@rancher/shell 3.0.7 → 3.0.8-rc.10

package/utils/pagination-utils.ts

@@ -1,4 +1,6 @@
-import { PaginationFeature, PaginationSettings, PaginationSettingsStore, PaginationSettingsStores } from '@shell/types/resources/settings';
+import {
+  PaginationFeature, PaginationFeatureHomePageClusterConfig, PaginationFeatureName, PaginationSettings, PaginationSettingsFeatures, PaginationSettingsStore, PaginationSettingsStores
+} from '@shell/types/resources/settings';
 import {
   NAMESPACE_FILTER_ALL_USER as ALL_USER,
   NAMESPACE_FILTER_ALL as ALL,
@@ -22,6 +24,15 @@ import { EXT_IDS } from '@shell/core/plugin';
 import { ExtensionManager } from '@shell/types/extension-manager';
 import { DEFAULT_PERF_SETTING } from '@shell/config/settings';
 
+const homePageClusterFeature: PaginationFeature<PaginationFeatureHomePageClusterConfig> = {
+  version:       1,
+  enabled:       true,
+  configuration: {
+    threshold: 500, results: 250, pagesPerRow: 25
+  }
+};
+const PAGINATION_SETTINGS_FEATURE_DEFAULTS: PaginationSettingsFeatures = { homePageCluster: homePageClusterFeature };
+
 /**
  * Helper functions for server side pagination
  */
@@ -222,15 +233,19 @@ class PaginationUtils {
     return this.isFeatureEnabled({ rootGetters }, 'listManualRefresh');
   }
 
-  private isFeatureEnabled({ rootGetters }: any, featureName: PaginationFeature): boolean {
+  getFeature<Config = any>({ rootGetters }: any, featureName: PaginationFeatureName): PaginationFeature<Config> | undefined {
     // Cache must be enabled to support pagination api
     if (!this.isSteveCacheEnabled({ rootGetters })) {
-      return false;
+      return undefined;
     }
 
     const settings = this.getSettings({ rootGetters });
 
-    return !!settings.features?.[featureName]?.enabled;
+    return settings.features?.[featureName] || PAGINATION_SETTINGS_FEATURE_DEFAULTS[featureName];
+  }
+
+  private isFeatureEnabled({ rootGetters }: any, featureName: PaginationFeatureName): boolean {
+    return !!this.getFeature({ rootGetters }, featureName)?.enabled;
   }
 
   resourceChangesDebounceMs({ rootGetters }: any): number | undefined {

package/utils/pagination-wrapper.ts

@@ -19,7 +19,7 @@ interface Args {
   /**
    * Callback called when the resource is changed (notified by socket)
    */
-  onChange?: () => void,
+  onChange?: STEVE_WATCH_EVENT_LISTENER_CALLBACK,
 
   formatResponse?: {
     /**
@@ -72,13 +72,13 @@ class PaginationWrapper<T extends object> {
     this.isEnabled = paginationUtils.isEnabled({ rootGetters: $store.getters, $plugin: this.$store.$plugin }, enabledFor);
   }
 
-  async request(args: {
-      pagination: PaginationArgs,
+  async request({ pagination, forceWatch }: {
+    forceWatch?: boolean,
+    pagination: PaginationArgs,
   }): Promise<Result<T>> {
     if (!this.isEnabled) {
       throw new Error(`Wrapper for type '${ this.enabledFor.store }/${ this.enabledFor.resource?.id }' in context '${ this.enabledFor.resource?.context }' not supported`);
     }
-    const { pagination } = args;
     const opt: ActionFindPageArgs = {
       watch:     false,
       pagination,
@@ -89,14 +89,18 @@ class PaginationWrapper<T extends object> {
     const out: ActionFindPageTransientResult<T> = await this.$store.dispatch(`${ this.enabledFor.store }/findPage`, { opt, type: this.enabledFor.resource?.id });
 
     // Watch
-    if (this.onChange && !this.steveWatchParams) {
+    const firstTime = !this.steveWatchParams;
+
+    if (this.onChange && (firstTime || forceWatch) ) { // && !this.steveWatchParams
       this.steveWatchParams = {
         event:  STEVE_WATCH_EVENT_TYPES.CHANGES,
         id:     this.id,
         params: {
-          type: this.enabledFor.resource?.id as string,
-          mode: STEVE_WATCH_MODE.RESOURCE_CHANGES,
-        }
+          type:  this.enabledFor.resource?.id as string,
+          mode:  STEVE_WATCH_MODE.RESOURCE_CHANGES,
+          force: forceWatch,
+        },
+
       };
 
       this.watch();

package/utils/provider.ts

@@ -0,0 +1,14 @@
+import { IClusterProvisioner, ClusterProvisionerContext } from '@shell/core/types';
+
+export function getHostedProviders(context: ClusterProvisionerContext) {
+  return context?.$extension?.getProviders(context)?.filter((p: IClusterProvisioner) => p.group === 'hosted') || [];
+}
+
+export function isHostedProvider(context: ClusterProvisionerContext, provisioner: string) {
+  if (!provisioner) {
+    return false;
+  }
+  const provisioners = new Set(getHostedProviders(context).map((p: IClusterProvisioner) => p.id.toLowerCase()));
+
+  return provisioners.has(provisioner.toLowerCase());
+}

package/utils/release-notes.ts

@@ -20,7 +20,7 @@ export async function addReleaseNotesNotification(dispatch: any, getters: any) {
       if (notification.id === id) {
         found = true;
       } else {
-        await dispatch('notifications/delete', notification.id);
+        await dispatch('notifications/remove', notification.id);
       }
     }
   }

package/utils/scroll.js

@@ -0,0 +1,7 @@
+export function scrollToBottom() {
+  const scrollable = document.getElementsByTagName('main')[0];
+
+  if (scrollable) {
+    scrollable.scrollTop = scrollable.scrollHeight;
+  }
+}

package/utils/selector-typed.ts

@@ -199,8 +199,12 @@ export function labelSelectorToSelector(labelSelector?: KubeLabelSelector): stri
   });
 
   (labelSelector?.matchExpressions || []).forEach((value: KubeLabelSelectorExpression) => {
-    if (value.operator === 'In' && value.values?.length === 1) {
-      res.push(`${ value.key }=${ value.values[0] }`);
+    if (value.operator === 'In' && value.values !== undefined) {
+      if (value.values?.length === 1) {
+        res.push(`${ value.key }=${ value.values[0] }`);
+      } else {
+        res.push(`${ value.key } in (${ value.values.join(',') })`);
+      }
     } else {
       throw new Error(`Unsupported matchExpression found when converting to selector string. ${ value }`);
     }

package/utils/settings.ts

@@ -3,6 +3,7 @@ import { Store } from 'vuex';
 import { DEFAULT_PERF_SETTING, PerfSettings, SETTING } from '@shell/config/settings';
 import { pluralize } from '@shell/utils/string';
 import { _MULTI } from '@shell/plugins/dashboard-store/actions';
+import { ClusterProvisionerContext } from '@shell/core/types';
 
 export const fetchOrCreateSetting = async(store: Store<any>, id: string, val: string, save = true): Promise<any> => {
   let setting;
@@ -109,3 +110,17 @@ export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string,
 
   return Object.assign(safeDefaults, perfSetting || {});
 };
+
+export const isProviderEnabled = (context: ClusterProvisionerContext, provider: string): boolean => {
+  const providerTypesJSON = context.getters['management/byId'](MANAGEMENT.SETTING, SETTING.KEV2_OPERATORS )?.value;
+  const providerTypes = providerTypesJSON ? JSON.parse(providerTypesJSON) : [];
+
+  for ( let i = 0; i < providerTypes.length; i++) {
+    if ( providerTypes[i].name === provider) {
+      return providerTypes[i].active;
+    }
+  }
+
+  // We want to have providers enabled by default unless they are turned off by a setting
+  return true;
+};

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/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);
-  }
-};