@rancher/shell 3.0.2 → 3.0.4

package/models/__tests__/logging.banzaicloud.io.flow.test.ts

@@ -0,0 +1,88 @@
+import LogFlow from '@shell/models/logging.banzaicloud.io.flow';
+
+describe('class LogFlow', () => {
+  it('prop "outputs" should take namespace in consideration when filtering logging v2 "outputs"', () => {
+    const logOutputs = [
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'default',
+          name:              'output1',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8b'
+        },
+        name:   'output1',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'cattle-fleet-system',
+          name:              'output2',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8c'
+        },
+        name:   'output2',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'cattle-fleet-system',
+          name:              'output3',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8d'
+        },
+        name:   'output3',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+      {
+        apiVersion: 'logging.banzaicloud.io/v1beta1',
+        kind:       'Output',
+        metadata:   {
+          creationTimestamp: '2025-03-17T10:51:55Z',
+          namespace:         'kube-system',
+          name:              'output4',
+          uid:               '927b4a2e-6be0-476f-9bdd-cf30c4a27d8e'
+        },
+        name:   'output4',
+        spec:   { awsElasticsearch: { endpoint: {} } },
+        status: { active: false }
+      },
+    ];
+
+    const logFlowData = {
+      apiVersion: 'logging.banzaicloud.io/v1beta1',
+      kind:       'Flow',
+      metadata:   {
+        name:              'flow2',
+        creationTimestamp: '2025-03-17T10:53:02Z',
+        generation:        1,
+        namespace:         'cattle-fleet-system',
+        resourceVersion:   '4070',
+        uid:               'fdf7d553-d101-4c37-91b0-784f95dc950a',
+        fields:            [
+          'flow2', true, null
+        ]
+      },
+      spec: {
+        localOutputRefs: [
+          'output2',
+          'output3'
+        ]
+      }
+    };
+
+    const logFlow = new LogFlow(logFlowData);
+
+    jest.spyOn(logFlow, 'allOutputs', 'get').mockReturnValue(logOutputs);
+
+    expect(logFlow.outputs).toStrictEqual([logOutputs[1], logOutputs[2]]);
+  });
+});

package/models/logging.banzaicloud.io.flow.js

@@ -64,7 +64,8 @@ export default class LogFlow extends SteveModel {
   get outputs() {
     const localOutputRefs = this.spec?.localOutputRefs || [];
 
-    return this.allOutputs.filter((output) => localOutputRefs.includes(output.name));
+    return this.allOutputs.filter((output) => localOutputRefs.includes(output.name) &&
+    output.metadata?.namespace === this.metadata?.namespace);
   }
 
   get outputsSortable() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -51,7 +51,7 @@
     "add": "2.0.6",
     "ansi_up": "5.0.0",
     "axios-retry": "3.1.9",
-    "axios": "0.21.4",
+    "axios": "1.8.4",
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",

package/pages/about.vue

@@ -119,8 +119,12 @@ export default {
     <table>
       <thead>
         <tr>
-          <th>{{ t('about.versions.component') }}</th>
-          <th>{{ t('about.versions.version') }}</th>
+          <th class="custom-th">
+            {{ t('about.versions.component') }}
+          </th>
+          <th class="custom-th">
+            {{ t('about.versions.version') }}
+          </th>
         </tr>
       </thead>
       <tr v-if="rancherVersion">
@@ -210,11 +214,11 @@ export default {
           v-for="(d, i) in downloadImageList"
           :key="i"
         >
-          <td>
+          <th>
             <div class="os">
               <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
             </div>
-          </td>
+          </th>
           <td>
             <a
               v-if="d.imageList"
@@ -241,11 +245,11 @@ export default {
           :key="i"
           class="link"
         >
-          <td>
+          <th>
             <div class="os">
               <i :class="`icon ${d.icon} mr-5`" /> {{ t(d.label) }}
             </div>
-          </td>
+          </th>
           <td>
             <a
               v-if="d.cliLink"
@@ -273,7 +277,7 @@ export default {
     overflow: hidden;
     border-radius: var(--border-radius);
 
-    tr > td:first-of-type {
+    tr > th:first-of-type {
       width: 20%;
     }
 
@@ -284,11 +288,15 @@ export default {
       text-align: left;
     }
 
-    th {
+    th.custom-th {
       background-color: var(--sortable-table-top-divider);
       border-bottom: 1px solid var(--sortable-table-top-divider);
     }
 
+    th:not(.custom-th) {
+      font-weight: normal;
+    }
+
     a {
       cursor: pointer;
     }

package/promptRemove/management.cattle.io.fleetworkspace.vue

@@ -71,7 +71,7 @@ export default {
   <div class="mt-10">
     <div class="mb-10">
       {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-        v-clean-html="resourceNames(names, t)"
+        v-clean-html="resourceNames(names, null, t)"
         class="description"
       />
     </div>

package/promptRemove/management.cattle.io.globalrole.vue

@@ -21,7 +21,7 @@ export default {
 
 <template>
   <div>
-    {{ t('promptRemove.attemptingToRemove', { type }) }} <span v-clean-html="resourceNames(names, t)" />
+    {{ t('promptRemove.attemptingToRemove', { type }) }} <span v-clean-html="resourceNames(names, null, t)" />
     <div
       v-if="info"
       class="text info mb-10 mt-20"

package/promptRemove/management.cattle.io.project.vue

@@ -94,7 +94,7 @@ export default {
         <template v-if="!canSeeProjectlessNamespaces">
           <span class="delete-warning"> {{ t('promptRemove.willDeleteAssociatedNamespaces') }}</span> <br>
           <div
-            v-clean-html="resourceNames(names, t)"
+            v-clean-html="resourceNames(names, null, t)"
             class="mt-10"
           />
         </template>
@@ -108,7 +108,7 @@ export default {
           :label="t('promptRemove.deleteAssociatedNamespaces')"
         />
         <div class="mt-10 ml-20">
-          <span v-clean-html="resourceNames(names, t)" />
+          <span v-clean-html="resourceNames(names, null, t)" />
         </div>
       </div>
     </div>

package/promptRemove/management.cattle.io.roletemplate.vue

@@ -22,7 +22,7 @@ export default {
 <template>
   <div>
     {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-      v-clean-html="resourceNames(names, t)"
+      v-clean-html="resourceNames(names, null, t)"
     />
     <div
       v-if="info"

package/promptRemove/pod.vue

@@ -98,7 +98,7 @@ export default {
   <div class="mt-10">
     <div class="mb-30">
       {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-        v-clean-html="resourceNames(names, t)"
+        v-clean-html="resourceNames(names, null, t)"
         class="body"
       />
     </div>

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

@@ -128,6 +128,10 @@ export default defineComponent({
 
   emits: ['update:value'],
 
+  data() {
+    return { describedById: `described-by-${ generateRandomAlphaString(12) }` };
+  },
+
   computed: {
     /**
      * Determines if the checkbox is disabled.
@@ -270,6 +274,7 @@ export default defineComponent({
         :aria-label="replacementLabel"
         :aria-checked="!!value"
         :aria-labelledby="labelKey || label ? idForLabel : undefined"
+        :aria-describedby="descriptionKey || description ? describedById : undefined"
         role="checkbox"
       />
       <span
@@ -311,10 +316,13 @@ export default defineComponent({
     >
       <t
         v-if="descriptionKey"
+        :id="describedById"
         :k="descriptionKey"
       />
       <template v-else-if="description">
-        {{ description }}
+        <p :id="describedById">
+          {{ description }}
+        </p>
       </template>
     </div>
     <div class="checkbox-outer-container-extra">

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

@@ -148,7 +148,8 @@ export default defineComponent({
     return {
       updated:          false,
       validationErrors: '',
-      inputId:          `input-${ generateRandomAlphaString(12) }`
+      inputId:          `input-${ generateRandomAlphaString(12) }`,
+      describedById:    `described-by-${ generateRandomAlphaString(12) }`
     };
   },
 
@@ -380,6 +381,7 @@ export default defineComponent({
         :placeholder="_placeholder"
         autocapitalize="off"
         :class="{ conceal: type === 'multiline-password' }"
+        :aria-describedby="cronHint || subLabel ? describedById : undefined"
         @update:value="onInput"
         @focus="onFocus"
         @blur="onBlur"
@@ -400,6 +402,7 @@ export default defineComponent({
         autocomplete="off"
         autocapitalize="off"
         :data-lpignore="ignorePasswordManagers"
+        :aria-describedby="cronHint || subLabel ? describedById : undefined"
         @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
@@ -428,13 +431,15 @@ export default defineComponent({
     >
       <div
         v-if="cronHint"
+        :id="describedById"
         role="alert"
         :aria-label="cronHint"
       >
         {{ cronHint }}
       </div>
       <div
-        v-if="subLabel"
+        v-else-if="subLabel"
+        :id="describedById"
         v-clean-html="subLabel"
       />
     </div>

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

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, onMounted, onBeforeUnmount, useTemplateRef } from 'vue';
+import { defineComponent, onMounted, onBeforeUnmount, ref } from 'vue';
 
 type StateType = boolean | 'true' | 'false' | undefined;
 
@@ -34,7 +34,7 @@ export default defineComponent({
   emits: ['update:value'],
 
   setup() {
-    const switchChrome = useTemplateRef<HTMLElement>('switchChrome');
+    const switchChrome = ref<HTMLElement | null>(null);
     const focus = () => {
       switchChrome.value?.classList.add('focus');
     };
@@ -43,7 +43,7 @@ export default defineComponent({
       switchChrome.value?.classList.remove('focus');
     };
 
-    const switchInput = useTemplateRef<HTMLInputElement>('switchInput');
+    const switchInput = ref<HTMLInputElement | null>(null);
 
     onMounted(() => {
       switchInput.value?.addEventListener('focus', focus);

package/rancher-components/RcDropdown/RcDropdown.vue

@@ -20,7 +20,7 @@
  *    </template>
  *  </rc-dropdown>
  */
-import { useTemplateRef } from 'vue';
+import { ref } from 'vue';
 import { useClickOutside } from '@shell/composables/useClickOutside';
 import { useDropdownContext } from '@components/RcDropdown/useDropdownContext';
 
@@ -42,8 +42,8 @@ const {
 
 provideDropdownContext();
 
-const popperContainer = useTemplateRef<HTMLElement>('popperContainer');
-const dropdownTarget = useTemplateRef<HTMLElement>('dropdownTarget');
+const popperContainer = ref(null);
+const dropdownTarget = ref(null);
 
 useClickOutside(dropdownTarget, () => showMenu(false));
 

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -8,8 +8,10 @@ import {
 import { RcDropdownMenuComponentProps, DropdownOption } from './types';
 import IconOrSvg from '@shell/components/IconOrSvg';
 
-// eslint-disable-next-line vue/no-setup-props-destructure
-const { buttonRole = 'primary', buttonSize = '' } = defineProps<RcDropdownMenuComponentProps>();
+withDefaults(defineProps<RcDropdownMenuComponentProps>(), {
+  buttonRole: 'primary',
+  buttonSize: undefined,
+});
 
 const emit = defineEmits(['update:open', 'select']);
 

package/rancher-components/RcDropdown/RcDropdownTrigger.vue

@@ -2,7 +2,7 @@
 /**
  * A button that opens a menu. Used in conjunction with `RcDropdown.vue`.
  */
-import { inject, onMounted, useTemplateRef } from 'vue';
+import { inject, onMounted, ref } from 'vue';
 import { RcButton, RcButtonType } from '@components/RcButton';
 import { DropdownContext, defaultContext } from './types';
 
@@ -13,7 +13,7 @@ const {
   handleKeydown,
 } = inject<DropdownContext>('dropdownContext') || defaultContext;
 
-const dropdownTrigger = useTemplateRef<RcButtonType>('dropdownTrigger');
+const dropdownTrigger = ref<RcButtonType | null>(null);
 
 onMounted(() => {
   registerTrigger(dropdownTrigger.value);

package/scripts/test-plugins-build.sh

@@ -238,11 +238,9 @@ function clone_repo_test_extension_build() {
 # Don't forget to add the unit tests exception to clone_repo_test_extension_build function if a new extension has those
 clone_repo_test_extension_build "rancher" "kubewarden-ui" "kubewarden"
 clone_repo_test_extension_build "rancher" "elemental-ui" "elemental"
-# TODO #13141: Enable neuvector tests after issues have been resolved
-# clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
-# TODO: #13173: Enable capi, stackstate, and harvester after `entities` resolution has been set
-# clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
-# clone_repo_test_extension_build "StackVista" "rancher-extension-stackstate" "observability"
-# clone_repo_test_extension_build "harvester" "harvester-ui-extension" "harvester"
+clone_repo_test_extension_build "neuvector" "manager-ext" "neuvector-ui-ext"
+clone_repo_test_extension_build "rancher" "capi-ui-extension" "capi"
+clone_repo_test_extension_build "StackVista" "rancher-extension-stackstate" "observability"
+clone_repo_test_extension_build "harvester" "harvester-ui-extension" "harvester"
 
 echo "All done"

package/types/shell/index.d.ts

@@ -4361,7 +4361,7 @@ export function random32(count: any): number | number[];
 export function randomStr(length?: number, chars?: string): any;
 export function formatPercent(value: any, maxPrecision?: number): string;
 export function pluralize(str: any): any;
-export function resourceNames(names: any, t: any, options?: {}): any;
+export function resourceNames(names: any, plusMore: any, t: any, endString: any): any;
 export function indent(lines: any, count?: number, token?: string, afterRegex?: any): any;
 export function decamelize(str: any): any;
 export function dasherize(str: any): any;

package/utils/__tests__/string.test.ts

@@ -81,9 +81,9 @@ describe('fx: resourceNames', () => {
     it.each(args)(`having: %p`, (
       names,
       expectation,
-      options,
+      options: any,
     ) => {
-      const result = resourceNames(names, t, options);
+      const result = resourceNames(names, options.plusMore, t, options.endString);
 
       expect(result).toStrictEqual(expectation);
     });

package/utils/color.js

@@ -19,14 +19,15 @@ export function createCssVars(color, theme = 'light', name = 'primary') {
   const contrastOpts = theme === 'light' ? LIGHT_CONTRAST_COLORS : DARK_CONTRAST_COLORS;
 
   return {
-    [`--${ name }`]:             color,
-    [`--${ name }-text `]:       contrastColor(color, contrastOpts),
-    [`--${ name }-hover-bg`]:    lighten(color, -10),
-    [`--${ name }-active-bg`]:   lighten(color, -25),
-    [`--${ name }-active-text`]: contrastColor(lighten(color, -25), contrastOpts),
-    [`--${ name }-border`]:      color,
-    [`--${ name }-banner-bg`]:   opacity(color, 0.15),
-    [`--${ name }-light-bg`]:    opacity(color, 0.05),
+    [`--${ name }`]:                color,
+    [`--${ name }-text `]:          contrastColor(color, contrastOpts),
+    [`--${ name }-hover-bg`]:       lighten(color, -10),
+    [`--${ name }-active-bg`]:      lighten(color, -25),
+    [`--${ name }-active-text`]:    contrastColor(lighten(color, -25), contrastOpts),
+    [`--${ name }-border`]:         color,
+    [`--${ name }-banner-bg`]:      opacity(color, 0.15),
+    [`--${ name }-light-bg`]:       opacity(color, 0.05),
+    [`--${ name }-keyboard-focus`]: lighten(color, -10),
   };
 }
 

package/utils/string.js

@@ -151,11 +151,9 @@ export function pluralize(str) {
   }
 }
 
-export function resourceNames(names, t, options = {}) {
+export function resourceNames(names, plusMore, t, endString) {
   const MAX_NAMES_COUNT = 5;
 
-  let { plusMore, endString } = options;
-
   // plusMore default value
   if (!plusMore) {
     plusMore = t('promptRemove.andOthers', { count: names.length > MAX_NAMES_COUNT ? names.length - MAX_NAMES_COUNT : 0 });