bfg-common 1.5.87 → 1.5.88

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

@@ -160,7 +160,13 @@ const validationFunc = async (
       serverValidation.stepHasError
   }
 
-  if (wizard.isValidateForStep(6, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.hostAccessibility,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await validation.checkHostsAccessibilitySync(
       localization.value,
       form.value.hosts,

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

@@ -110,7 +110,7 @@
                 v-if="
                   props.alertMessages[dynamicSteps.hostAccessibility].length
                 "
-                test-id="add-host-assign-license-error-alert"
+                test-id="add-host-accessibility-error-alert"
                 type="error"
                 size="md"
                 :messages="props.alertMessages[dynamicSteps.hostAccessibility]"
@@ -163,7 +163,6 @@ import type {
 import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
 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_CompatibleHosts } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
@@ -218,25 +217,13 @@ 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',
-  lunDisk: [],
-  hosts: props.hostId ? [props?.hostId] : [],
-  type_code: 2,
-  nfsVersion: 'nfs-4.1',
-  readonly: false,
-  server: '',
-  folder: '',
-})
-
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
   emits('change-steps', value)
 
 const dataReadyView = computed<UI_I_DetailsItem>(() =>
   constructDataReadyViewFunc(
     localization.value,
-    form.value,
+    formModelLocal.value,
     props.project,
     props.nfsHosts
   )

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

@@ -67,16 +67,6 @@
           @hide-alert="onHideAlert"
           @main-filter="emits('main-filter', $event)"
         />
-
-        <common-wizards-datastore-add-nfs
-          v-if="datastoreType === 'nfs'"
-          v-model="formModelLocal"
-          :project="props.project"
-          :step-id="selectedStep.id"
-          :alert-messages="alertMessages[selectedStep.id]"
-          :messages-fields="selectedStep.fields"
-          :hosts="props.nfsHosts"
-        />
       </template>
     </atoms-wizard>
   </div>

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

@@ -9,7 +9,7 @@ export const dynamicSteps = {
   nameAndDevice: 1,
   nameAndConfigure: 2,
   hostAccessibility: 3,
-  readyComplete: 6,
+  readyComplete: 4,
 }
 export const stepsFunc = (
   localization: UI_I_Localization

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

@@ -163,19 +163,19 @@ export const checkNfsServerSync = (
 
 export const checkHostsAccessibilitySync = (
   localization: UI_I_Localization,
-  hosts: any,
+  hosts: string[],
   wizard: Wizard,
   value: UI_I_WizardStep[]
 ): UI_I_ValidationReturn => {
   let stepHasError = false
 
   if (!hosts.length) {
-    stepHasError = wizard.setValidation(5, 'hostsAccessibility', {
+    stepHasError = wizard.setValidation(dynamicSteps.hostAccessibility, 'hostsAccessibility', {
       fieldMessage: '',
       alertMessage: localization.common.selectLeastEntityContinue,
     })
-  } else if (wizard.hasMessage(5, 'hostsAccessibility')) {
-    value = wizard.removeValidation(5, 'hostsAccessibility', value)
+  } else if (wizard.hasMessage(dynamicSteps.hostAccessibility, 'hostsAccessibility')) {
+    value = wizard.removeValidation(dynamicSteps.hostAccessibility, 'hostsAccessibility', value)
   }
 
   return {

package/components/common/wizards/datastore/add/steps/hostAccessibility/table/new/New.vue

@@ -112,6 +112,7 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
     margin-bottom: 12px;
   }
   .icon {
+    margin-right: 4px;
   }
 }
 </style>

package/components/common/wizards/datastore/add/steps/nameAndConfigure/_serversList/ServersList.vue

@@ -1,4 +1,5 @@
 <template>
+  <!--  TODO: если использовать этот компонент, нужно отрефакторить весь код — сейчас всё по-старому  -->
   <div class="servers-list">
     <atoms-table-data-grid
       v-model:selected-row="selectedDisk"
@@ -25,7 +26,7 @@
               <atoms-the-icon name="ellipsis-vertical" />
             </template>
             <template #content>
-              <common-wizards-datastore-add-nfs-configuration-servers-list-delete-popover
+              <common-wizards-datastore-add-steps-name-and-configure-servers-list-delete-popover
                 v-if="showTooltip && item[0].id === selectedServerForRemove"
                 class="data-table__popover"
                 @hide="showTooltip = false"

package/package.json

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

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

@@ -1,44 +0,0 @@
-<template>
-  <div class="nfs-container">
-    <common-wizards-datastore-add-nfs-accessibility
-      v-if="showHostAccessibility"
-      v-model="model.hosts"
-      :alert-messages="props.alertMessages"
-      :hosts="props.hosts"
-      @hide-alert="(e) => emits('hide-alert', e)"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-
-const props = defineProps<{
-  project: UI_T_Project
-  stepId: number
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  hosts?: any
-}>()
-const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
-const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-}>()
-
-const showHostAccessibility = computed<boolean>(() => {
-  return props.project === 'sphere' && props.stepId === 5
-})
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.nfs-container {
-  @include flex($dir: column);
-  height: inherit;
-  &__desc {
-  }
-}
-</style>

package/components/common/wizards/datastore/add/nfs/accessibility/Accessibility.vue

@@ -1,60 +0,0 @@
-<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/nfs/accessibility/lib/config/tabsPannel.ts

@@ -1,31 +0,0 @@
-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/nfs/accessibility/lib/models/interfaces.ts

@@ -1,9 +0,0 @@
-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/nfs/accessibility/lib/models/types.ts

@@ -1,5 +0,0 @@
-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/nfs/accessibility/tablesView/TablesView.vue

@@ -1,85 +0,0 @@
-<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/nfs/accessibility/tablesView/lib/config/compatibleTable.ts

@@ -1,62 +0,0 @@
-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
-}

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/incompatibleTable.ts

@@ -1,68 +0,0 @@
-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 { I_IncompatibleHostsTable } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
-import { E_NodeIconsByState } from '~/lib/models/enums'
-import { incompatibleHostsTableKeys } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/tableKeys'
-import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.common.host, true, 'auto', incompatibleHostsTableKeys[0]],
-    [
-      localization.common.hostIncompatibilityReason,
-      true,
-      'auto',
-      incompatibleHostsTableKeys[1],
-    ],
-    [localization.common.cluster, true, 'auto', incompatibleHostsTableKeys[2]],
-  ]
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 || i === 2 ? 'icon' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: I_IncompatibleHostsTable[]
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-  data.forEach((item: I_IncompatibleHostsTable, key) => {
-    const hostData = {
-      iconClassName: E_NodeIconsByState.host_Normal,
-    }
-    const clusterData = {
-      iconClassName: E_NodeIconsByState.host_Normal,
-    }
-
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: item[incompatibleHostsTableKeys[0]],
-        data: hostData,
-        id: key,
-      },
-      {
-        key: 'col1',
-        text: item[incompatibleHostsTableKeys[1]],
-        id: key,
-      },
-      {
-        key: 'icon',
-        text: item[incompatibleHostsTableKeys[2]],
-        data: clusterData,
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/tableKeys.ts

@@ -1,15 +0,0 @@
-import type {
-  T_CompatibleHostsTableKeys,
-  T_IncompatibleHostsTableKeys,
-} from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
-
-export const compatibleHostsTableKeys: T_CompatibleHostsTableKeys[] = [
-  'host',
-  'cluster',
-]
-
-export const incompatibleHostsTableKeys: T_IncompatibleHostsTableKeys[] = [
-  'host',
-  'cluster',
-  'host_incompatibility_reason',
-]

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces.ts

@@ -1,11 +0,0 @@
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-
-export interface UI_I_CompatibleHostsTableItem {
-  id: string
-  host: string
-  cluster: string
-  state: 0 | 1 | 2 | 3
-}
-
-export interface UI_I_CreateDatastoreHosts
-  extends API_UI_I_DataTable<UI_I_CompatibleHostsTableItem[]> {}