Skip to content

Commit 8257f75

Browse files
committed
feat(ui): update rclone base path label and improve data encryption key tooltip
1 parent c5f431a commit 8257f75

3 files changed

Lines changed: 7 additions & 16 deletions

File tree

core/ui/public/i18n/en/translation.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
"not_backed_up": "Not backed up",
534534
"search_instances": "Search applications",
535535
"not_backed_up_instances_selected": "Instances not backed up are currently selected",
536-
"data_encryption_key_tooltip": "This password is used to encrypt data in the backup destination and is saved inside your cluster backup. Store this password in a safe place, or remember to download cluster backup regularly.",
536+
"data_encryption_key_tooltip": "This key encrypts backup data stored on the destination. It is independent of any remote provider credentials. If left empty, a random key is generated automatically. The key is saved in the cluster backup, store it in a safe place or download the cluster backup regularly.",
537537
"run_backup": "Run backup",
538538
"run_backup_now": "Run backup now",
539539
"last_backup": "Last backup",
@@ -671,9 +671,8 @@
671671
"rclone_configuration_source_upload_configuration": "Upload configuration file",
672672
"rclone_configuration_file": "Rclone configuration file",
673673
"rclone_configuration_file_helper": "Supported file types: .conf, .txt",
674-
"rclone_base_path": "Base path",
674+
"rclone_base_path": "Path",
675675
"rclone_encryption_key_configured": "Encryption key configured",
676-
"rclone_encryption_key_configured_description": "Keys cannot be viewed or modified after creation.",
677676
"rclone_configuration_source_keep_configuration": "Keep current configuration",
678677
"data_encryption_key_placeholder": "e.g a76917c4522...",
679678
"invalid_base64": "Invalid base64 file format"

core/ui/src/components/backup/AddRepositoryModal.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
</div>
360360
</template>
361361
<cv-text-input
362-
:label="$t('backup.rclone_base_path')"
362+
:label="$t('backup.rclone_base_path') + ' (' + $t('common.optional') + ')'"
363363
v-model.trim="rclone.base_path"
364364
:invalid-message="error.rclone.base_path"
365365
:disabled="loading.addBackupRepository"
@@ -479,7 +479,7 @@
479479
:helper-text="$t('backup.repository_password_helper')"
480480
:placeholder="$t('backup.data_encryption_key_placeholder')"
481481
:invalid-message="error.password"
482-
:disabled="loading.addBackupRepository || isRcloneSelected"
482+
:disabled="loading.addBackupRepository"
483483
autocomplete="new-password"
484484
ref="password"
485485
>

core/ui/src/components/backup/EditRepositoryModal.vue

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,6 @@
137137
</template>
138138
<!-- rclone -->
139139
<template v-if="repository.provider == 'rclone'">
140-
<NsInlineNotification
141-
kind="info"
142-
:title="$t('backup.rclone_encryption_key_configured')"
143-
:description="
144-
$t('backup.rclone_encryption_key_configured_description')
145-
"
146-
:showCloseButton="false"
147-
/>
148140
<div>
149141
<label class="bx--label">{{
150142
$t("backup.rclone_configuration_source")
@@ -223,7 +215,7 @@
223215
</template>
224216
<cv-text-input
225217
v-if="rclone.configuration_source != 'keep'"
226-
:label="$t('backup.rclone_base_path')"
218+
:label="$t('backup.rclone_base_path') + ' (' + $t('common.optional') + ')'"
227219
v-model.trim="rclone.base_path"
228220
:invalid-message="error.rclone.base_path"
229221
:disabled="loading.alterBackupRepository"
@@ -239,8 +231,8 @@
239231
ref="name"
240232
>
241233
</cv-text-input>
242-
<!-- advanced options (read-only, not shown for rclone) -->
243-
<cv-accordion v-if="repository.provider != 'rclone'">
234+
<!-- advanced options (read-only) -->
235+
<cv-accordion>
244236
<cv-accordion-item :open="false">
245237
<template slot="title">{{ $t("common.advanced") }}</template>
246238
<template slot="content">

0 commit comments

Comments
 (0)