@rancher/shell 0.5.3 → 2.0.0

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

@@ -7,6 +7,34 @@ import { sortBy } from '@shell/utils/sort';
 import day from 'dayjs';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
+// This could be removed and just replaced with schema.fetchResourceFields()... but there's some getters that use hasSpecsScheduledScanConfig before it runs
+/**
+ * For the given schema, determine if the schema of it's associated scan's type has scheduledScanConfig
+ *
+ * This is resourceFields based, so we need to fetch schema definition
+ */
+export const fetchSpecsScheduledScanConfig = async(schema) => {
+  await schema.fetchResourceFields();
+
+  return hasSpecsScheduledScanConfig(schema);
+};
+
+/**
+ * For the given schema, determine if the schema of it's associated scan's type has scheduledScanConfig
+ *
+ * Assumes schemaDefinitions have been fetched (see async fetchSpecsScheduledScanConfig above)
+ */
+export const hasSpecsScheduledScanConfig = (schema) => {
+  const specSchemaId = get(schema, 'resourceFields.spec.type');
+  const specSchema = schema.schemaDefinitions?.[specSchemaId];
+
+  if (!specSchema) {
+    return false;
+  }
+
+  return !!get(specSchema, 'resourceFields.scheduledScanConfig');
+};
+
 export default class ClusterScan extends SteveModel {
   get _availableActions() {
     let out = super._availableActions;
@@ -64,14 +92,7 @@ export default class ClusterScan extends SteveModel {
   }
 
   canBeScheduled() {
-    const schema = this.$getters['schemaFor'](this.type);
-    const specSchema = this.$getters['schemaFor'](get(schema, 'resourceFields.spec.type') || '');
-
-    if (!specSchema) {
-      return false;
-    }
-
-    return !!get(specSchema, 'resourceFields.scheduledScanConfig');
+    return hasSpecsScheduledScanConfig(this.$getters['schemaFor'](this.type));
   }
 
   get isScheduled() {

package/models/cloudcredential.js

@@ -32,8 +32,16 @@ export default class CloudCredential extends NormanModel {
     };
   }
 
+  get secretName() {
+    return this.id.replace(':', '/');
+  }
+
   get secret() {
-    return this.$rootGetters['management/byId'](SECRET, this.id.replace(':', '/'));
+    return this.$rootGetters['management/byId'](SECRET, this.secretName);
+  }
+
+  async getSecret() {
+    await this.$dispatch('management/find', { type: SECRET, id: this.secretName }, { root: true });
   }
 
   get configKey() {

package/models/cluster/node.js

@@ -450,6 +450,10 @@ export default class ClusterNode extends SteveModel {
   get provider() {
     return this.$rootGetters['currentCluster'].provisioner.toLowerCase();
   }
+
+  get displayTaintsAndLabels() {
+    return !!this.spec.taints?.length || !!this.customLabelCount;
+  }
 }
 
 function calculatePercentage(allocatable, capacity) {

package/models/cluster/schema.js

@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the cluster store
+ */
+export default class ClusterStoreSchema extends SteveSchema { }

package/models/cluster.js

@@ -0,0 +1,33 @@
+import NormanModel from '@shell/plugins/steve/norman-class';
+
+export const LABEL_CONTAINS_PROTECTED = [
+  'io.cattle.lifecycle',
+  'kubernetes.io',
+  'cattle.io',
+  'k3s.io',
+];
+
+export const ANNOTATIONS_CONTAINS_PROTECTED = [
+  'coreos.com',
+  'cattle.io',
+  'k3s.io',
+  'kubernetes.io',
+  'k3s.io',
+];
+export default class NormanCluster extends NormanModel {
+  get systemLabels() {
+    return Object.keys(this.labels || {}).filter((key) => LABEL_CONTAINS_PROTECTED.find((label) => key.includes(label)));
+  }
+
+  get systemAnnotations() {
+    return Object.keys(this.annotations || {}).filter((key) => ANNOTATIONS_CONTAINS_PROTECTED.find((annotation) => key.includes(annotation)));
+  }
+
+  get hasSystemLabels() {
+    return !!(this.systemLabels || []).length;
+  }
+
+  get hasSystemAnnotations() {
+    return !!(this.systemAnnotations || []).length;
+  }
+}

package/models/driver.js

@@ -0,0 +1,62 @@
+import { DESCRIPTION } from '@shell/config/labels-annotations';
+import NormanModel from '@shell/plugins/steve/norman-class';
+import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+
+export default class Driver extends NormanModel {
+  get canViewYaml() {
+    return false;
+  }
+
+  get driverName() {
+    if (!this.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;
+  }
+
+  get nameDisplay() {
+    const path = `cluster.provider.${ this.driverName }`;
+    const label = this.driverName || this.name || this.id;
+
+    return this.$rootGetters['i18n/withFallback'](path, label);
+  }
+
+  get description() {
+    if (!!this.builtIn || !!this.builtin) {
+      return this.$rootGetters['i18n/withFallback']('tableHeaders.builtIn');
+    } else {
+      return this.url;
+    }
+  }
+
+  /**
+   * Set description based on the type of model available with private fallback
+   */
+  set description(value) {
+    if (this.annotations) {
+      this.annotations[DESCRIPTION] = value;
+    }
+
+    this._description = value;
+  }
+
+  cleanForSave(data, forNew) {
+    const val = super.cleanForSave(data, forNew);
+
+    if (forNew) {
+      val.active = true;
+    }
+    delete val.metadata;
+
+    return val;
+  }
+}

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

@@ -119,17 +119,6 @@ export default class FleetCluster extends SteveModel {
     return this.metadata?.state?.name || 'unknown';
   }
 
-  get nodeInfo() {
-    const ready = this.status?.agent?.readyNodes || 0;
-    const unready = this.status?.agent?.nonReadyNodes || 0;
-
-    return {
-      ready,
-      unready,
-      total: ready + unready,
-    };
-  }
-
   get repoInfo() {
     const ready = this.status?.readyGitRepos || 0;
     const total = this.status?.desiredReadyGitRepos || 0;
@@ -141,6 +130,29 @@ export default class FleetCluster extends SteveModel {
     };
   }
 
+  get bundleInfo() {
+    const bundlesData = {
+      ready: 0,
+      total: 0
+    };
+    const readyBundles = this.status?.display?.readyBundles;
+
+    if (readyBundles && readyBundles.includes('/')) {
+      const dataArr = readyBundles.split('/');
+
+      if (dataArr.length === 2 && parseInt(dataArr[0]) >= 0 && parseInt(dataArr[1]) >= 0) {
+        bundlesData.ready = parseInt(dataArr[0]);
+        bundlesData.total = parseInt(dataArr[1]);
+
+        return bundlesData;
+      }
+    }
+
+    bundlesData.noValidData = true;
+
+    return bundlesData;
+  }
+
   get mgmt() {
     const mgmt = this.$getters['byId'](MANAGEMENT.CLUSTER, this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME]);
 

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

@@ -105,6 +105,8 @@ export default class GitRepo extends SteveModel {
     const groups = workspace?.clusterGroups || [];
 
     if (workspace?.id === 'fleet-local') {
+      // should we be getting the clusters from workspace.clusters instead of having to rely on the groups,
+      // which takes an additional request to be done on the Fleet dashboard screen?
       const local = findBy(groups, 'id', 'fleet-local/default');
 
       if (local) {
@@ -314,6 +316,14 @@ export default class GitRepo extends SteveModel {
     return 0;
   }
 
+  get targetClustersReady() {
+    if (this.targetClusters && this.targetClusters.length) {
+      return this.targetClusters.filter((cluster) => cluster.state === 'active');
+    }
+
+    return 0;
+  }
+
   get bundleDeployments() {
     const bds = this.$getters['all'](FLEET.BUNDLE_DEPLOYMENT);
 

package/models/helm.cattle.io.projecthelmchart.js

@@ -22,7 +22,7 @@ export default class ProjectHelmChart extends SteveModel {
     const clusterId = this.$rootGetters['currentCluster']?.id;
     const project = this.$rootGetters['management/byId'](MANAGEMENT.PROJECT, `${ clusterId }/${ this.projectId }`);
 
-    return project.spec.displayName;
+    return project?.spec.displayName;
   }
 
   get namespaces() {

package/models/kontainerdriver.js

@@ -0,0 +1,68 @@
+import Driver from '@shell/models/driver';
+
+export default class KontainerDriver extends Driver {
+  get doneRoute() {
+    return 'c-cluster-manager-driver-kontainerdriver';
+  }
+
+  get _availableActions() {
+    const out = [
+      {
+        action:   'activate',
+        label:    'Activate',
+        icon:     'icon icon-play',
+        bulkable: true,
+        enabled:  !!this.links.update && !this.active
+      },
+      {
+        action:   'deactivate',
+        label:    'Deactivate',
+        icon:     'icon icon-pause',
+        bulkable: true,
+        enabled:  !!this.links.update && !!this.active,
+        weight:   -1
+      },
+      { divider: true },
+      {
+        action:  'viewInApi',
+        enabled: true,
+        icon:    'icon icon-external-link',
+        label:   this.t('action.viewInApi'),
+      },
+      { divider: true },
+      {
+        action:   'goToEdit',
+        label:    this.t('action.edit'),
+        icon:     'icon icon-edit',
+        bulkable: false,
+        enabled:  !!this.links.update && !this.builtin,
+      },
+      {
+        action:     'promptRemove',
+        altAction:  'remove',
+        bulkAction: 'promptRemove',
+        label:      this.t('action.remove'),
+        bulkable:   true,
+        icon:       'icon icon-delete',
+        enabled:    !!this.links.remove,
+        weight:     -10,
+      }
+    ];
+
+    return out;
+  }
+
+  deactivate() {
+    this.$dispatch('promptModal', {
+      componentProps: { url: `v3/kontainerDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  activate() {
+    return this.$dispatch('rancher/request', {
+      url:    `v3/kontainerDrivers/${ escape(this.id) }?action=activate`,
+      method: 'post',
+    }, { root: true });
+  }
+}

package/models/management/schema.js

@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the management store
+ */
+export default class ManagementStoreSchema extends SteveSchema { }

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

@@ -14,10 +14,11 @@ export const configType = {
   googleoauth:     'oauth',
   local:           '',
   github:          'oauth',
-  keycloakoidc:    'oidc'
+  keycloakoidc:    'oidc',
+  oidc:            'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak' };
+const imageOverrides = { keycloakoidc: 'keycloak', oidc: 'openid' };
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {

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

@@ -299,9 +299,10 @@ export default class MgmtCluster extends HybridModel {
 
   // Custom badge to show for the Cluster (if the appropriate annotations are set)
   get badge() {
-    const text = this.metadata?.annotations?.[CLUSTER_BADGE.TEXT];
+    const icon = this.metadata?.annotations?.[CLUSTER_BADGE.ICON_TEXT];
+    const comment = this.metadata?.annotations?.[CLUSTER_BADGE.TEXT];
 
-    if (!text) {
+    if (!icon && !comment) {
       return undefined;
     }
 
@@ -309,10 +310,10 @@ export default class MgmtCluster extends HybridModel {
     const iconText = this.metadata?.annotations[CLUSTER_BADGE.ICON_TEXT] || '';
 
     return {
-      text,
+      text:      comment || undefined,
       color,
       textColor: textColor(parseColor(color)),
-      iconText:  iconText.substr(0, 2)
+      iconText:  iconText.substr(0, 3)
     };
   }
 

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

@@ -37,6 +37,7 @@ export default class GlobalRole extends SteveDescriptionModel {
   }
 
   get nameDisplay() {
+    // i18n-uses rbac.globalRoles.role.*.label
     const path = `rbac.globalRoles.role.${ this.id }.label`;
     const label = this.displayName || this.metadata?.name || this.id;
 
@@ -46,6 +47,7 @@ export default class GlobalRole extends SteveDescriptionModel {
   get descriptionDisplay() {
     return this.description ||
     this.metadata?.annotations?.[DESCRIPTION] ||
+    // i18n-uses rbac.globalRoles.role.*.description
     this.$rootGetters['i18n/withFallback'](`rbac.globalRoles.role.${ this.id }.description`, this.t(`rbac.globalRoles.unknownRole.description`));
   }
 

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;
   }
@@ -177,7 +223,7 @@ export default class User extends HybridModel {
     return [
       {
         action:     'activate',
-        label:      this.t('action.activate'),
+        label:      this.t('action.enable'),
         icon:       'icon icon-play',
         bulkable:   true,
         bulkAction: 'activateBulk',
@@ -186,7 +232,7 @@ export default class User extends HybridModel {
       },
       {
         action:     'deactivate',
-        label:      this.t('action.deactivate'),
+        label:      this.t('action.disable'),
         icon:       'icon icon-pause',
         bulkable:   true,
         bulkAction: 'deactivateBulk',
@@ -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/monitoring.coreos.com.receiver.js

@@ -4,6 +4,8 @@ import { MONITORING } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
+// i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
+// i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
   {
     name:  'slack',
@@ -66,7 +68,7 @@ export default class Receiver extends SteveModel {
   }
 
   async save() {
-    const errors = await this.validationErrors(this);
+    const errors = this.validationErrors(this);
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);

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

@@ -34,7 +34,7 @@ export default class Route extends SteveModel {
   }
 
   async save() {
-    const errors = await this.validationErrors(this);
+    const errors = this.validationErrors(this);
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);

package/models/networking.k8s.io.ingress.js

@@ -44,7 +44,8 @@ export default class Ingress extends SteveModel {
     const isTargetsWorkload = serviceName.startsWith('ingress-');
     const id = `${ this.namespace }/${ serviceName }`;
 
-    if ( isTargetsWorkload ) {
+    if (isTargetsWorkload) {
+      // Need to expose workloadId's and fetch specific ones in IngressTarget?
       const workload = workloads.find((w) => w.id === (id));
 
       return workload?.detailLocation || '';

package/models/nodedriver.js

@@ -0,0 +1,68 @@
+import Driver from '@shell/models/driver';
+
+export default class NodeDriver extends Driver {
+  get doneRoute() {
+    return 'c-cluster-manager-driver-nodedriver';
+  }
+
+  get _availableActions() {
+    const out = [
+      {
+        action:   'activate',
+        label:    'Activate',
+        icon:     'icon icon-play',
+        bulkable: true,
+        enabled:  !!this.actions.activate && this.state === 'inactive',
+      },
+      {
+        action:   'deactivate',
+        label:    'Deactivate',
+        icon:     'icon icon-pause',
+        bulkable: true,
+        enabled:  !!this.actions.deactivate && this.state === 'active',
+        weight:   -1,
+      },
+      { divider: true },
+      {
+        action:  'viewInApi',
+        enabled: true,
+        icon:    'icon icon-external-link',
+        label:   this.t('action.viewInApi'),
+      },
+      { divider: true },
+      {
+        action:   'goToEdit',
+        label:    this.t('action.edit'),
+        icon:     'icon icon-edit',
+        bulkable: false,
+        enabled:  !!this.links.update && !this.builtin,
+      },
+      {
+        action:     'promptRemove',
+        altAction:  'remove',
+        bulkAction: 'promptRemove',
+        label:      this.t('action.remove'),
+        bulkable:   true,
+        icon:       'icon icon-delete',
+        enabled:    !!this.links.update && !this.active,
+        weight:     -10,
+      }
+    ];
+
+    return out;
+  }
+
+  deactivate() {
+    this.$dispatch('promptModal', {
+      componentProps: { url: `v3/nodeDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  activate() {
+    return this.$dispatch('rancher/request', {
+      url:    `v3/nodeDrivers/${ escape(this.id) }?action=activate`,
+      method: 'post',
+    }, { root: true });
+  }
+}

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

@@ -9,7 +9,8 @@ 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';
+import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
+import capitalize from 'lodash/capitalize';
 
 /**
  * Class representing Cluster resource.
@@ -403,6 +404,38 @@ export default class ProvCluster extends SteveModel {
     return this.mgmt?.providerLogo;
   }
 
+  get nodesArchitecture() {
+    const obj = {};
+
+    this.nodes?.forEach((node) => {
+      if (!node.metadata?.state?.transitioning) {
+        const architecture = node.status?.nodeLabels?.[NODE_ARCHITECTURE];
+
+        const key = architecture ? capitalize(architecture) : this.t('cluster.architecture.label.unknown');
+
+        obj[key] = (obj[key] || 0) + 1;
+      }
+    });
+
+    return obj;
+  }
+
+  get architecture() {
+    const keys = Object.keys(this.nodesArchitecture);
+
+    switch (keys.length) {
+    case 0:
+      return { label: this.t('generic.provisioning') };
+    case 1:
+      return { label: keys[0] };
+    default:
+      return {
+        label:   this.t('cluster.architecture.label.mixed'),
+        tooltip: keys.reduce((acc, k) => `${ acc }${ k }: ${ this.nodesArchitecture[k] }<br>`, '')
+      };
+    }
+  }
+
   get kubernetesVersion() {
     const unknown = this.$rootGetters['i18n/t']('generic.unknown');