Merge remote-tracking branch 'origin/master' into quinteros

ManageIQ · Oct 26, 2023 · 9a99ebc · 9a99ebc
2 parents 61fced5 + 9ac3a1b
commit 9a99ebc
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
         node-version:
         - '14'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up system
       run: bin/before_install
     - name: Set up Node

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@manageiq/ui-components",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "UI components for ManageIQ project",
   "main": "dist/js/ui-components.js",
   "scripts": {

diff --git a/src/dialog-editor/components/tree-selector/tree-selector.html b/src/dialog-editor/components/tree-selector/tree-selector.html
@@ -42,9 +42,16 @@
     </div>
     <div ng-if="$ctrl.treeOptions.automationType==$ctrl.treeOptions.automationTypes.workflow">
       <div ng-if="$ctrl.treeOptions.data">
-        <ul class="nav nav-list workflows_list_wrapper" ng-repeat="workflow in $ctrl.treeOptions.data">
-          <li class="workflow_item" ng-click="$ctrl.treeOptions.onSelect(workflow)">
-              {{workflow.name}}
+        <ul class="nav nav-list workflows_list_wrapper">
+          <li class="workflows_list_header">
+            <div class="col-md-6">Repository</div>
+            <div class="col-md-6">Workflow Name</div>
+          </li>
+          <li class="workflow_item" ng-repeat="workflow in $ctrl.treeOptions.data">
+            <div class="workflow_item_row" ng-click="$ctrl.treeOptions.onSelect(workflow)">
+              <div class="col-md-6">{{workflow.configuration_script_source.name}}</div>
+              <div class="col-md-6">{{workflow.name}}</div>
+            </div>
           </li>
         </ul>
       </div>

diff --git a/src/styles/dialog-editor-boxes.scss b/src/styles/dialog-editor-boxes.scss
@@ -192,11 +192,30 @@ l.nav.nav-list.workflows {
 
     ul.workflows_list_wrapper {
       display: flex;
+      flex-direction: column;
+      border: 1px solid lightgray;
+
+      li.workflows_list_header {
+        background: lightgray;
+        padding: 10px 0;
+        font-weight: bold;
+      }
 
       li.workflow_item {
         display: flex;
         flex-grow: 1;
         padding: 5px;
+        border-bottom: 1px solid lightgray;
+
+        &:last-child {
+          border-bottom: 0 !important;
+        }
+
+        .workflow_item_row {
+          display: flex;
+          flex-grow: 1;
+          margin-left: -5px;
+        }
 
         &:hover {
           background: #e4e5e6;

diff --git a/yarn.lock b/yarn.lock
@@ -262,7 +262,7 @@
     "@types/d3-voronoi" "*"
     "@types/d3-zoom" "^1"
 
-"@types/geojson@*", "@types/geojson@7946.0.8":
+"@types/geojson@*":
   version "7946.0.8"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
   integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
@@ -9346,9 +9346,9 @@ window-size@0.1.0:
   integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==
 
 word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wordwrap@0.0.2:
   version "0.0.2"