@rancher/shell 0.3.17 → 0.3.18

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

@@ -1,14 +1,16 @@
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
-import { escapeHtml } from '@shell/utils/string';
+import { escapeHtml, randomStr } from '@shell/utils/string';
 import { FLEET } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addObject, addObjects, findBy, insertAt } from '@shell/utils/array';
 import { set } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { STATES_ENUM, colorForState, stateDisplay, stateSort } from '@shell/plugins/dashboard-store/resource-class';
+import { NAME } from '@shell/config/product/explorer';
 
 function quacksLikeAHash(str) {
-  if ( str.match(/^[a-f0-9]{40,}$/i) ) {
+  if (str.match(/^[a-f0-9]{40,}$/i)) {
     return true;
   }
 
@@ -24,7 +26,7 @@ export default class GitRepo extends SteveModel {
 
     spec.repo = spec.repo || '';
 
-    if ( !spec.branch && !spec.revision ) {
+    if (!spec.branch && !spec.revision) {
       spec.branch = 'master';
     }
 
@@ -86,7 +88,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get state() {
-    if ( this.spec?.paused === true ) {
+    if (this.spec?.paused === true) {
       return 'paused';
     }
 
@@ -98,10 +100,10 @@ export default class GitRepo extends SteveModel {
     const clusters = workspace?.clusters || [];
     const groups = workspace?.clusterGroups || [];
 
-    if ( workspace?.id === 'fleet-local' ) {
+    if (workspace?.id === 'fleet-local') {
       const local = findBy(groups, 'id', 'fleet-local/default');
 
-      if ( local ) {
+      if (local) {
         return local.targetClusters;
       }
 
@@ -114,30 +116,30 @@ export default class GitRepo extends SteveModel {
 
     const out = [];
 
-    for ( const tgt of this.spec.targets ) {
-      if ( tgt.clusterName ) {
+    for (const tgt of this.spec.targets) {
+      if (tgt.clusterName) {
         const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
 
-        if ( cluster ) {
+        if (cluster) {
           addObject(out, cluster);
         }
-      } else if ( tgt.clusterGroup ) {
+      } else if (tgt.clusterGroup) {
         const group = findBy(groups, {
           'metadata.namespace': this.metadata.namespace,
           'metadata.name':      tgt.clusterGroup,
         });
 
-        if ( group ) {
+        if (group) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterGroupSelector ) {
+      } else if (tgt.clusterGroupSelector) {
         const expressions = convertSelectorObj(tgt.clusterGroupSelector);
         const matchingGroups = matching(groups, expressions);
 
-        for ( const group of matchingGroups ) {
+        for (const group of matchingGroups) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterSelector ) {
+      } else if (tgt.clusterSelector) {
         const expressions = convertSelectorObj(tgt.clusterSelector);
         const matchingClusters = matching(clusters, expressions);
 
@@ -151,7 +153,7 @@ export default class GitRepo extends SteveModel {
   get github() {
     const match = this.spec.repo.match(/^https?:\/\/github\.com\/(.*?)(\.git)?\/*$/);
 
-    if ( match ) {
+    if (match) {
       return match[1];
     }
 
@@ -159,7 +161,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get repoIcon() {
-    if ( this.github ) {
+    if (this.github) {
       return 'icon icon-github';
     }
 
@@ -173,7 +175,7 @@ export default class GitRepo extends SteveModel {
     repo = repo.replace(/^https:\/\//, '');
     repo = repo.replace(/\/+$/, '');
 
-    if ( this.github ) {
+    if (this.github) {
       return this.github;
     }
 
@@ -184,15 +186,15 @@ export default class GitRepo extends SteveModel {
     const spec = this.spec;
     const hash = this.status?.commit?.substr(0, 7);
 
-    if ( !spec || !spec.repo ) {
+    if (!spec || !spec.repo) {
       return null;
     }
 
-    if ( spec.revision && quacksLikeAHash(spec.revision) ) {
+    if (spec.revision && quacksLikeAHash(spec.revision)) {
       return spec.revision.substr(0, 7);
-    } else if ( spec.revision ) {
+    } else if (spec.revision) {
       return spec.revision;
-    } else if ( spec.branch ) {
+    } else if (spec.branch) {
       return spec.branch + (hash ? ` @ ${ hash }` : '');
     }
 
@@ -220,7 +222,7 @@ export default class GitRepo extends SteveModel {
 
     advanced = jsyaml.dump(targets);
 
-    if ( advanced === '[]\n' ) {
+    if (advanced === '[]\n') {
       advanced = `# - name:
 #  clusterSelector:
 #    matchLabels:
@@ -240,39 +242,39 @@ export default class GitRepo extends SteveModel {
 `;
     }
 
-    if ( this.metadata.namespace === 'fleet-local' ) {
+    if (this.metadata.namespace === 'fleet-local') {
       mode = 'local';
-    } else if ( !targets.length ) {
+    } else if (!targets.length) {
       mode = 'none';
-    } else if ( targets.length === 1) {
+    } else if (targets.length === 1) {
       const target = targets[0];
 
       if (Object.keys(target).length > 1) {
         // There are multiple properties in a single target, so use the 'advanced' mode
         // (otherwise any existing content is nuked for what we provide)
         mode = 'advanced';
-      } else if ( target.clusterGroup ) {
+      } else if (target.clusterGroup) {
         clusterGroup = target.clusterGroup;
 
-        if ( !mode ) {
+        if (!mode) {
           mode = 'clusterGroup';
         }
-      } else if ( target.clusterName ) {
+      } else if (target.clusterName) {
         mode = 'cluster';
         cluster = target.clusterName;
-      } else if ( target.clusterSelector ) {
-        if ( Object.keys(target.clusterSelector).length === 0 ) {
+      } else if (target.clusterSelector) {
+        if (Object.keys(target.clusterSelector).length === 0) {
           mode = 'all';
         } else {
           const expressions = convert(target.clusterSelector.matchLabels, target.clusterSelector.matchExpressions);
 
-          if ( expressions.length === 1 &&
-              expressions[0].key === FLEET_ANNOTATIONS.CLUSTER_NAME &&
-              expressions[0].operator === 'In' &&
-              expressions[0].values.length === 1
+          if (expressions.length === 1 &&
+            expressions[0].key === FLEET_ANNOTATIONS.CLUSTER_NAME &&
+            expressions[0].operator === 'In' &&
+            expressions[0].values.length === 1
           ) {
             cluster = expressions[0].values[0];
-            if ( !mode ) {
+            if (!mode) {
               mode = 'cluster';
             }
           }
@@ -280,7 +282,7 @@ export default class GitRepo extends SteveModel {
       }
     }
 
-    if ( !mode ) {
+    if (!mode) {
       mode = 'advanced';
     }
 
@@ -296,7 +298,7 @@ export default class GitRepo extends SteveModel {
   get groupByLabel() {
     const name = this.metadata.namespace;
 
-    if ( name ) {
+    if (name) {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.workspace', { name: escapeHtml(name) });
     } else {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAWorkspace');
@@ -306,7 +308,7 @@ export default class GitRepo extends SteveModel {
   get bundles() {
     const all = this.$getters['all'](FLEET.BUNDLE);
 
-    return all.filter((bundle) => bundle.name.startsWith(`${ this.name }-`) &&
+    return all.filter((bundle) => bundle.repoName === this.name &&
       bundle.namespace === this.namespace &&
       bundle.namespacedName.startsWith(`${ this.namespace }:${ this.name }`));
   }
@@ -325,6 +327,78 @@ export default class GitRepo extends SteveModel {
     return bds.filter((bd) => bd.metadata?.labels?.['fleet.cattle.io/repo-name'] === this.name);
   }
 
+  get resourcesStatuses() {
+    const clusters = this.targetClusters || [];
+    const resources = this.status?.resources || [];
+    const conditions = this.status?.conditions || [];
+
+    const out = [];
+
+    for (const c of clusters) {
+      const clusterBundleDeploymentResources = this.bundleDeployments
+        .find((bd) => bd.metadata?.labels?.[FLEET_ANNOTATIONS.CLUSTER] === c.metadata.name)
+        ?.status?.resources || [];
+
+      resources.forEach((r, i) => {
+        let namespacedName = r.name;
+
+        if (r.namespace) {
+          namespacedName = `${ r.namespace }:${ r.name }`;
+        }
+
+        let state = r.state;
+        const perEntry = r.perClusterState?.find((x) => x.clusterId === c.id);
+        const tooMany = r.perClusterState?.length >= 10 || false;
+
+        if (perEntry) {
+          state = perEntry.state;
+        } else if (tooMany) {
+          state = STATES_ENUM.UNKNOWN;
+        } else {
+          state = STATES_ENUM.READY;
+        }
+
+        const color = colorForState(state).replace('text-', 'bg-');
+        const display = stateDisplay(state);
+
+        const detailLocation = {
+          name:   `c-cluster-product-resource${ r.namespace ? '-namespace' : '' }-id`,
+          params: {
+            product:   NAME,
+            cluster:   c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
+            resource:  r.type,
+            namespace: r.namespace,
+            id:        r.name,
+          }
+        };
+
+        out.push({
+          key:                    `${ r.id }-${ c.id }-${ r.type }-${ r.namespace }-${ r.name }`,
+          tableKey:               `${ r.id }-${ c.id }-${ r.type }-${ r.namespace }-${ r.name }-${ randomStr(8) }`,
+          kind:                   r.kind,
+          apiVersion:             r.apiVersion,
+          type:                   r.type,
+          id:                     r.id,
+          namespace:              r.namespace,
+          name:                   r.name,
+          clusterId:              c.id,
+          clusterName:            c.nameDisplay,
+          state,
+          stateBackground:        color,
+          stateDisplay:           display,
+          stateSort:              stateSort(color, display),
+          namespacedName,
+          detailLocation,
+          conditions:             conditions[i],
+          bundleDeploymentStatus: clusterBundleDeploymentResources?.[i],
+          creationTimestamp:      clusterBundleDeploymentResources?.[i]?.createdAt
+        });
+      });
+    }
+
+    return out;
+  }
+
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }

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/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.17",
+  "version": "0.3.18",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

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

@@ -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 });
       }
     }

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">