@rancher/shell 3.0.8-rc.1 → 3.0.8-rc.12

package/utils/unit-tests/pagination-utils.spec.ts

@@ -163,14 +163,14 @@ describe('pagination-utils', () => {
 
     it('should return false if steve cache is disabled', () => {
       mockRootGetters['features/get'].mockImplementation((feature: string) => feature === STEVE_CACHE ? false : undefined);
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(false);
     });
 
     it('should return false if pagination settings are not defined', () => {
       jest.spyOn(paginationUtils, 'getSettings').mockReturnValue(undefined);
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(false);
 
@@ -189,7 +189,7 @@ describe('pagination-utils', () => {
         return null;
       });
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, undefined as unknown as PaginationResourceContext);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, undefined as unknown as PaginationResourceContext);
 
       expect(result).toBe(false);
     });
@@ -200,7 +200,7 @@ describe('pagination-utils', () => {
 
       mockPlugin.getAll.mockReturnValue({ [EXT_IDS.SERVER_SIDE_PAGINATION_RESOURCES]: { 'my-ext': () => extensionSettings } });
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(true);
     });
@@ -215,7 +215,7 @@ describe('pagination-utils', () => {
       // Mocking PAGINATION_SETTINGS_STORE_DEFAULTS behavior
       jest.spyOn(paginationUtils, 'getStoreDefault').mockReturnValue(defaultSettings);
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(true);
     });
@@ -235,7 +235,7 @@ describe('pagination-utils', () => {
       // Mocking PAGINATION_SETTINGS_STORE_DEFAULTS behavior
       jest.spyOn(paginationUtils, 'getStoreDefault').mockReturnValue({ cluster: { resources: { enableAll: true } } });
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(true);
     });
@@ -255,7 +255,7 @@ describe('pagination-utils', () => {
         return null;
       });
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(true);
     });
@@ -275,7 +275,7 @@ describe('pagination-utils', () => {
         return null;
       });
 
-      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $plugin: mockPlugin }, enabledFor);
+      const result = paginationUtils.isEnabled({ rootGetters: mockRootGetters, $extension: mockPlugin }, enabledFor);
 
       expect(result).toBe(false);
     });

package/utils/validators/machine-pool.ts

@@ -1,6 +1,8 @@
 const FIELDS = {
-  NAME:     'pool.name',
-  QUANTITY: 'pool.quantity'
+  NAME:           'pool.name',
+  QUANTITY:       'pool.quantity',
+  AUTOSCALER_MIN: 'pool.autoscalingMinSize',
+  AUTOSCALER_MAX: 'pool.autoscalingMaxSize'
 };
 
 const RULESETS = [
@@ -11,7 +13,15 @@ const RULESETS = [
   {
     path:  FIELDS.NAME,
     rules: ['required'],
-  }
+  },
+  {
+    path:  FIELDS.AUTOSCALER_MIN,
+    rules: ['isPositive', 'isAutoscalerMaxGreaterThanMin'],
+  },
+  {
+    path:  FIELDS.AUTOSCALER_MAX,
+    rules: ['isPositive', 'isAutoscalerMaxGreaterThanMin'],
+  },
 ];
 
 export const MACHINE_POOL_VALIDATION = {

package/utils/version.js

@@ -74,6 +74,21 @@ export function isPrerelease(version = '') {
   return !!semver.prerelease(version);
 }
 
+export function isUpgradeFromPreToStable(currentVersion, targetVersion) {
+  if (!isPrerelease(currentVersion) || isPrerelease(targetVersion)) {
+    return false;
+  }
+
+  const cVersion = semver.clean(currentVersion, { loose: true });
+  const tVersion = semver.clean(targetVersion, { loose: true });
+
+  if (cVersion && tVersion && semver.valid(cVersion) && semver.valid(tVersion)) {
+    return semver.lt(cVersion, tVersion);
+  }
+
+  return false;
+}
+
 export function isDevBuild(version) {
   if ( ['dev', 'master', 'head'].includes(version) || version.endsWith('-head') || version.match(/-rc\d+$/) || version.match(/-alpha\d+$/) ) {
     return true;

package/vue.config.js

@@ -323,16 +323,16 @@ const getVirtualModules = (dir, includePkg) => {
 
         // Package file must have rancher field to be a plugin
         if (includePkg(name) && library.rancher) {
-          reqs += `$plugin.registerBuiltinExtension('${ name }', require(\'~/pkg/${ name }\')); `;
+          reqs += `$extension.registerBuiltinExtension('${ name }', require(\'~/pkg/${ name }\')); `;
         }
       });
   }
 
   Object.keys(librariesIndex).forEach((i) => {
-    reqs += `$plugin.loadAsync('${ i }', '/pkg/${ i }/${ librariesIndex[i] }');`;
+    reqs += `$extension.loadAsync('${ i }', '/pkg/${ i }/${ librariesIndex[i] }');`;
   });
 
-  return new VirtualModulesPlugin({ 'node_modules/@rancher/dynamic.js': `export default function ($plugin) { ${ reqs } };` });
+  return new VirtualModulesPlugin({ 'node_modules/@rancher/dynamic.js': `export default function ($extension) { ${ reqs } };` });
 };
 
 const getAutoImport = () => new webpack.NormalModuleReplacementPlugin(/^@rancher\/auto-import$/, (resource) => {

package/assets/images/icons/document.svg

@@ -1,3 +0,0 @@
-<svg width="13" height="16" viewBox="0 0 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.30594 4.11111H8.9726M4.30594 7.22222H8.9726M4.30594 10.3333H7.41705M1.19482 2.55556C1.19482 2.143 1.35871 1.74733 1.65044 1.45561C1.94216 1.16389 2.33782 1 2.75038 1H10.5282C10.9407 1 11.3364 1.16389 11.6281 1.45561C11.9198 1.74733 12.0837 2.143 12.0837 2.55556V13.4444C12.0837 13.857 11.9198 14.2527 11.6281 14.5444C11.3364 14.8361 10.9407 15 10.5282 15H2.75038C2.33782 15 1.94216 14.8361 1.65044 14.5444C1.35871 14.2527 1.19482 13.857 1.19482 13.4444V2.55556Z" stroke="white" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

package/plugins/nuxt-client-init.js

@@ -1,3 +0,0 @@
-export default async(context) => {
-  await context.store.dispatch('nuxtClientInit', context);
-};

package/store/wm.js

@@ -1,95 +0,0 @@
-import { addObject, removeObject } from '@shell/utils/array';
-
-export const state = function() {
-  return {
-    tabs:       [],
-    active:     null,
-    open:       false,
-    userHeight: null,
-    userWidth:  null,
-    userPin:    null,
-  };
-};
-
-export const getters = {
-  byId: (state) => (id) => {
-    return state.tabs.find((x) => x.id === id);
-  },
-  allTabs: (state) => state.tabs,
-};
-
-export const mutations = {
-  addTab(state, tab) {
-    const existing = state.tabs.find((x) => x.id === tab.id);
-
-    if ( !existing ) {
-      addObject(state.tabs, tab);
-    }
-
-    state.active = tab.id;
-    state.open = true;
-  },
-
-  removeTab(state, tab) {
-    removeObject(state.tabs, tab);
-  },
-
-  setOpen(state, open) {
-    state.open = open;
-  },
-
-  setActive(state, id) {
-    state.active = id;
-  },
-
-  setUserHeight(state, height) {
-    state.userHeight = height;
-  },
-
-  setUserWidth(state, width) {
-    state.userWidth = width;
-  },
-
-  setUserPin(state, pin) {
-    state.userPin = pin;
-  }
-};
-
-export const actions = {
-  close({ state, getters, commit }, id) {
-    const tab = getters.byId(id);
-
-    if ( !tab ) {
-      return;
-    }
-
-    let idx = state.tabs.indexOf(tab);
-
-    commit('removeTab', tab);
-    if ( idx >= state.tabs.length ) {
-      idx = state.tabs.length - 1;
-    }
-
-    if ( idx >= 0 ) {
-      commit('setActive', state.tabs[idx].id);
-    } else {
-      commit('setOpen', false);
-    }
-  },
-
-  // {
-  //   id:  shell-<pod id> -- A string that is be unique for this instance;
-  //                           if a window with this key exists it will be focused instead of creating another
-  //   label: Shown on the tab
-  //   icon:  Shown on the tab
-  //   component: 'ContainerShell',
-  //   attrs: { whateverTheComponent: wants }
-  // }
-  open({ commit }, tab) {
-    if ( !tab.id ) {
-      throw new Error('Window must have an id property');
-    }
-
-    commit('addTab', tab);
-  }
-};