@rancher/shell 3.0.5-rc.2 → 3.0.5-rc.3

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/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
 

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

@@ -12,6 +12,14 @@ import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
 import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
 
+const RKE1_ALLOWED_ACTIONS = [
+  'openShell',
+  'downloadKubeConfig',
+  'copyKubeConfig',
+  'download',
+  'viewInApi'
+];
+
 /**
  * Class representing Cluster resource.
  * @extends SteveModel
@@ -41,17 +49,6 @@ export default class ProvCluster extends SteveModel {
       },
     ].filter((x) => !!x.content);
 
-    // RKE Template details
-    const rkeTemplate = this.rkeTemplate;
-
-    if (rkeTemplate) {
-      out.push({
-        label:     this.t('cluster.detail.rkeTemplate'),
-        formatter: 'RKETemplateName',
-        content:   rkeTemplate,
-      });
-    }
-
     if (!this.machineProvider) {
       out.splice(1, 1);
 
@@ -105,17 +102,6 @@ export default class ProvCluster extends SteveModel {
 
     const canSnapshot = ready && ((this.isRke2 && this.canUpdate) || (this.isRke1 && this.mgmt?.hasAction('backupEtcd')));
 
-    const clusterTemplatesSchema = this.$getters['schemaFor']('management.cattle.io.clustertemplate');
-    let canUpdateClusterTemplate = false;
-
-    if (clusterTemplatesSchema && (clusterTemplatesSchema.resourceMethods?.includes('blocked-PUT') || clusterTemplatesSchema.resourceMethods?.includes('PUT'))) {
-      canUpdateClusterTemplate = true;
-    }
-
-    const normanClusterSaveTemplateAction = !!this.normanCluster?.actions?.saveAsTemplate;
-
-    const canSaveRKETemplate = this.isRke1 && this.mgmt?.status?.driver === 'rancherKubernetesEngine' && !this.mgmt?.spec?.clusterTemplateName && this.hasLink('update') && canUpdateClusterTemplate && normanClusterSaveTemplateAction;
-
     const actions = [
       // Note: Actions are not supported in the Steve API, so we check
       // available actions for RKE1 clusters, but not RKE2 clusters.
@@ -158,12 +144,7 @@ export default class ProvCluster extends SteveModel {
         action:  'rotateEncryptionKey',
         label:   this.$rootGetters['i18n/t']('nav.rotateEncryptionKeys'),
         icon:    'icon icon-refresh',
-        enabled: canEditRKE2cluster || (this.isRke1 && this.mgmt?.hasAction('rotateEncryptionKey') && ready)
-      }, {
-        action:  'saveAsRKETemplate',
-        label:   this.$rootGetters['i18n/t']('nav.saveAsRKETemplate'),
-        icon:    'icon icon-folder',
-        enabled: canSaveRKETemplate,
+        enabled: canEditRKE2cluster
       }, { divider: true }];
 
     // Harvester Cluster 1:1 Harvester Cloud Cred
@@ -190,6 +171,15 @@ export default class ProvCluster extends SteveModel {
       }
     }
 
+    // If RKE1, then remove most of the actions
+    if (this.isRke1) {
+      all.forEach((action) => {
+        if (!action.divider && !RKE1_ALLOWED_ACTIONS.includes(action.action)) {
+          action.enabled = false;
+        }
+      });
+    }
+
     // If we have a helper that wants to modify the available actions, let it do it
     if (this.customProvisionerHelper?.availableActions) {
       // Provider can either modify the provided list or return one of its own
@@ -813,13 +803,6 @@ export default class ProvCluster extends SteveModel {
     this.$dispatch('promptRestore', [resource]);
   }
 
-  saveAsRKETemplate(cluster = this) {
-    this.$dispatch('promptModal', {
-      componentProps: { cluster },
-      component:      'SaveAsRKETemplateDialog'
-    });
-  }
-
   rotateCertificates(cluster = this) {
     this.$dispatch('promptModal', {
       componentProps: { cluster },
@@ -861,40 +844,11 @@ export default class ProvCluster extends SteveModel {
 
     return {
       displayName: `${ template.spec?.displayName }/${ revision.spec?.displayName }`,
-      upgrade:     this.rkeTemplateUpgrade,
       template,
       revision,
     };
   }
 
-  get rkeTemplateUpgrade() {
-    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 clusterTemplateRevisionName = this.mgmt.spec.clusterTemplateRevisionName.replace(':', '/');
-
-    // Get all of the template revisions for this template
-    const revisions = this.$rootGetters['management/all'](MANAGEMENT.RKE_TEMPLATE_REVISION).filter((t) => t.spec.enabled && t.spec.clusterTemplateName === this.mgmt.spec.clusterTemplateName);
-
-    if (revisions.length <= 1) {
-      // Only one template revision
-      return false;
-    }
-
-    revisions.sort((a, b) => {
-      return parseInt(a.metadata.resourceVersion, 10) - parseInt(b.metadata.resourceVersion, 10);
-    }).reverse();
-
-    return revisions[0].id !== clusterTemplateRevisionName ? revisions[0].spec?.displayName : false;
-  }
-
   get _stateObj() {
     if (!this.isRke2) {
       return this.mgmt?.stateObj || this.metadata?.state;

package/models/service.js

@@ -1,6 +1,7 @@
 import find from 'lodash/find';
 import { POD } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { parse } from '@shell/utils/selector';
 
 // i18n-uses servicesPage.serviceTypes.clusterIp.*, servicesPage.serviceTypes.externalName.*, servicesPage.serviceTypes.headless.*
 // i18n-uses servicesPage.serviceTypes.loadBalancer.*, servicesPage.serviceTypes.nodePort.*
@@ -49,7 +50,7 @@ export const CLUSTERIP = (() => {
   return clusterIp.id;
 })();
 
-export default class extends SteveModel {
+export default class Service extends SteveModel {
   get customValidationRules() {
     return [
       {
@@ -137,18 +138,32 @@ export default class extends SteveModel {
   }
 
   async fetchPods() {
-    if (this.podRelationship) {
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-      await this.$dispatch('cluster/findMatching', {
-        type:      POD,
-        selector:  this.podRelationship.selector,
-        namespace: this.namespace
-      }, { root: true });
+    if (!this.podRelationship) {
+      // If empty or not present, the service is assumed to have an external process managing its endpoints
+      return [];
     }
+
+    return await this.$dispatch('findLabelSelector', {
+      type:     POD,
+      matching: {
+        namespace:     this.metadata.namespace,
+        labelSelector: { matchExpressions: parse(this.podRelationship?.selector) },
+      }
+    });
   }
 
+  /**
+   * This getter expects a superset of workload pods to have been fetched already
+   *
+   * It assumes fetchPods has been called and should be used instead of the response of fetchPods
+   * (findAll --> findLabelSelector world results won't trigger change detection)
+   */
   get pods() {
-    return this.podRelationship ? this.$getters.matching( POD, this.podRelationship.selector, this.namespace ) : [];
+    if (this.podRelationship?.selector) {
+      return this.$getters['matchingLabelSelector'](POD, { matchExpressions: parse(this.podRelationship?.selector) }, this.metadata.namespace);
+    } else {
+      return [];
+    }
   }
 
   get serviceType() {

package/models/workload.js

@@ -3,9 +3,10 @@ import { TIMESTAMP, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotat
 import { WORKLOAD_TYPES, SERVICE, POD } from '@shell/config/types';
 import { get, set } from '@shell/utils/object';
 import day from 'dayjs';
-import { convertSelectorObj, matching, matches } from '@shell/utils/selector';
+import { convertSelectorObj, parse } from '@shell/utils/selector';
 import { SEPARATOR } from '@shell/config/workload';
 import WorkloadService from '@shell/models/workload.service';
+import { matching } from '@shell/utils/selector-typed';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -18,6 +19,7 @@ export const defaultContainer = {
   },
   volumeMounts: []
 };
+
 export default class Workload extends WorkloadService {
   // remove clone as yaml/edit as yaml until API supported
   get _availableActions() {
@@ -205,22 +207,20 @@ export default class Workload extends WorkloadService {
     return this.goToEdit({ sidecar: true });
   }
 
-  get showPodRestarts() {
-    return true;
-  }
-
   get restartCount() {
-    const pods = this.pods;
+    return this.pods.reduce((total, pod) => {
+      const { status:{ containerStatuses = [] } } = pod;
 
-    let sum = 0;
+      if (containerStatuses.length) {
+        total += containerStatuses.reduce((tot, container) => {
+          tot += container.restartCount || 0;
 
-    pods.forEach((pod) => {
-      if (pod.status.containerStatuses) {
-        sum += pod.status?.containerStatuses[0].restartCount || 0;
+          return tot;
+        }, 0);
       }
-    });
 
-    return sum;
+      return total;
+    }, 0);
   }
 
   get hasSidecars() {
@@ -334,6 +334,10 @@ export default class Workload extends WorkloadService {
     const type = this._type ? this._type : this.type;
 
     const detailItem = {
+      restarts: {
+        label:   this.t('resourceDetail.masthead.restartCount'),
+        content: this.restartCount
+      },
       endpoint: {
         label:     'Endpoints',
         content:   this.endpoint,
@@ -400,10 +404,13 @@ export default class Workload extends WorkloadService {
       });
     }
 
-    out.push( {
+    out.push({
       label:     'Image',
       content:   this.imageNames,
       formatter: 'PodImages'
+    }, {
+      label:   detailItem.restarts.label,
+      content: detailItem.restarts.content,
     });
 
     switch (type) {
@@ -550,30 +557,56 @@ export default class Workload extends WorkloadService {
     }
   }
 
-  get pods() {
-    const relationships = this.metadata?.relationships || [];
-    const podRelationship = relationships.filter((relationship) => relationship.toType === POD)[0];
+  async fetchPods() {
+    if (this.podMatchExpression) {
+      return this.$dispatch('findLabelSelector', {
+        type:     POD,
+        matching: {
+          namespace:     this.metadata.namespace,
+          labelSelector: { matchExpressions: this.podMatchExpression },
+        },
+      });
+    }
 
-    if (podRelationship) {
-      const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
+    return undefined;
+  }
 
-      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-      return pods.filter((obj) => {
-        return matches(obj, podRelationship.selector);
-      });
+  /**
+   * This getter expects a superset of workload pods to have been fetched already
+   *
+   * It assumes fetchPods has been called and should be used instead of the response of fetchPods
+   * (findAll --> findLabelSelector world results won't trigger change detection)
+   */
+  get pods() {
+    if (this.podMatchExpression) {
+      return this.$getters['matchingLabelSelector'](POD, { matchExpressions: this.podMatchExpression }, this.metadata.namespace);
     } else {
       return [];
     }
   }
 
-  get podGauges() {
+  /**
+   * Return a string version of a matchLabel expression
+   */
+  get podSelector() {
+    const relationships = this.metadata?.relationships || [];
+    const selector = relationships.filter((relationship) => relationship.toType === POD)[0]?.selector;
+
+    return selector;
+  }
+
+  get podMatchExpression() {
+    return this.podSelector ? parse(this.podSelector) : null;
+  }
+
+  calcPodGauges(pods) {
     const out = { };
 
-    if (!this.pods) {
+    if (!pods) {
       return out;
     }
 
-    this.pods.map((pod) => {
+    pods.map((pod) => {
       const { stateColor, stateDisplay } = pod;
 
       if (out[stateDisplay]) {
@@ -589,6 +622,10 @@ export default class Workload extends WorkloadService {
     return out;
   }
 
+  get podGauges() {
+    return this.calcPodGauges(this.pods);
+  }
+
   // Job Specific
   get jobRelationships() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
@@ -664,13 +701,15 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
-    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
-    const all = await this.$dispatch('findAll', { type: POD });
-    const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
-
-    const selector = convertSelectorObj(this.spec.selector);
+    const matchInfo = await matching({
+      labelSelector: { matchExpressions: convertSelectorObj(this.spec.selector) },
+      type:          POD,
+      $store:        this.$store || { getters: this.$rootGetters, dispatch: (action, args) => this.$dispatch(action.split('/')[1], args) },
+      inStore:       this.$rootGetters['currentProduct'].inStore,
+      namespace:     this.metadata.namespace,
+    });
 
-    return matching(allInNamespace, selector);
+    return matchInfo.matches;
   }
 
   cleanForSave(data) {

package/package.json

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

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

@@ -333,7 +333,6 @@ export default {
       this.chartValues = mergeWithReplace(
         merge({}, this.versionInfo?.values || {}),
         userValues,
-        { replaceObjectProps: true }
       );
 
       if (this.showCustomRegistry) {

package/pages/c/_cluster/explorer/index.vue

@@ -513,6 +513,13 @@ export default {
     },
 
     getAgentStatus(resources, opt = { checkDisconnected: false }) {
+      // If there is a single resource that is null, then there was an error fetching the status, which
+      // is most likely because the user does not have permission, so we should hide the agent status
+      // as we can not determine what it is
+      if (resources.length === 1 && resources[0] === null) {
+        return { state: STATES_ENUM.OFF };
+      }
+
       if (resources.find((resource) => resource === 'loading')) {
         return { state: STATES_ENUM.IN_PROGRESS };
       }
@@ -1000,5 +1007,9 @@ export default {
       color: var(--success)
     }
   }
+
+  &.off {
+    display: none;
+  }
 }
 </style>

package/pages/c/_cluster/longhorn/index.vue

@@ -12,9 +12,9 @@ export default {
 
   async fetch() {
     if ( this.$store.getters['cluster/schemaFor'](SERVICE) ) {
-      this.uiServices = await this.$store.dispatch('cluster/findMatching', {
+      this.uiServices = await this.$store.dispatch('cluster/findLabelSelector', {
         type:     SERVICE,
-        selector: 'app=longhorn-ui'
+        matching: { labelSelector: { matchLabels: { app: 'longhorn-ui' } } }
       });
     }
   },

package/pages/c/_cluster/settings/banners.vue

@@ -26,6 +26,7 @@ const DEFAULT_BANNER_SETTING = {
     fontSize:       '14px',
     textDecoration: null,
     text:           null,
+    html:           null,
   },
   bannerFooter: {
     background:     null,
@@ -35,7 +36,8 @@ const DEFAULT_BANNER_SETTING = {
     fontStyle:      null,
     fontSize:       '14px',
     textDecoration: null,
-    text:           null
+    text:           null,
+    html:           null,
   },
   bannerConsent: {
     background:     null,
@@ -47,6 +49,7 @@ const DEFAULT_BANNER_SETTING = {
     textDecoration: null,
     text:           null,
     button:         null,
+    html:           null,
   },
   showHeader:  'false',
   showFooter:  'false',
@@ -71,6 +74,7 @@ export default {
     Object.assign(this, hash);
 
     this.uiBannerIndividual = getIndividualBanners(this.$store);
+    this.overlayDefaults(this.bannerVal);
   },
 
   data() {
@@ -127,12 +131,26 @@ export default {
           this.bannerVal = this.checkOrUpdateLegacyUIBannerSetting(parsedBanner);
 
           overlayIndividualBanners(this.bannerVal, this.uiBannerIndividual);
+          this.overlayDefaults(this.bannerVal);
         } catch {}
       }
     }
   },
 
   methods: {
+    // We remove some of the defaults (e.g. font size) when we save as HTML
+    // so add them back in so that if the user switches back to text, they have those defaults
+    overlayDefaults(value) {
+      Object.keys(value).forEach((key) => {
+        if (key.startsWith('banner')) {
+          value[key] = {
+            ...DEFAULT_BANNER_SETTING[key] || {},
+            ...value[key]
+          };
+        }
+      });
+    },
+
     checkOrUpdateLegacyUIBannerSetting(parsedBanner) {
       const {
         bannerHeader, bannerFooter, bannerConsent, banner, loginError
@@ -175,8 +193,44 @@ export default {
       return parsedBanner;
     },
 
+    tidy(val) {
+      Object.keys(val).forEach((k) => {
+        if (k.startsWith('banner')) {
+          const banner = val[k];
+          const isHtml = banner.isHtml === undefined ? !!banner.html : banner.isHtml;
+
+          if (isHtml) {
+            banner.html = banner.html?.trim(); // Remove any whitespace at start and end
+            delete banner.text;
+
+            // Remove all of the fields for text formatting (not needed for HTML)
+            delete banner.textAlignment;
+            delete banner.textDecoration;
+            delete banner.fontWeight;
+            delete banner.fontStyle;
+            delete banner.fontSize;
+          } else {
+            delete banner.html;
+          }
+
+          delete banner.isHtml;
+
+          Object.keys(banner).forEach((f) => {
+            if (banner[f] === null) {
+              delete banner[f];
+            }
+          });
+        }
+      });
+
+      return val;
+    },
+
     async save(btnCB) {
-      this.uiBannerSetting.value = JSON.stringify(this.bannerVal);
+      // Clone the value - we'll tidy it up before save, but want to keep the full value in case the save errors
+      const cpy = JSON.parse(JSON.stringify(this.bannerVal));
+
+      this.uiBannerSetting.value = JSON.stringify(this.tidy(cpy));
 
       this.errors = [];
 

package/pages/c/_cluster/settings/performance.vue

@@ -14,12 +14,10 @@ import paginationUtils from '@shell/utils/pagination-utils';
 import Collapse from '@shell/components/Collapse';
 
 const incompatible = {
-  incrementalLoading: ['forceNsFilterV2', 'serverPagination'],
-  manualRefresh:      ['forceNsFilterV2', 'serverPagination'],
+  incrementalLoading: ['forceNsFilterV2'],
+  manualRefresh:      ['forceNsFilterV2'],
   forceNsFilterV2:    ['incrementalLoading', 'manualRefresh'],
-  serverPagination:   ['incrementalLoading', 'manualRefresh'],
 };
-
 const l10n = {
   incrementalLoading: 'incrementalLoad',
   manualRefresh:      'manualRefresh',
@@ -97,10 +95,6 @@ export default {
       return this.$store.getters['features/get'](STEVE_CACHE);
     },
 
-    steveCacheAndSSPEnabled() {
-      return this.steveCacheEnabled && this.value.serverPagination.enabled;
-    },
-
     sspApplicableResources() {
       const storeResources = [];
       const stores = paginationUtils.getStoreSettings(this.value.serverPagination);
@@ -257,27 +251,14 @@ export default {
           </h2>
           <p>{{ t('performance.serverPagination.description') }}</p>
           <Banner
-            v-if="!steveCacheEnabled"
-            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
             color="warning"
-          />
-          <Banner
-            color="error"
-            label-key="performance.serverPagination.experimental"
-          />
-          <Checkbox
-            v-model:value="value.serverPagination.enabled"
-            :mode="mode"
-            :label="t('performance.serverPagination.checkboxLabel')"
-            class="mt-10 mb-10"
-            :primary="true"
-            :disabled="!steveCacheEnabled"
-            @update:value="compatibleWarning('serverPagination', $event)"
-          />
+          >
+            <div v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)" />
+          </Banner>
           <Collapse
             :title="t('performance.serverPagination.applicable')"
-            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
-            :isDisabled="!steveCacheAndSSPEnabled"
+            :open="steveCacheEnabled && ssPApplicableTypesOpen"
+            :isDisabled="!steveCacheEnabled"
             @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
           >
             <p