Add package list in staging project show view

Package list partial is needed in both workflow and staging_project views, for this reason it is moved to staging/shared directory. Co-authored-by: David Kang <dkang@suse.com> Co-authored-by: Victor Pereira <vpereira@suse.com>
openSUSE · Nov 21, 2018 · e1e5b7b · e1e5b7b
1 parent 9a93fbc
commit e1e5b7b
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 64 deletions.
diff --git a/src/api/app/assets/stylesheets/webui2/staging-workflow.scss b/src/api/app/assets/stylesheets/webui2/staging-workflow.scss
@@ -19,95 +19,94 @@ ul .table-list-group-item {
   background-color: transparent;
 }
 
-#staging-projects-datatable {
-  td {
-    span.badge {
-      font-size: inherit;
-      font-weight: inherit;
-    }
+#staging-projects-datatable td,
+#staging-project-package-list {
+  span.badge {
+    font-size: inherit;
+    font-weight: inherit;
+  }
 
-    &.project {
-      > span.badge {
-        @extend .w-100;
+  &.project {
+    > span.badge {
+      @extend .w-100;
 
-        > span.badge {
-          @extend .m-1;
-        }
+      > span.badge {
+        @extend .m-1;
       }
+    }
 
-      span.badge {
-        &.state-unacceptable {
-          @extend .badge-dark;
-        }
+    span.badge {
+      &.state-unacceptable {
+        @extend .badge-dark;
+      }
 
-        &.state-acceptable {
-          @extend .badge-success;
-        }
+      &.state-acceptable {
+        @extend .badge-success;
+      }
 
-        &.state-testing {
-          @extend .badge-info;
-        }
+      &.state-testing {
+        @extend .badge-info;
+      }
 
-        &.state-building {
-          @extend .badge-warning;
+      &.state-building {
+        @extend .badge-warning;
 
-          span {
-            @extend .text-dark;
-          }
+        span {
+          @extend .text-dark;
         }
+      }
 
-        &.state-failed {
-          @extend .badge-danger;
-        }
+      &.state-failed {
+        @extend .badge-danger;
+      }
 
-        &.state-review {
-          @extend .badge-secondary;
-        }
+      &.state-review {
+        @extend .badge-secondary;
+      }
 
-        &.state-empty {
-          @extend .badge-light;
-          @extend .border;
+      &.state-empty {
+        @extend .badge-light;
+        @extend .border;
 
-          span {
-            @extend .text-dark;
-          }
+        span {
+          @extend .text-dark;
         }
       }
     }
+  }
 
-    &.requests {
-      @extend .w-50;
+  &.requests {
+    @extend .w-50;
 
-      a.request {
-        @extend .text-white;
-        padding: 0 0.125rem 0.25rem;
+    a.request {
+      @extend .text-white;
+      padding: 0 0.125rem 0.25rem;
 
-        &:hover {
-          text-decoration: none;
-        }
+      &:hover {
+        text-decoration: none;
+      }
 
-        span.badge {
-          &.state-ready {
-            @extend .badge-success;
-          }
+      span.badge {
+        &.state-ready {
+          @extend .badge-success;
+        }
 
-          &.state-review {
-            @extend .badge-warning;
-          }
+        &.state-review {
+          @extend .badge-warning;
+        }
 
-          &.state-obsolete {
-            @extend .badge-info;
-          }
+        &.state-obsolete {
+          @extend .badge-info;
+        }
 
-          &.state-untracked {
-            @extend .badge-dark;
-          }
+        &.state-untracked {
+          @extend .badge-dark;
         }
       }
+    }
 
-      a, div.collapse, div.collapsing {
-        float: left;
-      }
+    a, div.collapse, div.collapsing {
+      float: left;
     }
   }
 }
diff --git a/src/api/app/views/webui2/webui/staging/projects/show.html.haml b/src/api/app/views/webui2/webui/staging/projects/show.html.haml
@@ -7,6 +7,8 @@
       .card-body
         %h3= @pagetitle
         %h4.mt-4 Packages
+        .requests#staging-project-package-list
+          = render partial: 'webui/staging/shared/packages_list', locals: { staging_project: @staging_project }
     .card.mb-3
       %h5.card-header Status
       .card-body

diff --git a/...taging/workflows/_packages_list.html.haml → ...i/staging/shared/_packages_list.html.haml b/...taging/workflows/_packages_list.html.haml → ...i/staging/shared/_packages_list.html.haml
diff --git a/src/api/app/views/webui2/webui/staging/workflows/_staging_projects_table.html.haml b/src/api/app/views/webui2/webui/staging/workflows/_staging_projects_table.html.haml
@@ -12,7 +12,7 @@
         %td.project
           = render partial: 'overall_state', locals: { staging_project: staging_project }
         %td.requests
-          = render partial: 'packages_list', locals: { staging_project: staging_project }
+          = render partial: 'webui/staging/shared/packages_list', locals: { staging_project: staging_project }
         %td
           = render partial: 'problems', locals: { staging_project: staging_project }
         - if display_actions_column