Skip to content

Commit acb7dfa

Browse files
ByScriptsspacotte-vates
authored andcommitted
feat(web-core): add checkbox column to host, SR and VM column sets (#10485)
1 parent 3564f42 commit acb7dfa

9 files changed

Lines changed: 12 additions & 3 deletions

File tree

‎@xen-orchestra/lite/src/components/vm/VmsPageContent.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const state = useTableState({
143143
})
144144
145145
const { HeadCells, BodyCells } = useVmColumns({
146-
exclude: ['actions'],
146+
exclude: ['actions', 'checkbox'],
147147
body: (vm: XenApiVm) => {
148148
const guestMetrics = computed(() => getGuestMetrics(vm.guest_metrics))
149149
const vmMetrics = computed(() => getVmMetrics(vm.metrics))

‎@xen-orchestra/lite/src/modules/storage-repository/components/list/StorageRepositoriesTable.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ function getPrimaryIcon(sr: XenApiSr) {
105105
}
106106
107107
const { HeadCells, BodyCells } = useSrColumns({
108+
exclude: ['checkbox'],
108109
body: (sr: XenApiSr) => {
109110
const rightIcon = computed(() => getPrimaryIcon(sr))
110111

‎@xen-orchestra/lite/src/pages/pool/[uuid]/hosts.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const state = useTableState({
5050
})
5151
5252
const { HeadCells, BodyCells } = useHostColumns({
53-
exclude: ['selectItem', 'srStatus'],
53+
exclude: ['checkbox', 'selectItem', 'srStatus'],
5454
body: (host: XenApiHost) => {
5555
const state = isHostRunning(host) ? 'running' : 'halted'
5656

‎@xen-orchestra/web-core/lib/tables/column-sets/host-columns.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { defineColumns } from '@core/packages/table/define-columns.ts'
22
import { useAddressColumn } from '@core/tables/column-definitions/address-column.ts'
3+
import { useCheckboxColumn } from '@core/tables/column-definitions/checkbox-column.ts'
34
import { useLinkColumn } from '@core/tables/column-definitions/link-column.ts'
45
import { useSelectItemColumn } from '@core/tables/column-definitions/select-item-column.ts'
56
import { useStatusColumn } from '@core/tables/column-definitions/status-column.ts'
@@ -11,6 +12,7 @@ export const useHostColumns = defineColumns(() => {
1112
const { t } = useI18n()
1213

1314
return {
15+
checkbox: useCheckboxColumn(),
1416
host: useLinkColumn({ headerLabel: () => t('host') }),
1517
description: useTruncatedTextColumn({ headerLabel: () => t('description') }),
1618
ipAddresses: useAddressColumn({ headerLabel: () => t('management-ip') }),

‎@xen-orchestra/web-core/lib/tables/column-sets/sr-columns.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { defineColumns } from '@core/packages/table/define-columns.ts'
22
import { useActionColumn } from '@core/tables/column-definitions/action-column.ts'
3+
import { useCheckboxColumn } from '@core/tables/column-definitions/checkbox-column.ts'
34
import { useLinkColumn } from '@core/tables/column-definitions/link-column.ts'
45
import { useLiteralColumn } from '@core/tables/column-definitions/literal-column.ts'
56
import { useProgressBarColumn } from '@core/tables/column-definitions/progress-bar-column.ts'
@@ -10,6 +11,7 @@ export const useSrColumns = defineColumns(() => {
1011
const { t } = useI18n()
1112

1213
return {
14+
checkbox: useCheckboxColumn(),
1315
storageRepository: useLinkColumn({ headerLabel: () => t('storage-repository') }),
1416
description: useTruncatedTextColumn({ headerLabel: () => t('description') }),
1517
storageFormat: useLiteralColumn({ headerLabel: () => t('storage-format') }),

‎@xen-orchestra/web-core/lib/tables/column-sets/vm-columns.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { defineColumns } from '@core/packages/table/define-columns.ts'
22
import { useActionColumn } from '@core/tables/column-definitions/action-column.ts'
33
import { useAddressColumn } from '@core/tables/column-definitions/address-column.ts'
4+
import { useCheckboxColumn } from '@core/tables/column-definitions/checkbox-column.ts'
45
import { useLinkColumn } from '@core/tables/column-definitions/link-column.ts'
56
import { useNumberColumn } from '@core/tables/column-definitions/number-column.ts'
67
import { useTagColumn } from '@core/tables/column-definitions/tag-column.ts'
@@ -9,6 +10,7 @@ import { useI18n } from 'vue-i18n'
910
export const useVmColumns = defineColumns(() => {
1011
const { t } = useI18n()
1112
return {
13+
checkbox: useCheckboxColumn(),
1214
vm: useLinkColumn({ headerLabel: () => t('vm') }),
1315
ipAddresses: useAddressColumn({ headerLabel: () => t('ip-addresses') }),
1416
vcpus: useNumberColumn({ headerLabel: () => t('vcpus') }),

‎@xen-orchestra/web/src/modules/host/components/list/HostsTable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function getMasterIcon(host: FrontXoHost) {
9696
}
9797
9898
const { HeadCells, BodyCells } = useHostColumns({
99-
exclude: sr === undefined ? ['srStatus'] : [],
99+
exclude: sr === undefined ? ['checkbox', 'srStatus'] : ['checkbox'],
100100
body: (host: FrontXoHost) => {
101101
const ipAddresses = computed(() => getHostIpAddresses(host.address, pifsByHost.value.get(host.id)))
102102
const hostIcon = computed(() => getHostIcon(host))

‎@xen-orchestra/web/src/modules/storage-repository/components/list/StorageRepositoriesTable.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ function getPrimaryIcon(sr: FrontXoSr) {
100100
}
101101
102102
const { HeadCells, BodyCells } = useSrColumns({
103+
exclude: ['checkbox'],
103104
body: (sr: FrontXoSr) => {
104105
const rightIcon = computed(() => getPrimaryIcon(sr))
105106

‎@xen-orchestra/web/src/modules/vm/components/list/VmsTable.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ const displayVms = computed(() => filteredVms.value.map(vm => getDisplayData(vm)
6363
const { pageRecords: paginatedVms, paginationBindings } = usePagination('vms', displayVms)
6464
6565
const { HeadCells, BodyCells } = useVmColumns({
66+
exclude: ['checkbox'],
6667
body: (vm: VmDisplayData) => {
6768
return {
6869
vm: r => r({ label: vm.name_label, to: `/vm/${vm.id}/dashboard`, icon: vm.vmIcon }),

0 commit comments

Comments
 (0)