@rancher/shell 2.0.0 → 2.0.2-rc.1

package/promptRemove/pod.vue

@@ -30,6 +30,16 @@ export default {
     type: {
       type:     String,
       required: true
+    },
+
+    close: {
+      type:     Function,
+      required: true
+    },
+
+    doneLocation: {
+      type:    Object,
+      default: () => {}
     }
   },
 
@@ -69,23 +79,21 @@ export default {
 
   methods: {
     async remove(confirm) {
-      const parentComponent = this.$parent.$parent.$parent;
-
       let goTo;
 
-      if (parentComponent.doneLocation) {
+      if (this.doneLocation) {
         // doneLocation will recompute to undefined when delete request completes
-        goTo = { ...parentComponent.doneLocation };
+        goTo = { ...this.doneLocation };
       }
 
       try {
         await Promise.all(this.value.map((resource) => this.removePod(resource)));
         if ( goTo && !isEmpty(goTo) ) {
-          parentComponent.currentRouter.push(goTo);
+          this.value?.[0]?.currentRouter().push(goTo);
         }
-        parentComponent.close();
+        this.close();
       } catch (err) {
-        parentComponent.error = err;
+        this.$emit('errors', err);
         confirm(false);
       }
     },

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -1,6 +1,6 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.29.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows

package/scripts/publish-shell.sh

@@ -6,10 +6,15 @@ BASE_DIR="$(
   pwd
 )"
 SHELL_DIR=$BASE_DIR/shell/
-TMP_DIR=$BASE_DIR/tmp
-PUBLISH_ARGS="--no-git-tag-version --access public $PUBLISH_ARGS"
+CREATORS_DIR=$BASE_DIR/creators/extension
 FORCE_PUBLISH_TO_NPM="false"
-DEFAULT_YARN_REGISTRY="https://registry.npmjs.org"
+DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
+
+# if TAG doesn't exist, we can exit as it's needed for any type of publish.
+if [ -z "$TAG" ]; then
+  echo "You need to set the TAG variable first!"
+  exit 1
+fi
 
 if [ ! -d "${BASE_DIR}/node_modules" ]; then
   echo "You need to run 'yarn install' first"
@@ -23,72 +28,49 @@ if [ "$1" == "--npm" ]; then
 fi
 
 if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
-  export YARN_REGISTRY=$DEFAULT_YARN_REGISTRY
+  export NPM_REGISTRY=$DEFAULT_NPM_REGISTRY
 fi
 
-# We use the version from the shell package for the creator packages
-# Need to copy them to a temporary location, so we can patch the version number
-# before publishing
-
-# To set a token for NPM registry auth: `npm config set //registry.npmjs.org/:_authToken <TOKEN>``
-
-PKG_DIST=$BASE_DIR/dist-pkg/creators
-mkdir -p ${PKG_DIST}
-rm -rf ${PKG_DIST}/app
-rm -rf ${PKG_DIST}/pkg
-rm -rf ${PKG_DIST}/update
+PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY"
 
 pushd ${SHELL_DIR} >/dev/null
 
-PKG_VERSION=$(node -p "require('./package.json').version")
-popd >/dev/null
-
-echo "Publishing version: $PKG_VERSION"
-
-cp -R ${SHELL_DIR}/creators/app ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/pkg ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/update ${PKG_DIST}
-
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/app/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/pkg/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/update/package.json
-
-rm ${PKG_DIST}/app/package.json.bak
-rm ${PKG_DIST}/pkg/package.json.bak
-rm ${PKG_DIST}/update/package.json.bak
-
 function publish() {
   NAME=$1
   FOLDER=$2
 
+  # if we pass a third arg, that is the version number
+  # that we want to actually publish on NPM
+  # they should match with the package.json version stated 
+  # because of the check in the "Check Tags Version Matching" step in the workflow
+  if [ -n "$3" ]; then
+    PKG_VERSION=$3
+  fi
+
   echo "Publishing ${NAME} from ${FOLDER}"
   pushd ${FOLDER} >/dev/null
 
   # For now, copy the rancher components into the shell and ship them with it
   if [ "$NAME" == "Shell" ]; then
     echo "Adding Rancher Components"
+    rm -rf ./rancher-components
     cp -R ${BASE_DIR}/pkg/rancher-components/src/components ./rancher-components/
   fi
 
-  if [ "$NAME" == "Update" ]; then
-    # Add files from the app and pkg creators to the update package
-    mkdir -p ./app
-    mkdir -p ./pkg
-    cp -R ${BASE_DIR}/shell/creators/app/* ./app
-    cp -R ${BASE_DIR}/shell/creators/pkg/* ./pkg
-    # Remove index.ts from pkg files, as we don't want to replace that
-    rm -f ./pkg/files/index.ts
-
-    # Update the package.json for the app
-    cd app
-    node ${SCRIPT_DIR}/record-deps.js
-    cd ..
+  # if the PKG_VERSION has a - it means it will be a pre-release of legacy-v2
+  if [[ $PKG_VERSION == *"-"* ]]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v2-pre-release"
+  else
+    # If we need to release shell, we tag it as legacy-v2
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v2"
   fi
 
   # Make a note of dependency versions, if required
   node ${SCRIPT_DIR}/record-deps.js
 
-  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS}
+  echo "Publishing to registry: $NPM_REGISTRY with args: $PUBLISH_ARGS"
+
+  npm publish ${PUBLISH_ARGS}
   RET=$?
 
   popd >/dev/null
@@ -99,15 +81,32 @@ function publish() {
   fi
 }
 
-# Generate the type definitions for the shell
-${SCRIPT_DIR}/typegen.sh
-
-# Publish the packages - don't tag the git repo and don't auto-increment the version number
-publish "Shell" ${SHELL_DIR}
-publish "Application creator" ${PKG_DIST}/app/
-publish "Package creator" ${PKG_DIST}/pkg/
-publish "Update" ${PKG_DIST}/update/
+echo "TAG ${TAG}"
+  
+  # let's get the package name and version from the tag
+PKG_NAME=$(sed 's/-pkg-v.*//' <<< "$TAG")
+PKG_V=$(sed 's/.*-pkg-v//'<<< "$TAG")
 
-echo "Done"
+echo "PKG_NAME ${PKG_NAME}"
+echo "PKG_V ${PKG_V}"
 
+# Generate the type definitions for the shell
+if [ ${PKG_NAME} == "shell" ]; then
+  ${SCRIPT_DIR}/typegen.sh
+fi
 
+# version comparison checks
+case $PKG_NAME in
+  "shell")
+    echo "Publishing only Shell pkg via tagged release"
+    publish "Shell" ${SHELL_DIR} ${PKG_V}
+    ;;
+  "creators")
+    echo "Publishing only Creators pkg via tagged release"
+    publish "Extension creator" ${CREATORS_DIR} ${PKG_V}
+    ;;
+  *)
+    echo "something went wrong with the tagging name => TAG: ${TAG} , PKG_NAME: ${PKG_NAME}. Admissable names are 'shell' and 'creator'"
+    exit 1
+    ;;
+esac

package/scripts/test-plugins-build.sh

@@ -8,8 +8,8 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
 SHELL_DIR=$BASE_DIR/shell/
 SHELL_VERSION="99.99.99"
-DEFAULT_YARN_REGISTRY="https://registry.npmjs.org"
-VERDACCIO_YARN_REGISTRY="http://localhost:4873"
+DEFAULT_NPM_REGISTRY="https://registry.npmjs.org/"
+VERDACCIO_NPM_REGISTRY="http://localhost:4873"
 
 echo ${SCRIPT_DIR}
 
@@ -69,11 +69,11 @@ else
   rm -rf ~/.config/verdaccio/storage/@rancher/*
 fi
 
-export YARN_REGISTRY=$VERDACCIO_YARN_REGISTRY
+export NPM_REGISTRY=$VERDACCIO_NPM_REGISTRY
 export NUXT_TELEMETRY_DISABLED=1
 
 # Remove test package from previous run, if present
-if [ $TEST_PERSIST_BUILD != "true" ]; then
+if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
   echo "Removing folder ${BASE_DIR}/pkg/test-pkg"
   rm -rf ${BASE_DIR}/pkg/test-pkg
 fi
@@ -81,20 +81,34 @@ fi
 # 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
 # are already published and Verdaccio will check, since it is a read-through cache
-sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${SHELL_VERSION}\",/g" ${SHELL_DIR}/package.json
-rm ${SHELL_DIR}/package.json.bak
+update_version_in_package_json() {
+  local package_json_path="$1"
+  local version="$2"
 
-# 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]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${SHELL_VERSION}\",/g" ${BASE_DIR}/pkg/rancher-components/package.json
+  sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${version}\",/g" "$package_json_path"
+  rm "${package_json_path}.bak"
+}
+
+update_version_in_package_json "${SHELL_DIR}/package.json" "${SHELL_VERSION}"
+update_version_in_package_json "${BASE_DIR}/pkg/rancher-components/package.json" "${SHELL_VERSION}"
+update_version_in_package_json "${BASE_DIR}/creators/extension/package.json" "${SHELL_VERSION}"
 
-# Publish shell
-echo "Publishing shell packages to local registry"
+# Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)
+echo "Publishing Shell package to local registry"
 yarn install
+export TAG="shell-pkg-v${SHELL_VERSION}"
+${SHELL_DIR}/scripts/publish-shell.sh
+
+# Publish creators pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)
+echo "Publishing Creators package to local registry"
+export TAG="creators-pkg-v${SHELL_VERSION}"
 ${SHELL_DIR}/scripts/publish-shell.sh
 
 # Publish rancher components
 yarn build:lib
+
+npm set registry ${VERDACCIO_NPM_REGISTRY}
+yarn config set registry ${VERDACCIO_NPM_REGISTRY}
 yarn publish:lib
 
 # We pipe into cat for cleaner logging - we need to set pipefail
@@ -107,26 +121,18 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
 
   echo "Using temporary directory ${DIR}"
 
-  echo "Verifying app creator package"
+  echo "Verifying extension creator"
 
-  yarn create @rancher/app test-app
-  pushd test-app
-  yarn install
+  FORCE_COLOR=true yarn create @rancher/extension test-pkg --app-name test-app | cat
 
-  echo "Building skeleton app"
+  pushd test-app > /dev/null
 
+  yarn install
   FORCE_COLOR=true yarn build | cat
 
-  # Package creator
-  echo "Verifying package creator package"
-  yarn create @rancher/pkg test-pkg -i
-
-  echo "Building test package"
-  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
+  mkdir -p pkg/test-pkg/list
   cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
 
   FORCE_COLOR=true yarn build-pkg test-pkg | cat
@@ -134,7 +140,7 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   echo "Cleaning temporary dir"
   popd > /dev/null
 
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
+  if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
     echo "Removing folder ${DIR}"
     rm -rf ${DIR}
   fi
@@ -147,15 +153,16 @@ echo "Validating in-tree package"
 
 yarn install
 
-if [ $TEST_PERSIST_BUILD != "true" ]; then
+if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
   echo "Removing folder ./pkg/test-pkg"
   rm -rf ./pkg/test-pkg
 fi
 
-yarn create @rancher/pkg test-pkg -t -i
+yarn create @rancher/extension test-pkg -i
 cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
-if [ $TEST_PERSIST_BUILD != "true" ]; then
+
+if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
   echo "Removing folder ./pkg/test-pkg"
   rm -rf ./pkg/test-pkg
 fi
@@ -168,9 +175,9 @@ function clone_repo_test_extension_build() {
   echo -e "\nSetting up $REPO_NAME repository locally\n"
 
   # set registry to default (to install all of the other dependencies)
-  yarn config set registry ${DEFAULT_YARN_REGISTRY}
+  yarn config set registry ${DEFAULT_NPM_REGISTRY}
 
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
+  if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
     echo "Removing folder ${BASE_DIR}/$REPO_NAME"
     rm -rf ${BASE_DIR}/$REPO_NAME
   fi
@@ -183,7 +190,7 @@ function clone_repo_test_extension_build() {
   yarn install
 
   # set registry to local verdaccio (to install new shell)
-  yarn config set registry ${VERDACCIO_YARN_REGISTRY}
+  yarn config set registry ${VERDACCIO_NPM_REGISTRY}
 
   # update package.json to use a specific version of shell
   sed -i.bak -e "s/\"\@rancher\/shell\": \"[0-9]*.[0-9]*.[0-9]*\",/\"\@rancher\/shell\": \"${SHELL_VERSION}\",/g" package.json
@@ -209,16 +216,15 @@ function clone_repo_test_extension_build() {
   popd
 
   # delete folder
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${BASE_DIR}/$REPO_NAME"
-    rm -rf ${BASE_DIR}/$REPO_NAME
-  fi
-  yarn config set registry ${DEFAULT_YARN_REGISTRY}
+  echo "Removing folder ${BASE_DIR}/$REPO_NAME"
+  rm -rf ${BASE_DIR}/$REPO_NAME
+  yarn config set registry ${DEFAULT_NPM_REGISTRY}
 }
 
 # Here we just add the extension that we want to include as a check (all our official extensions should be included here)
 # Don't forget to add the unit tests exception to clone_repo_test_extension_build function if a new extension has those
-clone_repo_test_extension_build "kubewarden-ui" "kubewarden"
-clone_repo_test_extension_build "elemental-ui" "elemental"
+# clone_repo_test_extension_build "kubewarden-ui" "kubewarden"
+# clone_repo_test_extension_build "elemental-ui" "elemental"
+# clone_repo_test_extension_build "capi-ui-extension" "capi"
 
-echo "All done"
+echo "All done"

package/shell/types/shell/index.d.ts

@@ -0,0 +1,2 @@
+// Auto-generated type definitions for shell
+// Do not modify this file as changes will get overwritten

package/store/auth.js

@@ -13,7 +13,7 @@ export const BASE_SCOPES = {
   googleoauth:  ['openid profile email'],
   azuread:      [],
   keycloakoidc: ['openid profile email'],
-  oidc:         ['openid profile email'],
+  genericoidc:  ['openid profile email'],
 };
 
 const KEY = 'rc_nonce';

package/store/index.js

@@ -594,7 +594,7 @@ export const getters = {
   },
 
   releaseNotesUrl(state, getters) {
-    const version = getters['management/byId'](MANAGEMENT.SETTING, 'server-version')?.value;
+    const version = getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER)?.value;
 
     const base = 'https://github.com/rancher/rancher/releases';
 

package/store/type-map.js

@@ -2021,8 +2021,10 @@ function hasCustom(state, rootState, kind, key, fallback) {
     return cache[key];
   }
 
-  // Check to see if the custom kind is provided by a plugin
-  if (!!rootState.$plugin.getDynamic(kind, key)) {
+  // Check to see if the custom kind is provided by a plugin (ignore booleans)
+  const pluginComponent = rootState.$plugin.getDynamic(kind, key);
+
+  if (typeof pluginComponent !== 'boolean' && !!pluginComponent) {
     cache[key] = true;
 
     return cache[key];

package/types/store/pagination.types.ts

@@ -227,7 +227,7 @@ export class PaginationParamFilter extends PaginationParam {
   /**
    * Convenience method when you just want an instance of {@link PaginationParamFilter} with a simple `filter=x=y` param
    */
-  static createSingleField(field: { field?: string; value: string; equals?: boolean; }): PaginationParam {
+  static createSingleField(field: { field?: string; value: string; equals?: boolean; exact?: boolean }): PaginationParam {
     return new PaginationParamFilter({ fields: [new PaginationFilterField(field)] });
   }
 

package/utils/__tests__/kontainer.test.ts

@@ -1,4 +1,4 @@
-import { diffUpstreamSpec } from '@shell/utils/kontainer';
+import { diffUpstreamSpec, syncUpstreamConfig } from '@shell/utils/kontainer';
 
 describe('fx: diffUpstreamSpec', () => {
   it.each([
@@ -90,3 +90,91 @@ describe('fx: diffUpstreamSpec', () => {
     expect(diffUpstreamSpec(upstream, local)).toStrictEqual(diff);
   });
 });
+
+describe('fx: syncUpstreamSpec', () => {
+  it('should set any fields defined in upstream spec and not local spec', () => {
+    const upstream = {
+      string:                 'def',
+      'other-string':         '123',
+      alreadySet:             'abc',
+      alreadySetArray:        [2, 3, 4],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+    const local = {
+      alreadySet:             'def',
+      alreadySetArray:        [1, 2, 3],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const expected = {
+      string:                 'def',
+      'other-string':         '123',
+      alreadySet:             'def',
+      alreadySetArray:        [1, 2, 3],
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+
+  it('should not set empty objects or arrays from upstream spec', () => {
+    const upstream = {
+      emptyArray:      [],
+      emptyObject:     {},
+      nonEmptyArray:   [1, 2, 3],
+      nonEmptyObject:  { foo: 'bar' },
+      alreadySet:      'abc',
+      alreadySetArray: [2, 3, 4],
+    };
+    const local = {
+      alreadySet:      'def',
+      alreadySetArray: [1, 2, 3],
+    };
+
+    const expected = {
+      nonEmptyArray:   [1, 2, 3],
+      nonEmptyObject:  { foo: 'bar' },
+      alreadySet:      'def',
+      alreadySetArray: [1, 2, 3],
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+
+  it('should not overwrite boolean values explicitly set false', () => {
+    const upstream = {
+      falseBoolean:           false,
+      trueBoolean:            true,
+      alreadySetBooleanFalse: true,
+      alreadySetBooleanTrue:  false
+    };
+    const local = {
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const expected = {
+      falseBoolean:           false,
+      trueBoolean:            true,
+      alreadySetBooleanFalse: false,
+      alreadySetBooleanTrue:  true
+    };
+
+    const testCluster = { eksConfig: local, eksStatus: { upstreamSpec: upstream } };
+
+    syncUpstreamConfig( 'eks', testCluster);
+
+    expect(testCluster.eksConfig).toStrictEqual(expected);
+  });
+});

package/utils/auth.js

@@ -71,7 +71,7 @@ export const authProvidersInfo = async(store) => {
   const nonLocal = rows.filter((x) => x.name !== 'local');
   const enabled = nonLocal.filter((x) => x.enabled === true );
 
-  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'genericoidc');
+  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'oidc');
 
   const enabledLocation = enabled.length === 1 ? {
     name:   'c-cluster-auth-config-id',

package/utils/cluster.js

@@ -1,4 +1,5 @@
 import semver from 'semver';
+import { camelToTitle } from '@shell/utils/string';
 import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
@@ -90,3 +91,11 @@ export function abbreviateClusterName(input) {
 
   return result;
 }
+
+export function labelForAddon(name, configuration = true) {
+  const addon = camelToTitle(name.replace(/^(rke|rke2|rancher)-/, ''));
+  const fallback = `${ addon } ${ configuration ? 'Configuration' : '' }`;
+  const key = `cluster.addonChart."${ name }"${ configuration ? '.configuration' : '.label' }`;
+
+  return this.$store.getters['i18n/withFallback'](key, null, fallback);
+}

package/utils/kontainer.ts

@@ -17,7 +17,11 @@ export function syncUpstreamConfig(configPrefix: string, normanCluster: {[key: s
 
   if (!isEmpty(upstreamConfig)) {
     Object.keys(upstreamConfig).forEach((key) => {
-      if (isEmpty(rancherConfig[key]) && !isEmpty(upstreamConfig[key])) {
+      if (typeof upstreamConfig[key] === 'object') {
+        if (isEmpty(rancherConfig[key]) && !isEmpty(upstreamConfig[key])) {
+          set(rancherConfig, key, upstreamConfig[key]);
+        }
+      } else if ((rancherConfig[key] === null || rancherConfig[key] === undefined) && upstreamConfig[key] !== null && upstreamConfig[key] !== undefined) {
         set(rancherConfig, key, upstreamConfig[key]);
       }
     });

package/utils/settings.ts

@@ -102,5 +102,7 @@ export const getPerformanceSetting = (rootGetters: Record<string, (arg0: string,
   }
 
   // Start with the default and overwrite the values from the setting - ensures we have defaults for newly added options
-  return Object.assign(DEFAULT_PERF_SETTING, perfSetting || {});
+  const safeDefaults = Object.assign({}, DEFAULT_PERF_SETTING);
+
+  return Object.assign(safeDefaults, perfSetting || {});
 };

package/utils/version.js

@@ -2,6 +2,7 @@ import { sortableNumericSuffix } from '@shell/utils/sort';
 import semver from 'semver';
 import { MANAGEMENT } from '@shell/config/types';
 import { READ_WHATS_NEW, SEEN_WHATS_NEW } from '@shell/store/prefs';
+import { SETTING } from '@shell/config/settings';
 
 export function parse(str) {
   str = `${ str }`;
@@ -82,7 +83,7 @@ export function isDevBuild(version) {
 }
 
 export function getVersionInfo(store) {
-  const setting = store.getters['management/byId'](MANAGEMENT.SETTING, 'server-version');
+  const setting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER);
   const fullVersion = setting?.value || 'unknown';
   let displayVersion = fullVersion;
 

package/creators/app/app.package.json

@@ -1,13 +0,0 @@
-{
-  "name": "NAME",
-  "version": "0.1.0",
-  "private": false,
-  "engines": {
-    "node": ">=12"
-  },
-  "dependencies": {},
-  "resolutions": {
-    "**/webpack": "4",
-    "@types/node": "^16"
-  }  
-}

package/creators/app/files/.eslintignore

@@ -1,16 +0,0 @@
-assets/fonts
-coverage
-.nyc_output
-node_modules/
-.npm
-.eslintcache
-.env
-.cache
-.next
-dist
-dist-pkg
-.DS_Store
-dynamic-importer.js
-ksconfig.json
-shell/utils/dynamic-importer.js
-shell/assets/fonts