dashboard-shell-shell 3.0.5-logtest.2 → 3.0.5-natTest.1

package/assets/translations/en-us.yaml

@@ -6477,6 +6477,7 @@ tableHeaders:
   apikey: API Key
   available: Available
   attachedVM: Attached VM
+  vpc: vpc
 
   authRoles:
     globalDefault: New User Default
@@ -7652,6 +7653,8 @@ typeDescription:
   harvesterhci.io.logging.clusteroutput: 定义集群范围的日志输出目标，例如 Elasticsearch、Loki、S3、Kafka 等。可被多个集群日志配置引用，用于集中存储与分析集群级日志数据。
   harvesterhci.io.logging.flow: 用于配置资源组（命名空间）内的日志采集与流转规则，仅作用于当前资源组内的日志，并将日志转发至对应的资源组日志外发目标，便于分组级的日志管理。
   harvesterhci.io.logging.output: 定义资源组级别的日志输出目标，仅能被同一资源组下的日志配置引用，用于将该资源组内的日志发送至指定的存储或分析系统。
+  kubeovn.io.ovneip: EIP（Elastic IP，弹性公网 IP） 是一种可独立分配、绑定和管理的公网 IPv4 地址资源，使云上实例能够与公网进行双向通信。EIP 具备可移植、可复用和高可用等特性，为云中应用提供灵活的公网访问能力。
+  kubeovn.io.nat: NAT（Network Address Translation，网络地址转换） 是一种让私有子网内的云资源在不暴露自身公网 IP 的情况下访问互联网的网络服务。通过 NAT，实例可以共享统一的公网出口，实现安全、简化的外网访问能力。
 typeLabel:
   management.cattle.io.oidcclient: |-
     {count, plural,

package/assets/translations/zh-hans.yaml

@@ -5543,6 +5543,7 @@ tableHeaders:
   apikey: API 密钥
   available: 可用
   attachedVM: 挂载的虚拟机
+  vpc: vpc
 
   authRoles:
     globalDefault: 新用户的默认角色
@@ -6661,6 +6662,8 @@ typeDescription:
   harvesterhci.io.logging.clusteroutput: 定义集群范围的日志输出目标，例如 Elasticsearch、Loki、S3、Kafka 等。可被多个集群日志配置引用，用于集中存储与分析集群级日志数据。
   harvesterhci.io.logging.flow: 用于配置资源组（命名空间）内的日志采集与流转规则，仅作用于当前资源组内的日志，并将日志转发至对应的资源组日志外发目标，便于分组级的日志管理。
   harvesterhci.io.logging.output: 定义资源组级别的日志输出目标，仅能被同一资源组下的日志配置引用，用于将该资源组内的日志发送至指定的存储或分析系统。
+  kubeovn.io.ovneip: EIP（Elastic IP，弹性公网 IP） 是一种可独立分配、绑定和管理的公网 IPv4 地址资源，使云上实例能够与公网进行双向通信。EIP 具备可移植、可复用和高可用等特性，为云中应用提供灵活的公网访问能力。
+  kubeovn.io.nat: NAT（Network Address Translation，网络地址转换） 是一种让私有子网内的云资源在不暴露自身公网 IP 的情况下访问互联网的网络服务。通过 NAT，实例可以共享统一的公网出口，实现安全、简化的外网访问能力。
 typeLabel:
   management.cattle.io.project: |-
     {count, plural,

package/components/ResourceList/Masthead.vue

@@ -33,6 +33,10 @@ export default {
     TabTitle
   },
   props: {
+    actionsPositioning: {
+      type:     String,
+      required: '-48px',
+    },
     resource: {
       type:     String,
       required: true,
@@ -322,6 +326,7 @@ export default {
       <div 
         ref="actionsContainer"
         v-if="!(tabList.includes(_typeDisplay))"
+        :style="{ bottom: actionsPositioning ? actionsPositioning : '-48px' }"
         class="actions-container actions-positioning"
         style="min-height: 32px;align-self: flex-end;"
       >

package/components/actionButton/index.vue

@@ -0,0 +1,649 @@
+<script>
+import { KUBERNETES, PROJECT } from '@shell/config/labels-annotations';
+import { FLEET, NAMESPACE, MANAGEMENT, HELM } from '@shell/config/types';
+import ButtonGroup from '@shell/components/ButtonGroup';
+// import { BadgeState } from '@components/BadgeState';
+import DotState from '@shell/components/DotState.vue';
+import { Banner } from '@components/Banner';
+import { get } from '@shell/utils/object';
+import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
+import { HIDE_SENSITIVE } from '@shell/store/prefs';
+import {
+  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
+} from '@shell/config/query-params';
+import { ExtensionPoint, PanelLocation } from '@shell/core/types';
+import ExtensionPanel from '@shell/components/ExtensionPanel';
+import TabTitle from '@shell/components/TabTitle';
+import ActionMenu from '@shell/components/ActionMenuShell.vue';
+import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
+import { useStore } from 'vuex';
+
+// i18n-uses resourceDetail.header.*
+
+/**
+ * Resource Detail Masthead component.
+ *
+ * ToDo: this component seem to be picking up a lot of logic from special cases, could be simplified down to parameters and then customized per use-case via wrapper component
+ */
+export default {
+
+  name: 'MastheadResourceDetail',
+
+  components: {
+    // BadgeState,
+    DotState,
+    Banner,
+    ButtonGroup,
+    ExtensionPanel,
+    TabTitle,
+    ActionMenu,
+  },
+  props: {
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+
+    isManuallyHide: {
+      type:    Boolean,
+      default: true
+    },
+
+    mode: {
+      type:    String,
+      default: 'create'
+    },
+
+    realMode: {
+      type:    String,
+      default: 'create'
+    },
+
+    as: {
+      type:    String,
+      default: _YAML,
+    },
+
+    hasGraph: {
+      type:    Boolean,
+      default: false
+    },
+
+    hasDetail: {
+      type:    Boolean,
+      default: false
+    },
+
+    hasEdit: {
+      type:    Boolean,
+      default: false
+    },
+
+    storeOverride: {
+      type:    String,
+      default: null,
+    },
+
+    resource: {
+      type:    String,
+      default: null,
+    },
+
+    resourceSubtype: {
+      type:    String,
+      default: null,
+    },
+
+    parentRouteOverride: {
+      type:    String,
+      default: null,
+    },
+
+    canViewYaml: {
+      type:    Boolean,
+      default: false,
+    }
+  },
+
+  setup() {
+    const store = useStore();
+    const { featureDropdownMenu } = useRuntimeFlag(store);
+
+    return { featureDropdownMenu };
+  },
+
+  data() {
+    return {
+      DETAIL_VIEW:       _DETAIL,
+      extensionType:     ExtensionPoint.PANEL,
+      extensionLocation: PanelLocation.DETAILS_MASTHEAD,
+      Svg:               require('~shell/assets/images/API.svg')
+    };
+  },
+
+  computed: {
+    dev() {
+      return this.$store.getters['prefs/dev'];
+    },
+
+    schema() {
+      const inStore = this.storeOverride || this.$store.getters['currentStore'](this.resource);
+
+      return this.$store.getters[`${ inStore }/schemaFor`]( this.resource );
+    },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+    isEdit() {
+      return this.mode === _EDIT;
+    },
+
+    isCreate() {
+      return this.mode === _CREATE;
+    },
+
+    isNamespace() {
+      return this.schema?.id === NAMESPACE;
+    },
+
+    isProject() {
+      return this.schema?.id === MANAGEMENT.PROJECT;
+    },
+
+    isProjectHelmChart() {
+      return this.schema?.id === HELM.PROJECTHELMCHART;
+    },
+
+    hasMultipleNamespaces() {
+      return !!this.value.namespaces;
+    },
+
+    namespace() {
+      if (this.value?.metadata?.namespace) {
+        return this.value?.metadata?.namespace;
+      }
+
+      return null;
+    },
+
+    detailsAction() {
+      return this.value?.detailsAction;
+    },
+
+    shouldHifenize() {
+      return (this.mode === 'view' || this.mode === 'edit') && this.resourceSubtype?.length && this.value?.nameDisplay?.length;
+    },
+
+    namespaceLocation() {
+      if (!this.isNamespace) {
+        return this.value.namespaceLocation || {
+          name:   'c-cluster-product-resource-id',
+          params: {
+            cluster:  this.$route.params.cluster,
+            product:  this.$store.getters['productId'],
+            resource: NAMESPACE,
+            id:       this.$route.params.namespace
+          }
+        };
+      }
+
+      return null;
+    },
+
+    isWorkspace() {
+      return this.$store.getters['productId'] === FLEET_NAME && !!this.value?.metadata?.namespace;
+    },
+
+    workspaceLocation() {
+      return {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          cluster:  this.$route.params.cluster,
+          product:  this.$store.getters['productId'],
+          resource: FLEET.WORKSPACE,
+          id:       this.$route.params.namespace
+        }
+      };
+    },
+
+    project() {
+      if (this.isNamespace) {
+        const cluster = this.$store.getters['currentCluster'];
+
+        if (cluster) {
+          const id = (this.value?.metadata?.labels || {})[PROJECT];
+
+          return this.$store.getters['management/byId'](MANAGEMENT.PROJECT, `${ cluster.id }/${ id }`);
+        }
+      }
+
+      return null;
+    },
+
+    banner() {
+      if (this.value?.stateObj?.error) {
+        const defaultErrorMessage = this.t('resourceDetail.masthead.defaultBannerMessage.error', undefined, true);
+
+        return {
+          color:   'error',
+          message: this.value.stateObj.message || defaultErrorMessage
+        };
+      }
+
+      if (this.value?.spec?.paused) {
+        return {
+          color:   'info',
+          message: this.t('asyncButton.pause.description')
+        };
+      }
+
+      if (this.value?.stateObj?.transitioning) {
+        const defaultTransitioningMessage = this.t('resourceDetail.masthead.defaultBannerMessage.transitioning', undefined, true);
+
+        return {
+          color:   'info',
+          message: this.value.stateObj.message || defaultTransitioningMessage
+        };
+      }
+
+      return null;
+    },
+
+    parent() {
+      let displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
+      const product = this.$store.getters['currentProduct'].name;
+
+      const defaultLocation = {
+        name:   'c-cluster-product-resource',
+        params: {
+          resource: this.resource,
+          product,
+        }
+      };
+
+      const location = this.value?.parentLocationOverride || defaultLocation;
+
+      if (this.parentRouteOverride) {
+        location.name = this.parentRouteOverride;
+      }
+
+      const typeOptions = this.$store.getters[`type-map/optionsFor`]( this.resource );
+
+      // 转换为中文
+      const displayName_zh_hans = {
+        'GlobalRole': '全局角色',
+        'RoleTemplate': '集群角色',
+      }
+      if (displayName_zh_hans[displayName]) {
+        displayName = displayName_zh_hans[displayName]
+      }
+      
+      if (displayName == '集群角色' && (this.$route.query?.roleContext == 'NAMESPACE' || location.hash == '#NAMESPACE')) {
+        displayName = '项目或资源组角色'
+      }
+
+      const out = {
+        displayName, location, ...typeOptions
+      };
+
+      return out;
+    },
+
+    hideSensitiveData() {
+      return this.$store.getters['prefs/get'](HIDE_SENSITIVE);
+    },
+
+    sensitiveOptions() {
+      return [
+        {
+          tooltipKey: 'resourceDetail.masthead.sensitive.hide',
+          icon:       'icon-hide',
+          value:      true,
+        },
+        {
+          tooltipKey: 'resourceDetail.masthead.sensitive.show',
+          icon:       'icon-show',
+          value:      false
+        }
+      ];
+    },
+
+    viewOptions() {
+      const out = [];
+
+      if ( this.hasDetail ) {
+        out.push({
+          labelKey: 'resourceDetail.masthead.detail',
+          value:    _DETAIL,
+        });
+      }
+
+      if ( this.hasEdit && this.parent?.showConfigView !== false) {
+        out.push({
+          labelKey: 'resourceDetail.masthead.config',
+          value:    _CONFIG,
+        });
+      }
+
+      if ( this.hasGraph ) {
+        out.push({
+          labelKey: 'resourceDetail.masthead.graph',
+          value:    _GRAPH,
+        });
+      }
+
+      // if ( this.canViewYaml ) {
+      //   out.push({
+      //     labelKey: 'resourceDetail.masthead.yaml',
+      //     value:    _YAML,
+      //   });
+      // }
+
+      if ( out.length < 2 ) {
+        return null;
+      }
+
+      return out;
+    },
+
+    currentView: {
+      get() {
+        return this.as;
+      },
+
+      set(val) {
+        switch ( val ) {
+        case _DETAIL:
+          this.$router.applyQuery({
+            [MODE]: _UNFLAG,
+            [AS]:   _UNFLAG,
+          });
+          break;
+        case _CONFIG:
+          this.$router.applyQuery({
+            [MODE]: _UNFLAG,
+            [AS]:   _CONFIG,
+          });
+          break;
+        case _GRAPH:
+          this.$router.applyQuery({
+            [MODE]: _UNFLAG,
+            [AS]:   _GRAPH,
+          });
+          break;
+        case _YAML:
+          this.$router.applyQuery({
+            [MODE]: _UNFLAG,
+            [AS]:   _YAML,
+          });
+          break;
+        }
+      },
+    },
+
+    showSensitiveToggle() {
+      return !!this.value.hasSensitiveData && this.mode === _VIEW && this.as !== _YAML;
+    },
+
+    managedWarning() {
+      const { value } = this;
+      const labels = value?.metadata?.labels || {};
+
+      const managedBy = labels[KUBERNETES.MANAGED_BY] || '';
+      const appName = labels[KUBERNETES.MANAGED_NAME] || labels[KUBERNETES.INSTANCE] || '';
+
+      return {
+        show:    this.mode === _EDIT && !!managedBy,
+        type:    value?.kind || '',
+        hasName: appName ? 'yes' : 'no',
+        appName,
+        managedBy,
+      };
+    },
+
+    displayName() {
+      let displayName = this.value.nameDisplay;
+
+      if (this.isProjectHelmChart) {
+        displayName = this.value.projectDisplayName;
+      }
+
+      return this.shouldHifenize ? ` - ${ displayName }` : displayName;
+    },
+
+    demoDisplay() {
+      const product = this.$store.getters['productId'];
+
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
+
+      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
+
+      if (productId === undefined) {
+        return '';
+      }
+      const parts = productId?.split('::') || [];
+      const newString = 'root';
+
+      if (!parts?.includes(newString)) {
+        parts.unshift(newString); // 将字符串添加到数组第一位
+      }
+
+      const partsEn = parts.map((item) => {
+        return this.$store.getters['i18n/t'](`typeLabel."${ item.toLowerCase() }"`);
+      });
+
+      return partsEn;
+    },
+    menuIcon() {
+      const product = this.$store.getters['productId'];
+
+      const resources = this.location?.params?.resource || this.$route.params?.resource || ''
+
+
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
+    },
+
+    location() {
+      const { parent } = this;
+
+      return parent?.location;
+    },
+
+    hideNamespaceLocation() {
+      return this.$store.getters['currentProduct'].hideNamespaceLocation || this.value.namespaceLocation === null;
+    },
+
+    resourceExternalLink() {
+      return this.value.resourceExternalLink;
+    },
+  },
+
+  methods: {
+    get,
+
+    showActions() {
+      this.$store.commit('action-menu/show', {
+        resources: this.value,
+        elem:      this.$refs.actions,
+      });
+    },
+
+    toggleSensitiveData(e) {
+      this.$store.dispatch('prefs/set', { key: HIDE_SENSITIVE, value: !!e });
+    },
+
+    invokeDetailsAction() {
+      const action = this.detailsAction;
+
+      if (action) {
+        const fn = this.value[action.action];
+
+        if (fn) {
+          fn.apply(this.value, []);
+        }
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="actions">
+    <button
+      v-if="detailsAction && currentView === DETAIL_VIEW && isView"
+      type="button"
+      class="btn role-primary actions mr-10"
+      :disabled="!detailsAction.enabled"
+      @click="invokeDetailsAction"
+    >
+      {{ detailsAction.label }}
+    </button>
+    <ButtonGroup
+      v-if="showSensitiveToggle"
+      :value="!!hideSensitiveData"
+      icon-size="lg"
+      :options="sensitiveOptions"
+      class="mr-10"
+      @update:value="toggleSensitiveData"
+    />
+    <ButtonGroup
+      v-if="viewOptions && isView"
+      v-model:value="currentView"
+      :options="viewOptions"
+      class="mr-10"
+    />
+    <template v-if="featureDropdownMenu">
+      <ActionMenu
+        v-if="isView"
+        button-role="multiAction"
+        button-size="compact"
+        :resource="value"
+        data-testid="masthead-action-menu"
+      />
+    </template>
+    <template v-else>
+      <button
+        v-if="isView"
+        ref="actions"
+        data-testid="masthead-action-menu"
+        aria-haspopup="true"
+        type="button"
+        class="btn role-multi-action actions"
+        @click="showActions"
+      >
+        <i class="icon icon-actions" />
+      </button>
+    </template>
+  </div>
+</template>
+
+<style lang='scss' scoped>
+  .masthead {
+    padding-bottom: 10px;
+    /* border-bottom: 1px solid var(--border); */
+    margin-bottom: 10px;
+  }
+
+  HEADER {
+    margin: 0;
+  }
+
+  .primaryheader {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size:14px;
+    height: 50px;
+
+    h1 {
+      margin: 0;
+    }
+  }
+
+  .subheader{
+    display: flex;
+    flex-direction: row;
+    color: var(--input-label);
+    & > * {
+      margin: 5px 20px 5px 0px;
+    }
+
+    .live-data {
+      color: var(--body-text)
+    }
+  }
+
+  .state-banner {
+    margin: 3px 0 0 0;
+  }
+
+  .masthead-state {
+    font-size: initial;
+    display: inline-block;
+    position: relative;
+    /* top: -2px; */
+    font-size: 12px;
+    margin-left: 5px;
+  }
+
+  .masthead-istio {
+    .icon {
+      vertical-align: middle;
+      color: var(--primary);
+    }
+  }
+
+  .left-right-split {
+    display: grid;
+    align-items: center;
+
+    .left-half {
+      grid-column: 1;
+    }
+
+    .right-half {
+      grid-column: 2;
+    }
+  }
+
+  .resource-external {
+    font-size: 18px;
+  }
+  .excram-list{
+    font-size: 14px;
+    margin-bottom: 20px;
+  }
+  .excram-last-name{
+    color: var(--link);
+  }
+  .valid{
+    color: #d7d7d7;
+    margin: 0px 10px;
+  }
+  .detailIcon-span{
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+    position: relative;
+    background: var(--primary);
+    margin-right: 10px;
+  }
+  .detailIcon{
+    position: absolute;
+    color: #fff;
+    font-size: 38px;
+    left: 4px;
+    top: -2px;
+  }
+  .primary-title{
+    display: flex;
+    align-items: center;
+  }
+  .detailIcon-span-title{
+    font-weight: bold;
+  }
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-logtest.2",
+  "version": "3.0.5-natTest.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-logtest.2 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-natTest.1 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail