table resizing (#386)

jenkinsci · Jan 6, 2025 · 5601ba3 · 5601ba3
1 parent bf374bf
commit 5601ba3
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 65 deletions.
diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Table/index.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/Table/index.jelly
@@ -23,60 +23,80 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:s="/lib/samples">
+<j:jelly xmlns:j="jelly:core" xmlns:s="/lib/samples" xmlns:t="/lib/hudson" xmlns:l="/lib/layout">
   <s:layout>
     <s:section hideBorder="true">
       <s:group>
         <s:preview>
-          <table class="jenkins-table sortable jenkins-!-margin-bottom-0">
-            <thead>
-              <th>
-                Name
-              </th>
-              <th>
-                Status
-              </th>
-              <th>
-                Reason
-              </th>
-            </thead>
-            <tbody>
-              <tr>
-                <td>
-                  <a href="#" class="jenkins-table__link">Link 1</a>
-                </td>
-                <td>
-                  Success
-                  <a href="#" class="jenkins-table__link jenkins-table__badge model-link">#7</a>
-                </td>
-                <td>
-                  No Errors
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <a href="#" class="jenkins-table__link">Link 2</a>
-                </td>
-                <td>
-                  Failure
-                </td>
-                <td>
-                  Can't compile
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <a href="#" class="jenkins-table__link">Link 3</a>
-                </td>
-                <td>
-                  Unstable
-                </td>
-                <td>
-                  Test Failed
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="jdl-table-container">
+            <t:setIconSize/>
+            <table class="jenkins-table sortable ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''}">
+              <thead>
+                <th>
+                  Name
+                </th>
+                <th class="jenkins-table__cell--tight">S</th>
+                <th>
+                  Status
+                </th>
+                <th>
+                  Reason
+                </th>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>
+                    <a href="#" class="jenkins-table__link">Link 1</a>
+                  </td>
+                  <td class="jenkins-table__cell--tight jenkins-table__icon">
+                    <div class="jenkins-table__cell__button-wrapper">
+                      <l:icon src="symbol-status-blue"/>
+                    </div>
+                  </td>
+                  <td>
+                    Success
+                    <a href="#" class="jenkins-table__link jenkins-table__badge model-link">#7</a>
+                  </td>
+                  <td>
+                    No Errors
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <a href="#" class="jenkins-table__link">Link 2</a>
+                  </td>
+                  <td class="jenkins-table__cell--tight jenkins-table__icon">
+                    <div class="jenkins-table__cell__button-wrapper">
+                      <l:icon src="symbol-status-red"/>
+                    </div>
+                  </td>
+                  <td>
+                    Failure
+                  </td>
+                  <td>
+                    Can't compile
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <a href="#" class="jenkins-table__link">Link 3</a>
+                  </td>
+                  <td class="jenkins-table__cell--tight jenkins-table__icon">
+                    <div class="jenkins-table__cell__button-wrapper">
+                      <l:icon src="symbol-status-yellow"/>
+                    </div>
+                  </td>
+                  <td>
+                    Unstable
+                  </td>
+                  <td>
+                    Test Failed
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <t:iconSize/>
+          </div>
         </s:preview>
         <s:code file="index.jelly" />
       </s:group>

diff --git a/src/main/resources/scss/pages/_index.scss b/src/main/resources/scss/pages/_index.scss
@@ -9,3 +9,4 @@
 @use "notifications";
 @use "spacing";
 @use "symbols";
+@use "tables";
diff --git a/src/main/resources/scss/pages/_tables.scss b/src/main/resources/scss/pages/_tables.scss
@@ -0,0 +1,8 @@
+.jdl-table-container {
+  width: 100%;
+  margin-bottom: 0;
+}
+
+.jdl-table-container>div:last-child {
+  margin-bottom: 0;
+}
diff --git a/src/main/webapp/Table/index.jelly b/src/main/webapp/Table/index.jelly
@@ -1,20 +1,27 @@
-<table class="jenkins-table sortable">
-  <thead>
-    <th>
-      Name
-    </th>
-    <th>
-      Status
-    </th>
-    <th>
-      Reason
-    </th>
-  </thead>
-  <tbody>
+<t:setIconSize/>
+<table class="jenkins-table sortable ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''}">
+<thead>
+  <th>
+    Name
+  </th>
+  <th class="jenkins-table__cell--tight">S</th>
+  <th>
+    Status
+  </th>
+  <th>
+    Reason
+  </th>
+</thead>
+<tbody>
   <tr>
     <td>
       <a href="#" class="jenkins-table__link">Link 1</a>
     </td>
+    <td class="jenkins-table__cell--tight jenkins-table__icon">
+      <div class="jenkins-table__cell__button-wrapper">
+        <l:icon src="symbol-status-blue"/>
+      </div>
+    </td>
     <td>
       Success
       <a href="#" class="jenkins-table__link jenkins-table__badge model-link">#7</a>
@@ -27,6 +34,11 @@
     <td>
       <a href="#" class="jenkins-table__link">Link 2</a>
     </td>
+    <td class="jenkins-table__cell--tight jenkins-table__icon">
+      <div class="jenkins-table__cell__button-wrapper">
+        <l:icon src="symbol-status-red"/>
+      </div>
+    </td>
     <td>
       Failure
     </td>
@@ -38,12 +50,18 @@
     <td>
       <a href="#" class="jenkins-table__link">Link 3</a>
     </td>
+    <td class="jenkins-table__cell--tight jenkins-table__icon">
+      <div class="jenkins-table__cell__button-wrapper">
+        <l:icon src="symbol-status-yellow"/>
+      </div>
+    </td>
     <td>
       Unstable
     </td>
     <td>
       Test Failed
     </td>
   </tr>
-  </tbody>
+</tbody>
 </table>
+<t:iconSize/>
diff --git a/src/test/java/ValidRelativeUrlsTest.java b/src/test/java/ValidRelativeUrlsTest.java
@@ -74,7 +74,8 @@ private boolean filterUrl(DomNode anchor) {
                 && !url.equals("..")
                 && !url.equals("twoColumn")
                 && !url.equals("oneColumn")
-                && !url.equals("fullscreen");
+                && !url.equals("fullscreen")
+                && !url.startsWith("/jenkins/iconSize");
 
         if (!response) {
             System.out.println("🤫 Ignoring URL: " + url);