@rancher/shell 3.0.0-rc.3 → 3.0.0-rc.5

package/models/cis.cattle.io.clusterscan.js

@@ -1,8 +1,8 @@
-import { _CREATE, _EDIT } from '@shell/config/query-params';
+import { NAME as PRODUCT_NAME } from '@shell/config/product/cis';
 import { CIS } from '@shell/config/types';
 import { findBy } from '@shell/utils/array';
 import { downloadFile, generateZip } from '@shell/utils/download';
-import { get, isEmpty, set } from '@shell/utils/object';
+import { get, isEmpty } from '@shell/utils/object';
 import { sortBy } from '@shell/utils/sort';
 import day from 'dayjs';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -77,20 +77,6 @@ export default class ClusterScan extends SteveModel {
     return out;
   }
 
-  applyDefaults(vm, mode) {
-    if (mode === _CREATE || mode === _EDIT) {
-      const includeScheduling = this.canBeScheduled();
-      const spec = this.spec || {};
-
-      spec.scanProfileName = null;
-      if (includeScheduling) {
-        spec.scoreWarning = 'pass';
-        spec.scheduledScanConfig = { scanAlertRule: {}, retentionCount: 3 };
-      }
-      set(this, 'spec', spec);
-    }
-  }
-
   canBeScheduled() {
     return hasSpecsScheduledScanConfig(this.$getters['schemaFor'](this.type));
   }
@@ -166,6 +152,21 @@ export default class ClusterScan extends SteveModel {
       });
     }
   }
+
+  get scanProfileLink() {
+    if (this.status?.lastRunScanProfileName) {
+      return {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          resource: CIS.CLUSTER_SCAN_PROFILE,
+          product:  PRODUCT_NAME,
+          id:       this.status?.lastRunScanProfileName
+        }
+      };
+    }
+
+    return {};
+  }
 }
 
 const labelFor = (report) => {

package/models/cis.cattle.io.clusterscanprofile.js

@@ -1,5 +1,7 @@
 
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { NAME as PRODUCT_NAME } from '@shell/config/product/cis';
+import { CIS } from '@shell/config/types';
 
 export default class CISProfile extends SteveModel {
   warnDeletionMessage(toRemove = []) {
@@ -11,4 +13,19 @@ export default class CISProfile extends SteveModel {
 
     return skipTests.length;
   }
+
+  get benchmarkVersionLink() {
+    if (this.spec?.benchmarkVersion) {
+      return {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          resource: CIS.BENCHMARK,
+          product:  PRODUCT_NAME,
+          id:       this.spec?.benchmarkVersion
+        }
+      };
+    }
+
+    return {};
+  }
 }

package/models/management.cattle.io.cluster.js

@@ -118,7 +118,7 @@ export default class MgmtCluster extends SteveModel {
     // Provisioner is the "<something>Config" in the model
     const provisioner = KONTAINER_TO_DRIVER[(this.provisioner || '').toLowerCase()] || this.provisioner;
 
-    if ( provisioner === 'rancherKubernetesEngine' ) {
+    if ( provisioner === 'rancherKubernetesEngine' || provisioner === 'rke') {
       // Look for a cloud provider in one of the node templates
       if ( this.machinePools?.[0] ) {
         provider = this.machinePools[0]?.nodeTemplate?.spec?.driver || null;

package/models/management.cattle.io.user.js

@@ -105,7 +105,7 @@ export default class User extends HybridModel {
    * @returns {number}
    */
   get userLastLogin() {
-    return this.metadata?.labels?.['cattle.io/last-login'] * 1000;
+    return this.metadata?.labels?.['cattle.io/last-login'] * 1000 || 0;
   }
 
   /**
@@ -113,7 +113,7 @@ export default class User extends HybridModel {
    * @returns {number}
    */
   get userDisabledIn() {
-    return this.metadata?.labels?.['cattle.io/disable-after'] * 1000;
+    return this.metadata?.labels?.['cattle.io/disable-after'] * 1000 || 0;
   }
 
   /**
@@ -129,7 +129,7 @@ export default class User extends HybridModel {
    * @returns {number}
    */
   get userDeletedIn() {
-    return this.metadata?.labels?.['cattle.io/delete-after'] * 1000;
+    return this.metadata?.labels?.['cattle.io/delete-after'] * 1000 || 0;
   }
 
   get state() {

package/models/provisioning.cattle.io.cluster.js

@@ -885,7 +885,8 @@ export default class ProvCluster extends SteveModel {
   get agentConfig() {
     // The one we want is the first one with no selector.
     // If there are multiple with no selector, that will fall under the unsupported message below.
-    return this.spec.rkeConfig.machineSelectorConfig.find((x) => !x.machineLabelSelector)?.config;
+    return this.spec.rkeConfig?.machineSelectorConfig
+      .find((x) => !x.machineLabelSelector)?.config || { };
   }
 
   get cloudProvider() {

package/models/steve-schema.ts

@@ -160,7 +160,7 @@ export default class SteveSchema extends Schema {
         url
       });
     } catch (e: any) {
-      if ( e?._status === 500) {
+      if (e?._status === 500 || e?._status === 503) {
         // Rancher could be updating it's definition cache, attempt a few times
         await wait(2000);
 

package/models/workload.js

@@ -15,7 +15,8 @@ export const defaultContainer = {
     readOnlyRootFilesystem:   false,
     privileged:               false,
     allowPrivilegeEscalation: false,
-  }
+  },
+  volumeMounts: []
 };
 export default class Workload extends WorkloadService {
   // remove clone as yaml/edit as yaml until API supported

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.0-rc.3",
+  "version": "3.0.0-rc.5",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -27,9 +27,9 @@
     "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "3.1.0",
+    "@aws-sdk/client-ec2": "3.658.1",
     "@aws-sdk/client-eks": "3.1.0",
-    "@aws-sdk/client-iam": "3.18.0",
+    "@aws-sdk/client-iam": "3.658.1",
     "@aws-sdk/client-kms": "3.8.1",
     "@babel/plugin-proposal-optional-chaining": "7.14.5",
     "@babel/plugin-proposal-private-methods": "7.18.6",
@@ -53,7 +53,6 @@
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",
-    "browser-env": "3.3.0",
     "clipboard-polyfill": "4.0.1",
     "codemirror": ">=5.64.0 <6",
     "codemirror-editor-vue3": "2.7.1",
@@ -99,7 +98,6 @@
     "js-yaml": "4.1.0",
     "js-yaml-loader": "1.2.2",
     "jsdiff": "1.1.1",
-    "jsdom-global": "3.0.2",
     "jsonpath-plus": "6.0.1",
     "jsrsasign": "10.5.25",
     "jszip": "3.8.0",
@@ -123,13 +121,13 @@
     "unfetch": "4.2.0",
     "url-parse": "1.5.10",
     "vue": "~3.2.13",
-    "vue-resize": "0.4.5",
     "vue-router": "4.4.3",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
     "vue-template-compiler": "2.7.16",
+    "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
-    "vuedraggable": "2.24.3",
+    "vuedraggable": "4.1.0",
     "vuex": "~4.0.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-virtual-modules": "0.4.3",

package/pages/c/_cluster/apps/charts/chart.vue

@@ -115,7 +115,9 @@ export default {
 
   watch: {
     '$route.query'(neu, old) {
-      if ( !isEqual(neu, old) ) {
+      // If the query changes, refetch the chart
+      // When going back to app list, the query is empty and we don't want to refetch
+      if ( !isEqual(neu, old) && Object.keys(neu).length > 0 ) {
         this.$fetch();
       }
     },

package/pages/c/_cluster/apps/charts/install.vue

@@ -5,6 +5,7 @@ import isEqual from 'lodash/isEqual';
 import { mapPref, DIFF } from '@shell/store/prefs';
 import { mapFeature, MULTI_CLUSTER, LEGACY } from '@shell/store/features';
 import { mapGetters } from 'vuex';
+import { markRaw } from 'vue';
 import { Banner } from '@components/Banner';
 import ButtonGroup from '@shell/components/ButtonGroup';
 import ChartReadme from '@shell/components/ChartReadme';
@@ -260,14 +261,6 @@ export default {
       await this.loadValuesComponent();
     }
 
-    /*
-      Check if the Helm chart has indicated
-      that the user should fill out the chart values
-      through a wizard-style workflow. If so, load
-      the chart steps.
-    */
-    await this.loadChartSteps();
-
     /*
       this.loadedVersion will only be true if you select a non-defalut
       option from the "Version" dropdown menu in Apps & Marketplace
@@ -451,10 +444,6 @@ export default {
         weight:         10
       },
 
-      customSteps: [
-
-      ],
-
       isPlainLayout: isPlainLayout(this.$route.query),
 
       legacyDefs: {
@@ -674,7 +663,6 @@ export default {
         steps.push(
           this.stepBasic,
           this.stepValues,
-          ...this.customSteps
         );
       }
 
@@ -744,7 +732,9 @@ export default {
 
   watch: {
     '$route.query'(neu, old) {
-      if ( !isEqual(neu, old) ) {
+      // If the query changes, refetch the chart
+      // When going back to app list, the query is empty and we don't want to refetch
+      if ( !isEqual(neu, old) && Object.keys(neu).length > 0 ) {
         this.$fetch();
         this.showSlideIn = false;
       }
@@ -824,10 +814,6 @@ export default {
     // for editing values
     await this.loadValuesComponent();
 
-    // Load Helm chart info used for showing
-    // wizard steps
-    await this.loadChartSteps();
-
     window.scrollTop = 0;
 
     this.preFormYamlOption = this.valuesComponent || this.hasQuestions ? VALUES_STATE.FORM : VALUES_STATE.YAML;
@@ -908,7 +894,7 @@ export default {
         const hasChartComponent = this.$store.getters['type-map/hasCustomChart'](component);
 
         if ( hasChartComponent ) {
-          this.valuesComponent = this.$store.getters['type-map/importChart'](component);
+          this.valuesComponent = markRaw(this.$store.getters['type-map/importChart'](component));
           this.showValuesComponent = true;
         } else {
           this.valuesComponent = null;
@@ -920,32 +906,6 @@ export default {
       }
     },
 
-    async loadChartSteps() {
-      const component = this.version?.annotations?.[CATALOG_ANNOTATIONS.COMPONENT];
-
-      if ( component ) {
-        const steps = await this.$store.getters['catalog/chartSteps'](component);
-
-        this.customSteps = await Promise.all( steps.map((cs) => this.loadChartStep(cs)));
-      }
-    },
-
-    async loadChartStep(customStep) {
-      const loaded = await customStep.component();
-      const withFallBack = this.$store.getters['i18n/withFallback'];
-
-      return {
-        name:      customStep.name,
-        label:     withFallBack(loaded?.default?.label, null, customStep.name),
-        subtext:   withFallBack(loaded?.default?.subtext, null, ''),
-        weight:    loaded?.default?.weight,
-        ready:     false,
-        hidden:    true,
-        loading:   true,
-        component: customStep.component,
-      };
-    },
-
     selectChart(chart) {
       if ( !chart ) {
         return;
@@ -1345,17 +1305,6 @@ export default {
       @cancel="cancel"
       @finish="finish"
     >
-      <template
-        v-for="customStep of customSteps"
-        v-slot:[customStep.name]
-        :key="customStep.name"
-      >
-        <component
-          :is="customStep.component"
-          @update="updateStep(customStep.name, $event)"
-          @errors="e=>errors.push(...e)"
-        />
-      </template>
       <template #bannerTitleImage>
         <div>
           <div class="logo-bg">

package/pages/c/_cluster/fleet/index.vue

@@ -394,7 +394,6 @@ export default {
         </template>
         <template v-slot:content>
           <ResourceTable
-            v-bind="$attrs"
             :schema="schema"
             :headers="headers"
             :rows="ws.repos"

package/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue

@@ -14,6 +14,7 @@ import { clone } from '@shell/utils/object';
 
 export default {
   name:       'AlertmanagerConfigReceiverCreateEdit',
+  emits:      ['error'],
   components: {
     ActionMenu,
     ButtonGroup,

package/pages/c/_cluster/settings/DefaultLinksEditor.vue

@@ -5,6 +5,8 @@ import { Checkbox } from '@components/Form/Checkbox';
 export default {
   name: 'DefaultLinksEditor',
 
+  emits: ['update:value'],
+
   components: { Checkbox },
 
   props: {

package/pages/c/_cluster/settings/performance.vue

@@ -318,7 +318,7 @@ export default {
               {{ t('performance.manualRefresh.setting') }}
             </p>
             <LabeledInput
-              v-model.number="value.manualRefresh.threshold"
+              v-model:value.number="value.manualRefresh.threshold"
               :mode="mode"
               :label="t('performance.manualRefresh.inputLabel')"
               :disabled="!value.manualRefresh.enabled"
@@ -397,7 +397,7 @@ export default {
                 {{ t('performance.gc.howRun.count.description') }}
               </p>
               <LabeledInput
-                v-model.number="value.garbageCollection.countThreshold"
+                v-model:value.number="value.garbageCollection.countThreshold"
                 :mode="mode"
                 :label="t('performance.gc.howRun.count.inputLabel')"
                 :disabled="!value.garbageCollection.enabled"

package/pages/c/_cluster/uiplugins/AddExtensionRepos.vue

@@ -2,17 +2,12 @@
 import { CATALOG } from '@shell/config/types';
 import Dialog from '@shell/components/Dialog.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
-import {
-  UI_PLUGINS_REPO_NAME,
-  UI_PLUGINS_REPO_URL,
-  UI_PLUGINS_REPO_BRANCH,
-  UI_PLUGINS_PARTNERS_REPO_NAME,
-  UI_PLUGINS_PARTNERS_REPO_URL,
-  UI_PLUGINS_PARTNERS_REPO_BRANCH,
-} from '@shell/config/uiplugins';
+import { UI_PLUGINS_REPOS } from '@shell/config/uiplugins';
 import { isRancherPrime } from '@shell/config/version';
 
 export default {
+  emits: ['done'],
+
   components: {
     Checkbox,
     Dialog,
@@ -36,15 +31,15 @@ export default {
       reposInfo: {
         official: {
           repo:   undefined,
-          name:   UI_PLUGINS_REPO_NAME,
-          url:    UI_PLUGINS_REPO_URL,
-          branch: UI_PLUGINS_REPO_BRANCH,
+          name:   UI_PLUGINS_REPOS.OFFICIAL.NAME,
+          url:    UI_PLUGINS_REPOS.OFFICIAL.URL,
+          branch: UI_PLUGINS_REPOS.OFFICIAL.BRANCH,
         },
         partners: {
           repo:   undefined,
-          name:   UI_PLUGINS_PARTNERS_REPO_NAME,
-          url:    UI_PLUGINS_PARTNERS_REPO_URL,
-          branch: UI_PLUGINS_PARTNERS_REPO_BRANCH,
+          name:   UI_PLUGINS_REPOS.PARTNERS.NAME,
+          url:    UI_PLUGINS_REPOS.PARTNERS.URL,
+          branch: UI_PLUGINS_REPOS.PARTNERS.BRANCH,
         }
       },
       isDialogActive: false,
@@ -53,10 +48,10 @@ export default {
 
   computed: {
     hasRancherUIPluginsRepo() {
-      return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_REPO_URL);
+      return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_REPOS.OFFICIAL.URL);
     },
     hasRancherUIPartnersPluginsRepo() {
-      return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_PARTNERS_REPO_URL);
+      return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_REPOS.PARTNERS.URL);
     }
   },
 

package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue

@@ -98,6 +98,8 @@ const initialState = () => {
 };
 
 export default {
+  emits: ['closed', 'refresh'],
+
   components: {
     AsyncButton, Banner, LabeledInput, Loading, LabeledSelect, AppModal,
   },

package/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue

@@ -9,6 +9,8 @@ import AsyncButton from '@shell/components/AsyncButton';
 import AppModal from '@shell/components/AppModal.vue';
 
 export default {
+  emits: ['closed', 'refresh', 'update'],
+
   components: { AsyncButton, AppModal },
 
   async fetch() {

package/pages/c/_cluster/uiplugins/CatalogList/index.vue

@@ -10,6 +10,8 @@ import { UI_PLUGIN_CATALOG } from '@shell/config/table-headers';
 import ResourceTable from '@shell/components/ResourceTable';
 
 export default {
+  emits: ['showCatalogUninstallDialog', 'showCatalogLoadDialog'],
+
   name: 'CatalogList',
 
   components: { ResourceTable },

package/pages/c/_cluster/uiplugins/DeveloperInstallDialog.vue

@@ -4,9 +4,11 @@ import AppModal from '@shell/components/AppModal.vue';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import { UI_PLUGIN } from '@shell/config/types';
-import { UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
+import { UI_PLUGIN_CHART_ANNOTATIONS, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 
 export default {
+  emits: ['closed'],
+
   components: {
     AsyncButton,
     Checkbox,
@@ -105,8 +107,9 @@ export default {
               endpoint: url,
               noCache:  true,
               metadata: {
-                developer: 'true',
-                direct:    'true'
+                developer:                                        'true',
+                direct:                                           'true',
+                [UI_PLUGIN_CHART_ANNOTATIONS.EXTENSIONS_VERSION]: '>= 3',
               },
               noAuth: true
             }

package/pages/c/_cluster/uiplugins/InstallDialog.vue

@@ -11,6 +11,8 @@ import { SETTING } from '@shell/config/settings';
 // Note: This dialog handles installation and update of a plugin
 
 export default {
+  emits: ['closed', 'update'],
+
   components: {
     AsyncButton,
     Banner,

package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue

@@ -65,10 +65,9 @@ export default {
     async loadPluginVersionInfo(version) {
       const versionName = version || this.info.displayVersion;
 
-      const isVersionNotCompatibleWithUi = this.info.versions?.find((v) => v.version === versionName && !v.isCompatibleWithUi);
-      const isVersionNotCompatibleWithKubeVersion = this.info.versions?.find((v) => v.version === versionName && !v.isCompatibleWithKubeVersion);
+      const isVersionNotCompatible = this.info.versions?.find((v) => v.version === versionName && !v.isVersionCompatible);
 
-      if (!this.info.chart || isVersionNotCompatibleWithUi || isVersionNotCompatibleWithKubeVersion) {
+      if (!this.info.chart || isVersionNotCompatible) {
         return;
       }
 
@@ -107,18 +106,15 @@ export default {
     },
 
     handleVersionBtnTooltip(version) {
-      if (version.requiredUiVersion) {
-        return this.t('plugins.info.requiresRancherVersion', { version: version.requiredUiVersion });
-      }
-      if (version.requiredKubeVersion) {
-        return this.t('plugins.info.requiresKubeVersion', { version: version.requiredKubeVersion });
+      if (!version.isVersionCompatible && Object.keys(version.versionIncompatibilityData).length) {
+        return this.t(version.versionIncompatibilityData?.tooltipKey, { required: version.versionIncompatibilityData?.required, mainHost: version.versionIncompatibilityData?.mainHost });
       }
 
       return '';
     },
 
     handleVersionBtnClass(version) {
-      return { 'version-active': version.version === this.infoVersion, disabled: !version.isCompatibleWithUi || !version.isCompatibleWithKubeVersion };
+      return { 'version-active': version.version === this.infoVersion, disabled: !version.isVersionCompatible };
     }
   }
 };
@@ -185,12 +181,6 @@ export default {
           </div>
         </div>
         <div>
-          <Banner
-            v-if="info.error"
-            color="error"
-            :label="info.error"
-            class="mt-10"
-          />
           <Banner
             v-if="info.builtin"
             color="warning"
@@ -218,8 +208,8 @@ export default {
         </h3>
         <div class="plugin-versions mb-10">
           <div
-            v-for="(v, i) in info.versions"
-            :key="i"
+            v-for="v in info.versions"
+            :key="`${v.name}-${v.version}`"
           >
             <a
               v-clean-tooltip="handleVersionBtnTooltip(v)"

package/pages/c/_cluster/uiplugins/UninstallDialog.vue

@@ -7,6 +7,8 @@ import { CATALOG } from '@shell/config/types';
 import { UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 
 export default {
+  emits: ['closed', 'update'],
+
   components: {
     AsyncButton,
     AppModal,

package/pages/c/_cluster/uiplugins/__tests__/AddExtensionRepos.test.ts

@@ -1,9 +1,6 @@
 import { nextTick } from 'vue';
 import { mount } from '@vue/test-utils';
-import {
-  UI_PLUGINS_REPO_URL,
-  UI_PLUGINS_PARTNERS_REPO_URL,
-} from '@shell/config/uiplugins';
+import { UI_PLUGINS_REPOS } from '@shell/config/uiplugins';
 import AddExtensionRepos from '@shell/pages/c/_cluster/uiplugins/AddExtensionRepos.vue';
 const mockedStore = () => {
   return {
@@ -13,8 +10,8 @@ const mockedStore = () => {
       t:                      (text: string) => text,
       'management/schemaFor': () => true,
       'management/findAll':   () => [
-        { urlDisplay: UI_PLUGINS_REPO_URL },
-        { urlDisplay: UI_PLUGINS_PARTNERS_REPO_URL },
+        { urlDisplay: UI_PLUGINS_REPOS.OFFICIAL.URL },
+        { urlDisplay: UI_PLUGINS_REPOS.PARTNERS.URL },
       ]
     }
   };