@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.2

package/store/auth.js

@@ -3,7 +3,6 @@ import { MANAGEMENT, EXT } from '@shell/config/types';
 import { addObjects, findBy, joinStringList } from '@shell/utils/array';
 import { openAuthPopup, returnTo } from '@shell/utils/auth';
 import { base64Encode } from '@shell/utils/crypto';
-import { removeEmberPage } from '@shell/utils/ember-page';
 import { randomStr } from '@shell/utils/string';
 import { addParams, parse as parseUrl, removeParam } from '@shell/utils/url';
 
@@ -429,8 +428,6 @@ export const actions = {
   },
 
   uiLogout({ commit, dispatch }, options = {}) {
-    removeEmberPage();
-
     commit('loggedOut');
     dispatch('onLogout', options, { root: true });
 

package/store/catalog.js

@@ -325,8 +325,12 @@ export const actions = {
    * force: Always refresh catalog's helm repo by re-fetching index.yaml
    *
    * reset: clear existing charts and version cache
+   *
+   * repoKeys: Optional array of specific repo keys (IDs) to refresh. When provided, only these specific
+   * repos will be fetched, and only their existing charts will be cleared from the cache to avoid
+   * duplicate chart entries or wiping out unrelated chart data.
    */
-  async load(ctx, { force, reset } = {}) {
+  async load(ctx, { force, reset, repoKeys = [] } = {}) {
     const {
       state, getters, rootGetters, commit, dispatch
     } = ctx;
@@ -360,14 +364,34 @@ export const actions = {
     promises = {};
 
     for ( const repo of repos ) {
-      if ( (force === true || !getters.isLoaded(repo)) && repo.canLoad ) {
+      let shouldLoad = false;
+
+      if (repoKeys.length) {
+        // If repoKeys are explicitly provided (e.g. refreshing a single repo from the UI),
+        // we ONLY want to load the repos in that array. We intentionally ignore `!getters.isLoaded(repo)`
+        // here so we don't accidentally fetch other unrelated repos just because they haven't loaded yet.
+        shouldLoad = repoKeys.includes(repo._key);
+      } else {
+        // Default behavior: load if explicitly forced, OR if the repo hasn't been loaded into state yet.
+        shouldLoad = force === true || !getters.isLoaded(repo);
+      }
+
+      if ( shouldLoad && repo.canLoad ) {
         console.info('Loading index for repo', repo.name, `(${ repo._key })`); // eslint-disable-line no-console
         promises[repo._key] = repo.followLink('index');
       }
     }
 
     const res = await allHashSettled(promises);
-    const charts = reset ? {} : state.charts;
+    const charts = reset ? {} : { ...state.charts };
+    let versionInfos = null;
+
+    if (reset) {
+      versionInfos = {};
+    } else if (repoKeys.length) {
+      versionInfos = { ...state.versionInfos };
+    }
+
     const errors = [];
 
     for ( const key of Object.keys(res) ) {
@@ -379,6 +403,28 @@ export const actions = {
         continue;
       }
 
+      // We are targeting specific repos. To prevent duplicate chart versions from appearing,
+      // we must remove the old charts for this specific repo before appending the newly fetched ones,
+      // but ONLY if the fetch was successful.
+      if (repoKeys.length && repoKeys.includes(key)) {
+        for (const chartKey in charts) {
+          if (charts[chartKey].repoKey === key) {
+            delete charts[chartKey];
+          }
+        }
+
+        // Also clear out cached version info for this repo so we don't display stale READMEs/values
+        const repoType = repo.type === CATALOG.CLUSTER_REPO ? 'cluster' : 'namespace';
+        const repoName = repo.metadata.name;
+        const versionPrefix = `${ repoType }/${ repoName }/`;
+
+        for (const versionKey in versionInfos) {
+          if (versionKey.startsWith(versionPrefix)) {
+            delete versionInfos[versionKey];
+          }
+        }
+      }
+
       for ( const k in obj.value.entries ) {
         for ( const entry of obj.value.entries[k] ) {
           addChart(ctx, charts, entry, repo);
@@ -394,13 +440,17 @@ export const actions = {
       loaded,
     });
 
-    if (reset) {
-      commit('setVersions', {});
+    if (versionInfos) {
+      commit('setVersions', versionInfos);
     }
   },
 
+  /**
+   * Globally refreshes all loaded repositories by triggering their refresh actions concurrently,
+   * bypassing individual catalog loads, and then performs a single, global catalog/load.
+   */
   async refresh({ getters, commit, dispatch }) {
-    const promises = getters.repos.map((x) => x.refresh());
+    const promises = getters.repos.map((x) => x.refresh(false));
 
     // @TODO wait for repo state to indicate they're done once the API has that
 
@@ -488,7 +538,9 @@ function addChart(ctx, map, chart, repo) {
     certified = CATALOG_ANNOTATIONS._OTHER;
   }
 
-  if ( chart.deprecated ) {
+  const isDeprecated = !!chart.deprecated || chart.annotations?.[CATALOG_ANNOTATIONS.DEPRECATED] === 'true';
+
+  if ( isDeprecated ) {
     sideLabel = DEPRECATED;
   } else if ( chart.annotations?.[CATALOG_ANNOTATIONS.EXPERIMENTAL] ) {
     sideLabel = EXPERIMENTAL;
@@ -546,7 +598,7 @@ function addChart(ctx, map, chart, repo) {
       versions:         [],
       keywords:         chart.keywords || [],
       categories:       filterCategories(chart.keywords),
-      deprecated:       !!chart.deprecated,
+      deprecated:       isDeprecated,
       primeOnly,
       experimental,
       hidden:           !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],

package/types/shell/index.d.ts

@@ -81,6 +81,7 @@ export namespace CATALOG {
     let _OTHER: string;
     let PRIME_ONLY: string;
     let EXPERIMENTAL: string;
+    let DEPRECATED: string;
     let NAMESPACE: string;
     let RELEASE_NAME: string;
     let FEATURED: string;
@@ -247,6 +248,7 @@ export namespace CATALOG {
     let _OTHER: string;
     let PRIME_ONLY: string;
     let EXPERIMENTAL: string;
+    let DEPRECATED: string;
     let NAMESPACE: string;
     let RELEASE_NAME: string;
     let FEATURED: string;
@@ -650,6 +652,7 @@ export const DEPRECATED: "deprecated";
 export const HIDDEN: "hidden";
 export const FROM_TOOLS: "tools";
 export const FROM_CLUSTER: "cluster";
+export const NEW_APP_INSTANCE: "new-instance";
 export const HIDE_SIDE_NAV: "hide-side-nav";
 export const PROVIDER: "provider";
 export const CLOUD_CREDENTIAL: "cloud";
@@ -725,6 +728,7 @@ export const DEPRECATED: "deprecated";
 export const HIDDEN: "hidden";
 export const FROM_TOOLS: "tools";
 export const FROM_CLUSTER: "cluster";
+export const NEW_APP_INSTANCE: "new-instance";
 export const HIDE_SIDE_NAV: "hide-side-nav";
 export const PROVIDER: "provider";
 export const CLOUD_CREDENTIAL: "cloud";
@@ -5745,7 +5749,17 @@ export default class ClusterRepo {
     };
     get _isClusterRepoDisabled(): boolean;
     get _availableActions(): any;
-    refresh(): Promise<void>;
+    /**
+     * Refreshes the repository by updating its forceUpdate annotation and waiting for it to become active.
+     * @param {boolean} dispatchLoad - Whether to dispatch the catalog/load action after refreshing. Defaults to true.
+     */
+    refresh(dispatchLoad?: boolean): Promise<void>;
+    /**
+     * Performs a bulk refresh on multiple repositories concurrently, bypassing individual
+     * catalog loads, and dispatches a single catalog/load for all repositories once they are active.
+     * @param {ClusterRepo[]} items - Array of repository instances to refresh.
+     */
+    refreshBulk(items: ClusterRepo[]): Promise<void>;
     disableClusterRepo(): Promise<void>;
     enableClusterRepo(): Promise<void>;
     get isGit(): boolean;
@@ -5793,7 +5807,17 @@ export default class ClusterRepo {
     };
     get _isClusterRepoDisabled(): boolean;
     get _availableActions(): any;
-    refresh(): Promise<void>;
+    /**
+     * Refreshes the repository by updating its forceUpdate annotation and waiting for it to become active.
+     * @param {boolean} dispatchLoad - Whether to dispatch the catalog/load action after refreshing. Defaults to true.
+     */
+    refresh(dispatchLoad?: boolean): Promise<void>;
+    /**
+     * Performs a bulk refresh on multiple repositories concurrently, bypassing individual
+     * catalog loads, and dispatches a single catalog/load for all repositories once they are active.
+     * @param {ClusterRepo[]} items - Array of repository instances to refresh.
+     */
+    refreshBulk(items: ClusterRepo[]): Promise<void>;
     disableClusterRepo(): Promise<void>;
     enableClusterRepo(): Promise<void>;
     get isGit(): boolean;
@@ -9213,26 +9237,6 @@ export function resolveMachineConfigComponent(key: any): string;
 export function resolveCloudCredentialComponent(key: any): string;
 }
 
-// @shell/utils/ember-page
-
-declare module '@shell/utils/ember-page' {
-export function findEmberPage(): HTMLElement;
-export function clearEmberInactiveTimer(): void;
-export function startEmberInactiveTimer(): void;
-export function removeEmberPage(): void;
-export const EMBER_FRAME: "ember-iframe";
-}
-
-// @shell/utils/ember-page.js
-
-declare module '@shell/utils/ember-page.js' {
-export function findEmberPage(): HTMLElement;
-export function clearEmberInactiveTimer(): void;
-export function startEmberInactiveTimer(): void;
-export function removeEmberPage(): void;
-export const EMBER_FRAME: "ember-iframe";
-}
-
 // @shell/utils/error
 
 declare module '@shell/utils/error' {

package/utils/__tests__/git.test.ts

@@ -0,0 +1,270 @@
+import { GitUtils, Commit } from '@shell/utils/git';
+
+describe('git utils', () => {
+  describe('gitUtils.github.normalize.repo', () => {
+    it('maps owner fields from GitHub API response', () => {
+      const data = {
+        owner: {
+          login:      'octocat',
+          html_url:   'https://github.com/octocat',
+          avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
+        },
+        description: 'Hello World',
+        created_at:  '2021-01-01T00:00:00Z',
+        updated_at:  '2021-06-01T00:00:00Z',
+        html_url:    'https://github.com/octocat/hello-world',
+        name:        'hello-world'
+      };
+
+      const result = GitUtils.github.normalize.repo(data);
+
+      expect(result.owner).toStrictEqual({
+        name:      'octocat',
+        htmlUrl:   'https://github.com/octocat',
+        avatarUrl: 'https://avatars.githubusercontent.com/u/1?v=4'
+      });
+    });
+
+    it('maps repo-level fields from GitHub API response', () => {
+      const data = {
+        owner: {
+          login: 'octocat', html_url: '', avatar_url: ''
+        },
+        description: 'A repository description',
+        created_at:  '2021-01-01T00:00:00Z',
+        updated_at:  '2022-03-15T12:00:00Z',
+        html_url:    'https://github.com/octocat/repo',
+        name:        'my-repo'
+      };
+
+      const result = GitUtils.github.normalize.repo(data);
+
+      expect(result.description).toStrictEqual('A repository description');
+      expect(result.created_at).toStrictEqual('2021-01-01T00:00:00Z');
+      expect(result.updated_at).toStrictEqual('2022-03-15T12:00:00Z');
+      expect(result.htmlUrl).toStrictEqual('https://github.com/octocat/repo');
+      expect(result.name).toStrictEqual('my-repo');
+    });
+
+    it('handles missing owner gracefully', () => {
+      const data = {
+        owner:       undefined,
+        description: 'No owner',
+        created_at:  '2021-01-01T00:00:00Z',
+        updated_at:  '2021-01-01T00:00:00Z',
+        html_url:    'https://github.com/no/owner',
+        name:        'no-owner'
+      };
+
+      const result = GitUtils.github.normalize.repo(data);
+
+      expect(result.owner).toStrictEqual({
+        name:      undefined,
+        htmlUrl:   undefined,
+        avatarUrl: undefined
+      });
+    });
+  });
+
+  describe('gitUtils.github.normalize.commit', () => {
+    it('maps commit fields from GitHub API response', () => {
+      const data = {
+        commit: {
+          message:   'fix: resolve issue',
+          committer: { date: '2022-01-15T10:30:00Z' }
+        },
+        html_url: 'https://github.com/octocat/repo/commit/abc1234567890',
+        sha:      'abc1234567890abcdef',
+        author:   {
+          login:      'octocat',
+          avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4',
+          htmlUrl:    'https://github.com/octocat'
+        }
+      };
+
+      const result = GitUtils.github.normalize.commit(data);
+
+      expect(result.message).toStrictEqual('fix: resolve issue');
+      expect(result.htmlUrl).toStrictEqual('https://github.com/octocat/repo/commit/abc1234567890');
+      expect(result.sha).toStrictEqual('abc1234');
+      expect(result.commitId).toStrictEqual('abc1234567890abcdef');
+      expect(result.date).toStrictEqual('2022-01-15T10:30:00Z');
+      expect(result.isChecked).toStrictEqual(false);
+    });
+
+    it('truncates sha to 7 characters', () => {
+      const data = {
+        commit:   { message: 'chore: update deps', committer: { date: '2022-01-01T00:00:00Z' } },
+        html_url: 'https://github.com/octocat/repo/commit/1234567890',
+        sha:      '1234567890abcdef1234',
+        author:   {
+          login: 'user', avatar_url: '', htmlUrl: ''
+        }
+      };
+
+      const result = GitUtils.github.normalize.commit(data);
+
+      expect(result.sha).toStrictEqual('1234567');
+    });
+
+    it('returns undefined sha when sha is empty string', () => {
+      const data = {
+        commit:   { message: 'fix: bug', committer: { date: '2022-01-01T00:00:00Z' } },
+        html_url: 'https://github.com/octocat/repo/commit/x',
+        sha:      '',
+        author:   {
+          login: 'user', avatar_url: '', htmlUrl: ''
+        }
+      };
+
+      const result: Commit = GitUtils.github.normalize.commit(data);
+
+      expect(result.sha).toBeUndefined();
+    });
+
+    it('maps author fields from GitHub API response', () => {
+      const data = {
+        commit:   { message: 'feat: new feature', committer: { date: '2022-01-01T00:00:00Z' } },
+        html_url: 'https://github.com/octocat/repo/commit/abc',
+        sha:      'abcdef1234567890',
+        author:   {
+          login:      'contributor',
+          avatar_url: 'https://avatars.githubusercontent.com/u/2?v=4',
+          htmlUrl:    'https://github.com/contributor'
+        }
+      };
+
+      const result = GitUtils.github.normalize.commit(data);
+
+      expect(result.author).toStrictEqual({
+        name:      'contributor',
+        avatarUrl: 'https://avatars.githubusercontent.com/u/2?v=4',
+        htmlUrl:   'https://github.com/contributor'
+      });
+    });
+  });
+
+  describe('gitUtils.gitlab.normalize.repo', () => {
+    it('maps owner fields from GitLab API response', () => {
+      const data = {
+        namespace: {
+          name:       'my-group',
+          web_url:    'https://gitlab.com/my-group',
+          avatar_url: 'https://gitlab.com/uploads/group.png'
+        },
+        description:      'GitLab repo description',
+        created_at:       '2021-02-01T00:00:00Z',
+        last_activity_at: '2022-07-20T00:00:00Z',
+        web_url:          'https://gitlab.com/my-group/project',
+        name:             'project'
+      };
+
+      const result = GitUtils.gitlab.normalize.repo(data);
+
+      expect(result.owner).toStrictEqual({
+        name:      'my-group',
+        htmlUrl:   'https://gitlab.com/my-group',
+        avatarUrl: 'https://gitlab.com/uploads/group.png'
+      });
+    });
+
+    it('maps repo-level fields from GitLab API response', () => {
+      const data = {
+        namespace: {
+          name: 'ns', web_url: '', avatar_url: ''
+        },
+        description:      'My GitLab project',
+        created_at:       '2020-05-01T00:00:00Z',
+        last_activity_at: '2023-01-10T00:00:00Z',
+        web_url:          'https://gitlab.com/ns/myproject',
+        name:             'myproject'
+      };
+
+      const result = GitUtils.gitlab.normalize.repo(data);
+
+      expect(result.description).toStrictEqual('My GitLab project');
+      expect(result.created_at).toStrictEqual('2020-05-01T00:00:00Z');
+      expect(result.updated_at).toStrictEqual('2023-01-10T00:00:00Z');
+      expect(result.htmlUrl).toStrictEqual('https://gitlab.com/ns/myproject');
+      expect(result.name).toStrictEqual('myproject');
+    });
+
+    it('maps updated_at from last_activity_at (not updated_at)', () => {
+      const data = {
+        namespace: {
+          name: 'ns', web_url: '', avatar_url: ''
+        },
+        description:      '',
+        created_at:       '2020-01-01T00:00:00Z',
+        last_activity_at: '2023-06-15T08:00:00Z',
+        updated_at:       'should-be-ignored',
+        web_url:          'https://gitlab.com/ns/proj',
+        name:             'proj'
+      };
+
+      const result = GitUtils.gitlab.normalize.repo(data);
+
+      expect(result.updated_at).toStrictEqual('2023-06-15T08:00:00Z');
+    });
+  });
+
+  describe('gitUtils.gitlab.normalize.commit', () => {
+    it('maps commit fields from GitLab API response', () => {
+      const data = {
+        message:        'refactor: clean up code',
+        web_url:        'https://gitlab.com/ns/proj/-/commit/abc1234',
+        short_id:       'abc1234',
+        id:             'abc1234567890abcdef',
+        author_name:    'Jane Doe',
+        avatar_url:     'https://gitlab.com/uploads/jane.png',
+        committed_date: '2022-03-10T14:00:00Z'
+      };
+
+      const result = GitUtils.gitlab.normalize.commit(data);
+
+      expect(result.message).toStrictEqual('refactor: clean up code');
+      expect(result.htmlUrl).toStrictEqual('https://gitlab.com/ns/proj/-/commit/abc1234');
+      expect(result.sha).toStrictEqual('abc1234');
+      expect(result.commitId).toStrictEqual('abc1234567890abcdef');
+      expect(result.date).toStrictEqual('2022-03-10T14:00:00Z');
+      expect(result.isChecked).toStrictEqual(false);
+    });
+
+    it('maps author fields from GitLab API response', () => {
+      const data = {
+        message:        'feat: add feature',
+        web_url:        'https://gitlab.com/ns/proj/-/commit/xyz',
+        short_id:       'xyz',
+        id:             'xyzabcdef',
+        author_name:    'John Smith',
+        avatar_url:     'https://gitlab.com/uploads/john.png',
+        committed_date: '2022-04-01T00:00:00Z'
+      };
+
+      const result = GitUtils.gitlab.normalize.commit(data);
+
+      expect(result.author).toStrictEqual({
+        name:      'John Smith',
+        avatarUrl: 'https://gitlab.com/uploads/john.png',
+        htmlUrl:   'https://gitlab.com/ns/proj/-/commit/xyz'
+      });
+    });
+
+    it('uses web_url for both htmlUrl and author.htmlUrl', () => {
+      const data = {
+        message:        'fix: something',
+        web_url:        'https://gitlab.com/ns/proj/-/commit/def456',
+        short_id:       'def456',
+        id:             'def456abc',
+        author_name:    'Dev',
+        avatar_url:     '',
+        committed_date: '2022-01-01T00:00:00Z'
+      };
+
+      const result = GitUtils.gitlab.normalize.commit(data);
+
+      expect(result.htmlUrl).toStrictEqual('https://gitlab.com/ns/proj/-/commit/def456');
+      expect((result.author as any).htmlUrl).toStrictEqual('https://gitlab.com/ns/proj/-/commit/def456');
+    });
+  });
+});