@rancher/shell 0.3.19 → 0.3.21

package/middleware/authenticated.js

@@ -15,6 +15,7 @@ import dynamicPluginLoader from '@shell/pkg/dynamic-plugin-loader';
 import { AFTER_LOGIN_ROUTE, WORKSPACE } from '@shell/store/prefs';
 import { BACK_TO } from '@shell/config/local-storage';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet.js';
+import { canViewResource } from '@shell/utils/auth';
 
 const getPackageFromRoute = (route) => {
   if (!route?.meta) {
@@ -133,20 +134,7 @@ function invalidResource(store, to, redirect) {
     return false;
   }
 
-  // Note - don't use the current products store... because products can override stores for resources with `typeStoreMap`
-  const inStore = store.getters['currentStore'](resource);
-  // There's a chance we're in an extension's product who's store could be anything, so confirm schemaFor exists
-  const schemaFor = store.getters[`${ inStore }/schemaFor`];
-
-  // In order to check a resource is valid we need these
-  if (!inStore || !schemaFor) {
-    return false;
-  }
-
-  // Resource is valid if a schema exists for it (standard resource, spoofed resource) or it's a virtual resource
-  const validResource = schemaFor(resource) || store.getters['type-map/isVirtual'](resource);
-
-  if (validResource) {
+  if (canViewResource(store, resource)) {
     return false;
   }
 

package/models/fleet.cattle.io.gitrepo.js

@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
 import { escapeHtml, randomStr } from '@shell/utils/string';
@@ -32,7 +33,8 @@ export default class GitRepo extends SteveModel {
 
     spec.paths = spec.paths || [];
     spec.clientSecretName = spec.clientSecretName || null;
-    spec.correctDrift = { enabled: false };
+
+    Vue.set(spec, 'correctDrift', { enabled: false });
 
     set(this, 'spec', spec);
     set(this, 'metadata', meta);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -149,7 +149,7 @@ export default {
         return this.t('login.error');
       }
 
-      return this.err;
+      return this.err?.length ? this.t('login.specificError', { msg: this.err }) : '';
     },
 
     errorToDisplay() {

package/pages/c/_cluster/fleet/index.vue

@@ -377,6 +377,7 @@ export default {
         :title="`${t('resourceDetail.masthead.workspace')}: ${ws.nameDisplay}`"
         :is-collapsed="isCollapsed[ws.id]"
         :is-title-clickable="true"
+        :data-testid="`collapsible-card-${ ws.id }`"
         @toggleCollapse="toggleCollapse($event, ws.id)"
         @titleClick="setWorkspaceFilterAndLinkToGitRepo(ws.id)"
       >
@@ -411,6 +412,7 @@ export default {
               <span v-if="ws.type === 'namespace'"> - </span>
               <CompoundStatusBadge
                 v-else
+                data-testid="clusters-ready"
                 :tooltip-text="getTooltipInfo('clusters', row)"
                 :badge-class="getStatusInfo('clusters', row).badgeClass"
                 :icon="getStatusInfo('clusters', row).icon"
@@ -421,6 +423,7 @@ export default {
               <span v-if="ws.type === 'namespace'"> - </span>
               <CompoundStatusBadge
                 v-else
+                data-testid="bundles-ready"
                 :tooltip-text="getTooltipInfo('bundles', row)"
                 :badge-class="getStatusInfo('bundles', row).badgeClass"
                 :icon="getStatusInfo('bundles', row).icon"
@@ -429,6 +432,7 @@ export default {
             </template>
             <template #cell:resourcesReady="{row}">
               <CompoundStatusBadge
+                data-testid="resources-ready"
                 :tooltip-text="getTooltipInfo('resources', row)"
                 :badge-class="getStatusInfo('resources', row).badgeClass"
                 :icon="getStatusInfo('resources', row).icon"

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

@@ -243,9 +243,9 @@ export default {
 
       all = all.map((chart) => {
         // Label can be overridden by chart annotation
-        const label = uiPluginAnnotation(UI_PLUGIN_CHART_ANNOTATIONS.DISPLAY_NAME) || chart.chartNameDisplay;
+        const label = uiPluginAnnotation(chart, UI_PLUGIN_CHART_ANNOTATIONS.DISPLAY_NAME) || chart.chartNameDisplay;
         const item = {
-          name:         chart.chartNameDisplay,
+          name:         chart.chartName,
           label,
           description:  chart.chartDescription,
           id:           chart.id,
@@ -305,7 +305,7 @@ export default {
         if (!chart) {
           // A plugin is loaded, but there is no chart, so add an item so that it shows up
           const rancher = typeof p.metadata?.rancher === 'object' ? p.metadata.rancher : {};
-          const label = rancher[UI_PLUGIN_CHART_ANNOTATIONS.DISPLAY_NAME] || p.name;
+          const label = rancher.annotations?.[UI_PLUGIN_CHART_ANNOTATIONS.DISPLAY_NAME] || p.name;
           const item = {
             name:           p.name,
             label,

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

@@ -206,6 +206,13 @@ export default (
       }
     },
 
+    /**
+     * Emit on input change
+     */
+    onChange(event: Event): void {
+      this.$emit('change', event);
+    },
+
     /**
      * Emit on input with delay. Note: Arrow function is avoided due context
      * binding.
@@ -299,6 +306,7 @@ export default (
         @input="onInput($event.target.value)"
         @focus="onFocus"
         @blur="onBlur"
+        @change="onChange"
       >
     </slot>
 

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

@@ -4,7 +4,7 @@ import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 
 describe('radioButton.vue', () => {
   it('renders label slot contents', () => {
-    const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' } });
+    const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' }, propsData: { val: {}, value: {} } });
 
     expect(wrapper.find('.radio-label').text()).toBe('Test Label');
   });
@@ -14,7 +14,9 @@ describe('radioButton.vue', () => {
       RadioButton,
       {
         directives: { cleanHtmlDirective },
-        propsData:  { label: 'Test Label' }
+        propsData:  {
+          label: 'Test Label', val: {}, value: {}
+        }
       });
 
     expect(wrapper.find('.radio-label').text()).toBe('Test Label');
@@ -23,7 +25,9 @@ describe('radioButton.vue', () => {
   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' },
+      propsData: {
+        label: 'Test Label - Props', val: {}, value: {}
+      },
     });
 
     expect(wrapper.find('.radio-label').text()).toBe('Test Label - Slot');

package/store/auth.js

@@ -334,6 +334,8 @@ export const actions = {
     } catch (err) {
       if (err._status === 401) {
         return Promise.reject(LOGIN_ERRORS.CLIENT_UNAUTHORIZED);
+      } else if (err.message) {
+        return Promise.reject(err.message);
       } else if ( err._status >= 400 && err._status <= 499 ) {
         return Promise.reject(LOGIN_ERRORS.CLIENT);
       }

package/types/shell/index.d.ts

@@ -3029,6 +3029,7 @@ export function authProvidersInfo(store: any): Promise<{
 }>;
 export function checkSchemasForFindAllHash(types: any, store: any): any;
 export function checkPermissions(types: any, getters: any): any;
+export function canViewResource(store: any, resource: any): boolean;
 }
 
 // @shell/utils/aws
@@ -4060,6 +4061,7 @@ export default _default;
 
 declare module '@shell/utils/validators/cidr' {
 export function isValidCIDR(cidr: any): boolean;
+export function isValidIP(ip: any): boolean;
 export function isValidMac(value: any): boolean;
 }
 

package/utils/auth.js

@@ -144,3 +144,20 @@ export const checkPermissions = (types, getters) => {
 
   return allHash(hash);
 };
+
+export const canViewResource = (store, resource) => {
+  // Note - don't use the current products store... because products can override stores for resources with `typeStoreMap`
+  const inStore = store.getters['currentStore'](resource);
+  // There's a chance we're in an extension's product who's store could be anything, so confirm schemaFor exists
+  const schemaFor = store.getters[`${ inStore }/schemaFor`];
+
+  // In order to check a resource is valid we need these
+  if (!inStore || !schemaFor) {
+    return false;
+  }
+
+  // Resource is valid if a schema exists for it (standard resource, spoofed resource) or it's a virtual resource
+  const validResource = schemaFor(resource) || store.getters['type-map/isVirtual'](resource);
+
+  return !!validResource;
+};

package/utils/object.js

@@ -72,7 +72,6 @@ export function get(obj, path) {
       return '(JSON Path err)';
     }
   }
-
   if ( !path.includes('.') ) {
     return obj?.[path];
   }

package/utils/validators/__tests__/cidr.test.ts

@@ -0,0 +1,33 @@
+import { isValidCIDR, isValidIP, isValidMac } from '@shell/utils/validators/cidr';
+
+describe('fx: isValidCIDR', () => {
+  it('should be valid', () => {
+    expect(isValidCIDR('10.42.0.0/8')).toBe(true);
+  });
+  it('should be invalid', () => {
+    expect(isValidCIDR('10.42.0.0')).toBe(false);
+    expect(isValidCIDR('10.42.0.0/500')).toBe(false);
+    expect(isValidCIDR('300.42.0.0/8')).toBe(false);
+  });
+});
+
+describe('fx: isValidIP', () => {
+  it('should be valid', () => {
+    expect(isValidIP('10.42.0.1')).toBe(true);
+  });
+  it('should be invalid', () => {
+    expect(isValidIP('10.42.0.0/8')).toBe(false);
+    expect(isValidIP('300.42.0.0')).toBe(false);
+  });
+});
+
+describe('fx: isValidMac', () => {
+  it('should be valid', () => {
+    expect(isValidMac('00-08-20-83-53-D1')).toBe(true);
+    expect(isValidMac('00-08-20-83-53-d1')).toBe(true);
+  });
+  it('should be invalid', () => {
+    expect(isValidMac('invalid')).toBe(false);
+    expect(isValidMac('00-08-20-83-53')).toBe(false);
+  });
+});

package/utils/validators/cidr.js

@@ -1,9 +1,14 @@
 const validCIDRregex = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(3[0-2]|2[0-9]|1[0-9]|[0-9])$/;
+const validIPRegex = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
 
 export function isValidCIDR(cidr) {
   return !!cidr.match(validCIDRregex);
 }
 
+export function isValidIP(ip) {
+  return !!ip.match(validIPRegex);
+}
+
 export function isValidMac(value) {
   return /^[A-Fa-f0-9]{2}(-[A-Fa-f0-9]{2}){5}$|^[A-Fa-f0-9]{2}(:[A-Fa-f0-9]{2}){5}$/.test(value);
 }