@rancher/shell 3.0.9-rc.5 → 3.0.9

package/models/ext.cattle.io.token.js

@@ -0,0 +1,48 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+
+export default class SteveToken extends SteveModel {
+  // for now, we are only showing the new tokens in the UI. Later we will be able to edit a few of it's fields
+  get _availableActions() {
+    return super._availableActions.filter((a) => ['viewInApi', 'promptRemove'].includes(a.action));
+  }
+
+  cleanForSave(data) {
+    const val = super.cleanForSave(data);
+
+    delete val.type;
+
+    return val;
+  }
+
+  get isDeprecated() {
+    return undefined;
+  }
+
+  get state() {
+    return this.isExpired ? 'expired' : !this.spec?.enabled ? 'inactive' : 'active';
+  }
+
+  get isExpired() {
+    return this.status?.expired;
+  }
+
+  get expiresAt() {
+    return this.status?.expiresAt || '';
+  }
+
+  get lastUsedAt() {
+    return this.status?.lastUsedAt || '';
+  }
+
+  get description() {
+    return this.spec?.description || '';
+  }
+
+  get clusterId() {
+    return this.spec?.clusterName || '';
+  }
+
+  get created() {
+    return this.metadata?.creationTimestamp;
+  }
+}

package/models/kontainerdriver.js

@@ -70,7 +70,7 @@ export default class KontainerDriver extends Driver {
 
   activate() {
     return this.$dispatch('rancher/request', {
-      url:    `v3/kontainerDrivers/${ escape(this.id) }?action=activate`,
+      url:    `v3/kontainerDrivers/${ encodeURIComponent(this.id) }?action=activate`,
       method: 'post',
     }, { root: true }).catch((err) => {
       this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: this.nameDisplay }), err }, { root: true });
@@ -79,7 +79,7 @@ export default class KontainerDriver extends Driver {
 
   async activateBulk(resources) {
     await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
-      url:    `v3/kontainerDrivers/${ escape(resource.id) }?action=activate`,
+      url:    `v3/kontainerDrivers/${ encodeURIComponent(resource.id) }?action=activate`,
       method: 'post',
     }, { root: true }).catch((err) => {
       this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: resource.nameDisplay }), err }, { root: true });

package/models/namespace.js

@@ -134,6 +134,10 @@ export default class Namespace extends SteveModel {
     return project;
   }
 
+  get projectNameDisplay() {
+    return this.project?.nameDisplay || '';
+  }
+
   get groupById() {
     const projectId = this.project?.id;
 
@@ -267,7 +271,9 @@ export default class Namespace extends SteveModel {
   }
 
   get hideDetailLocation() {
-    return !!this.$rootGetters['currentProduct'].hideNamespaceLocation;
+    const currentProduct = this.$rootGetters['currentProduct'];
+
+    return currentProduct ? !!currentProduct.hideNamespaceLocation : true;
   }
 
   get glance() {

package/models/nodedriver.js

@@ -78,7 +78,7 @@ export default class NodeDriver extends Driver {
 
   activate() {
     return this.$dispatch('rancher/request', {
-      url:    `v3/nodeDrivers/${ escape(this.id) }?action=activate`,
+      url:    `v3/nodeDrivers/${ encodeURIComponent(this.id) }?action=activate`,
       method: 'post',
     }, { root: true }).catch((err) => {
       this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: this.nameDisplay }), err }, { root: true });
@@ -87,7 +87,7 @@ export default class NodeDriver extends Driver {
 
   async activateBulk(resources) {
     await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
-      url:    `v3/nodeDrivers/${ escape(resource.id) }?action=activate`,
+      url:    `v3/nodeDrivers/${ encodeURIComponent(resource.id) }?action=activate`,
       method: 'post',
     }, { root: true }).catch((err) => {
       this.$dispatch('growl/fromError', { title: this.t('drivers.error.activate', { name: resource.nameDisplay }), err }, { root: true });

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

@@ -101,14 +101,18 @@ export default class ProvCluster extends SteveModel {
   }
 
   get canEdit() {
-    // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
-    if (this.isKev1 || this.isHarvester) {
+    // If the cluster is a KEV1 cluster, Harvester cluster, or v2 provisioning cluster that uses upstream capi infrastructure providers, then prevent edit
+    if (this.isKev1 || this.isHarvester || this.isCapiHybrid) {
       return false;
     }
 
     return super.canEdit;
   }
 
+  get canCustomEdit() {
+    return !this.isCapiHybrid && super.canCustomEdit;
+  }
+
   get _availableActions() {
     const out = super._availableActions;
     const isLocal = this.mgmt?.isLocal;
@@ -123,9 +127,9 @@ export default class ProvCluster extends SteveModel {
     }
     const ready = this.mgmt?.isReady;
 
-    const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate;
+    const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate && !this.isCapiHybrid;
 
-    const canSnapshot = ready && this.isRke2 && this.canUpdate;
+    const canSnapshot = ready && this.isRke2 && this.canUpdate && !this.isCapiHybrid;
 
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
@@ -388,6 +392,19 @@ export default class ProvCluster extends SteveModel {
     return !!this.mgmt?.isHarvester;
   }
 
+  // identify v2 provisioning clusters created using upstream capi infrastructure providers instead of rancher/machine
+  get isCapiHybrid() {
+    if (!this.isRke2) {
+      return false;
+    }
+
+    const machineReferences = (this.spec?.rkeConfig?.machinePools || []).map((pool) => pool.machineConfigRef);
+
+    const capiMachines = machineReferences.find((r) => r?.apiVersion?.includes('cluster.x-k8s.io'));
+
+    return !!capiMachines;
+  }
+
   get mgmtClusterId() {
     // when a cluster is created `this` instance isn't immediately updated with `status.clusterName`
     // Workaround - Get fresh copy from the store
@@ -536,7 +553,7 @@ export default class ProvCluster extends SteveModel {
 
     if (this.isHarvester) {
       return HARVESTER;
-    } else if ( this.isImported ) {
+    } else if ( this.isImported || this.isCapiHybrid ) {
       return null;
     } else if ( this.isRke2 ) {
       const kind = this.spec?.rkeConfig?.machinePools?.[0]?.machineConfigRef?.kind?.toLowerCase();
@@ -880,7 +897,11 @@ export default class ProvCluster extends SteveModel {
 
     const cni = this.spec?.rkeConfig?.machineGlobalConfig?.cni;
 
-    if ( cni && cni !== 'calico' ) {
+    if ( cni === 'flannel' && compare(this.kubernetesVersion, 'v1.29.2') < 0 ) {
+      return false;
+    }
+
+    if ( cni && cni !== 'calico' && cni !== 'flannel' ) {
       return false;
     }
 
@@ -1049,7 +1070,7 @@ export default class ProvCluster extends SteveModel {
   }
 
   get disableResourceDetailDrawerConfigTab() {
-    return !!this.isHarvester;
+    return !!this.isHarvester || this.isCapiHybrid;
   }
 
   get fullDetailPageOverride() {

package/models/secret.js

@@ -550,23 +550,6 @@ export default class Secret extends SteveModel {
     return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ this.projectScopedClusterId }/${ this.projectScopedProjectId }`);
   }
 
-  get clusterAndProjectLabel() {
-    if (!this.isProjectScoped) {
-      return '';
-    }
-    const clusterName = this.projectCluster?.nameDisplay;
-    // project is going to be empty if upstream and trying to show pss from downstream clusters
-    // we only ever have the current clusters projects. if we change this (fetch them in the list)
-    // we wipe out the header ns filter projects
-    const projectName = this.project?.nameDisplay || this.projectScopedProjectId;
-
-    if (clusterName && projectName) {
-      return `${ projectName } (${ clusterName })`;
-    }
-
-    return '';
-  }
-
   get detailLocation() {
     if (this.isProjectScoped) {
       const id = this.id?.replace(/.*\//, '');

package/models/service.js

@@ -1,7 +1,8 @@
 import find from 'lodash/find';
-import { POD } from '@shell/config/types';
+import { NODE, POD } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { parse } from '@shell/utils/selector';
+import { PaginationFilterEquality, PaginationParamFilter } from '@shell/types/store/pagination.types';
 
 // i18n-uses servicesPage.serviceTypes.clusterIp.*, servicesPage.serviceTypes.externalName.*, servicesPage.serviceTypes.headless.*
 // i18n-uses servicesPage.serviceTypes.loadBalancer.*, servicesPage.serviceTypes.nodePort.*
@@ -50,6 +51,48 @@ export const CLUSTERIP = (() => {
   return clusterIp.id;
 })();
 
+/**
+ * Use to populate the cache with a node that can be used in Service's target value
+ *
+ * Service's Target Cell --> shell/components/formatter/ServiceTargets.vue --> shell/components/formatter/Endpoints.vue --> Picks the first one that has a model's externalIp
+ */
+export const fetchNodesForServiceTargets = async({
+  $store,
+  inStore,
+}) => {
+  try {
+    const schema = $store.getters[`${ inStore }/schemaFor`](NODE);
+
+    if (schema) {
+      if ($store.getters[`${ inStore }/paginationEnabled`](NODE)) {
+        // Of type @ActionFindPageArgs
+        const findPageArgs = {
+          pagination: {
+            pageSize: 1,
+            filters:  [
+              PaginationParamFilter.createSingleField({
+                field:    'status.addresses.type',
+                value:    'ExternalIP',
+                equality: PaginationFilterEquality.CONTAINS
+              }),
+            ],
+          },
+        };
+
+        return $store.dispatch(`${ inStore }/findPage`, { type: NODE, opt: findPageArgs });
+      } else {
+        return $store.dispatch(`${ inStore }/findAll`, { type: NODE });
+      }
+    } else {
+      return [];
+    }
+  } catch (err) {
+    console.warn('Failed to fetch nodes for service targets:', err); // eslint-disable-line no-console
+
+    return [];
+  }
+};
+
 export default class Service extends SteveModel {
   get customValidationRules() {
     return [

package/models/token.js

@@ -16,4 +16,8 @@ export default class extends NormanModel {
 
     return expiry.isBefore(day());
   }
+
+  get isDeprecated() {
+    return true;
+  }
 }

package/models/workload.js

@@ -755,20 +755,26 @@ export default class Workload extends WorkloadService {
   get podsCard() {
     const supportedTypes = [WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET];
 
-    if (!supportedTypes.includes(this.type) || (this.pods?.length || 0) <= 0) {
+    if (!supportedTypes.includes(this.type)) {
       return null;
     }
 
     const scalingTypes = [WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.STATEFUL_SET];
+    const canScale = this.canUpdate && scalingTypes.includes(this.type);
+
+    if (!this.pods || (this.pods.length === 0 && !canScale)) {
+      return null;
+    }
 
     return {
       component: markRaw(defineAsyncComponent(() => import('@shell/components/Resource/Detail/Card/StatusCard/index.vue'))),
       props:     {
-        title:       this.t('component.resource.detail.card.podsCard.title'),
-        resources:   this.pods,
-        showScaling: this.canUpdate && scalingTypes.includes(this.type),
-        onIncrease:  () => this.scale(true),
-        onDecrease:  () => this.scale(false)
+        title:              this.t('component.resource.detail.card.podsCard.title'),
+        resources:          this.pods,
+        showScaling:        canScale,
+        onIncrease:         () => this.scale(true),
+        onDecrease:         () => this.scale(false),
+        noResourcesMessage: this.t('component.resource.detail.card.podsCard.noPods')
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.9-rc.5",
+  "version": "3.0.9",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",

package/pages/account/index.vue

@@ -9,94 +9,107 @@ import { mapGetters } from 'vuex';
 
 import { Banner } from '@components/Banner';
 import ResourceTable from '@shell/components/ResourceTable';
-import CopyToClipboardText from '@shell/components/CopyToClipboardText';
 import TabTitle from '@shell/components/TabTitle';
 
-const API_ENDPOINT = '/v3';
+import { allHash } from '@shell/utils/promise';
+
+import {
+  ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE,
+  LAST_USED, AGE_NORMAN, SCOPE_NORMAN, NORMAN_KEY_DEPRECATION
+} from '@shell/config/table-headers';
+import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
 
 export default {
   components: {
-    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
+    BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
+    const hashedRequests = {};
+
     this.canChangePassword = await this.calcCanChangePassword();
 
-    if (this.apiKeySchema) {
-      this.rows = await this.$store.dispatch('rancher/findAll', { type: NORMAN.TOKEN });
-    }
+    this.normanTokenSchema = this.$store.getters[`rancher/schemaFor`](NORMAN.TOKEN);
+    this.steveTokenSchema = this.$store.getters[`management/schemaFor`](EXT.TOKEN);
 
-    // Get all settings - the API host setting may not be set, so this avoids a 404 request if we look for the specific setting
-    const allSettings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
-    const apiHostSetting = allSettings.find((i) => i.id === SETTING.API_HOST);
-    const serverUrlSetting = allSettings.find((i) => i.id === SETTING.SERVER_URL);
+    const selfUser = await this.$store.dispatch('auth/getSelfUser');
 
-    this.apiHostSetting = apiHostSetting?.value;
-    this.serverUrlSetting = serverUrlSetting?.value;
+    if (this.normanTokenSchema) {
+      hashedRequests.normanTokens = this.$store.dispatch('rancher/findAll', { type: NORMAN.TOKEN });
+    }
 
-    const selfUser = await this.$store.dispatch('auth/getSelfUser');
+    if (this.steveTokenSchema) {
+      this.filterByUserTokens = this.$store.getters[`management/paginationEnabled`](EXT.TOKEN);
+
+      if (this.filterByUserTokens && selfUser?.status?.userID) {
+        // Only get associated with the current user
+        const opt = { // Of type ActionFindPageArgs
+          pagination: new FilterArgs({
+            filters: PaginationParamFilter.createSingleField({
+              field: 'metadata.fields.1',
+              value: selfUser.status?.userID,
+            })
+          })
+        };
+
+        hashedRequests.steveTokens = this.$store.dispatch(`management/findPage`, { type: EXT.TOKEN, opt });
+      } else {
+        hashedRequests.steveTokens = this.$store.dispatch('management/findAll', { type: EXT.TOKEN });
+      }
+    }
 
     if (selfUser?.canGetUser && selfUser.status?.userID) {
       // Fetch the user info for ChangePassword (ChangePasswordDialog needs the user info for the user whose password is being changed)
-      this.user = await this.$store.dispatch('management/find', {
+      hashedRequests.user = this.$store.dispatch('management/find', {
         type: MANAGEMENT.USER,
         id:   selfUser.status?.userID
       });
-    } else {
-      throw new Error(this.t('changePassword.errors.cannotFetchSelf'));
     }
+
+    // Get all settings - the API host setting may not be set, so this avoids a 404 request if we look for the specific setting
+    hashedRequests.allSettings = this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
+
+    const {
+      normanTokens, steveTokens, allSettings, user
+    } = await allHash(hashedRequests);
+
+    this.normanTokens = normanTokens;
+    this.steveTokens = steveTokens;
+    this.user = user;
+
+    const apiHostSetting = allSettings.find((i) => i.id === SETTING.API_HOST);
+    const serverUrlSetting = allSettings.find((i) => i.id === SETTING.SERVER_URL);
+
+    this.apiHostSetting = apiHostSetting?.value;
+    this.serverUrlSetting = serverUrlSetting?.value;
   },
   data() {
     return {
+      normanTokenSchema: undefined,
+      steveTokenSchema:  undefined,
       apiHostSetting:    null,
       serverUrlSetting:  null,
       rows:              null,
       canChangePassword: false,
-      user:              null
+      user:              null,
+      normanTokens:      null,
+      steveTokens:       null,
     };
   },
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
     apiKeyheaders() {
-      return this.apiKeySchema ? this.$store.getters['type-map/headersFor'](this.apiKeySchema) : [];
-    },
-
-    // Port of Ember code for API Url - see: https://github.com/rancher/ui/blob/8e07c492673171731f3b26af14c978bc103d1828/lib/shared/addon/endpoint/service.js#L58
-    apiUrlBase() {
-      let setting = this.apiHostSetting;
-
-      if (setting && setting.indexOf('http') !== 0) {
-        setting = `http://${ setting }`;
-      }
-
-      // Use Server Setting URL if the api host setting is not set
-      let url = setting || this.serverUrlSetting;
-
-      // If the URL is relative, add on the current base URL from the browser
-      if ( url.indexOf('http') !== 0 ) {
-        url = `${ window.location.origin }/${ url.replace(/^\/+/, '') }`;
-      }
-
-      // URL must end in a single slash
-      url = `${ url.replace(/\/+$/, '') }/`;
-
-      return url;
-    },
-
-    apiUrl() {
-      const base = this.apiUrlBase;
-      const path = API_ENDPOINT.replace(/^\/+/, '');
-
-      return `${ base }${ path }`;
-    },
-
-    apiKeySchema() {
-      try {
-        return this.$store.getters[`rancher/schemaFor`](NORMAN.TOKEN);
-      } catch (e) {}
-
-      return null;
+      return [
+        EXPIRY_STATE,
+        ACCESS_KEY,
+        DESCRIPTION,
+        SCOPE_NORMAN,
+        NORMAN_KEY_DEPRECATION,
+        LAST_USED,
+        EXPIRES,
+        AGE_NORMAN
+      ];
     },
 
     principal() {
@@ -110,7 +123,7 @@ export default {
       return principal || {};
     },
 
-    apiKeys() {
+    filteredNormanTokens() {
       // Filter out tokens that are not API Keys and are not expired UI Sessions
       const isApiKey = (key) => {
         const labels = key.labels;
@@ -120,7 +133,24 @@ export default {
         return ( !expired || !labels || !labels['ui-session'] ) && !current;
       };
 
-      return !this.rows ? [] : this.rows.filter(isApiKey);
+      return !this.normanTokens ? [] : this.normanTokens.filter(isApiKey);
+    },
+
+    filteredNewTokens() {
+      // Filter out tokens that are not API Keys and are not expired UI Sessions
+      const isApiKey = (key) => {
+        const labels = key.metadata?.labels;
+        const expired = key.status?.expired;
+        const current = key.status?.current;
+
+        return ( !expired || !labels || !labels['ui-session'] ) && !current;
+      };
+
+      return !this.steveTokens ? [] : this.steveTokens.filter(isApiKey);
+    },
+
+    apiKeys() {
+      return (this.filteredNormanTokens || []).concat(this.filteredNewTokens || []);
     }
   },
 
@@ -191,16 +221,9 @@ export default {
     <div class="keys-header">
       <div>
         <h2 v-t="'accountAndKeys.apiKeys.title'" />
-        <div class="api-url">
-          <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
-          <CopyToClipboardText
-            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
-            :text="apiUrl"
-          />
-        </div>
       </div>
       <button
-        v-if="apiKeySchema"
+        v-if="steveTokenSchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
         class="btn role-primary add mb-20"
@@ -211,11 +234,17 @@ export default {
       </button>
     </div>
     <div
-      v-if="apiKeySchema"
+      v-if="steveTokenSchema"
       class="keys"
     >
+      <Banner
+        v-if="filteredNormanTokens.length"
+        color="warning"
+        class="mb-20"
+        :label="t('accountAndKeys.apiKeys.normanTokenDeprecation')"
+      />
       <ResourceTable
-        :schema="apiKeySchema"
+        :schema="steveTokenSchema"
         :rows="apiKeys"
         :headers="apiKeyheaders"
         key-field="id"

package/pages/auth/setup.vue

@@ -5,7 +5,6 @@ import CopyToClipboard from '@shell/components/CopyToClipboard';
 import AsyncButton from '@shell/components/AsyncButton';
 import { LOGGED_OUT, SETUP } from '@shell/config/query-params';
 import { NORMAN, MANAGEMENT, EXT } from '@shell/config/types';
-import { findBy } from '@shell/utils/array';
 import { Checkbox } from '@components/Form/Checkbox';
 import { getVendor, getProduct, setVendor } from '@shell/config/private-label';
 import { RadioGroup } from '@components/Form/Radio';
@@ -67,7 +66,6 @@ export default {
       serverUrl:          null,
       mcmEnabled:         null,
       eula:               false,
-      principals:         null,
       errors:             []
     };
   },
@@ -121,11 +119,7 @@ export default {
 
     const productName = plSetting.default;
 
-    const principals = await this.$store.dispatch('rancher/findAll', { type: NORMAN.PRINCIPAL, opt: { url: '/v3/principals' } });
-    const me = findBy(principals, 'me', true);
-
     const current = this.$route.query[SETUP] || this.$store.getters['auth/initialPass'];
-    const user = this.$store.getters['auth/user'] ?? {};
 
     const mcmFeature = await this.$store.dispatch('management/find', {
       type: MANAGEMENT.FEATURE, id: 'multi-cluster-management', opt: { url: `/v1/${ MANAGEMENT.FEATURE }/multi-cluster-management` }
@@ -144,16 +138,19 @@ export default {
     const isFirstLogin = await calcIsFirstLogin(this.$store);
     const mustChangePassword = await calcMustChangePassword(this.$store);
 
+    // user getter must be after "calcMustChangePassword" where all the user info is loaded
+    // via the "auth/getUser" action
+    const user = this.$store.getters['auth/user'] ?? {};
+
     this['productName'] = productName;
     this['haveCurrent'] = !!current;
-    this['username'] = me?.loginName || 'admin';
+    this['username'] = user?.username || 'admin';
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
     this['current'] = current;
     this['user'] = user;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
-    this['principals'] = principals;
   },
 
   computed: {
@@ -181,12 +178,6 @@ export default {
       return true;
     },
 
-    me() {
-      const out = findBy(this.principals, 'me', true);
-
-      return out;
-    },
-
     showLocalhostWarning() {
       return isLocalhost(this.serverUrl);
     },