fix(ui): skip apps restore on multi-node cluster

NethServer · Dec 16, 2024 · 5e59e69 · 5e59e69
1 parent 3904ffb
commit 5e59e69
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/core/ui/public/i18n/en/translation.json b/core/ui/public/i18n/en/translation.json
@@ -210,7 +210,7 @@
         "redirect_cluster_link": "Go to cluster administration",
         "node_added_to_cluster": "Node {nodeId} added to cluster",
         "restore_cluster": "Restore cluster",
-        "restore_cluster_description": "Restore cluster and apps from backup",
+        "restore_cluster_description": "Restore cluster from a previous backup",
         "restore_from_cluster_backup_file": "Restore from cluster backup file",
         "restore_from_remote_url": "Restore from remote URL",
         "remote_url": "Remote URL",
@@ -229,7 +229,7 @@
         "restoring_cluster": "Restoring cluster",
         "restore_num_apps": "Restore apps | Restore {num} app | Restore {num} apps",
         "select_apps_to_restore": "Select apps to restore",
-        "select_apps_to_restore_description": "Your apps will be restored using the latest backup. If you need to restore certain apps from an earlier backup, you can do so later by going to the '@:backup.title' page",
+        "select_apps_to_restore_description": "Your apps will be restored using the latest backup. If you need to restore certain apps from an earlier backup, you can do so later by going to '@:backup.title > @:backup.restore_app'",
         "skip_apps_restore": "Skip apps restore",
         "skip_apps_restore_1": "Do you want to skip apps restore?",
         "skip_apps_restore_2": "You can restore apps later in Backup page",
@@ -254,7 +254,10 @@
         "domain_format": "Invalid domain format",
         "hostname_format": "Invalid hostname format",
         "hostname_pattern": "Invalid hostname format",
-        "forbidden_hostname_value": "Forbidden hostname"
+        "forbidden_hostname_value": "Forbidden hostname",
+        "apps_restoration": "Apps restoration",
+        "apps_restoration_single_node_description": "You can choose which apps to restore in the next step, after the cluster has been restored.",
+        "apps_restoration_multi_node_description": "Apps cannot be restored automatically because the original cluster consisted of multiple nodes. You can manually restore apps later by going to '@:backup.title > @:backup.restore_app'"
     },
     "shell": {
         "skip_to_content": "Skip to content",

diff --git a/core/ui/src/views/InitializeCluster.vue b/core/ui/src/views/InitializeCluster.vue
@@ -646,6 +646,17 @@
                         restore.summary.backup_repositories
                       }}</span>
                     </div>
+                    <NsInlineNotification
+                      kind="info"
+                      :title="$t('init.apps_restoration')"
+                      :description="
+                        restore.summary.single_node_cluster
+                          ? $t('init.apps_restoration_single_node_description')
+                          : $t('init.apps_restoration_multi_node_description')
+                      "
+                      :showCloseButton="false"
+                      class="mg-top-lg"
+                    />
                     <NsInlineNotification
                       v-if="error.restoreCluster"
                       kind="error"
@@ -704,9 +715,10 @@
                       <span v-if="restore.progress < 100">
                         {{ $t("init.traveling_back_in_time") }}
                       </span>
-                      <span v-else>
+                      <span v-else-if="loading.readBackupRepositories">
                         {{ $t("init.reading_backup_repositories") }}
                       </span>
+                      <span v-else>&nbsp;</span>
                     </template>
                   </NsEmptyState>
                   <NsProgressBar
@@ -1677,6 +1689,7 @@ export default {
       this.restore.summary = taskResult.output;
       this.restore.step = "summary";
       this.loading.retrieveClusterBackup = false;
+      this.restore.backupPassword = "";
     },
     async restoreCluster() {
       this.error.restoreCluster = "";
@@ -1745,7 +1758,13 @@ export default {
         `${taskContext.action}-progress-${taskContext.extra.eventId}`
       );
 
-      this.readBackupRepositories();
+      if (this.restore.summary.single_node_cluster) {
+        // restore apps
+        this.readBackupRepositories();
+      } else {
+        // skip restore apps
+        this.getClusterStatus();
+      }
     },
     async readBackupRepositories() {
       this.error.readBackupRepositories = "";