@rancher/shell 0.5.3 → 1.2.1

package/rancher-components/Form/Radio/RadioButton.vue

@@ -1,8 +1,9 @@
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { _VIEW } from '@shell/config/query-params';
+import { randomStr } from '@shell/utils/string';
 
-export default Vue.extend({
+export default defineComponent({
   props: {
     /**
      * The name of the input, for grouping.
@@ -71,7 +72,10 @@ export default Vue.extend({
   },
 
   data() {
-    return { isChecked: this.value === this.val };
+    return {
+      isChecked:    this.value === this.val,
+      randomString: `${ randomStr() }-radio`,
+    };
   },
 
   computed: {
@@ -115,13 +119,15 @@ export default Vue.extend({
     /**
      * Emits the input event.
      */
-    clicked({ target }: { target?: HTMLElement }) {
-      if (this.isDisabled || target?.tagName === 'A') {
+    clicked(event: MouseEvent | KeyboardEvent) {
+      const target = event.target;
+
+      if (this.isDisabled || (target instanceof HTMLElement && target.tagName === 'A')) {
         return;
       }
 
       this.$emit('input', this.val);
-    }
+    },
   }
 });
 </script>
@@ -134,7 +140,7 @@ export default Vue.extend({
     @click.stop="clicked($event)"
   >
     <input
-      :id="_uid+'-radio'"
+      :id="randomString"
       :disabled="isDisabled"
       :name="name"
       :value="''+val"

package/rancher-components/Form/Radio/RadioGroup.vue

@@ -1,14 +1,15 @@
 <script lang="ts">
-import Vue, { PropType } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import { _VIEW } from '@shell/config/query-params';
 import RadioButton from '@components/Form/Radio/RadioButton.vue';
 
 interface Option {
   value: unknown,
-  label: string
+  label: string,
+  description?: string,
 }
 
-export default Vue.extend({
+export default defineComponent({
   components: { RadioButton },
   props:      {
     /**

package/rancher-components/Form/TextArea/TextAreaAutoGrow.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import debounce from 'lodash/debounce';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 
@@ -10,7 +10,7 @@ declare module 'vue/types/vue' {
   }
 }
 
-export default Vue.extend({
+export default defineComponent({
   inheritAttrs: false,
 
   props: {
@@ -115,7 +115,9 @@ export default Vue.extend({
     /**
      * Emits the input event and resizes the Text Area.
     */
-    onInput(val: string): void {
+    onInput(event: Event): void {
+      const val = (event?.target as HTMLInputElement)?.value;
+
       this.$emit('input', val);
       this.queueResize();
     },
@@ -155,7 +157,7 @@ export default Vue.extend({
 <template>
   <textarea
     ref="ta"
-    data-testid="text-area-auto-grow"
+    :data-testid="$attrs['data-testid'] ? $attrs['data-testid'] : 'text-area-auto-grow'"
     :disabled="isDisabled"
     :style="style"
     :placeholder="placeholder"
@@ -163,7 +165,7 @@ export default Vue.extend({
     v-bind="$attrs"
     :spellcheck="spellcheck"
     @paste="$emit('paste', $event)"
-    @input="onInput($event.target.value)"
+    @input="onInput($event)"
     @focus="$emit('focus', $event)"
     @blur="$emit('blur', $event)"
   />

package/rancher-components/Form/ToggleSwitch/ToggleSwitch.vue

@@ -1,6 +1,9 @@
 <script lang="ts">
-import Vue from 'vue';
-export default Vue.extend({
+import { defineComponent } from 'vue';
+
+type StateType = boolean | 'true' | 'false' | undefined;
+
+export default defineComponent({
   props: {
     value: {
       type:    [Boolean, String, Number],
@@ -28,7 +31,7 @@ export default Vue.extend({
     },
   },
   data() {
-    return { state: false as boolean | string | number };
+    return { state: false as StateType };
   },
 
   watch: {
@@ -41,7 +44,7 @@ export default Vue.extend({
   },
 
   methods: {
-    toggle(neu: boolean | string | number) {
+    toggle(neu: StateType | null) {
       this.state = neu === null ? !this.state : neu;
       this.$emit('input', this.state ? this.onValue : this.offValue);
     }

package/rancher-components/LabeledTooltip/LabeledTooltip.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 
-export default Vue.extend({
+export default defineComponent({
   props: {
     /**
      * The Labeled Tooltip value.
@@ -29,9 +29,14 @@ export default Vue.extend({
     }
   },
   computed: {
-    iconClass() {
+    iconClass(): string {
       return this.status === 'error' ? 'icon-warning' : 'icon-info';
     }
+  },
+  methods: {
+    isObject(value: string | Record<string, unknown>): value is Record<string, unknown> {
+      return typeof value === 'object' && value !== null && !!value.content;
+    }
   }
 });
 </script>
@@ -44,7 +49,7 @@ export default Vue.extend({
   >
     <template v-if="hover">
       <i
-        v-clean-tooltip="value.content ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value"
+        v-clean-tooltip="isObject(value) ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value"
         :class="{'hover':!value, [iconClass]: true}"
         class="icon status-icon"
       />

package/rancher-components/StringList/StringList.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import Vue, { PropType } from 'vue';
+import Vue, { PropType, defineComponent } from 'vue';
 
 import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 import { findStringIndex, hasDuplicatedStrings } from '@shell/utils/array';
@@ -29,7 +29,7 @@ const CLASS = {
 /**
  * Manage a list of strings
  */
-export default Vue.extend({
+export default defineComponent({
 
   name:       'StringList',
   components: { LabeledInput },
@@ -92,9 +92,9 @@ export default Vue.extend({
   },
   data() {
     return {
-      value:        null as string | null,
+      value:        undefined as string | undefined,
       selected:     null as string | null,
-      editedItem:   null as string | null,
+      editedItem:   undefined as string | undefined,
       isCreateItem: false,
       errors:       { duplicate: false } as Record<Error, boolean>
     };
@@ -281,7 +281,7 @@ export default Vue.extend({
         this.isCreateItem = true;
         this.setFocus(INPUT.create);
       } else {
-        this.value = null;
+        this.value = undefined;
         this.toggleError('duplicate', false);
         this.onSelectLeave();
 
@@ -303,11 +303,11 @@ export default Vue.extend({
         this.editedItem = item || '';
         this.setFocus(INPUT.edit);
       } else {
-        this.value = null;
+        this.value = undefined;
         this.toggleError('duplicate', false);
         this.onSelectLeave();
 
-        this.editedItem = null;
+        this.editedItem = undefined;
       }
     },
 
@@ -502,7 +502,7 @@ export default Vue.extend({
         <button
           data-testid="button-add"
           class="btn btn-sm role-tertiary add-button"
-          :disabled="isCreateItem || editedItem"
+          :disabled="!!isCreateItem || !!editedItem"
           @click.prevent="onClickPlusButton"
         >
           <span class="icon icon-plus icon-sm" />

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

@@ -1,7 +1,8 @@
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { mapGetters } from 'vuex';
-export default Vue.extend({
+
+export default defineComponent({
   props: {
     title: {
       type:    String,

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

@@ -0,0 +1,12 @@
+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);
+  });
+});

package/rancher-components/components/Form/LabeledInput/LabeledInput.test.ts

@@ -1,3 +1,4 @@
+
 import { mount } from '@vue/test-utils';
 import { LabeledInput } from './index';
 
@@ -5,7 +6,7 @@ describe('component: LabeledInput', () => {
   it('should emit input only once', () => {
     const value = '2';
     const delay = 1;
-    const wrapper = mount(LabeledInput as any, {
+    const wrapper = mount(LabeledInput, {
       propsData: { delay },
       mocks:     { $store: { getters: { 'i18n/t': jest.fn() } } }
     });
@@ -19,22 +20,4 @@ describe('component: LabeledInput', () => {
     expect(wrapper.emitted('input')).toHaveLength(1);
     expect(wrapper.emitted('input')![0][0]).toBe(value);
   });
-
-  it('using mode "multiline" should emit input value correctly', () => {
-    const value = 'any-string';
-    const delay = 1;
-    const wrapper = mount(LabeledInput as any, {
-      propsData: { delay, multiline: true },
-      mocks:     { $store: { getters: { 'i18n/t': jest.fn() } } }
-    });
-
-    jest.useFakeTimers();
-    wrapper.find('input').setValue('1');
-    wrapper.find('input').setValue(value);
-    jest.advanceTimersByTime(delay);
-    jest.useRealTimers();
-
-    expect(wrapper.emitted('input')).toHaveLength(1);
-    expect(wrapper.emitted('input')![0][0]).toBe(value);
-  });
 });

package/rancher-components/components/Form/LabeledInput/LabeledInput.vue

@@ -90,7 +90,7 @@ export default (
     delay: {
       type:    Number,
       default: 0
-    },
+    }
   },
 
   data() {
@@ -216,9 +216,6 @@ export default (
     /**
      * Emit on input with delay. Note: Arrow function is avoided due context
      * binding.
-     *
-     * NOTE: In multiline, TextAreaAutoGrow emits a string with the value
-     * https://github.com/rancher/dashboard/issues/10249
      */
     delayInput(value: string): void {
       this.$emit('input', value);
@@ -325,14 +322,20 @@ export default (
       :hover="hoverTooltip"
       :value="validationMessage"
     />
-    <label
-      v-if="cronHint"
-      class="cron-label"
-    >{{ cronHint }}</label>
-    <label
-      v-if="subLabel"
+    <div
+      v-if="cronHint || subLabel"
       class="sub-label"
-    >{{ subLabel }}</label>
+    >
+      <div
+        v-if="cronHint"
+      >
+        {{ cronHint }}
+      </div>
+      <div
+        v-if="subLabel"
+        v-clean-html="subLabel"
+      />
+    </div>
   </div>
 </template>
 <style scoped lang="scss">

package/rancher-components/components/Form/TextArea/TextAreaAutoGrow.vue

@@ -155,7 +155,7 @@ export default Vue.extend({
 <template>
   <textarea
     ref="ta"
-    data-testid="text-area-auto-grow"
+    :data-testid="$attrs['data-testid'] ? $attrs['data-testid'] : 'text-area-auto-grow'"
     :disabled="isDisabled"
     :style="style"
     :placeholder="placeholder"

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

@@ -398,276 +398,6 @@ describe('stringList.vue', () => {
     });
   });
 
-  describe('bulk delimiter', () => {
-    const delimiter = /;/;
-
-    describe('add', () => {
-      const items: string[] = [];
-
-      beforeEach(() => {
-        wrapper = mount(StringList, {
-          propsData: {
-            items,
-            bulkAdditionDelimiter: delimiter,
-            errorMessages:         { duplicate: 'error, item is duplicate.' },
-          }
-        });
-      });
-
-      it('should split values if delimiter set', async() => {
-        const value = 'test;test1;test2';
-        const result = ['test', 'test1', 'test2'];
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should show warning if one of the values is a duplicate', async() => {
-        const value = 'test;test1;test2';
-
-        await wrapper.setProps({ items: ['test1'] });
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
-
-        expect(isDuplicate).toBe(true);
-      });
-
-      it('should show a warning if the new values are all duplicates', async() => {
-        const value = 'test;test';
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
-
-        expect(isDuplicate).toBe(true);
-      });
-
-      it('should not consider empty strings at the beginning', async() => {
-        const value = ';test;test1;test2';
-        const result = ['test', 'test1', 'test2'];
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should not consider empty strings in the middle', async() => {
-        const value = 'test;test1;;test2';
-        const result = ['test', 'test1', 'test2'];
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should not consider empty strings at the end', async() => {
-        const value = 'test;test1;test2;';
-        const result = ['test', 'test1', 'test2'];
-
-        // activate create mode
-        await wrapper.setData({ isCreateItem: true });
-        const inputField = wrapper.find('[data-testid="item-create"]');
-
-        await inputField.setValue(value);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-    });
-
-    describe('edit', () => {
-      const items = ['test1', 'test2'];
-
-      beforeEach(() => {
-        wrapper = mount(StringList, {
-          propsData: {
-            items,
-            bulkAdditionDelimiter: delimiter,
-            errorMessages:         { duplicate: 'error, item is duplicate.' },
-          }
-        });
-      });
-
-      it('should split values if delimiter set', async() => {
-        const newValue = 'test1;new;values';
-        const result = ['test1', 'new', 'values', 'test2'];
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should show warning if one of the values is a duplicate', async() => {
-        const newValue = 'test1;test2';
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
-
-        expect(isDuplicate).toBe(true);
-      });
-
-      it('should show a warning if the new values are all duplicates', async() => {
-        const newValue = 'test;test';
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
-
-        expect(isDuplicate).toBe(true);
-      });
-
-      it('should not consider empty strings at the beginning', async() => {
-        const newValue = ';test1;new;value';
-        const result = ['test1', 'new', 'value', 'test2'];
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should not consider empty strings in the middle 1', async() => {
-        const newValue = 'test1; ;new;value';
-        const result = ['test1', 'new', 'value', 'test2'];
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should not consider empty strings in the middle 2', async() => {
-        const newValue = 'test1;;new;value';
-        const result = ['test1', 'new', 'value', 'test2'];
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-
-      it('should not consider empty strings at the end', async() => {
-        const newValue = 'test1;new;value;';
-        const result = ['test1', 'new', 'value', 'test2'];
-
-        await wrapper.setData({ editedItem: items[0] });
-        const inputField = wrapper.find('[data-testid^="item-edit"]');
-
-        await inputField.setValue(newValue);
-
-        // press enter
-        await inputField.trigger('keydown.enter');
-        await wrapper.vm.$nextTick();
-
-        const itemsResult = (wrapper.emitted('change') || [])[0][0];
-
-        expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
-      });
-    });
-  });
-
   describe('errors handling', () => {
     it('show duplicate warning icon when errorMessages is defined', async() => {
       const items = ['test'];