@rancher/shell 0.2.5 → 0.3.1

package/scripts/record-deps.js

@@ -0,0 +1,37 @@
+const fs = require('fs');
+const path = require('path');
+
+// Script lives in shell/scripts, so work out top-level dir from there
+const topDir = path.resolve(__dirname, '..', '..');
+const dir = process.cwd();
+
+// Read the package.json file
+const topPkgFile = path.join(topDir, 'package.json');
+const pkgFile = path.join(dir, 'package.json');
+
+const topPkg = JSON.parse(fs.readFileSync(topPkgFile));
+const mainPkg = JSON.parse(fs.readFileSync(pkgFile));
+
+// Look to see if we specify the deps we require
+if (mainPkg._requires) {
+  // Map each one to the same version as the main package
+  const out = {};
+
+  mainPkg._requires.forEach((name) => {
+    let ver = topPkg.dependencies?.[name] || topPkg.devDependencies?.[name];
+
+    if (name === '@rancher/components') {
+      const componentsPkgFile = path.join(topDir, 'pkg', 'rancher-components', 'package.json');
+      const componentsPkg = JSON.parse(fs.readFileSync(componentsPkgFile));
+
+      ver = componentsPkg.version;
+    }
+
+    out[name] = ver;
+  });
+
+  mainPkg._pkgs = out;
+  delete mainPkg._requires;
+
+  fs.writeFileSync(pkgFile, JSON.stringify(mainPkg, null, 2), 'utf-8');
+}

package/scripts/test-plugins-build.sh

@@ -30,7 +30,7 @@ if [ $SKIP_SETUP == "false" ]; then
   fi
 
   set +e
-  RUNNING=$(ps -A | grep Verdaccio -c)
+  RUNNING=$(pgrep Verdaccio | wc -l | xargs)
   set -e
 
   if [ $RUNNING -eq 0 ]; then
@@ -45,7 +45,7 @@ if [ $SKIP_SETUP == "false" ]; then
 
     # Remove existing admin if already there
     if [ -f ~/.config/verdaccio/htpasswd ]; then
-      sed -i '/^admin:/d' ~/.config/verdaccio/htpasswd
+      sed -i.bak -e '/^admin:/d' ~/.config/verdaccio/htpasswd
     fi
 
     curl -XPUT -H "Content-type: application/json" -d '{ "name": "admin", "password": "admin" }' 'http://localhost:4873/-/user/admin' > login.json
@@ -67,7 +67,10 @@ else
 fi
 
 export YARN_REGISTRY=http://localhost:4873
-export NEXT_TELEMETRY_DISABLED=1
+export NUXT_TELEMETRY_DISABLED=1
+
+# Remove test package from previous run, if present
+rm -rf ${BASE_DIR}/pkg/test-pkg
 
 # We need to patch the version number of the shell, otherwise if we are running
 # with the currently published version, things will fail as those versions
@@ -75,10 +78,19 @@ export NEXT_TELEMETRY_DISABLED=1
 sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\",/\"version\": \"7.7.7\",/g" ${SHELL_DIR}/package.json
 rm ${SHELL_DIR}/package.json.bak
 
+# Same as above for Rancher Components
+# We might have bumped the version number but its not published yet, so this will fail
+sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\",/\"version\": \"7.7.7\",/g" ${BASE_DIR}/pkg/rancher-components/package.json
+
 # Publish shell
 echo "Publishing shell packages to local registry"
+yarn install
 ${SHELL_DIR}/scripts/publish-shell.sh
 
+# Publish rancher components
+yarn build:lib
+yarn publish:lib
+
 if [ "${SKIP_STANDALONE}" == "false" ]; then
   DIR=$(mktemp -d)
   pushd $DIR > /dev/null
@@ -92,21 +104,21 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   yarn install
 
   echo "Building skeleton app"
-  yarn build
+  FORCE_COLOR=true yarn build | cat
 
   # Package creator
   echo "Verifying package creator package"
   yarn create @rancher/pkg test-pkg
 
   echo "Building test package"
-  yarn build-pkg test-pkg
+  FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
   # Add test list component to the test package
   # Validates rancher-components imports
   mkdir pkg/test-pkg/list
   cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
 
-  yarn build-pkg test-pkg
+  FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
   echo "Cleaning temporary dir"
   popd > /dev/null
@@ -126,7 +138,7 @@ yarn install
 rm -rf ./pkg/test-pkg
 yarn create @rancher/pkg test-pkg -t
 cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
-yarn build-pkg test-pkg
+FORCE_COLOR=true yarn build-pkg test-pkg | cat
 rm -rf ./pkg/test-pkg
 
 echo "All done"

package/scripts/typegen.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
+SHELL_DIR=$BASE_DIR/shell
+
+echo "Generating typescript definitions"
+
+rm -rf ${SHELL_DIR}/tmp
+mkdir -p ${SHELL_DIR}/tmp
+
+echo "Generating ..."
+
+# utils
+${BASE_DIR}/node_modules/.bin/tsc shell/utils/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/utils > /dev/null
+
+# config
+${BASE_DIR}/node_modules/.bin/tsc shell/config/query-params.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc shell/config/table-headers.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc shell/config/types.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
+
+# store
+${BASE_DIR}/node_modules/.bin/tsc shell/store/features.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
+
+# plugins
+${BASE_DIR}/node_modules/.bin/tsc shell/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc shell/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+
+
+# mkixins
+${BASE_DIR}/node_modules/.bin/tsc shell/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
+
+#./node_modules/.bin/tsc shell/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store > /dev/null
+
+# Go through all of the folders and combine by wrapping with 'declare module'
+
+echo "Combining type definitions ..."
+
+DEST=${SHELL_DIR}/types/shell
+mkdir -p ${DEST}
+
+INDEX=${DEST}/index.d.ts
+rm -rf ${INDEX}
+
+echo "// Auto-generated type definitions for shell" > ${INDEX}
+echo "// Do not modify this file as changes will get overwritten" >> ${INDEX}
+
+# Copy in the vue shim type definitions
+if [ -f "$BASE_DIR/shell/types/vue-shim.d" ]; then
+  cat "$BASE_DIR/shell/types/vue-shim.d" >> ${INDEX}
+fi
+
+function processDir() {
+  local dir=$1
+  local basePkg=$2
+
+  for entry in $1/*
+  do
+    local filename=$(basename $entry)
+
+    if [ -d $entry ]; then
+      processDir $entry $basePkg/$filename
+    else
+      if [[ $filename == *.d.ts ]]; then
+        # We use convoluted mechanism here to ensure this works on mac with bash 3.x
+        local name=$(echo $filename | rev | cut -c6- | rev)
+
+        local module=${basePkg}/${name}
+        if [ "${name}" == "index" ]; then
+          module=${basePkg}
+        fi
+
+        echo -e "\n// ${module}\n" >> ${INDEX}
+        echo "declare module '${module}' {" >> ${INDEX}
+        cat $entry >> ${INDEX}
+        echo -e "}" >> ${INDEX}
+      fi
+    fi
+  done
+}
+
+processDir ${SHELL_DIR}/tmp @shell
+
+rm -rf ${SHELL_DIR}/tmp

package/static/loading-indicator.html

@@ -13,7 +13,7 @@
 
 .initial-load-spinner {
   animation: initial-load-animate 1s infinite linear;
-  background-color: #fff;
+  background-color: transparent;
   box-sizing: border-box;
   border: 5px solid #008ACF;
   border-radius: 50%;

package/store/action-menu.js

@@ -22,9 +22,9 @@ export const state = function() {
 };
 
 export const getters = {
-  showing:       state => state.show,
-  elem:          state => state.elem,
-  event:         state => state.event,
+  showing: state => state.show,
+  elem:    state => state.elem,
+  event:   state => state.event,
 
   options(state) {
     let selected = state.resources;

package/store/auth.js

@@ -216,8 +216,8 @@ export const actions = {
     let url = removeParam(redirectUrl, GITHUB_SCOPE);
 
     const params = {
-      [GITHUB_SCOPE]:    scopes.join(','),
-      [GITHUB_NONCE]:   base64Encode(nonce, 'url')
+      [GITHUB_SCOPE]: scopes.join(','),
+      [GITHUB_NONCE]: base64Encode(nonce, 'url')
     };
 
     if (!url.includes(GITHUB_REDIRECT)) {
@@ -276,8 +276,8 @@ export const actions = {
         const url = await dispatch('redirectTo', {
           provider,
           redirectUrl,
-          test:        true,
-          redirect:    false
+          test:     true,
+          redirect: false
         });
 
         return openAuthPopup(url, provider);

package/store/aws.js

@@ -44,8 +44,8 @@ function credentialDefaultProvider(accessKey, secretKey) {
     // The SDK will complain if these aren't set, so fill them with something
     // even though the cloudCredential will be used eventually
     const out = {
-      accessKeyId:         accessKey || randomStr(),
-      secretAccessKey:     secretKey || randomStr(),
+      accessKeyId:     accessKey || randomStr(),
+      secretAccessKey: secretKey || randomStr(),
     };
 
     return out;
@@ -164,8 +164,8 @@ export const actions = {
         memoryBytes:       row.MemoryInfo.SizeInMiB * 1024 * 1024,
         label:             rootGetters['i18n/t']('cluster.machineConfig.aws.sizeLabel', {
           apiName,
-          cpu:          row.VCpuInfo.DefaultVCpus,
-          memory:       row.MemoryInfo.SizeInMiB / 1024,
+          cpu:    row.VCpuInfo.DefaultVCpus,
+          memory: row.MemoryInfo.SizeInMiB / 1024,
           storageSize,
           storageUnit,
           storageType,

package/store/catalog.js

@@ -503,32 +503,32 @@ function addChart(ctx, map, chart, repo) {
     if ( ctx ) { }
     obj = classify(ctx, {
       key,
-      type:                 'chart',
-      id:                   key,
+      type:                'chart',
+      id:                  key,
       certified,
       sideLabel,
       repoType,
       repoName,
-      repoNameDisplay:      ctx.rootGetters['i18n/withFallback'](`catalog.repo.name."${ repoName }"`, null, repoName),
-      certifiedSort:        CERTIFIED_SORTS[certified] || 99,
-      icon:                 chart.icon,
-      color:                repo.color,
-      chartType:            chart.annotations?.[CATALOG_ANNOTATIONS.TYPE] || CATALOG_ANNOTATIONS._APP,
-      chartName:            chart.name,
-      chartNameDisplay:     chart.annotations?.[CATALOG_ANNOTATIONS.DISPLAY_NAME] || chart.name,
-      chartDescription:     chart.description,
-      featured:             chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED],
-      repoKey:              repo._key,
-      versions:             [],
-      categories:           filterCategories(chart.keywords),
-      deprecated:           !!chart.deprecated,
-      hidden:               !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],
-      targetNamespace:      chart.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE],
-      targetName:           chart.annotations?.[CATALOG_ANNOTATIONS.RELEASE_NAME],
-      scope:                chart.annotations?.[CATALOG_ANNOTATIONS.SCOPE],
-      provides:             [],
-      windowsIncompatible:  !(chart.annotations?.[CATALOG_ANNOTATIONS.PERMITTED_OS] || '').includes('windows'),
-      deploysOnWindows:     (chart.annotations?.[CATALOG_ANNOTATIONS.DEPLOYED_OS] || '').includes('windows')
+      repoNameDisplay:     ctx.rootGetters['i18n/withFallback'](`catalog.repo.name."${ repoName }"`, null, repoName),
+      certifiedSort:       CERTIFIED_SORTS[certified] || 99,
+      icon:                chart.icon,
+      color:               repo.color,
+      chartType:           chart.annotations?.[CATALOG_ANNOTATIONS.TYPE] || CATALOG_ANNOTATIONS._APP,
+      chartName:           chart.name,
+      chartNameDisplay:    chart.annotations?.[CATALOG_ANNOTATIONS.DISPLAY_NAME] || chart.name,
+      chartDescription:    chart.description,
+      featured:            chart.annotations?.[CATALOG_ANNOTATIONS.FEATURED],
+      repoKey:             repo._key,
+      versions:            [],
+      categories:          filterCategories(chart.keywords),
+      deprecated:          !!chart.deprecated,
+      hidden:              !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],
+      targetNamespace:     chart.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE],
+      targetName:          chart.annotations?.[CATALOG_ANNOTATIONS.RELEASE_NAME],
+      scope:               chart.annotations?.[CATALOG_ANNOTATIONS.SCOPE],
+      provides:            [],
+      windowsIncompatible: !(chart.annotations?.[CATALOG_ANNOTATIONS.PERMITTED_OS] || '').includes('windows'),
+      deploysOnWindows:    (chart.annotations?.[CATALOG_ANNOTATIONS.DEPLOYED_OS] || '').includes('windows')
     });
 
     map[key] = obj;

package/store/index.js

@@ -81,7 +81,13 @@ const getActiveNamespaces = (state, getters) => {
     return out;
   }
 
-  const namespaces = getters[`${ inStore }/all`](NAMESPACE);
+  let namespaces = [];
+
+  if (Array.isArray(state.allNamespaces) && state.allNamespaces.length > 0) {
+    namespaces = state.allNamespaces;
+  } else {
+    namespaces = getters[`${ inStore }/all`](NAMESPACE);
+  }
 
   const filters = state.namespaceFilters.filter(x => !!x && !`${ x }`.startsWith(NAMESPACED_PREFIX));
   const includeAll = getters.isAllNamespaces;
@@ -169,6 +175,7 @@ export const state = () => {
     serverVersion:           null,
     systemNamespaces:        [],
     isSingleProduct:         undefined,
+    namespaceFilterMode:     null,
   };
 };
 
@@ -205,6 +212,15 @@ export const getters = {
     return state.systemNamespaces;
   },
 
+  /**
+   * Namespace Filter Mode supplies a resource type to the NamespaceFilter.
+   *
+   * Only one of the resource type is allowed to be selected
+   */
+  namespaceFilterMode(state) {
+    return state.namespaceFilterMode;
+  },
+
   currentCluster(state, getters) {
     return getters['management/byId'](MANAGEMENT.CLUSTER, state.clusterId);
   },
@@ -284,6 +300,34 @@ export const getters = {
     return state.namespaceFilters.filter(x => !`${ x }`.startsWith(NAMESPACED_PREFIX)).length === 0;
   },
 
+  isSingleNamespace(state, getters) {
+    const product = getters['currentProduct'];
+
+    if ( !product ) {
+      return false;
+    }
+
+    if ( product.showWorkspaceSwitcher ) {
+      return false;
+    }
+
+    if ( getters.isAllNamespaces ) {
+      return false;
+    }
+
+    const filters = state.namespaceFilters;
+
+    if ( filters.length !== 1 ) {
+      return false;
+    }
+
+    if (filters[0].startsWith('ns://')) {
+      return filters[0];
+    }
+
+    return false;
+  },
+
   isMultipleNamespaces(state, getters) {
     const product = getters['currentProduct'];
 
@@ -485,6 +529,10 @@ export const mutations = {
     getActiveNamespaces(state, getters);
   },
 
+  setNamespaceFilterMode(state, mode) {
+    state.namespaceFilterMode = mode;
+  },
+
   pageActions(state, pageActions) {
     state.pageActions = pageActions;
   },
@@ -795,10 +843,10 @@ export const actions = {
     };
 
     const res = await allHash({
-      projects:          fetchProjects(),
-      counts:            dispatch('cluster/findAll', { type: COUNT }),
-      namespaces:        dispatch('cluster/findAll', { type: NAMESPACE }),
-      navLinks:          !!getters['cluster/schemaFor'](UI.NAV_LINK) && dispatch('cluster/findAll', { type: UI.NAV_LINK }),
+      projects:   fetchProjects(),
+      counts:     dispatch('cluster/findAll', { type: COUNT }),
+      namespaces: dispatch('cluster/findAll', { type: NAMESPACE }),
+      navLinks:   !!getters['cluster/schemaFor'](UI.NAV_LINK) && dispatch('cluster/findAll', { type: UI.NAV_LINK }),
     });
 
     await dispatch('cleanNamespaces');
@@ -808,7 +856,6 @@ export const actions = {
     commit('updateNamespaces', {
       filters: filters || [ALL_USER],
       all:     res.namespaces,
-      ...getters
     });
 
     commit('clusterReady', true);
@@ -826,7 +873,11 @@ export const actions = {
         [key]: ids
       }
     });
-    commit('updateNamespaces', { filters: ids, ...getters });
+    commit('updateNamespaces', { filters: ids });
+  },
+
+  setNamespaceFilterMode({ commit }, mode) {
+    commit('setNamespaceFilterMode', mode);
   },
 
   async cleanNamespaces({ getters, dispatch }) {

package/store/plugins.js

@@ -5,7 +5,7 @@ export function simplify(key) {
 }
 
 const credentialOptions = {
-  aws:          {
+  aws: {
     publicKey:  'accessKey',
     publicMode: 'full',
     keys:       ['region', 'accessKey', 'secretKey']
@@ -15,7 +15,7 @@ const credentialOptions = {
     publicMode: 'prefix',
     keys:       'accessToken'
   },
-  azure:        {
+  azure: {
     publicKey:  'clientId',
     publicMode: 'full',
     keys:       ['subscriptionId', 'tenantId', 'clientId', 'clientSecret']
@@ -125,14 +125,6 @@ export const state = function() {
 };
 
 export const getters = {
-  credentialDrivers() {
-    const ctx = require.context('@shell/cloud-credential', true, /.*/);
-
-    const drivers = ctx.keys().filter(path => !path.match(/\.(vue|js)$/)).map(path => path.substr(2));
-
-    return drivers;
-  },
-
   credentialOptions() {
     return (name) => {
       name = (name || '').toLowerCase();
@@ -157,15 +149,6 @@ export const getters = {
     };
   },
 
-  machineDrivers() {
-    // The subset of drivers supported by Vue components
-    const ctx = require.context('@shell/machine-config', true, /.*/);
-
-    const drivers = ctx.keys().filter(path => !path.match(/\.(vue|js)$/)).map(path => path.substr(2));
-
-    return drivers;
-  },
-
   clusterDrivers() {
     // The subset of drivers supported by Vue components
     return [];

package/store/pnap.js

@@ -0,0 +1,128 @@
+import { base64Encode } from '@shell/utils/crypto';
+import { addParam, addParams } from '@shell/utils/url';
+
+const ENDPOINT = 'api.phoenixnap.com';
+
+export const state = () => {
+  return { cache: {} };
+};
+
+export const mutations = {
+  setCache(state, { credentialId, key, value }) {
+    let cache = state.cache[credentialId];
+
+    if ( !cache ) {
+      cache = {};
+      state.cache[credentialId] = cache;
+    }
+
+    cache[key] = value;
+  },
+};
+
+export const getters = {
+  fromCache: state => ({ credentialId, key }) => {
+    return state.cache[credentialId]?.[key];
+  },
+};
+
+export const actions = {
+  async osChoices({ dispatch }, { credentialId }) {
+    const osList = await dispatch('cachedCommand', { credentialId, command: 'rancher-node-driver/options' });
+
+    const oses = osList.operatingSystems;
+    const result = [];
+
+    if (Array.isArray(oses)) {
+      const map = new Map();
+
+      for (const os of oses) {
+        if (!map.has(os)) {
+          map.set(os, true);
+          result.push({ value: os, label: os });
+        }
+      }
+    } else {
+      result.push({ value: osList.message });
+    }
+
+    return result;
+  },
+
+  async allProducts({ dispatch }, { credentialId }) {
+    const out = await dispatch('cachedCommand', { credentialId, command: 'billing/v1/products?productCategory=SERVER' });
+
+    return out;
+  },
+
+  async cachedCommand({ getters, commit, dispatch }, { credentialId, command }) {
+    let out = getters['fromCache']({ credentialId, key: command });
+
+    if ( !out ) {
+      out = await dispatch('request', { credentialId, command });
+      commit('setCache', {
+        credentialId, key: command, value: out
+      });
+    }
+
+    return out;
+  },
+
+  async request({ dispatch }, {
+    clientId, clientSecret, credentialId, command, opt, out
+  }) {
+    opt = opt || {};
+
+    let url = '/meta/proxy/';
+    const body = null;
+    let method = 'GET';
+
+    if ( opt.url ) {
+      url += opt.url.replace(/^https?:\/\//, '');
+    } else {
+      url += `${ ENDPOINT }/${ command }`;
+      url = addParam(url, 'per_page', opt.per_page || 1000);
+      url = addParams(url, opt.params || {});
+    }
+
+    const headers = { Accept: 'application/json' };
+
+    if ( credentialId ) {
+      headers['X-API-CattleAuth-Header'] = `Bearer credID=${ credentialId } passwordField=token`;
+    } else if ( clientId ) {
+      const credentials = `${ clientId }:${ clientSecret }`;
+      const encoded = base64Encode(credentials);
+
+      headers['Content-Type'] = 'application/json';
+      headers['X-API-Auth-Header'] = `Basic ${ encoded }`;
+      url = '/meta/proxy/auth.phoenixnap.com/auth/realms/BMC/protocol/openid-connect/token/';
+      // body = `grant_type:client_credentials`;
+      method = 'POST';
+    }
+
+    const res = await dispatch('management/request', {
+      url,
+      method,
+      headers,
+      data:                 body,
+      redirectUnauthorized: false,
+    }, { root: true });
+
+    if ( out ) {
+      out[command] = out[command].concat(res[command]);
+    } else {
+      out = res;
+    }
+
+    // De-pagination
+    if ( res?.links?.pages?.next ) {
+      opt.url = res.links.pages.next;
+
+      return dispatch('request', {
+        clientId, clientSecret, credentialId, command, opt, out
+      });
+    }
+
+    return out;
+  }
+};

package/store/prefs.js

@@ -74,7 +74,7 @@ export const HIDE_REPOS = create('hide-repos', [], { parseJSON });
 export const HIDE_DESC = create('hide-desc', [], { parseJSON });
 export const HIDE_SENSITIVE = create('hide-sensitive', true, { options: [true, false], parseJSON });
 export const SHOW_PRE_RELEASE = create('show-pre-release', false, { options: [false, true], parseJSON });
-export const SHOW_CHART_MODE = create('chartMode', 'featured', { parseJSON });
+export const SHOW_CHART_MODE = create('chart-mode', 'featured', { parseJSON });
 
 export const DATE_FORMAT = create('date-format', 'ddd, MMM D YYYY', {
   options: [
@@ -109,7 +109,7 @@ export const PLUGIN_DEVELOPER = create('plugin-developer', false, { parseJSON, i
 
 export const _RKE1 = 'rke1';
 export const _RKE2 = 'rke2';
-export const PROVISIONER = create('provisioner', _RKE1, { options: [_RKE1, _RKE2] });
+export const PROVISIONER = create('provisioner', _RKE2, { options: [_RKE1, _RKE2] });
 
 // Promo for Cluster Tools feature on Cluster Dashboard page
 export const CLUSTER_TOOLS_TIP = create('hide-cluster-tools-tip', false, { parseJSON });
@@ -120,6 +120,8 @@ export const PSP_DEPRECATION_BANNER = create('hide-psp-deprecation-banner', fals
 // Maximum number of clusters to show in the slide-in menu
 export const MENU_MAX_CLUSTERS = create('menu-max-clusters', 4, { options: [2, 3, 4, 5, 6, 7, 8, 9, 10], parseJSON });
 
+// Prompt for confirm when scaling down node pool in GUI and save the pref
+export const SCALE_POOL_PROMPT = create('scale-pool-prompt', null, { parseJSON });
 // --------------------
 
 const cookiePrefix = 'R_';
@@ -470,11 +472,19 @@ export const actions = {
     return server;
   },
 
-  setLastVisited({ state, dispatch }, route) {
+  setLastVisited({ state, dispatch, getters }, route) {
     if (!route) {
       return;
     }
 
+    // Only save the last visited page if the user has that set as the login route preference
+    const afterLoginRoutePref = getters['get'](AFTER_LOGIN_ROUTE);
+    const doNotTrackLastVisited = typeof afterLoginRoutePref !== 'string' || afterLoginRoutePref !== 'last-visited';
+
+    if (doNotTrackLastVisited) {
+      return;
+    }
+
     const toSave = getLoginRoute(route);
 
     return dispatch('set', { key: LAST_VISITED, value: toSave });