dashboard-shell-shell 1.0.113 → 1.0.114

package/components/form/ArrayList.vue

@@ -1,5 +1,4 @@
 <script>
-import { ref, watch, computed } from 'vue';
 import debounce from 'lodash/debounce';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import { removeAt } from '@shell/utils/array';
@@ -95,87 +94,22 @@ export default {
       // we only want functions in the rules array
       validator: (rules) => rules.every((rule) => ['function'].includes(typeof rule))
     },
-    a11yLabel: {
-      type:    String,
-      default: '',
-    },
-    componentTestid: {
-      type:    String,
-      default: 'array-list',
-    }
   },
-
-  setup(props, { emit }) {
-    const input = (Array.isArray(props.value) ? props.value : []).slice();
-    const rows = ref([]);
+  data() {
+    const input = (Array.isArray(this.value) ? this.value : []).slice();
+    const rows = [];
 
     for ( const value of input ) {
-      rows.value.push({ value });
+      rows.push({ value });
     }
-    if ( !rows.value.length && props.initialEmptyRow ) {
-      const value = props.defaultAddValue ? clone(props.defaultAddValue) : '';
+    if ( !rows.length && this.initialEmptyRow ) {
+      const value = this.defaultAddValue ? clone(this.defaultAddValue) : '';
 
-      rows.value.push({ value });
+      rows.push({ value });
     }
 
-    const isView = computed(() => {
-      return props.mode === _VIEW;
-    });
-
-    /**
-     * Cleanup rows and emit input
-     */
-    const update = () => {
-      if ( isView.value ) {
-        return;
-      }
-      const out = [];
-
-      for ( const row of rows.value ) {
-        const trim = !props.valueMultiline && (typeof row.value === 'string');
-        const value = trim ? row.value.trim() : row.value;
-
-        if ( typeof value !== 'undefined' ) {
-          out.push(value);
-        }
-      }
-      emit('update:value', out);
-    };
-
-    const lastUpdateWasFromValue = ref(false);
-    const queueUpdate = debounce(update, 50);
-
-    watch(
-      rows,
-      () => {
-        // lastUpdateWasFromValue is used to break a cycle where when rows are updated
-        // this was called which then forced rows to updated again
-        if (!lastUpdateWasFromValue.value) {
-          queueUpdate();
-        }
-        lastUpdateWasFromValue.value = false;
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => props.value,
-      () => {
-        lastUpdateWasFromValue.value = true;
-        rows.value = (props.value || []).map((v) => ({ value: v }));
-      },
-      { deep: true }
-    );
-
-    return {
-      rows,
-      lastUpdateWasFromValue,
-      queueUpdate,
-      isView,
-      update,
-    };
+    return { rows, lastUpdateWasFromValue: false };
   },
-
   computed: {
     _addLabel() {
       return this.addLabel || this.t('generic.add');
@@ -183,6 +117,10 @@ export default {
     _removeLabel() {
       return this.removeLabel || this.t('generic.remove');
     },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
     showAdd() {
       return this.addAllowed;
     },
@@ -203,7 +141,29 @@ export default {
       return !this.valueMultiline && this.protip;
     }
   },
+  watch: {
+    value: {
+      deep: true,
+      handler() {
+        this.lastUpdateWasFromValue = true;
+        this.rows = (this.value || []).map((v) => ({ value: v }));
+      }
+    },
+
+    rows: {
+      deep: true,
+      handler(newValue, oldValue) {
+        // lastUpdateWasFromValue is used to break a cycle where when rows are updated
+        // this was called which then forced rows to updated again
+        if (!this.lastUpdateWasFromValue) {
+          this.queueUpdate();
+        }
+        this.lastUpdateWasFromValue = false;
+      }
+    }
+  },
   created() {
+    this.queueUpdate = debounce(this.update, 50);
   },
   methods: {
     add() {
@@ -229,6 +189,26 @@ export default {
       this.queueUpdate();
     },
 
+    /**
+     * Cleanup rows and emit input
+     */
+    update() {
+      if ( this.isView ) {
+        return;
+      }
+      const out = [];
+
+      for ( const row of this.rows ) {
+        const trim = !this.valueMultiline && (typeof row.value === 'string');
+        const value = trim ? row.value.trim() : row.value;
+
+        if ( typeof value !== 'undefined' ) {
+          out.push(value);
+        }
+      }
+      this.$emit('update:value', out);
+    },
+
     /**
      * Handle paste event, e.g. split multiple lines in rows
      */
@@ -274,32 +254,7 @@ export default {
         </h3>
       </slot>
     </div>
-    <div
-      v-if="showAdd && !isView"
-      class="footer"
-    >
-      <slot
-        v-if="showAdd"
-        name="add"
-        :add="add"
-      >
-        <button
-          type="button"
-          class="btn role-primary add"
-          :disabled="loading || disableAdd"
-          :data-testid="`${componentTestid}-button`"
-          :aria-label="_addLabel"
-          role="button"
-          @click="add()"
-        >
-          <i
-            class="mr-5 icon"
-            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
-          />
-          {{ _addLabel }}
-        </button>
-      </slot>
-    </div>
+
     <template v-if="rows.length">
       <div v-if="showHeader">
         <slot name="column-headers">
@@ -311,7 +266,7 @@ export default {
       <div
         v-for="(row, idx) in rows"
         :key="idx"
-        :data-testid="`${componentTestid}-box${ idx }`"
+        :data-testid="`array-list-box${ idx }`"
         class="box"
       >
         <slot
@@ -335,7 +290,7 @@ export default {
                 v-if="valueMultiline"
                 ref="value"
                 v-model:value="row.value"
-                :data-testid="`${componentTestid}-textarea-${idx}`"
+                :data-testid="`textarea-${idx}`"
                 :placeholder="valuePlaceholder"
                 :mode="mode"
                 :disabled="disabled"
@@ -346,7 +301,7 @@ export default {
                 v-else-if="rules.length > 0"
                 ref="value"
                 v-model:value="row.value"
-                :data-testid="`${componentTestid}-labeled-input-${idx}`"
+                :data-testid="`labeled-input-${idx}`"
                 :placeholder="valuePlaceholder"
                 :disabled="isView || disabled"
                 :rules="rules"
@@ -358,10 +313,9 @@ export default {
                 v-else
                 ref="value"
                 v-model="row.value"
-                :data-testid="`${componentTestid}-input-${idx}`"
+                :data-testid="`input-${idx}`"
                 :placeholder="valuePlaceholder"
                 :disabled="isView || disabled"
-                :aria-label="a11yLabel ? a11yLabel : undefined"
                 @paste="onPaste(idx, $event)"
               >
             </slot>
@@ -381,9 +335,7 @@ export default {
               type="button"
               :disabled="isView"
               class="btn role-link"
-              :data-testid="`${componentTestid}-remove-item-${idx}`"
-              :aria-label="`${_removeLabel} ${idx + 1}`"
-              role="button"
+              :data-testid="`remove-item-${idx}`"
               @click="remove(row, idx)"
             >
               {{ _removeLabel }}
@@ -402,7 +354,30 @@ export default {
         </div>
       </slot>
     </div>
-
+    <div
+      v-if="showAdd && !isView"
+      class="footer mt-20"
+    >
+      <slot
+        v-if="showAdd"
+        name="add"
+        :add="add"
+      >
+        <button
+          type="button"
+          class="btn role-tertiary add"
+          :disabled="loading || disableAdd"
+          data-testid="array-list-button"
+          @click="add()"
+        >
+          <i
+            class="mr-5 icon"
+            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
+          />
+          {{ _addLabel }}
+        </button>
+      </slot>
+    </div>
   </div>
 </template>
 
@@ -423,12 +398,7 @@ export default {
     .value {
       flex: 1;
       INPUT {
-        height: $input-height;
-        border: solid var(--border-width) var(--input-border);
-        padding: 4px 11px;
-        &:hover{
-          box-shadow: 0 4px 6px 0 var(--input-border-box-shadow);
-        }
+        height: $unlabeled-input-height;
       }
     }
   }
@@ -436,7 +406,6 @@ export default {
     text-align: right;
   }
   .footer {
-    margin-bottom: 24px;
     .protip {
       float: right;
       padding: 5px 0;
@@ -446,11 +415,4 @@ export default {
   .required {
     color: var(--error);
   }
-  :deep() .labeled-input.compact-input{
-    padding: 0px;
-  }
-  :deep() .box{
-    margin-bottom: 10px;
-  }
-    
 </style>

package/components/form/ArrayListGrouped.vue

@@ -127,16 +127,8 @@ export default {
       & > .remove {
         position: absolute;
 
-        top: 10px;
-        right: 10px;
-        & > .close{
-          width: 32px;
-          min-width: 32px !important;
-          color: var(--body-text);
-          &:hover{
-            color: var(--link);
-          }
-        }
+        top: 0;
+        right: 0;
       }
 
       & > .info-box {

package/components/form/Command.vue

@@ -43,14 +43,23 @@ export default {
   },
 
   data() {
+    const {
+      command,
+      args,
+      workingDir,
+      stdin = false,
+      stdinOnce = false,
+      tty = false,
+    } = this.value;
+
     return {
-      args:           this.value.args,
-      command:        this.value.command,
+      args,
+      command,
       commandOptions: ['No', 'Once', 'Yes'],
-      stdin:          this.value.stdin || false,
-      stdinOnce:      this.value.stdin || false,
-      tty:            this.value.tty || false,
-      workingDir:     this.value.workingDir,
+      stdin,
+      stdinOnce,
+      tty,
+      workingDir,
     };
   },
 

package/components/form/EnvVars.vue

@@ -39,10 +39,14 @@ export default {
   },
 
   data() {
+    const { env = [], envFrom = [] } = this.value;
+
+    const allEnv = [...env, ...envFrom].map((row) => {
+      return { value: row, id: randomStr(4) };
+    });
+
     return {
-      env:     [],
-      envFrom: [],
-      allEnv:  [],
+      env, envFrom, allEnv
     };
   },
 
@@ -59,18 +63,7 @@ export default {
       }
     }
   },
-
   created() {
-    const { env = [], envFrom = [] } = this.value;
-
-    const allEnv = [...env, ...envFrom].map((row) => {
-      return { value: row, id: randomStr(4) };
-    });
-
-    this.env = env;
-    this.envFrom = envFrom;
-    this.allEnv = allEnv;
-
     this.queueUpdate = debounce(this.update, 500);
   },
 
@@ -114,8 +107,7 @@ export default {
   <div :style="{'width':'100%'}">
     <div
       v-for="(row, i) in allEnv"
-      :key="row.id"
-      :data-testid="`env-var-row-${i}`"
+      :key="i"
     >
       <ValueFromResource
         v-model:value="row.value"

package/components/form/Footer.vue

@@ -91,10 +91,9 @@ export default defineComponent({
 
 <style lang='scss'>
   .buttons {
-    /* display: grid;
+    display: grid;
     grid-template-areas:  "left right";
-    grid-template-columns: "min-content auto"; */
-    display: flex;
+    grid-template-columns: "min-content auto";
 
     .left {
       grid-area: left;
@@ -106,13 +105,11 @@ export default defineComponent({
     }
 
     .right {
-      /* grid-area: right;
-      text-align: right; */
-      display: flex;
+      grid-area: right;
+      text-align: right;
 
       .btn, button {
-        /* margin: 0 0 0 $column-gutter; */
-        margin: 0 10px 0 0px;
+        margin: 0 0 0 $column-gutter;
       }
     }
   }

package/components/form/HealthCheck.vue

@@ -18,10 +18,10 @@ export default {
   },
 
   data() {
+    const { readinessProbe, livenessProbe, startupProbe } = this.value;
+
     return {
-      readinessProbe: this.value.readinessProbe,
-      livenessProbe:  this.value.livenessProbe,
-      startupProbe:   this.value.startupProbe,
+      readinessProbe, livenessProbe, startupProbe
     };
   },
 

package/components/form/HookOption.vue

@@ -28,18 +28,23 @@ export default {
   },
 
   data() {
+    const selectHook = null;
+
+    const defaultExec = { exec: { command: [] } };
+    const defaultHttpGet = {
+      httpGet: {
+        host:        '',
+        path:        '',
+        port:        null,
+        scheme:      '',
+        httpHeaders: null
+      }
+    };
+
     return {
-      selectHook:     null,
-      defaultExec:    { exec: { command: [] } },
-      defaultHttpGet: {
-        httpGet: {
-          host:        '',
-          path:        '',
-          port:        null,
-          scheme:      '',
-          httpHeaders: null
-        }
-      },
+      selectHook,
+      defaultExec,
+      defaultHttpGet,
       schemeOptions: ['HTTP', 'HTTPS']
     };
   },

package/components/form/KeyValue.vue

@@ -277,7 +277,7 @@ export default {
       const gap = this.canRemove ? ' 50px' : '';
       const size = 2 + this.extraColumns.length;
 
-      return `grid-template-columns: repeat(${ size }, 400px)${ gap };`;
+      return `grid-template-columns: repeat(${ size }, 1fr)${ gap };`;
     },
     usedKeyOptions() {
       return this.rows.map((row) => row[this.keyName]);
@@ -760,7 +760,7 @@ export default {
                     :disabled="disabled || isProtected(row.key)"
                     :mode="mode"
                     :placeholder="_valuePlaceholder"
-                    :min-height="32"
+                    :min-height="40"
                     :spellcheck="false"
                     :aria-label="t('generic.ariaLabel.value', {index: i})"
                     @update:value="queueUpdate"
@@ -823,7 +823,7 @@ export default {
                   type="button"
                   role="button"
                   :disabled="isView || isProtected(row.key) || disabled"
-                  :aria-label="`${removeLabel || t('generic.remove')} ${ i+1 }`"
+                  :aria-label="removeLabel || t('generic.remove')"
                   class="btn role-link"
                   @click="remove(i)"
                 >
@@ -837,7 +837,7 @@ export default {
     </div>
     <div
       v-if="(addAllowed || readAllowed) && !isView"
-      class="footer mt-10"
+      class="footer mt-20"
     >
       <slot
         name="add"
@@ -880,8 +880,8 @@ export default {
   }
   .kv-container {
     display: grid;
-    /* align-items: center; */
-    column-gap: 10px;
+    align-items: center;
+    column-gap: 20px;
     label {
       margin-bottom: 0;
     }
@@ -905,9 +905,6 @@ export default {
       }
       &.value textarea {
         padding: 10px 10px 10px 10px;
-        min-height:32px;
-        line-height: 12px; 
-        border: solid var(--border-width) var(--input-border);       
       }
 
       .text-monospace:not(.conceal) {
@@ -946,14 +943,8 @@ export default {
     }
   }
   input {
-    height: 32px;
+    height: 40px;
     line-height: 1;
-    border: solid var(--border-width) var(--input-border);
-    padding: 4px 11px;
-    &:hover{
-      border: solid var(--border-width) var(--input-border);
-      box-shadow: 0 4px 6px 0 var(--input-border-box-shadow);
-    }
   }
   .footer {
     .protip {