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

.github/workflows/ci.yaml

@@ -14,6 +14,9 @@ jobs:
       matrix:
         node-version:
         - 18
+        test-suite:
+        - test
+        - test:security
     steps:
     - uses: actions/checkout@v4
     - name: Set up system
@@ -27,8 +30,8 @@ jobs:
     - name: Prepare tests
       run: bin/setup
     - name: Run tests
-      run: yarn run test
+      run: yarn run ${{ matrix.test-suite }}
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' }}
+      if: ${{ github.ref == 'refs/heads/master' && matrix.test-suite != 'test:security' }}
       continue-on-error: true
       run: cat reports/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

.whitesource

@@ -1,4 +1,3 @@
 {
   "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
 }
-

.yarnrc.yml

@@ -4,4 +4,32 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.2.2.cjs
+npmAuditExcludePackages:
+- angular
+# pending | moderate | GHSA-m2h2-264f-f486 | angular >=1.7.0         | 1.8.3 brought in by manageiq-ui-service@workspace:.
+# pending | moderate | GHSA-prc3-vjfx-vhm9 | angular <=1.8.3         | 1.8.3 brought in by manageiq-ui-service@workspace:.
+# pending | moderate | GHSA-2vrf-hf26-jrp5 | angular <=1.8.3         | 1.8.3 brought in by manageiq-ui-service@workspace:.
+# pending | moderate | GHSA-2qqx-w9hr-q5gx | angular <=1.8.3         | 1.8.3 brought in by manageiq-ui-service@workspace:.
+# pending | moderate | GHSA-qwqh-hm9m-p5hr | angular <=1.8.3         | 1.8.3 brought in by manageiq-ui-service@workspace:.
+# pending | high     | GHSA-4w4v-5hc9-xrr2 | angular >=1.3.0 <=1.8.3 | 1.8.3 brought in by manageiq-ui-service@workspace:.
+- bootstrap
+# pending | moderate | GHSA-9v3m-8fp8-mj99 | bootstrap >=3.0.0 <3.4.1  | 3.3.7 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-9mvj-f7w8-pvh2 | bootstrap >=2.0.0 <=3.4.1 | 3.3.7, 3.4.1 brought in by angular-patternfly@npm:5.0.3, patternfly@npm:3.25.1
+# pending | moderate | GHSA-3mgp-fx93-9xv5 | bootstrap <3.4.0          | 3.3.7 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-ph58-4vrj-w6hr | bootstrap <3.4.0          | 3.3.7 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-3wqf-4x89-9g79 | bootstrap >=2.3.0 <3.4.0  | 3.3.7 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-7mvr-5x2g-wfc8 | bootstrap >=2.3.0 <3.4.0  | 3.3.7 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-4p24-vmcr-4gqj | bootstrap >=2.0.4 <3.4.0  | 3.3.7 brought in by patternfly@npm:3.25.1
+- bootstrap-select
+# pending | high     | GHSA-9r7h-6639-v5mw | bootstrap-select <1.13.6 | 1.12.2, 1.12.4 brought in by angular-patternfly@npm:5.0.3, patternfly@npm:3.59.5
+# pending | moderate | GHSA-7c82-mp33-r854 | bootstrap-select <1.13.6 | 1.12.2, 1.12.4 brought in by angular-patternfly@npm:5.0.3, patternfly@npm:3.59.5
+- jquery
+# pending | moderate | GHSA-gxr4-xjj5-5px2 | jquery >=1.2.0 <3.5.0 | 3.2.1, 3.4.1 brought in by angular-patternfly@npm:5.0.3, patternfly@npm:3.25.1
+# pending | moderate | GHSA-6c3j-c64m-qhgq | jquery >=1.1.4 <3.4.0 | 3.2.1 brought in by patternfly@npm:3.25.1
+# pending | moderate | GHSA-jpcq-cgw6-v4j6 | jquery >=1.0.3 <3.5.0 | 3.2.1, 3.4.1 brought in by angular-patternfly@npm:5.0.3, patternfly@npm:3.25.1
+- lodash.pick
+# pending | high | GHSA-p6mc-m468-83gw | lodash.pick >=4.0.0 <=4.4.0 | 4.4.0 brought in by cheerio@npm:0.22.0
+- postcss
+# pending | moderate | GHSA-7fh5-64p2-3v2j | postcss <8.4.31 | 7.0.39 brought in by autoprefixer@npm:9.8.8
+
+yarnPath: .yarn/releases/yarn-4.3.1.cjs

client/app/core/navigation.service.js

@@ -31,6 +31,23 @@ export function NavigationFactory (RBAC, Polling, POLLING_INTERVAL, CollectionsA
         iconClass: 'fa fa-dashboard',
         permissions: true
       },
+      {
+        title: __('Service Catalog'),
+        originalTitle: 'Service Catalog',
+        state: 'catalogs',
+        iconClass: 'fa fa-folder-open-o',
+        badgeQuery: {
+          'field': 'service_templates',
+          'filter': 'display=true'
+        },
+        badges: [
+          {
+            count: service.navCount.catalogs,
+            tooltip: __('The total number of available catalogs')
+          }
+        ],
+        permissions: false
+      },
       {
         title: __('My Services'),
         state: 'services',
@@ -63,23 +80,6 @@ export function NavigationFactory (RBAC, Polling, POLLING_INTERVAL, CollectionsA
           }
         ],
         permissions: false
-      },
-      {
-        title: __('Service Catalog'),
-        originalTitle: 'Service Catalog',
-        state: 'catalogs',
-        iconClass: 'fa fa-folder-open-o',
-        badgeQuery: {
-          'field': 'service_templates',
-          'filter': 'display=true'
-        },
-        badges: [
-          {
-            count: service.navCount.catalogs,
-            tooltip: __('The total number of available catalogs')
-          }
-        ],
-        permissions: false
       }
     ]
     setPermissions()

package.json

@@ -23,6 +23,7 @@
     "t": "yarn run build:test && yarn run test:karma",
     "test": "yarn run gettext:extract && yarn run gettext:validate && yarn run gettext:validate-language-codes && yarn run t",
     "test:karma": "karma start karma.conf.js --single-run",
+    "test:security": "yarn npm audit --recursive --no-deprecations --environment production",
     "test:watch": "karma start --auto-watch --no-single-run",
     "update": "jq -r '.dependencies|keys|join(\"\n\")'  package.json | grep -v patternfly-timeline | xargs yarn add",
     "update-dev": "jq -r '.devDependencies|keys|join(\"\n\")'  package.json | xargs yarn add -D",
@@ -137,8 +138,9 @@
     "node": ">= 18.0.0",
     "npm": ">= 8.6.0"
   },
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.1",
   "resolutions": {
+    "d3-color": "~3.1.0",
     "moment-timezone": "^0.5.41",
     "moment": "~2.29.4",
     "node-sass": "^8.0.0",