bfg-common 1.5.76 → 1.5.77

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

@@ -72,7 +72,7 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const title = computed<string>(() => localization.value.common.addHost)
+const title = computed<string>(() => localization.value.common.newDatastore)
 
 const form = ref<UI_I_CreateDatastoreForm>(
   useDeepCopy(datastoreDefaultFormFunc(props.hostId))

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

@@ -9,7 +9,7 @@
     test-id="add-datastore-wizard"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
-    @submit="onFinish"
+    @submit="onCreateDatastore"
   >
     <template #content="{ selectedStep, isLoading }">
       <ui-wizard-block
@@ -56,7 +56,6 @@
             v-if="selectedStep.id === dynamicSteps.nameAndDevice"
             v-model="formModelLocal"
             :project="props.project"
-            :alert-messages="alertMessages[selectedStep.id]"
             :messages-fields="selectedStep.fields"
             :hosts="props.nfsHosts"
             :host-id="props.hostId"
@@ -66,20 +65,18 @@
       </ui-wizard-block>
 
       <ui-wizard-block
-        v-if="selectedStep.id === dynamicSteps.hostSummary"
+        v-if="selectedStep.id === dynamicSteps.nameAndConfigure"
         :sub-title-height="height2"
       >
         <template #subTitle>
           <div ref="subTitleBlock2">
             <div class="subtitle-block">
               <ui-alert
-                v-if="hostAssociated"
+                v-if="props.alertMessages[dynamicSteps.nameAndConfigure].length"
                 test-id="add-host-connection-settings-error-alert"
                 type="error"
                 size="md"
-                :messages="[
-                  localization.common.errorProcuratorHostAlreadyConnectedSphere,
-                ]"
+                :messages="props.alertMessages[dynamicSteps.nameAndConfigure]"
                 class="subtitle-block__alert"
               />
 
@@ -88,36 +85,29 @@
           </div>
         </template>
         <template #content>
-          <common-wizards-datastore-add-shared-storm
-            v-show="datastoreType === 'shared-storm'"
-            v-model="form"
+          <common-wizards-datastore-add-steps-name-and-configure
+            v-if="selectedStep.id === dynamicSteps.nameAndConfigure"
+            v-model="formModelLocal"
             :project="props.project"
-            :step-id="selectedStep.id"
-            :datastore-type="datastoreType"
-            :alert-messages="alertMessages[selectedStep.id]"
             :messages-fields="selectedStep.fields"
-            :hosts="props.nfsHosts"
-            :is-main-filter="props.isMainFilter"
-            :host-id="props.hostId"
-            @hide-alert="onHideAlert"
-            @main-filter="emits('main-filter', $event)"
+            @hide-alert="(e) => emits('hide-alert', e)"
           />
         </template>
       </ui-wizard-block>
 
       <ui-wizard-block
-        v-if="selectedStep.id === dynamicSteps.assignLicense"
+        v-if="selectedStep.id === dynamicSteps.hostAccessibility"
         :sub-title-height="height3"
       >
         <template #subTitle>
           <div ref="subTitleBlock3">
             <div class="subtitle-block">
               <ui-alert
-                v-if="props.alertMessages[dynamicSteps.assignLicense].length"
+                v-if="props.alertMessages[dynamicSteps.hostAccessibility].length"
                 test-id="add-host-assign-license-error-alert"
                 type="error"
                 size="md"
-                :messages="props.alertMessages[dynamicSteps.assignLicense]"
+                :messages="props.alertMessages[dynamicSteps.hostAccessibility]"
                 class="subtitle-block__alert"
               />
 
@@ -126,14 +116,12 @@
           </div>
         </template>
         <template #content>
-          <common-wizards-datastore-add-nfs
-            v-show="datastoreType === 'nfs'"
-            v-model="form"
-            :project="props.project"
-            :step-id="selectedStep.id"
-            :alert-messages="alertMessages[selectedStep.id]"
-            :messages-fields="selectedStep.fields"
+          <common-wizards-datastore-add-steps-host-accessibility
+            v-if="selectedStep.id === dynamicSteps.hostAccessibility"
+            v-model="formModelLocal.hosts"
+            :alert-messages="props.alertMessages[dynamicSteps.nameAndDevice]"
             :hosts="props.nfsHosts"
+            @hide-alert="(e) => emits('hide-alert', e)"
           />
         </template>
       </ui-wizard-block>
@@ -230,7 +218,6 @@ const { height: height3 } = useElementSize(subTitleBlock3)
 const subTitleBlock4 = ref<HTMLElement | null>(null)
 const { height: height4 } = useElementSize(subTitleBlock4)
 
-
 const datastoreType = ref<UI_T_DatastoreTypeCode>(2)
 const form = ref<UI_I_CreateDatastoreForm>({
   name: 'Datastore',
@@ -257,12 +244,8 @@ const dataReadyView = computed<UI_I_DetailsItem>(() =>
 const onHideAlert = (stepId: number): void => {
   emits('hide-alert', stepId)
 }
-const onHideModal = (): void => {
-  emits('hide')
-}
-const onFinish = (): void => {
-  emits('submit')
-}
+const onHideModal = (): void => emits('hide')
+const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">

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

@@ -10,7 +10,7 @@
       test-id="add-datastore-wizard"
       @change-steps="onChangeSteps"
       @hide="onHideModal"
-      @submit="onFinish"
+      @submit="onCreateDatastore"
     >
       <template #modalBody="{ selectedStep }">
         <common-wizards-datastore-add-steps-type-mode
@@ -22,7 +22,7 @@
           v-if="selectedStep.id === dynamicSteps.nameAndDevice"
           v-model="formModelLocal"
           :project="props.project"
-          :alert-messages="alertMessages[selectedStep.id]"
+          :alert-messages="props.alertMessages[dynamicSteps.nameAndDevice]"
           :messages-fields="selectedStep.fields"
           :hosts="props.nfsHosts"
           :host-id="props.hostId"
@@ -31,8 +31,26 @@
           @main-filter="emits('main-filter', $event)"
         />
 
+        <common-wizards-datastore-add-steps-name-and-configure
+          v-if="selectedStep.id === dynamicSteps.nameAndConfigure"
+          v-model="formModelLocal"
+          :project="props.project"
+          :alert-messages="props.alertMessages[dynamicSteps.nameAndConfigure]"
+          :messages-fields="selectedStep.fields"
+          @hide-alert="(e) => emits('hide-alert', e)"
+        />
+
+
+        <common-wizards-datastore-add-steps-host-accessibility
+          v-if="selectedStep.id === dynamicSteps.hostAccessibility"
+          v-model="formModelLocal.hosts"
+          :alert-messages="props.alertMessages[dynamicSteps.hostAccessibility]"
+          :hosts="props.nfsHosts"
+          @hide-alert="(e) => emits('hide-alert', e)"
+        />
+
         <common-wizards-datastore-add-shared-storm
-          v-show="datastoreType === 'shared-storm'"
+          v-if="datastoreType === 'shared-storm'"
           v-model="formModelLocal"
           :project="props.project"
           :step-id="selectedStep.id"
@@ -47,7 +65,7 @@
         />
 
         <common-wizards-datastore-add-nfs
-          v-show="datastoreType === 'nfs'"
+          v-if="datastoreType === 'nfs'"
           v-model="formModelLocal"
           :project="props.project"
           :step-id="selectedStep.id"
@@ -114,12 +132,8 @@ const dataReadyView = computed<UI_I_DetailsItem>(() =>
 const onHideAlert = (stepId: number): void => {
   emits('hide-alert', stepId)
 }
-const onHideModal = (): void => {
-  emits('hide')
-}
-const onFinish = (): void => {
-  emits('submit')
-}
+const onHideModal = (): void => emits('hide')
+const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">

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

@@ -8,8 +8,8 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 export const dynamicSteps = {
   type: 0,
   nameAndDevice: 1,
-  hostSummary: 2,
-  assignLicense: 3,
+  nameAndConfigure: 2,
+  hostAccessibility: 3,
   lockdownMode: 4,
   vmLocation: 5,
   readyComplete: 6,
@@ -81,7 +81,7 @@ export const stepsFunc = (
   //   testId: 'create-datastore-select-nfs-version',
   // },
   {
-    id: 4,
+    id: dynamicSteps.nameAndConfigure,
     title: localization.common.nameAndConfiguration,
     subTitle: localization.common.nameAndConfigurationDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
@@ -104,7 +104,7 @@ export const stepsFunc = (
   },
 
   {
-    id: 5,
+    id: dynamicSteps.hostAccessibility,
     title: localization.common.hostsAccessibility,
     subTitle: localization.common.hostsAccessibilityDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
@@ -138,17 +138,19 @@ export const stepsFunc = (
     fields: {},
     isValid: true,
     testId: 'create-datastore-ready-complete',
-    // testId: 'create-datastore-storm-ready-complete',
-    // testId: 'create-datastore-nfs-ready-complete',
-    // testId: 'create-datastore-local-ready-complete',
   },
 ]
 
 export const stepsSchemeInitial: number[][] = [
   [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Procurator Scheme for "shared-storm" type
-  [dynamicSteps.type, 4, 11], // Procurator Scheme for "nfs" type
+  [dynamicSteps.type, dynamicSteps.nameAndConfigure, 11], // Procurator Scheme for "nfs" type
   [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Sphere Scheme for "shared-storm" type
-  [dynamicSteps.type, 4, 5, 11], // Sphere Scheme for "nfs" type
+  [
+    dynamicSteps.type,
+    dynamicSteps.nameAndConfigure,
+    dynamicSteps.hostAccessibility,
+    11,
+  ], // Sphere Scheme for "nfs" type (not used from <host Context Menu>)
 ]
 
 export const getStepScheme = (

package/components/common/wizards/datastore/add/nfs/Nfs.vue

@@ -1,10 +1,5 @@
 <template>
   <div class="nfs-container">
-<!--    <common-wizards-datastore-add-nfs-version-->
-<!--      v-if="props.stepId === 4"-->
-<!--      v-model="model.nfsVersion"-->
-<!--    />-->
-
     <common-wizards-datastore-add-nfs-configuration
       v-show="props.stepId === 4"
       v-model="model"

package/components/common/wizards/datastore/add/{nfs/version/Version.vue → steps/_nfsVersion/NfsVersion.vue}

@@ -1,4 +1,5 @@
 <template>
+  <!--  TODO: если использовать этот компонент, нужно отрефакторить весь код — сейчас всё по-старому  -->
   <section class="nfs-version">
     <common-select-radio-group
       v-model="selectedNfsVersionLocal"

package/components/common/wizards/datastore/add/steps/hostAccessibility/HostAccessibility.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="host-accessibility">
+    <atoms-alert
+      v-show="props.alertMessages?.length"
+      test-id="accessibility"
+      status="alert-danger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
+    />
+
+    <atoms-tabs
+      v-model="activeTab"
+      test-id="accessibility"
+      :items="tabs"
+      size="small"
+      class="w-100"
+    />
+    <common-wizards-datastore-add-nfs-accessibility-tables-view
+      v-model="modelHosts"
+      :data-table="dataTable?.items || []"
+      :total-items="dataTable?.total_items || 0"
+      :total-pages="dataTable?.total_pages || 1"
+      :table-type="activeTab"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
+
+const props = defineProps<{
+  alertMessages: string[]
+  hosts?: UI_I_CreateDatastoreHosts
+}>()
+const modelHosts = defineModel<string[]>()
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
+const tabs = computed<UI_I_CollapseNavItem[]>(() =>
+  hostAccessibilityTabsFunc(localization.value, [
+    (props.hosts?.items?.length || 0) + '',
+    '0',
+  ])
+)
+
+const dataTable = computed<UI_I_CreateDatastoreHosts>(() => props.hosts)
+const onHideAlert = (): void => {
+  emits('hide-alert', 6)
+}
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/wizards/datastore/add/steps/hostAccessibility/HostAccessibilityNew.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="host-accessibility">
+    {{ props }}
+    {{ modelHosts }}
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
+
+const props = defineProps<{
+  alertMessages: string[]
+  hosts?: UI_I_CreateDatastoreHosts
+}>()
+const modelHosts = defineModel<string[]>()
+// const emits = defineEmits<{
+//   (event: 'hide-alert', value: number): void
+// }>()
+
+// const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/wizards/datastore/add/steps/hostAccessibility/HostAccessibilityOld.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="host-accessibility">
+    <atoms-alert
+      v-show="props.alertMessages?.length"
+      test-id="accessibility"
+      status="alert-danger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
+    />
+
+    <atoms-tabs
+      v-model="activeTab"
+      test-id="accessibility"
+      :items="tabs"
+      size="small"
+      class="w-100"
+    />
+    <common-wizards-datastore-add-nfs-accessibility-tables-view
+      v-model="modelHosts"
+      :data-table="dataTable?.items || []"
+      :total-items="dataTable?.total_items || 0"
+      :total-pages="dataTable?.total_pages || 1"
+      :table-type="activeTab"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
+
+const props = defineProps<{
+  alertMessages: string[]
+  hosts?: UI_I_CreateDatastoreHosts
+}>()
+const modelHosts = defineModel<string[]>()
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
+const tabs = computed<UI_I_CollapseNavItem[]>(() =>
+  hostAccessibilityTabsFunc(localization.value, [
+    (props.hosts?.items?.length || 0) + '',
+    '0',
+  ])
+)
+
+const dataTable = computed<UI_I_CreateDatastoreHosts>(() => props.hosts)
+const onHideAlert = (): void => {
+  emits('hide-alert', 6)
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,31 @@
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
+export const hostAccessibilityTabsFunc = (
+  localization: UI_I_Localization,
+  hosts: string[]
+) => {
+  const [compatibleHosts, incompatibleHost] = hosts
+
+  const tabs: UI_I_CollapseNavItem[] = [
+    {
+      text: localization.common.compatibleHosts.replace(
+        '{0}',
+        compatibleHosts || ''
+      ),
+      value: 'compatible-hosts',
+      disabled: false,
+      testId: 'host-accessibility-compatible',
+    },
+    {
+      text: localization.common.incompatibleHosts.replace(
+        '{0}',
+        incompatibleHost || ''
+      ),
+      value: 'incompatible-hosts',
+      disabled: true,
+      testId: 'host-accessibility-incompatible',
+    },
+  ]
+  return tabs
+}

package/components/common/wizards/datastore/add/steps/hostAccessibility/lib/models/interfaces.ts

@@ -0,0 +1,9 @@
+export interface I_CompatibleHostsTable {
+    id: number,
+    host: string,
+    cluster: string
+}
+
+export interface I_IncompatibleHostsTable extends I_CompatibleHostsTable{
+    host_incompatibility_reason: string
+}

package/components/common/wizards/datastore/add/steps/hostAccessibility/lib/models/types.ts

@@ -0,0 +1,5 @@
+export type T_HostsAccessibilityTab = 'compatible-hosts' | 'incompatible-hosts'
+
+export type T_CompatibleHostsTableKeys = 'host' | 'cluster'
+
+export type T_IncompatibleHostsTableKeys = 'host' | 'cluster' | 'host_incompatibility_reason'

package/components/common/wizards/datastore/add/steps/hostAccessibility/tablesView/TablesView.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="data-table-view">
+    <div>
+      <atoms-table-data-grid
+        v-model:selected-row="selectedHostsIdLocal"
+        v-model:page-size="pagination.pageSize"
+        v-model:page="pagination.page"
+        type="checkbox"
+        class="data-table"
+        test-id="accessibility-table"
+        :head-items="headItems"
+        :body-items="bodyItems"
+        :total-items="props.totalItems"
+        :total-pages="props.totalPages"
+        hide-page-size
+        :loading="loading"
+        server-off
+      >
+        <template #icon="{ item }">
+          <span :class="['datagrid-cell-icon', item.data.iconClassName]" />
+          <span class="text-ellipsis">
+            {{ item.text }}
+          </span>
+        </template>
+      </atoms-table-data-grid>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import {
+  I_CompatibleHostsTable,
+  I_IncompatibleHostsTable,
+} from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
+import * as compatibleTable from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/compatibleTable'
+import * as incompatibleTable from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/incompatibleTable'
+
+const props = defineProps<{
+  dataTable: I_CompatibleHostsTable[] | I_IncompatibleHostsTable[]
+  tableType: T_HostsAccessibilityTab
+  totalItems: number
+  totalPages: number
+}>()
+const selectedHostsIdLocal = defineModel<string[]>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const loading = computed<boolean>(() => false)
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 1,
+})
+
+const tables: any = {
+  'compatible-hosts': compatibleTable,
+  'incompatible-hosts': incompatibleTable,
+}
+
+const headItems = computed<UI_I_HeadItem[]>(() =>
+  tables[props.tableType].headItems(localization.value)
+)
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  return tables[props.tableType].bodyItems(props.dataTable)
+})
+</script>
+
+<style lang="scss" scoped>
+.data-table-view {
+  height: inherit;
+  .data-table {
+    height: inherit;
+    :deep(.datagrid-outer-wrapper) {
+      height: inherit;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,62 @@
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import type { I_CompatibleHostsTable } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
+import { compatibleHostsTableKeys } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/tableKeys'
+import {
+  hostIconByState,
+  clusterIconByState,
+} from '~/components/common/lib/config/states'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.common.host, true, '300px', compatibleHostsTableKeys[0]],
+    [localization.common.cluster, true, '300px', compatibleHostsTableKeys[1]],
+  ]
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item) => {
+    result.push(constructHeadItem('icon', item[0], item[3], false, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: I_CompatibleHostsTable[]
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+  data.forEach((item: I_CompatibleHostsTable, key) => {
+    const hostData = {
+      // @ts-ignore
+      iconClassName: `vsphere-icon-${hostIconByState[item.state]}`,
+    }
+    const clusterData = {
+      iconClassName: `vsphere-icon-${clusterIconByState[1]}`,
+    }
+
+    bodyItems.push([
+      {
+        key: 'icon',
+        text: item[compatibleHostsTableKeys[0]],
+        data: hostData,
+        id: item.id,
+        testId: `host-table-item-${item.host}`,
+      },
+      {
+        key: 'icon',
+        text: item[compatibleHostsTableKeys[1]],
+        data: clusterData,
+        id: item.id,
+        testId: `host-table-item-${item.host}`,
+      },
+    ])
+  })
+  return bodyItems
+}