@xen-orchestra/web-core 0.41.0 → 0.43.0

package/lib/locales/pt-BR.json

@@ -51,7 +51,7 @@
   "admin-login": "Login do administrador",
   "admin-password": "Senha do administrador",
   "admin-password-confirm": "Confirmar senha do administrador",
-  "affinity-host": "Servidor preferencial",
+  "affinity-host": "Afinidade do Host",
   "alarm-type:cpu_usage": "O uso da CPU excede @:n-percent",
   "alarm-type:disk_usage": "O uso do disco excede @:n-percent",
   "alarm-type:fs_usage": "O uso de FS excede @:n-percent",
@@ -94,10 +94,7 @@
   "backup:rolling-snapshot": "Snapshot contínuo",
   "backup:xo-config": "Configuração XO",
   "backups": "Backups",
-  "backups:jobs:at-least-one-skipped": "Pelo menos um ignorado",
-  "backups:jobs:based-on-last-three": "Com base nas últimas três execuções",
   "backups:jobs:disabled": "Desativado",
-  "backups:jobs:looks-like-issue": "Parece que há um problema",
   "backups:jobs:running-good": "Está funcionando bem",
   "backups:vms-protection": "Proteção de máquinas virtuais",
   "backups:vms-protection:no-job": "Sem tarefa",
@@ -214,7 +211,6 @@
   "other-settings": "Outras configurações",
   "page-not-found": "Esta página não foi encontrada…",
   "pending": "Pendente",
-  "pool:status:unknown:tooltip": "Servidores atualmente em conexão ou em estado desconhecido",
   "pool:status:unreachable:tooltip": "Servidores configurados que não podem ser alcançados",
   "progress": "Progresso",
   "properties": "Propriedades",
@@ -237,6 +233,10 @@
   "task": "Tarefa",
   "tasks:overview": "Visão geral das tarefas",
   "template-has-bios-strings": "O template já contém BIOS strings",
+  "theme-dracula": "Dracula",
+  "theme-monokai": "Monokai",
+  "theme-nord": "Nord",
+  "theme-solarized": "Solarized",
   "third-parties": "Aplicativos de terceiros",
   "timezone": "Fuso horário",
   "topology": "Topologia",
@@ -252,6 +252,7 @@
   "viridian": "Viridian",
   "vlan": "VLAN",
   "vm-off": "Esta máquina virtual está desligada.",
+  "vtpm": "VTPM",
   "warning": "Aviso",
   "warnings": "Avisos",
   "weblate": "Weblate",
@@ -259,6 +260,7 @@
   "xen-orchestra": "Xen Orchestra",
   "xo": "XO",
   "xo-5": "XO-5",
+  "xo-lite": "XO lite",
   "xoa": "XOA",
   "xoa-deploy-failed!": "Desculpe, a implantação falhou!",
   "xoa-deploy-successful!": "Implantação do XOA concluída com sucesso!"

package/lib/locales/ru.json

@@ -131,17 +131,13 @@
   "backup:rolling-snapshot": "Скользящий снимок",
   "backup:xo-config": "Конфигурация XO",
   "backups": "Резервные копии",
-  "backups:jobs:at-least-one-skipped": "Как минимум один пропущенный",
-  "backups:jobs:based-on-last-three": "На основе трех последних работ",
   "backups:jobs:disabled": "Отключен(о)а",
-  "backups:jobs:looks-like-issue": "Похоже, есть какая-то проблема",
   "backups:jobs:running-good": "Работает хорошо",
   "backups:vms-protection": "Защита ВМ",
   "backups:vms-protection:no-job": "Ни на какой работе",
   "backups:vms-protection:protected": "По крайней мере на 1 работе и защищен",
   "backups:vms-protection:tooltip": "VM защищена, если резервное копирование по расписанию, и предыдущий запуск прошел успешно",
   "backups:vms-protection:unprotected": "По крайней мере в 1 задании, но без защиты",
-  "best-effort": "лучшее усилие",
   "bios-default": "bios (по умолчанию)",
   "bios-info": "Информация о BIOS",
   "bond": "Bond",
@@ -297,18 +293,15 @@
   "host-internal-networks": "Внутренние сети узла",
   "host-not-running": "Хост не запущен",
   "host-off": "Хост выключен",
-  "host-unknown": "Узел неизвестен",
   "host:status:active": "активен",
   "host:status:halted": "@:status:halted",
   "host:status:inactive": "неактивен",
   "host:status:running": "работает",
   "host:status:unknown": "неизвестен",
-  "host:status:unknown:tooltip": "Метрики узла недоступны",
   "hosts": "Узлы",
   "hosts-status": "Статус узла",
   "hyper-threading": "Многопоточность (SMT)",
   "id": "ID",
-  "in-last-three-jobs": "На своих последних трех работах",
   "in-progress": "В процессе",
   "info": "Информация",
   "infos": "Информация",
@@ -449,14 +442,13 @@
   "offline": "Не в сети",
   "ok": "OK",
   "or": "Или",
-  "pagination:all": "Все",
+  "pagination:all": "@:all",
   "password": "Пароль",
   "password-invalid": "Неверный пароль",
   "pif": "PIF",
   "pif-status": "Статус PIF",
   "pifs": "PIFs",
   "pifs-status": "PIFs статус",
-  "please-confirm": "Пожалуйста подтвердите",
   "proxy": "Proxy",
   "pxe": "PXE",
   "query-search-bar:label": "поисковый движок",
@@ -481,6 +473,10 @@
   "status:running": "Запущен",
   "status:unknown": "Неизвестно",
   "template-has-bios-strings": "Шаблон уже содержит настройки BIOS",
+  "theme-dracula": "Dracula",
+  "theme-monokai": "Monokai",
+  "theme-nord": "Nord",
+  "theme-solarized": "Solarized",
   "uuid": "UUID",
   "vcpu": "vCPU",
   "vcpus": "vCPUs",
@@ -498,7 +494,6 @@
   "vm:status:paused": "Пауза",
   "vm:status:running": "Запущенный",
   "vm:status:suspended": "Приостановлен",
-  "vm:status:unknown": "Неизвестный",
   "weblate": "Weblate",
   "write": "Писать",
   "xcp-ng": "XCP-ng",
@@ -506,6 +501,7 @@
   "xo": "XO",
   "xo-5": "XO-5",
   "xo-backups": "резервные копии XO",
+  "xo-lite": "XO lite",
   "xo-lite-under-construction": "XOLite находится в разработке",
   "xo-replications": "Репликации XO",
   "xoa": "XOA",

package/lib/locales/sv.json

@@ -118,17 +118,13 @@
   "backup:rolling-snapshot": "Rullande ögonblicksbild",
   "backup:xo-config": "XO-konfig",
   "backups": "Säkerhetskopieringar",
-  "backups:jobs:at-least-one-skipped": "Minst en hoppades över",
-  "backups:jobs:based-on-last-three": "Baserat på de senaste tre jobben",
   "backups:jobs:disabled": "Inaktiverad",
-  "backups:jobs:looks-like-issue": "Det ser ut som att vi har ett problem",
   "backups:jobs:running-good": "Fungerar",
   "backups:vms-protection": "VM-skydd",
   "backups:vms-protection:no-job": "Ej i något jobb",
   "backups:vms-protection:protected": "I minst ett jobb och skyddad",
   "backups:vms-protection:tooltip": "En VM är skyddad om den är med i ett säkerhetskopieringsjobb, med ett aktivt schema och den senaste körningen lyckades",
   "backups:vms-protection:unprotected": "Med i minst 1 jobb men oskyddad",
-  "best-effort": "bästa möjliga insats",
   "bios-default": "bios (standardinställt)",
   "bios-info": "BIOS-info",
   "bond": "Bindning",
@@ -273,17 +269,14 @@
   "host-internal-networks": "Host-interna nätverk",
   "host-not-running": "Host:en kör inte",
   "host-off": "Hosten är avstängd",
-  "host-unknown": "Host okänd",
   "host:status:active": "@:status:active",
   "host:status:halted": "@:status:halted",
   "host:status:inactive": "@:status:inactive",
   "host:status:running": "@:status:running",
-  "host:status:unknown:tooltip": "Host-data är otillgängligt",
   "hosts": "Hostar",
   "hosts-status": "Host-status",
   "hyper-threading": "Multitrådning (SMT)",
   "id": "ID",
-  "in-last-three-jobs": "I de senaste tre jobben",
   "in-progress": "Pågående",
   "install-settings": "Installationsinställningar",
   "installed": "Installerad",
@@ -395,7 +388,7 @@
   "n-missing": "{n} saknas",
   "n-percent": "{n}%",
   "n-selected-of": "{count} markerade av {total} objekt",
-  "n-subtasks": "{n} underuppgift | {n} underuppgifter",
+  "n-subtasks": "1 underuppgift | {n} underuppgifter",
   "n-vms": "1 VM | {n} VM:ar",
   "name": "Namn",
   "nested-virtualization": "Nästlad virtualisering",
@@ -461,13 +454,10 @@
   "pif-status": "PIF-status",
   "pifs": "PIFar",
   "pifs-status": "PIF status",
-  "please-confirm": "Vänligen bekräfta",
   "pool": "Pool",
   "pool-cpu-usage": "Användning av CPU-pool",
   "pool-ram-usage": "Användning av RAM-pool",
   "pool:status:connected": "@:status:connected",
-  "pool:status:unknown": "@:status:unknown",
-  "pool:status:unknown:tooltip": "Servrarna ansluter just nu eller är i ett okänt stadie",
   "pool:status:unreachable": "Onåbar",
   "pool:status:unreachable:tooltip": "Konfigurerade servrar som inte kan nås",
   "pools": "Pooler",
@@ -573,7 +563,11 @@
   "template-has-bios-strings": "Den här mallen innehåller redan BIOS-strängar",
   "theme-auto": "Auto",
   "theme-dark": "Mörkt",
+  "theme-dracula": "Dracula",
   "theme-light": "Ljust",
+  "theme-monokai": "Monokai",
+  "theme-nord": "Nord",
+  "theme-solarized": "Solarized",
   "third-parties": "Tredjepartsappar",
   "this-host": "Den här hosten",
   "this-vm-cant-be-migrated": "Denna VM kan inte migreras",
@@ -632,11 +626,10 @@
   "vm:status:paused": "Pausad",
   "vm:status:running": "@:status:running",
   "vm:status:suspended": "Suspenderad",
-  "vm:status:unknown": "@:status:unknown",
-  "vm:status:unknown:tooltip": "Där XO har förlorat kontakten med poolen",
   "vms": "VMar",
   "vms-status": "VM-status",
   "vms-treeview": "VM-trädvy",
+  "vtpm": "VTPM",
   "warning": "Varning",
   "warnings": "Varningar",
   "weblate": "Weblate",
@@ -647,6 +640,7 @@
   "xo": "XO",
   "xo-5": "XO-5",
   "xo-backups": "XO-backuper",
+  "xo-lite": "XO lite",
   "xo-lite-under-construction": "XOLite är under uppbyggnad",
   "xo-replications": "XO-replikeringar",
   "xoa": "XOA",

package/lib/locales/uk.json

@@ -94,17 +94,13 @@
   "backup:rolling-snapshot": "Ковзний знімок",
   "backup:xo-config": "Конфігурація XO",
   "backups": "Резервні копії",
-  "backups:jobs:at-least-one-skipped": "Як мінімум один пропущений",
-  "backups:jobs:based-on-last-three": "На основі трьох останніх робіт",
   "backups:jobs:disabled": "Вимкнено",
-  "backups:jobs:looks-like-issue": "Схоже, є якась проблема",
   "backups:jobs:running-good": "Працює добре",
   "backups:vms-protection": "Захист ВМ",
   "backups:vms-protection:no-job": "На жодній роботі",
   "backups:vms-protection:protected": "Принаймні на 1 роботі і захищений",
   "backups:vms-protection:tooltip": "ВМ захищена, якщо резервне копіювання за розкладом, і попередній запуск пройшов успішно",
   "backups:vms-protection:unprotected": "Принаймні на 1 роботі, але без захисту",
-  "best-effort": "найкращі зусилля",
   "bios-default": "bios (за замовчуванням)",
   "bios-info": "Інформація про BIOS",
   "bond": "Bond",
@@ -228,12 +224,10 @@
   "high-availability": "Висока доступність (HA)",
   "host": "Вузол",
   "host-internal-networks": "Внутрішні мережі вузла",
-  "host-unknown": "Вузол невідомий",
   "host:status:active": "Активний",
   "host:status:halted": "@:status:halted",
   "host:status:inactive": "Неактивний",
   "host:status:running": "@:status:running",
-  "host:status:unknown:tooltip": "Метрики вузла недоступні",
   "hosts": "Вузли",
   "hosts-status": "Статус вузла",
   "hyper-threading": "Багатопотоковість (SMT)",
@@ -276,7 +270,6 @@
   "pif-status": "Статус PIF",
   "pifs": "PIFs",
   "pifs-status": "Статус PIF",
-  "please-confirm": "Будь ласка, підтвердіть",
   "proxy": "Proxy",
   "pxe": "PXE",
   "query-search-bar:label": "пошуковий движок",
@@ -301,6 +294,10 @@
   "status:running": "Запущений",
   "status:unknown": "Невідомо",
   "template-has-bios-strings": "Шаблон вже містить налаштування BIOS",
+  "theme-dracula": "Dracula",
+  "theme-monokai": "Monokai",
+  "theme-nord": "Nord",
+  "theme-solarized": "Solarized",
   "uuid": "UUID",
   "vcpu": "vCPU",
   "vcpus": "vCPUs",
@@ -318,7 +315,7 @@
   "vm:status:paused": "Пауза",
   "vm:status:running": "@:status:running",
   "vm:status:suspended": "Призупинено",
-  "vm:status:unknown": "Невідомий",
+  "vtpm": "VTPM",
   "weblate": "Weblate",
   "write": "Писати",
   "xcp-ng": "XCP-ng",
@@ -326,6 +323,7 @@
   "xo": "XO",
   "xo-5": "XO-5",
   "xo-backups": "резервні копії XO",
+  "xo-lite": "XO lite",
   "xo-lite-under-construction": "XOLite знаходиться в розробці",
   "xo-replications": "Реплікації XO",
   "xoa": "XOA",

package/lib/packages/modal/create-modal-opener.ts

@@ -55,6 +55,9 @@ export function createModalOpener() {
           try {
             isBusy.value = true
 
+            // TODO carefully about the order of close, if any issue, put it after resolve
+            close()
+
             const result = config.onConfirm ? await config.onConfirm(...args) : (undefined as TConfirmPayload)
 
             if (result === ABORT_MODAL || result instanceof ModalCancelResponse) {
@@ -66,8 +69,6 @@ export function createModalOpener() {
             } else {
               resolve(new ModalConfirmResponse(result))
             }
-
-            close()
           } finally {
             isBusy.value = false
           }

package/lib/packages/remote-resource/define-remote-resource.ts

@@ -1,8 +1,8 @@
 import {
-  useSseStore,
   type THandleDelete,
   type THandlePost,
   type THandleWatching,
+  useSseStore,
 } from '@core/packages/remote-resource/sse.store'
 import type { ResourceContext, UseRemoteResource } from '@core/packages/remote-resource/types.ts'
 import type { VoidFunction } from '@core/types/utility.type.ts'
@@ -63,7 +63,7 @@ export function defineRemoteResource<
   onDataReceived?: (data: Ref<NoInfer<TData>>, receivedData: any) => void
   onDataRemoved?: (data: Ref<NoInfer<TData>>, receivedData: any) => void
   stream?: boolean
-  watchCollection: {
+  initWatchCollection: () => {
     collectionId: string
     resource: string // reactivity only on XAPI XO record for now
     getIdentifier: (obj: unknown) => string
@@ -87,7 +87,7 @@ export function defineRemoteResource<
   cacheExpirationMs?: number | false
   pollingIntervalMs?: number | false
   stream?: boolean
-  watchCollection?: {
+  initWatchCollection?: () => {
     collectionId: string
     resource: string // reactivity only on XAPI XO record for now
     getIdentifier: (obj: unknown) => string
@@ -121,8 +121,10 @@ export function defineRemoteResource<
 
   const pollingInterval = config.pollingIntervalMs ?? DEFAULT_POLLING_INTERVAL_MS
 
+  const watchCollection = config.initWatchCollection?.()
+
   const removeData = (data: TData[], dataToRemove: any) => {
-    const getIdentifier = config.watchCollection?.getIdentifier ?? JSON.stringify
+    const getIdentifier = watchCollection?.getIdentifier ?? JSON.stringify
 
     remove(data, item => {
       if (typeof item === 'object') {
@@ -156,14 +158,14 @@ export function defineRemoteResource<
     config.onDataReceived ??
     ((data: Ref<TData>, receivedData: any, context?: ResourceContext<TArgs>) => {
       // allow to ignore some update (like for sub collection. E.g. vms/:id/vdis)
-      if (config.watchCollection?.predicate?.(receivedData, context) === false) {
+      if (watchCollection?.predicate?.(receivedData, context) === false) {
         return
       }
 
       if (data.value === undefined || (Array.isArray(data.value) && Array.isArray(receivedData))) {
         data.value = receivedData
 
-        if (config.watchCollection !== undefined && Array.isArray(data.value)) {
+        if (watchCollection !== undefined && Array.isArray(data.value)) {
           handleBuffer(data as Ref<TData[]>)
           isBufferEventsProcessed = true
         }
@@ -187,7 +189,7 @@ export function defineRemoteResource<
     config.onDataRemoved ??
     ((data: Ref<TData>, receivedData: any, context?: ResourceContext<TArgs>) => {
       // allow to ignore some update (like for sub collection. E.g. vms/:id/vdis)
-      if (config.watchCollection?.predicate?.(receivedData, context) === false) {
+      if (watchCollection?.predicate?.(receivedData, context) === false) {
         return
       }
 
@@ -289,8 +291,8 @@ export function defineRemoteResource<
     let pause: VoidFunction = noop
     let resume: VoidFunction = execute
 
-    if (config.watchCollection !== undefined) {
-      const { collectionId, resource, handleDelete, handlePost, handleWatching } = config.watchCollection
+    if (watchCollection !== undefined) {
+      const { collectionId, resource, handleDelete, handlePost, handleWatching } = watchCollection
       const { watch, unwatch } = useSseStore()
 
       pause = () => unwatch({ collectionId, resource, handleDelete })

package/lib/packages/remote-resource/sse.store.ts

@@ -1,5 +1,6 @@
+import { useNow } from '@vueuse/core'
 import { defineStore } from 'pinia'
-import { ref, watch as watchVue } from 'vue'
+import { computed, ref, watch as watchVue } from 'vue'
 
 type EventFn = (object: unknown) => void
 export type THandlePost = (sseId: string) => Promise<string>
@@ -22,7 +23,10 @@ export type THandleWatching = (
 ) => void
 
 export const useSseStore = defineStore('sse', () => {
-  const sse = ref<{ id?: string; isWatching: boolean }>({ isWatching: false })
+  const sse = ref<{ id?: string; isWatching: boolean; lastPing?: number; errorSse?: unknown | null }>({
+    isWatching: false,
+    errorSse: null,
+  })
   const configsByResource: Map<
     string,
     {
@@ -38,10 +42,30 @@ export const useSseStore = defineStore('sse', () => {
     }
   > = new Map()
 
+  const now = useNow({ interval: 1000 })
+
+  const isError = computed(() => {
+    if (!sse.value.lastPing) {
+      return false
+    }
+
+    return now.value.getTime() - sse.value.lastPing > 32_000
+  })
+
+  const hasErrorSse = computed(() => isError.value || sse.value.errorSse !== null)
+
+  function setErrorSse(error: unknown | null) {
+    sse.value.errorSse = error
+  }
+
   function updateSseId(id: string) {
     sse.value.id = id
   }
 
+  function setPing(timestamp: number) {
+    sse.value.lastPing = timestamp
+  }
+
   function getConfigsByResource(resource: string) {
     return configsByResource.get(resource)
   }
@@ -135,6 +159,10 @@ export const useSseStore = defineStore('sse', () => {
       })
     }
   }
+  // TODO need to be improve
+  function retry() {
+    window.location.reload()
+  }
 
-  return { watch, unwatch }
+  return { watch, unwatch, retry, hasErrorSse, setErrorSse, setPing }
 })

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

@@ -7,9 +7,11 @@ export const useBackupIssueColumns = defineColumns(() => {
   const { t } = useI18n()
 
   return {
-    job: useLinkColumn({ headerIcon: 'fa:floppy-disk', headerLabel: () => t('job-name') }),
-    lastRun: useStatusColumn({ headerIcon: 'fa:square-caret-down', headerLabel: () => t('last') }),
-    secondLastRun: useStatusColumn({ headerIcon: 'fa:square-caret-down', headerLabel: () => t('2nd-last') }),
-    thirdLastRun: useStatusColumn({ headerIcon: 'fa:square-caret-down', headerLabel: () => t('3rd-last') }),
+    job: useLinkColumn({ headerLabel: t('backup-job') }),
+    lastRuns: useStatusColumn({
+      headerLabel: t('last-n-runs', { n: 3 }),
+      iconOnly: true,
+      progressiveSize: true,
+    }),
   }
 })

package/lib/types/object.type.ts

@@ -0,0 +1,10 @@
+export type ObjectType = 'vm'
+export type VmActions = 'reboot' | 'shutdown' | 'force-reboot' | 'force-shutdown'
+export type VmBlockedOperations =
+  | 'clean_shutdown'
+  | 'hard_shutdown'
+  | 'pause'
+  | 'clean_reboot'
+  | 'hard_reboot'
+  | 'suspend'
+  | 'destroy'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xen-orchestra/web-core",
   "type": "module",
-  "version": "0.41.0",
+  "version": "0.43.0",
   "private": false,
   "exports": {
     "./*": {