bfg-common 1.5.77 → 1.5.79

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

@@ -42,9 +42,10 @@ import {
   stepsFunc,
   stepsSchemeInitial,
   getStepScheme,
+  dynamicSteps,
 } from '~/components/common/wizards/datastore/add/lib/config/steps'
 import { datastoreDefaultFormFunc } from '~/components/common/wizards/datastore/add/lib/config/createDatastore'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import * as validation from '~/components/common/wizards/datastore/add/lib/validations'
 
 const props = defineProps<{
@@ -84,28 +85,18 @@ const validationFunc = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const nameValidation = await validation.checkDatastoreNameAsync(
-      localization.value,
-      value,
-      form.value,
-      1,
-      'datastoreName',
-      wizard,
-      props.project
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.nameAndDevice,
+      currentStep.id,
+      nextStep.id
     )
-
-    value = nameValidation.newValue
-
-    stepHasError = nameValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
+  ) {
     const nameValidation = await validation.checkDatastoreNameAsync(
       localization.value,
       value,
       form.value,
-      2,
+      dynamicSteps.nameAndDevice,
       'datastoreName',
       wizard,
       props.project
@@ -127,12 +118,18 @@ const validationFunc = async (
     stepHasError = nameValidation.stepHasError || lunDiskValidation.stepHasError
   }
 
-  if (wizard.isValidateForStep(4, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.nameAndConfigure,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await validation.checkDatastoreNameAsync(
       localization.value,
       value,
       form.value,
-      4,
+      dynamicSteps.nameAndConfigure,
       'name',
       wizard,
       props.project

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

@@ -90,7 +90,6 @@
             v-model="formModelLocal"
             :project="props.project"
             :messages-fields="selectedStep.fields"
-            @hide-alert="(e) => emits('hide-alert', e)"
           />
         </template>
       </ui-wizard-block>
@@ -103,7 +102,9 @@
           <div ref="subTitleBlock3">
             <div class="subtitle-block">
               <ui-alert
-                v-if="props.alertMessages[dynamicSteps.hostAccessibility].length"
+                v-if="
+                  props.alertMessages[dynamicSteps.hostAccessibility].length
+                "
                 test-id="add-host-assign-license-error-alert"
                 type="error"
                 size="md"
@@ -127,25 +128,19 @@
       </ui-wizard-block>
 
       <ui-wizard-block
-        v-if="selectedStep.id === dynamicSteps.lockdownMode"
+        v-if="selectedStep.id === dynamicSteps.readyComplete"
         :sub-title-height="height4"
       >
         <template #subTitle>
           <div ref="subTitleBlock4">
             <div class="subtitle-block">
               <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
-              <ui-wizard-subtitle
-                :sub-title="localization.common.whenEnabledLockdown"
-              />
-              <ui-wizard-subtitle
-                :sub-title="localization.common.leaveLockdownDefault"
-              />
             </div>
           </div>
         </template>
         <template #content>
-          <common-wizards-datastore-add-ready-complete
-            v-show="selectedStep.id === 11"
+          <common-wizards-datastore-add-steps-ready-complete
+            v-if="selectedStep.id === dynamicSteps.readyComplete"
             :data-ready-view="dataReadyView"
           />
         </template>
@@ -167,7 +162,7 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })

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

@@ -40,7 +40,6 @@
           @hide-alert="(e) => emits('hide-alert', e)"
         />
 
-
         <common-wizards-datastore-add-steps-host-accessibility
           v-if="selectedStep.id === dynamicSteps.hostAccessibility"
           v-model="formModelLocal.hosts"
@@ -49,6 +48,11 @@
           @hide-alert="(e) => emits('hide-alert', e)"
         />
 
+        <common-wizards-datastore-add-steps-ready-complete
+          v-if="selectedStep.id === dynamicSteps.readyComplete"
+          :data-ready-view="dataReadyView"
+        />
+
         <common-wizards-datastore-add-shared-storm
           v-if="datastoreType === 'shared-storm'"
           v-model="formModelLocal"
@@ -73,11 +77,6 @@
           :messages-fields="selectedStep.fields"
           :hosts="props.nfsHosts"
         />
-
-        <common-wizards-datastore-add-ready-complete
-          v-show="selectedStep.id === 11"
-          :data-ready-view="dataReadyView"
-        />
       </template>
     </atoms-wizard>
   </div>
@@ -92,7 +91,7 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })

package/components/common/wizards/datastore/add/lib/config/steps.ts

@@ -4,14 +4,11 @@ import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/inter
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
 import type { UI_I_ChangeStepsSchemes } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
-
 export const dynamicSteps = {
   type: 0,
   nameAndDevice: 1,
   nameAndConfigure: 2,
   hostAccessibility: 3,
-  lockdownMode: 4,
-  vmLocation: 5,
   readyComplete: 6,
 }
 export const stepsFunc = (
@@ -131,7 +128,7 @@ export const stepsFunc = (
   //   testId: 'select-kerberos-authentication',
   // },
   {
-    id: 11,
+    id: dynamicSteps.readyComplete,
     title: localization.common.readyComplete,
     subTitle: localization.common.readyCompleteDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
@@ -142,14 +139,18 @@ export const stepsFunc = (
 ]
 
 export const stepsSchemeInitial: number[][] = [
-  [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Procurator Scheme for "shared-storm" type
-  [dynamicSteps.type, dynamicSteps.nameAndConfigure, 11], // Procurator Scheme for "nfs" type
-  [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Sphere Scheme for "shared-storm" type
+  [dynamicSteps.type, dynamicSteps.nameAndDevice, dynamicSteps.readyComplete], // Procurator Scheme for "shared-storm" type
+  [
+    dynamicSteps.type,
+    dynamicSteps.nameAndConfigure,
+    dynamicSteps.readyComplete,
+  ], // Procurator Scheme for "nfs" type
+  [dynamicSteps.type, dynamicSteps.nameAndDevice, dynamicSteps.readyComplete], // Sphere Scheme for "shared-storm" type
   [
     dynamicSteps.type,
     dynamicSteps.nameAndConfigure,
     dynamicSteps.hostAccessibility,
-    11,
+    dynamicSteps.readyComplete,
   ], // Sphere Scheme for "nfs" type (not used from <host Context Menu>)
 ]
 

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

@@ -8,7 +8,7 @@ import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
-
+import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 const checkName = async (
   form: UI_I_CreateDatastoreForm,
   localization: UI_I_Localization,
@@ -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 {
@@ -108,12 +108,20 @@ export const checkNfsFolderSync = (
   let stepHasError = false
 
   if (!name) {
-    stepHasError = wizard.setValidation(4, 'folder', {
-      fieldMessage: localization.common.specifyFolderName,
-      alertMessage: '',
-    })
-  } else if (wizard.hasMessage(4, 'folder')) {
-    value = wizard.removeValidation(4, 'folder', value)
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'folder',
+      {
+        fieldMessage: localization.common.specifyFolderName,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'folder')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'folder',
+      value
+    )
   }
 
   return {
@@ -131,12 +139,20 @@ export const checkNfsServerSync = (
   let stepHasError = false
 
   if (!name) {
-    stepHasError = wizard.setValidation(4, 'server', {
-      fieldMessage: localization.common.specifyServerName,
-      alertMessage: '',
-    })
-  } else if (wizard.hasMessage(4, 'server')) {
-    value = wizard.removeValidation(4, 'server', value)
+    stepHasError = wizard.setValidation(
+      dynamicSteps.nameAndConfigure,
+      'server',
+      {
+        fieldMessage: localization.common.specifyServerName,
+        alertMessage: '',
+      }
+    )
+  } else if (wizard.hasMessage(dynamicSteps.nameAndConfigure, 'server')) {
+    value = wizard.removeValidation(
+      dynamicSteps.nameAndConfigure,
+      'server',
+      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,7 +26,7 @@
             class="pointer hide-icon"
             width="16px"
             height="16px"
-            @click.stop="emits('toggle-error', '')"
+            @click.stop="isShowInfo = false"
           />
         </div>
 
@@ -44,42 +45,30 @@ const props = withDefaults(
   defineProps<{
     id: string
     info: string
-    openedError: 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,16 +79,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;
     }
+
+    svg {
+      color: var(--alert-icon);
+      min-width: 16px;
+    }
   }
 }
 </style>

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

@@ -1,185 +1,43 @@
 <template>
-  <div class="configuration">
-    <div>
-      <atoms-alert
-        v-show="props.alertMessages?.length"
-        test-id="configure-error-alert"
-        status="alert-danger"
-        :items="props.alertMessages"
-        @remove="onHideAlert"
-      />
-
-      <atoms-alert
-        v-show="alertInfo"
-        test-id="configure-information-alert"
-        status="alert-info"
-        :items="[localization.common.nameAndConfigurationAlertInfo]"
-        @remove="alertInfo = false"
-      />
-      <h6 class="nd-mt-0">{{ localization.common.nfsShareDetails }}</h6>
-
-      <div class="clr-form-control clr-row">
-        <label for="" class="clr-control-label clr-col-md-2">
-          {{ localization.common.name }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="nameErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center">
-            <input
-              id="configuration-name-input"
-              v-model="model.name"
-              data-id="configuration-name-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['name'])"
-              @input="initValidation(false, ['name'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div class="clr-subtext" data-id="nfs-datastore-name-field-require">
-            {{ nameErrorText }}
-          </div>
-        </div>
-      </div>
-
-      <div class="clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.folder }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="folderErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center">
-            <input
-              id="configuration-folder-input"
-              v-model="model.folder"
-              data-id="configuration-folder-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['folder'])"
-              @input="initValidation(false, ['folder'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-
-          <div
-            v-if="folderErrorText"
-            class="clr-subtext"
-            data-id="folder-name-field-require"
-          >
-            {{ folderErrorText }}
-          </div>
-          <div v-else class="clr-subtext">E.g: /vols/vol0/datastore-001</div>
-        </div>
-      </div>
-
-      <div class="nd-mt-0 clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">
-          {{ localization.common.server }}
-        </label>
-
-        <div
-          class="clr-control-container"
-          :class="serverErrorText && 'clr-error'"
-        >
-          <div class="flex-align-center input-action-wrapper">
-            <input
-              id="configuration-server-input"
-              v-model="model.server"
-              data-id="configuration-server-input"
-              type="text"
-              class="clr-input"
-              @blur="initValidation(true, ['server'])"
-              @input="initValidation(false, ['server'])"
-            />
-            <atoms-the-icon class="error-icon" name="info-circle" />
-          </div>
-          <div
-            v-if="serverErrorText"
-            class="clr-subtext"
-            data-id="server-name-field-require"
-          >
-            {{ serverErrorText }}
-          </div>
-          <div v-else class="clr-subtext">
-            E.g: nas, nas.it.com or 192.168.0.1
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <common-wizards-datastore-add-steps-name-and-configure-new
+    v-if="isNewView"
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :messages-fields="props.messagesFields"
+  />
+
+  <common-wizards-datastore-add-steps-name-and-configure-old
+    v-else
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
+    @hide-alert="(e) => emits('hide-alert', e)"
+  />
 </template>
 
 <script lang="ts" setup>
 import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_ArbitraryObject,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_InitialValidationFields } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
+const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const props = defineProps<{
   project: UI_T_Project
   alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  messagesFields: UI_I_WizardStep['fields']
 }>()
-const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
 
-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))
-}
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-/* Validation error text for Name input field */
-const nameErrorText = computed<string>(() => {
-  if (props.messagesFields?.name?.field && !model.value.name) {
-    return props.messagesFields.name.field
-  }
-
-  if (!initValidationFields.value.name) return ''
-  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
-})
-
-/* Validation error text for Folder input field */
-const folderErrorText = computed<string>(() => {
-  if (props.messagesFields.folder?.field && !model.value.folder) {
-    return props.messagesFields.folder.field
-  }
-
-  if (!initValidationFields.value.folder) return ''
-  return !model.value.folder ? localization.value.common.specifyFolderName : ''
-})
-
-/* Validation error text for Server input field */
-const serverErrorText = computed<string>(() => {
-  if (props.messagesFields.server?.field && !model.value.server) {
-    return props.messagesFields.server.field
-  }
-
-  if (!initValidationFields.value.server) return ''
-  return !model.value.server ? localization.value.common.specifyServerName : ''
-})
-const onHideAlert = (): void => {
-  emits('hide-alert', 5)
-}
-const alertInfo = ref<boolean>(props.project === 'procurator')
+const isShowAlertInfo = ref<boolean>(props.project === 'procurator')
 </script>
 
 <style lang="scss" scoped>