@rancher/shell 0.3.16 → 0.3.18

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

@@ -15,8 +15,10 @@ export const KONTAINER_TO_DRIVER = {
   huaweicontainercloudengine:       'huaweicce', // Does this actually exist?
   huaweiengine:                     'huaweicce',
   linodekubernetesengine:           'linodelke', // Does this actually exist?
+  lke:                              'linodelke',
   lkeengine:                        'linodelke',
   okeengine:                        'oracleoke',
+  oke:                              'oracleoke',
   oraclecontainerengine:            'oracleoke', // Does this actually exist?
   rke2:                             'rke2',
   tencentengine:                    'tencenttke',
@@ -63,6 +65,18 @@ export default class KontainerDriver extends HybridModel {
   }
 
   get driverName() {
+    if (!this.spec.builtIn) {
+      // if the driver is not built in, there's a good change its a custom one
+      // custom drivers have a random id, so shouldn't be used as the type
+      // instead use the status.displayName. this will map to the name extracted from the binary
+      const driverName = this.status?.displayName?.toLowerCase();
+
+      if (driverName) {
+        // some drivers are built in but don't have the builtIn flag. ensure we pass these through K_TO_D
+        return KONTAINER_TO_DRIVER[driverName] || driverName;
+      }
+    }
+
     return KONTAINER_TO_DRIVER[this.id] || this.id;
   }
 }

package/models/persistentvolume.js

@@ -1,116 +1,7 @@
-import { PVC } from '@shell/config/types';
+import { PVC, LONGHORN_DRIVER } from '@shell/config/types';
+import { VOLUME_PLUGINS } from '@shell/config/persistentVolume';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
-export const VOLUME_PLUGINS = [
-  {
-    labelKey:  'persistentVolume.awsElasticBlockStore.label',
-    value:     'awsElasticBlockStore',
-    supported: true
-  },
-  {
-    labelKey:  'persistentVolume.azureDisk.label',
-    value:     'azureDisk',
-    supported: true
-  },
-  {
-    labelKey:  'persistentVolume.azureFile.label',
-    value:     'azureFile',
-    supported: true
-  },
-  {
-    labelKey: 'persistentVolume.cephfs.label',
-    value:    'cephfs',
-  },
-  {
-    labelKey: 'persistentVolume.rbd.label',
-    value:    'rbd',
-  },
-  {
-    labelKey: 'persistentVolume.csi.label',
-    value:    'csi',
-  },
-  {
-    labelKey: 'persistentVolume.fc.label',
-    value:    'fc',
-  },
-  {
-    labelKey: 'persistentVolume.flexVolume.label',
-    value:    'flexVolume',
-  },
-  {
-    labelKey: 'persistentVolume.flocker.label',
-    value:    'flocker',
-  },
-  {
-    labelKey: 'persistentVolume.glusterfs.label',
-    value:    'glusterfs',
-  },
-  {
-    labelKey:  'persistentVolume.gcePersistentDisk.label',
-    value:     'gcePersistentDisk',
-    supported: true
-  },
-  {
-    labelKey:  'persistentVolume.hostPath.label',
-    value:     'hostPath',
-    supported: true
-  },
-  {
-    labelKey: 'persistentVolume.iscsi.label',
-    value:    'iscsi',
-  },
-  {
-    labelKey:  'persistentVolume.local.label',
-    value:     'local',
-    supported: true
-  },
-  {
-    labelKey:  'persistentVolume.longhorn.label',
-    value:     'longhorn',
-    supported: true
-  },
-  {
-    labelKey:  'persistentVolume.nfs.label',
-    value:     'nfs',
-    supported: true
-  },
-  {
-    labelKey: 'persistentVolume.cinder.label',
-    value:    'cinder',
-  },
-  {
-    labelKey: 'persistentVolume.photonPersistentDisk.label',
-    value:    'photonPersistentDisk',
-  },
-  {
-    labelKey: 'persistentVolume.portworxVolume.label',
-    value:    'portworxVolume',
-  },
-
-  {
-    labelKey: 'persistentVolume.quobyte.label',
-    value:    'quobyte',
-  },
-
-  {
-    labelKey: 'persistentVolume.scaleIO.label',
-    value:    'scaleIO',
-  },
-  {
-    labelKey: 'persistentVolume.storageos.label',
-    value:    'storageos',
-  },
-  {
-    labelKey:  'persistentVolume.vsphereVolume.label',
-    value:     'vsphereVolume',
-    supported: true
-  },
-];
-
-export const LONGHORN_DRIVER = 'driver.longhorn.io';
-
-export const LONGHORN_PLUGIN = VOLUME_PLUGINS.find((plugin) => plugin.value === 'longhorn');
-
 export default class PV extends SteveModel {
   // plugin display value table
   get source() {

package/models/pod.js

@@ -15,6 +15,36 @@ export const WORKLOAD_PRIORITY = {
 };
 
 export default class Pod extends WorkloadService {
+  _os = undefined;
+
+  get inStore() {
+    return this.$rootGetters['currentProduct'].inStore;
+  }
+
+  set os(operatingSystem) {
+    this._os = operatingSystem;
+  }
+
+  get os() {
+    if (this._os) {
+      return this._os;
+    }
+
+    return this?.node?.status?.nodeInfo?.operatingSystem;
+  }
+
+  get node() {
+    try {
+      const schema = this.$store.getters[`cluster/schemaFor`](NODE);
+
+      if (schema) {
+        this.$dispatch(`find`, { type: NODE, id: this.spec.nodeName });
+      }
+    } catch {}
+
+    return this.$getters['byId'](NODE, this.spec.nodeName);
+  }
+
   get _availableActions() {
     const out = super._availableActions;
 

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

@@ -9,10 +9,11 @@ import { ucFirst } from '@shell/utils/string';
 import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { CAPI as CAPI_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 /**
  * Class representing Cluster resource.
- * @extends SteveModal
+ * @extends SteveModel
  */
 export default class ProvCluster extends SteveModel {
   get details() {
@@ -381,6 +382,13 @@ export default class ProvCluster extends SteveModel {
   }
 
   get machineProvider() {
+    // First check annotation - useful for clusters created by extension providers
+    const fromAnnotation = this.annotations?.[CAPI_ANNOTATIONS.UI_CUSTOM_PROVIDER];
+
+    if (fromAnnotation) {
+      return fromAnnotation;
+    }
+
     if (this.isHarvester) {
       return HARVESTER;
     } else if ( this.isImported ) {

package/models/rke.cattle.io.etcdsnapshot.js

@@ -5,17 +5,20 @@ import { findBy } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
 import { base64Decode } from '@shell/utils/crypto';
 import { ucFirst } from '@shell/utils/string';
+import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 
 export default class EtcdBackup extends NormanModel {
   /**
    * Restrict actions for snapshots to restore only
    */
   get _availableActions() {
+    const enabled = this.snapshotFile?.status === STATES_ENUM.SUCCESSFUL;
+
     return [{
-      action:  'promptRestore',
-      enabled: true,
-      icon:    'icon icon-fw icon-backup-restore',
-      label:   'Restore'
+      action: 'promptRestore',
+      enabled,
+      icon:   'icon icon-fw icon-backup-restore',
+      label:  'Restore'
     }];
   }
 
@@ -48,7 +51,7 @@ export default class EtcdBackup extends NormanModel {
   }
 
   get errorMessage() {
-    const inError = get(this, 'snapshotFile.status') === 'failed';
+    const inError = get(this, 'snapshotFile.status') === STATES_ENUM.FAILED;
 
     if (inError) {
       return base64Decode(this.snapshotFile?.message);
@@ -59,10 +62,10 @@ export default class EtcdBackup extends NormanModel {
 
   get stateDescription() {
     const trans = this.stateObj?.transitioning || false;
-    const error = this.stateObj?.error || this.snapshotFile?.status === 'failed' || false;
+    const error = this.stateObj?.error || this.snapshotFile?.status === STATES_ENUM.FAILED || false;
     const message = this.stateObj?.message;
 
-    const fileMessage = this.snapshotFile?.status === 'failed' ? base64Decode(this.snapshotFile?.message) : null;
+    const fileMessage = this.snapshotFile?.status === STATES_ENUM.FAILED ? base64Decode(this.snapshotFile?.message) : null;
 
     return trans || error ? fileMessage || ucFirst(message) : '';
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -69,7 +69,7 @@
     "d3-selection": "1.4.1",
     "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
-    "diff2html": "2.11.2",
+    "diff2html": "3.4.24",
     "dompurify": "2.4.5",
     "eslint": "7.32.0",
     "eslint-config-standard": "16.0.3",

package/pages/about.vue

@@ -6,6 +6,7 @@ import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { getVendor } from '@shell/config/private-label';
 import { downloadFile } from '@shell/utils/download';
+import { mapGetters } from 'vuex';
 
 export default {
   layout:     'plain',
@@ -22,6 +23,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['releaseNotesUrl']),
     rancherVersion() {
       return this.settings.find((s) => s.id === SETTING.VERSION_RANCHER);
     },
@@ -168,9 +170,13 @@ export default {
       </tr>
     </table>
     <p class="pt-20">
-      <nuxt-link :to="{ path: 'docs/whats-new'}">
+      <a
+        :href="releaseNotesUrl"
+        target="_blank"
+        rel="nofollow noopener noreferrer"
+      >
         {{ t('about.versions.releaseNotes') }}
-      </nuxt-link>
+      </a>
     </p>
     <template v-if="downloadImageList.length">
       <h3 class="pt-40">

package/pages/auth/login.vue

@@ -544,7 +544,7 @@ export default {
 
   .gutless {
     height: 100vh;
-    .span-6 {
+    & > .span-6 {
       overflow-y: auto;
       display: flex;
       flex-direction: column;

package/pages/auth/logout.vue

@@ -11,8 +11,16 @@ export default {
 
 <template>
   <main class="main-layout">
-    <h1 class="text-center mt-50">
-      Logging Out&hellip;
-    </h1>
+    <div>
+      <h1 v-t="'logout.message'" />
+    </div>
   </main>
 </template>
+<style lang="scss" scoped>
+  main > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100vh;
+  }
+</style>

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

@@ -242,7 +242,7 @@ export default {
   },
 
   created() {
-    const release = this.currentCluster?.status?.version.gitVersion || '';
+    const release = this.currentCluster?.status?.version?.gitVersion || '';
     const isRKE2 = release.includes('rke2');
     const version = release.match(/\d+/g);
 
@@ -352,7 +352,10 @@ export default {
   <div v-else>
     <header>
       <div class="title">
-        <h1 class="m-0">
+        <h1
+          data-testid="charts-header-title"
+          class="m-0"
+        >
           {{ t('catalog.charts.header') }}
         </h1>
       </div>

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

@@ -1251,6 +1251,10 @@ export default {
       this.steps[0].ready = okRequires && okChart;
     },
 
+    updateStepTwoReady(update) {
+      this.updateStep('helmValues', { ready: update });
+    },
+
     getOptionLabel(opt) {
       return opt?.chartNameDisplay;
     },
@@ -1567,6 +1571,7 @@ export default {
                   @warn="e=>errors.push(e)"
                   @register-before-hook="registerBeforeHook"
                   @register-after-hook="registerAfterHook"
+                  @valid="updateStepTwoReady($event)"
                 />
               </Tabbed>
               <template v-else>

package/pages/c/_cluster/auth/group.principal/assign-edit.vue

@@ -6,7 +6,7 @@ import { NORMAN } from '@shell/config/types';
 import { _VIEW, _EDIT } from '@shell/config/query-params';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { NAME } from '@shell/config/product/auth';
-import { BLANK_CLUSTER } from '@shell/store';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export default {
   components: {

package/pages/c/_cluster/auth/roles/index.vue

@@ -6,7 +6,7 @@ import ResourceTable from '@shell/components/ResourceTable';
 import Loading from '@shell/components/Loading';
 import { SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { NAME } from '@shell/config/product/auth';
-import { BLANK_CLUSTER } from '@shell/store';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;

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

@@ -27,7 +27,7 @@ import {
   STATE,
 } from '@shell/config/table-headers';
 
-import { mapPref, CLUSTER_TOOLS_TIP, PSP_DEPRECATION_BANNER } from '@shell/store/prefs';
+import { mapPref, PSP_DEPRECATION_BANNER } from '@shell/store/prefs';
 import { haveV1Monitoring, monitoringStatus } from '@shell/utils/monitoring';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -103,7 +103,7 @@ export default {
         `Determine etcd metrics`
       );
 
-      if (this.currentCluster.isLocal) {
+      if (this.currentCluster.isLocal && this.$store.getters['management/schemaFor'](MANAGEMENT.NODE)) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
       }
     }
@@ -173,7 +173,6 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
     },
 
-    hideClusterToolsTip:      mapPref(CLUSTER_TOOLS_TIP),
     hidePspDeprecationBanner: mapPref(PSP_DEPRECATION_BANNER),
 
     hasV1Monitoring() {
@@ -441,14 +440,6 @@ export default {
         :raw="true"
       />
     </Banner>
-    <Banner
-      v-if="!hideClusterToolsTip"
-      :closable="true"
-      class="cluster-tools-tip"
-      color="info"
-      label-key="cluster.toolsTip"
-      @close="hideClusterToolsTip = true"
-    />
     <div
       class="cluster-dashboard-glance"
     >

package/pages/c/_cluster/manager/cloudCredential/_id.vue

@@ -9,7 +9,6 @@ export default {
 
 <template>
   <ResourceDetail
-    store-override="rancher"
     resource-override="cloudcredential"
     parent-route-override="c-cluster-manager-cloudCredential"
   />

package/pages/c/_cluster/manager/cloudCredential/create.vue

@@ -9,7 +9,6 @@ export default {
 
 <template>
   <ResourceDetail
-    store-override="rancher"
     resource-override="cloudcredential"
     parent-route-override="c-cluster-manager-cloudCredential"
   />

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

@@ -4,7 +4,7 @@ import ColorInput from '@shell/components/form/ColorInput';
 import TypeDescription from '@shell/components/TypeDescription';
 
 import { Checkbox } from '@components/Form/Checkbox';
-import FileSelector from '@shell/components/form/FileSelector';
+import FileImageSelector from '@shell/components/form/FileImageSelector';
 import SimpleBox from '@shell/components/SimpleBox';
 import Loading from '@shell/components/Loading';
 import AsyncButton from '@shell/components/AsyncButton';
@@ -23,7 +23,7 @@ export default {
   layout: 'authenticated',
 
   components: {
-    LabeledInput, Checkbox, FileSelector, Loading, SimpleBox, AsyncButton, Banner, ColorInput, TypeDescription
+    LabeledInput, Checkbox, FileImageSelector, Loading, SimpleBox, AsyncButton, Banner, ColorInput, TypeDescription
   },
 
   async fetch() {
@@ -222,14 +222,15 @@ export default {
       >
         <div class="col logo-container span-6">
           <div class="mb-10">
-            <FileSelector
+            <FileImageSelector
               :byte-limit="20000"
               :read-as-data-url="true"
               class="role-secondary"
               :label="t('branding.logos.uploadLight')"
               :mode="mode"
+              accept="image/jpeg,image/png,image/svg+xml"
               @error="setError"
-              @selected="updateLogo($event, 'uiLogoLight')"
+              @input="updateLogo($event, 'uiLogoLight')"
             />
           </div>
           <SimpleBox
@@ -245,14 +246,15 @@ export default {
         </div>
         <div class="col logo-container span-6">
           <div class="mb-10">
-            <FileSelector
+            <FileImageSelector
               :byte-limit="20000"
               :read-as-data-url="true"
               class="role-secondary"
               :label="t('branding.logos.uploadDark')"
               :mode="mode"
+              accept="image/jpeg,image/png,image/svg+xml"
               @error="setError"
-              @selected="updateLogo($event, 'uiLogoDark')"
+              @input="updateLogo($event, 'uiLogoDark')"
             />
           </div>
           <SimpleBox
@@ -289,14 +291,15 @@ export default {
       >
         <div class="col logo-container span-12">
           <div class="mb-10">
-            <FileSelector
+            <FileImageSelector
               :byte-limit="20000"
               :read-as-data-url="true"
               class="role-secondary"
               :label="t('branding.favicon.upload')"
               :mode="mode"
+              accept="image/jpeg,image/png,image/svg+xml"
               @error="setError"
-              @selected="updateLogo($event, 'uiFavicon')"
+              @input="updateLogo($event, 'uiFavicon')"
             />
           </div>
           <SimpleBox v-if="uiFavicon">