dashboard-shell-shell 1.0.122 → 1.0.1000000082

package/utils/router.js

@@ -1,5 +1,26 @@
 import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
 
+export function harvesterhci2cloud(str) {
+    return str?.replace('harvesterhci.io', 'cloudhci.io')
+}
+
+export function cloud2harvesterhci(str) {
+  // console.log('00099', str)
+  // const regex = /[a-z]+cloud.io.(.+)/;
+  // if (str?.match(regex)) {
+  //   return str;
+  // }
+  return str?.replace('cloudhci.io', 'harvesterhci.io')
+}
+
+export function harvester2cloud(str) {
+    return str?.replace('harvester', 'cloud')
+}
+
+export function cloud2harvester(str) {
+    return str?.replace('cloud', 'harvester')
+}
+
 export function queryParamsFor(current, qp, defaults = {}) {
   const query = Object.assign({}, current || {});
 
@@ -68,7 +89,7 @@ export const getPackageFromRoute = (route) => {
 };
 
 export const getResourceFromRoute = (to) => {
-  let resource = to.params?.resource;
+  let resource = cloud2harvesterhci(to.params?.resource);
 
   if (!resource) {
     resource = findMeta(to, 'resource');

package/utils/select.js

@@ -26,8 +26,19 @@ export function onClickOption(option, e) {
 // This is a simpler positionner for the dropdown for a select control
 // We used to use popper for these, but it does not suppotr fractional pixel placements which
 // means the dropdown does not appear aligned to the control when placed in a column-based layout
-export function calculatePosition(dropdownList, component, width, placement) {
+export function calculatePosition(dropdownList, component, width, placement, type, isLabel,leftWidth) {
   const selectEl = component.$parent.$el;
+ 
+  const labeledContainer = selectEl.querySelector('.labeled-container');
+  let labelWidth=0
+  if (labeledContainer) {
+    labelWidth= labeledContainer.offsetWidth;
+  } else {
+    console.warn("未找到类名为 labeled-container 的元素");
+  }
+
+
+  
   const r = selectEl.getBoundingClientRect();
   const p = placement || 'bottom-start';
   const docHeight = document.body.offsetHeight;
@@ -59,7 +70,19 @@ export function calculatePosition(dropdownList, component, width, placement) {
     selectEl.classList.remove('vs__dropdown-up');
   }
 
-  dropdownList.style.left = `${ r.x }px`;
+  // dropdownList.style.left = `${ r.x }px`;
   dropdownList.style.width = 'min-content';
-  dropdownList.style.minWidth = `${ r.width }px`;
+  // const s  = type === 'label'?   `${ r.x }px` :`${ r.x + Number(type.split("px")[0]) }px`
+  dropdownList.style.left = ((type === 'label') && (!isLabel)) ? `${ (r.x) + labelWidth }px` : `${ r.x + (typeof type === 'string' ? parseFloat(type) : 0) }px`;
+  // dropdownList.style.minWidth = type === 'label' ? `${ (r.width) - 160 }px` : `${ r.width }px`;
+  console.log(type);
+  console.log( r.width);
+  if(leftWidth!=='') {
+    dropdownList.style.left = leftWidth
+  }
+  const SelectContainer = selectEl.querySelector('.labeled-select');
+  
+  
+  // dropdownList.style.width = type === 'label' ? '400px' : `${ r.width }px`;
+  dropdownList.style.width = type === 'label' ? `${SelectContainer.offsetWidth}px` : `${ r.width- (typeof type === 'string' ? parseFloat(type) : 0) }px`;
 }

package/utils/string.js

@@ -1,3 +1,5 @@
+import { translateError } from "@shell/utils/error";
+
 export function camelToTitle(str) {
   return dasherize((str || '')).split('-').map((str) => {
     return ucFirst(str);
@@ -151,11 +153,9 @@ export function pluralize(str) {
   }
 }
 
-export function resourceNames(names, t, options = {}) {
+export function resourceNames(names, plusMore, t, endString) {
   const MAX_NAMES_COUNT = 5;
 
-  let { plusMore, endString } = options;
-
   // plusMore default value
   if (!plusMore) {
     plusMore = t('promptRemove.andOthers', { count: names.length > MAX_NAMES_COUNT ? names.length - MAX_NAMES_COUNT : 0 });
@@ -163,19 +163,19 @@ export function resourceNames(names, t, options = {}) {
 
   // endString default value
   if (!endString) {
-    endString = endString === false ? ' ' : '.';
+    endString = endString === false ? ' ' : '？';
   }
 
   return names.reduce((res, name, i) => {
     if (i < MAX_NAMES_COUNT) {
-      res += `<b>${ escapeHtml( name ) }</b>`;
+      res += `<span>${ escapeHtml( name ) }</span>`;
 
       if (i === names.length - 1) {
         res += endString;
       } else if (i === names.length - 2) {
-        res += names.length <= 5 ? t('generic.and') : '';
+        res += names.length <= 5 ? ' 和 ' : '';
       } else {
-        res += i < MAX_NAMES_COUNT - 1 ? t('generic.comma') : '';
+        res += i < MAX_NAMES_COUNT - 1 ? ' , ' : '';
       }
     }
 
@@ -284,7 +284,8 @@ export function ensureRegex(strOrRegex, exact = true) {
 }
 
 export function nlToBr(value) {
-  return escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n');
+  
+  return translateError(escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n'));
 }
 
 const quotedMatch = /[^."']+|"([^"]*)"|'([^']*)'/g;

package/utils/title.ts

@@ -1,3 +1,3 @@
 export function updatePageTitle(...breadcrumb: (string | null | undefined | false)[]): void {
-  document.title = breadcrumb.filter((s) => s).join(' - ');
+  document.title = breadcrumb.filter((s) => s).join(' - ').replace(/<i[^>]*>|<\/i>/g, '').replace('Harvester', 'HCI');
 }

package/utils/validators/machine-pool.ts

@@ -0,0 +1,20 @@
+const FIELDS = {
+  NAME:     'pool.name',
+  QUANTITY: 'pool.quantity'
+};
+
+const RULESETS = [
+  {
+    path:  FIELDS.QUANTITY,
+    rules: ['requiredInt', 'isPositive'],
+  },
+  {
+    path:  FIELDS.NAME,
+    rules: ['required'],
+  }
+];
+
+export const MACHINE_POOL_VALIDATION = {
+  FIELDS,
+  RULESETS
+};

package/vue.config.js

@@ -58,6 +58,11 @@ const getShellPaths = (dir) => {
     COMPONENTS_DIR = path.join(dir, 'pkg', 'rancher-components', 'src', 'components');
   }
 
+   if (fs.existsSync(path.join(dir, 'cloud-shell'))) {
+    SHELL_ABS = path.join(dir, 'cloud-shell');
+    COMPONENTS_DIR = path.join(dir, 'pkg', 'rancher-components', 'src', 'components');
+  }
+
   return { SHELL_ABS, COMPONENTS_DIR };
 };
 
@@ -157,7 +162,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',
@@ -574,4 +579,4 @@ module.exports = function(dir, appConfig = {}) {
   };
 
   return config;
-};
+};

package/components/formatter/ExtensionCache.vue

@@ -1,74 +0,0 @@
-<script>
-import { BadgeState } from '@components/BadgeState';
-import { stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
-
-export default {
-  props: {
-    value: {
-      type:    String,
-      default: ''
-    }
-  },
-
-  components: { BadgeState },
-
-  data() {
-    const STATES = {
-      cached: {
-        color: 'info', icon: 'dot-open', label: 'Cached', compoundIcon: 'checkmark'
-      },
-      pending: {
-        color: 'warning', icon: 'tag', label: 'In Progress', compoundIcon: 'info'
-      },
-      disabled: {
-        color: 'error', icon: 'dot-half', label: 'Cache Disabled', compoundIcon: 'info'
-      },
-    };
-
-    return {
-      STATES,
-      stateDisplay:    '',
-      stateBackground: ''
-    };
-  },
-
-  watch: {
-    value: {
-      handler() {
-        const out = this.value || 'pending';
-        const color = this.colorForState(out);
-
-        this.stateDisplay = stateDisplay(out);
-        this.stateBackground = color.replace('text-', 'bg-');
-      },
-      immediate: true
-    }
-  },
-
-  methods: {
-    colorForState(state) {
-      const key = (state).toLowerCase();
-      let color;
-
-      if ( this.STATES[key] && this.STATES[key].color ) {
-        color = this.STATES[key].color;
-      }
-
-      if ( !color ) {
-        color = 'info';
-      }
-
-      return `text-${ color }`;
-    }
-  }
-};
-</script>
-
-<template>
-  <div>
-    <BadgeState
-      :color="stateBackground"
-      :label="stateDisplay"
-    />
-  </div>
-</template>

package/components/formatter/Port.vue

@@ -1,24 +0,0 @@
-<script>
-export default {
-  props: {
-    value: {
-      type:    Array,
-      default: () => []
-    }
-  },
-  data() {
-    const { hostPort = '', protocol = '' } = this.value[0] || {};
-
-    return { hostPort, protocol };
-  }
-};
-</script>
-
-<template>
-  <div v-if="hostPort">
-    {{ hostPort+'/'+protocol }}
-  </div>
-  <div v-else>
-    —
-  </div>
-</template>

package/components/formatter/SecretType.vue

@@ -1,41 +0,0 @@
-<script>
-import { SERVICE_ACCOUNT } from '@shell/config/types';
-export default {
-  props: {
-    value: {
-      type:    [String, Object],
-      default: 'Opaque'
-    }
-  },
-  data() {
-    if (this.value.typeDisplay) {
-      this.findServiceAccount();
-
-      return { typeDisplay: this.value.typeDisplay, serviceAccountLink: null };
-    }
-
-    return { typeDisplay: this.value, serviceAccountLink: null };
-  },
-  methods: {
-    async findServiceAccount() {
-      const serviceAccount = await this.$store.dispatch('cluster/find', { type: SERVICE_ACCOUNT, id: this.value.serviceAccountID });
-
-      if (serviceAccount) {
-        this.serviceAccountLink = serviceAccount.detailLocation;
-      }
-    }
-  }
-};
-</script>>
-
-<template>
-  <router-link
-    v-if="serviceAccountLink"
-    :to="serviceAccountLink"
-  >
-    {{ typeDisplay }}
-  </router-link>
-  <div v-else>
-    {{ typeDisplay }}
-  </div>
-</template>

package/types/resources/fleet.d.ts

@@ -1,57 +0,0 @@
-export interface BundleResourceKey {
-  kind: string,
-  apiVersion: string,
-  namespace?: string,
-  name: string,
-}
-
-export interface BundleDeploymentResource extends BundleResourceKey {
-  createdAt?: string,
-}
-
-export interface BundleModifiedResource extends BundleResourceKey {
-  missing?: boolean,
-  delete?: boolean,
-  patch: string,
-}
-
-export interface BundleNonReadyResource extends BundleResourceKey {
-  summary: { [state: string]: string }
-}
-
-export interface BundleNonReadyBundle {
-  modifiedStatus: BundleModifiedResource[],
-  nonReadyStatus: BundleNonReadyResource[],
-}
-
-export interface Condition {
-  status: string,
-  type: string,
-}
-
-export interface BundleDeploymentStatus {
-  resources?: BundleDeploymentResource[],
-  modifiedStatus?: BundleModifiedResource[],
-  nonReadyStatus?: BundleNonReadyResource[],
-  appliedDeploymentId?: string,
-  ready: boolean
-  nonModified: boolean
-  conditions: Condition[],
-}
-
-export interface BundleStatusSummary {
-  nonReadyResources?: BundleNonReadyBundle[],
-}
-
-export interface BundleStatus {
-  resourceKey?: BundleResourceKey[],
-  summary?: BundleStatusSummary,
-}
-
-export interface BundleDeployment {
-  spec: {
-    deploymentId: string,
-    stagedDeploymentId: string,
-  }
-  status?: BundleDeploymentStatus
-}

package/types/resources/pod-security-admission.ts

@@ -1,36 +0,0 @@
-/**
- * Mode Description
- * - 'enforce': Policy violations will cause the pod to be rejected.
- * - 'audit':   Policy violations will trigger the addition of an audit annotation to the event recorded in the audit log, but are otherwise allowed.
- * - 'warn':    Policy violations will trigger a user-facing warning, but are otherwise allowed.
- */
-export type PSAMode = 'enforce' | 'audit' | 'warn';
-
-/**
- * Pod Security admission places requirements on a Pod's Security Context and other related fields according to the three levels defined by the Pod Security Standards:
- * privileged, baseline, and restricted.
- * Refer to the Pod Security Standards page for an in-depth look at those requirements.
- */
-export type PSALevel = 'privileged' | 'baseline' | 'restricted';
-
-/**
- * Usernames:         requests from users with an exempt authenticated (or impersonated) username are ignored.
- * RuntimeClassNames: pods and workload resources specifying an exempt runtime class name are ignored.
- * Namespaces:        pods and workload resources in an exempt namespace are ignored.
- */
-export type PSADimension = 'usernames' | 'runtimeClasses' | 'namespaces'
-
-export type PSADefaults = Record<PSAMode, PSALevel>
-export type PSAExemptions = Record<PSADimension, string[]>
-
-export interface PSAConfig {
-  defaults: PSADefaults,
-  exemptions: PSAExemptions
-}
-
-export interface PSA {
-  configuration: PSAConfig,
-  metadata: {
-    labels: Record<string, string>
-  }
-}

package/types/resources/settings.d.ts

@@ -1,93 +0,0 @@
-
-export interface PaginationSettingsStore {
-  [name: string]: {
-    resources: {
-      /**
-       * Enable for all resources in this store
-       */
-      enableAll: boolean,
-      enableSome: {
-        /**
-         * Specific resource type to enable
-         */
-        enabled: (string | { resource: string, context: string[]})[],
-        /**
-         * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
-         */
-        generic: boolean,
-      },
-    }
-  }
-}
-
-/**
- * Settings to handle server side pagination
- */
-export interface PaginationSettings {
-  /**
-   * Global setting to enable or disable
-   */
-  enabled: boolean,
-  /**
-   * Override `stores` and apply pagination to a set of default resource types that can change between versions
-   */
-  useDefaultStores: boolean,
-  /**
-   * Should pagination be enabled for resources in a store
-   */
-  stores: PaginationSettingsStore | undefined
-}
-
-type Links = {
-  remove: string;
-  self: string;
-  update: string;
-  view: string;
-};
-
-type FieldsV1 = {
-  'f:customized': {};
-  'f:default': {};
-  'f:source': {};
-  'f:value': {};
-};
-
-type ManagedFields = {
-  apiVersion: string;
-  fieldsType: string;
-  fieldsV1: FieldsV1;
-  manager: string;
-  operation: string;
-  time: string;
-};
-
-type Metadata = {
-  creationTimestamp: string;
-  fields: string[];
-  generation: number;
-  managedFields: ManagedFields[];
-  name: string;
-  relationships: null;
-  resourceVersion: string;
-  state: {
-    error: boolean;
-    message: string;
-    name: string;
-    transitioning: boolean;
-  };
-  uid: string;
-};
-
-export type Setting = {
-  id: string;
-  type: string;
-  links: Links;
-  apiVersion: string;
-  customized: boolean;
-  default: string;
-  kind: string;
-  metadata: Metadata;
-  source: string;
-  value: string | null;
-  save: () => void;
-};

package/types/resources/userPreferences.d.ts

@@ -1,13 +0,0 @@
-export interface UserPreferences {
-  'after-login-route': string,
-  cluster: string,
-  'group-by': string,
-  'home-page-cards': string,
-  'last-namespace': string,
-  'last-visited': string,
-  'ns-by-cluster': string,
-  provisioner: string,
-  'read-whatsnew': string,
-  'seen-whatsnew': string,
-  theme: string,
-}

package/types/vue-shim.d

@@ -1,20 +0,0 @@
-declare module '*.vue' {
-  import Vue from 'vue';
-  export default Vue;
-}
-
-// This is required to keep typescript from complaining. It is required for
-// our i18n plugin. For more info see:
-// https://v2.vuejs.org/v2/guide/typescript.html?redirect=true#Augmenting-Types-for-Use-with-Plugins
-declare module 'vue/types/vue' {
-  // eslint-disable-next-line no-unused-vars
-  interface Vue {
-      /**
-       * Lookup a given string with the given arguments
-       * @param raw if set, do not do HTML escaping.
-       */
-      t: (key: string, args?: Record<string, any>, raw?: boolean) => string,
-  }
-}
-
-declare module 'js-yaml';