@rancher/shell 2.0.0 → 2.0.1

package/models/kontainerdriver.js

@@ -8,19 +8,21 @@ export default class KontainerDriver extends Driver {
   get _availableActions() {
     const out = [
       {
-        action:   'activate',
-        label:    'Activate',
-        icon:     'icon icon-play',
-        bulkable: true,
-        enabled:  !!this.links.update && !this.active
+        action:     'activate',
+        label:      this.t('action.activate'),
+        icon:       'icon icon-play',
+        bulkable:   true,
+        bulkAction: 'activateBulk',
+        enabled:    !!this.links.update && !this.active
       },
       {
-        action:   'deactivate',
-        label:    'Deactivate',
-        icon:     'icon icon-pause',
-        bulkable: true,
-        enabled:  !!this.links.update && !!this.active,
-        weight:   -1
+        action:     'deactivate',
+        label:      this.t('action.deactivate'),
+        icon:       'icon icon-pause',
+        bulkable:   true,
+        bulkAction: 'deactivateBulk',
+        enabled:    !!this.links.update && !!this.active,
+        weight:     -1
       },
       { divider: true },
       {
@@ -52,9 +54,16 @@ export default class KontainerDriver extends Driver {
     return out;
   }
 
-  deactivate() {
+  deactivate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  deactivateBulk(resources) {
     this.$dispatch('promptModal', {
-      componentProps: { url: `v3/kontainerDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
       component:      'DeactivateDriverDialog'
     });
   }
@@ -65,4 +74,12 @@ export default class KontainerDriver extends Driver {
       method: 'post',
     }, { root: true });
   }
+
+  async activateBulk(resources) {
+    await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
+      url:    `v3/kontainerDrivers/${ escape(resource.id) }?action=activate`,
+      method: 'post',
+    }, { root: true }
+    )));
+  }
 }

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

@@ -15,10 +15,10 @@ export const configType = {
   local:           '',
   github:          'oauth',
   keycloakoidc:    'oidc',
-  oidc:            'oidc',
+  genericoidc:     'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak', oidc: 'openid' };
+const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {

package/models/nodedriver.js

@@ -8,19 +8,21 @@ export default class NodeDriver extends Driver {
   get _availableActions() {
     const out = [
       {
-        action:   'activate',
-        label:    'Activate',
-        icon:     'icon icon-play',
-        bulkable: true,
-        enabled:  !!this.actions.activate && this.state === 'inactive',
+        action:     'activate',
+        label:      this.t('action.activate'),
+        icon:       'icon icon-play',
+        bulkable:   true,
+        bulkAction: 'activateBulk',
+        enabled:    !!this.actions.activate && this.state === 'inactive',
       },
       {
-        action:   'deactivate',
-        label:    'Deactivate',
-        icon:     'icon icon-pause',
-        bulkable: true,
-        enabled:  !!this.actions.deactivate && this.state === 'active',
-        weight:   -1,
+        action:     'deactivate',
+        label:      this.t('action.deactivate'),
+        icon:       'icon icon-pause',
+        bulkable:   true,
+        bulkAction: 'deactivateBulk',
+        enabled:    !!this.actions.deactivate && this.state === 'active',
+        weight:     -1,
       },
       { divider: true },
       {
@@ -52,9 +54,16 @@ export default class NodeDriver extends Driver {
     return out;
   }
 
-  deactivate() {
+  deactivate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { drivers: resources, driverType: 'nodeDrivers' },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  deactivateBulk(resources) {
     this.$dispatch('promptModal', {
-      componentProps: { url: `v3/nodeDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      componentProps: { drivers: resources, driverType: 'nodeDrivers' },
       component:      'DeactivateDriverDialog'
     });
   }
@@ -65,4 +74,12 @@ export default class NodeDriver extends Driver {
       method: 'post',
     }, { root: true });
   }
+
+  async activateBulk(resources) {
+    await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
+      url:    `v3/nodeDrivers/${ escape(resource.id) }?action=activate`,
+      method: 'post',
+    }, { root: true }
+    )));
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -153,7 +153,8 @@
     "nth-check": ">=2.0.1",
     "follow-redirects": ">=1.14.7",
     "merge": ">=2.1.1",
-    "semver": ">=7.5.2"
+    "semver": ">=7.5.2",
+    "glob": "7.2.3"
   },
   "nyc": {
     "extension": [

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

@@ -37,6 +37,7 @@ import { findBy, insertAt } from '@shell/utils/array';
 import Vue from 'vue';
 import { saferDump } from '@shell/utils/create-yaml';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
+import { SETTING } from '@shell/config/settings';
 
 const VALUES_STATE = {
   FORM: 'FORM',
@@ -126,7 +127,7 @@ export default {
     try {
       this.serverUrlSetting = await this.$store.dispatch('management/find', {
         type: MANAGEMENT.SETTING,
-        id:   'server-url'
+        id:   SETTING.SERVER_URL,
       });
     } catch (e) {
       console.error('Unable to fetch `server-url` setting: ', e); // eslint-disable-line no-console
@@ -888,7 +889,7 @@ export default {
       // runtime will pull images from docker.io.
       const globalRegistry = await this.$store.dispatch('management/find', {
         type: MANAGEMENT.SETTING,
-        id:   'system-default-registry'
+        id:   SETTING.SYSTEM_DEFAULT_REGISTRY,
       });
 
       return globalRegistry.value;

package/pages/c/_cluster/manager/drivers/kontainerDriver/index.vue

@@ -44,9 +44,6 @@ export default {
         buttonDone(false);
       }
     }
-  },
-  mounted() {
-    window.c = this;
   }
 };
 </script>

package/pages/c/_cluster/manager/drivers/nodeDriver/index.vue

@@ -26,10 +26,7 @@ export default {
     rows() {
       return this.allDrivers || [];
     },
-  },
-  mounted() {
-    window.c = this;
-  },
+  }
 };
 </script>
 

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

@@ -6,6 +6,7 @@ import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import Banner from '@components/Banner/Banner.vue';
+import { SETTING } from '@shell/config/settings';
 
 // Note: This dialog handles installation and update of a plugin
 
@@ -20,7 +21,7 @@ export default {
   async fetch() {
     this.defaultRegistrySetting = await this.$store.dispatch('management/find', {
       type: MANAGEMENT.SETTING,
-      id:   'system-default-registry'
+      id:   SETTING.SYSTEM_DEFAULT_REGISTRY,
     });
   },
 

package/promptRemove/pod.vue

@@ -30,6 +30,16 @@ export default {
     type: {
       type:     String,
       required: true
+    },
+
+    close: {
+      type:     Function,
+      required: true
+    },
+
+    doneLocation: {
+      type:    Object,
+      default: () => {}
     }
   },
 
@@ -69,23 +79,21 @@ export default {
 
   methods: {
     async remove(confirm) {
-      const parentComponent = this.$parent.$parent.$parent;
-
       let goTo;
 
-      if (parentComponent.doneLocation) {
+      if (this.doneLocation) {
         // doneLocation will recompute to undefined when delete request completes
-        goTo = { ...parentComponent.doneLocation };
+        goTo = { ...this.doneLocation };
       }
 
       try {
         await Promise.all(this.value.map((resource) => this.removePod(resource)));
         if ( goTo && !isEmpty(goTo) ) {
-          parentComponent.currentRouter.push(goTo);
+          this.value?.[0]?.currentRouter().push(goTo);
         }
-        parentComponent.close();
+        this.close();
       } catch (err) {
-        parentComponent.error = err;
+        this.$emit('errors', err);
         confirm(false);
       }
     },

package/scripts/publish-shell.sh

@@ -67,6 +67,7 @@ function publish() {
   # For now, copy the rancher components into the shell and ship them with it
   if [ "$NAME" == "Shell" ]; then
     echo "Adding Rancher Components"
+    rm -rf ./rancher-components
     cp -R ${BASE_DIR}/pkg/rancher-components/src/components ./rancher-components/
   fi
 

package/store/auth.js

@@ -13,7 +13,7 @@ export const BASE_SCOPES = {
   googleoauth:  ['openid profile email'],
   azuread:      [],
   keycloakoidc: ['openid profile email'],
-  oidc:         ['openid profile email'],
+  genericoidc:  ['openid profile email'],
 };
 
 const KEY = 'rc_nonce';

package/store/index.js

@@ -594,7 +594,7 @@ export const getters = {
   },
 
   releaseNotesUrl(state, getters) {
-    const version = getters['management/byId'](MANAGEMENT.SETTING, 'server-version')?.value;
+    const version = getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER)?.value;
 
     const base = 'https://github.com/rancher/rancher/releases';
 

package/utils/__tests__/kontainer.test.ts

@@ -1,4 +1,4 @@
-import { diffUpstreamSpec } from '@shell/utils/kontainer';
+import { diffUpstreamSpec, syncUpstreamConfig } from '@shell/utils/kontainer';
 
 describe('fx: diffUpstreamSpec', () => {
   it.each([
@@ -90,3 +90,91 @@ describe('fx: diffUpstreamSpec', () => {
     expect(diffUpstreamSpec(upstream, local)).toStrictEqual(diff);
   });
 });
+
+describe('fx: syncUpstreamSpec', () => {
+  it('should set any fields defined in upstream spec and not local spec', () => {
+    const upstream = {
+      string:                 'def',
+      'other-string':         '123',
+      alreadySet:             'abc',
+      alreadySetArray:        [2, 3, 4],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+    const local = {
+      alreadySet:             'def',
+      alreadySetArray:        [1, 2, 3],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const expected = {
+      string:                 'def',
+      'other-string':         '123',
+      alreadySet:             'def',
+      alreadySetArray:        [1, 2, 3],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+
+  it('should not set empty objects or arrays from upstream spec', () => {
+    const upstream = {
+      emptyArray:      [],
+      emptyObject:     {},
+      nonEmptyArray:   [1, 2, 3],
+      nonEmptyObject:  { foo: 'bar' },
+      alreadySet:      'abc',
+      alreadySetArray: [2, 3, 4],
+    };
+    const local = {
+      alreadySet:      'def',
+      alreadySetArray: [1, 2, 3],
+    };
+
+    const expected = {
+      nonEmptyArray:   [1, 2, 3],
+      nonEmptyObject:  { foo: 'bar' },
+      alreadySet:      'def',
+      alreadySetArray: [1, 2, 3],
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+
+  it('should not overwrite boolean values explicitly set false', () => {
+    const upstream = {
+      falseBoolean:           false,
+      trueBoolean:            true,
+      alreadySetBooleanFalse: true,
+      alreadySetBooleanTrue:  false
+    };
+    const local = {
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const expected = {
+      falseBoolean:           false,
+      trueBoolean:            true,
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+});

package/utils/auth.js

@@ -71,7 +71,7 @@ export const authProvidersInfo = async(store) => {
   const nonLocal = rows.filter((x) => x.name !== 'local');
   const enabled = nonLocal.filter((x) => x.enabled === true );
 
-  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'genericoidc');
+  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'oidc');
 
   const enabledLocation = enabled.length === 1 ? {
     name:   'c-cluster-auth-config-id',

package/utils/kontainer.ts

@@ -17,7 +17,11 @@ export function syncUpstreamConfig(configPrefix: string, normanCluster: {[key: s
 
   if (!isEmpty(upstreamConfig)) {
     Object.keys(upstreamConfig).forEach((key) => {
-      if (isEmpty(rancherConfig[key]) && !isEmpty(upstreamConfig[key])) {
+      if (typeof upstreamConfig[key] === 'object') {
+        if (isEmpty(rancherConfig[key]) && !isEmpty(upstreamConfig[key])) {
+          set(rancherConfig, key, upstreamConfig[key]);
+        }
+      } else if ((rancherConfig[key] === null || rancherConfig[key] === undefined) && upstreamConfig[key] !== null && upstreamConfig[key] !== undefined) {
         set(rancherConfig, key, upstreamConfig[key]);
       }
     });

package/utils/version.js

@@ -2,6 +2,7 @@ import { sortableNumericSuffix } from '@shell/utils/sort';
 import semver from 'semver';
 import { MANAGEMENT } from '@shell/config/types';
 import { READ_WHATS_NEW, SEEN_WHATS_NEW } from '@shell/store/prefs';
+import { SETTING } from '@shell/config/settings';
 
 export function parse(str) {
   str = `${ str }`;
@@ -82,7 +83,7 @@ export function isDevBuild(version) {
 }
 
 export function getVersionInfo(store) {
-  const setting = store.getters['management/byId'](MANAGEMENT.SETTING, 'server-version');
+  const setting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER);
   const fullVersion = setting?.value || 'unknown';
   let displayVersion = fullVersion;
 

package/rancher-components/components/Accordion/Accordion.test.ts

@@ -1,45 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { Accordion } from './index';
-
-describe('component: Accordion', () => {
-  it('is closed initially by default', () => {
-    const title = 'Test Title';
-
-    const wrapper = shallowMount(Accordion, { propsData: { title } });
-
-    expect(wrapper.find('[data-testid="accordion-body"]').isVisible()).toBe(false);
-    expect(wrapper.find('[data-testid="accordion-header"]').text()).toBe(title);
-  });
-
-  it('is opened initially when openInitially prop is true', () => {
-    const wrapper = shallowMount(Accordion, { propsData: { openInitially: true } });
-
-    expect(wrapper.find('[data-testid="accordion-body"]').isVisible()).toBe(true);
-  });
-
-  it('when closed, opens when the header is clicked', async() => {
-    const wrapper = shallowMount(Accordion, { });
-
-    await wrapper.find('[data-testid="accordion-header"]').trigger('click');
-    expect(wrapper.find('[data-testid="accordion-body"]').isVisible()).toBe(true);
-  });
-
-  it('when open, closes when the header is clicked', async() => {
-    const wrapper = shallowMount(Accordion, { propsData: { openInitially: true } });
-
-    await wrapper.find('[data-testid="accordion-header"]').trigger('click');
-    expect(wrapper.find('[data-testid="accordion-body"]').isVisible()).toBe(false);
-  });
-
-  it('displays a chevron when closed', async() => {
-    const wrapper = shallowMount(Accordion, { propsData: { } });
-
-    expect(wrapper.find('[data-testid="accordion-header"] .icon-chevron-up').exists()).toBe(true);
-  });
-
-  it('displays an inverted chevron when open', async() => {
-    const wrapper = shallowMount(Accordion, { propsData: { openInitially: true } });
-
-    expect(wrapper.find('[data-testid="accordion-header"] .icon-chevron-down').exists()).toBe(true);
-  });
-});

package/rancher-components/components/Accordion/Accordion.vue

@@ -1,86 +0,0 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapGetters } from 'vuex';
-
-export default defineComponent({
-  props: {
-    title: {
-      type:    String,
-      default: ''
-    },
-
-    titleKey: {
-      type:    String,
-      default: null
-    },
-
-    openInitially: {
-      type:    Boolean,
-      default: false
-    }
-  },
-
-  data() {
-    return { isOpen: this.openInitially };
-  },
-
-  computed: { ...mapGetters({ t: 'i18n/t' }) },
-
-  methods: {
-    toggle() {
-      this.isOpen = !this.isOpen;
-    }
-  }
-});
-</script>
-
-<template>
-  <div class="accordion-container">
-    <div
-      class="accordion-header"
-      data-testid="accordion-header"
-      @click="toggle"
-    >
-      <i
-        class="icon text-primary"
-        :class="{'icon-chevron-down':isOpen, 'icon-chevron-up':!isOpen}"
-        data-testid="accordion-chevron"
-      />
-      <slot name="header">
-        <h4
-          data-testid="accordion-title-slot-content"
-          class="mb-0"
-        >
-          {{ titleKey ? t(titleKey) : title }}
-        </h4>
-      </slot>
-    </div>
-    <div
-      v-show="isOpen"
-      class="accordion-body"
-      data-testid="accordion-body"
-    >
-      <slot />
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.accordion-container {
-  border: 1px solid var(--border)
-}
-.accordion-header {
-  padding: 5px;
-  display: flex;
-  align-items: center;
-  &>*{
-    padding: 5px 0px 5px 0px;
-  }
-  I {
-    margin: 0px 10px 0px 10px;
-  }
-}
-.accordion-body {
-  padding: 10px;
-}
-</style>

package/rancher-components/components/Accordion/index.ts

@@ -1 +0,0 @@
-export { default as Accordion } from './Accordion.vue';

package/rancher-components/components/BadgeState/BadgeState.test.ts

@@ -1,12 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { BadgeState } from './index';
-
-describe('BadgeState.vue', () => {
-  it('renders props.msg when passed', () => {
-    const label = 'Hello, World!';
-
-    const wrapper = shallowMount(BadgeState, { propsData: { label } });
-
-    expect(wrapper.find('span').text()).toMatch(label);
-  });
-});