dashboard-shell-shell 3.0.5-test.5 → 3.0.5-test.6

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -11,8 +11,6 @@ import IconOrSvg from '@shell/components/IconOrSvg';
 withDefaults(defineProps<RcDropdownMenuComponentProps>(), {
   buttonRole: 'primary',
   buttonSize: undefined,
-  isDetail: false,
-  showIcon: false
 });
 
 const emit = defineEmits(['update:open', 'select']);
@@ -33,10 +31,7 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-    <div v-if="showIcon">
-      <i data-v-5db2c2c7="" class="icon icon-actions" alt="More actions icon"></i>
-    </div>
-    <a v-else href="javascript:;">操作</a>
+      <i class="icon icon-actions" />
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template
@@ -47,7 +42,7 @@ const hasOptions = (options: DropdownOption[]) => {
           v-if="!a.divider"
           @click="(e: MouseEvent) => emit('select', e, a)"
         >
-          <!-- <template #before>
+          <template #before>
             <IconOrSvg
               v-if="a.icon || a.svg"
               :icon="a.icon"
@@ -55,19 +50,18 @@ const hasOptions = (options: DropdownOption[]) => {
               class="icon"
               color="header"
             />
-          </template> -->
+          </template>
           {{ a.label }}
         </rc-dropdown-item>
-        <!-- <rc-dropdown-separator
+        <rc-dropdown-separator
           v-else
-        /> -->
+        />
       </template>
       <rc-dropdown-item
         v-if="!hasOptions(options)"
         disabled
       >
-        <!-- No actions available -->
-         暂无可执行的操作。
+        No actions available
       </rc-dropdown-item>
     </template>
   </rc-dropdown>

package/rancher-components/RcDropdown/types.ts

@@ -46,5 +46,4 @@ export type RcDropdownMenuComponentProps = {
   buttonAriaLabel?: string;
   dropdownAriaLabel?: string;
   dataTestid?: string;
-  showIcon?: Boolean;
 }

package/rancher-components/StringList/StringList.vue

@@ -633,7 +633,7 @@ export default defineComponent({
 }
 
 :deep() {
-  // .labeled-input INPUT.no-label,
+  .labeled-input INPUT.no-label,
   .labeled-input INPUT:hover.no-label,
   .labeled-input INPUT:focus.no-label {
     padding: 1px 0px 0px 0px;

package/static/loading-indicator.html

@@ -15,14 +15,14 @@
   animation: initial-load-animate 1s infinite linear;
   background-color: transparent;
   box-sizing: border-box;
-  border: 5px solid #1890FF;
+  border: 5px solid #008ACF;
   border-radius: 50%;
-  border-top-color: transparent;
+  border-top-color: #00B2E2;
   display: inline-block;
   height: 80px;
   margin: 0 auto;
   width: 80px;
-}}
+}
 
 @keyframes initial-load-animate {
   0% {

package/store/i18n.js

@@ -18,7 +18,7 @@ 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,
@@ -229,11 +229,8 @@ export const actions = {
     const exists = !!state.available.find((loc) => loc === selected);
 
     if ( !selected || !exists) {
-      selected = 'zh-hans';
+      selected = state.default;
     }
-    
-    // selected = 'none'
-    selected = 'zh-hans'
 
     return dispatch('switchTo', selected);
   },

package/store/modal.ts

@@ -17,7 +17,7 @@ const state = (): ModalState => ({
   componentProps:      {},
   resources:           [],
   closeOnClickOutside: false,
-  modalWidth:          '610px',
+  modalWidth:          '600px',
   modalSticky:         false
 });
 
@@ -45,7 +45,7 @@ const mutations: MutationTree<ModalState> = {
     state.componentProps = payload.componentProps || {};
     state.resources = Array.isArray(payload.resources) ? payload.resources : (payload.resources ? [payload.resources] : []);
     state.closeOnClickOutside = payload.closeOnClickOutside ?? false;
-    state.modalWidth = payload.modalWidth || '610px';
+    state.modalWidth = payload.modalWidth || '600px';
     state.modalSticky = payload.modalSticky ?? false;
   },
 
@@ -55,7 +55,7 @@ const mutations: MutationTree<ModalState> = {
     state.componentProps = {};
     state.resources = [];
     state.closeOnClickOutside = false;
-    state.modalWidth = '610px';
+    state.modalWidth = '600px';
     state.modalSticky = false;
   }
 };

package/store/prefs.js

@@ -57,14 +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'],
+  options:     ['light', 'auto', 'dark'],
   asCookie,
   parseJSON,
   mangleRead:  (x) => x.replace(/^ui-/, ''),
-  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 });
@@ -149,11 +149,6 @@ export const getters = {
 
     const def = clone(definition.def);
 
-    if (key === THEME) {
-      // 无论 state 里存的是什么，都强制返回 light
-      return 'light';
-    }
-
     return def;
   },
 
@@ -475,9 +470,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

@@ -395,7 +395,6 @@ export function productsLoaded() {
 
 export const state = function() {
   return {
-    actionsWidth:            0,
     products:                [],
     virtualTypes:            {},
     spoofedTypes:            {},
@@ -465,8 +464,6 @@ export const getters = {
     };
   },
 
-  actionsWidth: (state) => state.actionsWidth,
-
   // Turns a group name into a display label (e.g. management.cattle.io.v3.cluster -> Cluster)
   groupLabelFor(state) {
     return (schemaOrName) => {
@@ -512,12 +509,6 @@ export const getters = {
       return state.basicTypes?.[product]?.[schemaId];
     };
   },
-  
-  groupsForVirTypes(state) {
-    return (product, name) => {
-      return state.virtualTypes?.[product].find(item => item.name === name)?.icon;
-    };
-  },
 
   optionsFor(state, getters, rootState, rootGetters) {
     const def = {
@@ -670,18 +661,7 @@ export const getters = {
 
         const label = typeObj.labelKey ? rootGetters['i18n/t'](typeObj.labelKey) || typeObj.label : typeObj.label;
 
-        const virtual = !!typeObj.virtual;
-        let icon = typeObj.icon;
-
-        if ( (!virtual || typeObj.isSpoofed ) && !icon ) {
-          if ( namespaced ) {
-            icon = 'folder';
-          } else {
-            icon = 'globe';
-          }
-        }
-
-        let labelDisplay = highlightLabel(label, icon, count, typeObj.schema);
+        let labelDisplay = highlightLabel(label, count, typeObj.schema);
 
         // If we did not match on just the label, add the schema name and see if that matches
         if (!labelDisplay && typeObj.schema?.attributes) {
@@ -798,7 +778,7 @@ export const getters = {
         return group;
       }
 
-      function highlightLabel(original, icon, count, schema) {
+      function highlightLabel(original, count, schema) {
         let label = escapeHtml(original);
 
         if ( searchRegex ) {
@@ -822,12 +802,6 @@ export const getters = {
           }
         }
 
-        if ( icon ) {
-          console.log(icon)
-          label = `<i class="icon icon-fw icon-${ icon }"></i>${ label }`;
-          console.log(label)
-        }
-
         return label;
       }
     };
@@ -1497,10 +1471,6 @@ export const getters = {
 };
 
 export const mutations = {
-  setActionsWidth(state, width) {
-    state.actionsWidth = width
-  },
-
   schemaChanged(state) {
     state.schemaGeneration = state.schemaGeneration + 1;
   },

package/types/shell/index.d.ts

@@ -305,8 +305,6 @@ export namespace NAME {
     export { sort_3 as sort };
     let formatter_3: string;
     export { formatter_3 as formatter };
-    let width_2: number;
-    export { width_2 as width };
     let canBeVariable_1: boolean;
     export { canBeVariable_1 as canBeVariable };
 }
@@ -331,8 +329,8 @@ export namespace SIMPLE_NAME {
     export { value_5 as value };
     let sort_5: string[];
     export { sort_5 as sort };
-    let width_3: number;
-    export { width_3 as width };
+    let width_2: number;
+    export { width_2 as width };
     let canBeVariable_2: boolean;
     export { canBeVariable_2 as canBeVariable };
 }
@@ -537,8 +535,8 @@ export namespace CPU {
     export { value_21 as value };
     let formatter_11: string;
     export { formatter_11 as formatter };
-    let width_4: number;
-    export { width_4 as width };
+    let width_3: number;
+    export { width_3 as width };
 }
 export namespace RAM {
     let name_23: string;
@@ -553,8 +551,8 @@ export namespace RAM {
     export { value_22 as value };
     let formatter_12: string;
     export { formatter_12 as formatter };
-    let width_5: number;
-    export { width_5 as width };
+    let width_4: number;
+    export { width_4 as width };
 }
 export namespace PRINCIPAL {
     let name_24: string;
@@ -581,8 +579,8 @@ export namespace PODS {
     export { value_24 as value };
     let formatter_14: string;
     export { formatter_14 as formatter };
-    let width_6: number;
-    export { width_6 as width };
+    let width_5: number;
+    export { width_5 as width };
 }
 export namespace AGE {
     let name_26: string;
@@ -599,8 +597,8 @@ export namespace AGE {
     export { search_4 as search };
     let formatter_15: string;
     export { formatter_15 as formatter };
-    let width_7: number;
-    export { width_7 as width };
+    let width_6: number;
+    export { width_6 as width };
     let align_1: string;
     export { align_1 as align };
 }
@@ -637,8 +635,8 @@ export namespace DESCRIPTION {
     export { sort_28 as sort };
     let formatter_17: string;
     export { formatter_17 as formatter };
-    let width_8: number;
-    export { width_8 as width };
+    let width_7: number;
+    export { width_7 as width };
 }
 export namespace NS_SNAPSHOT_QUOTA {
     let name_29: string;
@@ -728,8 +726,8 @@ export namespace SCALE {
     export { sort_33 as sort };
     let formatter_23: string;
     export { formatter_23 as formatter };
-    let width_9: number;
-    export { width_9 as width };
+    let width_8: number;
+    export { width_8 as width };
     let align_4: string;
     export { align_4 as align };
 }
@@ -750,8 +748,8 @@ export namespace SUCCESS {
     export { labelKey_36 as labelKey };
     let value_36: string;
     export { value_36 as value };
-    let width_10: number;
-    export { width_10 as width };
+    let width_9: number;
+    export { width_9 as width };
     let align_5: string;
     export { align_5 as align };
 }
@@ -762,8 +760,8 @@ export namespace REQ_RATE {
     export { labelKey_37 as labelKey };
     let value_37: string;
     export { value_37 as value };
-    let width_11: number;
-    export { width_11 as width };
+    let width_10: number;
+    export { width_10 as width };
     let align_6: string;
     export { align_6 as align };
 }
@@ -774,8 +772,8 @@ export namespace P95 {
     export { labelKey_38 as labelKey };
     let value_38: string;
     export { value_38 as value };
-    let width_12: number;
-    export { width_12 as width };
+    let width_11: number;
+    export { width_11 as width };
     let align_7: string;
     export { align_7 as align };
 }
@@ -833,8 +831,8 @@ export namespace TARGET_KIND {
     export { labelKey_43 as labelKey };
     let value_43: string;
     export { value_43 as value };
-    let width_13: number;
-    export { width_13 as width };
+    let width_12: number;
+    export { width_12 as width };
 }
 export namespace TARGET {
     let name_44: string;
@@ -963,8 +961,8 @@ export namespace SIMPLE_TYPE {
     export { value_53 as value };
     let sort_45: string[];
     export { sort_45 as sort };
-    let width_14: number;
-    export { width_14 as width };
+    let width_13: number;
+    export { width_13 as width };
 }
 export namespace IMAGE_SIZE {
     let name_54: string;
@@ -989,8 +987,8 @@ export namespace TYPE {
     export { getValue_11 as getValue };
     let sort_47: string[];
     export { sort_47 as sort };
-    let width_15: number;
-    export { width_15 as width };
+    let width_14: number;
+    export { width_14 as width };
 }
 export namespace SUB_TYPE {
     let name_56: string;
@@ -1001,8 +999,8 @@ export namespace SUB_TYPE {
     export { value_56 as value };
     let sort_48: string[];
     export { sort_48 as sort };
-    let width_16: number;
-    export { width_16 as width };
+    let width_15: number;
+    export { width_15 as width };
 }
 export namespace EVENT_TYPE {
     let name_57: string;
@@ -1023,8 +1021,8 @@ export namespace STATUS {
     export { value_58 as value };
     let sort_50: string[];
     export { sort_50 as sort };
-    let width_17: number;
-    export { width_17 as width };
+    let width_16: number;
+    export { width_16 as width };
 }
 export namespace LAST_SEEN_TIME {
     let name_59: string;
@@ -1052,8 +1050,8 @@ export namespace LAST_HEARTBEAT_TIME {
     export { sort_52 as sort };
     let formatter_31: string;
     export { formatter_31 as formatter };
-    let width_18: number;
-    export { width_18 as width };
+    let width_17: number;
+    export { width_17 as width };
 }
 export namespace REASON {
     let name_61: string;
@@ -1222,8 +1220,8 @@ export namespace INGRESS_DEFAULT_BACKEND {
     export { sort_67 as sort };
     let formatter_37: string;
     export { formatter_37 as formatter };
-    let width_19: number;
-    export { width_19 as width };
+    let width_18: number;
+    export { width_18 as width };
     let align_10: string;
     export { align_10 as align };
 }
@@ -1306,8 +1304,8 @@ export namespace RESOURCES {
     export { value_82 as value };
     let sort_74: string;
     export { sort_74 as sort };
-    let width_20: number;
-    export { width_20 as width };
+    let width_19: number;
+    export { width_19 as width };
 }
 export namespace URL {
     let name_83: string;
@@ -1376,8 +1374,8 @@ export namespace WORKLOAD_HEALTH_SCALE {
     export { formatter_44 as formatter };
     export function getValue_13(): any;
     export { getValue_13 as getValue };
-    let width_21: number;
-    export { width_21 as width };
+    let width_20: number;
+    export { width_20 as width };
     export let skipSelect: boolean;
     let delayLoading_1: boolean;
     export { delayLoading_1 as delayLoading };
@@ -1401,8 +1399,8 @@ export namespace FLEET_SUMMARY {
     export { formatter_45 as formatter };
     let align_11: string;
     export { align_11 as align };
-    let width_22: number;
-    export { width_22 as width };
+    let width_21: number;
+    export { width_21 as width };
 }
 export namespace FLEET_APPLICATION_TYPE {
     let name_89: string;
@@ -1417,8 +1415,8 @@ export namespace FLEET_APPLICATION_TYPE {
     export { search_10 as search };
     let align_12: string;
     export { align_12 as align };
-    let width_23: number;
-    export { width_23 as width };
+    let width_22: number;
+    export { width_22 as width };
 }
 export namespace FLEET_APPLICATION_SOURCE {
     let name_90: string;
@@ -1473,8 +1471,8 @@ export namespace FLEET_APPLICATION_RESOURCES_SUMMARY {
     export { formatter_48 as formatter };
     let align_13: string;
     export { align_13 as align };
-    let width_24: number;
-    export { width_24 as width };
+    let width_23: number;
+    export { width_23 as width };
 }
 export namespace FLEET_REPO_CLUSTER_SUMMARY {
     let name_94: string;
@@ -1491,8 +1489,8 @@ export namespace FLEET_REPO_CLUSTER_SUMMARY {
     export { formatter_49 as formatter };
     let align_14: string;
     export { align_14 as align };
-    let width_25: number;
-    export { width_25 as width };
+    let width_24: number;
+    export { width_24 as width };
 }
 export namespace FLEET_REPO_PER_CLUSTER_STATE {
     let name_95: string;
@@ -1503,8 +1501,8 @@ export namespace FLEET_REPO_PER_CLUSTER_STATE {
     export { tooltip_3 as tooltip };
     let sort_85: string[];
     export { sort_85 as sort };
-    let width_26: number;
-    export { width_26 as width };
+    let width_25: number;
+    export { width_25 as width };
     let _default_2: string;
     export { _default_2 as default };
     let formatter_50: string;
@@ -1529,8 +1527,8 @@ export namespace APP_SUMMARY {
     export { formatter_51 as formatter };
     let align_15: string;
     export { align_15 as align };
-    let width_27: number;
-    export { width_27 as width };
+    let width_26: number;
+    export { width_26 as width };
 }
 export namespace CONSTRAINT_VIOLATION_CONSTRAINT_LINK {
     let name_97: string;
@@ -1687,8 +1685,8 @@ export namespace GROUP_NAME {
     export { search_18 as search };
     let formatter_58: string;
     export { formatter_58 as formatter };
-    let width_28: number;
-    export { width_28 as width };
+    let width_27: number;
+    export { width_27 as width };
 }
 export namespace GROUP_ROLE_NAME {
     let name_107: string;
@@ -1755,8 +1753,8 @@ export namespace ACCESS_KEY {
     export { align_16 as align };
     let sort_101: string[];
     export { sort_101 as sort };
-    let width_29: number;
-    export { width_29 as width };
+    let width_28: number;
+    export { width_28 as width };
 }
 export namespace SCOPE {
     let name_113: string;
@@ -1771,8 +1769,8 @@ export namespace SCOPE {
     export { align_17 as align };
     let sort_102: string[];
     export { sort_102 as sort };
-    let width_30: number;
-    export { width_30 as width };
+    let width_29: number;
+    export { width_29 as width };
 }
 export namespace SCOPE_NORMAN {
     let value_113: string;
@@ -1791,8 +1789,8 @@ export namespace EXPIRES {
     export { align_18 as align };
     let sort_104: string[];
     export { sort_104 as sort };
-    let width_31: number;
-    export { width_31 as width };
+    let width_30: number;
+    export { width_30 as width };
     let formatter_61: string;
     export { formatter_61 as formatter };
 }
@@ -1807,8 +1805,8 @@ export namespace LAST_USED {
     export { align_19 as align };
     let sort_105: string[];
     export { sort_105 as sort };
-    let width_32: number;
-    export { width_32 as width };
+    let width_31: number;
+    export { width_31 as width };
     let formatter_62: string;
     export { formatter_62 as formatter };
     export namespace formatterOpts_14 {
@@ -1827,8 +1825,8 @@ export namespace RESTART {
     export { sort_106 as sort };
     let formatter_63: string;
     export { formatter_63 as formatter };
-    let width_33: number;
-    export { width_33 as width };
+    let width_32: number;
+    export { width_32 as width };
     let align_20: string;
     export { align_20 as align };
 }
@@ -1867,8 +1865,8 @@ export namespace STATE_NORMAN {
     export { sort_108 as sort };
     let value_119: string;
     export { value_119 as value };
-    let width_34: number;
-    export { width_34 as width };
+    let width_33: number;
+    export { width_33 as width };
     let _default_3: string;
     export { _default_3 as default };
     let formatter_65: string;
@@ -4022,8 +4020,7 @@ export const EMBER_FRAME: "ember-iframe";
 
 declare module '@shell/utils/error' {
 export function stringify(err: any): any;
-export function exceptionToErrorsArray(err: any): any[];
-export function translateError(error: any): any;
+export function exceptionToErrorsArray(err: any): any;
 export class ClusterNotFoundError extends Error {
     static NAME: string;
     constructor(message: any);
@@ -4383,10 +4380,6 @@ export function setPromiseResult(promise: any, obj: any, key: any, label: any):
 // @shell/utils/router
 
 declare module '@shell/utils/router' {
-export function harvesterhci2cloud(str: any): any;
-export function cloud2harvesterhci(str: any): any;
-export function harvester2cloud(str: any): any;
-export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;
 export function getClusterFromRoute(to: any): any;
 export function getProductFromRoute(to: any): any;
@@ -4402,7 +4395,7 @@ export function routeRequiresInstallRedirect(to: any): boolean;
 
 declare module '@shell/utils/select' {
 export function onClickOption(option: any, e: any): void;
-export function calculatePosition(dropdownList: any, component: any, width: any, placement: any, type: any, isLabel: any, leftWidth: any): void;
+export function calculatePosition(dropdownList: any, component: any, width: any, placement: any): void;
 }
 
 // @shell/utils/selector
@@ -4616,7 +4609,7 @@ export function asciiLike(str: any): boolean;
 export function coerceStringTypeToScalarType(val: any, type: any): any;
 export function matchesSomeRegex(stringRaw: any, regexes?: any[]): boolean;
 export function ensureRegex(strOrRegex: any, exact?: boolean): any;
-export function nlToBr(value: any): any;
+export function nlToBr(value: any): string;
 export function splitObjectPath(path: any): any;
 export function joinObjectPath(ary: any): string;
 export function shortenedImage(image: any): any;