jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix up backup contents UI

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-09-26 11:51:10 +02:00
parent 73ddf48d12
commit a8f88d7c4d
4 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dashboard/src/components/BackupSiteAddDialog.vue
View File

@@ -30,7 +30,7 @@ const formError = ref({});
const busy = ref(false);
const enableForUpdates = ref(false);
const provider = ref('');
const includeExclude = ref('include'); // or exclude
const includeExclude = ref('everything'); // or exclude, everything
const contentOptions = ref([]);
const contentInclude = ref([]);
const contentExclude = ref([]);
@@ -157,12 +157,12 @@ async function onSubmit() {
// everything
let contents;
if (includeExclude.value === 'exclude') {
if (includeExclude.value === 'everything') {
contents = null;
} else if (includeExclude.value === 'exclude') {
contents = { exclude: contentExclude.value };
} else if (includeExclude.value === 'include' && contentInclude.value.length) {
contents = { include: contentInclude.value };
} else {
contents = null;
}
const [error, result] = await backupSitesModel.add(name.value, format.value, contents, enableForUpdates.value, provider.value, data, schedulePattern, retention, limitsConfig);
@@ -245,7 +245,7 @@ defineExpose({
encryptionPasswordHint.value = '';
encryptedFilenames.value = false;
limits.value = {};
includeExclude.value = 'include';
includeExclude.value = 'everything';
contentInclude.value = [];
contentExclude.value = [];
@@ -301,11 +301,16 @@ defineExpose({
<BackupProviderForm v-model:provider="provider" v-model:format="format" v-model:provider-config="providerConfig" :form-error="formError"/>
<FormGroup>
<label>Contents</label>
<Radiobutton v-model="includeExclude" value="include" label="Include everything, exclude optionally the following:"/>
<MultiSelect v-model="contentInclude" v-if="includeExclude === 'include'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
<Radiobutton v-model="includeExclude" value="exclude" label="Only the following:"/>
<MultiSelect v-model="contentExclude" v-if="includeExclude === 'exclude'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
<label>Backup Contents</label>
<Radiobutton v-model="includeExclude" value="everything" label="Everything"/>
<div>
<Radiobutton v-model="includeExclude" value="exclude" label="Exclude selected"/>
<MultiSelect v-model="contentExclude" v-if="includeExclude === 'exclude'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
</div>
<div>
<Radiobutton v-model="includeExclude" value="include" label="Include only selected"/>
<MultiSelect v-model="contentInclude" v-if="includeExclude === 'include'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
</div>
</FormGroup>
<Checkbox v-model="enableForUpdates" :label="$t('backups.configureBackupStorage.useForUpdates')" />

38
dashboard/src/components/BackupSiteEditDialog.vue
View File

@@ -28,7 +28,7 @@ const uploadPartSize = ref(0);
const syncConcurrency = ref(0);
const downloadConcurrency = ref(0);
const copyConcurrency = ref(0);
const includeExclude = ref('include'); // or exclude
const includeExclude = ref('everything'); // or include, exclude
const contentOptions = ref([]);
const contentInclude = ref([]);
const contentExclude = ref([]);
@@ -51,12 +51,12 @@ async function onSubmit() {
}
let contents;
if (includeExclude.value === 'exclude') {
if (includeExclude.value === 'everything') {
contents = null;
} else if (includeExclude.value === 'exclude') {
contents = { exclude: contentExclude.value };
} else if (includeExclude.value === 'include' && contentInclude.value.length) {
contents = { include: contentInclude.value };
} else {
contents = null;
}
[error] = await backupSitesModel.setContents(site.value.id, contents);
@@ -124,12 +124,15 @@ defineExpose({
});
});
includeExclude.value = 'include';
if (t.contents !== null && t.contents.exclude) {
includeExclude.value = 'exclude';
contentExclude.value = t.contents.exclude;
} else if (t.contents !== null && t.contents.include) {
contentInclude.value = t.contents.include;
if (t.contents !== null) {
if (t.contents.exclude) {
includeExclude.value = 'exclude';
contentExclude.value = t.contents.exclude;
} else if (t.contents.include) {
contentInclude.value = t.contents.include;
}
} else {
includeExclude.value = 'everything';
}
dialog.value.open();
@@ -161,11 +164,16 @@ defineExpose({
</FormGroup>
<FormGroup>
<label>Contents</label>
<Radiobutton v-model="includeExclude" value="include" label="Include everything, exclude optionally the following:"/>
<MultiSelect v-model="contentInclude" v-if="includeExclude === 'include'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
<Radiobutton v-model="includeExclude" value="exclude" label="Only the following:"/>
<MultiSelect v-model="contentExclude" v-if="includeExclude === 'exclude'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
<label>Backup Contents</label>
<Radiobutton v-model="includeExclude" value="everything" label="Everything"/>
<div>
<Radiobutton v-model="includeExclude" value="exclude" label="Exclude selected"/>
<MultiSelect v-model="contentExclude" v-if="includeExclude === 'exclude'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
</div>
<div>
<Radiobutton v-model="includeExclude" value="include" label="Include only selected"/>
<MultiSelect v-model="contentInclude" v-if="includeExclude === 'include'" :options="contentOptions" :search-threshold="10" option-key="id" style="margin: 6px 0 6px 25px;"/>
</div>
</FormGroup>
<Checkbox v-model="enableForUpdates" :label="$t('backups.configureBackupStorage.useForUpdates')" />