@rancher/shell 3.0.2-rc.6 → 3.0.3

package/edit/service.vue

@@ -521,9 +521,6 @@ export default {
               "
               :label="t('servicesPage.affinity.timeout.label')"
               :placeholder="t('servicesPage.affinity.timeout.placeholder')"
-              @input="
-                (e) => value.spec.sessionAffinityConfig.clientIP.timeoutSeconds = e
-              "
             />
           </div>
         </div>

package/edit/workload/Job.vue

@@ -161,7 +161,7 @@ export default {
           :suffix="t('suffix.times', {count: completions})"
           label-key="workload.job.completions.label"
           tooltip-key="workload.job.completions.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
       <div
@@ -174,7 +174,7 @@ export default {
           :suffix="t('suffix.times', {count: parallelism})"
           label-key="workload.job.parallelism.label"
           tooltip-key="workload.job.parallelism.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
     </div>
@@ -189,7 +189,7 @@ export default {
           :suffix="t('suffix.times', {count: backoffLimit})"
           label-key="workload.job.backoffLimit.label"
           tooltip-key="workload.job.backoffLimit.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
       <div
@@ -202,7 +202,7 @@ export default {
           :suffix="t('suffix.seconds', {count: activeDeadlineSeconds})"
           label-key="workload.job.activeDeadlineSeconds.label"
           tooltip-key="workload.job.activeDeadlineSeconds.tip"
-          @input="update"
+          @update:value="update"
         />
       </div>
     </div>
@@ -245,7 +245,7 @@ export default {
             :suffix="t('suffix.seconds', {count: startingDeadlineSeconds})"
             label-key="workload.job.startingDeadlineSeconds.label"
             tooltip-key="workload.job.startingDeadlineSeconds.tip"
-            @input="update"
+            @update:value="update"
           />
         </div>
         <div
@@ -257,7 +257,7 @@ export default {
             :suffix="t('suffix.seconds', { count: terminationGracePeriodSeconds })"
             :label="t('workload.upgrading.activeDeadlineSeconds.label')"
             :mode="mode"
-            @input="update"
+            @update:value="update"
           >
             <template #label>
               <label

package/edit/workload/__tests__/Job.test.ts

@@ -64,7 +64,6 @@ describe('component: Job', () => {
       const newValue = 123;
 
       input.setValue(newValue);
-      input.trigger('blur');
 
       expect(wrapper.emitted('update:value')).toHaveLength(1);
     });

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-rc.6",
+  "version": "3.0.3",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -85,7 +85,7 @@
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-n": "15.2.0",
-    "eslint-plugin-vue": "9.10.0",
+    "eslint-plugin-vue": "9.32.0",
     "eslint": "7.32.0",
     "event-target-shim": "5.0.1",
     "express": "4.17.1",

package/pages/auth/login.vue

@@ -30,7 +30,6 @@ import {
 } from '@shell/config/private-label';
 import loadPlugins from '@shell/plugins/plugin';
 import Loading from '@shell/components/Loading';
-import { getGlobalBannerFontSizes } from '@shell/utils/banners';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 
 export default {
@@ -133,13 +132,6 @@ export default {
     hasLoginMessage() {
       return this.errorToDisplay || this.loggedOut || this.timedOut;
     },
-
-    // Apply bottom margin so that the locale secletor control lifts up to avoid the footer fixed banner, if it is shown
-    localeSelectorStyle() {
-      const globalBannerSettings = getGlobalBannerFontSizes(this.$store);
-
-      return { marginBottom: globalBannerSettings?.footerFont };
-    }
   },
 
   async fetch() {
@@ -509,7 +501,6 @@ export default {
           class="locale-selector"
         >
           <LocaleSelector
-            :style="localeSelectorStyle"
             mode="login"
           />
         </div>
@@ -526,6 +517,7 @@ export default {
 <style lang="scss" scoped>
   .login {
     overflow: hidden;
+    position: relative;  // Used to keep the locale selector positioned correctly
 
     .row {
       align-items: center;

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/scripts/extension/helm/charts/ui-plugin-server/templates/_helpers.tpl

@@ -38,7 +38,7 @@ Common labels
 helm.sh/chart: {{ include "extension-server.chart" . }}
 {{ include "extension-server.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
@@ -60,4 +60,4 @@ Pkg annotations
 {{ $key }}: {{ $value | quote }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

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/store/aws.js

@@ -241,8 +241,15 @@ export const actions = {
       }
 
       addObjects(out, res[key]);
-      opt.NextToken = res.NextToken;
-      hasNext = !!res.NextToken;
+      if (res.NextToken) {
+        opt.NextToken = res.NextToken;
+        hasNext = true;
+      } else if (res.Marker) {
+        opt.Marker = res.Marker;
+        hasNext = true;
+      } else {
+        hasNext = false;
+      }
     }
 
     return out;

package/types/shell/index.d.ts

@@ -3446,13 +3446,6 @@ export function getIndividualBanners(store: any): {};
  * Overlay settings from the individual banner settings onto the single banner setting
  */
 export function overlayIndividualBanners(parsedBanner: any, banners: any): void;
-/**
- * Get banner font sizes - used to add margins when header and footer banners are present
- **/
-export function getGlobalBannerFontSizes(store: any): {
-    headerFont: string;
-    footerFont: string;
-};
 }
 
 // @shell/utils/clipboard
@@ -4001,9 +3994,6 @@ export function deepToRaw(obj: any, cache?: any): any;
  * More info: https://github.com/lodash/lodash/issues/1313
  *
  * This helper function addresses the issue by always replacing the old array with the new array during the merge process.
- *
- * This helper is used for another case in rke2.vue to handle merging addon chart default values with the user's current values.
- * It fixed https://github.com/rancher/dashboard/issues/12418
  */
 export function mergeWithReplaceArrays(obj1?: {}, obj2?: {}): any;
 export { isEqualBasic as isEqual };

package/utils/banners.js

@@ -5,7 +5,6 @@
  */
 
 import { MANAGEMENT } from '@shell/config/types';
-import { SETTING } from '@shell/config/settings';
 
 const BANNER_HEADER = 'bannerHeader';
 const BANNER_FOOTER = 'bannerFooter';
@@ -57,47 +56,3 @@ export function overlayIndividualBanners(parsedBanner, banners) {
     } catch {}
   });
 }
-
-/**
- * Converts a pixel value to an em value based on the default font size.
- * @param {number} elementFontSize - The font size of the element in pixels.
- * @param {number} [defaultFontSize=14] - The default font size in pixels.
- * @returns {string} The converted value in em units.
- */
-function pxToEm(elementFontSize, defaultFontSize = 14) {
-  const lineHeightInPx = 2 * parseInt(elementFontSize);
-  const lineHeightInEm = lineHeightInPx / defaultFontSize;
-
-  return `${ lineHeightInEm }em`;
-}
-
-/**
- * Get banner font sizes - used to add margins when header and footer banners are present
- **/
-export function getGlobalBannerFontSizes(store) {
-  const settings = store.getters['management/all'](MANAGEMENT.SETTING);
-  const bannerSettings = settings?.find((s) => s.id === SETTING.BANNERS);
-  const individualBannerSettings = getIndividualBanners(store);
-
-  if (bannerSettings) {
-    const parsed = JSON.parse(bannerSettings.value);
-
-    overlayIndividualBanners(parsed, individualBannerSettings);
-
-    const {
-      showFooter, showHeader, bannerFooter, bannerHeader, banner
-    } = parsed;
-
-    // add defaults to accommodate older JSON structures for banner definitions without breaking the UI
-    // https://github.com/rancher/dashboard/issues/10140
-    const bannerHeaderFontSize = bannerHeader?.fontSize || banner?.fontSize || '14px';
-    const bannerFooterFontSize = bannerFooter?.fontSize || banner?.fontSize || '14px';
-
-    return {
-      headerFont: showHeader === 'true' ? pxToEm(bannerHeaderFontSize) : '0px',
-      footerFont: showFooter === 'true' ? pxToEm(bannerFooterFontSize) : '0px'
-    };
-  }
-
-  return undefined;
-}

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/object.js

@@ -488,9 +488,6 @@ export function deepToRaw(obj, cache = new WeakSet()) {
  * More info: https://github.com/lodash/lodash/issues/1313
  *
  * This helper function addresses the issue by always replacing the old array with the new array during the merge process.
- *
- * This helper is used for another case in rke2.vue to handle merging addon chart default values with the user's current values.
- * It fixed https://github.com/rancher/dashboard/issues/12418
  */
 export function mergeWithReplaceArrays(obj1 = {}, obj2 = {}) {
   return mergeWith(obj1, obj2, (obj1Value, obj2Value) => {