@xen-orchestra/web-core 0.54.0 → 0.55.0

package/lib/tables/column-definitions/status-column.ts

@@ -7,10 +7,10 @@ import { useI18n } from 'vue-i18n'
 
 export const useStatusColumn = defineColumn((config?: HeaderConfig & Omit<StatusCellProps, 'status'>) => {
   const { t } = useI18n()
-  const { headerIcon, headerLabel, ...statusCellProps } = config ?? {}
+  const { headerLabel, ...statusCellProps } = config ?? {}
 
   return {
-    renderHead: () => renderHeadCell(headerIcon ?? 'fa:square-caret-down', headerLabel ?? t('status')),
+    renderHead: () => renderHeadCell(headerLabel ?? t('status')),
     renderBody: (status: StatusCellProps['status']) => h(VtsStatusCell, { status, ...statusCellProps }),
   }
 })

package/lib/tables/column-definitions/tag-column.ts

@@ -1,4 +1,5 @@
 import VtsTagCell from '@core/components/table/cells/VtsTagCell.vue'
+import type { TagAccent } from '@core/components/ui/tag/UiTag.vue'
 import { defineColumn } from '@core/packages/table/define-column'
 import { renderHeadCell } from '@core/tables/helpers/render-head-cell'
 import type { HeaderConfig } from '@core/tables/types.ts'
@@ -6,6 +7,6 @@ import type { MaybeArray } from '@core/types/utility.type'
 import { h } from 'vue'
 
 export const useTagColumn = defineColumn((config?: HeaderConfig) => ({
-  renderHead: () => renderHeadCell(config?.headerIcon ?? 'fa:square-caret-down', config?.headerLabel),
-  renderBody: (tag: MaybeArray<string>) => h(VtsTagCell, { tag }),
+  renderHead: () => renderHeadCell(config?.headerLabel),
+  renderBody: (tag: MaybeArray<string>, accent: TagAccent = 'info') => h(VtsTagCell, { tag, accent }),
 }))

package/lib/tables/column-definitions/text-column.ts

@@ -6,6 +6,6 @@ import type { HeaderConfig } from '@core/tables/types.ts'
 import { h } from 'vue'
 
 export const useTextColumn = defineColumn((config?: HeaderConfig) => ({
-  renderHead: () => renderHeadCell(config?.headerIcon ?? 'fa:align-left', config?.headerLabel),
+  renderHead: () => renderHeadCell(config?.headerLabel),
   renderBody: (content: string, props?: TextCellProps) => h(VtsTextCell, props, () => content),
 }))

package/lib/tables/column-definitions/truncated-text-column.ts

@@ -5,6 +5,6 @@ import type { HeaderConfig } from '@core/tables/types.ts'
 import { h } from 'vue'
 
 export const useTruncatedTextColumn = defineColumn((config?: HeaderConfig & { limit?: number }) => ({
-  renderHead: () => renderHeadCell(config?.headerIcon ?? 'fa:align-left', config?.headerLabel),
+  renderHead: () => renderHeadCell(config?.headerLabel),
   renderBody: (content: string) => h(VtsTruncatedTextCell, { content, limit: config?.limit }),
 }))

package/lib/tables/column-sets/backup-job-schedule-columns.ts

@@ -9,9 +9,9 @@ export const useBackupJobScheduleColumns = defineColumns(() => {
 
   return {
     schedule: useLinkColumn({ headerLabel: () => t('schedule') }),
-    id: useTextColumn({ headerLabel: () => t('id'), headerIcon: 'fa:hashtag' }),
+    id: useTextColumn({ headerLabel: () => t('id') }),
     status: useStatusColumn(),
-    cronPattern: useTextColumn({ headerLabel: () => t('cron-pattern'), headerIcon: 'fa:clock' }),
+    cronPattern: useTextColumn({ headerLabel: () => t('cron-pattern') }),
     lastThreeRuns: useStatusColumn({
       headerLabel: () => t('last-n-runs', { n: 3 }),
       iconOnly: true,

package/lib/tables/column-sets/backup-log-columns.ts

@@ -11,7 +11,7 @@ export const useBackupLogsColumns = defineColumns(() => {
   return {
     startDate: useDateColumn({ headerLabel: () => t('start-date'), dateStyle: 'short', timeStyle: 'medium' }),
     endDate: useDateColumn({ headerLabel: () => t('end-date'), dateStyle: 'short', timeStyle: 'medium' }),
-    duration: useNumberColumn({ headerIcon: 'fa:time', headerLabel: () => t('duration') }),
+    duration: useNumberColumn({ headerLabel: () => t('duration') }),
     status: useStatusColumn(),
     transferSize: useNumberColumn({ headerLabel: () => t('transfer-size') }),
     selectItem: useSelectItemColumn(),

package/lib/tables/column-sets/new-vm-network-columns.ts

@@ -10,12 +10,10 @@ export const useNewVmNetworkColumns = defineColumns(() => {
   return {
     interface: useSelectColumn({
       headerLabel: () => t('interfaces'),
-      headerIcon: 'object:network',
     }),
 
     mac: useInputColumn({
       headerLabel: () => t('mac-addresses'),
-      headerIcon: 'fa:at',
       placeholder: () => t('auto-generated'),
     }),
 

package/lib/tables/column-sets/new-vm-sr-columns.ts

@@ -10,7 +10,6 @@ export const useNewVmSrColumns = defineColumns(() => {
   return {
     sr: useSelectColumn({
       headerLabel: () => t('storage-repositories'),
-      headerIcon: 'object:sr',
     }),
 
     diskName: useInputColumn({

package/lib/tables/column-sets/server-columns.ts

@@ -12,7 +12,7 @@ export const useServerColumns = defineColumns(() => {
     pool: useLinkColumn({ headerLabel: () => t('pool') }),
     hostIp: useAddressColumn({ headerLabel: () => t('ip-address') }),
     status: useStatusColumn({ headerLabel: () => t('status') }),
-    primaryHost: useLinkColumn({ headerLabel: () => t('master'), headerIcon: 'object:host' }),
+    primaryHost: useLinkColumn({ headerLabel: () => t('master') }),
     selectItem: useSelectItemColumn(),
   }
 })

package/lib/tables/column-sets/snapshot-columns.ts

@@ -13,7 +13,7 @@ export const useSnapshotColumns = defineColumns(() => {
     name: useLinkColumn({ headerLabel: () => t('name') }),
     description: useTruncatedTextColumn({ headerLabel: () => t('description') }),
     creationDate: useDateColumn({ headerLabel: () => t('creation-date'), dateStyle: 'short', timeStyle: 'medium' }),
-    trigger: useLinkOrTextColumn({ headerLabel: () => t('trigger'), headerIcon: 'fa:square-caret-down' }),
+    trigger: useLinkOrTextColumn({ headerLabel: () => t('trigger') }),
     actions: useActionColumn({}),
   }
 })

package/lib/tables/column-sets/sr-columns.ts

@@ -1,8 +1,8 @@
 import { defineColumns } from '@core/packages/table/define-columns.ts'
+import { useActionColumn } from '@core/tables/column-definitions/action-column'
 import { useLinkColumn } from '@core/tables/column-definitions/link-column'
 import { useLiteralColumn } from '@core/tables/column-definitions/literal-column.ts'
 import { useProgressBarColumn } from '@core/tables/column-definitions/progress-bar-column.ts'
-import { useSelectItemColumn } from '@core/tables/column-definitions/select-item-column'
 import { useTruncatedTextColumn } from '@core/tables/column-definitions/truncated-text-column'
 import { useI18n } from 'vue-i18n'
 
@@ -15,6 +15,6 @@ export const useSrColumns = defineColumns(() => {
     storageFormat: useLiteralColumn({ headerLabel: () => t('storage-format') }),
     accessMode: useLiteralColumn({ headerLabel: () => t('access-mode') }),
     usedSpace: useProgressBarColumn({ headerLabel: () => t('used-space') }),
-    selectItem: useSelectItemColumn(),
+    actions: useActionColumn({}),
   }
 })

package/lib/tables/column-sets/traffic-rules-columns.ts

@@ -1,7 +1,7 @@
 import { defineColumns } from '@core/packages/table/define-columns.ts'
+import { useActionColumn } from '@core/tables/column-definitions/action-column.ts'
 import { useDoubleLinkColumn } from '@core/tables/column-definitions/double-link-column.ts'
 import { useNumberColumn } from '@core/tables/column-definitions/number-column.ts'
-import { useSelectItemColumn } from '@core/tables/column-definitions/select-item-column.ts'
 import { useTagColumn } from '@core/tables/column-definitions/tag-column.ts'
 import { useTextColumn } from '@core/tables/column-definitions/text-column.ts'
 import { useTruncatedTextColumn } from '@core/tables/column-definitions/truncated-text-column.ts'
@@ -11,19 +11,17 @@ export const useTrafficRulesColumns = defineColumns(() => {
   const { t } = useI18n()
 
   return {
-    order: useNumberColumn({ headerIcon: 'fa:hashtag' }),
+    order: useNumberColumn(),
     policy: useTagColumn({ headerLabel: () => t('policy') }),
     protocol: useTextColumn({
       headerLabel: () => t('protocol:port'),
-      headerIcon: 'fa:square-caret-down',
     }),
-    directionA: useTextColumn({ headerLabel: () => t('direction'), headerIcon: 'fa:square-caret-down' }),
-    target: useTruncatedTextColumn({ headerLabel: () => t('target'), headerIcon: 'fa:at' }),
+    directionA: useTextColumn({ headerLabel: () => t('direction') }),
+    target: useTruncatedTextColumn({ headerLabel: () => t('target') }),
     directionB: useTextColumn({
       headerLabel: () => t('direction'),
-      headerIcon: 'fa:square-caret-down',
     }),
     object: useDoubleLinkColumn({ headerLabel: () => t('object') }),
-    selectItem: useSelectItemColumn(),
+    actions: useActionColumn({}),
   }
 })

package/lib/tables/column-sets/vif-network-columns.ts

@@ -0,0 +1,24 @@
+import { defineColumns } from '@core/packages/table/define-columns.ts'
+import { useActionColumn } from '@core/tables/column-definitions/action-column.ts'
+import { useAddressColumn } from '@core/tables/column-definitions/address-column.ts'
+import { useLinkColumn } from '@core/tables/column-definitions/link-column'
+import { useNumberColumn } from '@core/tables/column-definitions/number-column.ts'
+import { useStatusColumn } from '@core/tables/column-definitions/status-column.ts'
+import { useTextColumn } from '@core/tables/column-definitions/text-column.ts'
+import { useI18n } from 'vue-i18n'
+
+export const useVifNetworkColumns = defineColumns(() => {
+  const { t } = useI18n()
+
+  return {
+    vif: useLinkColumn({ headerLabel: () => t('vif') }),
+    network: useLinkColumn({ headerLabel: () => t('network') }),
+    device: useTextColumn({ headerLabel: () => t('device') }),
+    status: useStatusColumn({ headerLabel: () => t('status') }),
+    ipsAddresses: useAddressColumn({ headerLabel: () => t('ip-addresses') }),
+    macAddresses: useAddressColumn({ headerLabel: () => t('mac-addresses') }),
+    mtu: useNumberColumn({ headerLabel: () => t('mtu') }),
+    lockingMode: useTextColumn({ headerLabel: () => t('locking-mode') }),
+    actions: useActionColumn({}),
+  }
+})

package/lib/tables/helpers/render-head-cell.ts

@@ -1,6 +1,4 @@
 import VtsHeaderCell from '@core/components/table/cells/VtsHeaderCell.vue'
-import type { IconName } from '@core/icons/index.ts'
-import { h, toValue, type MaybeRefOrGetter } from 'vue'
+import { h, type MaybeRefOrGetter, toValue } from 'vue'
 
-export const renderHeadCell = (icon?: MaybeRefOrGetter<IconName>, label?: MaybeRefOrGetter<string | undefined>) =>
-  h(VtsHeaderCell, { icon: toValue(icon) }, () => toValue(label))
+export const renderHeadCell = (label?: MaybeRefOrGetter<string | undefined>) => h(VtsHeaderCell, () => toValue(label))

package/lib/tables/types.ts

@@ -1,7 +1,5 @@
-import type { IconName } from '@core/icons/index.ts'
 import type { MaybeRefOrGetter } from 'vue'
 
 export type HeaderConfig = {
   headerLabel?: MaybeRefOrGetter<string | undefined>
-  headerIcon?: MaybeRefOrGetter<IconName>
 }

package/lib/types/connection.ts

@@ -0,0 +1,14 @@
+export const CONNECTION_ACTION = {
+  CONNECT: 'connect',
+  DISCONNECT: 'disconnect',
+} as const
+
+export type ConnectionAction = (typeof CONNECTION_ACTION)[keyof typeof CONNECTION_ACTION]
+
+export const CONNECTION_STATUS = {
+  CONNECTED: 'connected',
+  PARTIALLY_CONNECTED: 'partially-connected',
+  DISCONNECTED: 'disconnected',
+  PHYSICALLY_DISCONNECTED: 'physically-disconnected',
+  DISCONNECTED_FROM_PHYSICAL_DEVICE: 'disconnected-from-physical-device',
+} as const

package/lib/types/storage-repository.type.ts

@@ -0,0 +1,14 @@
+export const SR_SCOPE_TYPE = {
+  POOL: 'pool',
+  HOST: 'host',
+} as const
+
+export type SrScope = { type: typeof SR_SCOPE_TYPE.POOL } | { type: typeof SR_SCOPE_TYPE.HOST; hostId: string }
+
+export const SR_ACCESS_MODE = {
+  LOCAL: 'local',
+  SHARED: 'shared',
+  MIXED: 'mixed',
+} as const
+
+export type SrAccessMode = (typeof SR_ACCESS_MODE)[keyof typeof SR_ACCESS_MODE]

package/lib/utils/sr.utils.ts

@@ -0,0 +1,34 @@
+import { SR_ACCESS_MODE, SR_SCOPE_TYPE, type SrAccessMode, type SrScope } from '@core/types/storage-repository.type.ts'
+
+export function getSrAccessMode(srs: { shared: boolean }[]): SrAccessMode {
+  const hasShared = srs.some(sr => sr.shared)
+  const hasLocal = srs.some(sr => !sr.shared)
+
+  if (hasShared && hasLocal) {
+    return SR_ACCESS_MODE.MIXED
+  }
+
+  if (hasShared) {
+    return SR_ACCESS_MODE.SHARED
+  }
+
+  return SR_ACCESS_MODE.LOCAL
+}
+
+export type SrModalInfoVariant = 'host' | 'pool-local' | 'pool-mixed' | 'pool-shared'
+
+export function getSrModalInfoVariant(scope: SrScope, accessMode: SrAccessMode): SrModalInfoVariant {
+  if (scope.type === SR_SCOPE_TYPE.HOST) {
+    return 'host'
+  }
+
+  if (accessMode === SR_ACCESS_MODE.LOCAL) {
+    return 'pool-local'
+  }
+
+  if (accessMode === SR_ACCESS_MODE.MIXED) {
+    return 'pool-mixed'
+  }
+
+  return 'pool-shared'
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xen-orchestra/web-core",
   "type": "module",
-  "version": "0.54.0",
+  "version": "0.55.0",
   "private": false,
   "exports": {
     "./*": {
@@ -17,8 +17,8 @@
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/vue-fontawesome": "^3.0.8",
     "@novnc/novnc": "~1.5.0",
-    "@regle/core": "^1.20.2",
-    "@regle/rules": "^1.20.2",
+    "@regle/core": "^1.26.0",
+    "@regle/rules": "^1.26.0",
     "@regle/schemas": "^1.20.2",
     "@types/d3-time-format": "^4.0.3",
     "@vueuse/core": "^14.0.0",
@@ -50,7 +50,7 @@
     "pinia": "^3.0.1",
     "vue": "~3.5.13",
     "vue-i18n": "^11.1.2",
-    "vue-router": "^5.0.0"
+    "vue-router": "5.0.6"
   },
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/web-core",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",