@rancher/shell 0.5.2 → 1.2.0

package/scripts/test-plugins-build.sh

@@ -7,9 +7,6 @@ echo "Checking plugin build"
 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"
 
 echo ${SCRIPT_DIR}
 
@@ -69,24 +66,21 @@ else
   rm -rf ~/.config/verdaccio/storage/@rancher/*
 fi
 
-export YARN_REGISTRY=$VERDACCIO_YARN_REGISTRY
+export YARN_REGISTRY=http://localhost:4873
 export NUXT_TELEMETRY_DISABLED=1
 
 # Remove test package from previous run, if present
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ${BASE_DIR}/pkg/test-pkg"
-  rm -rf ${BASE_DIR}/pkg/test-pkg
-fi
+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
 # 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
+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]*\(-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]*\",/\"version\": \"7.7.7\",/g" ${BASE_DIR}/pkg/rancher-components/package.json
 
 # Publish shell
 echo "Publishing shell packages to local registry"
@@ -114,7 +108,6 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   yarn install
 
   echo "Building skeleton app"
-
   FORCE_COLOR=true yarn build | cat
 
   # Package creator
@@ -134,91 +127,22 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   echo "Cleaning temporary dir"
   popd > /dev/null
 
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${DIR}"
-    rm -rf ${DIR}
-  fi
+  rm -rf ${DIR}
 fi
 
 pushd $BASE_DIR
+pwd
+ls
 
 # Now try a plugin within the dashboard codebase
 echo "Validating in-tree package"
 
 yarn install
 
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ./pkg/test-pkg"
-  rm -rf ./pkg/test-pkg
-fi
-
+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
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ./pkg/test-pkg"
-  rm -rf ./pkg/test-pkg
-fi
-
-# function to clone repos and install dependencies (including the newly published shell version)
-function clone_repo_test_extension_build() {
-  REPO_NAME=$1
-  PKG_NAME=$2
-
-  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}
-
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${BASE_DIR}/$REPO_NAME"
-    rm -rf ${BASE_DIR}/$REPO_NAME
-  fi
-
-  # cloning repo
-  git clone https://github.com/rancher/$REPO_NAME.git
-  pushd ${BASE_DIR}/$REPO_NAME
-
-  echo -e "\nInstalling dependencies for $REPO_NAME\n"
-  yarn install
-
-  # set registry to local verdaccio (to install new shell)
-  yarn config set registry ${VERDACCIO_YARN_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
-  rm package.json.bak
-
-  # we need to remove yarn.lock, otherwise it would install a version that we don't want
-  rm yarn.lock
-
-  echo -e "\nInstalling newly built shell version\n"
-
-  # installing new version of shell
-  yarn add @rancher/shell@${SHELL_VERSION}
-
-  # test build-pkg
-  FORCE_COLOR=true yarn build-pkg $PKG_NAME | cat
-
-  # kubewarden has some unit tests and they should be quick to run... Let's check them as well
-  if [ "${REPO_NAME}" == "kubewarden-ui" ]; then
-    yarn test:ci
-  fi
-
-  # return back to the base path
-  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}
-}
-
-# 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"
+rm -rf ./pkg/test-pkg
 
 echo "All done"

package/store/catalog.js

@@ -354,7 +354,7 @@ export const actions = {
 
     // As per comment above, when there are no clusters this will be management. Store it such that it can be used for those cases
     commit('setInStore', inStore);
-    hash.cluster = hash.cluster?.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+    hash.cluster = hash.cluster.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
 
     commit('setRepos', hash);
 

package/store/features.js

@@ -27,7 +27,6 @@ export const mapFeature = function(name) {
 export const MULTI_CLUSTER = create('multi-cluster-management', true);
 export const LEGACY = create('legacy', false);
 export const RKE2 = create('rke2', true);
-export const RKE1_UI = create('rke1-ui', true);
 export const UNSUPPORTED_STORAGE_DRIVERS = create('unsupported-storage-drivers', false);
 export const FLEET = create('continuous-delivery', true);
 export const HARVESTER = create('harvester', true);

package/store/i18n.js

@@ -308,17 +308,6 @@ export const actions = {
           p.push(dispatch('mergeLoad', { locale, module: fn }));
         });
 
-        // load all of the default locales from the plugins for fallback
-        if (locale !== DEFAULT_LOCALE) {
-          const defaultI18nExt = rootState.$plugin?.getDynamic('l10n', DEFAULT_LOCALE);
-
-          if (defaultI18nExt && defaultI18nExt.length) {
-            defaultI18nExt.forEach((fn) => {
-              p.push(dispatch('mergeLoad', { locale: DEFAULT_LOCALE, module: fn }));
-            });
-          }
-        }
-
         try {
           await Promise.all(p);
         } catch (e) {

package/store/index.js

@@ -801,14 +801,14 @@ export const actions = {
     commit('targetRoute', targetRoute);
     const sameCluster = state.clusterId && state.clusterId === id;
     const samePackage = oldPkg?.name === newPkg?.name;
-    const sameProduct = oldProduct === product;
     const isMultiCluster = getters['isMultiCluster'];
 
-    // Are we in the same cluster and package or product?
-    if ( sameCluster && (samePackage || sameProduct)) {
+    // Are we in the same cluster and package?
+    if ( sameCluster && samePackage) {
       // Do nothing, we're already connected/connecting to this cluster
       return;
     }
+
     const oldPkgClusterStore = oldPkg?.stores.find(
       (s) => getters[`${ s.storeName }/isClusterStore`]
     )?.storeName;
@@ -829,6 +829,7 @@ export const actions = {
       // so that the nav and header stay the same when going to things like prefs
       commit('clusterReady', false);
       commit('clusterId', undefined);
+
       await dispatch('cluster/unsubscribe');
       commit('cluster/reset');
 
@@ -1047,13 +1048,15 @@ export const actions = {
     if ( route.name === 'index' ) {
       router.replace('/auth/login');
     } else {
-      const backTo = window.localStorage.getItem(BACK_TO);
+      if (!process.server) {
+        const backTo = window.localStorage.getItem(BACK_TO);
 
-      const isLogin = route.name === 'auth-login' || route.path === '/login'; // Cover dashboard and case of log out from ember;
-      const isLogout = route.name === 'auth-logout';
+        const isLogin = route.name === 'auth-login' || route.path === '/login'; // Cover dashboard and case of log out from ember;
+        const isLogout = route.name === 'auth-logout';
 
-      if (!backTo && !isLogin && !isLogout) {
-        window.localStorage.setItem(BACK_TO, window.location.href);
+        if (!backTo && !isLogin && !isLogout) {
+          window.localStorage.setItem(BACK_TO, window.location.href);
+        }
       }
 
       const QUERY = (LOGGED_OUT in route.query) ? LOGGED_OUT : TIMED_OUT;

package/store/prefs.js

@@ -112,6 +112,9 @@ export const _RKE1 = 'rke1';
 export const _RKE2 = 'rke2';
 export const PROVISIONER = create('provisioner', _RKE2, { options: [_RKE1, _RKE2] });
 
+// Promo for Pod Security Policies (PSPs) being deprecated on kube version 1.25 on Cluster Dashboard page
+export const PSP_DEPRECATION_BANNER = create('hide-psp-deprecation-banner', false, { parseJSON });
+
 // Maximum number of clusters to show in the slide-in menu
 export const MENU_MAX_CLUSTERS = 10;
 // Prompt for confirm when scaling down node pool in GUI and save the pref
@@ -345,44 +348,46 @@ export const actions = {
     commit('cookiesLoaded');
   },
 
-  loadTheme({ dispatch }) {
-    const watchDark = window.matchMedia('(prefers-color-scheme: dark)');
-    const watchLight = window.matchMedia('(prefers-color-scheme: light)');
-    const watchNone = window.matchMedia('(prefers-color-scheme: no-preference)');
-
-    const interval = 30 * 60 * 1000;
-    const nextHalfHour = interval - Math.round(new Date().getTime()) % interval;
-
-    setTimeout(() => {
-      dispatch('loadTheme');
-    }, nextHalfHour);
-    // console.log('Update theme in', nextHalfHour, 'ms');
-
-    if ( watchDark.matches ) {
-      changed('dark');
-    } else if ( watchLight.matches ) {
-      changed('light');
-    } else {
-      changed(fromClock());
-    }
+  loadTheme({ state, dispatch }) {
+    if ( process.client ) {
+      const watchDark = window.matchMedia('(prefers-color-scheme: dark)');
+      const watchLight = window.matchMedia('(prefers-color-scheme: light)');
+      const watchNone = window.matchMedia('(prefers-color-scheme: no-preference)');
 
-    watchDark.addListener((e) => {
-      if ( e.matches ) {
-        changed('dark');
-      }
-    });
+      const interval = 30 * 60 * 1000;
+      const nextHalfHour = interval - Math.round(new Date().getTime()) % interval;
 
-    watchLight.addListener((e) => {
-      if ( e.matches ) {
-        changed('light');
-      }
-    });
+      setTimeout(() => {
+        dispatch('loadTheme');
+      }, nextHalfHour);
+      // console.log('Update theme in', nextHalfHour, 'ms');
 
-    watchNone.addListener((e) => {
-      if ( e.matches ) {
+      if ( watchDark.matches ) {
+        changed('dark');
+      } else if ( watchLight.matches ) {
+        changed('light');
+      } else {
         changed(fromClock());
       }
-    });
+
+      watchDark.addListener((e) => {
+        if ( e.matches ) {
+          changed('dark');
+        }
+      });
+
+      watchLight.addListener((e) => {
+        if ( e.matches ) {
+          changed('light');
+        }
+      });
+
+      watchNone.addListener((e) => {
+        if ( e.matches ) {
+          changed(fromClock());
+        }
+      });
+    }
 
     function changed(value) {
       // console.log('Prefers Theme:', value);

package/store/type-map.js

@@ -148,7 +148,7 @@ import isObject from 'lodash/isObject';
 import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
 import { sortBy } from '@shell/utils/sort';
 
-import { haveV1Monitoring, haveV2Monitoring } from '@shell/utils/monitoring';
+import { haveV2Monitoring } from '@shell/utils/monitoring';
 import { NEU_VECTOR_NAMESPACE } from '@shell/config/product/neuvector';
 
 export const NAMESPACED = 'namespaced';
@@ -171,7 +171,6 @@ const graphConfigMap = {};
 const FIELD_REGEX = /^\$\.metadata\.fields\[([0-9]*)\]/;
 
 export const IF_HAVE = {
-  V1_MONITORING:            'v1-monitoring',
   V2_MONITORING:            'v2-monitoring',
   PROJECT:                  'project',
   NO_PROJECT:               'no-project',
@@ -912,10 +911,6 @@ export const getters = {
             continue;
           }
 
-          if (item.ifFeature && !rootGetters['features/get'](item.ifFeature)) {
-            continue;
-          }
-
           if ( isBasic && !getters.groupForBasicType(product, id) ) {
             continue;
           } else if ( mode === FAVORITE && !getters.isFavorite(id) ) {
@@ -1793,9 +1788,6 @@ function ifHave(getters, option) {
   case IF_HAVE.V2_MONITORING: {
     return haveV2Monitoring(getters);
   }
-  case IF_HAVE.V1_MONITORING: {
-    return haveV1Monitoring(getters);
-  }
   case IF_HAVE.PROJECT: {
     return !!project(getters);
   }
@@ -1848,12 +1840,15 @@ function _rowValueGetter(col) {
   // We will use JsonPath to look up this value, which is costly - so if we can detect this format
   // Use a more efficient function to get the value
   const value = col.field.startsWith('.') ? `$${ col.field }` : col.field;
-  const found = value.match(FIELD_REGEX);
 
-  if (found && found.length === 2) {
-    const fieldIndex = parseInt(found[1], 10);
+  if (process.client) {
+    const found = value.match(FIELD_REGEX);
+
+    if (found && found.length === 2) {
+      const fieldIndex = parseInt(found[1], 10);
 
-    return (row) => row.metadata?.fields?.[fieldIndex];
+      return (row) => row.metadata?.fields?.[fieldIndex];
+    }
   }
 
   return value;

package/tsconfig.default.json

@@ -0,0 +1,46 @@
+{
+  "compilerOptions": {
+    "target": "ES2018",
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "lib": [
+      "ESNext",
+      "ESNext.AsyncIterable",
+      "DOM"
+    ],
+    "esModuleInterop": true,
+    "allowJs": true,
+    "sourceMap": true,
+    "strict": true,
+    "noEmit": false,
+    "baseUrl": ".",
+    "rootDir": ".",
+    "paths": {
+      "~/*": [
+        "../*"
+      ],
+      "@/*": [
+        "../*"
+      ],
+      "@shell/*": [
+        "../shell/*"
+      ],
+      "@pkg/*": [
+        "../shell/pkg/*"
+      ]
+    },
+    "typeRoots": [
+      "./node_modules/@types"
+    ],
+  },
+  "exclude": [
+    "node_modules",
+    ".nuxt",
+    "dist",
+    "dist-pkg",
+    "shell/creators",
+    "shell/scripts",
+    "script/standalone",
+    "docusaurus"
+  ]
+}

package/tsconfig.json

@@ -1,42 +1,16 @@
 {
-  "extends": "./tsconfig.paths.json",
+  "extends": "./tsconfig.default.json",
   "compilerOptions": {
-    "target": "ES2018",
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "lib": [
-      "ESNext",
-      "ESNext.AsyncIterable",
-      "DOM"
-    ],
-    "allowJs": true,
-    "sourceMap": true,
-    "strict": true,
-    "noEmit": false,
-    "esModuleInterop": true,
-    "baseUrl": ".",
-    "rootDir": ".",
     "types": [
-      "node",
-      "jest",
-    ],
-    "typeRoots": [
-      "./node_modules/@types",
-      "../node_modules/@types"
-    ],
+      "@types/node",
+      "@types/jest",
+      "@nuxt/types",
+    ]
   },
   "exclude": [
-    "node_modules",
-    ".nuxt",
-    "dist",
-    "dist-pkg",
-    "../dist",
-    "../dist-pkg",
-    "../creators",
-    "../scripts",
-    "../cypress",
-    "../cypress.config.ts",
-    "../docusaurus",
-    "../**/*.spec.ts"
+    "cypress",
+    "./cypress.config.ts",
+    "**/*.test.ts",
+    "**/*.spec.ts"
   ]
 }