@rancher/shell 3.0.11 → 3.0.12-rc.1

package/mixins/resource-fetch.js

@@ -87,6 +87,14 @@ export default {
       type:    Function,
       default: null,
     },
+
+    /**
+     * When making a supporting HTTP request include associated resource data
+     */
+    includeAssociatedData: {
+      type:    Boolean,
+      default: false,
+    },
   },
 
   computed: {
@@ -185,9 +193,10 @@ export default {
           return;
         }
         const opt = {
-          hasManualRefresh: this.hasManualRefresh,
-          pagination:       { ...this.pagination },
-          force:            this.paginating !== null // Fix for manual refresh (before ripped out).
+          hasManualRefresh:      this.hasManualRefresh,
+          pagination:            { ...this.pagination },
+          force:                 this.paginating !== null, // Fix for manual refresh (before ripped out).
+          includeAssociatedData: this.includeAssociatedData,
         };
 
         if (this.apiFilter) {

package/models/pod.js

@@ -4,6 +4,7 @@ import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
 import WorkloadService from '@shell/models/workload.service';
 import { deleteProperty } from '@shell/utils/object';
+import { POD_RESTARTS_REG_EX } from '@shell/types/resources/pod';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -222,6 +223,9 @@ export default class Pod extends WorkloadService {
     return this.$rootGetters['i18n/t']('resourceTable.groupLabel.node', { name: escapeHtml(name) });
   }
 
+  /**
+   * How many times has the first container restarted
+   */
   get restartCount() {
     if (this.status.containerStatuses) {
       return this.status?.containerStatuses[0].restartCount || 0;
@@ -230,6 +234,20 @@ export default class Pod extends WorkloadService {
     return 0;
   }
 
+  /**
+   * How many times does native kube report this pod has restarted
+   */
+  get restartsCount() {
+    return this.metadata?.fields?.[3]?.match(POD_RESTARTS_REG_EX)?.[1] || '';
+  }
+
+  /**
+   * When does native kube think the last pod restart happen?
+   */
+  get restartsLaster() {
+    return this.metadata?.fields?.[3]?.match(POD_RESTARTS_REG_EX)?.[2] || '';
+  }
+
   processSaveResponse(res) {
     if (res._headers && res._headers.warning) {
       const warnings = res._headers.warning.split('299') || [];

package/models/workload.js

@@ -9,6 +9,7 @@ import WorkloadService from '@shell/models/workload.service';
 import { matching } from '@shell/utils/selector-typed';
 import { defineAsyncComponent, markRaw } from 'vue';
 import { useResourceCardRow } from '@shell/components/Resource/Detail/Card/StateCard/composables';
+import { colorForState as colorForStateFn, stateDisplay as stateDisplayFn } from '@shell/plugins/dashboard-store/resource-class';
 
 export const defaultContainer = {
   imagePullPolicy: 'Always',
@@ -622,12 +623,29 @@ export default class Workload extends WorkloadService {
 
   calcPodGauges(pods) {
     const out = { };
+    let refPods = pods;
 
-    if (!pods) {
+    if (this.metadata.associatedData) {
+      refPods = [];
+      this.metadata.associatedData.forEach((w) => {
+        if (w.gvk.kind.toLowerCase() !== POD) {
+          return;
+        }
+
+        return w.data.forEach((p) => {
+          refPods.push({
+            stateColor:   colorForStateFn(p.state.name, p.state.error === 'true', p.state.transitioning === 'true'),
+            stateDisplay: stateDisplayFn(p.state.name),
+          });
+        });
+      });
+    }
+
+    if (!refPods) {
       return out;
     }
 
-    pods.map((pod) => {
+    refPods.map((pod) => {
       const { stateColor, stateDisplay } = pod;
 
       if (out[stateDisplay]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.11",
+  "version": "3.0.12-rc.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -76,7 +76,6 @@
     "d3-selection": "3.0.0",
     "d3": "7.3.0",
     "dayjs": "1.11.18",
-    "defu": "6.1.4",
     "diff2html": "3.4.24",
     "dompurify": "3.2.5",
     "element-matches": "^0.1.2",

package/pages/c/_cluster/apps/charts/AppChartCardFooter.vue

@@ -183,7 +183,6 @@ function getTooltip(key: string, fallback?: string): string | undefined {
   }
 
   &-button {
-    text-transform: capitalize;
     min-width: 0;
     max-width: 100%;
 

package/pages/c/_cluster/settings/brand.vue

@@ -440,14 +440,14 @@ export default {
             />
           </div>
           <SimpleBox
-            v-if="uiLoginBackgroundLight || uiLoginBackgroundDark"
+            v-if="uiLoginBackgroundLight"
             class="theme-light mb-10"
           >
             <label class="text-muted">{{ t('branding.loginBackground.lightPreview') }}</label>
             <img
               class="img-preview"
               data-testid="branding-login-background-light-preview"
-              :src="uiLoginBackgroundLight ? uiLoginBackgroundLight : uiLoginBackgroundDark"
+              :src="uiLoginBackgroundLight"
             >
           </SimpleBox>
         </div>
@@ -465,14 +465,14 @@ export default {
             />
           </div>
           <SimpleBox
-            v-if="uiLoginBackgroundDark || uiLoginBackgroundLight"
+            v-if="uiLoginBackgroundDark"
             class="theme-dark  mb-10"
           >
             <label class="text-muted">{{ t('branding.loginBackground.darkPreview') }}</label>
             <img
               class="img-preview"
               data-testid="branding-login-background-dark-preview"
-              :src="uiLoginBackgroundDark ? uiLoginBackgroundDark : uiLoginBackgroundLight"
+              :src="uiLoginBackgroundDark"
             >
           </SimpleBox>
         </div>

package/pages/c/_cluster/uiplugins/__tests__/index.test.ts

@@ -207,6 +207,68 @@ describe('page: UI plugins/Extensions', () => {
 
       expect(items).toHaveLength(0);
     });
+
+    it('should display repository name for non-installed plugins with chart info', () => {
+      const plugin = {
+        installed: false,
+        chart:     { repoNameDisplay: 'rancher-charts' },
+        certified: true
+      };
+      const items = wrapper.vm.getFooterItems(plugin);
+
+      expect(items).toHaveLength(1);
+      expect(items[0].icon).toBe('repository-alt');
+      expect(items[0].labels).toStrictEqual(['rancher-charts']);
+    });
+
+    it('should display repository name for installed plugins when chart info is present (original repo exists)', () => {
+      const plugin = {
+        installed: true,
+        chart:     { repoNameDisplay: 'rancher-charts' },
+        certified: true
+      };
+      const items = wrapper.vm.getFooterItems(plugin);
+
+      expect(items).toHaveLength(1);
+      expect(items[0].icon).toBe('repository-alt');
+      expect(items[0].labels).toStrictEqual(['rancher-charts']);
+    });
+
+    it('should display original repository name for installed plugins when original repo was removed', () => {
+      const plugin = {
+        installed:               true,
+        originalRepoNameDisplay: 'removed-repo',
+        certified:               true
+      };
+      const items = wrapper.vm.getFooterItems(plugin);
+
+      expect(items).toHaveLength(1);
+      expect(items[0].icon).toBe('repository-alt');
+      expect(items[0].labels).toStrictEqual(['removed-repo']);
+    });
+
+    it('should prefer chart.repoNameDisplay over originalRepoNameDisplay when both are present', () => {
+      const plugin = {
+        installed:               true,
+        chart:                   { repoNameDisplay: 'current-repo' },
+        originalRepoNameDisplay: 'original-repo',
+        certified:               true
+      };
+      const items = wrapper.vm.getFooterItems(plugin);
+
+      expect(items).toHaveLength(1);
+      expect(items[0].labels).toStrictEqual(['current-repo']);
+    });
+
+    it('should NOT display repository name when neither chart nor originalRepoNameDisplay are present', () => {
+      const plugin = {
+        installed: true,
+        certified: true
+      };
+      const items = wrapper.vm.getFooterItems(plugin);
+
+      expect(items).toHaveLength(0);
+    });
   });
 
   describe('getStatuses', () => {
@@ -269,6 +331,162 @@ describe('page: UI plugins/Extensions', () => {
     });
   });
 
+  describe('showInstallDialog', () => {
+    let dispatchMock: jest.Mock;
+
+    const createWrapper = (availablePlugins: any[] = []) => {
+      dispatchMock = jest.fn().mockResolvedValue(true);
+
+      const store = {
+        getters: {
+          'prefs/get':         jest.fn(),
+          'catalog/rawCharts': {},
+          'uiplugins/plugins': [],
+          'uiplugins/errors':  {},
+          'management/all':    () => [],
+        },
+        dispatch: dispatchMock,
+      };
+
+      const wrapper = shallowMount(UiPluginsPage, {
+        global: {
+          mocks: {
+            $store: store,
+            t,
+          },
+          stubs: { ActionMenu: { template: '<div />' } }
+        }
+      });
+
+      // Mock the available computed property
+      Object.defineProperty(wrapper.vm, 'available', { get: () => availablePlugins });
+
+      return wrapper;
+    };
+
+    it('should open UninstallExistingExtensionDialog when installing a plugin that is already installed from a different source', () => {
+      const installedPlugin = {
+        id:        'other-repo/my-plugin',
+        name:      'my-plugin',
+        installed: true
+      };
+      const pluginToInstall = {
+        id:   'new-repo/my-plugin',
+        name: 'my-plugin'
+      };
+
+      const wrapper = createWrapper([installedPlugin, pluginToInstall]);
+
+      wrapper.vm.showInstallDialog(pluginToInstall, 'install', {});
+
+      expect(dispatchMock).toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({ component: 'UninstallExistingExtensionDialog' })
+      );
+    });
+
+    it('should NOT open InstallExtensionDialog when plugin is already installed from a different source', () => {
+      const installedPlugin = {
+        id:        'other-repo/my-plugin',
+        name:      'my-plugin',
+        installed: true
+      };
+      const pluginToInstall = {
+        id:   'new-repo/my-plugin',
+        name: 'my-plugin'
+      };
+
+      const wrapper = createWrapper([installedPlugin, pluginToInstall]);
+
+      wrapper.vm.showInstallDialog(pluginToInstall, 'install', {});
+
+      expect(dispatchMock).not.toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({ component: 'InstallExtensionDialog' })
+      );
+    });
+
+    it('should pass the installedPlugin to UninstallExistingExtensionDialog', () => {
+      const installedPlugin = {
+        id:        'other-repo/my-plugin',
+        name:      'my-plugin',
+        installed: true
+      };
+      const pluginToInstall = {
+        id:   'new-repo/my-plugin',
+        name: 'my-plugin'
+      };
+
+      const wrapper = createWrapper([installedPlugin, pluginToInstall]);
+
+      wrapper.vm.showInstallDialog(pluginToInstall, 'install', {});
+
+      expect(dispatchMock).toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({
+          component:      'UninstallExistingExtensionDialog',
+          componentProps: expect.objectContaining({ installedPlugin })
+        })
+      );
+    });
+
+    it('should open InstallExtensionDialog when installing a plugin that is NOT installed from another source', () => {
+      const pluginToInstall = {
+        id:   'repo/my-plugin',
+        name: 'my-plugin'
+      };
+
+      const wrapper = createWrapper([pluginToInstall]);
+
+      wrapper.vm.showInstallDialog(pluginToInstall, 'install', {});
+
+      expect(dispatchMock).toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({ component: 'InstallExtensionDialog' })
+      );
+    });
+
+    it('should open InstallExtensionDialog when the same plugin id is being re-installed (same source)', () => {
+      const installedPlugin = {
+        id:        'repo/my-plugin',
+        name:      'my-plugin',
+        installed: true
+      };
+
+      const wrapper = createWrapper([installedPlugin]);
+
+      wrapper.vm.showInstallDialog(installedPlugin, 'install', {});
+
+      expect(dispatchMock).toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({ component: 'InstallExtensionDialog' })
+      );
+    });
+
+    it('should open InstallExtensionDialog for upgrade action even if same name exists in another repo', () => {
+      const installedPlugin = {
+        id:        'repo-a/my-plugin',
+        name:      'my-plugin',
+        installed: true
+      };
+      const otherPlugin = {
+        id:        'repo-b/my-plugin',
+        name:      'my-plugin',
+        installed: false
+      };
+
+      const wrapper = createWrapper([installedPlugin, otherPlugin]);
+
+      // Upgrade action should always go to InstallExtensionDialog
+      wrapper.vm.showInstallDialog(installedPlugin, 'upgrade', {});
+
+      expect(dispatchMock).toHaveBeenCalledWith(
+        'management/promptModal',
+        expect.objectContaining({ component: 'InstallExtensionDialog' })
+      );
+    });
+  });
+
   describe('watch: helmOps', () => {
     let wrapper: VueWrapper<any>;
     let updatePluginInstallStatusMock: jest.Mock;
@@ -296,10 +514,10 @@ describe('page: UI plugins/Extensions', () => {
         computed: {
           // Override the computed property for this test suite
           available: () => [
-            { name: 'plugin1' },
-            { name: 'plugin2' },
-            { name: 'plugin3' },
-            { name: 'plugin4' },
+            { name: 'plugin1', id: 'repo/plugin1' },
+            { name: 'plugin2', id: 'repo/plugin2' },
+            { name: 'plugin3', id: 'repo/plugin3' },
+            { name: 'plugin4', id: 'repo/plugin4' },
           ],
           hasMenuActions: () => true,
           menuActions:    () => []
@@ -311,9 +529,9 @@ describe('page: UI plugins/Extensions', () => {
 
       // Set the 'installing' status on the component instance
       wrapper.vm.installing = {
-        plugin1: 'install',
-        plugin2: 'downgrade',
-        plugin3: 'uninstall',
+        'repo/plugin1': 'install',
+        'repo/plugin2': 'downgrade',
+        'repo/plugin3': 'uninstall',
       };
 
       // Reset errors
@@ -330,7 +548,7 @@ describe('page: UI plugins/Extensions', () => {
       wrapper.vm.helmOps = helmOps;
       await wrapper.vm.$nextTick();
 
-      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('plugin1', 'install');
+      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('repo/plugin1', 'install');
     });
 
     it('should not update status for an upgrade op when a downgrade was initiated', async() => {
@@ -344,7 +562,7 @@ describe('page: UI plugins/Extensions', () => {
       await wrapper.vm.$nextTick();
 
       // It should not be called with 'upgrade' for plugin2
-      expect(updatePluginInstallStatusMock).not.toHaveBeenCalledWith('plugin2', 'upgrade');
+      expect(updatePluginInstallStatusMock).not.toHaveBeenCalledWith('repo/plugin2', 'upgrade');
     });
 
     it('should clear status for a completed uninstall operation', async() => {
@@ -357,7 +575,7 @@ describe('page: UI plugins/Extensions', () => {
       wrapper.vm.helmOps = helmOps;
       await wrapper.vm.$nextTick();
 
-      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('plugin3', false);
+      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('repo/plugin3', false);
     });
 
     it('should set error and clear status for a failed operation', async() => {
@@ -370,8 +588,8 @@ describe('page: UI plugins/Extensions', () => {
       wrapper.vm.helmOps = helmOps;
       await wrapper.vm.$nextTick();
 
-      expect(wrapper.vm.errors.plugin1).toBe(true);
-      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('plugin1', false);
+      expect(wrapper.vm.errors['repo/plugin1']).toBe(true);
+      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('repo/plugin1', false);
     });
 
     it('should clear status for plugins with no active operation', async() => {
@@ -385,7 +603,7 @@ describe('page: UI plugins/Extensions', () => {
       await wrapper.vm.$nextTick();
 
       // plugin4 has no op, so its status should be cleared
-      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('plugin4', false);
+      expect(updatePluginInstallStatusMock).toHaveBeenCalledWith('repo/plugin4', false);
     });
   });
 });