@rancher/shell 3.0.5-rc.5 → 3.0.5-rc.7

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

@@ -57,34 +57,11 @@ export default class HelmOp extends FleetApplication {
       enabled:  !!this.links.update && !this.spec?.disablePolling
     });
 
-    insertAt(out, 4, {
-      action:     'forceUpdate',
-      label:      this.t('fleet.helmOp.actions.forceUpdate.label'),
-      icon:       'icon icon-refresh',
-      bulkable:   true,
-      bulkAction: 'forceUpdateBulk',
-      enabled:    !!this.links.update
-    });
-
     insertAt(out, 5, { divider: true });
 
     return out;
   }
 
-  forceUpdate(resources = [this]) {
-    this.$dispatch('promptModal', {
-      componentProps: { helmOps: resources },
-      component:      'HelmOpForceUpdateDialog'
-    });
-  }
-
-  forceUpdateBulk(resources) {
-    this.$dispatch('promptModal', {
-      componentProps: { helmOps: resources },
-      component:      'HelmOpForceUpdateDialog'
-    });
-  }
-
   get dashboardIcon() {
     return FleetUtils.dashboardIcons[FLEET.HELM_OP];
   }
@@ -124,7 +101,6 @@ export default class HelmOp extends FleetApplication {
 
     repo = repo.replace(/.git$/, '');
     repo = repo.replace(/^https:\/\//, '');
-    repo = repo.replace(/^oci:\/\//, '');
     repo = repo.replace(/\/+$/, '');
 
     return repo;
@@ -140,16 +116,16 @@ export default class HelmOp extends FleetApplication {
    *    chart: fleet-agent
    *    version: 0.12.1-beta.2
    *  oci:
-   *    chart: oci://ghcr.io/rancher/fleet-test-configmap-chart
+   *    repo: oci://ghcr.io/rancher/fleet-test-configmap-chart
    *    version: the-tag
    */
   get sourceType() {
-    if (this.spec.helm?.repo && this.spec.helm?.chart) {
-      return SOURCE_TYPE.REPO;
+    if (this.spec.helm?.repo?.startsWith('oci://')) {
+      return SOURCE_TYPE.OCI;
     }
 
-    if (this.spec.helm?.chart?.startsWith('oci://')) {
-      return SOURCE_TYPE.OCI;
+    if (this.spec.helm?.repo && this.spec.helm?.chart) {
+      return SOURCE_TYPE.REPO;
     }
 
     if (this.spec.helm?.chart) {
@@ -164,20 +140,14 @@ export default class HelmOp extends FleetApplication {
 
     switch (this.sourceType) {
     case SOURCE_TYPE.REPO:
+    case SOURCE_TYPE.OCI:
       value = this.spec.helm?.repo || '';
       break;
-    case SOURCE_TYPE.OCI: {
-      const parsed = parse(this.spec.helm?.chart || '');
-
-      value = parsed?.host ? `oci://${ parsed?.host }` : '';
-      break;
-    }
     case SOURCE_TYPE.TARBALL:
-      value = this.spec.helm?.chart || ''; // TODO ellipsis and tooltip
+      value = this.spec.helm?.chart || '';
     }
 
     const matchHttps = value.match(FleetUtils.HTTP_REGEX);
-    const matchOCI = value.match(FleetUtils.OCI_REGEX);
     const matchSSH = value.match(FleetUtils.GIT_SSH_REGEX);
 
     if (matchSSH) {
@@ -190,7 +160,7 @@ export default class HelmOp extends FleetApplication {
       value,
       display:  this.repoDisplay(value),
       icon:     'icon icon-application',
-      showLink: matchHttps || matchSSH || matchOCI
+      showLink: matchHttps || matchSSH
     };
   }
 
@@ -203,7 +173,7 @@ export default class HelmOp extends FleetApplication {
       chart = this.spec.helm.chart || '';
       break;
     case SOURCE_TYPE.OCI: {
-      const parsed = parse(this.spec.helm.chart || '');
+      const parsed = parse(this.spec.helm.repo || '');
 
       chart = parsed?.path ? parsed?.path.substring(1) : '';
       break;

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

@@ -15,7 +15,8 @@ export default class Workspace extends HybridModel {
     const out = {
       clusterGroups: summary[FLEET.CLUSTER_GROUP]?.namespaces?.[name]?.count || 0,
       clusters:      summary[FLEET.CLUSTER]?.namespaces?.[name]?.count || 0,
-      gitRepos:      summary[FLEET.GIT_REPO]?.namespaces?.[name]?.count || 0
+      gitRepos:      summary[FLEET.GIT_REPO]?.namespaces?.[name]?.count || 0,
+      helmOps:       summary[FLEET.HELM_OP]?.namespaces?.[name]?.count || 0
     };
 
     return out;

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

@@ -0,0 +1,18 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+
+export default class OIDCClient extends SteveModel {
+  get details() {
+    return [
+      ...this._details, {
+        label:   this.t('oidcclient.redirectURIs.label'),
+        content: this.spec.redirectURIs?.join(', ')
+      }, {
+        label:   this.t('oidcclient.refreshTokenExpirationSeconds.detailLabel'),
+        content: this.spec.refreshTokenExpirationSeconds
+      }, {
+        label:   this.t('oidcclient.tokenExpirationSeconds.detailLabel'),
+        content: this.spec.tokenExpirationSeconds
+      }
+    ];
+  }
+}

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

@@ -0,0 +1,3 @@
+import SteveDescriptionModel from '@shell/plugins/steve/steve-description-class';
+
+export default class RancherRegistration extends SteveDescriptionModel { }

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

@@ -13,6 +13,7 @@ import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/label
 import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
 
 const RKE1_ALLOWED_ACTIONS = [
+  'promptRemove',
   'openShell',
   'downloadKubeConfig',
   'copyKubeConfig',
@@ -100,7 +101,7 @@ export default class ProvCluster extends SteveModel {
 
     const canEditRKE2cluster = this.isRke2 && ready && this.canUpdate;
 
-    const canSnapshot = ready && ((this.isRke2 && this.canUpdate) || (this.isRke1 && this.mgmt?.hasAction('backupEtcd')));
+    const canSnapshot = ready && this.isRke2 && this.canUpdate;
 
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
@@ -162,8 +163,8 @@ export default class ProvCluster extends SteveModel {
 
     const all = actions.concat(out);
 
-    // If the cluster is a KEV1 cluster then prevent edit
-    if (this.isKev1) {
+    // If the cluster is a KEV1 cluster or Harvester cluster then prevent edit
+    if (this.isKev1 || this.isHarvester) {
       const edit = all.find((action) => action.action === 'goToEdit');
 
       if (edit) {
@@ -719,7 +720,7 @@ export default class ProvCluster extends SteveModel {
   async copyKubeConfig() {
     await this.mgmt?.copyKubeConfig();
 
-    this.$dispatch('growl/success', {
+    this.$dispatch('growl/info', {
       title:   this.t('cluster.copiedConfig'),
       timeout: 3000,
     }, { root: true });
@@ -736,7 +737,7 @@ export default class ProvCluster extends SteveModel {
   async snapshotAction() {
     try {
       await this.takeSnapshot();
-      this.$dispatch('growl/success', {
+      this.$dispatch('growl/info', {
         title:   this.$rootGetters['i18n/t']('cluster.snapshot.successTitle', { name: this.nameDisplay }),
         message: this.$rootGetters['i18n/t']('cluster.snapshot.successMessage', { name: this.nameDisplay })
       }, { root: true });
@@ -756,7 +757,7 @@ export default class ProvCluster extends SteveModel {
     const successful = res.filter( (x) => x.status === 'fulfilled').length;
 
     if ( successful ) {
-      this.$dispatch('growl/success', {
+      this.$dispatch('growl/info', {
         title:   this.$rootGetters['i18n/t']('cluster.snapshot.bulkSuccessTitle'),
         message: this.$rootGetters['i18n/t']('cluster.snapshot.bulkSuccessMessage', { count: successful })
       }, { root: true });
@@ -822,33 +823,6 @@ export default class ProvCluster extends SteveModel {
     return this._stateObj;
   }
 
-  get rkeTemplate() {
-    if (!this.isRke1 || !this.mgmt) {
-      // Not an RKE! cluster or no management cluster available
-      return false;
-    }
-
-    if (!this.mgmt.spec?.clusterTemplateRevisionName) {
-      // Cluster does not use an RKE template
-      return false;
-    }
-
-    const clusterTemplateName = this.mgmt.spec.clusterTemplateName.replace(':', '/');
-    const clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
-    const template = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE).find((t) => t.id === clusterTemplateName);
-    const revision = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).find((t) => t.spec.enabled && t.id === clusterTemplateRevisionName);
-
-    if (!template || !revision) {
-      return false;
-    }
-
-    return {
-      displayName: `${ template.spec?.displayName }/${ revision.spec?.displayName }`,
-      template,
-      revision,
-    };
-  }
-
   get _stateObj() {
     if (!this.isRke2) {
       return this.mgmt?.stateObj || this.metadata?.state;
@@ -1011,6 +985,28 @@ export default class ProvCluster extends SteveModel {
     return null;
   }
 
+  /**
+   * Gets the options for fields that should be commented out in the YAML representation
+   * of the model. This is particularly useful for conditionally commenting out certain
+   * fields based on the model's configuration.
+   *
+   * @returns {null | Array.<{path: string, key: string}>}
+   * - `path`: A dot-separated string indicating the path to the object containing the key.
+   * - `key`: The specific key within the object at the given path that should be commented out.
+   */
+  get commentFieldsOptions() {
+    if ( this.isRke2 ) {
+      return [
+        {
+          path: 'spec.rkeConfig.machineGlobalConfig',
+          key:  'profile'
+        }
+      ];
+    }
+
+    return null;
+  }
+
   // JSON Paths that should be folded in the YAML editor by default
   get yamlFolding() {
     return [

package/models/secret.js

@@ -1,8 +1,8 @@
 import r from 'jsrsasign';
-import { CERTMANAGER, KUBERNETES } from '@shell/config/labels-annotations';
+import { CERTMANAGER, KUBERNETES, UI_PROJECT_SECRET, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import { removeObjects } from '@shell/utils/array';
-import { SERVICE_ACCOUNT } from '@shell/config/types';
+import { MANAGEMENT, SERVICE_ACCOUNT, VIRTUAL_TYPES } from '@shell/config/types';
 import { set } from '@shell/utils/object';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -10,6 +10,8 @@ import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboa
 import { diffFrom } from '@shell/utils/time';
 import day from 'dayjs';
 import { steveCleanForDownload } from '@shell/plugins/steve/resource-utils';
+import { STORE } from '@shell/store/store-types';
+import { escapeHtml } from '@shell/utils/string';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -159,6 +161,10 @@ export default class Secret extends SteveModel {
   }
 
   get canUpdate() {
+    if (this.isProjectSecretCopy) {
+      return false;
+    }
+
     if ( !this.hasLink('update') ) {
       return false;
     }
@@ -170,6 +176,20 @@ export default class Secret extends SteveModel {
     return this.$rootGetters['type-map/optionsFor'](this.type).isEditable;
   }
 
+  get canDelete() {
+    // Deleting a copy / synced secret that was created in a namespace in a project that has a project scoped secret
+    // will only be temporary (the parent project scoped secret will recreate it)
+    return this.isProjectSecretCopy ? false : super.canDelete;
+  }
+
+  get canCreate() {
+    return this.isProjectSecretCopy ? false : super.canCreate;
+  }
+
+  get canEditYaml() {
+    return this.isProjectSecretCopy ? false : super.canEditYaml;
+  }
+
   get keysDisplay() {
     const keys = [
       ...Object.keys(this.data || []),
@@ -470,4 +490,139 @@ export default class Secret extends SteveModel {
 
     return steveCleanForDownload(yaml, { rootKeys: ['id', 'links', 'actions'] });
   }
+
+  /**
+   * is this a project scoped secret .... or also a cloned project scoped secret
+   */
+  get isProjectScopedRelated() {
+    return !!this.metadata.labels?.[UI_PROJECT_SECRET];
+  }
+
+  /**
+   * is this a project scoped secret
+   */
+  get isProjectScoped() {
+    return this.isProjectScopedRelated && !this.isProjectSecretCopy && this.$rootGetters['isRancher'];
+  }
+
+  get projectScopedClusterId() {
+    if (!this.projectScopedProjectId) {
+      return undefined;
+    }
+
+    const clusterId = this.metadata.namespace.replace(`-${ this.projectScopedProjectId }`, '');
+
+    // default and system pss don't follow the patter of <cluster>-<project>, so if they match assume its one of them
+    return clusterId === this.metadata.namespace ? 'local' : clusterId;
+  }
+
+  get projectScopedProjectId() {
+    return this.metadata.labels?.[UI_PROJECT_SECRET];
+  }
+
+  get isProjectSecretCopy() {
+    return this.metadata?.annotations?.[UI_PROJECT_SECRET_COPY] === 'true';
+  }
+
+  get projectCluster() {
+    if (!this.isProjectScoped) {
+      return undefined;
+    }
+
+    return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.CLUSTER, this.projectScopedClusterId);
+  }
+
+  /**
+   * If this is a project scoped secret, return it
+   */
+  get project() {
+    if (!this.isProjectScoped ) {
+      return undefined;
+    }
+
+    return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ this.projectScopedClusterId }/${ this.projectScopedProjectId }`);
+  }
+
+  get projectScopedSecretCluster() {
+    if (!this.isProjectScoped ) {
+      return undefined;
+    }
+
+    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(/.*\//, '');
+
+      return {
+        name:   `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
+        params: {
+          product:   this.$rootGetters['productId'],
+          cluster:   this.$rootGetters['clusterId'],
+          namespace: this.metadata?.namespace,
+          resource:  VIRTUAL_TYPES.PROJECT_SECRETS,
+          id,
+        }
+      };
+    }
+
+    return this._detailLocation;
+  }
+
+  get listLocation() {
+    if (!this.isProjectScoped) {
+      return super.listLocation;
+    }
+
+    return {
+      name:   'c-cluster-product-resource',
+      params: {
+        product:  this.$rootGetters['productId'],
+        cluster:  this.$rootGetters['clusterId'],
+        resource: VIRTUAL_TYPES.PROJECT_SECRETS,
+      }
+    };
+  }
+
+  get parentNameOverride() {
+    if (!this.isProjectScoped) {
+      return super.parentNameOverride;
+    }
+
+    return this.$rootGetters['i18n/t'](`typeLabel."${ VIRTUAL_TYPES.PROJECT_SECRETS }"`, { count: 1 })?.trim();
+  }
+
+  get parentLocationOverride() {
+    if (!this.isProjectScoped) {
+      return super.parentNameOverride;
+    }
+
+    return this.listLocation;
+  }
+
+  get groupByProject() {
+    if (!this.isProjectScoped) {
+      return undefined;
+    }
+
+    return this.t('resourceTable.groupLabel.project', { name: escapeHtml(this?.project?.nameDisplay || '') }, true);
+  }
 }

package/models/service.js

@@ -152,6 +152,10 @@ export default class Service extends SteveModel {
     });
   }
 
+  async unWatchPods() {
+    return await this.$dispatch('unwatch', { type: POD, all: true });
+  }
+
   /**
    * This getter expects a superset of workload pods to have been fetched already
    *

package/models/workload.js

@@ -567,6 +567,10 @@ export default class Workload extends WorkloadService {
     return undefined;
   }
 
+  async unWatchPods() {
+    return await this.$dispatch('unwatch', { type: POD, all: true });
+  }
+
   /**
    * This getter expects a superset of workload pods to have been fetched already
    *
@@ -703,6 +707,7 @@ export default class Workload extends WorkloadService {
       $store:        this.$store || { getters: this.$rootGetters, dispatch: (action, args) => this.$dispatch(action.split('/')[1], args) },
       inStore:       this.$rootGetters['currentProduct'].inStore,
       namespace:     this.metadata.namespace,
+      transient:     true,
     });
 
     return matchInfo.matches;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.5-rc.5",
+  "version": "3.0.5-rc.7",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
-    "@rancher/icons": "2.0.29",
+    "@rancher/icons": "2.0.37",
     "@types/is-url": "1.2.30",
     "@types/node": "20.10.8",
     "@types/semver": "^7.5.8",

package/pages/about.vue

@@ -5,7 +5,6 @@ import BackRoute from '@shell/mixins/back-link';
 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';
 import TabTitle from '@shell/components/TabTitle';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
@@ -47,50 +46,27 @@ export default {
     },
     downloads() {
       return [
-        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find((s) => s.id === SETTING.CLI_URL.DARWIN)?.value, null),
-        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find((s) => s.id === SETTING.CLI_URL.LINUX)?.value, this.downloadLinuxImages),
-        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find((s) => s.id === SETTING.CLI_URL.WINDOWS)?.value, this.downloadWindowsImages)
+        this.createOSOption('about.os.mac', 'icon-apple', this.settings?.find((s) => s.id === SETTING.CLI_URL.DARWIN)?.value),
+        this.createOSOption('about.os.linux', 'icon-linux', this.settings?.find((s) => s.id === SETTING.CLI_URL.LINUX)?.value),
+        this.createOSOption('about.os.windows', 'icon-windows', this.settings?.find((s) => s.id === SETTING.CLI_URL.WINDOWS)?.value)
       ];
     },
-    downloadImageList() {
-      return this.downloads.filter((d) => !!d.imageList);
-    },
     downloadCli() {
       return this.downloads.filter((d) => !!d.cliLink);
     }
   },
   methods: {
-    createOSOption(label, icon, cliLink, imageList) {
+    createOSOption(label, icon, cliLink) {
       const slash = cliLink?.lastIndexOf('/');
 
       return {
         label,
         icon,
-        imageList,
         cliLink,
         cliFile: slash >= 0 ? cliLink.substr(slash + 1, cliLink.length - 1) : cliLink
       };
     },
 
-    async downloadLinuxImages() {
-      const res = await this.$store.dispatch('management/request', { url: '/v3/kontainerdrivers/rancher-images' });
-
-      try {
-        await downloadFile(`.rancher-linux-images.txt`, res.data);
-      } catch (error) {
-        this.$store.dispatch('growl/fromError', { title: 'Error downloading Linux image list', err: error }, { root: true });
-      }
-    },
-
-    async downloadWindowsImages() {
-      const res = await this.$store.dispatch('management/request', { url: '/v3/kontainerdrivers/rancher-windows-images' });
-
-      try {
-        await downloadFile(`.rancher-windows-images.txt`, res.data);
-      } catch (error) {
-        this.$store.dispatch('growl/fromError', { title: 'Error downloading Windows image list', err: error }, { root: true });
-      }
-    },
   }
 };
 </script>
@@ -215,36 +191,6 @@ export default {
         {{ t('about.versions.releaseNotes') }}
       </a>
     </p>
-    <template v-if="downloadImageList.length">
-      <h3 class="pt-40">
-        {{ t('about.downloadImageList.title') }}
-      </h3>
-      <table>
-        <tr
-          v-for="(d, i) in downloadImageList"
-          :key="i"
-        >
-          <th>
-            <div class="os">
-              <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
-            </div>
-          </th>
-          <td>
-            <a
-              v-if="d.imageList"
-              tabindex="0"
-              :data-testid="`image_list_download_link__${d.label}`"
-              role="link"
-              :aria-label="t('about.versions.downloadImages', { listName: t(d.label) })"
-              @click="d.imageList"
-              @keyup.enter="d.imageList"
-            >
-              {{ t('asyncButton.download.action') }}
-            </a>
-          </td>
-        </tr>
-      </table>
-    </template>
     <template v-if="downloadCli.length">
       <h3 class="pt-40">
         {{ t('about.downloadCLI.title') }}

package/pages/auth/login.vue

@@ -452,7 +452,7 @@ export default {
                   v-model:value="password"
                   data-testid="local-login-password"
                   :label="t('login.password')"
-                  autocomplete="password"
+                  autocomplete="current-password"
                 />
               </div>
             </div>

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

@@ -9,7 +9,6 @@ defineProps<{
 <template>
   <router-link
     :to="`/c/${clusterId}/apps/catalog.cattle.io.clusterrepo/create`"
-    target="_blank"
     class="add-repo-link"
     tabindex="0"
     :aria-label="t('catalog.charts.addNewRepo.ariaLabel')"