bfg-common 1.5.78 → 1.5.80

package/components/common/wizards/datastore/add/Add.vue

@@ -85,12 +85,18 @@ const validationFunc = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.nameAndDevice,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await validation.checkDatastoreNameAsync(
       localization.value,
       value,
       form.value,
-      2,
+      dynamicSteps.nameAndDevice,
       'datastoreName',
       wizard,
       props.project

package/components/common/wizards/datastore/add/New.vue

@@ -18,8 +18,13 @@
       >
         <template #subTitle>
           <div ref="subTitleBlock0">
-            <div class="subtitle-block">
+            <div class="subtitle-block flex-row">
               <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
+
+              <common-wizards-datastore-add-steps-common-tooltip-info
+                id="datastore-type-subtitle-tooltip"
+                :description="localization.common.datastoreTypeHelpDesc"
+              />
             </div>
           </div>
         </template>
@@ -90,7 +95,6 @@
             v-model="formModelLocal"
             :project="props.project"
             :messages-fields="selectedStep.fields"
-            @hide-alert="(e) => emits('hide-alert', e)"
           />
         </template>
       </ui-wizard-block>
@@ -252,6 +256,10 @@ const onCreateDatastore = (): void => emits('submit')
   border-bottom: 1px solid var(--wizard-line);
   padding-bottom: 12px;
 
+  &.flex-row {
+    flex-direction: row;
+  }
+
   :deep(&__alert) {
     padding: 10px 12px;
   }

package/components/common/wizards/datastore/add/lib/validations.ts

@@ -83,14 +83,14 @@ export const checkSelectedLunDiskSync = (
   if (!lunDisk.length && name) {
     const isErrorTextForSphere =
       project === 'sphere' && !hostId && !hosts.length
-    stepHasError = wizard.setValidation(2, 'lunDisk', {
+    stepHasError = wizard.setValidation(dynamicSteps.nameAndDevice, 'lunDisk', {
       fieldMessage: '',
       alertMessage: isErrorTextForSphere
         ? localization.common.selectHostToContinueAlert
         : localization.common.selectDiskToContinueAlert,
     })
-  } else if (wizard.hasMessage(2, 'lunDisk')) {
-    value = wizard.removeValidation(2, 'lunDisk', value)
+  } else if (wizard.hasMessage(dynamicSteps.nameAndDevice, 'lunDisk')) {
+    value = wizard.removeValidation(dynamicSteps.nameAndDevice, 'lunDisk', value)
   }
 
   return {

package/components/common/wizards/datastore/add/steps/common/tooltipInfo/TooltipInfo.vue

@@ -1,22 +1,23 @@
 <template>
   <div class="tooltip-info">
     <ui-icon
-      :id="`task-error-info-icon-${props.id}`"
+      :id="`${props.id}-info-trigger`"
       name="info"
-      width="16px"
-      height="16px"
-      :class="['info-icon pointer', { show: isShowInfo }]"
-      @click.stop="emits('toggle-error', props.id)"
+      width="16"
+      height="16"
+      :class="['tooltip-info__icon pointer', { active: isShowInfo }]"
+      @click.stop="isShowInfo = !isShowInfo"
     />
     <ui-popup-window
       v-model="isShowInfo"
       top
       left
-      :elem-id="`task-error-info-icon-${props.id}`"
+      width="272px"
+      :elem-id="`${props.id}-info-trigger`"
     >
       <div class="common-widget-info">
-        <div class="headline justify-between flex-align-center">
-          <div class="flex-align-center">
+        <div class="flex justify-between">
+          <div class="flex">
             <ui-icon name="info-2" width="16px" height="16px" />
             <span class="title"> {{ localization.common.information }}</span>
           </div>
@@ -25,12 +26,12 @@
             class="pointer hide-icon"
             width="16px"
             height="16px"
-            @click.stop="emits('toggle-error', '')"
+            @click.stop="isShowInfo = false"
           />
         </div>
 
         <div class="common-widget-info-description">
-          {{ props.info }}
+          {{ props.description }}
         </div>
       </div>
     </ui-popup-window>
@@ -40,46 +41,31 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const props = withDefaults(
-  defineProps<{
-    id: string
-    info: string
-    openedError: string
-  }>(),
-  {}
-)
+const props = defineProps<{
+  id: string
+  description: string
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const emits = defineEmits<{
-  (event: 'toggle-error', value: string): void
-}>()
-
-const isShowInfo = computed<boolean>({
-  get() {
-    return props.openedError === props.id
-  },
-  set() {
-    emits('toggle-error', '')
-  },
-})
+const isShowInfo = ref<boolean>(false)
 </script>
 
 <style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
 .tooltip-info {
-  .info-icon {
+  @include flex($align: center);
+  &__icon {
     color: var(--form-icon-color);
-
     &:hover {
       color: var(--close-icon);
     }
-    &.show {
+    &.active {
       color: var(--btn-primary-fill-bg-color);
     }
   }
 
   .common-widget-info {
-    width: 232px;
     padding: 16px;
 
     .title {
@@ -90,15 +76,17 @@ const isShowInfo = computed<boolean>({
       margin-left: 8px;
     }
 
-    .hide-icon {
-      color: var(--alert-icon);
-    }
-
     .common-widget-info-description {
       font-size: 13px;
       line-height: 15.73px;
       color: var(--zabbix-text-color);
       margin-top: 12px;
+      white-space: pre-line;
+    }
+
+    svg {
+      color: var(--alert-icon);
+      min-width: 16px;
     }
   }
 }

package/components/common/wizards/datastore/add/steps/nameAndConfigure/NameAndConfigureNew.vue

@@ -8,20 +8,66 @@
       </div>
       <div class="basics-step-row-content">
         <ui-input
-          id="name"
+          id="configuration-name-input"
           v-model="formModelLocal.name"
-          test-id="new-host-name-field"
-          :placeholder="localization.common.hostNameOrIPAddress"
+          test-id="configuration-name-input"
           is-focused
-          :error="errorText"
-          @input="onRemoveValidationErrors"
+          :error="nameErrorText"
+          @blur="initValidation(true, ['name'])"
+          @input="initValidation(false, ['name'])"
         />
       </div>
     </div>
 
     <div class="basics-step-line"></div>
 
-    {{ isShowAlertInfo }}
+    <div class="basics-step-row">
+      <div class="basics-step-row-title">
+        <span class="basics-step-row-title-text">
+          {{ localization.common.folder }}
+        </span>
+        <common-wizards-datastore-add-steps-common-tooltip-info
+          :id="'option.testId'"
+          :description="'Specify the folder path - for example, /vols/vol0/datastore-001'"
+        />
+      </div>
+      <div class="basics-step-row-content">
+        <ui-input
+          id="configuration-folder-input"
+          v-model="formModelLocal.folder"
+          test-id="configuration-folder-input"
+          placeholder="E.g: /vols/vol0/datastore-001"
+          :error="folderErrorText"
+          @blur="initValidation(true, ['folder'])"
+          @input="initValidation(false, ['folder'])"
+        />
+      </div>
+    </div>
+
+    <div class="basics-step-line"></div>
+
+    <div class="basics-step-row">
+      <div class="basics-step-row-title">
+        <span class="basics-step-row-title-text">
+          {{ localization.common.server }}
+        </span>
+        <common-wizards-datastore-add-steps-common-tooltip-info
+          :id="'option.testIdserver'"
+          :description="'Specify the server address - for example, nas, nas.it.com or 192.168.0.1.'"
+        />
+      </div>
+      <div class="basics-step-row-content">
+        <ui-input
+          id="configuration-server-input"
+          v-model="formModelLocal.server"
+          test-id="configuration-server-input"
+          placeholder="E.g: nas, nas.it.com or 192.168.0.1"
+          :error="serverErrorText"
+          @blur="initValidation(true, ['server'])"
+          @input="initValidation(false, ['server'])"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
@@ -31,7 +77,7 @@ import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/inter
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
-const isShowAlertInfo = defineModel<boolean>('alertInfo', { required: true })
+// const isShowAlertInfo = defineModel<boolean>('alertInfo', { required: true })
 
 const props = defineProps<{
   messagesFields: UI_I_WizardStep['fields']
@@ -42,9 +88,50 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onRemoveValidationErrors = (): void => {
-  emits('remove-errors')
+const initValidationFields = ref<UI_I_InitialValidationFields>({
+  name: false,
+  folder: false,
+  server: false,
+})
+const initValidation = (onlyBlur = false, types: string[]): void => {
+  onlyBlur && types.forEach((type) => (initValidationFields.value[type] = true))
 }
+
+/* Validation error text for Name input field */
+const nameErrorText = computed<string>(() => {
+  if (props.messagesFields?.name?.field && !formModelLocal.value.name) {
+    return props.messagesFields.name.field
+  }
+
+  if (!initValidationFields.value.name) return ''
+  return !formModelLocal.value.name
+    ? localization.value.common.specifyDatastoreName
+    : ''
+})
+
+/* Validation error text for Folder input field */
+const folderErrorText = computed<string>(() => {
+  if (props.messagesFields.folder?.field && !formModelLocal.value.folder) {
+    return props.messagesFields.folder.field
+  }
+
+  if (!initValidationFields.value.folder) return ''
+  return !formModelLocal.value.folder
+    ? localization.value.common.specifyFolderName
+    : ''
+})
+
+/* Validation error text for Server input field */
+const serverErrorText = computed<string>(() => {
+  if (props.messagesFields.server?.field && !formModelLocal.value.server) {
+    return props.messagesFields.server.field
+  }
+
+  if (!initValidationFields.value.server) return ''
+  return !formModelLocal.value.server
+    ? localization.value.common.specifyServerName
+    : ''
+})
 </script>
 
 <style scoped lang="scss">

package/components/common/wizards/datastore/add/steps/typeMode/TypeModeNew.vue

@@ -19,9 +19,7 @@
         <template #tooltip>
           <common-wizards-datastore-add-steps-common-tooltip-info
             :id="option.testId"
-            :info="option.tooltipContent"
-            :opened-error="openedError"
-            @toggle-error="onToggleError"
+            :description="option.tooltipContent"
           />
         </template>
       </ui-radio>
@@ -39,16 +37,6 @@ const props = defineProps<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-
-const openedError = ref<string>('')
-
-const onToggleError = (value: string): void => {
-  if (!value || value === openedError.value) {
-    openedError.value = ''
-  } else {
-    openedError.value = value
-  }
-}
 </script>
 
 <style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.78",
+  "version": "1.5.80",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",