@rancher/shell 3.0.5-rc.7 → 3.0.5-rc.9

package/rancher-components/RcItemCard/RcItemCardAction.vue

@@ -17,8 +17,20 @@
 <template>
   <div
     item-card-action
+    class="rc-item-card-action"
     data-testid="rc-item-card-action"
   >
     <slot />
   </div>
 </template>
+
+<style lang="scss">
+.rc-item-card-action {
+  .v-popper {
+    .icon-actions {
+      color: var(--body-text);
+      font-size: 19px;
+    }
+  }
+}
+</style>

package/store/__tests__/catalog.test.ts

@@ -1,5 +1,7 @@
 import { CATALOG } from '@shell/config/types';
-import { state, getters, actions, mutations } from '../catalog';
+import {
+  state, getters, actions, mutations, filterAndArrangeCharts
+} from '../catalog';
 import { createStore } from 'vuex';
 
 const clusterRepo = { _key: 'testClusterRepo' };
@@ -204,4 +206,157 @@ describe('catalog', () => {
       expect(store.state[catalogStoreName].versionInfos).toStrictEqual({ });
     });
   });
+
+  describe('filterAndArrangeCharts', () => {
+    const mockCharts = [
+      {
+        chartName:        'chart-a',
+        chartNameDisplay: 'Chart Alpha',
+        chartDescription: 'Description for Alpha',
+        keywords:         ['keyword1', 'keyword2'],
+        versions:         [{ annotations: {}, version: '1.0.0' }],
+        deprecated:       false,
+        hidden:           false,
+        repoKey:          'repo1',
+        chartType:        'app',
+        categories:       [],
+        tags:             [],
+      },
+      {
+        chartName:        'chart-b',
+        chartNameDisplay: 'Chart Beta',
+        chartDescription: 'Description for Beta',
+        keywords:         ['keyword2', 'keyword3'],
+        versions:         [{ annotations: {}, version: '1.0.0' }],
+        deprecated:       false,
+        hidden:           false,
+        repoKey:          'repo1',
+        chartType:        'app',
+        categories:       [],
+        tags:             [],
+      },
+      {
+        chartName:        'chart-c',
+        chartNameDisplay: 'Chart Gamma',
+        chartDescription: 'Description for Gamma',
+        keywords:         ['keyword3', 'keyword4'],
+        versions:         [{ annotations: {}, version: '1.0.0' }],
+        deprecated:       false,
+        hidden:           false,
+        repoKey:          'repo1',
+        chartType:        'app',
+        categories:       [],
+        tags:             [],
+      },
+    ];
+
+    it('should return all charts when no search query is provided', () => {
+      const result = filterAndArrangeCharts(mockCharts, {});
+
+      expect(result).toHaveLength(mockCharts.length);
+    });
+
+    it('should filter charts by name', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'Chart Alpha' });
+
+      expect(result).toHaveLength(1);
+      expect(result[0].chartNameDisplay).toBe('Chart Alpha');
+    });
+
+    it('should filter charts by description', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'Description for Beta' });
+
+      expect(result).toHaveLength(1);
+      expect(result[0].chartNameDisplay).toBe('Chart Beta');
+    });
+
+    it('should filter charts by keyword', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'keyword1' });
+
+      expect(result).toHaveLength(1);
+      expect(result[0].chartNameDisplay).toBe('Chart Alpha');
+    });
+
+    it('should handle multiple search tokens', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'Chart, keyword2' });
+
+      expect(result).toHaveLength(2);
+    });
+
+    it('should be case-insensitive', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'chart alpha' });
+
+      expect(result).toHaveLength(1);
+      expect(result[0].chartNameDisplay).toBe('Chart Alpha');
+    });
+
+    it('should return an empty array if no charts match', () => {
+      const result = filterAndArrangeCharts(mockCharts, { searchQuery: 'nonexistent' });
+
+      expect(result).toHaveLength(0);
+    });
+  });
+
+  describe('getters', () => {
+    describe('version', () => {
+      it('should find a version from a chart, respecting the showDeprecated flag for charts', () => {
+        // A regular chart with some versions
+        const regularChart = {
+          repoType:   'cluster',
+          repoName:   'rancher-charts',
+          chartName:  'regular-chart',
+          deprecated: false,
+          versions:   [{ version: '1.2.3' }, { version: '1.2.4' }]
+        };
+        // A deprecated chart with some versions
+        const deprecatedChart = {
+          repoType:   'cluster',
+          repoName:   'rancher-charts',
+          chartName:  'deprecated-chart',
+          deprecated: true,
+          versions:   [{ version: '2.0.0' }, { version: '2.1.0' }]
+        };
+
+        const allCharts = [regularChart, deprecatedChart];
+        const state = {};
+        const localGetters = {
+          charts: allCharts,
+          chart:  (args: any) => getters.chart(state, { charts: allCharts })(args)
+        };
+
+        // Scenario 1: Get a version from a regular chart
+        const result1 = getters.version(state, localGetters)({
+          repoType:       'cluster',
+          repoName:       'rancher-charts',
+          chartName:      'regular-chart',
+          versionName:    '1.2.3',
+          showDeprecated: false
+        });
+
+        expect(result1).toStrictEqual({ version: '1.2.3' });
+
+        // Scenario 2: Get a version from a deprecated chart
+        const result2 = getters.version(state, localGetters)({
+          repoType:       'cluster',
+          repoName:       'rancher-charts',
+          chartName:      'deprecated-chart',
+          versionName:    '2.0.0',
+          showDeprecated: true
+        });
+
+        expect(result2).toStrictEqual({ version: '2.0.0' });
+
+        // Scenario 3: Try to get a version from a deprecated chart without the flag should fail
+        const result3 = getters.version(state, localGetters)({
+          repoType:       'cluster',
+          repoName:       'rancher-charts',
+          chartName:      'deprecated-chart',
+          versionName:    '2.0.0',
+          showDeprecated: false
+        });
+
+        expect(result3).toBeNull();
+      });
+    });
+  });
 });

package/store/aws.js

@@ -1,6 +1,6 @@
 import { sortBy } from '@shell/utils/sort';
 import { randomStr } from '@shell/utils/string';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { isArray, addObjects } from '@shell/utils/array';
 
 export const state = () => {
@@ -11,26 +11,33 @@ export const state = () => {
 };
 
 class Handler {
-  constructor(cloudCredentialId) {
+  constructor(cloudCredentialId, options) {
     this.cloudCredentialId = (cloudCredentialId || '');
+    this.fetchHandler = new FetchHttpHandler(options);
   }
 
-  handle(httpRequest, ...args) {
+  async handle(httpRequest, options = {}) {
+    if (!httpRequest?.headers) {
+      httpRequest.headers = {};
+    }
+
     httpRequest.headers['x-api-headers-restrict'] = 'Content-Length';
 
-    if ( this.cloudCredentialId ) {
+    if (this.cloudCredentialId) {
       httpRequest.headers['x-api-cattleauth-header'] = `awsv4 credID=${ this.cloudCredentialId }`;
-    } else {
+    } else if (httpRequest?.headers['authorization']) {
       httpRequest.headers['x-api-auth-header'] = httpRequest.headers['authorization'];
     }
 
     delete httpRequest.headers['authorization'];
 
-    httpRequest.headers['content-type'] = `rancher:${ httpRequest.headers['content-type'] }`;
+    const originalContentType = httpRequest.headers['content-type'] ?? '';
+
+    httpRequest.headers['content-type'] = originalContentType ? `rancher:${ originalContentType }` : 'rancher:';
 
     const endpoint = `/meta/proxy/`;
 
-    if ( !httpRequest.path.startsWith(endpoint) ) {
+    if (!httpRequest.path.startsWith(endpoint)) {
       httpRequest.path = endpoint + httpRequest.hostname + httpRequest.path;
     }
 
@@ -38,7 +45,7 @@ class Handler {
     httpRequest.hostname = window.location.hostname;
     httpRequest.port = window.location.port;
 
-    return FetchHttpHandler.prototype.handle.call(this, httpRequest, ...args);
+    return this.fetchHandler.handle(httpRequest, options);
   }
 }
 
@@ -107,6 +114,7 @@ export const actions = {
       region,
       credentialDefaultProvider: credentialDefaultProvider(accessKey, secretKey),
       requestHandler:            new Handler(cloudCredentialId),
+      useDualstackEndpoint:      true,
     });
 
     return client;
@@ -121,6 +129,7 @@ export const actions = {
       region,
       credentialDefaultProvider: credentialDefaultProvider(accessKey, secretKey),
       requestHandler:            new Handler(cloudCredentialId),
+      useDualstackEndpoint:      true,
     });
 
     return client;
@@ -135,6 +144,7 @@ export const actions = {
       region,
       credentialDefaultProvider: credentialDefaultProvider(accessKey, secretKey),
       requestHandler:            new Handler(cloudCredentialId),
+      useDualstackEndpoint:      true,
     });
 
     return client;
@@ -149,6 +159,7 @@ export const actions = {
       region,
       credentialDefaultProvider: credentialDefaultProvider(accessKey, secretKey),
       requestHandler:            new Handler(cloudCredentialId),
+      useDualstackEndpoint:      true,
     });
 
     return client;

package/store/catalog.js

@@ -237,10 +237,10 @@ export const getters = {
 
   version(state, getters) {
     return ({
-      repoType, repoName, chartName, versionName
+      repoType, repoName, chartName, versionName, showDeprecated
     }) => {
       const chart = getters['chart']({
-        repoType, repoName, chartName
+        repoType, repoName, chartName, showDeprecated
       });
 
       if ( !chart ) {
@@ -539,6 +539,7 @@ function addChart(ctx, map, chart, repo) {
       featuredIndex:    chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED] ? Number(chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED]) : Number.MAX_SAFE_INTEGER,
       repoKey:          repo._key,
       versions:         [],
+      keywords:         chart.keywords || [],
       categories:       filterCategories(chart.keywords),
       deprecated:       !!chart.deprecated,
       experimental,
@@ -693,11 +694,15 @@ export function filterAndArrangeCharts(charts, {
     if ( searchQuery ) {
       // The search filter doesn't match
       const searchTokens = searchQuery.split(/\s*[, ]\s*/).map((x) => ensureRegex(x, false));
+      const chartDescription = c.chartDescription || '';
+      const keywords = c.keywords || [];
 
-      for ( const token of searchTokens ) {
-        const chartDescription = c.chartDescription || '';
+      for (const token of searchTokens) {
+        const nameMatch = c.chartNameDisplay.match(token);
+        const descMatch = chartDescription.match(token);
+        const keywordMatch = keywords.some((k) => k.match(token));
 
-        if ( !c.chartNameDisplay.match(token) && !chartDescription.match(token) ) {
+        if (!nameMatch && !descMatch && !keywordMatch) {
           return false;
         }
       }

package/store/type-map.js

@@ -103,8 +103,6 @@
 //                               depaginate: undefined -- Use this to depaginate requests for this type
 //                               resourceEditMasthead: true   -- Show the Masthead in the edit resource component
 //                               customRoute: undefined,
-//                               hasGraph: undefined   -- If true, render ForceDirectedTreeChart graph (ATTENTION: option graphConfig is needed also!!!)
-//                               graphConfig: undefined   -- Use this to pass along the graph configuration
 //                               notFilterNamespace:  undefined -- Define namespaces that do not need to be filtered
 //                               localOnly: False -- Hide this type from the nav/search bar on downstream clusters
 //                               custom: any - Custom options for a given type
@@ -208,7 +206,6 @@ export const SPOOFED_PREFIX = '__[[spoofed]]__';
 export const SPOOFED_API_PREFIX = '__[[spoofedapi]]__';
 
 const instanceMethods = {};
-const graphConfigMap = {};
 
 export const IF_HAVE = {
   V2_MONITORING:            'v2-monitoring',
@@ -291,10 +288,6 @@ export function DSL(store, product, module = 'type-map') {
     },
 
     configureType(match, options) {
-      if (options.graphConfig) {
-        graphConfigMap[match] = options.graphConfig;
-        delete options.graphConfig;
-      }
       store.commit(`${ module }/configureType`, { ...options, match });
     },
 
@@ -1178,14 +1171,9 @@ export const getters = {
     };
   },
 
-  hasGraph(state, getters) {
-    return (resource) => {
-      const typeOptions = getters['optionsFor'](resource);
-
-      if (typeOptions && typeOptions.hasGraph) {
-        return graphConfigMap[resource];
-      }
-
+  // This has to be left in to support extensions which use shell version 3.0.5-rc.8 or earlier, this extensions have a version of ResourceDetail/index.vue which still invokes this method.
+  hasGraph() {
+    return () => {
       return null;
     };
   },

package/types/extension-manager.ts

@@ -0,0 +1,26 @@
+import { ClusterProvisionerContext } from '@shell/core/types';
+export type ExtensionManager = {
+  internal(): any;
+  loadPluginAsync(plugin: any): Promise<void>;
+  loadAsync(id: string, mainFile: string): Promise<void>;
+  loadBuiltinExtensions(): void;
+  registerBuiltinExtension(id: string, module: any): void;
+  initBuiltinExtension(id: string, module: any): void;
+  logout(): Promise<void>;
+  removePlugin(name: string): Promise<void>;
+  removeTypeFromStore(store: any, storeName: string, types: string[]): any[];
+  applyPlugin(plugin: any): void;
+  register(type: string, name: string, fn: Function): void;
+  unregister(type: string, name: string, fn: Function): void;
+  getAll(): any;
+  getPlugins(): any;
+  getDynamic(typeName: string, name: string): any;
+  getValidator(name: string): any;
+  getUIConfig(type: string, uiArea: string): any[];
+  getAllUIConfig(): any;
+  getProviders(context: ClusterProvisionerContext): any[];
+  lastLoad: number;
+  listDynamic(typeName: string): string[];
+  products: any[];
+  loadProducts(loadPlugins: any[]): void;
+}

package/types/resources/settings.d.ts

@@ -39,7 +39,7 @@ export interface PaginationSettings {
    * List of specific features that can be enabled / disabled
    */
   features?: {
-    [key in PaginationFeature]: { // eslint-disable-line no-unused-vars
+    [key in PaginationFeature]: {
       enabled: boolean,
     }
   },

package/types/shell/index.d.ts

@@ -121,7 +121,6 @@ export namespace FLEET {
     export { CLUSTER_NAMESPACE_1 as CLUSTER_NAMESPACE };
     export let CLUSTER: string;
     export let CREATED_BY_USER_ID: string;
-    export let CREATED_BY_USER_NAME: string;
     export let OCI_STORAGE_SECRET_DEFAULT: string;
     export let OCI_STORAGE_SECRET_GENERATED: string;
 }
@@ -149,6 +148,7 @@ export namespace HCI {
     let NETWORK_TYPE: string;
     let CLUSTER_NETWORK: string;
     let PRIMARY_SERVICE: string;
+    let CPU_MANAGER: string;
 }
 export namespace CLUSTER_BADGE {
     export let TEXT: string;
@@ -157,9 +157,6 @@ export namespace CLUSTER_BADGE {
     export let ICON_TEXT: string;
 }
 export const SYSTEM_LABELS: string[];
-export namespace CLOUD_CREDENTIALS {
-    let EXPIRATION: string;
-}
 export namespace OIDC_CLIENT_SECRET_ANNOTATIONS {
     let CREATE: string;
     let REGEN: string;
@@ -201,6 +198,7 @@ export const _STAGE: "stage";
 export const _IMPORT: "import";
 export const LEGACY: "legacy";
 export const AS: "as";
+export const VIEW: "view";
 export const _DETAIL: "detail";
 export const _CONFIG: "config";
 export const _YAML: "yaml";
@@ -2615,6 +2613,20 @@ export default class Namespace {
     cleanForNew(): void;
     metadata: any;
     get hideDetailLocation(): boolean;
+    get glance(): any[];
+    get projectGlance(): {
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            to: any;
+            row: {};
+            options: {
+                internal: boolean;
+            };
+        };
+        content: any;
+    };
 }
 }
 
@@ -2789,6 +2801,9 @@ declare namespace _default {
     export function createMany(ctx: any, data: any): any;
     export function createPopulated(ctx: any, userData: any): Promise<any>;
     export function clone(ctx: any, { resource }?: {}): any;
+    /**
+     * Remove all cached entries for a resource and stop watches
+     */
     export function forgetType({ commit, dispatch, state }: {
         commit: any;
         dispatch: any;
@@ -3044,17 +3059,8 @@ export default class Resource {
     hasCondition(condition: any): boolean;
     isCondition(condition: any, withStatus?: string): boolean;
     waitForCondition(name: any, withStatus?: string, timeoutMs?: number, intervalMs?: number): any;
+    get canEdit(): any;
     get availableActions(): ({
-        divider: boolean;
-        action?: undefined;
-        label?: undefined;
-        icon?: undefined;
-        enabled?: undefined;
-        bulkable?: undefined;
-        bulkAction?: undefined;
-        weight?: undefined;
-        altAction?: undefined;
-    } | {
         action: string;
         label: any;
         icon: string;
@@ -3064,6 +3070,16 @@ export default class Resource {
         bulkAction?: undefined;
         weight?: undefined;
         altAction?: undefined;
+    } | {
+        divider: boolean;
+        action?: undefined;
+        label?: undefined;
+        icon?: undefined;
+        enabled?: undefined;
+        bulkable?: undefined;
+        bulkAction?: undefined;
+        weight?: undefined;
+        altAction?: undefined;
     } | {
         action: string;
         label: any;
@@ -3085,17 +3101,8 @@ export default class Resource {
         weight: number;
         divider?: undefined;
     })[];
+    showConfiguration(returnFocusSelector: any): void;
     get _availableActions(): ({
-        divider: boolean;
-        action?: undefined;
-        label?: undefined;
-        icon?: undefined;
-        enabled?: undefined;
-        bulkable?: undefined;
-        bulkAction?: undefined;
-        weight?: undefined;
-        altAction?: undefined;
-    } | {
         action: string;
         label: any;
         icon: string;
@@ -3105,6 +3112,16 @@ export default class Resource {
         bulkAction?: undefined;
         weight?: undefined;
         altAction?: undefined;
+    } | {
+        divider: boolean;
+        action?: undefined;
+        label?: undefined;
+        icon?: undefined;
+        enabled?: undefined;
+        bulkable?: undefined;
+        bulkAction?: undefined;
+        weight?: undefined;
+        altAction?: undefined;
     } | {
         action: string;
         label: any;
@@ -3272,6 +3289,112 @@ export default class Resource {
         };
         content: any;
     })[];
+    get glance(): ({
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            row: this;
+            to?: undefined;
+            options?: undefined;
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            to: {
+                name: string;
+                params: {
+                    product: any;
+                    cluster: any;
+                    resource: any;
+                };
+            };
+            row: {};
+            options: {
+                internal: boolean;
+            };
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            to: {
+                name: string;
+                product: any;
+                cluster: any;
+                resource: any;
+            };
+            row: {};
+            options: {
+                internal: boolean;
+            };
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        content: any;
+        formatterOpts?: undefined;
+    })[];
+    get _glance(): ({
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            row: this;
+            to?: undefined;
+            options?: undefined;
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            to: {
+                name: string;
+                params: {
+                    product: any;
+                    cluster: any;
+                    resource: any;
+                };
+            };
+            row: {};
+            options: {
+                internal: boolean;
+            };
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        formatterOpts: {
+            to: {
+                name: string;
+                product: any;
+                cluster: any;
+                resource: any;
+            };
+            row: {};
+            options: {
+                internal: boolean;
+            };
+        };
+        content: any;
+    } | {
+        name: string;
+        label: any;
+        formatter: string;
+        content: any;
+        formatterOpts?: undefined;
+    })[];
     get t(): any;
     findOwners(): any[];
     getOwners(): any[];
@@ -3553,20 +3676,6 @@ export function parseAuthProvidersInfo(rows: any): {
     };
     enabled: any;
 };
-/**
- * Attempt to set the product in our datastore if the route matches a known product. Otherwise show an error page instead.
- */
-export function setProduct(store: any, to: any): any;
-/**
- * Check that the resource is valid, if not redirect to fail whale
- *
- * This requires that
- * - product is set
- * - product's store is set and setup (so we can check schema's within it)
- * - product's store has the schemaFor getter (extension stores might not have it)
- * - there's a resource associated with route (meta or param)
- */
-export function validateResource(store: any, to: any): boolean;
 /**
  * Attempt to load the current user's principal
  */
@@ -3594,11 +3703,6 @@ export function checkPermissions(types: any, getters: any): any;
 export function canViewResource(store: any, resource: any): boolean;
 }
 
-// @shell/utils/aws
-
-declare module '@shell/utils/aws' {
-}
-
 // @shell/utils/axios
 
 declare module '@shell/utils/axios' {
@@ -3988,6 +4092,7 @@ export function importList(name: any): any;
 export function importDetail(name: any): any;
 export function importEdit(name: any): any;
 export function importDialog(name: any): any;
+export function importDrawer(name: any): any;
 export function importWindowComponent(name: any): any;
 export function loadProduct(name: any): Promise<any>;
 export function listProducts(): string[];
@@ -4390,7 +4495,6 @@ export function routeRequiresInstallRedirect(to: any): boolean;
 // @shell/utils/select
 
 declare module '@shell/utils/select' {
-export function onClickOption(option: any, e: any): void;
 export function calculatePosition(dropdownList: any, component: any, width: any, placement: any): void;
 }
 
@@ -4855,6 +4959,7 @@ export function externalName(spec: any, getters: any, errors: any, validatorArgs
 declare module '@shell/utils/validators/setting' {
 export function isServerUrl(value: any): boolean;
 export function isHttps(value: any): any;
+export function isDomainWithoutProtocol(value: any): boolean;
 export function isLocalhost(value: any): boolean;
 export function hasTrailingForwardSlash(value: any): any;
 }