bfg-common 1.4.158 → 1.4.159

package/components/common/wizards/vm/migrate/select/computeResource/ComputeResource.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="compute-resource">
     <atoms-alert
-      v-if="errorMessages.length"
+      v-show="props.alertMessages?.length"
       test-id="compute-resource-alert"
       status="alert-danger"
-      :items="errorMessages"
-      @remove="onHideErrorMessageAlert"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div
-      v-if="props.migrateType === 'resource-storage'"
+      v-if="model.migrate_type === 'resource-storage'"
       class="tree-view-wrap mt-1"
     >
       <common-wizards-vm-common-compute-resource-tree-view
-        v-model="computeResourceDataLocal.selectedNode"
+        v-model="model.resource.selectedNode"
         :compute-resource-tree="nodes"
         @show-compute-resource-tree="onShowComputeResourceTree"
         @select-compute-resource-tree="onSelectComputeResourceTree"
@@ -30,17 +30,17 @@
       />
 
       <common-wizards-vm-migrate-select-compute-resource-table-view
-        v-model:selected-data="selectedTableDataKeys[activeTab]"
-        :get-compute-resource-data="props.getComputeResourceData"
+        v-model="selectedTableDataKeys[activeTab]"
+        :type="activeTab"
         :data-table="props.computeResourceData?.items || []"
         :total-items="props.computeResourceData?.total_items || 0"
         :total-pages="props.computeResourceData?.total_pages || 1"
-        :type="activeTab"
+        :get-compute-resource-data="props.getComputeResourceData"
       />
     </template>
 
     <common-wizards-vm-common-validation-compatibility
-      :loading="!computeResourceDataLocal.selectedNode"
+      :loading="!model.resource.selectedNode"
       :status="compatibilityText[0]"
       :text="compatibilityText[1]"
     />
@@ -54,37 +54,30 @@ import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
 import type { UI_E_ComputeResourceTabKamelKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/enums'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/lib/models/types'
+import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
 import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
 import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/config/tabsPannel'
 
 const props = defineProps<{
-  submit: number
+  alertMessages: string[]
   getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
-  migrateType: UI_T_VmMigrateType
   computeResourceData: any
   computeResourceTree: UI_I_TreeNode
 }>()
+const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
 const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
   (event: 'next-step', value: any): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $recursion } = useNuxtApp()
+const { $recursion }: any = useNuxtApp()
 
 const activeTab = ref<UI_T_SelectComputeResourceTabType>('host')
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateComputeResourceTabsFunc(localization.value)
 )
 
-const computeResourceDataLocal = ref<any>({
-  selectedNode: null,
-  host: null,
-  cluster: null,
-  resourcePool: null,
-  vApps: null,
-})
-
 const selectedTableDataKeys = ref<UI_I_SelectedTableDataKeys>({
   host: null,
   cluster: null,
@@ -101,7 +94,7 @@ watch(
     )
     if (data) {
       const dataKeys = UI_E_ComputeResourceTabKamelKeys[activeTab.value]
-      computeResourceDataLocal.value[dataKeys] = data
+      model.value.resource[dataKeys] = data
     }
   },
   { immediate: true, deep: true }
@@ -142,7 +135,7 @@ const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
   )
 }
 const compatibilityText = computed<[string, string]>(() => {
-  const { selectedNode } = computeResourceDataLocal.value
+  const { selectedNode } = model.value.resource
 
   if (!selectedNode) return ['Success', '']
 
@@ -167,36 +160,9 @@ const compatibilityText = computed<[string, string]>(() => {
 
   return res
 })
-
-const errorMessages = ref<string[]>([])
-const onHideErrorMessageAlert = (): void => {
-  errorMessages.value = []
+const onHideAlert = (): void => {
+  emits('hide-alert', 2)
 }
-
-const checkValidityBlock = (): boolean => {
-  const hasSelectedData = Object.values(computeResourceDataLocal.value).some(
-    (value) => value !== null
-  )
-
-  if (!hasSelectedData) {
-    const errorText = localization.value.common.selectValidDestinationComputeResource
-
-    errorMessages.value = [errorText]
-    return false
-  }
-
-  onHideErrorMessageAlert()
-  emits('next-step', {
-    ...computeResourceDataLocal.value,
-  })
-  return true
-}
-watch(
-  () => props.submit,
-  () => {
-    checkValidityBlock()
-  }
-)
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/migrate/select/computeResource/lib/config/tabsPannel.ts

@@ -15,7 +15,7 @@ export const vmMigrateComputeResourceTabsFunc = (
       disabled: false,
     },
     {
-      text: localization.common.resourcePools,
+      text: localization.inventoryTabs.resourcePools,
       value: 'resource-pool',
       disabled: false,
     },

package/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces.ts

@@ -15,7 +15,8 @@ export interface UI_I_SelectedTableDataKeys {
   'v-apps': UI_I_VAppsTableItem | null
 }
 
-export interface UI_I_ComputeResourceDataLocal {
+
+export interface UI_I_ComputeResourceFormLocal {
   selectedNode: UI_I_TreeNode | null
   host: UI_I_HostTableItem | null
   cluster: UI_I_ClusterTableItem | null

package/components/common/wizards/vm/migrate/select/computeResource/tableView/TableView.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="data-table-view">
     <atoms-table-data-grid
-      v-model:selected-row="selectedRow"
+      v-model:selected-row="selectedDataLocal"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
@@ -28,9 +28,9 @@
           <div class="progress flex-1">
             <progress class="progress-block" :max="100" :value="item.data" />
           </div>
-          <span class="text-ellipsis ml-1" :title="item.text">{{
-            item.text
-          }}</span>
+          <span class="text-ellipsis ml-1" :title="item.text">
+            {{ item.text }}
+          </span>
         </div>
       </template>
     </atoms-table-data-grid>
@@ -45,7 +45,10 @@ import type {
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-import type { UI_I_TablePayload, UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type {
+  UI_I_TablePayload,
+  UI_I_Pagination,
+} from '~/lib/models/table/interfaces'
 import type { UI_T_ComputeResourceTableItem } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/types'
 import * as hostTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/hostTable'
 import * as clusterTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/clusterTable'
@@ -54,15 +57,12 @@ import * as vAppsTable from '~/components/common/wizards/vm/migrate/select/compu
 
 const props = defineProps<{
   getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
-  selectedData: number
   dataTable: UI_T_ComputeResourceTableItem[]
   totalItems: number
   totalPages: number
   type: UI_T_SelectComputeResourceTabType
 }>()
-const emits = defineEmits<{
-  (event: 'update:selected-data', value: number): void
-}>()
+const selectedDataLocal = defineModel<number>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -112,15 +112,6 @@ watch(localization, () => {
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return table[props.type].bodyItems(props.dataTable, localization.value)
 })
-
-const selectedRow = computed<number>({
-  get() {
-    return props.selectedData
-  },
-  set(newValue: number) {
-    emits('update:selected-data', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/clusterTable.ts

@@ -56,7 +56,7 @@ export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
 }
 
 export const bodyItems = (data: UI_I_ClusterTableItem[]): UI_I_BodyItem[][] => {
-  const { $binary } = useNuxtApp()
+  const { $binary }: any = useNuxtApp()
 
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((cluster, key) => {

package/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/resourcePoolTable.ts

@@ -73,7 +73,7 @@ export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
 }
 
 export const bodyItems = (data: any[]): UI_I_BodyItem[][] => {
-  const { $binary } = useNuxtApp()
+  const { $binary }: any = useNuxtApp()
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((vapp, key) => {
     bodyItems.push([

package/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/vappsTable.ts

@@ -4,13 +4,7 @@ import type {
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-// import {
-//   I_TableIconColumnData,
-//   I_Vapps,
-// } from '~/components/templates/inventory/mainBlock/tablesView/lib/models/interfaces'
-import { E_StatusEnum } from '~/components/templates/inventory/treeView/lib/models/enums'
-import { columnKeys as getColumnKeys } from '~/components/templates/inventory/mainBlock/tablesView/lib/config/columnKeys'
-import { headItems as getHeadItems } from '~/components/templates/inventory/mainBlock/tablesView/lib/config/headItems'
+import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
 import { vAppsTableItemKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/tableKeys'
 
 const getItems = (
@@ -21,7 +15,12 @@ const getItems = (
     [localization.common.cpuShares, true, '180px', vAppsTableItemKeys[1]],
     [localization.common.cpuSharesValue, true, '180px', vAppsTableItemKeys[2]],
     [localization.common.memoryShares, true, '180px', vAppsTableItemKeys[3]],
-    [localization.common.memorySharesValue, true, '180px', vAppsTableItemKeys[4]],
+    [
+      localization.common.memorySharesValue,
+      true,
+      '180px',
+      vAppsTableItemKeys[4],
+    ],
     [localization.common.managedBy, true, '180px', vAppsTableItemKeys[5]],
   ]
 }
@@ -29,20 +28,23 @@ const getItems = (
 export const columnKeys = (
   localization: UI_I_Localization
 ): UI_I_ColumnKey[] => {
-  return getColumnKeys(getItems(localization))
+  return defaultSettings.defaultColumnKeys(getItems(localization), {
+    icon: [0],
+  })
 }
 
 export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  return getHeadItems(getItems(localization))
+  return defaultSettings.defaultHeadItems(getItems(localization), {
+    icon: [0],
+  })
 }
 
 export const bodyItems = (data: any[]): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((vapp, key) => {
-    const nameData: any = {
-      iconClassName: E_StatusEnum.vmtemplate_Normal,
+    const nameData = {
+      iconClassName: 'vsphere-icon-vm-template',
       name: vapp.name,
-      // @ts-ignore TODO id надо для перехода, пока что так оставить чтобы нигде не ломалось потом поправить для всех
       id: vapp.id,
       nav: 'v',
       type: 'vmtemplate',
@@ -55,11 +57,11 @@ export const bodyItems = (data: any[]): UI_I_BodyItem[][] => {
         data: nameData,
         id: key,
       },
-      { key: 'col2', text: vapp[vAppsTableItemKeys[1]], id: key },
-      { key: 'col3', text: vapp[vAppsTableItemKeys[2]], id: key },
-      { key: 'col4', text: vapp[vAppsTableItemKeys[3]], id: key },
-      { key: 'col5', text: vapp[vAppsTableItemKeys[4]], id: key },
-      { key: 'col6', text: vapp[vAppsTableItemKeys[5]], id: key },
+      { key: 'col1', text: vapp[vAppsTableItemKeys[1]], id: key },
+      { key: 'col2', text: vapp[vAppsTableItemKeys[2]], id: key },
+      { key: 'col3', text: vapp[vAppsTableItemKeys[3]], id: key },
+      { key: 'col4', text: vapp[vAppsTableItemKeys[4]], id: key },
+      { key: 'col5', text: vapp[vAppsTableItemKeys[5]], id: key },
     ])
   })
   return bodyItems

package/components/common/wizards/vm/migrate/select/network/Network.vue

@@ -13,7 +13,7 @@
     />
 
     <div
-      v-if="isShowNetworkBasic && selectedSourceNetwork"
+      v-if="model.isBasicNetworkMode && selectedSourceNetwork"
       class="select-network__matcher-details"
     >
       <span> {{ networkDetailsHeadline }} </span>
@@ -29,9 +29,9 @@
         data-id="migrate-network-advanced-button"
         @click="onClickSelectNetworkMode"
       >
-        <span v-if="!isShowNetworkBasic"> &#x226A; </span>
+        <span v-if="!model.isBasicNetworkMode"> &#x226A; </span>
         {{ buttonText }}
-        <span v-if="isShowNetworkBasic"> &#8811; </span>
+        <span v-if="model.isBasicNetworkMode"> &#8811; </span>
       </button>
     </div>
 
@@ -45,28 +45,30 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectNetworksFormLocal } from '~/components/common/wizards/vm/migrate/select/network/lib/models/interfaces'
 
-const isShowNetworkBasic = defineModel<boolean>('isBasicNetworkMode')
-const networkData = defineModel<any>('networkData')
-
+const model = defineModel<UI_I_SelectNetworksFormLocal>({ required: true })
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const selectedSourceNetwork = ref<string | null>(null)
 const uniqueKey = ref<number>(0)
 
 const buttonText = computed(
-  () => localization.value.common[isShowNetworkBasic.value ? 'advanced' : 'basic']
+  () =>
+    localization.value.common[
+      model.value.isBasicNetworkMode ? 'advanced' : 'basic'
+    ]
 )
 
 const tableType = computed<string>(() =>
-  isShowNetworkBasic.value ? 'basic' : 'advanced'
+  model.value.isBasicNetworkMode ? 'basic' : 'advanced'
 )
 
 const selectNetworkHeadline = computed<string>(() => {
   const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
     localization.value.common
 
-  return isShowNetworkBasic.value
+  return model.value.isBasicNetworkMode
     ? migrateNetworkingForAllAdapters
     : migrateNetworkingForEachAdapters
 })
@@ -101,16 +103,19 @@ const useAtTableData = computed(() =>
 
 const onClickSelectNetworkMode = (): void => {
   uniqueKey.value++
-  isShowNetworkBasic.value = !isShowNetworkBasic.value
+  model.value.isBasicNetworkMode = !model.value.isBasicNetworkMode
   selectedSourceNetwork.value = ''
 }
 const onSelectNetwork = (data: any): void => {
-  networkData.value = data
+  model.value.data = data
 }
 </script>
 
 <style lang="scss" scoped>
+@import 'assets/scss/common/mixins';
 .select-network {
+  @include flex($dir: column);
+  height: inherit;
   margin-top: 10px;
   &__text {
     font-size: 12px;

package/components/common/wizards/vm/migrate/select/network/lib/models/interfaces.ts

@@ -0,0 +1,4 @@
+export interface UI_I_SelectNetworksFormLocal {
+  isBasicNetworkMode: boolean
+  data: any // добавить interface потом
+}

package/components/common/wizards/vm/migrate/select/network/table/network/Network.vue

@@ -1,8 +1,7 @@
 <template>
-  <div class="table-wrap">
+  <div class="table-view-container">
     <atoms-table-data-grid
       v-model:selected-row="selectedNetworkLocal"
-      v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
       :head-items="headItems"
@@ -24,6 +23,7 @@
             data-id="network-select"
             :disabled="item.data.disabled"
             @change="onSelect(item.data)"
+            @click.stop
           >
             <option
               v-for="option in item.data.option"
@@ -42,7 +42,6 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type {
-  UI_I_ColumnKey,
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
@@ -74,13 +73,6 @@ const table: any = {
 const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.type].headItems(localization.value)
 )
-const columnKeys = computed<UI_I_ColumnKey[]>(() =>
-  table[props.type].columnKeys(localization.value)
-)
-watch(localization, () => {
-  columnKeys.value = table[props.type].columnKeys(localization.value)
-})
-
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return table[props.type].bodyItems(props.networks)
 })
@@ -101,14 +93,21 @@ watch(
 </script>
 
 <style lang="scss" scoped>
-.select-network {
-  &__select {
-    width: 100%;
-    height: 24px;
-    min-width: 107px;
-    & > select {
-      height: 100%;
+@import 'assets/scss/common/mixins';
+.table-view-container {
+  @include flex($dir: column);
+  height: inherit;
+  .select-network {
+    height: inherit;
+    &__select {
+      width: 100%;
+      height: 24px;
+      min-width: 107px;
+      & > select {
+        height: 100%;
+      }
     }
   }
 }
+
 </style>

package/components/common/wizards/vm/migrate/select/priority/Priority.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="select-priority">
     <common-select-radio-group
-      v-model="selectedPriorityType"
+      v-model="selectedPriorityTypeLocal"
       :options="vmMigrationPriorityTypes"
     />
   </div>
@@ -13,27 +13,13 @@ import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/mode
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
 import { vmMigrateSelectPriorityTypesFunc } from '~/components/common/wizards/vm/migrate/select/priority/lib/config/typeOptions'
 
-const props = defineProps<{
-  modelValue: UI_T_SelectVMotionPriority
-}>()
-const emits = defineEmits<{
-  (event: 'update:model-value', value: UI_T_SelectVMotionPriority): void
-}>()
+const selectedPriorityTypeLocal = defineModel<UI_T_SelectVMotionPriority>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const vmMigrationPriorityTypes = computed<UI_I_RadioOption[]>(() =>
   vmMigrateSelectPriorityTypesFunc(localization.value)
 )
-
-const selectedPriorityType = computed<UI_T_SelectVMotionPriority>({
-  get() {
-    return props.modelValue
-  },
-  set(newValue: UI_T_SelectVMotionPriority) {
-    emits('update:model-value', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped></style>