Skip to content

Commit 44d26fd

Browse files
authored
Merge branch 'master' into pierre-license-bundle-name
2 parents a9e6049 + 0866a5d commit 44d26fd

File tree

241 files changed

+3610
-931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+3610
-931
lines changed

.eslintrc.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,17 @@ module.exports = {
287287
'eslint-comments/no-unlimited-disable': 'off',
288288
},
289289
},
290+
{
291+
files: ['*.d.ts'],
292+
parser: '@typescript-eslint/parser',
293+
parserOptions: {
294+
sourceType: 'module',
295+
},
296+
rules: {
297+
'n/no-unsupported-features/es-syntax': 'off',
298+
'no-unused-vars': 'off',
299+
},
300+
},
290301
],
291302

292303
ignorePatterns: ['@vates/fatfs/'],

@vates/fuse-vhd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"main": "./index.mjs",
2121
"dependencies": {
22-
"@xen-orchestra/fs": "^4.6.6",
22+
"@xen-orchestra/fs": "^4.6.7",
2323
"@xen-orchestra/log": "^0.7.1",
2424
"fuse-native": "^2.2.6",
2525
"lru-cache": "^7.14.0",

@vates/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vates/types",
33
"private": false,
4-
"version": "1.19.0",
4+
"version": "1.20.0",
55
"main": "./dist/index.mjs",
66
"exports": {
77
".": {

@vates/types/src/lib/xen-orchestra-xapi.mts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ import {
1313
XenApiVmWrapped,
1414
XenApiVtpm,
1515
} from '../xen-api.mjs'
16-
import type { OPAQUE_REF_NULL, SUPPORTED_VDI_FORMAT, VBD_MODE, VBD_TYPE, VIF_LOCKING_MODE } from '../common.mjs'
16+
import type {
17+
OPAQUE_REF_NULL,
18+
SUPPORTED_VDI_FORMAT,
19+
VBD_MODE,
20+
VBD_TYPE,
21+
VDI_TYPE,
22+
VIF_LOCKING_MODE,
23+
} from '../common.mjs'
1724
import type { PassThrough, Readable } from 'node:stream'
1825
import type {
1926
XoGpuGroup,
@@ -121,6 +128,7 @@ export interface Xapi {
121128
xenstore_data?: Record<string, string>
122129
}
123130
): Promise<XenApiVdi['$ref']>
131+
SR_reclaimSpace(ref: XenApiSr['$ref']): Promise<void>
124132
startVm(
125133
id: XoVm['id'],
126134
opts?: {
@@ -218,6 +226,23 @@ export interface Xapi {
218226
}): Promise<XenApiVbd['$ref']>
219227
VBD_destroy(vbdRef: XenApiVbd['$ref']): Promise<void>
220228
VBD_unplug(vbdRef: XenApiVbd['$ref']): Promise<void>
229+
VDI_create(
230+
options: {
231+
name_description?: XoVdi['name_description']
232+
name_label?: XoVdi['name_label']
233+
other_config?: XoVdi['other_config']
234+
read_only?: boolean
235+
sharable?: boolean
236+
SR?: XenApiSr['$ref']
237+
tags?: XoVdi['tags']
238+
type?: VDI_TYPE
239+
virtual_size: XoVdi['size']
240+
xenstore_data?: Record<string, string>
241+
},
242+
extraOptions?: {
243+
sm_config?: Record<string, string>
244+
}
245+
): Promise<XenApiVdi['$ref']>
221246
VDI_destroy(vdiRef: XenApiVdi['$ref']): Promise<void>
222247
VDI_destroyCloudInitConfig(vdiRef: XenApiVdi['$ref'], opts?: { timeLimit?: number }): Promise<void>
223248
VDI_exportContent(

@xen-orchestra/backups-cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"dependencies": {
99
"@vates/async-each": "^1.0.1",
1010
"@xen-orchestra/async-map": "^0.1.2",
11-
"@xen-orchestra/backups": "^0.68.2",
12-
"@xen-orchestra/fs": "^4.6.6",
11+
"@xen-orchestra/backups": "^0.69.0",
12+
"@xen-orchestra/fs": "^4.6.7",
1313
"filenamify": "^6.0.0",
1414
"getopts": "^2.2.5",
1515
"lodash": "^4.17.15",
@@ -28,7 +28,7 @@
2828
"scripts": {
2929
"postversion": "npm publish --access public"
3030
},
31-
"version": "1.1.7",
31+
"version": "1.1.8",
3232
"license": "AGPL-3.0-or-later",
3333
"author": {
3434
"name": "Vates SAS",

@xen-orchestra/backups/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "git",
99
"url": "https://github.com/vatesfr/xen-orchestra.git"
1010
},
11-
"version": "0.68.2",
11+
"version": "0.69.0",
1212
"engines": {
1313
"node": ">=14.18"
1414
},
@@ -30,7 +30,7 @@
3030
"@vates/parse-duration": "^0.1.1",
3131
"@xen-orchestra/async-map": "^0.1.2",
3232
"@xen-orchestra/disk-transform": "^1.2.1",
33-
"@xen-orchestra/fs": "^4.6.6",
33+
"@xen-orchestra/fs": "^4.6.7",
3434
"@xen-orchestra/log": "^0.7.1",
3535
"@xen-orchestra/qcow2": "^1.1.2",
3636
"@xen-orchestra/template": "^0.1.0",

@xen-orchestra/fs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": false,
33
"name": "@xen-orchestra/fs",
4-
"version": "4.6.6",
4+
"version": "4.6.7",
55
"license": "AGPL-3.0-or-later",
66
"description": "The File System for Xen Orchestra backups.",
77
"homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/fs",

@xen-orchestra/immutable-backups/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"xo-lift-remote-immutability": "./liftProtection.mjs"
1818
},
1919
"license": "AGPL-3.0-or-later",
20-
"version": "1.0.29",
20+
"version": "1.0.30",
2121
"engines": {
2222
"node": ">=14.0.0"
2323
},
2424
"dependencies": {
2525
"@vates/async-each": "^1.0.1",
26-
"@xen-orchestra/backups": "^0.68.2",
26+
"@xen-orchestra/backups": "^0.69.0",
2727
"@xen-orchestra/log": "^0.7.1",
2828
"app-conf": "^3.0.0",
2929
"chokidar": "^3.6.0",

@xen-orchestra/lite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"@types/file-saver": "^2.0.7",
2929
"@types/lodash-es": "^4.17.12",
3030
"@types/node": "^18.19.80",
31-
"@vates/types": "^1.19.0",
31+
"@vates/types": "^1.20.0",
3232
"@vitejs/plugin-vue": "^5.2.1",
3333
"@vue/tsconfig": "^0.7.0",
3434
"@vueuse/core": "^13.0.0",
3535
"@vueuse/math": "^13.0.0",
3636
"@vueuse/shared": "^13.0.0",
37-
"@xen-orchestra/web-core": "^0.42.0",
37+
"@xen-orchestra/web-core": "^0.43.0",
3838
"complex-matcher": "^1.0.0",
3939
"d3-time-format": "^4.1.0",
4040
"decorator-synchronized": "^0.6.0",

@xen-orchestra/lite/src/components/AppHeader.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
<header class="app-header">
33
<div class="left">
44
<UiButtonIcon
5+
v-if="!uiStore.isLarge"
56
ref="navigationTrigger"
6-
:class="{ 'menu-to-right': !uiStore.isMobile }"
7+
:class="{ 'menu-to-right': !uiStore.isSmall }"
78
accent="brand"
89
icon="fa:bars"
910
size="medium"
1011
/>
1112
<RouterLink :to="logoRoute" class="logo-container">
12-
<img v-if="uiStore.isMobile" alt="XO Lite" src="../assets/logo.svg" />
13+
<img v-if="uiStore.isSmall" alt="XO Lite" src="../assets/logo.svg" />
1314
<UiLogoText v-else :text="t('xo-lite')" />
1415
</RouterLink>
1516
</div>
1617
<slot />
1718
<div class="right">
1819
<PoolOverrideWarning as-tooltip />
19-
<XoaButton v-if="!uiStore.isMobile" />
20+
<XoaButton v-if="!uiStore.isSmall" />
2021
<AccountMenu />
2122
</div>
2223
</header>

0 commit comments

Comments
 (0)