dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

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

@@ -0,0 +1,202 @@
+import { parse } from '@shell/utils/url';
+import { insertAt } from '@shell/utils/array';
+import { set } from '@shell/utils/object';
+import { SOURCE_TYPE } from '@shell/config/product/fleet';
+import FleetUtils from '@shell/utils/fleet';
+import { FLEET } from '@shell/config/types';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+import FleetApplication from '@shell/models/fleet-application';
+
+export default class HelmOp extends FleetApplication {
+  applyDefaults() {
+    const spec = this.spec || {};
+    const meta = this.metadata || {};
+
+    meta.namespace = this.$rootGetters['workspace'];
+
+    spec.helm = spec.helm || {};
+
+    spec['correctDrift'] = { enabled: false };
+
+    set(this, 'spec', spec);
+    set(this, 'metadata', meta);
+  }
+
+  get _availableActions() {
+    const out = super._availableActions;
+
+    insertAt(out, 0, {
+      action:   'pause',
+      label:    this.t('fleet.helmOp.actions.pause.label'),
+      icon:     'icon icon-pause',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.paused
+    });
+
+    insertAt(out, 1, {
+      action:   'unpause',
+      label:    this.t('fleet.helmOp.actions.unpause.label'),
+      icon:     'icon icon-play',
+      bulkable: true,
+      enabled:  !!this.links.update && this.spec?.paused === true
+    });
+
+    insertAt(out, 5, { divider: true });
+
+    return out;
+  }
+
+  get dashboardIcon() {
+    return FleetUtils.dashboardIcons[FLEET.HELM_OP];
+  }
+
+  get resourceIcon() {
+    return FleetUtils.resourceIcons[FLEET.HELM_OP];
+  }
+
+  github(value) {
+    const url = (value || '');
+
+    const matchHttps = url.match(FleetUtils.GIT_HTTPS_REGEX);
+
+    if (matchHttps) {
+      return matchHttps[1];
+    }
+
+    const matchSSH = url.match(FleetUtils.GIT_SSH_REGEX);
+
+    if (matchSSH) {
+      return FleetUtils.parseSSHUrl(matchSSH[0]).repoPath;
+    }
+
+    return false;
+  }
+
+  sourceDisplay(repo) {
+    if (!repo) {
+      return null;
+    }
+
+    const github = this.github(repo);
+
+    if (github) {
+      return github;
+    }
+
+    repo = repo.replace(/.git$/, '');
+    repo = repo.replace(/^https:\/\//, '');
+    repo = repo.replace(/\/+$/, '');
+
+    return repo;
+  }
+
+  /**
+   *  Source type examples:
+   *
+   *  tarball:
+   *    chart: https://github.com/rancher/fleet-helm-charts/releases/download/fleet-0.12.1-beta.2/fleet-0.12.1-beta.2.tgz
+   *  repo:
+   *    repo: https://rancher.github.io/fleet-helm-charts/
+   *    chart: fleet-agent
+   *    version: 0.12.1-beta.2
+   *  oci:
+   *    repo: oci://ghcr.io/rancher/fleet-test-configmap-chart
+   *    version: the-tag
+   */
+  get sourceType() {
+    if (this.spec.helm?.repo?.startsWith('oci://')) {
+      return SOURCE_TYPE.OCI;
+    }
+
+    if (this.spec.helm?.repo && this.spec.helm?.chart) {
+      return SOURCE_TYPE.REPO;
+    }
+
+    if (this.spec.helm?.chart) {
+      return SOURCE_TYPE.TARBALL;
+    }
+
+    return null;
+  }
+
+  get source() {
+    let value = '';
+
+    switch (this.sourceType) {
+    case SOURCE_TYPE.REPO:
+      value = this.spec.helm?.repo || '';
+      break;
+    case SOURCE_TYPE.OCI: {
+      const parsed = parse(this.spec.helm?.repo || '');
+
+      value = parsed?.host ? `oci://${ parsed.host }` : '';
+      break;
+    }
+    case SOURCE_TYPE.TARBALL:
+      value = this.spec.helm?.chart || '';
+    }
+
+    const matchHttps = value.match(FleetUtils.HTTP_REGEX);
+    const matchSSH = value.match(FleetUtils.GIT_SSH_REGEX);
+
+    if (matchSSH) {
+      const { sshUserAndHost, repoPath } = FleetUtils.parseSSHUrl(matchSSH[0]);
+
+      value = `https://${ sshUserAndHost.replace('git@', '') }/${ repoPath }`;
+    }
+
+    return {
+      value,
+      display:  this.sourceDisplay(value),
+      icon:     'icon icon-application',
+      showLink: !!(matchHttps || matchSSH)
+    };
+  }
+
+  get sourceSub() {
+    // Version label
+    const semanticVersion = this.spec.helm?.version || '';
+    const installedVersion = this.status?.version || '';
+
+    let labelVersion = semanticVersion || installedVersion || '';
+
+    if (semanticVersion && installedVersion && semanticVersion !== installedVersion) {
+      labelVersion = `${ semanticVersion } -> ${ installedVersion }`;
+    }
+
+    // Chart label
+    let chart = '';
+
+    switch (this.sourceType) {
+    case SOURCE_TYPE.REPO:
+      chart = this.spec.helm.chart || '';
+      break;
+    case SOURCE_TYPE.OCI: {
+      const parsed = parse(this.spec.helm.repo || '');
+
+      chart = parsed?.path ? parsed?.path.substring(1) : '';
+      break;
+    }
+    }
+
+    // Concat chart label and version label
+    let value = chart || labelVersion || '';
+
+    if (chart && labelVersion) {
+      value = `${ chart } : ${ labelVersion }`;
+    }
+
+    return {
+      value,
+      display: value,
+    };
+  }
+
+  get bundles() {
+    return this.$getters['matching'](FLEET.BUNDLE, { [FLEET_ANNOTATIONS.HELM_NAME]: this.name }, this.namespace);
+  }
+
+  get bundleDeployments() {
+    return this.$getters['matching'](FLEET.BUNDLE_DEPLOYMENT, { [FLEET_ANNOTATIONS.HELM_NAME]: this.name });
+  }
+}

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

@@ -16,6 +16,7 @@ export const configType = {
   github:          'oauth',
   keycloakoidc:    'oidc',
   genericoidc:     'oidc',
+  cognito:         'oidc',
 };
 
 const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };

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

@@ -106,10 +106,6 @@ export default class MgmtCluster extends SteveModel {
     return null;
   }
 
-  get rkeTemplateVersion() {
-    return this.spec?.clusterTemplateRevisionName;
-  }
-
   get providerForEmberParam() {
     // Ember wants one word called provider to tell what component to show, but has much indirect mapping to figure out what it is.
     let provider;
@@ -136,14 +132,6 @@ export default class MgmtCluster extends SteveModel {
   }
 
   get emberEditPath() {
-    let clusterTemplateRevision;
-
-    // If the RKE1 cluster is created from an RKE template, we need
-    // to get the template version to pass into the Ember UI for
-    // the iFramed edit cluster form
-    if (this.rkeTemplateVersion) {
-      clusterTemplateRevision = this.rkeTemplateVersion;
-    }
     const provider = this.providerForEmberParam;
 
     // Avoid passing falsy values as query parameters
@@ -153,10 +141,6 @@ export default class MgmtCluster extends SteveModel {
       qp['provider'] = provider;
     }
 
-    if (clusterTemplateRevision) {
-      qp['clusterTemplateRevision'] = clusterTemplateRevision;
-    }
-
     // Copied out of https://github.com/rancher/ui/blob/20f56dc54c4fc09b5f911e533cb751c13609adaf/app/models/cluster.js#L844
     if ( provider === 'import' && isEmpty(this.eksConfig) && isEmpty(this.gkeConfig) ) {
       qp.importProvider = 'other';
@@ -168,10 +152,6 @@ export default class MgmtCluster extends SteveModel {
       qp.importProvider = KONTAINER_TO_DRIVER[provider];
     }
 
-    if ( this.clusterTemplateRevisionId ) {
-      qp.clusterTemplateRevision = this.clusterTemplateRevisionId;
-    }
-
     const path = addParams(`/c/${ escape(this.id) }/edit`, qp);
 
     return path;

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

@@ -51,6 +51,12 @@ export default class Feature extends HybridModel {
   }
 
   toggleFeatureFlag(resources = this) {
-    this.$dispatch('promptUpdate', resources);
+    this.$dispatch('promptModal', {
+      component:  'FeatureFlagListDialog',
+      resources:  !Array.isArray(resources) ? [resources] : resources,
+      modalWidth: '450',
+      height:     'auto',
+      styles:     'max-height: 100vh;'
+    });
   }
 }

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

@@ -1,6 +1,7 @@
 import { COUNT, FLEET, NORMAN } from '@shell/config/types';
 import { filterBy } from '@shell/utils/array';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 export default class Workspace extends HybridModel {
   get isLocal() {
@@ -14,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;
@@ -41,6 +43,13 @@ export default class Workspace extends HybridModel {
     return forWorkspace;
   }
 
+  get helmOps() {
+    const all = this.$getters['all'](FLEET.HELM_OP);
+    const forWorkspace = filterBy(all, 'namespace', this.id);
+
+    return forWorkspace;
+  }
+
   get basicNorman() {
     if (this.id) {
       return this.$dispatch(`rancher/find`, { id: this.id, type: NORMAN.FLEET_WORKSPACES }, { root: true });
@@ -87,4 +96,8 @@ export default class Workspace extends HybridModel {
   get confirmRemove() {
     return true;
   }
+
+  get systemAnnotations() {
+    return [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT];
+  }
 }

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

@@ -4,37 +4,22 @@ import {
 } from '@shell/config/types';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
-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';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'goToViewYaml',
+  'download',
+  'viewInApi'
+];
+
 export default class MgmtNode extends HybridModel {
   get _availableActions() {
     const out = super._availableActions;
 
-    const downloadKeys = {
-      action:  'downloadKeys',
-      enabled: !!this.norman?.links?.nodeConfig,
-      icon:    'icon icon-fw icon-download',
-      label:   this.t('node.actions.downloadNodeConfig'),
-    };
-
-    const scaleDown = {
-      action:     'scaleDown',
-      bulkAction: 'scaleDown',
-      enabled:    !!this.canScaleDown,
-      icon:       'icon icon-minus icon-fw',
-      label:      this.t('node.actions.scaleDown'),
-      bulkable:   true,
-    };
-
-    insertAt(out, 0, { divider: true });
-    insertAt(out, 0, downloadKeys);
-    insertAt(out, 0, scaleDown);
-
-    return out;
+    return out.filter((a) => a.divider || RKE1_ALLOWED_ACTIONS.includes(a.action));
   }
 
   get kubeNodeName() {

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

@@ -3,7 +3,19 @@ import { sortBy } from '@shell/utils/sort';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'goToViewYaml',
+  'download',
+  'viewInApi'
+];
+
 export default class MgmtNodePool extends HybridModel {
+  get _availableActions() {
+    const out = super._availableActions;
+
+    return out.filter((a) => a.divider || RKE1_ALLOWED_ACTIONS.includes(a.action));
+  }
+
   get nodeTemplateId() {
     return (this.spec?.nodeTemplateName || '').replace(/:/, '/');
   }

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/management.cattle.io.setting.js

@@ -2,7 +2,6 @@ import { ALLOWED_SETTINGS } from '@shell/config/settings';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { isServerUrl } from '@shell/utils/validators/setting';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
-import { harvester2cloud } from '@shell/utils/router'
 import {
   _EDIT,
   _UNFLAG,

package/models/namespace.js

@@ -11,6 +11,11 @@ import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { hasPSALabels, getPSATooltipsDescription, getPSALabels } from '@shell/utils/pod-security-admission';
 import { PSAIconsDisplay, PSALabelsNamespaceVersion } from '@shell/config/pod-security-admission';
 
+/**
+ * obscure namespaces are reserved and have special meaning if they're also classed as `system`
+ *
+ * (by default hidden from user given by default `show dynamic namespaces` preference is disabled and `user namespaces` filter is on)
+ */
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
 
@@ -73,7 +78,13 @@ export default class Namespace extends SteveModel {
   }
 
   move(resources = this) {
-    this.$dispatch('promptMove', resources);
+    this.$dispatch('promptModal', {
+      component:  'MoveNamespaceDialog',
+      resources:  !Array.isArray(resources) ? [resources] : resources,
+      modalWidth: '440',
+      height:     'auto',
+      styles:     'max-height: 100vh;'
+    });
   }
 
   get isSystem() {