dashboard-shell-shell 3.0.2-test.20250913 → 3.0.5-logTest.2

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

@@ -35,8 +35,16 @@ export default {
       defaultCert,
       hosts,
       secretName,
+      secretVal: this.value.secretName ?? DEFAULT_CERT_VALUE,
     };
   },
+  watch: {
+    value(newVal) {
+      this.hosts = newVal.hosts;
+      this.secretName = newVal.secretName;
+      this.secretVal = this.secretName === null ? DEFAULT_CERT_VALUE : this.secretName;
+    },
+  },
   computed: {
     certsWithDefault() {
       return [this.defaultCert, ...this.certs.map((c) => ({ label: c, value: c }))];
@@ -59,7 +67,7 @@ export default {
     update() {
       const out = { hosts: this.hosts };
 
-      out.secretName = this.secretName;
+      out.secretName = this.secretVal;
 
       if (out.secretName === DEFAULT_CERT_VALUE) {
         out.secretName = null;
@@ -68,7 +76,7 @@ export default {
       this.$emit('update:value', out);
     },
     onSecretInput(e) {
-      this.secretName = e && typeof e === 'object' ? e.label : e;
+      this.secretVal = e && typeof e === 'object' ? e.label : e;
       this.update();
     },
     onHostsInput(e) {
@@ -81,12 +89,12 @@ export default {
 
 <template>
   <div
-    class="cert row"
+    class="cert row mb-10"
     @update:value="update"
   >
-    <div class="col span-6">
+    <div>
       <LabeledSelect
-        v-model:value="secretName"
+        v-model:value="secretVal"
         class="secret-name"
         :options="certsWithDefault"
         :label="t('ingress.certificates.certificate.label')"
@@ -99,7 +107,9 @@ export default {
         @update:value="onSecretInput"
       />
     </div>
-    <div class="col span-6">
+  </div>
+  <div class="row ingressBox">
+    <div style="padding-left: 160px;">
       <ArrayList
         :value="hosts"
         :add-label="t('ingress.certificates.addHost')"
@@ -119,6 +129,13 @@ export default {
   position: absolute;
 }
 
+.ingressBox 
+  :deep() .box {
+    border: 0px solid var(--tabbed-border);
+    >.remove {
+    top: 1px;
+  }
+}
 .cert {
   position: relative;
 
@@ -127,8 +144,8 @@ export default {
   }
 
   &:not(:last-of-type) {
-    padding-bottom: 10px;
-    margin-bottom: 30px;
+    // padding-bottom: 10px;
+    // margin-bottom: 30px;
   }
 }
 </style>

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

@@ -96,7 +96,7 @@ export default {
       v-if="serviceName || !isView"
       class="row"
     >
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledSelect
           v-model:value="serviceName"
           :taggable="true"
@@ -111,7 +111,7 @@ export default {
         />
       </div>
       <div
-        class="col span-3"
+        class="col span-6"
         :style="{'margin-right': '0px'}"
       >
         <LabeledInput

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

@@ -107,10 +107,10 @@ export default {
 
 <template>
   <div class="rule">
-    <div class="row mb-20">
+    <div class="row">
       <div
         id="host"
-        class="col span-6"
+        class="col"
       >
         <LabeledInput
           ref="host"
@@ -121,12 +121,8 @@ export default {
           @update:value="update"
         />
       </div>
-      <div
-        id="spacer"
-        class="col span-5"
-      />
     </div>
-    <div class="rule-path-headings row">
+    <!-- <div class="rule-path-headings row">
       <div
         class="col"
         :class="{'span-6': ingress.showPathType, 'span-4': !ingress.showPathType}"
@@ -134,20 +130,18 @@ export default {
         <label>{{ t("ingress.rules.path.label") }}</label>
       </div>
       <div
-        class="col"
         :class="{'span-3': ingress.showPathType, 'span-4': !ingress.showPathType}"
       >
         <label>{{ t("ingress.rules.target.label") }}</label>
       </div>
       <div
-        class="col"
         :class="{'span-2': ingress.showPathType, 'span-3': !ingress.showPathType}"
         :style="{ 'margin-right': '0px' }"
       >
         <label>{{ t("ingress.rules.port.label") }}</label>
       </div>
       <div class="col" />
-    </div>
+    </div> -->
     <template
       v-for="(path, i) in paths"
       :key="path.id"
@@ -155,7 +149,7 @@ export default {
       <RulePath
         ref="paths"
         v-model:value="paths[i]"
-        class="row mb-10"
+        class="row"
         :rule-mode="ruleMode"
         :service-targets="serviceTargets"
         :ingress="ingress"

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

@@ -107,118 +107,127 @@ export default {
 };
 </script>
 <template>
-  <div class="rule-path row">
-    <div
-      v-if="ingress.showPathType"
-      class="col span-6"
-    >
-      <InputWithSelect
-        ref="first"
-        class="path-type"
-        :options="pathTypes"
-        :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
-        :select-value="value.pathType"
-        :text-value="value.path"
-        :searchable="false"
-        :text-rules="rules.path"
-        @update:value="queueUpdatePathTypeAndPath"
-      />
-    </div>
-    <div
-      v-else
-      class="col span-4"
-    >
-      <input
-        ref="first"
-        v-model="path"
-        :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
-        @input="queueUpdate"
+  <div class="rule-path" style="display: block;">
+    <div class="row">
+      <button
+        class="btn btn-sm role-link remove"
+        @click="remove"
       >
+        {{ t('ingress.rules.removePath') }}
+      </button>
+    </div>
+    <div class="flex col">
+      <div class="label">{{ t("ingress.rules.target.label") }}</div>
+      <div class="service" style="width: 400px;">
+        <Select
+          v-model:value="serviceName"
+          :options="serviceTargets"
+          :status="serviceTargetStatus"
+          :taggable="true"
+          :searchable="true"
+          :tooltip="serviceTargetTooltip"
+          :hover-tooltip="true"
+          @update:value="servicePort = ''; queueUpdate();"
+        />
+      </div>
     </div>
-    <div
-      class="col"
-      :class="{'span-3': ingress.showPathType, 'span-4': !ingress.showPathType}"
-    >
-      <Select
-        v-model:value="serviceName"
-        :options="serviceTargets"
-        :status="serviceTargetStatus"
-        :taggable="true"
-        :searchable="true"
-        :tooltip="serviceTargetTooltip"
-        :hover-tooltip="true"
-        @update:value="servicePort = ''; queueUpdate();"
-      />
+    <div class="flex col">
+      <div class="label">{{ t("ingress.rules.port.label") }}</div>
+      <div>
+        <LabeledInput
+          v-if="portOptions.length === 0"
+          v-model:value="servicePort"
+          class="fullHeightInput"
+          :placeholder="t('ingress.rules.port.placeholder')"
+          :rules="rules.port"
+          @update:value="queueUpdate"
+        />
+        <Select
+          v-else
+          v-model:value="servicePort"
+          :options="portOptions"
+          :placeholder="t('ingress.rules.port.placeholder')"
+          :rules="rules.port"
+          @update:value="queueUpdate"
+        />
+      </div>
     </div>
-    <div
-      class="col"
-      :class="{'span-2': ingress.showPathType, 'span-3': !ingress.showPathType}"
-      :style="{'margin-right': '0px'}"
-    >
-      <LabeledInput
-        v-if="portOptions.length === 0"
-        v-model:value="servicePort"
-        class="fullHeightInput"
-        :placeholder="t('ingress.rules.port.placeholder')"
-        :rules="rules.port"
-        @update:value="queueUpdate"
-      />
-      <Select
-        v-else
-        v-model:value="servicePort"
-        :options="portOptions"
-        :placeholder="t('ingress.rules.port.placeholder')"
-        :rules="rules.port"
-        @update:value="queueUpdate"
-      />
+    <div class="flex" :style="{marginBottom: !ingress.showPathType ? '24px': '' }">
+      <div class="label">
+        <div style="padding-bottom: 43px;" v-if="ingress.showPathType">
+          匹配模式
+        </div>
+        <div :style="{paddingBottom: ingress.showPathType ? '15px' : ''}">
+          {{ t("ingress.rules.path.label") }}
+        </div>
+      </div>
+      <div
+        v-if="ingress.showPathType"
+        class="path_row"
+      >
+        <InputWithSelect
+          ref="first"
+          class="path-type"
+          :options="pathTypes"
+          :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
+          :select-value="value.pathType"
+          :text-value="value.path"
+          :searchable="false"
+          :text-rules="rules.path"
+          @update:value="queueUpdatePathTypeAndPath"
+        />
+      </div>
+      <div v-else class="path_row2">
+        <input
+          ref="first"
+          v-model="path"
+          :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
+          @input="queueUpdate"
+        >
+      </div>
     </div>
-    <button
-      class="btn btn-sm role-link col"
-      @click="remove"
-    >
-      {{ t('ingress.rules.removePath') }}
-    </button>
   </div>
 </template>
 <style lang="scss" scoped>
 // TODO #11952: Correct deep statement
-$row-height: 40px;
-.rule-path {
-  :deep(.labeled-input) {
-    padding: 0 !important;
-    height: 100%;
-
-    input.no-label {
-      height: calc($row-height - 2px);
-      padding: 10px;
-    }
-  }
-
-  :deep(.col), INPUT {
-    height: $row-height;
+::v-deep .input-container{
+  display: flex !important;
+  .unlabeled-select{
+    height: 34px !important;
   }
-  &, :deep(.input-container) {
-    height: $row-height;
+  .in-input.unlabeled-select{
+    margin-right: -1px;
+    margin-bottom: 24px;
+    width: 400px;
   }
+}
 
-  :deep(.input-container) :deep(.in-input.unlabeled-select) {
-    width: initial;
-  }
+.flex{
+  display: flex;
+  align-items: center;
 
-  button {
-    line-height: $row-height;
+  .label{
+    min-width: 160px;
   }
+}
 
-  :deep(.v-select) INPUT {
-    height: 50px;
-  }
-  :deep(.labeled-input) {
-    padding-top: 6px;
+::v-deep .path_row{
+  width: 800px;
+  .input-container{
+    flex-direction: column;
   }
 
-  :deep(.unlabeled-select) {
-    height: 100%;
-    min-width: 200px;
+  .labeled-container{
+    width: 0px !important;
   }
 }
+
+.path_row2{
+  width: 400px;
+}
+
+.remove{
+  padding: 0px;
+  min-width: auto;
+}
 </style>

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

@@ -0,0 +1,37 @@
+import { shallowMount } from '@vue/test-utils';
+import Certificate from '../Certificate.vue';
+
+const DEFAULT_CERT_VALUE = '__[[DEFAULT_CERT]]__';
+
+const createWrapper = (propsData = {}) => {
+  return shallowMount(Certificate, { propsData });
+};
+
+describe('networking.k8s.io.ingress/Certificate.vue', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('initializes with default values', () => {
+    const wrapper = createWrapper();
+
+    expect(wrapper.vm.hosts).toStrictEqual(['']);
+    expect(wrapper.vm.secretVal).toStrictEqual(DEFAULT_CERT_VALUE);
+    expect(wrapper.vm.secretName).toStrictEqual(DEFAULT_CERT_VALUE);
+  });
+
+  it('initializes with provided props', () => {
+    const value = { hosts: ['host1', 'host2'], secretName: 'some-secret' };
+    const certs = ['cert1', 'cert2'];
+    const rules = { host: ['rule1'] };
+    const wrapper = createWrapper({
+      value, certs, rules
+    });
+
+    expect(wrapper.vm.hosts).toStrictEqual(['host1', 'host2']);
+    expect(wrapper.vm.secretVal).toStrictEqual('some-secret');
+    expect(wrapper.vm.secretName).toStrictEqual('some-secret');
+    expect(wrapper.vm.certs).toStrictEqual(certs);
+    expect(wrapper.vm.rules).toStrictEqual(rules);
+  });
+});

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

@@ -226,7 +226,10 @@ export default {
       :rules="fvGetAndReportPathRules('spec')"
       as-banner
     />
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         :label="firstTabLabel"
         name="rules"

package/edit/networking.k8s.io.networkpolicy/PolicyRule.vue

@@ -5,6 +5,9 @@ import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import { _EDIT } from '@shell/config/query-params';
 import PolicyRuleTarget from '@shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget';
 
+// Components shown for Network Policy --> Ingress/Egress Rules --> Rule Type are...
+// Edit Network Policy --> `PolicyRules` 1 --> M `PolicyRule` 1 --> M `PolicyRuleTarget`
+
 export default {
   components: {
     ArrayListGrouped, PolicyRulePort, PolicyRuleTarget
@@ -28,18 +31,6 @@ export default {
       type:    String,
       default: ''
     },
-    allPods: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
-    allNamespaces: {
-      type:    Array,
-      default: () => {
-        return [];
-      },
-    },
   },
   data() {
     return { targetKey: this.type === 'ingress' ? 'from' : 'to' };
@@ -49,8 +40,8 @@ export default {
 
 <template>
   <div class="rule">
-    <div class="row mb-40">
-      <div class="col span-12">
+    <div class="row">
+      <div class="span-12">
         <h2>
           {{ t(`networkpolicy.${type}.ruleLabel`) }}
           <i
@@ -71,15 +62,13 @@ export default {
               :mode="mode"
               :type="type"
               :namespace="namespace"
-              :all-namespaces="allNamespaces"
-              :all-pods="allPods"
               :data-testid="`policy-rule-target-${props.i}`"
             />
           </template>
         </ArrayListGrouped>
       </div>
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-12">
         <h2>
           {{ t('networkpolicy.rules.ports.label') }}

package/edit/networking.k8s.io.networkpolicy/PolicyRulePort.vue

@@ -26,7 +26,7 @@ export default {
 
 <template>
   <div class="row">
-    <div class="col span-4">
+    <div class="col">
       <LabeledInput
         v-model:value.number="value.port"
         :mode="mode"
@@ -37,7 +37,9 @@ export default {
         :label="t('networkpolicy.rules.ports.port.label')"
       />
     </div>
-    <div class="col span-4">
+  </div>
+  <div class="row">
+    <div class="col">
       <LabeledSelect
         v-model:value="value.protocol"
         :mode="mode"