bfg-common 1.4.382 → 1.4.383

package/components/common/wizards/vm/migrate/Migrate.vue

@@ -160,7 +160,6 @@ const form = ref<UI_I_MigrateFormLocal>({
     password: '',
   },
   network: {
-    isBasicNetworkMode: true,
     data: null,
   },
   resource: {

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

@@ -68,34 +68,31 @@ const setSelectNetworkDataView = (
 ): string => {
   const {
     noNetworkReassignments,
-    networkAdapterReassignedNewDestination,
+    // networkAdapterReassignedNewDestination,
     networkAdapterWillBeReassignedTo,
   } = localization.common
 
-  const { isBasicNetworkMode, data } = from.network
+  const { data } = from.network
   const { sourceNetwork, value } = data
 
   if (sourceNetwork === value) {
     return noNetworkReassignments
   }
 
-  if (isBasicNetworkMode) {
-    type Replacements = {
-      lan: string
-      network: string
-    }
-
-    const replacements: Replacements = {
-      lan: sourceNetwork,
-      network: value,
-    }
-    return networkAdapterWillBeReassignedTo.replace(
-      /{(\w+)}/g,
-      (_, key: keyof Replacements) => replacements[key]
-    )
+  type Replacements = {
+    lan: string
+    network: string
   }
 
-  return networkAdapterReassignedNewDestination.replace('{number}', '1')
+  const replacements: Replacements = {
+    lan: sourceNetwork,
+    network: value,
+  }
+  return networkAdapterWillBeReassignedTo.replace(
+    /{(\w+)}/g,
+    (_, key: keyof Replacements) => replacements[key]
+  )
+  // return networkAdapterReassignedNewDestination.replace('{number}', '1')
 }
 
 const storageDetailsFunc = (

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

@@ -6,36 +6,11 @@
 
     <common-wizards-vm-migrate-select-network-table-network
       v-model="selectedSourceNetwork"
-      :key="uniqueKey"
       :networks="dataNetwork"
       :source-networks="sourceNetworks"
-      :type="tableType"
       @select-network="onSelectNetwork"
     />
 
-    <div
-      v-if="model.isBasicNetworkMode && selectedSourceNetwork"
-      class="select-network__matcher-details"
-    >
-      <span> {{ networkDetailsHeadline }} </span>
-
-      <common-wizards-vm-migrate-select-network-table-use-at
-        :networks="useAtTableData"
-      />
-    </div>
-
-    <div class="vm-migrate-advanced-view-button">
-      <button
-        class="btn btn-sm migrate-network-advanced-btn"
-        data-id="migrate-network-advanced-button"
-        @click="onClickSelectNetworkMode"
-      >
-        <span v-if="!model.isBasicNetworkMode"> &#x226A; </span>
-        {{ buttonText }}
-        <span v-if="model.isBasicNetworkMode"> &#8811; </span>
-      </button>
-    </div>
-
     <common-wizards-vm-common-validation-compatibility
       :loading="false"
       status="Success"
@@ -55,18 +30,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
 
 const selectedSourceNetwork = ref<string | null>(null)
-const uniqueKey = ref<number>(0)
-
-const buttonText = computed(
-  () =>
-    localization.value.common[
-      model.value.isBasicNetworkMode ? 'advanced' : 'basic'
-    ]
-)
-
-const tableType = computed<string>(() =>
-  model.value.isBasicNetworkMode ? 'basic' : 'advanced'
-)
 
 const selectNetworkHeadline = computed<string>(() => {
   const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
@@ -76,12 +39,6 @@ const selectNetworkHeadline = computed<string>(() => {
     ? migrateNetworkingForAllAdapters
     : migrateNetworkingForEachAdapters
 })
-const networkDetailsHeadline = computed<string>(() =>
-  localization.value.common.networkIsInUseAt.replace(
-    '{ network }',
-    selectedSourceNetwork.value + ''
-  )
-)
 
 // TODO эти данные бутут приходить из апи все надо поменять
 const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => [
@@ -119,22 +76,6 @@ const dataNetwork = computed(() => {
     },
   ]
 })
-
-const useAtTableData = computed(() =>
-  dataNetwork.value.map((x) => {
-    return {
-      vm_name: x.vm_name,
-      network: x.source_network,
-      network_adapter: x.network_adapter,
-    }
-  })
-)
-
-const onClickSelectNetworkMode = (): void => {
-  uniqueKey.value++
-  model.value.isBasicNetworkMode = !model.value.isBasicNetworkMode
-  selectedSourceNetwork.value = ''
-}
 const onSelectNetwork = (data: any): void => {
   model.value.data = data
 }

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

@@ -54,13 +54,11 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/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 * as table from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable'
 
 const props = defineProps<{
   networks: UI_T_MigrateSelectNetwork[]
   sourceNetworks: UI_I_NetworkTableItem[]
-  type: 'basic' | 'advanced'
 }>()
 const emits = defineEmits<{
   (event: 'select-network', value: any): void
@@ -82,16 +80,11 @@ const onSelectLocation = (_network: UI_I_NetworkTableItem): void => {
   isShowSelectNetworkModal.value = false
 }
 
-const table: any = {
-  basic: basicTable,
-  advanced: advancedTable,
-}
-
 const headItems = computed<UI_I_HeadItem[]>(() =>
-  table[props.type].headItems(localization.value)
+  table.headItems(localization.value)
 )
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table[props.type].bodyItems(props.networks)
+  return table.bodyItems(props.networks)
 })
 
 const onSelectNetwork = (data: any): void => {

package/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable.ts

@@ -11,9 +11,19 @@ const getItems = (
   localization: UI_I_Localization
 ): [string, boolean, string, string][] => {
   return [
-    [localization.common.vm, true, '25%', networkAdvancedTableItemKeys[0]],
-    [localization.common.networkAdapter, true, '25%', networkAdvancedTableItemKeys[1]],
-    [localization.common.sourceNetwork, true, '25%', networkAdvancedTableItemKeys[2]],
+    [
+      localization.common.sourceNetwork,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[0],
+    ],
+    [localization.common.vm, true, '25%', networkAdvancedTableItemKeys[1]],
+    [
+      localization.common.networkAdapter,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[2],
+    ],
     [
       localization.common.destinationNetwork,
       true,

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

@@ -1,13 +1,13 @@
 import type {
-  UI_T_NetworkBasicsTableKeysTuple,
+  // UI_T_NetworkBasicsTableKeysTuple,
   UI_T_NetworkAdvancedTableKeysTuple,
 } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/types'
 
-export const networkBasicsTableItemKeys: UI_T_NetworkBasicsTableKeysTuple = [
-  'source_network',
-  'used_by',
-  'destination_network',
-]
+// export const networkBasicsTableItemKeys: UI_T_NetworkBasicsTableKeysTuple = [
+//   'source_network',
+//   'used_by',
+//   'destination_network',
+// ]
 
 export const networkAdvancedTableItemKeys: UI_T_NetworkAdvancedTableKeysTuple =
-  ['vm_name', 'network_adapter', 'source_network', 'destination_network']
+  ['source_network', 'vm_name', 'network_adapter', 'destination_network']

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

@@ -4,17 +4,17 @@ import type {
 } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
 
 export type UI_T_NetworkAdvancedTableKeysTuple = [
+  'source_network',
   'vm_name',
   'network_adapter',
-  'source_network',
   'destination_network'
 ]
 
-export type UI_T_NetworkBasicsTableKeysTuple = [
-  'source_network',
-  'used_by',
-  'destination_network'
-]
+// export type UI_T_NetworkBasicsTableKeysTuple = [
+//   'source_network',
+//   'used_by',
+//   'destination_network'
+// ]
 
 export type UI_T_MigrateSelectNetwork =
   | UI_I_MigrateSelectNetworkBasicItem

package/package.json

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