fix: onPaste separate logic in KeyValue.vue

Signed-off-by: andy.lee <[email protected]>
harvester · May 5, 2024 · 61e0227 · 61e0227
1 parent bbc89cc
commit 61e0227
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
@@ -410,15 +410,6 @@ export default {
           @focusKey="focusKey"
           @input="value.setLabels($event)"
         >
-          <template #key="{ row, keyName, queueUpdate}">
-            <input
-              ref="key"
-              v-model="row[keyName]"
-              :placeholder="t('keyValue.keyPlaceholder')"
-              @input="queueUpdate"
-            />
-          </template>
-
           <template #value="{row, keyName, valueName, queueUpdate}">
             <Select
               v-if="internalAnnotations(row)"

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
@@ -6916,7 +6916,7 @@ podAffinity:
 keyValue:
   keyPlaceholder: e.g. foo
   valuePlaceholder: e.g. bar
-  protip: 'Paste lines of <em>key=value</em> or <em>key: value</em> into any key field for easy bulk entry'
+  protip: 'Paste lines of <em>key=value</em> or <em>key:value</em> into any key field for easy bulk entry'
 
 registryMirror:
   header: Mirrors

diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
@@ -237,7 +237,7 @@ export default {
     },
     parserSeparators: {
       type:    Array,
-      default: () => [': ', '='],
+      default: () => [':', '='],
     },
     loading: {
       default: false,
@@ -492,14 +492,14 @@ export default {
       }
       this.$emit('input', out);
     },
-    onPaste(index, event, pastedValue) {
+    onPaste(index, event) {
       const text = event.clipboardData.getData('text/plain');
       const lines = text.split('\n');
       const splits = lines.map((line) => {
-        const splitter = !line.includes(':') || ((line.indexOf('=') < line.indexOf(':')) && line.includes(':')) ? '=' : ':';
+        const splitter = this.parserSeparators.find(sep => line.includes(sep));
 
-        return line.split(splitter);
-      });
+        return splitter ? line.split(splitter) : '';
+      }).filter(split => split && split.length > 0);
 
       if (splits.length === 0 || (splits.length === 1 && splits[0].length < 2)) {
         return;