bfg-common 1.4.141 → 1.4.143

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,6 +116,31 @@ 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]

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,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"
@@ -43,13 +42,12 @@
 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'
-import type { UI_T_MigrateSelectNetwork } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/types'
-import * as basicTable from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/basicTable'
-import * as advancedTable from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable'
+import type { UI_T_MigrateSelectNetwork } from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/models/types'
+import * as basicTable from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/config/basicTable'
+import * as advancedTable from '~/components/common/wizards/vmNew/migrate/select/network/table/network/lib/config/advancedTable'
 
 const props = defineProps<{
   networks: UI_T_MigrateSelectNetwork[]
@@ -75,13 +73,6 @@ const table: any = {
 const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.type].headItems(localization.value)
 )
-const columnKeys = ref<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)
 })
@@ -102,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/package.json

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