bfg-common 1.3.42 → 1.3.44

package/components/atoms/table/dataGrid/DataGrid.vue

@@ -547,6 +547,8 @@ const changeAll = (e: UI_I_HTMLSelectElement): void => {
   const newSelectedRow: (number | string)[] = []
   if (e.target.checked) {
     bodyItemsPresent.value.forEach((row) => {
+      if (row[0]?.disabled) return
+
       newSelectedRow.push(row[0].id)
     })
   }

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

@@ -3,7 +3,7 @@
     <common-wizards-vm-migrate-select-network-table-disk
       v-model="selected"
       :type="tableType"
-      :data-table="[]"
+      :networks="[]"
     />
 
     <div class="vm-migrate-advanced-view-button">
@@ -11,9 +11,9 @@
         class="btn btn-sm migrate-network-advanced-btn"
         @click="isShowNetworkBasic = !isShowNetworkBasic"
       >
-        <span v-if="isShowNetworkBasic"> &#x226A; </span>
+        <span v-if="!isShowNetworkBasic"> &#x226A; </span>
         {{ buttonText }}
-        <span v-if="!isShowNetworkBasic"> &#8811; </span>
+        <span v-if="isShowNetworkBasic"> &#8811; </span>
       </button>
     </div>
 
@@ -30,11 +30,11 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selected = ref<number[]>([])
-const isShowNetworkBasic = ref<boolean>(false)
+const selected = ref<number | null>(null)
+const isShowNetworkBasic = ref<boolean>(true)
 
 const buttonText = computed(
-  () => localization.value[isShowNetworkBasic.value ? 'basic' : 'advanced']
+  () => localization.value[isShowNetworkBasic.value ? 'advanced' : 'basic']
 )
 
 const tableType = computed<string>(() =>

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

@@ -1,20 +1,35 @@
 <template>
   <div class="table-wrap">
     <atoms-table-data-grid
-      v-model:selected-row="selectedRow"
+      v-model:selected-row="selectedNetworkLocal"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
-      type="checkbox"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="bodyItems.length"
       :total-pages="1"
+      class="select-network"
       server-off
       hide-footer
       hide-page-size
-      @sorting="sorting"
     >
+      <template #select="{ item }">
+        <span class="select select-network__select">
+          <select
+            :id="item.data.id"
+            v-model="item.data.value"
+            :disabled="item.data.disabled"
+          >
+            <option
+              v-for="option in item.data.option"
+              :key="option"
+              :value="option"
+              :label="option"
+            />
+          </select>
+        </span>
+      </template>
     </atoms-table-data-grid>
   </div>
 </template>
@@ -27,20 +42,26 @@ import type {
   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/disk/lib/models/types'
 import * as basicTable from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/config/basicTable'
 import * as advancedTable from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/config/advancedTable'
 
 const props = defineProps<{
-  modelValue: number[]
-  dataTable: any[]
+  modelValue: number | null
+  networks: UI_T_MigrateSelectNetwork[]
   type: 'basic' | 'advanced'
 }>()
 const emits = defineEmits<{
-  (event: 'update:model-value', value: number[] | null): void
+  (event: 'update:model-value', value: number | null): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+
 const table: any = {
   basic: basicTable,
   advanced: advancedTable,
@@ -57,29 +78,28 @@ watch(localization, () => {
 })
 
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table[props.type].bodyItems(props.dataTable)
+  return table[props.type].bodyItems(props.networks)
 })
 
-const sort = ref<string | null>(null)
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-
-const sorting = (data: [string, boolean]): void => {
-  const [column, status] = data
-  const direction = status ? 'asc' : 'desc'
-  sort.value = `${column}.${direction}`
-}
-
-const selectedRow = computed<number[]>({
+const selectedNetworkLocal = computed<number | null>({
   get() {
     return props.modelValue
   },
-  set(newValue: number[]) {
+  set(newValue: number | null) {
     emits('update:model-value', newValue)
   },
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.select-network {
+  &__select {
+    width: 100%;
+    height: 24px;
+    min-width: 107px;
+    & > select {
+      height: 100%;
+    }
+  }
+}
+</style>

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

@@ -1,13 +1,10 @@
 import type {
-  UI_I_ColumnKey,
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/models/interfaces'
 import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/config/tableKeys'
 
 const getItems = (
@@ -26,52 +23,53 @@ const getItems = (
   ]
 }
 
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
-}
-
 export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
   const result: UI_I_HeadItem[] = []
   getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+    const col = i === 3 ? 'select' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
   })
   return result
 }
 
-export const bodyItems = (data: any[]): UI_I_BodyItem[][] => {
+export const bodyItems = (
+  data: UI_I_MigrateSelectNetworkAdvancedItem[]
+): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
 
-  data.forEach((storage: any, key: number) => {
-    bodyItems.push([
-      {
-        key: 'col0',
-        text: storage[networkAdvancedTableItemKeys[0]],
-        id: key,
-      },
-      {
-        key: 'col1',
-        text: storage[networkAdvancedTableItemKeys[1]],
-        id: key,
-      },
-      {
-        key: 'col2',
-        text: storage[networkAdvancedTableItemKeys[2]],
-        id: key,
-      },
-      {
-        key: 'col3',
-        text: storage[networkAdvancedTableItemKeys[3]],
-        id: key,
-      },
-    ])
-  })
+  data.forEach(
+    (network: UI_I_MigrateSelectNetworkAdvancedItem, key: number) => {
+      const data = {
+        id: `${network.vm_name}-select`,
+        disabled: false,
+        value: network.destination_network[0],
+        option: network.destination_network,
+      }
+
+      bodyItems.push([
+        {
+          key: 'col0',
+          text: network[networkAdvancedTableItemKeys[0]],
+          id: key,
+        },
+        {
+          key: 'col1',
+          text: network[networkAdvancedTableItemKeys[1]],
+          id: key,
+        },
+        {
+          key: 'col2',
+          text: network[networkAdvancedTableItemKeys[2]],
+          id: key,
+        },
+        {
+          key: 'select',
+          text: network[networkAdvancedTableItemKeys[3]],
+          data,
+          id: key,
+        },
+      ])
+    }
+  )
   return bodyItems
 }

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

@@ -1,13 +1,10 @@
 import type {
-  UI_I_ColumnKey,
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import type { UI_I_MigrateSelectNetworkBasicItem } from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/models/interfaces'
 import { networkBasicsTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/config/tableKeys'
 
 const getItems = (
@@ -25,44 +22,43 @@ const getItems = (
   ]
 }
 
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
-}
-
 export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
   const result: UI_I_HeadItem[] = []
   getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+    const col = i === 2 ? 'select' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
   })
   return result
 }
 
-export const bodyItems = (data: any[]): UI_I_BodyItem[][] => {
+export const bodyItems = (
+  data: UI_I_MigrateSelectNetworkBasicItem[]
+): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
 
-  data.forEach((storage: any, key: number) => {
+  data.forEach((network: UI_I_MigrateSelectNetworkBasicItem, key: number) => {
+    const data = {
+      id: `${network.source_network}-select`,
+      disabled: false,
+      value: network.destination_network[0],
+      option: network.destination_network,
+    }
+
     bodyItems.push([
       {
         key: 'col0',
-        text: storage[networkBasicsTableItemKeys[0]],
+        text: network[networkBasicsTableItemKeys[0]],
         id: key,
       },
       {
         key: 'col1',
-        text: storage[networkBasicsTableItemKeys[1]],
+        text: network[networkBasicsTableItemKeys[1]],
         id: key,
       },
       {
-        key: 'col2',
-        text: storage[networkBasicsTableItemKeys[2]],
+        key: 'select',
+        text: network[networkBasicsTableItemKeys[2]],
+        data,
         id: key,
       },
     ])

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

@@ -1 +1,12 @@
+export interface UI_I_MigrateSelectNetworkBasicItem {
+  source_network: string
+  used_by: string
+  destination_network: string
+}
 
+export interface UI_I_MigrateSelectNetworkAdvancedItem {
+  vm_name: string
+  network_adapter: string
+  source_network: string
+  destination_network: string
+}

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

@@ -1,3 +1,8 @@
+import type {
+  UI_I_MigrateSelectNetworkBasicItem,
+  UI_I_MigrateSelectNetworkAdvancedItem,
+} from '~/components/common/wizards/vm/migrate/select/network/table/disk/lib/models/interfaces'
+
 export type UI_T_NetworkAdvancedTableKeysTuple = [
   'vm_name',
   'network_adapter',
@@ -10,3 +15,7 @@ export type UI_T_NetworkBasicsTableTableKeysTuple = [
   'used_by',
   'destination_network'
 ]
+
+export type UI_T_MigrateSelectNetwork =
+  | UI_I_MigrateSelectNetworkBasicItem
+  | UI_I_MigrateSelectNetworkAdvancedItem

package/package.json

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