bfg-common 1.4.142 → 1.4.144

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/vmNew/migrate/Migrate.vue

@@ -40,7 +40,6 @@
           v-show="selectedStep.id === 3"
           v-model="form"
           :alert-messages="alertMessages[3]"
-          :submit="selectStorageSubmit"
           :get-datastore-table-func="props.getDatastoreTableFunc"
           :datastore="props.datastore"
           :connected-storage-id-default="connectedStorageIdOnVm"
@@ -195,7 +194,6 @@ watch(
 
 const loading = ref<boolean>(false)
 
-const selectStorageSubmit = ref<number>(0)
 const selectComputeResourceSubmit = ref<number>(0)
 
 const connectedStorageIdOnVm = computed<string>(

package/components/common/wizards/vmNew/migrate/lib/config/constructDataReady.ts

@@ -63,12 +63,43 @@ const migrateOnlyStorageDataView = (
   )
 }
 
+const setSelectNetworkDataView = (
+  localization: UI_I_Localization,
+  from: UI_I_MigrateFormLocal
+): string => {
+  const {
+    noNetworkReassignments,
+    networkAdapterReassignedNewDestination,
+    networkAdapterWillBeReassignedTo,
+  } = localization.common
+
+  const { isBasicNetworkMode, data } = from.network
+  const { sourceNetwork, value } = data
+
+  if (sourceNetwork === value) {
+    return noNetworkReassignments
+  }
+
+  if (isBasicNetworkMode) {
+    const replacements = {
+      lan: sourceNetwork,
+      network: value,
+    }
+    return networkAdapterWillBeReassignedTo.replace(
+      /{(\w+)}/g,
+      (_, key) => replacements[key]
+    )
+  }
+
+  return networkAdapterReassignedNewDestination.replace('{number}', '1')
+}
+
 const storageDetailsFunc = (
   localization: UI_I_Localization,
   name: string,
   form: UI_I_MigrateFormLocal
 ): UI_I_MigrateReadyBlockData[] => {
-  const { migrate_type } = form
+  const { migrate_type, vMotion_priority } = form
 
   const migrationType = localization.common[UI_E_VmMigrationType[migrate_type]]
 
@@ -85,11 +116,87 @@ const storageDetailsFunc = (
     },
   ]
 
+  if (migrate_type === 'resource') {
+    const resourceResult = [
+      {
+        label: localization.common.vMotionPriority,
+        value: localization.common[vMotion_priority],
+        permissions: [],
+      },
+      {
+        label: localization.common.networks,
+        value: setSelectNetworkDataView(localization, form),
+        permissions: [],
+      },
+    ]
+    // Object.entries(selectedComputeResource).forEach(([key, value]) => {
+    //   if (value !== null) {
+    //     storageResult.unshift({
+    //       label: localization.common[key],
+    //       value: value.name,
+    //       permissions: [],
+    //     })
+    //   }
+    // })
+    result = [...result, ...resourceResult]
+  }
+
   if (migrate_type === 'storage') {
     const storageData = migrateOnlyStorageDataView(localization, form, name)
     result = [...result, ...storageData]
   }
 
+  if (migrate_type === 'resource-storage') {
+    const resourceStorageResult = [
+      {
+        label: localization.common.host,
+        value: '', //selectedComputeResource.selectedNode.name,
+        permissions: [],
+      },
+      {
+        label: localization.common.vMotionPriority,
+        value: localization.common[vMotion_priority],
+        permissions: [],
+      },
+      {
+        label: localization.common.networks,
+        value: setSelectNetworkDataView(localization, form),
+        permissions: [],
+      },
+    ]
+    const storageResult = migrateOnlyStorageDataView(localization, form, name)
+
+    result = [...result, ...resourceStorageResult, ...storageResult]
+  }
+
+  if (migrate_type === 'server') {
+    const serverResult = [
+      {
+        label: localization.common.vMotionPriority,
+        value: localization.common[vMotion_priority],
+        permissions: [],
+      },
+      {
+        label: localization.common.networks,
+        value: setSelectNetworkDataView(localization, form),
+        permissions: [],
+      },
+    ]
+    // Object.entries(selectedComputeResource).forEach(([key, value]) => {
+    //   if (value !== null) {
+    //     serverResult.unshift({
+    //       label: localization.common[key],
+    //       value: value.name,
+    //       permissions: [],
+    //     })
+    //   }
+    // })
+
+    const storageResult = migrateOnlyStorageDataView(localization, form, name)
+
+    result = [...result, ...serverResult, ...storageResult]
+  }
+
   return result
 }
 export const constructDataReadyViewFunc = (

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

@@ -36,8 +36,8 @@
         :total-items="props.computeResourceData?.total_items || 0"
         :total-pages="props.computeResourceData?.total_pages || 1"
         :type="activeTab"
-      />
-    </template>a
+      /> </template
+    >a
 
     <common-wizards-vm-common-validation-compatibility
       :loading="!computeResourceDataLocal.selectedNode"
@@ -54,9 +54,9 @@ 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_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'
+import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/types'
+import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vmNew/migrate/select/computeResource/lib/models/interfaces'
+import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vmNew/migrate/select/computeResource/lib/config/tabsPannel'
 
 const props = defineProps<{
   submit: number
@@ -179,7 +179,8 @@ const checkValidityBlock = (): boolean => {
   )
 
   if (!hasSelectedData) {
-    const errorText = localization.value.common.selectValidDestinationComputeResource
+    const errorText =
+      localization.value.common.selectValidDestinationComputeResource
 
     errorMessages.value = [errorText]
     return false

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

@@ -112,7 +112,10 @@ const onSelectNetwork = (data: any): void => {
 </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/vmNew/migrate/select/network/table/network/Network.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="table-wrap">
+  <div class="table-view-container">
     <atoms-table-data-grid
       v-model:selected-row="selectedNetworkLocal"
       v-model:page-size="pagination.pageSize"
@@ -93,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/vmNew/migrate/select/network/table/network/lib/config/advancedTable.ts

@@ -4,8 +4,8 @@ import type {
 } 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 { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
-import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
+import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/models/interfaces'
+import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/config/tableKeys'
 
 const getItems = (
   localization: UI_I_Localization

package/components/common/wizards/vmNew/migrate/select/network/table/network/lib/config/tableKeys.ts

@@ -1,7 +1,7 @@
 import type {
   UI_T_NetworkBasicsTableKeysTuple,
   UI_T_NetworkAdvancedTableKeysTuple,
-} from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/types'
+} from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/models/types'
 
 export const networkBasicsTableItemKeys: UI_T_NetworkBasicsTableKeysTuple = [
   'source_network',

package/components/common/wizards/vmNew/migrate/select/network/table/network/lib/models/types.ts

@@ -1,7 +1,7 @@
 import type {
   UI_I_MigrateSelectNetworkBasicItem,
   UI_I_MigrateSelectNetworkAdvancedItem,
-} from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
+} from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/models/interfaces'
 
 export type UI_T_NetworkAdvancedTableKeysTuple = [
   'vm_name',

package/components/common/wizards/vmNew/migrate/select/storage/Storage.vue

@@ -73,7 +73,6 @@ import { vmMigrateSelectStorageTabsFunc } from '~/components/common/wizards/vmNe
 
 const props = defineProps<{
   alertMessages: string[]
-  submit: number
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
   connectedStorageIdDefault: string | null

package/package.json

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