bfg-common 1.5.77 → 1.5.79

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

@@ -1,30 +1,210 @@
 <template>
-  <div class="name-and-configure">
-    {{ props }}
-    {{ model }}
+  <div class="basics-step">
+    <div class="basics-step-row">
+      <div class="basics-step-row-title">
+        <span class="basics-step-row-title-text">
+          {{ localization.common.name }}
+        </span>
+      </div>
+      <div class="basics-step-row-content">
+        <ui-input
+          id="configuration-name-input"
+          v-model="formModelLocal.name"
+          test-id="configuration-name-input"
+          is-focused
+          :error="nameErrorText"
+          @blur="initValidation(true, ['name'])"
+          @input="initValidation(false, ['name'])"
+        />
+      </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.folder }}
+        </span>
+        <common-wizards-datastore-add-steps-common-tooltip-info
+          :id="'option.testId'"
+          :info="'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'"
+          :info="'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>
 
-<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'
+<script setup lang="ts">
+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 formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+// const isShowAlertInfo = defineModel<boolean>('alertInfo', { required: true })
+
 const props = defineProps<{
-  project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  messagesFields: UI_I_WizardStep['fields']
+}>()
+const emits = defineEmits<{
+  (event: 'remove-errors'): void
 }>()
-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 localization = computed<UI_I_Localization>(() => useLocal())
+
+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 lang="scss" scoped></style>
+<style scoped lang="scss">
+.basics-step {
+  padding: 16px 0 16px;
+
+  &-row {
+    min-height: 36px;
+    width: 100%;
+    display: flex;
+    column-gap: 16px;
+    align-items: center;
+
+    &-title {
+      padding-top: 8px;
+      max-width: 240px;
+      width: 100%;
+      display: flex;
+      align-items: center;
+      column-gap: 8px;
+      font-weight: 400;
+      font-size: 13px;
+      line-height: 20px;
+      letter-spacing: 0;
+      vertical-align: middle;
+      align-self: flex-start;
+      color: var(--wizard-content-title);
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+
+      &-text {
+        display: block;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+
+    &-content {
+      max-width: 480px;
+      width: 100%;
+      font-weight: 400;
+      font-size: 13px;
+      line-height: 20px;
+      letter-spacing: 0;
+      vertical-align: middle;
+      color: var(--wizard-content-value);
+
+      &-text {
+        display: flex;
+        column-gap: 8px;
+        align-items: center;
+
+        &-icon {
+          width: 20px;
+          min-width: 20px;
+          height: 20px;
+          min-height: 20px;
+        }
+      }
+
+      &-switch-container {
+        width: fit-content;
+      }
+    }
+  }
+
+  &-line {
+    height: 0;
+    width: 100%;
+    border-bottom: 1px solid var(--wizard-content-line);
+    margin: 16px 0;
+  }
+}
+</style>

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

@@ -1,115 +1,110 @@
 <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>
+    <atoms-alert
+      v-show="props.alertMessages?.length"
+      test-id="configure-error-alert"
+      status="alert-danger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
+    />
+
+    <atoms-alert
+      v-show="isShowAlertInfo"
+      test-id="configure-information-alert"
+      status="alert-info"
+      :items="[localization.common.nameAndConfigurationAlertInfo]"
+      @remove="isShowAlertInfo = 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="formModelLocal.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-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 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-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="formModelLocal.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
-          class="clr-control-container"
-          :class="folderErrorText && 'clr-error'"
+          v-if="folderErrorText"
+          class="clr-subtext"
+          data-id="folder-name-field-require"
         >
-          <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>
+          {{ 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="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="formModelLocal.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
-          class="clr-control-container"
-          :class="serverErrorText && 'clr-error'"
+          v-if="serverErrorText"
+          class="clr-subtext"
+          data-id="server-name-field-require"
         >
-          <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>
+          {{ serverErrorText }}
+        </div>
+        <div v-else class="clr-subtext">
+          E.g: nas, nas.it.com or 192.168.0.1
         </div>
       </div>
     </div>
@@ -117,21 +112,19 @@
 </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_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } 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_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
+
+const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+const isShowAlertInfo = defineModel<boolean>('alertInfo', { 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
 }>()
@@ -149,37 +142,41 @@ const initValidation = (onlyBlur = false, types: string[]): void => {
 
 /* Validation error text for Name input field */
 const nameErrorText = computed<string>(() => {
-  if (props.messagesFields?.name?.field && !model.value.name) {
+  if (props.messagesFields?.name?.field && !formModelLocal.value.name) {
     return props.messagesFields.name.field
   }
 
   if (!initValidationFields.value.name) return ''
-  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
+  return !formModelLocal.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) {
+  if (props.messagesFields.folder?.field && !formModelLocal.value.folder) {
     return props.messagesFields.folder.field
   }
 
   if (!initValidationFields.value.folder) return ''
-  return !model.value.folder ? localization.value.common.specifyFolderName : ''
+  return !formModelLocal.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) {
+  if (props.messagesFields.server?.field && !formModelLocal.value.server) {
     return props.messagesFields.server.field
   }
 
   if (!initValidationFields.value.server) return ''
-  return !model.value.server ? localization.value.common.specifyServerName : ''
+  return !formModelLocal.value.server
+    ? localization.value.common.specifyServerName
+    : ''
 })
-const onHideAlert = (): void => {
-  emits('hide-alert', 5)
-}
-const alertInfo = ref<boolean>(props.project === 'procurator')
+const onHideAlert = (): void =>
+  emits('hide-alert', dynamicSteps.nameAndConfigure)
 </script>
 
 <style lang="scss" scoped>

package/package.json

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

package/components/common/wizards/datastore/add/readyComplete/ReadyComplete.vue

@@ -1,92 +0,0 @@
-<template>
-  <div class="ready-complete">
-    <common-details-list :items="properties" class="ready-complete__list list">
-      <template #default="{ item }">
-        <common-details-item
-          :has-children="true"
-          open-by-default
-          :test-id="item.testId"
-        >
-          <template #stackBlockKey>
-            <span class="list__labels">
-              {{ item.label }}
-            </span>
-          </template>
-
-          <template #stackChildren>
-            <template
-              v-for="(item2, key2) in item.items"
-              :key="`${item2}_${key2}`"
-            >
-              <common-details-item
-                :has-children="false"
-                :test-id="item2.testId"
-                class="list__default-style"
-              >
-                <template #stackBlockKey>
-                  <div>
-                    {{ item2.label }}
-                  </div>
-                </template>
-                <template #stackBlockContent>
-                  <div v-if="item2.data">
-                    <div
-                      v-for="item3 in item2.data"
-                      :key="item3"
-                      class="flex-align-center"
-                    >
-                      <div class="vsphere-icon-host"></div>
-                      <span>{{ item3 }}</span>
-                    </div>
-                  </div>
-                  <span v-else>
-                    {{ item2.value }}
-                  </span>
-                </template>
-              </common-details-item>
-            </template>
-          </template>
-        </common-details-item>
-      </template>
-    </common-details-list>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  dataReadyView: UI_I_DetailsItem[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const properties = computed<UI_I_DetailsItem[]>(() => props.dataReadyView)
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.ready-complete {
-  &__list {
-    @include flex($dir: column);
-    padding: 12px 0;
-    row-gap: 15px;
-  }
-}
-.list {
-  &__labels {
-    @include text($fs: 13px, $fw: 700);
-  }
-  :deep(.list__default-style) {
-    .stack-block {
-      &__label {
-        align-items: flex-start;
-      }
-      &-content {
-        white-space: pre-line;
-      }
-    }
-  }
-}
-</style>