@rancher/shell 0.3.16 → 0.3.18

package/rancher-components/Form/Radio/RadioButton.test.ts

@@ -0,0 +1,31 @@
+import { shallowMount } from '@vue/test-utils';
+import { RadioButton } from './index';
+import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
+
+describe('radioButton.vue', () => {
+  it('renders label slot contents', () => {
+    const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' } });
+
+    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
+  });
+
+  it('renders label prop contents', () => {
+    const wrapper = shallowMount(
+      RadioButton,
+      {
+        directives: { cleanHtmlDirective },
+        propsData:  { label: 'Test Label' }
+      });
+
+    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
+  });
+
+  it('renders slot contents when both slot and label prop are provided', () => {
+    const wrapper = shallowMount(RadioButton, {
+      slots:     { label: 'Test Label - Slot' },
+      propsData: { label: 'Test Label - Props' },
+    });
+
+    expect(wrapper.find('.radio-label').text()).toBe('Test Label - Slot');
+  });
+});

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

@@ -12,25 +12,25 @@ export default Vue.extend({
       default: ''
     },
 
-    /** 
+    /**
      * The value for this option.
-     */ 
+     */
     val: {
       required:  true,
-      validator: x => true
+      validator: () => true
     },
 
-    /** 
+    /**
      * The selected value.
-     */ 
+     */
     value: {
       required:  true,
-      validator: x => true
+      validator: () => true
     },
 
     /**
      * The label shown next to the radio.
-     */ 
+     */
     label: {
       type:    String,
       default: ''
@@ -96,6 +96,10 @@ export default Vue.extend({
     hasDescriptionSlot(): boolean {
       return !!this.$slots.description;
     },
+
+    hasLabelSlot(): boolean {
+      return !!this.$slots.label || !!this.$scopedSlots.label;
+    }
   },
 
   watch: {
@@ -138,7 +142,7 @@ export default Vue.extend({
       type="radio"
       :tabindex="-1"
       @click.stop.prevent
-    />
+    >
     <span
       ref="custom"
       :class="[ isDisabled ? 'text-muted' : '', 'radio-custom']"
@@ -149,15 +153,28 @@ export default Vue.extend({
     />
     <div class="labeling">
       <label
-        v-if="label"
         :class="[ muteLabel ? 'text-muted' : '', 'radio-label', 'm-0']"
         :for="name"
-        v-html="label"
       >
-        <slot name="label">{{ label }}</slot>
+        <slot
+          v-if="hasLabelSlot"
+          name="label"
+        >
+          <!-- slot content -->
+        </slot>
+        <span
+          v-else-if="label"
+          v-clean-html="label"
+        />
       </label>
-      <div v-if="descriptionKey || description" class="radio-button-outer-container-description">
-        <t v-if="descriptionKey" :k="descriptionKey" />
+      <div
+        v-if="descriptionKey || description"
+        class="radio-button-outer-container-description"
+      >
+        <t
+          v-if="descriptionKey"
+          :k="descriptionKey"
+        />
         <template v-else-if="description">
           {{ description }}
         </template>

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

@@ -28,7 +28,7 @@ export default Vue.extend({
     },
 
     /**
-     * If options are just values, then labels can be a corresponding display 
+     * If options are just values, then labels can be a corresponding display
      * value.
      */
     labels: {
@@ -152,7 +152,7 @@ export default Vue.extend({
      */
     clickNext(direction: number): void {
       const opts = this.normalizedOptions;
-      const selected = opts.find(x => x.value === this.value);
+      const selected = opts.find((x) => x.value === this.value);
       let newIndex = (selected ? opts.indexOf(selected) : -1) + direction;
 
       if (newIndex >= opts.length) {
@@ -169,15 +169,29 @@ export default Vue.extend({
 
 <template>
   <div>
-    <div v-if="label || labelKey || tooltip || tooltipKey || $slots.label" class="radio-group label">
+    <div
+      v-if="label || labelKey || tooltip || tooltipKey || $slots.label"
+      class="radio-group label"
+    >
       <slot name="label">
         <h3>
-          <t v-if="labelKey" :k="labelKey" />
+          <t
+            v-if="labelKey"
+            :k="labelKey"
+          />
           <template v-else-if="label">
             {{ label }}
           </template>
-          <i v-if="tooltipKey" v-tooltip="t(tooltipKey)" class="icon icon-info icon-lg" />
-          <i v-else-if="tooltip" v-tooltip="tooltip" class="icon icon-info icon-lg" />
+          <i
+            v-if="tooltipKey"
+            v-clean-tooltip="t(tooltipKey)"
+            class="icon icon-info icon-lg"
+          />
+          <i
+            v-else-if="tooltip"
+            v-clean-tooltip="tooltip"
+            class="icon icon-info icon-lg"
+          />
         </h3>
       </slot>
     </div>
@@ -192,7 +206,12 @@ export default Vue.extend({
         v-for="(option, i) in normalizedOptions"
         :key="name+'-'+i"
       >
-        <slot :listeners="$listeners" :option="option" :name="i">
+        <slot
+          :listeners="$listeners"
+          :option="option"
+          :is-disabled="isDisabled"
+          :name="i"
+        >
           <RadioButton
             :key="name+'-'+i"
             :name="name"

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

@@ -24,14 +24,14 @@ export default Vue.extend({
     },
 
     /**
-     * Sets the Minimum height for Text Area. Prevents the height from becoming 
+     * Sets the Minimum height for Text Area. Prevents the height from becoming
      * smaller than the value specified in minHeight.
      */
     minHeight: {
       type:    Number,
       default: 25
     },
-    
+
     /**
      * Sets the maximum height for Text Area. Prevents the height from becoming
      * larger than the value specified in maxHeight.
@@ -50,7 +50,7 @@ export default Vue.extend({
     },
 
     /**
-     * Specifies whether Text Area is subject to spell checking by the 
+     * Specifies whether Text Area is subject to spell checking by the
      * underlying browser/OS.
      */
     spellcheck: {
@@ -83,7 +83,7 @@ export default Vue.extend({
     },
 
     /**
-     * Sets the height to one-line for SSR pageload so that it's already right 
+     * Sets the height to one-line for SSR pageload so that it's already right
      * (unless the input is long)
      */
     style(): string {
@@ -112,7 +112,7 @@ export default Vue.extend({
   },
 
   methods: {
-    /** 
+    /**
      * Emits the input event and resizes the Text Area.
     */
     onInput(val: string): void {
@@ -128,7 +128,7 @@ export default Vue.extend({
     },
 
     /**
-     * Sets the overflowY and height of the Text Area based on the content 
+     * Sets the overflowY and height of the Text Area based on the content
      * entered (calculated via scroll height).
      */
     autoSize(): void {
@@ -155,6 +155,7 @@ export default Vue.extend({
 <template>
   <textarea
     ref="ta"
+    data-testid="text-area-auto-grow"
     :disabled="isDisabled"
     :style="style"
     :placeholder="placeholder"

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

@@ -1,11 +1,11 @@
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, Wrapper } from '@vue/test-utils';
 import { ToggleSwitch } from './index';
 
-describe('ToggleSwitch.vue', () => {
+describe('toggleSwitch.vue', () => {
   it('renders falsy by default', () => {
     const wrapper = shallowMount(ToggleSwitch);
 
-    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement
+    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement;
 
     expect(toggleInput.checked).toBeFalsy();
   });
@@ -13,71 +13,58 @@ describe('ToggleSwitch.vue', () => {
   it('renders a true value', () => {
     const wrapper = shallowMount(
       ToggleSwitch,
-      {
-        propsData: {
-          value: true
-        }
-      });
+      { propsData: { value: true } });
 
-    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement
+    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement;
 
     expect(toggleInput.checked).toBe(true);
   });
 
-  it('updates from falsy to truthy when props change', async () => {
+  it('updates from falsy to truthy when props change', async() => {
     const wrapper = shallowMount(ToggleSwitch);
-  
-    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement
+
+    const toggleInput = wrapper.find('input[type="checkbox"]').element as HTMLInputElement;
 
     expect(toggleInput.checked).toBe(false);
 
     await wrapper.setProps({ value: true });
-  
+
     expect(toggleInput.checked).toBe(true);
   });
 
-  it('emits an input event with a true value', async () => {
-    const wrapper = shallowMount(ToggleSwitch);
+  it('emits an input event with a true value', async() => {
+    const wrapper: Wrapper<InstanceType<typeof ToggleSwitch>> = shallowMount(ToggleSwitch);
 
-    (wrapper.vm as any).toggle(true);
+    wrapper.vm.toggle(true);
 
     await wrapper.vm.$nextTick();
 
     expect(wrapper.emitted().input?.length).toBe(1);
     expect(wrapper.emitted().input?.[0][0]).toBe(true);
-
   });
 
-  it('emits an input event with a false value', async () => {
-    const wrapper = shallowMount(
+  it('emits an input event with a false value', async() => {
+    const wrapper: Wrapper<InstanceType<typeof ToggleSwitch>> = shallowMount(
       ToggleSwitch,
-      {
-        propsData: {
-          value: true
-        }
-      }
+      { propsData: { value: true } }
     );
 
-    (wrapper.vm as any).toggle(false);
+    wrapper.vm.toggle(false);
 
     await wrapper.vm.$nextTick();
 
     expect(wrapper.emitted().input?.length).toBe(1);
     expect(wrapper.emitted().input?.[0][0]).toBe(false);
-  })
+  });
 
-  it('emits an input event with a custom onValue', async () => {
+  it('emits an input event with a custom onValue', async() => {
     const onValue = 'THE TRUTH';
 
-    const wrapper = shallowMount(
+    const wrapper: Wrapper<InstanceType<typeof ToggleSwitch>> = shallowMount(
       ToggleSwitch,
-      {
-        propsData: {
-          onValue,
-        }
-      });
+      { propsData: { onValue } });
 
-    (wrapper.vm as any).toggle(true);
+    wrapper.vm.toggle(true);
 
     await wrapper.vm.$nextTick();
 
@@ -85,10 +72,10 @@ describe('ToggleSwitch.vue', () => {
     expect(wrapper.emitted().input?.[0][0]).toBe(onValue);
   });
 
-  it('emits an input event with a custom offValue', async () => {
+  it('emits an input event with a custom offValue', async() => {
     const offValue = 'NOT THE TRUTH';
 
-    const wrapper = shallowMount(
+    const wrapper: Wrapper<InstanceType<typeof ToggleSwitch>> = shallowMount(
       ToggleSwitch,
       {
         propsData: {
@@ -97,11 +84,11 @@ describe('ToggleSwitch.vue', () => {
         }
       });
 
-    (wrapper.vm as any).toggle(false);
+    wrapper.vm.toggle(false);
 
     await wrapper.vm.$nextTick();
 
     expect(wrapper.emitted().input?.length).toBe(1);
     expect(wrapper.emitted().input?.[0][0]).toBe(offValue);
-  })
+  });
 });

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

@@ -31,13 +31,6 @@ export default Vue.extend({
     return { state: false as boolean | string | number };
   },
 
-  methods: {
-    toggle(neu: boolean | string | number) {
-      this.state = neu === null ? !this.state : neu;
-      this.$emit('input', this.state ? this.onValue : this.offValue);
-    }
-  },
-
   watch: {
     value: {
       handler() {
@@ -45,18 +38,37 @@ export default Vue.extend({
       },
       immediate: true
     }
+  },
+
+  methods: {
+    toggle(neu: boolean | string | number) {
+      this.state = neu === null ? !this.state : neu;
+      this.$emit('input', this.state ? this.onValue : this.offValue);
+    }
   }
 });
 </script>
 
 <template>
   <span class="toggle-container">
-    <span class="label no-select hand" :class="{ active: !state}" @click="toggle(false)">{{ offLabel }}</span>
+    <span
+      class="label no-select hand"
+      :class="{ active: !state}"
+      @click="toggle(false)"
+    >{{ offLabel }}</span>
     <label class="switch hand">
-      <input type="checkbox" :checked="state" @input="toggle(null)">
-      <span class="slider round"></span>
+      <input
+        type="checkbox"
+        :checked="state"
+        @input="toggle(null)"
+      >
+      <span class="slider round" />
     </label>
-    <span class="label no-select hand" :class="{ active: state}" @click="toggle(true)">{{ onLabel }}</span>
+    <span
+      class="label no-select hand"
+      :class="{ active: state}"
+      @click="toggle(true)"
+    >{{ onLabel }}</span>
   </span>
 </template>
 

package/rancher-components/LabeledTooltip/LabeledTooltip.vue

@@ -37,13 +37,28 @@ export default Vue.extend({
 </script>
 
 <template>
-  <div ref="container" class="labeled-tooltip" :class="{[status]: true, hoverable: hover}">
+  <div
+    ref="container"
+    class="labeled-tooltip"
+    :class="{[status]: true, hoverable: hover}"
+  >
     <template v-if="hover">
-      <i v-tooltip="value.content ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value" :class="{'hover':!value, [iconClass]: true}" class="icon status-icon" />
+      <i
+        v-clean-tooltip="value.content ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value"
+        :class="{'hover':!value, [iconClass]: true}"
+        class="icon status-icon"
+      />
     </template>
     <template v-else>
-      <i :class="{'hover':!value}" class="icon status-icon" />
-      <div v-if="value" class="tooltip" x-placement="bottom">
+      <i
+        :class="{'hover':!value}"
+        class="icon status-icon"
+      />
+      <div
+        v-if="value"
+        class="tooltip"
+        x-placement="bottom"
+      >
         <div class="tooltip-arrow" />
         <div class="tooltip-inner">
           {{ value }}
@@ -69,7 +84,6 @@ export default Vue.extend({
         position:  absolute;
         right: 30px;
         top: $input-padding-lg;
-        font-size: 20px;
         z-index: z-index(hoverOverContent);
      }