@rancher/shell 0.5.1 → 0.5.3

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

@@ -249,6 +249,21 @@ export default class ProvCluster extends SteveModel {
     return providers.includes(this.provisioner);
   }
 
+  get isPrivateHostedProvider() {
+    if (this.isHostedKubernetesProvider && this.mgmt && this.provisioner) {
+      switch (this.provisioner.toLowerCase()) {
+      case 'gke':
+        return this.mgmt.spec?.gkeConfig?.privateClusterConfig?.enablePrivateEndpoint;
+      case 'eks':
+        return this.mgmt.spec?.eksConfig?.privateAccess;
+      case 'aks':
+        return this.mgmt.spec?.aksConfig?.privateCluster;
+      }
+    }
+
+    return false;
+  }
+
   get isLocal() {
     return this.mgmt?.isLocal;
   }
@@ -891,7 +906,27 @@ export default class ProvCluster extends SteveModel {
   }
 
   get hasError() {
-    return this.status?.conditions?.some((condition) => condition.error === true);
+    // Before we were just checking for this.status?.conditions?.some((condition) => condition.error === true)
+    // but this is wrong as an error might exist but it might not be meaningful in the context of readiness of a cluster
+    // which is what this 'hasError' is used for.
+    // We now check if there's a ready condition after an error, which helps dictate the readiness of a cluster
+    // Based on the findings in https://github.com/rancher/dashboard/issues/10043
+    if (this.status?.conditions && this.status?.conditions.length) {
+      // if there are errors, we compare with how recent the "Ready" condition is compared to that error, otherwise we just move on
+      if (this.status?.conditions.some((c) => c.error === true)) {
+        // there's no ready condition and has an error, mark it
+        if (!this.status?.conditions.some((c) => c.type === 'Ready')) {
+          return true;
+        }
+
+        const filteredConditions = this.status?.conditions.filter((c) => c.error === true || c.type === 'Ready');
+        const mostRecentCondition = filteredConditions.reduce((a, b) => ((a.lastUpdateTime > b.lastUpdateTime) ? a : b));
+
+        return mostRecentCondition.error;
+      }
+    }
+
+    return false;
   }
 
   get namespaceLocation() {

package/models/secret.js

@@ -9,6 +9,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import { diffFrom } from '@shell/utils/time';
 import day from 'dayjs';
+import { steveCleanForDownload } from '@shell/plugins/steve/resource-utils';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -456,4 +457,12 @@ export default class Secret extends SteveModel {
 
     return val;
   }
+
+  async cleanForDownload(yaml) {
+    // secret resource contains the type attribute
+    // ref: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/secret-v1/
+    // ref: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
+
+    return steveCleanForDownload(yaml, { rootKeys: ['id', 'links', 'actions'] });
+  }
 }

package/models/storage.k8s.io.storageclass.js

@@ -84,7 +84,7 @@ export const PROVISIONER_OPTIONS = [
 export default class extends SteveModel {
   get provisionerDisplay() {
     const option = PROVISIONER_OPTIONS.find((o) => o.value === this.provisioner);
-    const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.drivers.suffix') }`;
+    const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.suffix') }`;
 
     return option ? this.t(option.labelKey) : this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ this.provisioner.replaceAll('.', '-') }`, null, fallback);
   }

package/package.json

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

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

@@ -81,6 +81,7 @@ export default {
             v-if="!isView"
             v-model="row.enabled"
             label-key="customLinks.settings.showLabel"
+            :data-testid="`custom-links__checkbox-${i}`"
             @input="showhide(row, i, $event)"
           />
         </div>

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

@@ -238,6 +238,7 @@ export default {
             <label class="text-muted">{{ t('branding.logos.lightPreview') }}</label>
             <img
               class="logo-preview"
+              data-testid="branding-logo-light-preview"
               :src="uiLogoLight ? uiLogoLight : uiLogoDark"
             >
           </SimpleBox>
@@ -262,6 +263,7 @@ export default {
             <label class="text-muted">{{ t('branding.logos.darkPreview') }}</label>
             <img
               class="logo-preview"
+              data-testid="branding-logo-dark-preview"
               :src="uiLogoDark ? uiLogoDark : uiLogoLight"
             >
           </SimpleBox>
@@ -304,6 +306,7 @@ export default {
             <label class="text-muted">{{ t('branding.favicon.preview') }}</label>
             <img
               class="logo-preview"
+              data-testid="branding-favicon-preview"
               :src="uiFavicon"
             >
           </SimpleBox>

package/pages/c/_cluster/uiplugins/AddExtensionRepos.vue

@@ -10,6 +10,7 @@ import {
   UI_PLUGINS_PARTNERS_REPO_URL,
   UI_PLUGINS_PARTNERS_REPO_BRANCH,
 } from '@shell/config/uiplugins';
+import { isRancherPrime } from '@shell/config/version';
 
 export default {
   components: {
@@ -27,6 +28,7 @@ export default {
     return {
       errors:   [],
       repos:    [],
+      prime:    isRancherPrime(),
       addRepos: {
         official: true,
         partners: true
@@ -54,16 +56,13 @@ export default {
     },
     hasRancherUIPartnersPluginsRepo() {
       return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_PARTNERS_REPO_URL);
-    },
-    isAnyRepoAvailableForInstall() {
-      return !this.hasRancherUIPluginsRepo || !this.hasRancherUIPartnersPluginsRepo;
     }
   },
 
   methods: {
     showDialog() {
       this.addRepos = {
-        official: !this.hasRancherUIPluginsRepo,
+        official: isRancherPrime() && !this.hasRancherUIPluginsRepo,
         partners: !this.hasRancherUIPartnersPluginsRepo,
       };
       this.$modal.show('add-extensions-repos');
@@ -121,6 +120,7 @@ export default {
       </p>
       <!-- Official repo -->
       <div
+        v-if="prime"
         class="mb-15"
       >
         <Checkbox

package/pages/c/_cluster/uiplugins/SetupUIPlugins.vue

@@ -7,6 +7,7 @@ import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations
 import Dialog from '@shell/components/Dialog.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import Banner from '@components/Banner/Banner.vue';
+import { isRancherPrime } from '@shell/config/version';
 
 import {
   UI_PLUGIN_NAMESPACE,
@@ -68,6 +69,7 @@ export default {
       haveCharts:    false,
       installCharts: [],
       errors:        [],
+      prime:         isRancherPrime(),
       addRepos:      {
         official: true,
         partners: true,
@@ -98,7 +100,7 @@ export default {
       return !!this.repos.find((r) => r.urlDisplay === UI_PLUGINS_PARTNERS_REPO_URL);
     },
     isAnyRepoAvailableForInstall() {
-      return !this.hasRancherUIPluginsRepo || !this.hasRancherUIPartnersPluginsRepo;
+      return (isRancherPrime() && !this.hasRancherUIPluginsRepo) || !this.hasRancherUIPartnersPluginsRepo;
     }
   },
 
@@ -155,7 +157,7 @@ export default {
 
       // Reset checkbox based on if the repo is already installed
       this.addRepos = {
-        official: !this.hasRancherUIPluginsRepo,
+        official: isRancherPrime() && !this.hasRancherUIPluginsRepo,
         partners: !this.hasRancherUIPartnersPluginsRepo,
       };
 
@@ -286,6 +288,7 @@ export default {
         </Banner>
         <!-- Official rancher repo -->
         <div
+          v-if="prime"
           class="mb-15"
         >
           <Checkbox

package/pages/c/_cluster/uiplugins/__tests__/AddExtensionRepos.test.ts

@@ -0,0 +1,96 @@
+import { mount } from '@vue/test-utils';
+import {
+  UI_PLUGINS_REPO_URL,
+  UI_PLUGINS_PARTNERS_REPO_URL,
+} from '@shell/config/uiplugins';
+import AddExtensionRepos from '@shell/pages/c/_cluster/uiplugins/AddExtensionRepos.vue';
+const mockedStore = () => {
+  return {
+    getters: {
+      'i18n/t':               (text: string) => text,
+      'i18n/exists':          (text: string) => text,
+      t:                      (text: string) => text,
+      'management/schemaFor': () => true,
+      'management/findAll':   () => [
+        { urlDisplay: UI_PLUGINS_REPO_URL },
+        { urlDisplay: UI_PLUGINS_PARTNERS_REPO_URL },
+      ]
+    }
+  };
+};
+
+const requiredSetup = () => {
+  return {
+    mocks: {
+      $store:      mockedStore(),
+      $fetchState: {},
+    }
+  };
+};
+
+describe('component: AddExtensionRepos', () => {
+  it('should NOT SHOW a checkbox to install official Rancher repo if NOT prime', async() => {
+    jest.useFakeTimers();
+
+    const wrapper = mount(AddExtensionRepos, {
+      ...requiredSetup(),
+      // since vue-js-modal uses transitions, we need disable
+      // the default behaviour of transition-stubbing that vue-test-utils has...
+      stubs: { transition: false }
+    });
+
+    wrapper.vm.showDialog();
+
+    // these couple of nextTick + advanceTimersByTime are needed for
+    // the dialog content to be rendered!
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    const rancherCheckbox = wrapper.find('[data-testid="add-extensions-repos-modal-add-official-repo"]');
+    const partnersCheckbox = wrapper.find('[data-testid="add-extensions-repos-modal-add-partners-repo"]');
+
+    expect(rancherCheckbox.exists()).toBe(false);
+    expect(partnersCheckbox.exists()).toBe(true);
+
+    jest.clearAllTimers();
+    wrapper.destroy();
+  });
+
+  it('should SHOW a checkbox to install official Rancher repo if IS prime', async() => {
+    jest.useFakeTimers();
+
+    const wrapper = mount(AddExtensionRepos, {
+      ...requiredSetup(),
+      // since vue-js-modal uses transitions, we need disable
+      // the default behaviour of transition-stubbing that vue-test-utils has...
+      stubs: { transition: false }
+    });
+
+    wrapper.vm.prime = true;
+    wrapper.vm.showDialog();
+
+    // these couple of nextTick + advanceTimersByTime are needed for
+    // the dialog content to be rendered!
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    const rancherCheckbox = wrapper.find('[data-testid="add-extensions-repos-modal-add-official-repo"]');
+    const partnersCheckbox = wrapper.find('[data-testid="add-extensions-repos-modal-add-partners-repo"]');
+
+    expect(rancherCheckbox.exists()).toBe(true);
+    expect(partnersCheckbox.exists()).toBe(true);
+
+    jest.clearAllTimers();
+    wrapper.destroy();
+  });
+});

package/pages/c/_cluster/uiplugins/__tests__/SetupUIPlugins.test.ts

@@ -0,0 +1,128 @@
+import { mount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import {
+  UI_PLUGINS_REPO_URL,
+  UI_PLUGINS_PARTNERS_REPO_URL,
+} from '@shell/config/uiplugins';
+import SetupUIPlugins from '@shell/pages/c/_cluster/uiplugins/SetupUIPlugins.vue';
+
+describe('component: SetupUIPlugins', () => {
+  const localVue = createLocalVue();
+
+  localVue.use(Vuex);
+
+  it('should NOT SHOW a checkbox to install official Rancher repo if NOT prime', async() => {
+    const store = new Vuex.Store({
+      modules: {
+        catalog: {
+          namespaced: true,
+          getters:    {
+            repos: () => [
+              { urlDisplay: UI_PLUGINS_REPO_URL },
+              { urlDisplay: UI_PLUGINS_PARTNERS_REPO_URL },
+            ],
+            repo:      () => {},
+            rawCharts: () => [],
+          }
+        }
+      },
+      getters: {
+        'i18n/t':               () => jest.fn(),
+        'i18n/exists':          () => jest.fn(),
+        t:                      () => jest.fn(),
+        'management/schemaFor': () => true,
+        'management/findAll':   () => [],
+        'management/find':      () => {}
+      }
+    });
+
+    jest.useFakeTimers();
+
+    const wrapper = mount(SetupUIPlugins, {
+      store,
+      localVue,
+      // since vue-js-modal uses transitions, we need disable
+      // the default behaviour of transition-stubbing that vue-test-utils has...
+      stubs: { transition: false }
+    });
+
+    wrapper.vm.enable();
+
+    // these couple of nextTick + advanceTimersByTime are needed for
+    // the dialog content to be rendered!
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    const rancherCheckbox = wrapper.find('[data-testid="extension-enable-operator-official-repo"]');
+    const partnersCheckbox = wrapper.find('[data-testid="extension-enable-operator-partners-repo"]');
+
+    expect(rancherCheckbox.exists()).toBe(false);
+    expect(partnersCheckbox.exists()).toBe(true);
+
+    jest.clearAllTimers();
+    wrapper.destroy();
+  });
+
+  it('should SHOW a checkbox to install official Rancher repo if IS prime', async() => {
+    const store = new Vuex.Store({
+      modules: {
+        catalog: {
+          namespaced: true,
+          getters:    {
+            repos: () => [
+              { urlDisplay: UI_PLUGINS_REPO_URL },
+              { urlDisplay: UI_PLUGINS_PARTNERS_REPO_URL },
+            ],
+            repo:      () => {},
+            rawCharts: () => [],
+          }
+        }
+      },
+      getters: {
+        'i18n/t':               () => jest.fn(),
+        'i18n/exists':          () => jest.fn(),
+        t:                      () => jest.fn(),
+        'management/schemaFor': () => true,
+        'management/findAll':   () => [],
+        'management/find':      () => {}
+      }
+    });
+
+    jest.useFakeTimers();
+
+    const wrapper = mount(SetupUIPlugins, {
+      store,
+      localVue,
+      // since vue-js-modal uses transitions, we need disable
+      // the default behaviour of transition-stubbing that vue-test-utils has...
+      stubs: { transition: false }
+    });
+
+    wrapper.vm.prime = true;
+    wrapper.vm.enable();
+
+    // these couple of nextTick + advanceTimersByTime are needed for
+    // the dialog content to be rendered!
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    await wrapper.vm.$nextTick();
+
+    jest.advanceTimersByTime(1);
+
+    const rancherCheckbox = wrapper.find('[data-testid="extension-enable-operator-official-repo"]');
+    const partnersCheckbox = wrapper.find('[data-testid="extension-enable-operator-partners-repo"]');
+
+    expect(rancherCheckbox.exists()).toBe(true);
+    expect(partnersCheckbox.exists()).toBe(true);
+
+    jest.clearAllTimers();
+    wrapper.destroy();
+  });
+});