@rancher/shell 0.5.2 → 1.2.0

package/models/__tests__/management.cattle.io.node.ts

@@ -93,89 +93,4 @@ describe('class MgmtNode', () => {
       resetMocks();
     });
   });
-
-  describe('canScaleDown', () => {
-    const mgmtClusterId = 'test';
-    const nodeId = 'test/id';
-    const specs = {
-      worker: {
-        worker: true, etcd: false, controlPlane: false
-      },
-      etcd: {
-        worker: false, etcd: true, controlPlane: false
-      },
-      controlPlane: {
-        worker: false, etcd: false, controlPlane: true
-      },
-      etcdAndControlPlane: {
-        worker: false, etcd: true, controlPlane: true
-      },
-      all: {
-        worker: true, etcd: true, controlPlane: true
-      }
-    };
-
-    const workerNode = {
-      id:             '01',
-      isWorker:       true,
-      isControlPlane: false,
-      isEtcd:         false
-    };
-    const etcdNode = {
-      id:             '02',
-      isWorker:       false,
-      isControlPlane: false,
-      isEtcd:         true
-    };
-    const controlPlaneNode = {
-      id:             '03',
-      isWorker:       false,
-      isControlPlane: true,
-      isEtcd:         false
-    };
-    const etcdAndControlPlaneNode = {
-      id:             '03',
-      isWorker:       false,
-      isControlPlane: true,
-      isEtcd:         true
-    };
-    const allNode = {
-      id:             '04',
-      isWorker:       true,
-      isControlPlane: true,
-      isEtcd:         true
-    };
-
-    const baseCtx = {
-      rootGetters: {
-        'rancher/byId': () => ({ actions: { scaledown: 'scaledown' } }),
-        'i18n/t':       t
-      }
-    };
-
-    it.each([
-      [{ spec: specs.worker, nodes: [workerNode] }, true],
-      [{ spec: specs.etcd, nodes: [etcdNode, etcdNode, controlPlaneNode] }, true],
-      [{ spec: specs.etcdAndControlPlane, nodes: [etcdAndControlPlaneNode, etcdAndControlPlaneNode] }, true],
-      [{ spec: specs.etcdAndControlPlane, nodes: [etcdAndControlPlaneNode] }, false],
-      [{ spec: specs.all, nodes: [allNode] }, false],
-      [{ spec: specs.all, nodes: [allNode, allNode] }, true],
-    ])('should return canScaleDown properly', (data, expected) => {
-      const { spec, nodes } = data;
-      const mgmtNode = new MgmtNode({
-        spec,
-        id: nodeId
-      }, {
-        ...baseCtx,
-        getters: {
-          all: () => [{
-            mgmtClusterId,
-            nodes
-          }]
-        }
-      });
-
-      expect(mgmtNode.canScaleDown).toStrictEqual(expected);
-    });
-  });
 });

package/models/__tests__/namespace.test.ts

@@ -1,48 +1,11 @@
 import Namespace from '@shell/models/namespace';
-import { SYSTEM_NAMESPACE } from '@shell/config/labels-annotations';
-import SYSTEM_NAMESPACES from '@shell/config/system-namespaces';
 
 describe('class Namespace', () => {
   describe('checking if isSystem', () => {
     it.each([
-      ['whatever1', SYSTEM_NAMESPACE, true],
-      ['whatever2', 'any-annotation', false],
-      ['whatever3', '', false]
-    ])('should return true if it has the correct annotation', (name, annotation, expectation) => {
-      const namespace = new Namespace({});
-
-      namespace.metadata = { ...namespace.metadata, name };
-
-      if (annotation) {
-        namespace.metadata.annotations = { [annotation]: 'true' };
-      }
-
-      expect(namespace.isSystem).toBe(expectation);
-    });
-
-    const assertionsArr = [];
-
-    SYSTEM_NAMESPACES.forEach((ns) => {
-      assertionsArr.push([ns, true]);
-    });
-
-    assertionsArr.push(['c-whatever-system', false]);
-    assertionsArr.push(['cattle-whatever', false]);
-    assertionsArr.push(['', false]);
-
-    it.each(assertionsArr)('should return true if it belongs to the curated list of namespaces', (name, expectation) => {
-      const namespace = new Namespace({});
-
-      namespace.metadata = { ...namespace.metadata, name };
-
-      expect(namespace.isSystem).toBe(expectation);
-    });
-
-    it.each([
-      ['cattle-c-whatever-system', true],
-      ['cattle-whatever', false],
-      ['c-whatever-system', false]
-    ])('should return true if starts with "cattle-" end with "-system', (name, expectation) => {
+      ['c-whatever-system', true],
+      ['whatever', false]
+    ])('should return true if end with "-system', (name, expectation) => {
       const namespace = new Namespace({});
 
       namespace.metadata = { ...namespace.metadata, name };
@@ -55,21 +18,18 @@ describe('class Namespace', () => {
 
   describe('checking if isObscure', () => {
     it.each([
-      ['c-whatever-system', 'management.cattle.io/system-namespace', true],
-      ['p-whatever', SYSTEM_NAMESPACE, true],
-      ['p-whatever', '', false],
-      ['', '', false]
-    ])('should return a value if is system AND has the correct prefix', (name, annotation, expectation) => {
+      ['c-whatever-system', true],
+      ['whatever', false],
+      ['', false]
+    ])('should return a value if has or not a name in the metadata', (name, expectation) => {
       const namespace = new Namespace({});
 
       namespace.metadata = { ...namespace.metadata, name };
 
-      if (annotation) {
-        namespace.metadata.annotations = { [annotation]: 'true' };
-      }
-
       expect(namespace.isObscure).toBe(expectation);
     });
+
+    it.todo('should return a value if is or not system');
   });
 
   it.each([

package/models/cluster/node.js

@@ -187,7 +187,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get cpuCapacity() {
-    return parseSi(this.status.allocatable?.cpu);
+    return parseSi(this.status.allocatable.cpu);
   }
 
   get cpuUsagePercentage() {
@@ -203,7 +203,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get ramCapacity() {
-    return parseSi(this.status.capacity?.memory);
+    return parseSi(this.status.capacity.memory);
   }
 
   get ramUsagePercentage() {
@@ -219,7 +219,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podUsage() {
-    return calculatePercentage(this.status.allocatable?.pods, this.status.capacity?.pods);
+    return calculatePercentage(this.status.allocatable.pods, this.status.capacity.pods);
   }
 
   get podConsumedUsage() {
@@ -227,7 +227,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podCapacity() {
-    return Number.parseInt(this.status.capacity?.pods);
+    return Number.parseInt(this.status.capacity.pods);
   }
 
   get podConsumed() {

package/models/cluster.x-k8s.io.machine.js

@@ -231,7 +231,7 @@ export default class CapiMachine extends SteveModel {
       return false;
     }
 
-    return notOnlyOfRole(this, this.cluster?.machines);
+    return notOnlyOfRole(this, this.cluster.machines);
   }
 
   get roles() {

package/models/cluster.x-k8s.io.machinedeployment.js

@@ -7,7 +7,6 @@ import { handleConflict } from '@shell/plugins/dashboard-store/normalize';
 import { MACHINE_ROLES } from '@shell/config/labels-annotations';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 import { KIND } from '../config/elemental-types';
-import { KIND as HARVESTER_KIND } from '../config/harvester-manager-types';
 
 export default class CapiMachineDeployment extends SteveModel {
   get cluster() {
@@ -70,19 +69,6 @@ export default class CapiMachineDeployment extends SteveModel {
     return this.template?.providerSize || this.t('node.list.poolDescription.noSize');
   }
 
-  get providerSummary() {
-    if (this.template) {
-      switch (this.infrastructureRefKind) {
-      case HARVESTER_KIND.MACHINE_TEMPLATE:
-        return null;
-      default:
-        return `${ this.providerDisplay } \u2013  ${ this.providerLocation } / ${ this.providerSize } (${ this.providerName })`;
-      }
-    }
-
-    return null;
-  }
-
   get desired() {
     return this.spec?.replicas || 0;
   }

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

@@ -107,10 +107,6 @@ export default class FleetCluster extends SteveModel {
     return this.metadata?.labels?.[FLEET_LABELS.CLUSTER_DISPLAY_NAME] || this.metadata?.name || this.id;
   }
 
-  get name() {
-    return this.metadata?.name || this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME];
-  }
-
   get state() {
     if (this.spec?.paused === true) {
       return 'paused';

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

@@ -7,9 +7,7 @@ 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, mapStateToEnum, primaryDisplayStatusFromCount, stateDisplay, stateSort
-} from '@shell/plugins/dashboard-store/resource-class';
+import { STATES_ENUM, colorForState, stateDisplay, stateSort } from '@shell/plugins/dashboard-store/resource-class';
 import { NAME } from '@shell/config/product/explorer';
 
 function quacksLikeAHash(str) {
@@ -205,6 +203,17 @@ export default class GitRepo extends SteveModel {
     return hash;
   }
 
+  get clusterInfo() {
+    const ready = this.status?.readyClusters || 0;
+    const total = this.status?.desiredReadyClusters || 0;
+
+    return {
+      ready,
+      unready: total - ready,
+      total,
+    };
+  }
+
   get targetInfo() {
     let mode = null;
     let cluster = null;
@@ -375,9 +384,8 @@ export default class GitRepo extends SteveModel {
           namespace:              r.namespace,
           name:                   r.name,
           clusterId:              c.id,
-          clusterLabel:           c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
           clusterName:            c.nameDisplay,
-          state:                  mapStateToEnum(state),
+          state,
           stateBackground:        color,
           stateDisplay:           display,
           stateSort:              stateSort(color, display),
@@ -393,57 +401,6 @@ export default class GitRepo extends SteveModel {
     return out;
   }
 
-  get clusterInfo() {
-    const ready = this.status?.readyClusters || 0;
-    const total = this.status?.desiredReadyClusters || 0;
-
-    return {
-      ready,
-      unready: total - ready,
-      total,
-    };
-  }
-
-  get clusterResourceStatus() {
-    const clusterStatuses = this.resourcesStatuses.reduce((prev, curr) => {
-      const { clusterId, clusterLabel } = curr;
-
-      const state = curr.state;
-
-      if (!prev[clusterId]) {
-        prev[clusterId] = {
-          clusterLabel,
-          resourceCounts: { [state]: 0, desiredReady: 0 }
-
-        };
-      }
-
-      if (!prev[clusterId].resourceCounts[state]) {
-        prev[clusterId].resourceCounts[state] = 0;
-      }
-
-      prev[clusterId].resourceCounts[state] += 1;
-      prev[clusterId].resourceCounts.desiredReady += 1;
-
-      return prev;
-    }, {});
-
-    const values = Object.keys(clusterStatuses).map((key) => {
-      const { clusterLabel, resourceCounts } = clusterStatuses[key];
-
-      return {
-        clusterId: key,
-        clusterLabel, // FLEET LABEL
-        status:    {
-          displayStatus:  primaryDisplayStatusFromCount(resourceCounts),
-          resourceCounts: { ...resourceCounts }
-        }
-      };
-    });
-
-    return values;
-  }
-
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }

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

@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import { CATALOG, CLUSTER_BADGE } from '@shell/config/labels-annotations';
 import { NODE, FLEET, MANAGEMENT, CAPI } from '@shell/config/types';
 import { insertAt, addObject, removeObject } from '@shell/utils/array';
@@ -14,7 +15,6 @@ import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
-import { copyTextToClipboard } from '@shell/utils/clipboard';
 
 // See translation file cluster.providers for list of providers
 // If the logo is not named with the provider name, add an override here
@@ -88,10 +88,6 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get provisioner() {
-    if (this.status?.provider ) {
-      return this.status.provider;
-    }
-
     // For imported K3s clusters, this.status.driver is 'k3s.'
     return this.status?.driver ? this.status.driver : 'imported';
   }
@@ -408,13 +404,9 @@ export default class MgmtCluster extends HybridModel {
   }
 
   async copyKubeConfig() {
-    try {
-      const config = await this.generateKubeConfig();
+    const config = await this.generateKubeConfig();
 
-      if (config) {
-        await copyTextToClipboard(config);
-      }
-    } catch {}
+    Vue.prototype.$copyText(config);
   }
 
   async fetchNodeMetrics() {

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

@@ -1,7 +1,6 @@
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 
 const HIDDEN = ['rke', 'rancherkubernetesengine'];
-
 const V2 = ['amazoneks', 'googlegke', 'azureaks'];
 const IMPORTABLE = ['amazoneks', 'googlegke', 'azureaks'];
 

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

@@ -8,7 +8,6 @@ import { insertAt } from '@shell/utils/array';
 import { downloadUrl } from '@shell/utils/download';
 import findLast from 'lodash/findLast';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
-import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
 export default class MgmtNode extends HybridModel {
   get _availableActions() {
@@ -22,12 +21,11 @@ export default class MgmtNode extends HybridModel {
     };
 
     const scaleDown = {
-      action:     'scaleDown',
-      bulkAction: 'scaleDown',
-      enabled:    !!this.canScaleDown,
-      icon:       'icon icon-minus icon-fw',
-      label:      this.t('node.actions.scaleDown'),
-      bulkable:   true,
+      action:   'scaleDown',
+      enabled:  !!this.canScaleDown,
+      icon:     'icon icon-minus icon-fw',
+      label:    this.t('node.actions.scaleDown'),
+      bulkable: true,
     };
 
     insertAt(out, 0, { divider: true });
@@ -107,12 +105,12 @@ export default class MgmtNode extends HybridModel {
     }
   }
 
-  async scaleDown(resources = this) {
-    this.$dispatch('promptModal', {
-      resources,
-      component:  'ScaleMachineDownDialog',
-      modalWidth: '450px'
-    });
+  async scaleDown(resources) {
+    const safeResources = Array.isArray(resources) ? resources : [this];
+
+    await Promise.all(safeResources.map((node) => {
+      return node.norman?.doAction('scaledown');
+    }));
   }
 
   get provisioningCluster() {
@@ -168,12 +166,10 @@ export default class MgmtNode extends HybridModel {
   }
 
   get canScaleDown() {
-    if (!this.isEtcd && !this.isControlPlane) {
-      return true;
-    }
-
+    const isInOnlyPool = this.pool?.provisioningCluster?.pools?.length === 1;
+    const isOnlyNode = this.pool?.nodes?.length === 1;
     const hasAction = this.norman?.actions?.scaledown;
 
-    return hasAction && notOnlyOfRole(this, this.provisioningCluster?.nodes);
+    return hasAction && (!isInOnlyPool || !isOnlyNode);
   }
 }

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

@@ -1,7 +1,6 @@
 import { CAPI, MANAGEMENT, NORMAN } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
-import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
 export default class MgmtNodePool extends HybridModel {
   get nodeTemplate() {
@@ -162,22 +161,6 @@ export default class MgmtNodePool extends HybridModel {
     return this.norman?.hasLink('update');
   }
 
-  get isControlPlane() {
-    return this.spec?.controlPlane === true;
-  }
-
-  get isEtcd() {
-    return this.spec?.etcd === true;
-  }
-
-  canScaleDownPool() {
-    if (!this.isEtcd && !this.isControlPlane) {
-      return true;
-    }
-
-    return notOnlyOfRole(this, this?.provisioningCluster?.nodes);
-  }
-
   remove() {
     return this.norman?.remove();
   }

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

@@ -99,6 +99,42 @@ export default class Project extends HybridModel {
     // and the PUT request should have a query param _replace=true.
     const newValue = await norman.save({ replace: forceReplaceOnReq });
 
+    let retryCount = 0;
+
+    const finishProjectCreation = async() => {
+      try {
+        await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
+      } catch (err) {
+        if ( err.status === 409 || err.status === 403 ) {
+          // The backend updates each new project soon after it is created,
+          // so there is a chance of a 409 resource conflict or forbidden error. If that happens,
+          // retry the action.
+
+          // The 403 permission error can happen due to the user requesting
+          // the project before the project is fully created and the project
+          // permissions are assigned to the user so we allow some
+          // time for that process to complete.
+
+          if (retryCount < 3) {
+            retryCount++;
+            await setTimeout(() => {
+              // Delay for three seconds to avoid another failure due to latency.
+              finishProjectCreation();
+            }, '3000');
+          } else {
+            throw err;
+          }
+        }
+      }
+    };
+
+    // Only update PSP template if the value changed
+    const newPSPTemplateID = this.spec.podSecurityPolicyTemplateId || null;
+
+    if (norman.podSecurityPolicyTemplateId !== newPSPTemplateID) {
+      await finishProjectCreation();
+    }
+
     return newValue;
   }
 

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

@@ -1,6 +1,5 @@
 import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
-import { isServerUrl } from '@shell/utils/validators/setting';
 
 export default class Setting extends HybridModel {
   get fromEnv() {
@@ -32,15 +31,12 @@ export default class Setting extends HybridModel {
   }
 
   get customValidationRules() {
-    const out = [];
-
-    if (isServerUrl(this.metadata.name)) {
-      out.push({
-        path:       'value',
-        validators: ['required', 'https', 'url', 'trailingForwardSlash']
-      });
-    }
-
-    return out;
+    return [
+      {
+        path:           'value',
+        translationKey: 'setting.serverUrl.https',
+        validators:     [`isHttps:${ this.metadata.name }`]
+      },
+    ];
   }
 }

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

@@ -1,5 +1,6 @@
 import { NORMAN } from '@shell/config/types';
 import HybridModel, { cleanHybridResources } from '@shell/plugins/steve/hybrid-class';
+import day from 'dayjs';
 
 export default class User extends HybridModel {
   // Preserve description
@@ -99,6 +100,38 @@ export default class User extends HybridModel {
     return this.$rootGetters['i18n/withFallback'](`model.authConfig.provider."${ this.provider }"`, null, this.provider);
   }
 
+  /**
+   * Gets the last-login label in milliseconds
+   * @returns {number}
+   */
+  get userLastLogin() {
+    return this.metadata?.labels?.['cattle.io/last-login'] * 1000;
+  }
+
+  /**
+   * Gets the disabled-after label in milliseconds
+   * @returns {number}
+   */
+  get userDisabledIn() {
+    return this.metadata?.labels?.['cattle.io/disable-after'] * 1000;
+  }
+
+  /**
+   * Provides a display value for the userDisabledIn date based on the user
+   * state.
+   */
+  get userDisabledInDisplay() {
+    return this.state === 'inactive' ? null : this.userDisabledIn;
+  }
+
+  /**
+   * Gets the delete-after label in milliseconds
+   * @returns {number}
+   */
+  get userDeletedIn() {
+    return this.metadata?.labels?.['cattle.io/delete-after'] * 1000;
+  }
+
   get state() {
     if ( this.enabled === false ) {
       return 'inactive';
@@ -107,6 +140,19 @@ export default class User extends HybridModel {
     return this.metadata?.state?.name || 'unknown';
   }
 
+  get stateDisplay() {
+    switch (this.state) {
+    case 'inactive':
+      return this.t('user.state.inactive');
+    case 'active':
+      return this.t('user.state.active');
+    case 'unknown':
+      return this.t('user.state.unknown');
+    default:
+      return this.state;
+    }
+  }
+
   get description() {
     return this._description;
   }
@@ -211,6 +257,25 @@ export default class User extends HybridModel {
         formatter: 'CopyToClipboard',
         content:   this.username
       },
+      { separator: true },
+      {
+        label:         this.t('tableHeaders.userLastLogin'),
+        formatter:     'LiveDate',
+        formatterOpts: { addSuffix: true, suffix: `${ this.t('suffix.ago') } (${ day(this.userLastLogin) })` },
+        content:       this.userLastLogin,
+      },
+      {
+        label:         this.t('tableHeaders.userDisabledIn'),
+        formatter:     'LiveDate',
+        formatterOpts: { isCountdown: true },
+        content:       this.userDisabledInDisplay,
+      },
+      {
+        label:         this.t('tableHeaders.userDeletedIn'),
+        formatter:     'LiveDate',
+        formatterOpts: { isCountdown: true },
+        content:       this.userDeletedIn,
+      },
       ...this._details
     ];
   }

package/models/namespace.js

@@ -87,7 +87,7 @@ export default class Namespace extends SteveModel {
       return true;
     }
 
-    if ( this.metadata.name.startsWith('cattle-') && this.metadata.name.endsWith('-system') ) {
+    if ( this.metadata.name.endsWith('-system') ) {
       return true;
     }