@rancher/shell 3.0.10 → 3.0.12-rc.1

package/config/product/apps.js

@@ -29,7 +29,8 @@ export function init(store) {
     weight:              97,
     ifHaveGroup:         'catalog.cattle.io',
     icon:                'marketplace',
-    showNamespaceFilter: true
+    showNamespaceFilter: true,
+    extendable:          true,
   });
 
   virtualType({
@@ -53,6 +54,7 @@ export function init(store) {
 
   configureType(CATALOG.APP, { isCreatable: false, isEditable: false });
   configureType(CATALOG.OPERATION, { isCreatable: false, isEditable: false });
+  configureType(CATALOG.CLUSTER_REPO, { listCreateButtonLabelKey: 'catalog.repo.add' });
 
   const repoType = {
     name:     'type',

package/config/product/auth.js

@@ -34,6 +34,7 @@ export function init(store) {
     removable:           false,
     showClusterSwitcher: false,
     category:            'configuration',
+    extendable:          true,
   });
 
   virtualType({

package/config/product/backup.js

@@ -16,6 +16,7 @@ export function init(store) {
   product({
     ifHaveGroup: /^(.*\.)*resources\.cattle\.io$/,
     icon:        'backup-restore',
+    extendable:  true,
   });
 
   weightType(BACKUP_RESTORE.BACKUP, 99, true);

package/config/product/compliance.js

@@ -14,7 +14,7 @@ export function init(store) {
     headers
   } = DSL(store, NAME);
 
-  product({ ifHaveGroup: /^(.*\.)*compliance\.cattle\.io$/ });
+  product({ ifHaveGroup: /^(.*\.)*compliance\.cattle\.io$/, extendable: true });
 
   weightType(COMPLIANCE.CLUSTER_SCAN, 3, true);
   weightType(COMPLIANCE.CLUSTER_SCAN_PROFILE, 2, true);

package/config/product/explorer.js

@@ -27,13 +27,15 @@ import {
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_EVENT_FIRST_SEEN, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_EVENT_TYPE, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_FIRST_SEEN, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_EVENT_TYPE, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL,
+  STEVE_WORKLOAD_HEALTH_SCALE
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
 import { CATTLE_PUBLIC_ENDPOINTS, STORAGE } from '@shell/config/labels-annotations';
+import { POD_LAST_RESTART_FIELD as POD_RESTARTS_LAST_FIELD, POD_RESTART_FIELD as POD_RESTARTS_COUNT_FIELD } from '@shell/types/resources/pod';
 
 export const NAME = 'explorer';
 
@@ -58,6 +60,7 @@ export function init(store) {
     weight:              3,
     showNamespaceFilter: true,
     icon:                'compass',
+    extendable:          true,
     typeStoreMap:        {
       [MANAGEMENT.PROJECT]:                       'management',
       [MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING]: 'management',
@@ -386,11 +389,11 @@ export function init(store) {
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
   headers(WORKLOAD_TYPES.DEPLOYMENT,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', STEVE_AGE_COL],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', STEVE_AGE_COL, STEVE_WORKLOAD_HEALTH_SCALE],
   );
   headers(WORKLOAD_TYPES.DAEMON_SET,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(9), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL]
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(9), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL, STEVE_WORKLOAD_HEALTH_SCALE]
   );
   headers(WORKLOAD_TYPES.REPLICA_SET,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
@@ -398,7 +401,7 @@ export function init(store) {
   );
   headers(WORKLOAD_TYPES.STATEFUL_SET,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
-    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(4), STEVE_WORKLOAD_ENDPOINTS, 'Ready', STEVE_AGE_COL],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(4), STEVE_WORKLOAD_ENDPOINTS, 'Ready', STEVE_AGE_COL, STEVE_WORKLOAD_HEALTH_SCALE],
   );
   headers(WORKLOAD_TYPES.JOB,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
@@ -408,7 +411,7 @@ export function init(store) {
       sort:      'metadata.fields.3',
       search:    'metadata.fields.3',
       formatter: undefined, // Now that sort/search is remote we're not doing weird things with start time (see `duration` in model)
-    }, STEVE_AGE_COL],
+    }, STEVE_AGE_COL, STEVE_WORKLOAD_HEALTH_SCALE],
   );
   headers(WORKLOAD_TYPES.CRON_JOB,
     [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
@@ -428,7 +431,23 @@ export function init(store) {
         ...POD_IMAGES,
         sort:   false,
         search: 'spec.containers.image'
-      }, 'Ready', 'Restarts', 'IP', {
+      },
+      'Ready',
+      {
+        name:     'pod-restart',
+        labelKey: 'tableHeaders.podRestarts',
+        search:   false,
+        sort:     [POD_RESTARTS_COUNT_FIELD, POD_RESTARTS_LAST_FIELD, 'metadata.name'],
+        value:    'restartsCount',
+      }, {
+        name:     'pod-last-restart',
+        labelKey: 'tableHeaders.podLastRestart',
+        value:    'restartsLaster',
+        search:   false,
+        sort:     [POD_RESTARTS_LAST_FIELD, POD_RESTARTS_COUNT_FIELD, 'metadata.name'],
+      },
+      'IP',
+      {
         ...NODE_COL,
         search: 'spec.nodeName'
       },

package/config/product/fleet.js

@@ -32,6 +32,7 @@ export function init(store) {
     removable:             false,
     showClusterSwitcher:   false,
     showWorkspaceSwitcher: true,
+    extendable:            true,
     to:                    {
       name:   'c-cluster-fleet',
       params: { cluster: BLANK_CLUSTER }

package/config/product/gatekeeper.js

@@ -21,6 +21,7 @@ export function init(store) {
   product({
     ifHaveGroup: /^(.*\.)?gatekeeper\.sh$/,
     icon:        'gatekeeper',
+    extendable:  true,
   });
 
   mapGroup(/^(.*\.)?gatekeeper\.sh$/, 'OPA Gatekeeper');

package/config/product/istio.js

@@ -18,6 +18,7 @@ export function init(store) {
     ifHave:              IF_HAVE.NOT_V1_ISTIO,
     icon:                'istio',
     showNamespaceFilter: true,
+    extendable:          true,
   });
 
   virtualType({

package/config/product/logging.js

@@ -21,6 +21,7 @@ export function init(store) {
     icon:                'logging',
     showNamespaceFilter: true,
     weight:              89,
+    extendable:          true,
   });
 
   basicType([

package/config/product/longhorn.js

@@ -20,7 +20,8 @@ export function init(store) {
 
   product({
     ifHaveGroup: 'longhorn.io',
-    icon:        'longhorn'
+    icon:        'longhorn',
+    extendable:  true,
   });
 
   virtualType({

package/config/product/manager.js

@@ -38,6 +38,7 @@ export function init(store) {
     removable:           false,
     showClusterSwitcher: false,
     weight:              -1, // Place at the top
+    extendable:          true,
     to:                  {
       name:   'c-cluster-product-resource',
       params: {

package/config/product/monitoring.js

@@ -38,6 +38,7 @@ export function init(store) {
     icon:                'monitoring',
     showNamespaceFilter: true,
     weight:              90,
+    extendable:          true,
   });
 
   virtualType({

package/config/product/navlinks.js

@@ -10,6 +10,7 @@ export function init(store) {
   product({
     ifHaveType: UI.NAV_LINK,
     icon:       'external-link',
+    extendable: false,
   });
 
   headers(UI.NAV_LINK, [

package/config/product/neuvector.js

@@ -12,7 +12,8 @@ export function init(store) {
   product({
     ifHaveGroup: 'neuvector.com',
     ifHave:      IF_HAVE.NEUVECTOR_NAMESPACE,
-    icon:        'neuvector'
+    icon:        'neuvector',
+    extendable:  true,
   });
 
   virtualType({

package/config/product/settings.js

@@ -28,6 +28,7 @@ export function init(store) {
     showClusterSwitcher: false,
     category:            'configuration',
     weight:              100,
+    extendable:          true,
   });
 
   virtualType({

package/config/product/uiplugins.js

@@ -14,5 +14,6 @@ export function init(store) {
     showClusterSwitcher: false,
     category:            'configuration',
     weight:              50,
+    extendable:          false,
   });
 }

package/core/__tests__/extension-manager-impl.test.js

@@ -38,8 +38,30 @@ jest.mock('@shell/core/plugin', () => {
   };
 });
 
-// Mock ExtensionPoint
-jest.mock('@shell/core/types', () => ({ ExtensionPoint: { EDIT_YAML: 'edit-yaml' } }));
+// Mock ExtensionPoint — only EDIT_YAML, simulating an older dashboard (e.g. 2.13)
+// that does not know about newer ExtensionPoints like 'Table'.
+// The ensureUIConfigCompat tests override this to include TABLE for plugin-helpers,
+// simulating an extension shipping a newer shell.
+jest.mock('@shell/core/types', () => ({
+  ExtensionPoint: { EDIT_YAML: 'edit-yaml' },
+  ActionLocation: { TABLE: 'table-action' },
+  CardLocation:   {},
+}));
+
+jest.mock('@shell/utils/platform', () => ({ isMac: false }));
+jest.mock('@shell/utils/string', () => ({
+  ucFirst:   jest.fn((s) => s),
+  randomStr: jest.fn(() => 'abc123'),
+}));
+jest.mock('@shell/config/query-params', () => ({
+  _EDIT:   'edit',
+  _CONFIG: 'config',
+  _DETAIL: 'detail',
+  _LIST:   'list',
+  _CREATE: 'create',
+}));
+jest.mock('@shell/utils/router', () => ({ getProductFromRoute: jest.fn() }));
+jest.mock('@shell/utils/object', () => ({ isEqual: jest.fn() }));
 
 // Mock PluginRoutes
 jest.mock('@shell/core/plugin-routes', () => {
@@ -299,6 +321,28 @@ describe('extension Manager', () => {
       delete window[pluginId];
     });
 
+    it('surfaces the plugin id and original error message when initialization fails', async() => {
+      const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+      const pluginId = 'surface-error-plugin';
+      const originalError = new Error('something went wrong');
+      const mockPluginInit = jest.fn().mockImplementation(() => {
+        throw originalError;
+      });
+
+      window[pluginId] = { default: mockPluginInit };
+
+      const loadPromise = manager.loadAsync(pluginId, 'test.js');
+      const script = document.head.querySelector(`script[id="${ pluginId }"]`);
+
+      script.onload();
+
+      await expect(loadPromise).rejects.toThrow(`Could not initialize plugin ${ pluginId } - ${ originalError.message }`);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(`Could not initialize plugin ${ pluginId }`, originalError);
+
+      consoleErrorSpy.mockRestore();
+      delete window[pluginId];
+    });
+
     it('rejects if script load fails', async() => {
       const pluginId = 'fail-plugin';
       const loadPromise = manager.loadAsync(pluginId, 'bad-url.js');
@@ -433,5 +477,146 @@ describe('extension Manager', () => {
 
       expect(config).toStrictEqual([]);
     });
+
+    it('returns empty array for non-existent type', () => {
+      // Simulates an extension using a newer ExtensionPoint (e.g. 'Table')
+      // that the running dashboard does not have in its uiConfig
+      const config = manager.getUIConfig('unknown-type', 'some-area');
+
+      expect(config).toStrictEqual([]);
+    });
+  });
+
+  describe('ensureUIConfigCompat (via plugin-helpers)', () => {
+    // These tests verify that getApplicableExtensionEnhancements tracks missing
+    // ExtensionPoint keys and exits early when accessing them.
+    // This is the forwards-compatibility mechanism for extensions running on
+    // older dashboards that don't know about newer ExtensionPoints (e.g. 'Table').
+
+    const mockRoute = {
+      name:   'test',
+      params: {},
+      query:  {},
+      meta:   {},
+      hash:   '',
+      path:   '/test',
+    };
+
+    // Each test needs a fresh plugin-helpers module to reset the _uiConfigPatched tracking.
+    // The extension-manager is created with the "old" ExtensionPoint (only EDIT_YAML),
+    // then plugin-helpers is re-required with an "upgraded" ExtensionPoint that includes TABLE,
+    // simulating an extension built with a newer shell running on an older dashboard.
+    let freshGetApplicable;
+    let freshManager;
+
+    beforeEach(() => {
+      freshManager = createExtensionManager(context);
+
+      // Reset modules so plugin-helpers._uiConfigPatched starts as empty object
+      jest.resetModules();
+
+      // Override the types mock so plugin-helpers sees a newer ExtensionPoint with TABLE
+      jest.doMock('@shell/core/types', () => ({
+        ExtensionPoint: {
+          EDIT_YAML: 'edit-yaml',
+          TABLE:     'Table',
+        },
+        ActionLocation: { TABLE: 'table-action' },
+        CardLocation:   {},
+      }));
+
+      freshGetApplicable = require('@shell/core/plugin-helpers').getApplicableExtensionEnhancements;
+    });
+
+    it('returns empty array for missing ExtensionPoint and does not mutate uiConfig', () => {
+      // Verify 'Table' is NOT in uiConfig before the call
+      const uiConfig = freshManager.getAllUIConfig();
+
+      expect(uiConfig['Table']).toBeUndefined();
+
+      // Call getApplicableExtensionEnhancements which triggers ensureUIConfigCompat
+      const result = freshGetApplicable({ $extension: freshManager }, 'Table', 'some-area', mockRoute);
+
+      // Should return empty array for missing extension point
+      expect(result).toStrictEqual([]);
+
+      // uiConfig should NOT be mutated - 'Table' should remain undefined
+      expect(uiConfig['Table']).toBeUndefined();
+    });
+
+    it('does not affect existing ExtensionPoint keys', () => {
+      const mockAction = { label: 'Test', locationConfig: {} };
+      const plugin = {
+        types:           {},
+        uiConfig:        { 'edit-yaml': { header: [mockAction] } },
+        l10n:            {},
+        modelExtensions: {},
+        stores:          [],
+        locales:         [],
+        routes:          [],
+        validators:      {},
+        productNames:    [],
+      };
+
+      freshManager.applyPlugin(plugin);
+
+      const result = freshGetApplicable({ $extension: freshManager }, 'edit-yaml', 'header', mockRoute);
+
+      // Should return the actual action
+      expect(result).toHaveLength(1);
+      expect(result[0].label).toBe('Test');
+
+      // Existing config should be untouched
+      const uiConfig = freshManager.getAllUIConfig();
+
+      expect(uiConfig['edit-yaml'].header).toHaveLength(1);
+      expect(uiConfig['edit-yaml'].header[0]).toBe(mockAction);
+    });
+
+    it('logs a warning for missing ExtensionPoints', () => {
+      const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+
+      freshGetApplicable({ $extension: freshManager }, 'Table', 'some-area', mockRoute);
+
+      expect(consoleWarnSpy).toHaveBeenCalledWith(
+        expect.stringContaining('Table')
+      );
+
+      consoleWarnSpy.mockRestore();
+    });
+
+    it('dashboard-side getUIConfig calls remain safe with optional chaining', () => {
+      // getUIConfig('Table', ...) should not crash even though 'Table' is missing
+      // Returns empty array due to optional chaining in extension-manager
+      expect(freshManager.getUIConfig('Table', 'some-area')).toStrictEqual([]);
+
+      // Trigger ensureUIConfigCompat via getApplicableExtensionEnhancements
+      const result = freshGetApplicable({ $extension: freshManager }, 'Table', 'some-area', mockRoute);
+
+      // getApplicableExtensionEnhancements exits early and returns empty array
+      expect(result).toStrictEqual([]);
+
+      // uiConfig is NOT mutated - 'Table' key still doesn't exist
+      const uiConfig = freshManager.getAllUIConfig();
+
+      expect(uiConfig['Table']).toBeUndefined();
+
+      // Direct getUIConfig calls still work safely (optional chaining)
+      expect(freshManager.getUIConfig('Table', 'some-area')).toStrictEqual([]);
+    });
+
+    it('only logs warning once for each missing ExtensionPoint', () => {
+      const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+
+      // First call logs warning and tracks 'Table' as missing
+      freshGetApplicable({ $extension: freshManager }, 'Table', 'some-area', mockRoute);
+      // Second call should not log warning again (already tracked)
+      freshGetApplicable({ $extension: freshManager }, 'Table', 'some-area', mockRoute);
+
+      // Warning should only be logged once
+      expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
+
+      consoleWarnSpy.mockRestore();
+    });
   });
 });