bfg-common 1.4.368 → 1.4.370

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

@@ -8,6 +8,7 @@
       v-model="selectedSourceNetwork"
       :key="uniqueKey"
       :networks="dataNetwork"
+      :source-networks="sourceNetworks"
       :type="tableType"
       @select-network="onSelectNetwork"
     />
@@ -45,10 +46,13 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
 import type { UI_I_SelectNetworksFormLocal } from '~/components/common/wizards/vm/migrate/select/network/lib/models/interfaces'
 
 const model = defineModel<UI_I_SelectNetworksFormLocal>({ required: true })
+
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
 
 const selectedSourceNetwork = ref<string | null>(null)
 const uniqueKey = ref<number>(0)
@@ -79,14 +83,39 @@ const networkDetailsHeadline = computed<string>(() =>
   )
 )
 
+// TODO эти данные бутут приходить из апи все надо поменять
+const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => [
+  {
+    id: 1,
+    name: 'VM Network 1',
+    net_bridge: 'VM Network 1',
+  },
+  {
+    id: 2,
+    name: 'VM-VLAN105',
+    net_bridge: 'VM-VLAN105',
+  },
+  {
+    id: 3,
+    name: 'VM Network 2',
+    net_bridge: 'VM Network 2',
+  },
+])
+
 const dataNetwork = computed(() => {
+  // TODO надо потом все поменять когда будет заприсы
   return [
     {
       vm_name: 'vm-horizon-1',
       network_adapter: 'Network adapter 1',
       source_network: 'VM-VLAN105',
       used_by: '1 VMs / 1 Network adapters',
-      destination_network: ['VM Network 1', 'VM-VLAN105', 'VM Network 2'],
+      destination_network: [
+        { text: 'VM Network 1', value: 'VM Network 1' },
+        { text: 'VM-VLAN105', value: 'VM-VLAN105' },
+        { text: 'VM Network 2', value: 'VM Network 2' },
+        { text: `${localization.value.common.browse}...`, value: 'browser' },
+      ],
     },
   ]
 })

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

@@ -22,19 +22,26 @@
             v-model="item.data.value"
             data-id="network-select"
             :disabled="item.data.disabled"
-            @change="onSelect(item.data)"
+            @change="onSelectNetwork(item.data)"
             @click.stop
           >
             <option
-              v-for="option in item.data.option"
-              :key="option"
-              :value="option"
-              :label="option"
+              v-for="(option, key) in item.data.option"
+              :key="key"
+              :value="option.value"
+              :label="option.text"
             />
           </select>
         </span>
       </template>
     </atoms-table-data-grid>
+
+    <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-location
+      :location-modal-is-show="isShowSelectNetworkModal"
+      :networks-table="props.sourceNetworks"
+      @hide="onHideLocationModal"
+      @select="onSelectLocation"
+    />
   </div>
 </template>
 
@@ -45,12 +52,14 @@ import type {
   UI_I_HeadItem,
   UI_I_BodyItem,
 } 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'
 
 const props = defineProps<{
   networks: UI_T_MigrateSelectNetwork[]
+  sourceNetworks: UI_I_NetworkTableItem[]
   type: 'basic' | 'advanced'
 }>()
 const emits = defineEmits<{
@@ -65,6 +74,14 @@ const pagination = ref<UI_I_Pagination>({
   pageSize: 100,
 })
 
+const isShowSelectNetworkModal = ref<boolean>(false)
+const onHideLocationModal = (): void => {
+  isShowSelectNetworkModal.value = false
+}
+const onSelectLocation = (_network: UI_I_NetworkTableItem): void => {
+  isShowSelectNetworkModal.value = false
+}
+
 const table: any = {
   basic: basicTable,
   advanced: advancedTable,
@@ -77,7 +94,12 @@ const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return table[props.type].bodyItems(props.networks)
 })
 
-const onSelect = (data: any): void => {
+const onSelectNetwork = (data: any): void => {
+  if (data?.value === 'browser') {
+    isShowSelectNetworkModal.value = true
+    return
+  }
+
   emits('select-network', data)
 }
 watch(
@@ -86,7 +108,7 @@ watch(
     const tableData = bodyItems.value[0]
     const itemKey = newValue === 'basic' ? 2 : 3
     const data = tableData[itemKey].data
-    onSelect(data)
+    onSelectNetwork(data)
   },
   { deep: true, immediate: true }
 )
@@ -109,5 +131,4 @@ watch(
     }
   }
 }
-
 </style>

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

@@ -44,8 +44,8 @@ export const bodyItems = (
         sourceNetwork: network.source_network,
         disabled: false,
         value: network.destination_network.find(
-          (item: string) => item === network.source_network
-        ),
+          (item) => item.value === network.source_network
+        ).text,
         option: network.destination_network,
       }
 

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

@@ -42,8 +42,8 @@ export const bodyItems = (
       sourceNetwork: network.source_network,
       disabled: false,
       value: network.destination_network.find(
-        (item) => item === network.source_network
-      ),
+        (item) => item.value === network.source_network
+      ).text,
       option: network.destination_network,
     }
 

package/package.json

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