dashboard-shell-shell 1.0.121 → 1.0.1000000081

package/edit/monitoring.coreos.com.alertmanagerconfig/types/pagerduty.vue

@@ -130,7 +130,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div
@@ -142,7 +142,7 @@ export default {
           v-model:value="integrationType"
           :options="integrationTypeOptions"
           :mode="mode"
-          label="Integration Type"
+          label="整合型"
         />
       </div>
     </div>
@@ -186,7 +186,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
           data-testid="v2-monitoring-receiver-pagerduty-proxy-url"
         />
@@ -196,7 +196,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue

@@ -82,7 +82,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -116,7 +116,7 @@ export default {
         <LabeledInput
           v-model:value="value.channel"
           :mode="mode"
-          label="Default Channel"
+          label="默认频道"
           placeholder="e.g. #example"
         />
       </div>
@@ -124,7 +124,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -133,7 +133,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/webhook.vue

@@ -160,7 +160,7 @@ export default {
     <div class="row">
       <div class="col span-12">
         <h3 class="mb-0">
-          Target
+          目标
         </h3>
       </div>
     </div>

package/edit/monitoring.coreos.com.receiver/auth.vue

@@ -81,38 +81,38 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-12">
-        <LabeledSelect
-          v-model:value="authType"
-          :options="authOptions"
-          label="Auth Type"
-          @update:value="initializeType(authOptions, authType)"
+        <LabeledSelect
+          v-model:value="authType"
+          :options="authOptions"
+          label="验证类型"
+          @update:value="initializeType(authOptions, authType)"
         />
       </div>
     </div>
-    <div
-      v-if="authType === 'basic_auth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basic_auth'"
+      class="row mb-20"
     >
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.basic_auth.username"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.username')"
+        <LabeledInput
+          v-model:value="value.basic_auth.username"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.username')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.basic_auth.password"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.password')"
-          type="password"
-          autocomplete="password"
+        <LabeledInput
+          v-model:value="value.basic_auth.password"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.password')"
+          type="password"
+          autocomplete="password"
         />
       </div>
     </div>
-    <div
-      v-else-if="authType === 'bearer_token'"
-      class="row mb-20"
+    <div
+      v-else-if="authType === 'bearer_token'"
+      class="row mb-20"
     >
       <div class="col span-6">
         <LabeledInput
@@ -125,16 +125,16 @@ export default {
         />
       </div>
     </div>
-    <div
-      v-else-if="authType === 'bearer_token_file'"
-      class="row mb-20"
+    <div
+      v-else-if="authType === 'bearer_token_file'"
+      class="row mb-20"
     >
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.bearer_token_file"
-          :mode="mode"
-          :label="t('monitoringReceiver.auth.bearerTokenFile.label')"
-          :placeholder="t('monitoringReceiver.auth.bearerTokenFile.placeholder')"
+        <LabeledInput
+          v-model:value="value.bearer_token_file"
+          :mode="mode"
+          :label="t('monitoringReceiver.auth.bearerTokenFile.label')"
+          :placeholder="t('monitoringReceiver.auth.bearerTokenFile.placeholder')"
         />
       </div>
     </div>

package/edit/monitoring.coreos.com.receiver/types/email.vue

@@ -39,7 +39,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -47,7 +47,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="Default Recipient Address"
+          label="默认收件人地址"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -56,7 +56,7 @@ export default {
           v-model:value="value.send_resolved"
           :mode="mode"
           class="mt-20"
-          label="Enable send resolved alerts"
+          label="启用发送已解决的警报"
         />
       </div>
     </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.require_tls"
           :mode="mode"
           class="mt-20"
-          label="Use TLS"
+          label="启用TLS"
         />
       </div>
     </div>
@@ -106,7 +106,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_username"
           :mode="mode"
-          label="Username"
+          label="用户名"
           placeholder="e.g. John"
         />
       </div>
@@ -114,7 +114,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_password"
           :mode="mode"
-          label="Password"
+          label="密码"
           type="password"
           autocomplete="password"
         />

package/edit/monitoring.coreos.com.receiver/types/opsgenie.vue

@@ -130,7 +130,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -147,7 +147,7 @@ export default {
         <LabeledInput
           v-model:value="value.http_config.proxy_url"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -156,12 +156,12 @@ export default {
       <Checkbox
         v-model:value="value.send_resolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
     <div class="row">
       <div class="col span-12">
-        <h3>Responders</h3>
+        <h3>响应者</h3>
         <ArrayList
           v-model:value="responders"
           :mode="mode"
@@ -174,18 +174,18 @@ export default {
                 class="row"
                 :class="{'mb-15': isView, 'mb-10': !isView}"
               >
-                <div class="col span-6">
-                  <span class="text-label">Type</span>
+                <div class="col" style="width:400px">
+                  <span class="text-label">类型</span>
                 </div>
-                <div class="col span-6 send-to">
-                  <span class="text-label">Send To</span>
+                <div class="col send-to ml-10" style="flex: 1;">
+                  <span class="text-label">发送至</span>
                 </div>
               </div>
             </div>
           </template>
           <template v-slot:columns="scope">
             <div class="row responder">
-              <div class="col span-6">
+              <div style="width:400px">
                 <span v-if="isView">{{ typeLabel(scope.row.value.type) }}</span>
                 <Select
                   v-else
@@ -194,7 +194,7 @@ export default {
                   :options="TYPES"
                 />
               </div>
-              <div class="col-span-6 target-container">
+              <div class="target-container ml-10" style="flex: 1;">
                 <span v-if="isView">{{ targetLabel(scope.row.value.target) }}: {{ scope.row.value.value }}</span>
                 <InputWithSelect
                   v-else

package/edit/monitoring.coreos.com.receiver/types/pagerduty.vue

@@ -56,7 +56,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -65,14 +65,14 @@ export default {
           v-model:value="integrationType"
           :options="integrationTypeOptions"
           :mode="mode"
-          label="Integration Type"
+          label="整合型"
         />
       </div>
       <div class="col span-6">
         <LabeledInput
           v-model:value="value[integrationMapping[integrationType]]"
           :mode="mode"
-          label="Default Integration Key"
+          label="默认集成密钥"
         />
       </div>
     </div>
@@ -81,7 +81,7 @@ export default {
         <LabeledInput
           v-model:value="value.http_config.proxy_url"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -90,7 +90,7 @@ export default {
       <Checkbox
         v-model:value="value.send_resolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

package/edit/monitoring.coreos.com.receiver/types/slack.vue

@@ -40,7 +40,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -64,7 +64,7 @@ export default {
         <LabeledInput
           v-model:value="value.channel"
           :mode="mode"
-          label="Default Channel"
+          label="默认频道"
           placeholder="e.g. #example"
         />
       </div>
@@ -72,7 +72,7 @@ export default {
         <LabeledInput
           v-model:value="value.http_config.proxy_url"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -81,7 +81,7 @@ export default {
       <Checkbox
         v-model:value="value.send_resolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

package/edit/namespace.vue

@@ -186,11 +186,10 @@ export default {
       :value="value"
       :namespaced="false"
       :mode="mode"
-      :extra-columns="['project-col']"
     >
       <template
         v-if="flatView && isCreate"
-        #project-col
+        #customize
       >
         <LabeledSelect
           v-model:value="projectName"

package/edit/networking.k8s.io.ingress/IngressClass.vue

@@ -5,6 +5,7 @@ import { get, set, remove } from '@shell/utils/object';
 
 export default {
   components: { LabeledSelect },
+  emits:      ['update:value'],
   props:      {
     value: {
       type:    Object,
@@ -37,13 +38,16 @@ export default {
   },
   methods: {
     update(e) {
-      if (!e || e.label === this.t('generic.none')) {
+      if (!e || e === '' || e.label === this.t('generic.none')) {
         remove(this.value, 'spec.ingressClassName');
         this.ingressClassName = '';
+        this.$emit('update:value', this.value);
       } else {
         // when a user manually types an ingress class name, the event emitted has a 'label' but no 'value'
-        this.ingressClassName = e.value ? e.value : e.label;
+        this.ingressClassName = e.label || e;
         set(this.value, 'spec.ingressClassName', this.ingressClassName);
+
+        this.$emit('update:value', this.value);
       }
     }
   }
@@ -59,7 +63,7 @@ export default {
       :label="t('ingress.ingressClass.label')"
       :options="ingressClassOptions"
       option-label="label"
-      @selecting="update"
+      @update:value="update"
     />
   </div>
 </template>

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -189,7 +189,7 @@ $row-height: 40px;
     height: 100%;
 
     input.no-label {
-      height: calc($row-height - 2px);
+      height: 32px;
       padding: 10px;
     }
   }

package/edit/networking.k8s.io.ingress/__tests__/IngressClass.test.ts

@@ -0,0 +1,58 @@
+import { shallowMount } from '@vue/test-utils';
+import IngressClass from '@shell/edit/networking.k8s.io.ingress/IngressClass.vue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { _EDIT } from '@shell/config/query-params';
+
+jest.mock('@shell/components/form/LabeledSelect', () => ({
+  name:     'LabeledSelect',
+  template: '<div></div>',
+  props:    ['value', 'taggable', 'searchable', 'mode', 'label', 'options', 'optionLabel'],
+  emits:    ['update:value'],
+}));
+
+describe('ingressClass.vue', () => {
+  it('renders correctly', () => {
+    const wrapper = shallowMount(IngressClass, {
+      props: {
+        value:          {},
+        ingressClasses: [],
+        mode:           _EDIT,
+      },
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.findComponent(LabeledSelect).exists()).toBe(true);
+  });
+
+  it('updates ingressClassName correctly', async() => {
+    const wrapper = shallowMount(IngressClass, {
+      props: {
+        value:          {},
+        ingressClasses: [{ label: 'nginx', value: 'nginx' }],
+        mode:           _EDIT,
+      },
+    });
+
+    await wrapper.findComponent(LabeledSelect).vm.$emit('update:value', 'nginx');
+
+    expect(wrapper.vm.ingressClassName).toBe('nginx');
+    expect(wrapper.props('value').spec.ingressClassName).toBe('nginx');
+    expect(wrapper.emitted()['update:value']).toBeTruthy();
+  });
+
+  it('removes ingressClassName when none is selected', async() => {
+    const wrapper = shallowMount(IngressClass, {
+      props: {
+        value:          { spec: { ingressClassName: 'nginx' } },
+        ingressClasses: [{ label: 'nginx', value: 'nginx' }],
+        mode:           _EDIT,
+      },
+    });
+
+    await wrapper.findComponent(LabeledSelect).vm.$emit('update:value', '');
+
+    expect(wrapper.vm.ingressClassName).toBe('');
+    expect(wrapper.props('value').spec.ingressClassName).toBeUndefined();
+    expect(wrapper.emitted()['update:value']).toBeTruthy();
+  });
+});

package/edit/persistentvolume/__tests__/persistentvolume.test.ts

@@ -9,7 +9,13 @@ describe('view: PersistentVolume', () => {
     };
     const resource = 'PersistentVolume';
     const wrapper = mount(PersistentVolume as ExtendedVue<Vue, {}, {}, {}, PersistentVolume>, {
-      props: { value: { spec: { } } },
+      props: {
+        value: {
+          setAnnotation: jest.fn(),
+          spec:          {},
+          metadata:      {},
+        }
+      },
 
       global: {
         mocks: {
@@ -54,7 +60,13 @@ describe('view: PersistentVolume', () => {
     const plugin = 'csi';
     const resource = 'PersistentVolume';
     const wrapper = mount(PersistentVolume as ExtendedVue<Vue, {}, {}, {}, PersistentVolume>, {
-      props:  { value: { spec: { [plugin]: { value: plugin } } } },
+      props: {
+        value: {
+          setAnnotation: jest.fn(),
+          spec:          { [plugin]: { value: plugin } },
+          metadata:      {},
+        }
+      },
       global: {
         mocks: {
           $store: {

package/edit/provisioning.cattle.io.cluster/CustomCommand.vue

@@ -260,7 +260,10 @@ export default {
       />
 
       <template v-if="cluster.supportsWindows">
-        <hr class="mt-20 mb-20">
+        <hr
+          class="mt-20 mb-20"
+          role="none"
+        >
         <h4 v-t="'cluster.custom.registrationCommand.windowsDetail'" />
         <Banner
           v-if="readyForWindows"

package/edit/provisioning.cattle.io.cluster/SelectCredential.vue

@@ -81,6 +81,30 @@ export default {
   },
 
   computed: {
+    hasCustomCloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/hasCustomCloudCredentialComponent'](driverName);
+    },
+
+    cloudCredentialComponent() {
+      const driverName = this.driverName;
+
+      return this.$store.getters['type-map/importCloudCredential'](driverName);
+    },
+
+    genericCloudCredentialComponent() {
+      return this.$store.getters['type-map/importCloudCredential']('generic');
+    },
+
+    cloudComponent() {
+      if (this.hasCustomCloudCredentialComponent) {
+        return this.cloudCredentialComponent;
+      }
+
+      return this.genericCloudCredentialComponent;
+    },
+
     isNone() {
       return this.credentialId === null || this.credentialId === _NONE;
     },
@@ -140,14 +164,6 @@ export default {
       return out;
     },
 
-    createComponent() {
-      if (this.$store.getters['type-map/hasCustomCloudCredentialComponent'](this.driverName)) {
-        return this.$store.getters['type-map/importCloudCredential'](this.driverName);
-      }
-
-      return this.$store.getters['type-map/importCloudCredential']('generic');
-    },
-
     validationPassed() {
       if ( this.credentialId === _NONE ) {
         return false;
@@ -175,6 +191,7 @@ export default {
   },
 
   methods: {
+
     async save(btnCb) {
       if ( this.errors ) {
         clear(this.errors);
@@ -266,7 +283,7 @@ export default {
       />
 
       <component
-        :is="createComponent"
+        :is="cloudComponent"
         ref="create"
         v-model:value="newCredential"
         mode="create"

package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts

@@ -45,8 +45,6 @@ describe('component: Advanced', () => {
         mountOptions
       );
 
-      // eslint-disable-next-line no-console
-      console.log(wrapper.html());
       const inputElem = wrapper.find('[data-testid="array-list-box0"]');
 
       expect(inputElem.exists()).toBe(false);
@@ -178,7 +176,7 @@ describe('component: Advanced', () => {
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
           const globalInputElem = globalContainer;
-          const selectorInputElem = selectorContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(globalInputElem.exists()).toBe(false);
           expect(selectorInputElem.value).toContain('config-from-machineSelectorConfig');
@@ -201,7 +199,7 @@ describe('component: Advanced', () => {
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
           const selectorInputElem = selectorContainer;
-          const globalInputElem = globalContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(selectorInputElem.exists()).toBe(false);
           expect(globalInputElem.value).toContain('config-from-machineGlobalConfig');
@@ -224,8 +222,8 @@ describe('component: Advanced', () => {
           const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
           const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-          const selectorInputElem = selectorContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
-          const globalInputElem = globalContainer.find('[data-testid="input-0"]').element as HTMLInputElement;
+          const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
+          const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]').element as HTMLInputElement;
 
           expect(selectorInputElem.value).toContain('config-from-machineSelectorConfig');
           expect(globalInputElem.value).toContain('config-from-machineGlobalConfig');
@@ -249,8 +247,8 @@ describe('component: Advanced', () => {
         const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
         const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-        const selectorInputElem = selectorContainer.find('[data-testid="input-0"]');
-        const globalInputElem = globalContainer.find('[data-testid="input-0"]');
+        const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]');
+        const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]');
 
         const emptyCharacter = wrapper.find('.info-box').find('.text-muted').element;
 
@@ -284,8 +282,8 @@ describe('component: Advanced', () => {
         const globalContainer = wrapper.find('[data-testid="global-kubelet-arg"]');
         const selectorContainer = wrapper.find('[data-testid="selector-kubelet-arg"]');
 
-        const selectorInputElem = selectorContainer.find('[data-testid="input-0"]');
-        const globalInputElem = globalContainer.find('[data-testid="input-0"]');
+        const selectorInputElem = selectorContainer.find('[data-testid="array-list-input-0"]');
+        const globalInputElem = globalContainer.find('[data-testid="array-list-input-0"]');
 
         const emptyCharacter = wrapper.find('.info-box').find('.text-muted');