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

package/components/form/KeyValue.vue

@@ -12,6 +12,7 @@ import { _EDIT, _VIEW } from '@shell/config/query-params';
 import { asciiLike } from '@shell/utils/string';
 import CodeMirror from '@shell/components/CodeMirror';
 import isEqual from 'lodash/isEqual';
+import { LabeledTooltip } from '@components/LabeledTooltip';
 
 export default {
   name: 'KeyValue',
@@ -22,7 +23,8 @@ export default {
     CodeMirror,
     Select,
     TextAreaAutoGrow,
-    FileSelector
+    FileSelector,
+    LabeledTooltip
   },
   props: {
     value: {
@@ -64,6 +66,12 @@ export default {
       type:    [String, Boolean],
       default: '',
     },
+
+    protipValue: {
+      type:    [String, Boolean],
+      default: '',
+    },
+
     // For asMap=false, the name of the field that goes into the row objects
     keyName: {
       type:    String,
@@ -95,20 +103,6 @@ export default {
       type:    String,
       default: '',
     },
-    /**
-     * List of keys which needs to be disabled and hidden based on toggler
-     */
-    protectedKeys: {
-      type:    Array,
-      default: () => [],
-    },
-    /**
-     * Conditionally display protected keys, if any
-     */
-    toggleFilter: {
-      type:    Boolean,
-      default: false,
-    },
     separatorLabel: {
       type:    String,
       default: '',
@@ -184,6 +178,10 @@ export default {
       type:    String,
       default: '',
     },
+    addClass: {
+      type:    String,
+      default: '',
+    },
     addAllowed: {
       type:    Boolean,
       default: true,
@@ -210,7 +208,7 @@ export default {
     },
     removeIcon: {
       type:    String,
-      default: 'icon-minus',
+      default: '',
     },
     removeAllowed: {
       type:    Boolean,
@@ -240,6 +238,10 @@ export default {
       default: false,
       type:    Boolean
     },
+    keyErrors: {
+      type:    Object,
+      default: () => ({})
+    }
   },
   data() {
     const rows = this.getRows(this.value);
@@ -252,6 +254,10 @@ export default {
   },
   computed: {
     _protip() {
+      if (this.protip === false) {
+        return null;
+      }
+
       return this.protip || this.t('keyValue.protip', null, true);
     },
     _keyLabel() {
@@ -323,10 +329,6 @@ export default {
       }
     },
 
-    isProtected(key) {
-      return this.protectedKeys && this.protectedKeys.includes(key);
-    },
-
     getRows(value) {
       let rows = [];
 
@@ -388,6 +390,17 @@ export default {
         });
       }
 
+      rows = rows.map((item) => {
+        if (item?.key?.includes('harvester')) {
+          item.key = item.key?.replace('harvester', 'cloud');
+        }
+        if (item?.value?.includes('harvester')) {
+          item.value = item.value?.replace('harvester', 'cloud');
+        }
+
+        return item;
+      });
+
       return rows;
     },
 
@@ -398,6 +411,8 @@ export default {
         [this.valueName]: value,
       };
 
+      obj.key = obj.key?.replace('harvester', 'cloud');
+      obj.value = obj.value?.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -479,8 +494,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName] || '').trim();
-          let value = (row[valueName] || '').trim();
+          const key = (row[keyName]?.replace('cloud', 'harvester') || '').trim();
+          let value = (row[valueName]?.replace('cloud', 'harvester') || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));
@@ -530,10 +545,16 @@ export default {
       const text = event.clipboardData.getData('text/plain');
       const lines = text.split('\n');
       const splits = lines.map((line) => {
-        const splitter = this.parserSeparators.find((sep) => line.includes(sep));
+        const separatorIndex = line.search(new RegExp(this.parserSeparators.join('|')));
 
-        return splitter ? line.split(splitter) : '';
-      }).filter((split) => split && split.length > 0);
+        if (separatorIndex === -1) {
+          return [];
+        }
+        const key = line.substring(0, separatorIndex).trim();
+        const value = line.substring(separatorIndex + 1).trim();
+
+        return [key, value];
+      }).filter((split) => split.length > 0);
 
       if (splits.length === 0 || (splits.length === 1 && splits[0].length < 2)) {
         return;
@@ -612,11 +633,12 @@ export default {
         </h3>
       </slot>
     </div>
-
+    
     <!-- 整个 Key-Value 表格容器 -->
     <div
       class="kv-container"
       role="grid"
+      :aria-label="title || t('generic.ariaLabel.keyValue')"
       :aria-rowcount="rows.length"
       :aria-colcount="extraColumns.length + 2"
       :style="containerStyle"
@@ -626,8 +648,8 @@ export default {
       <template v-if="rows.length || isView">
         <div class="rowgroup">
           <div class="row">
-            <label
-              class="text-label"
+            <div
+              class="text-label key-value-label"
               role="columnheader"
             >
               {{ _keyLabel }}
@@ -637,21 +659,32 @@ export default {
                 v-stripped-aria-label="_protip"
                 class="icon icon-info"
                 tabindex="0"
+                role="tooltip"
               />
-            </label>
-            <label
-              class="text-label"
+            </div>
+            <div
+              class="text-label key-value-label"
               role="columnheader"
             >
               {{ _valueLabel }}
-            </label>
-            <label
+              <i
+                v-if="protipValue && !isView && addAllowed"
+                v-clean-tooltip="{content: protipValue, triggers: ['hover', 'touch', 'focus'] }"
+                v-stripped-aria-label="protipValue"
+                class="icon icon-info"
+                tabindex="0"
+                role="tooltip"
+              />
+            </div>
+            <div
               v-for="(c, i) in extraColumns"
               :key="i"
               role="columnheader"
             >
-              <slot :name="'label:'+c">{{ c }}</slot>
-            </label>
+              <slot :name="'label:'+c">
+                {{ c }}
+              </slot>
+            </div>
             <slot
               v-if="canRemove"
               name="remove"
@@ -688,10 +721,7 @@ export default {
         v-else
         :key="i"
       >
-        <div
-          class="rowgroup"
-          :class="{'hide': isProtected(row.key) && !toggleFilter}"
-        >
+        <div class="rowgroup">
           <div class="row">
             <!-- Key -->
             <div
@@ -699,6 +729,10 @@ export default {
               role="gridcell"
               :aria-rowindex="i+1"
               :aria-colindex="1"
+              :class="{
+                'labeled-input-key': keyErrors[row.key],
+                'v-popper--has-tooltip': keyErrors[row.key],
+              }"
             >
               <slot
                 name="key"
@@ -714,25 +748,30 @@ export default {
                   ref="key"
                   v-model:value="row[keyName]"
                   :searchable="true"
-                  :disabled="disabled || isProtected(row.key)"
+                  :disabled="disabled"
                   :clearable="false"
                   :taggable="keyTaggable"
                   :options="calculateOptions(row[keyName])"
                   :data-testid="`select-kv-item-key-${i}`"
-                  :aria-label="t('generic.ariaLabel.key', {index: i})"
+                  :aria-label="t('generic.ariaLabel.key', {index: i+1})"
                   @update:value="queueUpdate"
                 />
                 <input
                   v-else
                   ref="key"
                   v-model="row[keyName]"
-                  :disabled="isView || disabled || !keyEditable || isProtected(row.key)"
+                  :disabled="isView || disabled || !keyEditable"
                   :placeholder="_keyPlaceholder"
                   :data-testid="`input-kv-item-key-${i}`"
-                  :aria-label="t('generic.ariaLabel.key', {index: i})"
+                  :aria-label="t('generic.ariaLabel.key', {index: i+1})"
                   @input="queueUpdate"
                   @paste="onPaste(i, $event)"
                 >
+                <LabeledTooltip
+                  v-if="keyErrors[row.key]"
+                  :value="keyErrors[row.key]"
+                  :hover="true"
+                />
               </slot>
             </div>
 
@@ -782,25 +821,25 @@ export default {
                     v-model:value="row[valueName]"
                     data-testid="value-multiline"
                     :class="{'conceal': valueConcealed}"
-                    :disabled="disabled || isProtected(row.key)"
+                    :disabled="disabled"
                     :mode="mode"
                     :placeholder="_valuePlaceholder"
                     :min-height="32"
                     :spellcheck="false"
-                    :aria-label="t('generic.ariaLabel.value', {index: i})"
+                    :aria-label="t('generic.ariaLabel.value', {index: i+1})"
                     @update:value="queueUpdate"
                   />
                   <input
                     v-else
                     v-model="row[valueName]"
-                    :disabled="isView || disabled || isProtected(row.key)"
+                    :disabled="isView || disabled"
                     :type="valueConcealed ? 'password' : 'text'"
                     :placeholder="_valuePlaceholder"
                     autocorrect="off"
                     autocapitalize="off"
                     spellcheck="false"
                     :data-testid="`input-kv-item-value-${i}`"
-                    :aria-label="t('generic.ariaLabel.value', {index: i})"
+                    :aria-label="t('generic.ariaLabel.value', {index: i+1})"
                     @input="queueUpdate"
                   >
                   <FileSelector
@@ -808,7 +847,7 @@ export default {
                     class="btn btn-sm role-secondary file-selector"
                     :label="t('generic.upload')"
                     :include-file-name="true"
-                    :aria-label="t('generic.ariaLabel.value', {index: i})"
+                    :aria-label="t('generic.ariaLabel.value', {index: i+1})"
                     @selected="onValueFileSelected(i, $event)"
                   />
                 </div>
@@ -847,12 +886,16 @@ export default {
                 <button
                   type="button"
                   role="button"
-                  :disabled="isView || isProtected(row.key) || disabled"
-                  :aria-label="`${removeLabel || t('generic.remove')} ${ i+1 }`"
+                  :disabled="isView || disabled"
+                  :aria-label="t('generic.ariaLabel.remove', {index: i+1})"
                   class="btn role-link"
                   @click="remove(i)"
                 >
                   {{ removeLabel || t('generic.remove') }}
+                  <i
+                    v-if="removeIcon"
+                    :class="[removeIcon]"
+                  />
                 </button>
               </slot>
             </div>
@@ -877,9 +920,10 @@ export default {
           type="button"
           role="button"
           class="btn role-tertiary add"
+          :class="[addClass]"
           data-testid="add_row_item_button"
           :disabled="loading || disabled || (keyOptions && filteredKeyOptions.length === 0)"
-          :aria-label="_addLabel"
+          :aria-label="t('generic.ariaLabel.addKeyValue')"
           @click="add()"
         >
           <i
@@ -891,10 +935,12 @@ export default {
         <!-- 从文件读取 -->
         <FileSelector
           v-if="readAllowed"
+          :aria-label="t('generic.ariaLabel.readKeyValue')"
           :disabled="isView"
           class="role-tertiary"
           :label="t('generic.readFromFile')"
           :include-file-name="true"
+          data-testid="read_all_key_value_button"
           @selected="onFileSelected"
         />
       </slot>
@@ -913,7 +959,8 @@ export default {
     display: grid;
     /* align-items: center; */
     column-gap: 10px;
-    label {
+
+    .key-value-label {
       margin-bottom: 0;
     }
     & .kv-item {
@@ -938,7 +985,7 @@ export default {
         padding: 10px 10px 10px 10px;
         min-height:32px;
         line-height: 12px; 
-        border: solid var(--border-width) var(--input-border);       
+        border: solid var(--border-width) var(--input-border); 
       }
 
       .text-monospace:not(.conceal) {
@@ -967,6 +1014,7 @@ export default {
   .remove {
     text-align: center;
     BUTTON {
+      min-width: auto;
       padding: 0px;
     }
   }
@@ -999,4 +1047,15 @@ export default {
     padding: 0px 0px 0px 10px;
   }
 }
+
+.labeled-input-key {
+  position: relative;
+  display: flex;
+  border-collapse: separate;
+  z-index: 0; // Prevent label from cover other elements outside of the input
+}
+
+h3{
+  font-size: 14px;
+}
 </style>

package/components/form/LabeledSelect.vue

@@ -9,6 +9,9 @@ import { generateRandomAlphaString } from '@shell/utils/string';
 import LabeledSelectPagination from '@shell/components/form/labeled-select-utils/labeled-select-pagination';
 import { LABEL_SELECT_NOT_OPTION_KINDS } from '@shell/types/components/labeledSelect';
 import { mapGetters } from 'vuex';
+import { _VIEW } from '@shell/config/query-params';
+import { useClickOutside } from '@shell/composables/useClickOutside';
+import { ref } from 'vue';
 
 export default {
   name: 'LabeledSelect',
@@ -126,11 +129,23 @@ export default {
     },
   },
 
+  setup() {
+    const select = ref(null);
+    const isOpen = ref(false);
+
+    useClickOutside(select, () => {
+      isOpen.value = false;
+    });
+
+    return { isOpen, select };
+  },
+
   data() {
     return {
-      selectedVisibility: 'visible',
-      shouldOpen:         true,
-      uid:                generateRandomAlphaString(10)
+      selectedVisibility:   'visible',
+      shouldOpen:           true,
+      labeledSelectLabelId: `ls-label-id-${ generateRandomAlphaString(12) }`,
+      generatedUid:         `ls-uid-${ generateRandomAlphaString(12) }`
     };
   },
 
@@ -166,28 +181,24 @@ export default {
   },
 
   methods: {
-    // resizeHandler = in mixin
-    focusSearch() {
-      if (this.isView || this.disabled || this.loading) {
+    // Ensure we only focus on open, otherwise we re-open on close
+    clickSelect() {
+      if (this.mode === _VIEW || this.loading === true || this.disabled === true) {
         return;
       }
 
-      // we need this override as in a "closeOnSelect" type of component
-      // if we don't have this override, it would open again
-      if (this.overridesMixinPreventDoubleTriggerKeysOpen) {
-        this.$nextTick(() => {
-          const el = this.$refs['select'];
-
-          if ( el ) {
-            el.focus();
-          }
+      this.isOpen = !this.isOpen;
 
-          this.overridesMixinPreventDoubleTriggerKeysOpen = false;
-        });
+      if (this.isOpen) {
+        this.focusSearch();
+      }
+    },
 
+    // resizeHandler = in mixin
+    focusSearch() {
+      if (this.isView || this.disabled || this.loading) {
         return;
       }
-      this.$refs['select-input'].open = true;
 
       this.$nextTick(() => {
         const el = this.$refs['select-input']?.searchEl;
@@ -198,6 +209,10 @@ export default {
       });
     },
 
+    focusWrapper() {
+      this.$refs.select.focus();
+    },
+
     onFocus() {
       this.selectedVisibility = 'hidden';
       this.onFocusLabeled();
@@ -209,12 +224,27 @@ export default {
     },
 
     onOpen() {
+      this.focusSearch();
       this.$emit('on-open');
       this.resizeHandler();
     },
 
+    closeOnSelecting(e) {
+      if (e.value === this.value) {
+        this.close();
+      }
+
+      this.$emit('selecting', e);
+    },
+
+    close() {
+      this.isOpen = false;
+      this.onClose();
+    },
+
     onClose() {
       this.$emit('on-close');
+      this.focusWrapper();
     },
 
     getOptionLabel(option) {
@@ -249,6 +279,10 @@ export default {
     },
 
     dropdownShouldOpen(instance, forceOpen = false) {
+      if (!this.isOpen) {
+        return false;
+      }
+
       const { noDrop, mutableLoading } = instance;
       const { open } = instance;
       const shouldOpen = this.shouldOpen;
@@ -292,6 +326,7 @@ export default {
 <template>
   <div style="display: flex;">
     <div
+      v-if="hasLabel"
       :class="{ 'labeled-container': true, raised, empty, [mode]: true, 'is-lable': isLabel }"
       :style="{ border: 'none', width: selectWidth===''?'160px':selectWidth,lineHeight: '32px' }"
     >
@@ -310,10 +345,11 @@ export default {
     </div>
     <!-- label -->
     <div
+      :id="hasLabel ? labeledSelectLabelId : undefined"
       ref="select"
       class="labeled-select"
       :class="[
-        $attrs.class,
+        $attrs.class && $attrs.class.replace('mb-20', ''),
         {
           disabled: isView || disabled,
           focused,
@@ -327,37 +363,20 @@ export default {
         }
       ]"
       :tabindex="isView || disabled ? -1 : 0"
-      role="listbox"
-      @click="focusSearch"
-      @keydown.enter="focusSearch"
-      @keydown.down.prevent="focusSearch"
-      @keydown.space.prevent="focusSearch"
+      role="combobox"
+      :aria-expanded="isOpen"
+      :aria-describedby="$attrs['aria-describedby'] || undefined"
+      :aria-required="requiredField"
+      @click="clickSelect"
+      @keydown.self.enter="clickSelect"
+      @keydown.self.down.prevent="clickSelect"
+      @keydown.self.space.prevent="clickSelect"
     >
-      <!-- <div
-        :class="{ 'labeled-container': true, raised, empty, [mode]: true }"
-        :style="{ border: 'none' }"
-      >
-        <label
-          v-if="hasLabel"
-          :id="`labeled-select-uid-${uid}`"
-        >
-          <t
-            v-if="labelKey"
-            :k="labelKey"
-          />
-          <template v-else-if="label">{{ label }}</template>
-
-          <span
-            v-if="requiredField"
-            class="required"
-          >*</span>
-        </label>
-      </div> -->
       <v-select
         ref="select-input"
-        :aria-labelledby="hasLabel ? `labeled-select-uid-${uid}` : ''"
         v-bind="filteredAttrs"
         class="inline"
+        :close-on-select="false"
         :append-to-body="appendToBody"
         :calculate-position="positionDropdown"
         :class="{ 'no-label': !(label || '').length}"
@@ -376,17 +395,19 @@ export default {
         :modelValue="value != null && !loading ? value : ''"
         :dropdown-should-open="dropdownShouldOpen"
         :tabindex="-1"
-        role="listitem"
+        :uid="generatedUid"
+        :aria-label="'-'"
         @update:modelValue="$emit('selecting', $event); $emit('update:value', $event)"
         @search:blur="onBlur"
         @search:focus="onFocus"
         @search="onSearch"
         @open="onOpen"
         @close="onClose"
-        @option:selecting="$emit('selecting', $event)"
+        @option:selecting="closeOnSelecting"
+        @option:selected="close"
         @option:deselecting="$emit('deselecting', $event)"
+        @keydown.enter.stop
       >
-      
         <template #option="option">
           <template v-if="showTagPrompts">
             <div class="only-user-opts">
@@ -406,9 +427,9 @@ export default {
               </div>
             </div>
           </template>
-          <!-- <template v-else-if="option.kind === 'divider'">
+          <template v-else-if="option.kind === 'divider'">
             <hr role="none">
-          </template> -->
+          </template>
           <template v-else-if="option.kind === 'highlighted'">
             <div class="option-kind-highlighted">
               {{ option.label }}
@@ -509,11 +530,12 @@ export default {
   // Prevent namespace field from wiggling or changing
   // height when it is toggled from a LabeledInput to a
   // LabeledSelect.
+  // padding-bottom: 1px;
   &:deep() .vs__actions:after {
-      padding-top: 10px;
-    }
-  padding-bottom: 1px;
-  /* flex: 1; */
+    // padding-top: 10px;
+    display: flex;
+    align-items: center;
+  }
 
   &.no-label.compact-input {
     :deep() .vs__actions:after {
@@ -589,7 +611,6 @@ export default {
 
   &.taggable {
     :deep() .vs__selected-options {
-
       padding: 3px 0;
       .vs__selected {
         border-color: var(--accent-btn);