Fix types - requires new shell version; fix yaml dependency

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

package.json

@@ -6,11 +6,12 @@
     "node": ">=16"
   },
   "dependencies": {
+    "@rancher/components": "0.2.1-alpha.0",
     "@rancher/shell": "^0.5.3",
+    "@types/lodash": "4.14.184",
     "core-js": "3.21.1",
     "css-loader": "6.7.3",
-    "@types/lodash": "4.14.184",
+    "yaml": "2.0.0"
-    "@rancher/components": "0.2.1-alpha.0"
   },
   "resolutions": {
     "**/webpack": "4",
@@ -27,4 +28,4 @@
     "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
     "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue ."
   }
-}
+}

pkg/harvester/babel.config.js

@@ -1 +1 @@
-module.exports = require('./.shell/pkg/babel.config.js');
+module.exports = require('@shell/pkg/babel.config.js');

pkg/harvester/product.ts

@@ -24,6 +24,7 @@ import {
   SUB_TYPE,
   ADDRESS,
 } from '@shell/config/table-headers';
+import { IF_HAVE } from '@shell/store/type-map';
 import { HCI, VOLUME_SNAPSHOT } from './types';
 import {
   IMAGE_DOWNLOAD_SIZE,
@@ -32,9 +33,6 @@ import {
   SNAPSHOT_TARGET_VOLUME,
 } from './config/table-headers';
 
-// import { IF_HAVE } from '@shell/store/type-map';
-const IF_HAVE = { MULTI_CLUSTER: false };
-
 const TEMPLATE = HCI.VM_VERSION;
 const MONITORING_GROUP = 'Monitoring & Logging::Monitoring';
 const LOGGING_GROUP = 'Monitoring & Logging::Logging';

pkg/harvester/routing/harvester-routing.ts

@@ -1,4 +1,5 @@
-// import { RouteConfig } from 'vue-router';
+// eslint-disable-next-line import/named
+import { RouteConfig } from 'vue-router';
 import { PRODUCT_NAME } from '../config/harvester';
 
 import Root from '../pages/c/_cluster/index.vue';
@@ -15,7 +16,7 @@ import HarvesterMembers from '../pages/c/_cluster/members/index.vue';
 import ProjectNamespaces from '../pages/c/_cluster/projectsnamespaces.vue';
 import HarvesterAlertmanagerReceiver from '../pages/c/_cluster/alertmanagerconfig/_alertmanagerconfigid/receiver.vue';
 
-const routes: any[] = [
+const routes: RouteConfig[] = [
   {
     name:      `${ PRODUCT_NAME }-c-cluster-support`,
     path:      `/:product/c/:cluster/support`,

pkg/harvester/store/harvester-store/getters.ts

@@ -13,7 +13,7 @@ export default {
     divider,
     notFilterNamespaces
   }: any) => {
-    const out = [{
+    const out: { id: string, kind: string, label: string }[] = [{
       id:    ALL,
       kind:  NAMESPACE_FILTER_KINDS.SPECIAL,
       label: rootGetters['i18n/t']('nav.ns.all'),
@@ -29,9 +29,11 @@ export default {
         MANAGEMENT.PROJECT
       );
 
-      projects = sortBy(filterBy(projects, 'spec.clusterName', cluster.id), [
+      projects = sortBy(
-        'nameDisplay',
+        filterBy(projects, 'spec.clusterName', cluster.id),
-      ]).filter((project: any) => project.nameDisplay !== 'System');
+        ['nameDisplay'],
+        null
+      ).filter((project: any) => project.nameDisplay !== 'System');
 
       const projectsById: any = {};
       const namespacesByProject: any = {};

pkg/harvester/store/harvester-store/index.ts

@@ -7,7 +7,7 @@ import mutations from './mutations';
 import actions from './actions';
 
 const harvesterFactory = (): CoreStoreSpecifics => {
-  const steveFactory = SteveFactory();
+  const steveFactory = SteveFactory(null, null);
 
   steveFactory.getters = {
     ...steveFactory.getters,

pkg/harvester/vue.config.js

@@ -1 +1 @@
-module.exports = require('./.shell/pkg/vue.config')(__dirname);
+module.exports = require('@shell/pkg/vue.config')(__dirname);

yarn.lock

@@ -15491,7 +15491,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -15509,15 +15509,6 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -15569,7 +15560,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -15590,13 +15581,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -17240,7 +17224,7 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -17267,15 +17251,6 @@ wrap-ansi@^6.0.0, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -17415,6 +17390,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-2.0.0.tgz#cbc588ad58e0cd924cd3f5f2b1a9485103048e25"
+  integrity sha512-JbfdlHKGP2Ik9IHylzWlGd4pPK++EU46/IxMykphS2ZKw7a7h+dHNmcXObLgpRDriBY+rpWslldikckX8oruWQ==
+
 yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"