bfg-common 1.2.150 → 1.2.152
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/common/wizards/datastore/add/utils.ts +2 -4
- package/components/common/wizards/vm/common/readyComplete/ReadyComplete.vue +2 -2
- package/components/common/wizards/vm/migrate/Migrate.vue +5 -5
- package/components/common/wizards/vm/migrate/select/storage/Storage.vue +12 -3
- package/components/common/wizards/vm/migrate/select/storage/configure/disk/Disk.vue +4 -1
- package/components/common/wizards/vm/migrate/select/storage/models/interfaces.ts +1 -1
- package/components/common/wizards/vm/migrate/select/storage/table/disk/Disk.vue +13 -2
- package/package.json +1 -1
|
@@ -19,14 +19,12 @@ import {
|
|
|
19
19
|
|
|
20
20
|
export const checkValidityName = async (
|
|
21
21
|
name: string,
|
|
22
|
-
|
|
22
|
+
_mode: UI_T_WizardDatastoreMode = 'procurator'
|
|
23
23
|
): Promise<UI_I_DatastoreValidityName> => {
|
|
24
|
-
let api = '/api/v1'
|
|
25
|
-
mode === 'procurator' && (api = '/ui')
|
|
26
24
|
|
|
27
25
|
// @ts-ignore
|
|
28
26
|
const { error } = await useMyFetch<null, API_UI_I_Error>(
|
|
29
|
-
|
|
27
|
+
`/ui/ds/validate?name=${name}`,
|
|
30
28
|
{
|
|
31
29
|
method: 'GET',
|
|
32
30
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div>
|
|
2
|
+
<div class="ready-complete">
|
|
3
3
|
<atoms-table-info :items="props.readyCompleteTableInfo" />
|
|
4
4
|
</div>
|
|
5
5
|
</template>
|
|
6
6
|
|
|
7
7
|
<script lang="ts" setup>
|
|
8
|
-
import type { UI_I_TableInfoItem } from '
|
|
8
|
+
import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/interfaces'
|
|
9
9
|
|
|
10
10
|
const props = defineProps<{
|
|
11
11
|
readyCompleteTableInfo: UI_I_TableInfoItem[]
|
|
@@ -56,12 +56,12 @@
|
|
|
56
56
|
v-show="currentBlockId === 'select-motion-priority'"
|
|
57
57
|
v-model="selectedVMotionPriority"
|
|
58
58
|
/>
|
|
59
|
-
</div>
|
|
60
59
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
60
|
+
<common-wizards-vm-common-ready-complete
|
|
61
|
+
v-if="currentBlockId === 'ready-complete'"
|
|
62
|
+
:ready-complete-table-info="dataReadyView"
|
|
63
|
+
/>
|
|
64
|
+
</div>
|
|
65
65
|
</template>
|
|
66
66
|
</atoms-modal-by-steps>
|
|
67
67
|
</template>
|
|
@@ -122,9 +122,11 @@ const onApplyChanges = (): void => {
|
|
|
122
122
|
)!
|
|
123
123
|
|
|
124
124
|
if (selectedDisk) {
|
|
125
|
-
const { storage, vmDiskFormat } = dataLocal.value
|
|
125
|
+
const { storage, vmDiskFormat } = dataLocal.value
|
|
126
126
|
|
|
127
|
-
;({ name: disk.storage, id: disk.extra.datastore_id } = storage)
|
|
127
|
+
// ;({ name: disk.storage, id: disk.extra.datastore_id } = storage)
|
|
128
|
+
disk.storage = storage.name
|
|
129
|
+
disk.extra.datastore_id = storage.id
|
|
128
130
|
disk.disk_format = vmDiskFormat
|
|
129
131
|
}
|
|
130
132
|
})
|
|
@@ -156,10 +158,14 @@ const checkValidityBlock = (): boolean => {
|
|
|
156
158
|
return false
|
|
157
159
|
}
|
|
158
160
|
const isActivePerDiskTab = activeTab.value === 'configure-disk'
|
|
161
|
+
|
|
159
162
|
emits('next-step', {
|
|
160
163
|
...dataLocal.value,
|
|
161
164
|
tab: activeTab.value,
|
|
162
|
-
...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
|
|
165
|
+
// ...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
|
|
166
|
+
configureDisks: isActivePerDiskTab
|
|
167
|
+
? configurePerDisksLocal.value
|
|
168
|
+
: props.configurePerDisks,
|
|
163
169
|
})
|
|
164
170
|
return true
|
|
165
171
|
}
|
|
@@ -172,7 +178,10 @@ watch(
|
|
|
172
178
|
</script>
|
|
173
179
|
|
|
174
180
|
<style lang="scss" scoped>
|
|
181
|
+
@import 'assets/scss/common/mixins.scss';
|
|
175
182
|
.select-storage {
|
|
183
|
+
@include flex($dir: column);
|
|
184
|
+
height: inherit;
|
|
176
185
|
&__tabs {
|
|
177
186
|
width: 100%;
|
|
178
187
|
:deep(.nav) {
|
|
@@ -46,7 +46,7 @@ const selectedDisksFromTable = computed<UI_I_StorageConfigurePerDiskItem[]>(
|
|
|
46
46
|
if (!props.configurePerDisks) return []
|
|
47
47
|
|
|
48
48
|
return props.configurePerDisks.filter((_: never, key: number) =>
|
|
49
|
-
|
|
49
|
+
selectedPerDiskKeysLocal.value.includes(key)
|
|
50
50
|
)
|
|
51
51
|
}
|
|
52
52
|
)
|
|
@@ -77,7 +77,10 @@ const activeTabValue = computed<UI_T_VmMigrateSelectStorageTab>({
|
|
|
77
77
|
</script>
|
|
78
78
|
|
|
79
79
|
<style lang="scss" scoped>
|
|
80
|
+
@import 'assets/scss/common/mixins.scss';
|
|
80
81
|
.migrate-configure-disk {
|
|
82
|
+
@include flex($dir: column);
|
|
83
|
+
height: inherit;
|
|
81
84
|
margin-top: 10px;
|
|
82
85
|
}
|
|
83
86
|
</style>
|
|
@@ -10,5 +10,5 @@ export interface UI_I_SelectStorageDataLocal {
|
|
|
10
10
|
export interface UI_I_SelectStorageReadyData
|
|
11
11
|
extends UI_I_SelectStorageDataLocal {
|
|
12
12
|
tab: UI_T_VmMigrateSelectStorageTab
|
|
13
|
-
configureDisks
|
|
13
|
+
configureDisks: UI_I_StorageConfigurePerDiskItem[]
|
|
14
14
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="table-
|
|
2
|
+
<div class="data-table-view">
|
|
3
3
|
<atoms-table-data-grid
|
|
4
4
|
v-model:selected-row="selectedRow"
|
|
5
5
|
v-model:column-keys="columnKeys"
|
|
6
6
|
v-model:page-size="pagination.pageSize"
|
|
7
7
|
v-model:page="pagination.page"
|
|
8
8
|
type="checkbox"
|
|
9
|
+
class="data-table"
|
|
9
10
|
:head-items="headItems"
|
|
10
11
|
:body-items="bodyItems"
|
|
11
12
|
:total-items="bodyItems.length"
|
|
@@ -70,4 +71,14 @@ const selectedRow = computed<number[]>({
|
|
|
70
71
|
})
|
|
71
72
|
</script>
|
|
72
73
|
|
|
73
|
-
<style lang="scss" scoped
|
|
74
|
+
<style lang="scss" scoped>
|
|
75
|
+
.data-table-view {
|
|
76
|
+
height: inherit;
|
|
77
|
+
.data-table {
|
|
78
|
+
height: inherit;
|
|
79
|
+
:deep(.datagrid-outer-wrapper) {
|
|
80
|
+
height: inherit;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
</style>
|