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

package/edit/workload/index.vue

@@ -20,19 +20,10 @@ export default {
     },
   },
   data() {
-    return { selectedName: null, closedErrorMessages: [] };
+    return { selectedName: null, errors: [] };
   },
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-    errorMessages() {
-      if (!this.type) {
-        return [];
-      }
-
-      return this.fvUnreportedValidationErrors.filter((e) => !this.closedErrorMessages.includes(e));
-    }
-  },
-  methods: {
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+  methods:  {
     changed(tab) {
       const key = this.idKey;
 
@@ -94,7 +85,7 @@ export default {
       :selected-subtype="type"
       :resource="value"
       :mode="mode"
-      :errors="errorMessages"
+      :errors="errors"
       :done-route="doneRoute"
       :subtypes="workloadSubTypes"
       :apply-hooks="applyHooks"
@@ -102,7 +93,7 @@ export default {
       :errors-map="getErrorsMap(fvUnreportedValidationErrors)"
       @finish="save"
       @select-type="selectType"
-      @error="(_, closedError) => closedErrorMessages.push(closedError)"
+      @error="e=>errors = e"
     >
       <NameNsDescription
         :value="value"
@@ -117,7 +108,7 @@ export default {
       >
         <div
           v-if="isCronJob"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value="spec.schedule"
@@ -131,7 +122,7 @@ export default {
         </div>
         <div
           v-if="isReplicable"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value.number="spec.replicas"
@@ -144,7 +135,7 @@ export default {
         </div>
         <div
           v-if="isStatefulSet"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledSelect
             v-model:value="spec.serviceName"
@@ -163,6 +154,7 @@ export default {
         :show-tabs-add-remove="true"
         :default-tab="defaultTab"
         :flat="true"
+        :use-hash="useTabbedHash"
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >
@@ -178,6 +170,7 @@ export default {
             :side-tabs="true"
             :weight="99"
             :data-testid="`workload-container-tabs-${i}`"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.container.titles.general')"
@@ -193,6 +186,7 @@ export default {
                   type="button"
                   class="btn-sm role-link"
                   @click="removeContainer(tab)"
+                  style="min-width: auto;padding-left: 0;"
                 >
                   {{ t('workload.container.removeContainer') }}
                 </button>
@@ -200,7 +194,7 @@ export default {
               <div>
                 <div
                   :style="{'align-items':'center'}"
-                  class="row mb-20"
+                  class="row"
                 >
                   <div class="col span-6">
                     <LabeledInput
@@ -220,8 +214,8 @@ export default {
                     />
                   </div>
                 </div>
-                <h3>{{ t('workload.container.titles.image') }}</h3>
-                <div class="row mb-20">
+                <h3 class="mt-20">{{ t('workload.container.titles.image') }}</h3>
+                <div class="row">
                   <div class="col span-6">
                     <LabeledInput
                       v-model:value.trim="allContainers[i].image"
@@ -257,15 +251,15 @@ export default {
                   </div>
                 </div>
               </div>
-              <div class="spacer" />
               <div>
-                <h3>
+                <h3 class="mt-20">
                   {{ t('workload.container.ports.expose') }}
                   <i
                     v-clean-tooltip="{content: t('workload.container.ports.toolTip'), triggers: ['hover', 'touch', 'focus'] }"
                     v-stripped-aria-label="t('workload.container.ports.toolTip')"
                     class="icon icon-info"
                     tabindex="0"
+                    role="tooltip"
                   />
                 </h3>
                 <p class="padded">
@@ -280,8 +274,7 @@ export default {
                   />
                 </div>
               </div>
-              <div class="spacer" />
-              <div>
+              <div class="mt-40">
                 <h3>{{ t('workload.container.titles.command') }}</h3>
                 <Command
                   v-model:value="allContainers[i]"
@@ -301,8 +294,7 @@ export default {
                 :loading="isLoadingSecondaryResources"
                 @update:value="updateServiceAccount"
               />
-              <div class="spacer" />
-              <div>
+              <div class="mt-40">
                 <h3>{{ t('workload.container.titles.lifecycle') }}</h3>
                 <LifecycleHooks
                   v-model:value="allContainers[i].lifecycle"
@@ -373,6 +365,7 @@ export default {
           <Tabbed
             data-testid="workload-general-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               name="labels"
@@ -414,6 +407,7 @@ export default {
           <Tabbed
             data-testid="workload-pod-tabs"
             :side-tabs="true"
+            :use-hash="useTabbedHash"
           >
             <Tab
               :label="t('workload.storage.title')"
@@ -453,8 +447,7 @@ export default {
                   </div>
                 </div>
 
-                <div>
-                  <div class="spacer" />
+                <div class="mt-40">
                   <h3 class="mb-10">
                     <t k="workload.scheduling.titles.priority" />
                   </h3>
@@ -567,7 +560,7 @@ export default {
             >
               <div>
                 <h3>{{ t('workload.container.titles.podLabels') }}</h3>
-                <div class="row mb-20">
+                <div class="row">
                   <KeyValue
                     key="labels"
                     v-model:value="podLabels"
@@ -577,8 +570,7 @@ export default {
                     :protip="false"
                   />
                 </div>
-                <div class="spacer" />
-                <h3>{{ t('workload.container.titles.podAnnotations') }}</h3>
+                <h3 class="mt-40">{{ t('workload.container.titles.podAnnotations') }}</h3>
                 <div class="row">
                   <KeyValue
                     key="annotations"
@@ -668,10 +660,18 @@ export default {
 .deployment-tabs {
   > .tabs.horizontal {
     border-bottom: 1px solid var(--border);
-    margin-bottom: 10px;
+  }
+
+  > .tab-container{
+    padding: 20px 20px 0;
+    // border: none !important;
   }
 }
 .padded {
   padding-bottom: 10px;
 }
+
+H3{
+  font-size: 14px;
+}
 </style>

package/edit/workload/mixins/workload.js

@@ -52,8 +52,6 @@ import { TYPES as SECRET_TYPES } from '@shell/models/secret';
 import { defaultContainer } from '@shell/models/workload';
 import { allHash } from '@shell/utils/promise';
 
-import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
-
 const TAB_WEIGHT_MAP = {
   general:              99,
   healthCheck:          98,

package/edit/workload/storage/Mount.vue

@@ -148,6 +148,7 @@ export default {
 
   .remove BUTTON {
     padding: 0px;
+    min-width: auto;
   }
 }
 

package/edit/workload/storage/awsElasticBlockStore.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.awsElasticBlockStore.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.awsElasticBlockStore.volumeID"
           :required="true"
@@ -52,7 +52,9 @@ export default {
           :label="t('workload.storage.csi.volumeID')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.awsElasticBlockStore.partition"
           :mode="mode"
@@ -61,7 +63,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.awsElasticBlockStore.fsType"
           :mode="mode"

package/edit/workload/storage/azureDisk.vue

@@ -34,8 +34,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -43,7 +43,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.azureDisk.readOnly"
           :mode="mode"
@@ -51,8 +51,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureDisk.diskName"
           :mode="mode"
@@ -60,7 +60,9 @@ export default {
           :label="t('workload.storage.csi.diskName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.azureDisk.diskURI"
           :mode="mode"
@@ -69,8 +71,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="value.azureDisk.kind"
           :mode="mode"
@@ -80,7 +82,9 @@ export default {
           :labels="[t('workload.storage.csi.kind.options.dedicated'), t('workload.storage.csi.kind.options.managed'), t('workload.storage.csi.kind.options.shared')]"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="value.azureDisk.cachingMode"
           name="cachingMode"
@@ -92,7 +96,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureDisk.fsType"
           :mode="mode"

package/edit/workload/storage/azureFile.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.azureFile.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.shareName"
           :mode="mode"
@@ -52,7 +52,9 @@ export default {
           :label="t('workload.storage.csi.shareName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.secretName"
           :mode="mode"
@@ -62,7 +64,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.fsType"
           :mode="mode"

package/edit/workload/storage/csi/index.vue

@@ -77,8 +77,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -86,7 +86,7 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
           <Checkbox
             v-model:value="value.csi.readOnly"
             :mode="mode"
@@ -94,8 +94,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-model:value="value.csi.driver"
             data-testid="workload-storage-driver"
@@ -107,10 +107,7 @@ export default {
           />
         </div>
       </div>
-      <div
-        v-if="driverComponent"
-        class="mb-10"
-      >
+      <div v-if="driverComponent">
         <component
           :is="driverComponent"
           v-model:value="value.csi.volumeAttributes"

package/edit/workload/storage/emptyDir.vue

@@ -52,8 +52,8 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -61,7 +61,9 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="medium"
           :mode="mode"
@@ -71,8 +73,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <UnitInput
           v-model:value="value.emptyDir.sizeLimit"
           :mode="mode"

package/edit/workload/storage/gcePersistentDisk.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.gcePersistentDisk.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.pdName"
           :mode="mode"
@@ -52,7 +52,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.gcePersistentDisk.partition"
           :mode="mode"
@@ -61,7 +63,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.fsType"
           :mode="mode"

package/edit/workload/storage/hostPath.vue

@@ -82,8 +82,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -92,8 +92,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.hostPath.path"
             :required="true"
@@ -101,7 +101,9 @@ export default {
             :label="t('workload.storage.nodePath')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-model:value="value.hostPath.type"
             :mode="mode"

package/edit/workload/storage/nfs.vue

@@ -38,8 +38,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -47,7 +47,7 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
           <Checkbox
             v-model:value="value.nfs.readOnly"
             :mode="mode"
@@ -55,8 +55,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.path"
             :required="true"
@@ -64,7 +64,9 @@ export default {
             :label="t('workload.storage.path')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.server"
             :required="true"

package/edit/workload/storage/persistentVolumeClaim/index.vue

@@ -121,8 +121,8 @@ export default {
           @removePvcForm="removePvcForm"
         />
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -130,7 +130,16 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
+          <Checkbox
+            v-model:value="value.persistentVolumeClaim.readOnly"
+            :mode="mode"
+            :label="t('workload.storage.readOnly')"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-if="!createNew"
             v-model:value="value.persistentVolumeClaim.claimName"
@@ -142,13 +151,6 @@ export default {
           />
         </div>
       </div>
-      <div class="row">
-        <Checkbox
-          v-model:value="value.persistentVolumeClaim.readOnly"
-          :mode="mode"
-          :label="t('workload.storage.readOnly')"
-        />
-      </div>
     </div>
   </div>
 </template>