@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.2

package/models/chart.js

@@ -5,8 +5,9 @@ import {
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { SHOW_PRE_RELEASE } from '@shell/store/prefs';
 import { getLatestCompatibleVersion } from '@shell/utils/chart';
+import { isMissingDate } from '@shell/utils/time';
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { CATALOG, ZERO_TIME } from '@shell/config/types';
+import { CATALOG } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import day from 'dayjs';
 
@@ -89,22 +90,33 @@ export default class Chart extends SteveModel {
   }
 
   /**
-   * Determines if the chart is installed by checking if exactly one matching installed app is found.
+   * Determines if the chart is installed by checking if at least one matching installed app is found.
    *
    * @returns {boolean} `true` if the chart is currently installed.
    */
   get isInstalled() {
-    return this.matchingInstalledApps.length === 1;
+    return this.matchingInstalledApps.length >= 1;
   }
 
   /**
-   * Determines if the installed app has a single available upgrade.
+   * Determines if at least one installed instance has an available upgrade.
    * Requires the chart to be installed.
    *
-   * @returns {boolean} `true` if the app is installed and has a single upgrade available.
+   * @returns {boolean} `true` if the app is installed and at least one instance has an upgrade available.
    */
   get upgradeable() {
-    return this.isInstalled && this.matchingInstalledApps[0].upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE;
+    return this.isInstalled && this.matchingInstalledApps.some(
+      (app) => app.upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE
+    );
+  }
+
+  /**
+   * Returns the number of installed instances of this chart.
+   *
+   * @returns {number} The count of installed instances.
+   */
+  get installedCount() {
+    return this.matchingInstalledApps.length;
   }
 
   /**
@@ -140,25 +152,19 @@ export default class Chart extends SteveModel {
     const subHeaderItems = [];
 
     if (latestVersion) {
-      const hasZeroTime = latestVersion.created === ZERO_TIME;
-
       subHeaderItems.push({
         icon:        'icon-version-alt',
         iconTooltip: { key: 'tableHeaders.version' },
         label:       latestVersion.version
       });
 
-      const lastUpdatedItem = {
-        icon:        'icon-refresh-alt',
-        iconTooltip: { key: 'tableHeaders.lastUpdated' },
-        label:       hasZeroTime ? this.t('generic.na') : day(latestVersion.created).format('MMM D, YYYY')
-      };
-
-      if (hasZeroTime) {
-        lastUpdatedItem.labelTooltip = this.t('catalog.charts.appChartCard.subHeaderItem.missingVersionDate');
+      if (!isMissingDate(latestVersion.created)) {
+        subHeaderItems.push({
+          icon:        'icon-refresh-alt',
+          iconTooltip: { key: 'tableHeaders.lastUpdated' },
+          label:       day(latestVersion.created).format('MMM D, YYYY')
+        });
       }
-
-      subHeaderItems.push(lastUpdatedItem);
     }
 
     const footerItems = [
@@ -206,10 +212,18 @@ export default class Chart extends SteveModel {
     }
 
     if (this.isInstalled) {
+      const hasMultipleInstances = this.installedCount > 1;
       const installedVersion = this.matchingInstalledApps[0]?.spec?.chart?.metadata?.version;
 
+      // When multiple instances, don't show version in tooltip since each may have different versions
+      let tooltipText = hasMultipleInstances ? this.t('generic.installedMultiple') : this.t('generic.installed');
+
+      if (!hasMultipleInstances) {
+        tooltipText = `${ tooltipText } (${ installedVersion })`;
+      }
+
       statuses.push({
-        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: `${ this.t('generic.installed') } (${ installedVersion })` }
+        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: tooltipText }
       });
     }
 

package/models/fleet-application.js

@@ -105,7 +105,7 @@ export default class FleetApplication extends SteveModel {
 
     for (const tgt of this.spec.targets) {
       if (tgt.clusterName) {
-        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
+        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName) || findBy(clusters, 'nameDisplay', tgt.clusterName);
 
         if (cluster) {
           addObject(out, cluster);

package/models/fleet.cattle.io.bundle.js

@@ -47,7 +47,7 @@ export default class FleetBundle extends SteveModel {
 
     for (const tgt of this.spec.targets) {
       if (tgt.clusterName) {
-        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
+        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName) || findBy(clusters, 'nameDisplay', tgt.clusterName);
 
         if (cluster) {
           addObject(out, cluster);

package/models/kontainerdriver.js

@@ -5,6 +5,13 @@ export default class KontainerDriver extends Driver {
     return 'c-cluster-manager-driver-kontainerdriver';
   }
 
+  get parentLocationOverride() {
+    return {
+      name:   'c-cluster-manager-driver-kontainerdriver',
+      params: { cluster: this.$rootGetters['clusterId'] }
+    };
+  }
+
   get _availableActions() {
     const out = [
       {
@@ -54,6 +61,10 @@ export default class KontainerDriver extends Driver {
     return out;
   }
 
+  get isEmber() {
+    return !this.builtIn && !this.builtin;
+  }
+
   deactivate(resources = [this]) {
     this.$dispatch('promptModal', {
       componentProps: { drivers: resources, driverType: 'kontainerDrivers' },

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

@@ -21,7 +21,11 @@ export const configType = {
   cognito:         'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };
+const imageOverrides = {
+  azuread:      'entraid',
+  keycloakoidc: 'keycloak',
+  genericoidc:  'openid',
+};
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {

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

@@ -6,13 +6,11 @@ import { insertAt, addObject, removeObject } from '@shell/utils/array';
 import { downloadFile } from '@shell/utils/download';
 import { parseSi } from '@shell/utils/units';
 import { parseColor, textColor } from '@shell/utils/color';
-import { addParams } from '@shell/utils/url';
 import { isEmpty } from '@shell/utils/object';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
-import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
 import { requireAsset } from '@shell/utils/require-asset';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
 import { copyTextToClipboard } from '@shell/utils/clipboard';
@@ -114,57 +112,6 @@ export default class MgmtCluster extends SteveModel {
     return null;
   }
 
-  get providerForEmberParam() {
-    // Ember wants one word called provider to tell what component to show, but has much indirect mapping to figure out what it is.
-    let provider;
-
-    //  provisioner is status.driver
-    const provisioner = KONTAINER_TO_DRIVER[(this.provisioner || '').toLowerCase()] || this.provisioner;
-
-    if ( provisioner === 'rancherKubernetesEngine') {
-      // Look for a cloud provider in one of the node templates
-      if ( this.machinePools?.[0] ) {
-        provider = this.machinePools[0]?.nodeTemplate?.spec?.driver || null;
-      } else {
-        provider = 'custom';
-      }
-    } else if ( this.driver ) {
-      provider = this.driver;
-    } else if ( provisioner && provisioner.endsWith('v2') ) {
-      provider = provisioner;
-    } else {
-      provider = 'import';
-    }
-
-    return provider;
-  }
-
-  get emberEditPath() {
-    const provider = this.providerForEmberParam;
-
-    // Avoid passing falsy values as query parameters
-    const qp = { };
-
-    if (provider) {
-      qp['provider'] = provider;
-    }
-
-    // Copied out of https://github.com/rancher/ui/blob/20f56dc54c4fc09b5f911e533cb751c13609adaf/app/models/cluster.js#L844
-    if ( provider === 'import' && isEmpty(this.eksConfig) && isEmpty(this.gkeConfig) ) {
-      qp.importProvider = 'other';
-    } else if (
-      (provider === 'amazoneks' && !isEmpty(this.eksConfig) ) ||
-       (provider === 'gke' && !isEmpty(this.gkeConfig) )
-       // || something for aks v2
-    ) {
-      qp.importProvider = KONTAINER_TO_DRIVER[provider];
-    }
-
-    const path = addParams(`/c/${ escape(this.id) }/edit`, qp);
-
-    return path;
-  }
-
   get groupByLabel() {
     return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAWorkspace');
   }

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

@@ -8,7 +8,7 @@ export default class Feature extends HybridModel {
 
   get enabled() {
     // If lockedValue is not null, then this is the value that the flag is locked to, so that should be used
-    if (this.status.lockedValue !== null) {
+    if (this.status && this.status.lockedValue !== null) {
       return this.status.lockedValue;
     }
 
@@ -17,7 +17,7 @@ export default class Feature extends HybridModel {
   }
 
   get restartRequired() {
-    return !this.status.dynamic;
+    return !this.status?.dynamic;
   }
 
   get canYaml() {
@@ -43,7 +43,7 @@ export default class Feature extends HybridModel {
     // User can not disable or enable if the feature flag is locked
     // Note: lockedValue is the value that the feature flag is locked to, so it can be true or false
     // It can also be null, which indicates that the feature flag is not locked
-    enableAction.enabled = enableAction.enabled && (this.status.lockedValue === null);
+    enableAction.enabled = enableAction.enabled && (this.status && this.status.lockedValue === null);
 
     out.unshift(enableAction);
 

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

@@ -2,10 +2,9 @@ import HybridModel from '@shell/plugins/steve/hybrid-class';
 
 const HIDDEN = ['rke', 'rancherkubernetesengine'];
 
-const V2 = ['amazoneks', 'googlegke', 'azureaks'];
 const IMPORTABLE = ['amazoneks', 'googlegke', 'azureaks'];
 
-// The Ember create page has short names that don't match the full kontainer driver
+// Short names that map from the full kontainer driver name
 export const KONTAINER_TO_DRIVER = {
   amazonelasticcontainerservice:    'amazoneks',
   azurekubernetesservice:           'azureaks',
@@ -36,14 +35,6 @@ export const KEV1 = [
   'googlekubernetesengine',
 ];
 
-// And the Import page has even shorter ones that don't match kontainer or create...
-export const DRIVER_TO_IMPORT = {
-  googlegke: 'gke',
-  amazoneks: 'eks',
-  azureaks:  'aks',
-  alibaba:   'alibabacloud'
-};
-
 export default class KontainerDriver extends HybridModel {
   get showCreate() {
     if ( HIDDEN.includes(this.driverName) ) {
@@ -57,22 +48,6 @@ export default class KontainerDriver extends HybridModel {
     return this.showCreate && IMPORTABLE.includes(this.driverName);
   }
 
-  get emberCreatePath() {
-    let driver = this.driverName;
-
-    if ( V2.includes(driver) && !driver.endsWith('v2') ) {
-      driver += 'v2';
-    }
-
-    return `/g/clusters/add/launch/${ driver }`;
-  }
-
-  get emberImportPath() {
-    const provider = DRIVER_TO_IMPORT[this.driverName] || this.driverName;
-
-    return `/g/clusters/add/launch/import?importProvider=${ provider }`;
-  }
-
   get driverName() {
     if (!this.spec.builtIn) {
       // if the driver is not built in, there's a good change its a custom one

package/models/monitoring.coreos.com.alertmanagerconfig.js

@@ -5,25 +5,39 @@ import { set } from '@shell/utils/object';
 
 export default class AlertmanagerConfig extends SteveModel {
   applyDefaults() {
-    if (this.spec) {
-      return this.spec;
-    }
-    const existingReceivers = this.spec?.route?.receivers || [];
-
-    const defaultSpec = {
-      receivers: [...existingReceivers],
-      route:     {
-        receivers:      this.spec?.route?.receivers || [],
-        groupBy:        this.spec?.route?.groupBy || [],
-        groupWait:      this.spec?.route?.groupWait || '30s',
-        groupInterval:  this.spec?.route?.groupInterval || '5m',
-        repeatInterval: this.spec?.route?.repeatInterval || '4h',
-        match:          this.spec?.route?.match || {},
-        matchRe:        this.spec?.route?.matchRe || {}
+    const spec = this.spec || {};
+
+    spec.receivers = spec.receivers || [];
+
+    // Always provide a route object so the Route tab has something to bind to,
+    // even when loading a resource that was saved without `spec.route`.
+    const route = { ...(spec.route || {}) };
+
+    route.groupBy = route.groupBy || [];
+    route.groupWait = route.groupWait || '30s';
+    route.groupInterval = route.groupInterval || '5m';
+    route.repeatInterval = route.repeatInterval || '4h';
+    route.matchers = route.matchers || [];
+
+    spec.route = route;
+
+    set(this, 'spec', spec);
+  }
+
+  cleanForSave(data, forNew) {
+    const val = super.cleanForSave(data, forNew);
+    const route = val?.spec?.route;
+
+    if (route) {
+      // When a route is present its `receiver` is required and must match an
+      // entry in `spec.receivers`. Until the user has defined a receiver the
+      // root route can't direct alerts anywhere, so drop it entirely
+      if (!route.receiver) {
+        delete val.spec.route;
       }
-    };
+    }
 
-    set(this, 'spec', defaultSpec);
+    return val;
   }
 
   get _availableActions() {

package/models/nodedriver.js

@@ -13,6 +13,13 @@ export default class NodeDriver extends Driver {
     return 'c-cluster-manager-driver-nodedriver';
   }
 
+  get parentLocationOverride() {
+    return {
+      name:   'c-cluster-manager-driver-nodedriver',
+      params: { cluster: this.$rootGetters['clusterId'] }
+    };
+  }
+
   get _availableActions() {
     const out = [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.12-rc.1",
+  "version": "3.0.12-rc.2",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -32,7 +32,6 @@
     "@aws-sdk/client-eks": "3.879.0",
     "@aws-sdk/client-iam": "3.863.0",
     "@aws-sdk/client-kms": "3.863.0",
-    "@smithy/fetch-http-handler": "5.1.1",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
@@ -40,6 +39,7 @@
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
     "@rancher/icons": "2.0.55",
+    "@smithy/fetch-http-handler": "5.1.1",
     "@types/is-url": "1.2.30",
     "@types/node": "25.3.3",
     "@types/semver": "^7.5.8",
@@ -52,19 +52,19 @@
     "@vue/vue3-jest": "27.0.0",
     "add": "2.0.6",
     "ansi_up": "5.0.0",
+    "axios": "1.15.0",
     "axios-retry": "3.1.9",
-    "axios": "1.13.5",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "5.0.2",
     "babel-preset-vue": "2.0.2",
     "cache-loader": "4.1.0",
     "chart.js": "4.5.1",
     "clipboard-polyfill": "4.0.1",
-    "codemirror-editor-vue3": "2.8.0",
     "codemirror": ">=5.64.0 <6",
+    "codemirror-editor-vue3": "2.8.0",
     "color": "5.0.3",
-    "cookie-universal": "2.2.2",
     "cookie": "0.7.0",
+    "cookie-universal": "2.2.2",
     "core-js": "3.48.0",
     "cron-validator": "1.4.0",
     "cronstrue": "3.9.0",
@@ -73,13 +73,14 @@
     "csv-loader": "3.0.3",
     "custom-event-polyfill": "^1.0.7",
     "cypress": "11.1.0",
-    "d3-selection": "3.0.0",
     "d3": "7.3.0",
+    "d3-selection": "3.0.0",
     "dayjs": "1.11.18",
     "diff2html": "3.4.24",
     "dompurify": "3.2.5",
     "element-matches": "^0.1.2",
     "entities": "4.5.0",
+    "eslint": "7.32.0",
     "eslint-config-standard": "16.0.3",
     "eslint-import-resolver-node": "0.3.9",
     "eslint-module-utils": "2.6.1",
@@ -88,7 +89,6 @@
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-n": "15.2.0",
     "eslint-plugin-vue": "9.32.0",
-    "eslint": "7.32.0",
     "event-target-shim": "5.0.1",
     "express": "4.17.1",
     "file-saver": "2.0.2",
@@ -99,13 +99,13 @@
     "intl-messageformat": "7.8.4",
     "ip": "2.0.1",
     "is-url": "1.2.4",
+    "jest": "27.5.1",
     "jest-serializer-vue": "2.0.2",
     "jexl": "2.3.0",
-    "jest": "27.5.1",
     "jquery": "3.5.1",
     "js-cookie": "3.0.5",
-    "js-yaml-loader": "1.2.2",
     "js-yaml": "4.1.1",
+    "js-yaml-loader": "1.2.2",
     "jsdiff": "1.1.1",
     "jsonpath-plus": "10.3.0",
     "jsrsasign": "11.1.1",
@@ -117,8 +117,8 @@
     "nyc": "17.1.0",
     "papaparse": "5.3.0",
     "portal-vue": "~3.0.0",
-    "sass-loader": "12.6.0",
     "sass": "1.97.3",
+    "sass-loader": "12.6.0",
     "serve-static": "1.14.1",
     "set-cookie-parser": "2.4.6",
     "shell-quote": "1.7.3",
@@ -130,10 +130,11 @@
     "ufo": "0.7.11",
     "unfetch": "4.2.0",
     "url-parse": "1.5.10",
+    "vee-validate": "^4.15.1",
+    "vue": "3.5.29",
     "vue-router": "4.6.4",
     "vue-select": "4.0.0-beta.6",
     "vue-server-renderer": "2.7.16",
-    "vue": "3.5.29",
     "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
     "vuedraggable": "4.1.0",
@@ -141,12 +142,12 @@
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-virtual-modules": "0.6.2",
     "worker-loader": "3.0.8",
+    "xterm": "5.2.1",
     "xterm-addon-canvas": "0.5.0",
     "xterm-addon-fit": "0.8.0",
     "xterm-addon-search": "0.13.0",
     "xterm-addon-web-links": "0.9.0",
     "xterm-addon-webgl": "0.16.0",
-    "xterm": "5.2.1",
     "yarn": "1.22.22"
   },
   "resolutions": {