@rancher/shell 0.3.8 → 0.3.10

package/edit/workload/Job.vue

@@ -265,7 +265,7 @@ export default {
               >
                 {{ t('workload.upgrading.terminationGracePeriodSeconds.label') }}
                 <i
-                  v-tooltip="t('workload.upgrading.terminationGracePeriodSeconds.tip')"
+                  v-clean-tooltip="t('workload.upgrading.terminationGracePeriodSeconds.tip')"
                   class="icon icon-info"
                 />
               </label>
@@ -326,7 +326,7 @@ export default {
             >
               {{ t('workload.upgrading.terminationGracePeriodSeconds.label') }}
               <i
-                v-tooltip="t('workload.upgrading.terminationGracePeriodSeconds.tip')"
+                v-clean-tooltip="t('workload.upgrading.terminationGracePeriodSeconds.tip')"
                 class="icon icon-info"
               />
             </label>

package/edit/workload/index.vue

@@ -252,7 +252,7 @@ export default {
                 <h3>
                   {{ t('workload.container.ports.expose') }}
                   <i
-                    v-tooltip="t('workload.container.ports.toolTip')"
+                    v-clean-tooltip="t('workload.container.ports.toolTip')"
                     class="icon icon-info"
                   />
                 </h3>

package/edit/workload/mixins/workload.js

@@ -12,6 +12,7 @@ import {
   CAPI,
   POD,
   LIST_WORKLOAD_TYPES,
+  HCI,
 } from '@shell/config/types';
 import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -49,6 +50,7 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import formRulesGenerator from '@shell/utils/validators/formRules';
 import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { defaultContainer } from '@shell/models/workload';
+import { allHash } from '@shell/utils/promise';
 
 const TAB_WEIGHT_MAP = {
   general:              99,
@@ -143,7 +145,11 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER });
+    // TODO Should remove these lines
+    await allHash({
+      rancherClusters:  this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
+      harvesterConfigs: this.$store.dispatch('management/findAll', { type: HCI.HARVESTER_CONFIG }),
+    });
 
     // don't block UI for these resources
     this.resourceManagerFetchSecondaryResources(this.secondaryResourceData);

package/edit/workload/storage/__tests__/Storage.test.ts

@@ -2,20 +2,99 @@ import { mount } from '@vue/test-utils';
 import Storage from '@shell/edit//workload/storage/index.vue';
 
 describe('component: Storage', () => {
-  // TODO: Complete test after integrating #5631
+  describe.each([
+    'awsElasticBlockStore',
+    'azureDisk',
+    'azureFile',
+    'configMap',
+    // 'createPVC',
+    'csi',
+    'emptyDir',
+    'gcePersistentDisk',
+    'gcePersistentDisk',
+    'hostPath',
+    'secret',
+    'vsphereVolume'
+  ])('given volume type %p', (volumeType) => {
+    it('should display the volume name as first input of the form array', () => {
+      const name = 'whatever';
+      const wrapper = mount(Storage, {
+        propsData: {
+          savePvcHookName: '',
+          value:           {
+            volumes: [{
+              _type:        volumeType,
+              [volumeType]: {},
+              name
+            }]
+          },
+        },
+        mocks: {
+          t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
+          $store: {
+            getters: {
+              'i18n/t':      jest.fn(),
+              'i18n/exists': jest.fn()
+            }
+          }
+        },
+      });
+
+      const input = wrapper.find('input').element as HTMLInputElement;
+
+      expect(input.value).toStrictEqual(name);
+    });
+
+    it('should edit the volume name', () => {
+      const name = 'whatever';
+      const newName = 'new whatever';
+      const wrapper = mount(Storage, {
+        propsData: {
+          savePvcHookName: '',
+          value:           {
+            volumes: [{
+              _type:        volumeType,
+              [volumeType]: {},
+              name
+            }]
+          },
+        },
+        mocks: {
+          t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
+          $store: {
+            getters: {
+              'i18n/t':      jest.fn(),
+              'i18n/exists': jest.fn()
+            }
+          }
+        },
+      });
+
+      wrapper.find('input').setValue(newName);
+
+      expect(wrapper.vm.value.volumes[0].name).toStrictEqual(newName);
+    });
+  });
+
+  // TODO: find how to interact with the tooltip selection outside of the component
   // eslint-disable-next-line jest/no-disabled-tests
   it.skip('should allow to add a new volume', async() => {
     const wrapper = mount(Storage, {
       propsData: { savePvcHookName: '' },
       mocks:     {
-        t:      (text: string) => text, // Fixes another issue with another i18n logic not from the getters
+        t:      (text: string) => text, // Mock i18n global function used as alternative to the getter
         $store: { getters: { 'i18n/t': jest.fn() } }
       },
     });
 
-    await wrapper.find('#add-volume').trigger('click');
-    const title = wrapper.find('h3');
+    await wrapper.find('#select-volume').trigger('click');
+    await wrapper.trigger('keydown.down');
+    await wrapper.trigger('keydown.enter');
 
-    expect(title.isVisible).toBe(true);
+    expect(wrapper.vm.value.volumes[0]).toStrictEqual({
+      _type:                'awsElasticBlockStore',
+      awsElasticBlockStore: {},
+      name:                 ''
+    });
   });
 });

package/initialize/index.js

@@ -19,6 +19,7 @@ import plugins from '../core/plugins.js';
 import pluginsLoader from '../core/plugins-loader.js';
 import axiosShell from '../plugins/axios';
 import '../plugins/tooltip';
+import '../plugins/clean-tooltip-directive';
 import '../plugins/vue-clipboard2';
 import '../plugins/v-select';
 import '../plugins/directives';

package/layouts/default.vue

@@ -667,7 +667,7 @@ export default {
           </nuxt-link>
 
           <span
-            v-tooltip="{content: displayVersion, placement: 'top'}"
+            v-clean-tooltip="{content: displayVersion, placement: 'top'}"
             class="clip version text-muted"
           >
             {{ displayVersion }}

package/mixins/chart.js

@@ -14,7 +14,7 @@ import { CAPI, CATALOG } from '@shell/config/types';
 import { isPrerelease } from '@shell/utils/version';
 import difference from 'lodash/difference';
 import { LINUX } from '@shell/store/catalog';
-import { clone } from 'utils/object';
+import { clone } from '@shell/utils/object';
 import { merge } from 'lodash';
 
 export default {

package/mixins/resource-fetch-namespaced.js

@@ -1,5 +1,7 @@
+import { NAMESPACE_FILTER_NS_PREFIX, NAMESPACE_FILTER_P_PREFIX } from '@shell/utils/namespace-filter';
 import { mapGetters } from 'vuex';
 import { ResourceListComponentName } from '../components/ResourceList/resource-list.config';
+import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
 
 /**
  * Companion mixin used with `resource-fetch` for `ResourceList` to determine if the user needs to filter the list by a single namespace
@@ -11,46 +13,53 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['currentProduct', 'currentCluster', 'isSingleNamespace']),
+    ...mapGetters(['currentProduct', 'currentCluster', 'namespaceFilters']),
 
     /**
      * Does the user need to update the filter to supply a single namespace?
      */
     namespaceFilterRequired() {
-      return this.__namespaceRequired && !this.__singleNamespaceFilter;
+      return this.__namespaceRequired && !this.__validFilter;
     },
 
     /**
      * Returns the namespace that requests should be filtered by
      */
     namespaceFilter() {
-      return this.__namespaceRequired ? this.__singleNamespaceFilter : '';
+      return this.__namespaceRequired ? this.__validFilter : '';
     },
 
     /**
-     * If the Project/Namespace filter from the header contains a single NS... return it
+     * If the Project/Namespace filter from the header contains a valid ns / project filter ... return it
      */
-    __singleNamespaceFilter() {
-      const ns = this.isSingleNamespace;
+    __validFilter() {
+      const valid = this.namespaceFilters.length && this.namespaceFilters.every(f => f.startsWith(NAMESPACE_FILTER_NS_PREFIX) || f.startsWith(NAMESPACE_FILTER_P_PREFIX));
 
-      return ns ? ns.replace('ns://', '') : '';
+      return valid ? this.namespaceFilters : null;
     },
 
     /**
-     * Do we need to filter the list by a namespace?
+     * Do we need to filter the list by a namespace? This will control whether the user is shown an error
+     *
+     * We shouldn't show an error on pages with resources that aren't namespaced
      */
     __namespaceRequired() {
-      if (!this.forceNsFilter?.enabled || this.perfConfig.forceNsFilter.threshold === undefined) {
+      if (!pAndNFiltering.isEnabled(this.$store.getters)) {
         return false;
       }
 
-      return !this.currentProduct.showWorkspaceSwitcher && this.__areResourcesNamespaced && this.__areResourcesTooMany;
+      return this.__areResourcesNamespaced;
     },
 
     /**
      * Are all core list resources namespaced?
      */
     __areResourcesNamespaced() {
+      // Only enable for the cluster store at the moment. In theory this should work in management as well, as they're both 'steve' stores
+      if (this.currentProduct.inStore !== 'cluster') {
+        return false;
+      }
+
       return (this.loadResources || []).every((type) => {
         const schema = this.$store.getters['cluster/schemaFor'](type);
 
@@ -58,26 +67,9 @@ export default {
       });
     },
 
-    /**
-     * Are there too many core list resources to show in the list?
-     */
-    __areResourcesTooMany() {
-      // __getCountForResources is defined on resource-fetch mixin...
-      const count = this.__getCountForResources(this.loadResources);
-
-      return count > this.perfConfig.forceNsFilter.threshold;
-    },
-
   },
 
   watch: {
-    __namespaceRequired: {
-      handler(neu) {
-        this.$store.dispatch('setNamespaceFilterMode', neu ? 'namespace' : null, { root: true });
-      },
-      immediate: true,
-    },
-
     async namespaceFilter(neu) {
       if (neu) {
         // When a NS filter is required and the user selects a different one, kick off a new set of API requests

package/mixins/resource-fetch.js

@@ -38,11 +38,6 @@ export default {
       // incremental loading vars
       incremental:                false,
       fetchedResourceType:        [],
-      // force ns filtering
-      forceNsFilter:              {
-        ...perfConfig.forceNsFilter,
-        threshold: parseInt(perfConfig?.forceNsFilter?.threshold || '0', 10)
-      }
     };
   },
   beforeDestroy() {

package/models/__tests__/namespace.test.ts

@@ -0,0 +1,125 @@
+import Namespace from '@shell/models/namespace';
+
+describe('class Namespace', () => {
+  describe('checking if isSystem', () => {
+    it.each([
+      ['c-whatever-system', true],
+      ['whatever', false]
+    ])('should return true if end with "-system', (name, expectation) => {
+      const namespace = new Namespace({});
+
+      namespace.metadata = { ...namespace.metadata, name };
+
+      expect(namespace.isSystem).toBe(expectation);
+    });
+  });
+
+  it.todo('should check if isFleetManaged');
+
+  describe('checking if isObscure', () => {
+    it.each([
+      ['c-whatever-system', true],
+      ['whatever', false],
+      ['', false]
+    ])('should return a value if has or not a name in the metadata', (name, expectation) => {
+      const namespace = new Namespace({});
+
+      namespace.metadata = { ...namespace.metadata, name };
+
+      expect(namespace.isObscure).toBe(expectation);
+    });
+
+    it.todo('should return a value if is or not system');
+  });
+
+  it.each([
+    ['foo:bar', 'bar'],
+    ['', null]
+  ])('given %p annotation, projectId should be %p', (value, result) => {
+    const namespace = new Namespace({});
+
+    namespace.metadata = { name: '', annotations: { 'field.cattle.io/projectId': value } };
+
+    expect(namespace.projectId).toBe(result);
+  });
+
+  it.todo('should return the project');
+  it.todo('should return the groupByLabel with i18n');
+  it.todo('should return the project name with i18n');
+  it.todo('should return the projectNameSort');
+  it.todo('should check if istioInstalled');
+  it.todo('should check if injectionEnabled');
+
+  describe('handling Istio  labels', () => {
+    const save = jest.fn();
+
+    it.each([
+      { metadata: { name: '', labels: { 'istio-injection': 'whatever' } }, save },
+      [{ metadata: { name: '', labels: { 'istio-injection': 'whatever' } }, save }],
+    ])('should handle both data as list and single object and save', (data) => {
+      const namespace = new Namespace({});
+
+      namespace.enableAutoInjection(data as unknown as Namespace);
+
+      expect(save).toHaveBeenCalledWith();
+    });
+
+    it('should add auto injection label as enable', () => {
+      const data = { metadata: { name: '', labels: { 'istio-injection': 'whatever' } }, save };
+      const namespace = new Namespace({});
+
+      namespace.enableAutoInjection(data as unknown as Namespace);
+
+      expect(data.metadata!.labels['istio-injection']).toBe('enabled');
+    });
+
+    it('should remove label on disable', () => {
+      const data = { metadata: { name: '', labels: { 'istio-injection': 'whatever' } }, save };
+      const namespace = new Namespace({});
+
+      namespace.enableAutoInjection(data as unknown as Namespace, false);
+
+      expect(data.metadata!.labels['istio-injection']).toBeUndefined();
+    });
+  });
+
+  it.todo('should disableAutoInjection');
+  it.todo('should check if confirmRemove');
+
+  describe('handling listLocation', () => {
+    it.each([
+      ['c-cluster-product-projectsnamespaces', true],
+      ['c-cluster-product-resource', false],
+    ])('should return the name %p if is Rancher (%p)', (name, isRancher) => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, '$rootGetters', 'get').mockReturnValue({
+        isRancher,
+        currentProduct: { inStore: '' }
+      });
+
+      expect(namespace.listLocation.name).toBe(name);
+    });
+
+    it('should return the name and resource if Harvester', () => {
+      const namespace = new Namespace({});
+
+      jest.spyOn(namespace, '$rootGetters', 'get').mockReturnValue({
+        isRancher:      true,
+        currentProduct: { inStore: 'harvester' }
+      });
+
+      const value = {
+        name:   'harvester-c-cluster-projectsnamespaces',
+        params: { resource: 'namespace' }
+      };
+
+      expect(namespace.listLocation).toStrictEqual(value);
+    });
+  });
+
+  it.todo('should return _detailLocation with a name');
+  it.todo('should return the resourceQuota');
+  it.todo('should set the resourceQuota as reactive Vue property');
+  it.todo('should reset project with cleanForNew');
+});

package/models/batch.cronjob.js

@@ -2,6 +2,7 @@ import { insertAt } from '@shell/utils/array';
 import { clone } from '@shell/utils/object';
 import { WORKLOAD_TYPES } from '@shell/config/types';
 import Workload from './workload';
+import { WORKLOAD_TYPE_TO_KIND_MAPPING } from '@shell/detail/workload/index';
 
 export default class CronJob extends Workload {
   get state() {
@@ -47,12 +48,26 @@ export default class CronJob extends Workload {
   }
 
   async runNow() {
-    const job = await this.$dispatch('create', clone(this.spec.jobTemplate));
+    const ownerRef = {
+      apiVersion: this.apiVersion,
+      controller: true,
+      kind:       this.kind,
+      name:       this.metadata.name,
+      uid:        this.metadata.uid
+    };
+
+    // Set type and kind to ensure the correct model is returned (via classify). This object will be persisted to the store
+    const job = await this.$dispatch('create', {
+      type: WORKLOAD_TYPES.JOB,
+      kind: WORKLOAD_TYPE_TO_KIND_MAPPING[WORKLOAD_TYPES.JOB],
+      ...clone(this.spec.jobTemplate)
+    });
 
-    job.type = WORKLOAD_TYPES.JOB;
     job.metadata = job.metadata || {};
     job.metadata.namespace = this.metadata.namespace;
-    job.metadata.generateName = `${ this.metadata.name }-`;
+    // Can't use `generatedName` and no `name`... as this fails schema validation
+    job.metadata.name = `${ this.metadata.name }-${ Date.now() }`;
+    job.metadata.ownerReferences = [ownerRef];
 
     await job.save();
 

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

@@ -128,7 +128,12 @@ export default class Project extends HybridModel {
       }
     };
 
-    await finishProjectCreation();
+    // Only update PSP template if the value changed
+    const newPSPTemplateID = this.spec.podSecurityPolicyTemplateId || null;
+
+    if (norman.podSecurityPolicyTemplateId !== newPSPTemplateID) {
+      await finishProjectCreation();
+    }
 
     return newValue;
   }

package/models/persistentvolume.js

@@ -115,7 +115,7 @@ export default class PV extends SteveModel {
   // plugin display value table
   get source() {
     const csiDriver = this.spec?.csi?.driver;
-    const fallback = `${ csiDriver } ${ this.t('persistentVolume.csi.drivers.suffix') }`;
+    const fallback = `${ csiDriver } ${ this.t('persistentVolume.csi.suffix') }`;
 
     if (csiDriver) {
       return this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ csiDriver.replaceAll('.', '-') }`, null, fallback);

package/models/workload.js

@@ -296,7 +296,7 @@ export default class Workload extends WorkloadService {
   }
 
   get endpoint() {
-    return this?.metadata?.annotations[CATTLE_PUBLIC_ENDPOINTS];
+    return this?.metadata?.annotations?.[CATTLE_PUBLIC_ENDPOINTS];
   }
 
   get desired() {

package/models/workload.service.js

@@ -1,7 +1,7 @@
 
 import { findBy } from '@shell/utils/array';
 import { TARGET_WORKLOADS, UI_MANAGED, HCI as HCI_LABELS_ANNOTATIONS } from '@shell/config/labels-annotations';
-import { WORKLOAD_TYPES, SERVICE } from '@shell/config/types';
+import { WORKLOAD_TYPES, SERVICE, CAPI, HCI } from '@shell/config/types';
 import { clone, get } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { shortenedImage } from '@shell/utils/string';
@@ -304,16 +304,31 @@ export default class WorkloadService extends SteveModel {
       if (loadBalancer.id) {
         loadBalancerProxy = loadBalancer;
       } else {
-        loadBalancer = clone(loadBalancer);
+        loadBalancerProxy = await this.$dispatch(`cluster/create`, loadBalancer, { root: true });
+      }
 
-        const portsWithIpam = ports.filter(p => p._ipam) || [];
+      const portsWithIpam = ports.filter(p => p._ipam) || [];
 
-        if (portsWithIpam.length > 0) {
-          loadBalancer.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_IPAM] = portsWithIpam[0]._ipam;
-        }
+      if (portsWithIpam.length > 0) {
+        loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_IPAM] = portsWithIpam[0]._ipam;
 
-        loadBalancerProxy = await this.$dispatch(`cluster/create`, loadBalancer, { root: true });
+        const clusters = this.$rootGetters['management/all'](CAPI.RANCHER_CLUSTER);
+        const configs = this.$rootGetters['management/all'](HCI.HARVESTER_CONFIG);
+        const currentCluster = this.$rootGetters['currentCluster'];
+        const cluster = clusters.find(c => c.status.clusterName === currentCluster.id);
+
+        const machinePools = cluster?.spec?.rkeConfig?.machinePools || [];
+        const machineConfigName = machinePools[0]?.machineConfigRef?.name;
+        const config = configs.find(c => c.id === `fleet-default/${ machineConfigName }`);
+
+        if (config) {
+          const { vmNamespace, networkName } = config;
+
+          loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NAMESPACE] = vmNamespace;
+          loadBalancerProxy.metadata.annotations[HCI_LABELS_ANNOTATIONS.CLOUD_PROVIDER_NETWORK] = networkName;
+        }
       }
+
       toSave.push(loadBalancerProxy);
     } else if (loadBalancer.id) {
       toRemove.push(loadBalancer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -61,7 +61,7 @@
     "cron-validator": "1.2.0",
     "cronstrue": "1.95.0",
     "cross-env": "6.0.3",
-    "css-loader": "4.3.0",
+    "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
     "cypress": "10.3.1",
     "d3": "7.3.0",
@@ -69,7 +69,7 @@
     "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
     "diff2html": "2.11.2",
-    "dompurify": "2.0.12",
+    "dompurify": "2.4.5",
     "eslint": "7.32.0",
     "eslint-config-standard": "16.0.3",
     "eslint-import-resolver-node": "0.3.4",
@@ -96,11 +96,11 @@
     "jsdiff": "1.1.1",
     "jsdom-global": "3.0.2",
     "jsonpath-plus": "6.0.1",
-    "jsrsasign": "10.2.0",
-    "jszip": "3.7.0",
+    "jsrsasign": "10.5.25",
+    "jszip": "3.8.0",
     "lodash": "4.17.21",
     "marked": "4.0.17",
-    "nodemon": "2.0.4",
+    "nodemon": "2.0.22",
     "nuxt": "2.15.8",
     "nyc": "15.1.0",
     "papaparse": "5.3.0",
@@ -144,6 +144,17 @@
     "worker-loader": "3.0.8",
     "yarn": "1.22.18"
   },
+  "resolutions": {
+    "ejs": "^3.1.7",
+    "json5": ">=2.2.2",
+    "d3-color": ">=3.1.0",
+    "glob-parent": ">=5.1.2",
+    "node-forge": ">=1.3.0",
+    "qs": ">=6.7.3",
+    "nth-check": ">=2.0.1",
+    "follow-redirects": ">=1.14.7",
+    "merge": ">=2.1.1"
+  },
   "nyc": {
     "extension": [
       ".js",