dashboard-shell-shell 1.0.1000000117 → 1.0.1000000118

package/scripts/publish-shell.sh

@@ -1,136 +1,110 @@
 #!/usr/bin/env bash
 
-# 执行命令示例：
-# TAG=shell-pkg-v3.0.2-rc.105 ./shell/scripts/publish-shell.sh
+# 执行命令：TAG=cloud-shell-pkg-v{版本号} ./cloud-shell/scripts/publish-shell.sh
 
-set -euo pipefail
+set -eo pipefail
 
-# --------------------------
-# 基础路径
-# --------------------------
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR" && cd ../.. && pwd)"
+BASE_DIR="$(cd $SCRIPT_DIR && cd ../.. && pwd)"
 echo "BASE_DIR is ${BASE_DIR}"
 echo "SCRIPT_DIR is ${SCRIPT_DIR}"
 echo "PWD is $(pwd)"
-
-SHELL_DIR="$BASE_DIR/shell/"
-CREATORS_DIR="$BASE_DIR/creators/extension"
-
+CLOUD_SHELL_DIR=$BASE_DIR/cloud-shell/
+echo "CLOUD_SHELL_DIR is ${CLOUD_SHELL_DIR}"
+CREATORS_DIR=$BASE_DIR/creators/extension
 FORCE_PUBLISH_TO_NPM="false"
 DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
 
-# --------------------------
-# TAG 必须存在
-# --------------------------
-if [ -z "${TAG:-}" ]; then
+# 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
 
-# --------------------------
-# node_modules 检查
-# --------------------------
-if [[ ! -d "$BASE_DIR/node_modules" ]]; then
+if [ ! -d "${BASE_DIR}/node_modules" ]; then
   echo "You need to run 'yarn install' first"
   exit 1
 fi
 
-echo "Publishing Shell Packages"
+echo "Publishing Cloud Shell Packages"
 
-# --------------------------
-# NPM 发布参数
-# --------------------------
-if [[ "${1:-}" == "--npm" ]]; then
+if [ "$1" == "--npm" ]; then
   FORCE_PUBLISH_TO_NPM="true"
 fi
 
-if [[ "$FORCE_PUBLISH_TO_NPM" == "true" ]]; then
-  export NPM_REGISTRY="$DEFAULT_NPM_REGISTRY"
+if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
+  export NPM_REGISTRY=$DEFAULT_NPM_REGISTRY
 fi
 
-PUBLISH_ARGS="--no-git-tag-version --access public --registry ${NPM_REGISTRY:-$DEFAULT_NPM_REGISTRY}"
+PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY"
 
-# --------------------------
-# 解析 TAG
-# --------------------------
-if [[ "$TAG" =~ ^([a-zA-Z-]+)-pkg-v(.+)$ ]]; then
-  PKG_NAME="${BASH_REMATCH[1]}"
-  PKG_V="${BASH_REMATCH[2]}"
-else
-  echo "TAG format invalid: $TAG. Must be like 'shell-pkg-v3.0.2-rc.105'"
-  exit 1
-fi
+pushd ${CLOUD_SHELL_DIR} >/dev/null
 
-echo "PKG_NAME=${PKG_NAME}"
-echo "PKG_V=${PKG_V}"
-
-# --------------------------
-# publish 函数
-# --------------------------
-publish() {
-  local NAME="$1"
-  local FOLDER="$2"
-  local VERSION="${3:-$PKG_V}"
-
-  if [[ "${DRY_RUN:-false}" == "true" ]]; then
-    local ARGS="$PUBLISH_ARGS --dry-run"
-  else
-    local ARGS="$PUBLISH_ARGS"
+function publish() {
+  NAME=$1
+  FOLDER=$2
+
+  if [ -n "$3" ]; then
+    PKG_VERSION=$3
+  fi
+
+  if [ ${DRY_RUN} == "true" ]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --dry-run"
   fi
 
-  echo "Publish to NPM - arguments ::: ${ARGS}"
-  echo "Publishing ${NAME} version ${VERSION} from ${FOLDER}"
+  echo "Publish to NPM - arguments ::: ${PUBLISH_ARGS}"
 
-  pushd "$FOLDER" >/dev/null || exit 1
+  echo "Publishing ${NAME} from ${FOLDER}"
+  pushd ${FOLDER} >/dev/null
 
-  # 复制 rancher-components
-  if [[ "$NAME" == "Shell" ]]; then
+  # For now, copy the rancher components into the shell and ship them with it
+  if [ "$NAME" == "Cloud Shell" ]; then
     echo "Adding Rancher Components"
     rm -rf ./rancher-components
-    cp -R "$BASE_DIR/pkg/rancher-components/src/components" ./rancher-components/
+    cp -R ${BASE_DIR}/pkg/rancher-components/src/components ./rancher-components/
   fi
 
-  # 记录依赖
-  node "$SCRIPT_DIR/record-deps.js" || {
-    echo "record-deps.js failed"
-    popd >/dev/null
-    exit 1
-  }
+  node ${SCRIPT_DIR}/record-deps.js
 
-  # NPM 发布
-  echo "Publishing to registry: ${NPM_REGISTRY:-$DEFAULT_NPM_REGISTRY}"
-  npm publish $ARGS || {
-    echo "Error publishing package ${NAME}"
-    popd >/dev/null
-    exit 1
-  }
+  echo "Publishing to registry: $NPM_REGISTRY"
+
+  npm publish ${PUBLISH_ARGS}
+  RET=$?
 
   popd >/dev/null
+
+  if [ $RET -ne 0 ]; then
+    echo "Error publishing package ${NAME}"
+    exit $RET
+  fi
 }
 
-# --------------------------
-# 生成 TypeScript 类型
-# --------------------------
-if [[ "$PKG_NAME" == "shell" ]]; then
-  echo "Generating TypeScript definitions..."
-  bash "$SCRIPT_DIR/typegen.sh" || { echo "Type generation failed"; exit 1; }
+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 "PKG_NAME ${PKG_NAME}"
+echo "PKG_V ${PKG_V}"
+
+# Generate the type definitions for the cloud-shell
+if [ ${PKG_NAME} == "cloud-shell" ]; then
+  ${SCRIPT_DIR}/typegen.sh
 fi
 
-# --------------------------
-# 根据 TAG 发布
-# --------------------------
-case "$PKG_NAME" in
-  "shell")
-    echo "Publishing only Shell pkg via tagged release"
-    publish "Shell" "$SHELL_DIR" "$PKG_V"
+# version comparison checks
+case $PKG_NAME in
+  "cloud-shell")
+    echo "Publishing only Cloud Shell pkg via tagged release"
+    publish "Cloud Shell" ${CLOUD_SHELL_DIR} ${PKG_V}
     ;;
   "creators")
     echo "Publishing only Creators pkg via tagged release"
-    publish "Extension creator" "$CREATORS_DIR" "$PKG_V"
+    publish "Extension creator" ${CREATORS_DIR} ${PKG_V}
     ;;
   *)
-    echo "Something went wrong with the tagging name => TAG: ${TAG}, PKG_NAME: ${PKG_NAME}. Admissible names are 'shell' and 'creators'"
+    echo "something went wrong with the tagging name => TAG: ${TAG} , PKG_NAME: ${PKG_NAME}. Admissable names are 'cloud-shell' and 'creators'"
     exit 1
     ;;
 esac

package/scripts/typegen.sh

@@ -2,69 +2,53 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$(git rev-parse --show-toplevel)"
-SHELL_DIR=$BASE_DIR/shell
+CLOUD_SHELL_DIR=$BASE_DIR/cloud-shell
 
-echo "Generating typescript definitions"
+echo "Generating typescript definitions in ${CLOUD_SHELL_DIR}"
 
-rm -rf ${SHELL_DIR}/tmp
-mkdir -p ${SHELL_DIR}/tmp
+# 清理 tmp 并创建目录
+rm -rf ${CLOUD_SHELL_DIR}/tmp
+mkdir -p ${CLOUD_SHELL_DIR}/tmp
 
 echo "Generating ..."
 
 # utils
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/utils/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/utils > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/utils/validators/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/utils/validators > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/utils/crypto/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/utils/crypto > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/utils/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/utils > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/utils/validators/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/utils/validators > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/utils/crypto/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/utils/crypto > /dev/null
 
 # config
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/query-params.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/table-headers.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/types.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/labels-annotations.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/version.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/config > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/config/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/config > /dev/null
 
-# # store
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/features.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/prefs.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/plugins.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
+# store
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/store > /dev/null
 
-# # plugins
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/actions.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/steve-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/hybrid-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
+# plugins
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/plugins/steve/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/plugins/steve/ > /dev/null
 
-# # mixins
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
+# mixins
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/mixins/**/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/mixins > /dev/null
 
-# # models
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/networking.k8s.io.ingress.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
-${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/catalog.cattle.io.clusterrepo.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
+# models
+${BASE_DIR}/node_modules/.bin/tsc ${CLOUD_SHELL_DIR}/models/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${CLOUD_SHELL_DIR}/tmp/models/ > /dev/null
 
-#./node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store
-
-# Go through all of the folders and combine by wrapping with 'declare module'
-
-echo "Contents of ${SHELL_DIR}/tmp after tsc commands:"
-find ${SHELL_DIR}/tmp
+echo "Contents of ${CLOUD_SHELL_DIR}/tmp after tsc commands:"
+find ${CLOUD_SHELL_DIR}/tmp
 
 echo "Combining type definitions ..."
 
-DEST=${SHELL_DIR}/types/shell
+DEST=${CLOUD_SHELL_DIR}/types/cloud-shell
 mkdir -p ${DEST}
 
 INDEX=${DEST}/index.d.ts
 rm -rf ${INDEX}
 
-echo "// Auto-generated type definitions for shell" > ${INDEX}
+echo "// Auto-generated type definitions for cloud-shell" > ${INDEX}
 echo "// Do not modify this file as changes will get overwritten" >> ${INDEX}
 
-echo "/// <reference types=\"@rancher/shell/types/vue-shim\" />" >> ${INDEX}
-echo "/// <reference types=\"@rancher/shell/types/global-vue\" />" >> ${INDEX}
+echo "/// <reference types=\"@rancher/cloud-shell/types/vue-shim\" />" >> ${INDEX}
+echo "/// <reference types=\"@rancher/cloud-shell/types/global-vue\" />" >> ${INDEX}
 
 function processDir() {
   local dir=$1
@@ -78,9 +62,7 @@ function processDir() {
       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}
@@ -95,6 +77,8 @@ function processDir() {
   done
 }
 
-processDir ${SHELL_DIR}/tmp @shell
+processDir ${CLOUD_SHELL_DIR}/tmp @cloud-shell
+
+rm -rf ${CLOUD_SHELL_DIR}/tmp
 
-rm -rf ${SHELL_DIR}/tmp
+echo "Type generation completed in ${CLOUD_SHELL_DIR}"

package/store/i18n.js

@@ -1,12 +1,12 @@
 import merge from 'lodash/merge';
 import IntlMessageFormat from 'intl-messageformat';
 import { get } from '@shell/utils/object';
-import en from '@shell/assets/translations/en-us.yaml';
+import zh from '@shell/assets/translations/zh-hans.yaml';
 import { getProduct, getVendor, DOCS_BASE } from '@shell/config/private-label';
 import { loadTranslation } from '@shell/utils/dynamic-importer';
 
 const NONE = 'none';
-const DEFAULT_LOCALE = 'en-us';
+const DEFAULT_LOCALE = 'zh-hans';
 
 // Formatters can't be serialized into state
 const intlCache = {};
@@ -18,14 +18,14 @@ export const state = function() {
   // const available = translationContext.keys().map(path => path.replace(/^.*\/([^\/]+)\.[^.]+$/, '$1'));
   // Using require.context() forces them to all be in the same webpack chunk name... just hardcode the list for now so zh-hans
   // gets generated as it's own chunk instead of being loaded all the time.
-  const available = ['zh-hans', DEFAULT_LOCALE ];
+  const available = [DEFAULT_LOCALE, 'zh-hans'];
 
   const out = {
     default:      DEFAULT_LOCALE,
     selected:     null,
     previous:     null,
     available,
-    translations: { [DEFAULT_LOCALE]: en },
+    translations: { [DEFAULT_LOCALE]: zh },
   };
 
   return out;
@@ -229,7 +229,7 @@ export const actions = {
     const exists = !!state.available.find((loc) => loc === selected);
 
     if ( !selected || !exists) {
-      selected = 'zh-hans';
+      selected = state.default;
     }
 
     return dispatch('switchTo', selected);

package/store/prefs.js

@@ -57,16 +57,14 @@ export const PINNED_CLUSTERS = create('pinned-clusters', [], { parseJSON });
 export const GROUP_RESOURCES = create('group-by', 'namespace');
 export const DIFF = create('diff', 'unified', { options: ['unified', 'split'] });
 export const THEME = create('theme', 'auto', {
-  // options:     ['light', 'auto', 'dark'],
-  options:     ['light'],
+  options:     ['light', 'auto', 'dark'],
   asCookie,
   parseJSON,
   mangleRead:  (x) => x.replace(/^ui-/, ''),
-  // mangleWrite: (x) => `ui-${ x }`,
-  mangleWrite: (x) => `ui-light`, // 接口同时修改为 白色
+  mangleWrite: (x) => `ui-${ x }`,
 });
 export const PREFERS_SCHEME = create('pcs', '', { asCookie, asUserPreference: false });
-export const LOCALE = create('locale', 'zh-hans', { asCookie });
+export const LOCALE = create('locale', 'en-us', { asCookie });
 export const KEYMAP = create('keymap', 'sublime', { options: ['sublime', 'emacs', 'vim'] });
 export const ROWS_PER_PAGE = create('per-page', 100, { options: [10, 25, 50, 100], parseJSON });
 export const LOGS_WRAP = create('logs-wrap', true, { parseJSON });
@@ -105,10 +103,7 @@ export const THEME_SHORTCUT = create('theme-shortcut', false, { parseJSON, inher
 export const LAST_VISITED = create('last-visited', 'home', { parseJSON });
 export const SEEN_WHATS_NEW = create('seen-whatsnew', '', { parseJSON });
 export const READ_WHATS_NEW = create('read-whatsnew', '', { parseJSON });
-export const AFTER_LOGIN_ROUTE = create('after-login-route', 'home', {
-  parseJSON,
-  // mangleWrite: (x) => `ui-light`, // 接口同时修改为 白色
-} );
+export const AFTER_LOGIN_ROUTE = create('after-login-route', 'home', { parseJSON } );
 export const HIDE_HOME_PAGE_CARDS = create('home-page-cards', {}, { parseJSON } );
 export const PLUGIN_DEVELOPER = create('plugin-developer', false, { parseJSON, inheritFrom: DEV }); // Is the user a plugin developer?
 
@@ -154,11 +149,6 @@ export const getters = {
     }
 
     const def = clone(definition.def);
-    
-    if (key === THEME) {
-      // 无论 state 里存的是什么，都强制返回 light
-      return 'light';
-    }
 
     return def;
   },
@@ -481,9 +471,7 @@ export const actions = {
         try {
           value = JSON.parse(value);
         } catch (err) {
-          // 容错处理：如果后端返回 map[...] 这样的字符串，直接忽略或重置为空
-          console.warn(`Pref ${ key } has invalid JSON, resetting`, value);
-          value = definition.defaultValue || null;
+          console.error('Error parsing server pref', key, value, err); // eslint-disable-line no-console
           continue;
         }
       }

package/store/type-map.js

@@ -513,7 +513,7 @@ export const getters = {
   
   groupsForVirTypes(state) {
     return (product, name) => {
-      return state.virtualTypes?.[product]?.find(item => item.name === name)?.icon || '';
+      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
     };
   },
 
@@ -718,7 +718,6 @@ export const getters = {
           route.params = route.params || {};
           route.params.cluster = clusterId;
           route.params.product = productId;
-          route.params.resource = route.params.resource;
         }
 
         group.children.push({