From e8609526b0ca3099423d113b608dd5a3fa5060e2 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Mon, 2 Oct 2023 15:38:05 -0700
Subject: [PATCH] refactor(web): improved ux for update os flash backup

---
 web/components/UpdateOs/Update.vue | 7 +++++--
 web/locales/en_US.json             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/components/UpdateOs/Update.vue b/web/components/UpdateOs/Update.vue
index b8d35383b..925360653 100644
--- a/web/components/UpdateOs/Update.vue
+++ b/web/components/UpdateOs/Update.vue
@@ -169,12 +169,15 @@ watchEffect(() => {
           :text="flashBackupText"
           class="flex-none" />
 
-        <p v-if="flashBackupBasicStatus === 'started'" class="text-12px italic opacity-75 shrink">{{ t('Backing up...this may take a few minutes. Please wait for the download to complete before starting the update.') }}</p>
+        <p v-if="flashBackupBasicStatus === 'started'" class="text-12px italic opacity-75 shrink">
+          {{ t('Backing up...this may take a few minutes') }}
+        </p>
 
         <SwitchGroup as="div">
           <div class="flex flex-shrink-0 items-center gap-16px">
             <Switch
               v-model="acknowledgeBackup"
+              :disabled="flashBackupBasicStatus === 'started'"
               :class="[
                 acknowledgeBackup ? 'bg-green-500' : 'bg-gray-200',
                 'relative inline-flex h-24px w-[44px] flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2',
@@ -216,7 +219,7 @@ watchEffect(() => {
 
         <BrandButton
           @click="updateButton?.click"
-          :disabled="!acknowledgeBackup"
+          :disabled="!acknowledgeBackup || flashBackupBasicStatus === 'started'"
           :external="updateButton?.external"
           :icon-right="ArrowTopRightOnSquareIcon"
           :name="updateButton?.name"
diff --git a/web/locales/en_US.json b/web/locales/en_US.json
index 0ca381711..b1114c08e 100644
--- a/web/locales/en_US.json
+++ b/web/locales/en_US.json
@@ -296,7 +296,7 @@
   "You have not activated the Flash Backup feature via the Unraid Connect plugin.": "You have not activated the Flash Backup feature via the Unraid Connect plugin.",
   "Go to Tools > Management Access to activate the Flash Backup feature and ensure your backup is up-to-date.": "Go to Tools > Management Access to activate the Flash Backup feature and ensure your backup is up-to-date.",
   "Flash Backup is not available. Navigate to {0}/Main/Settings/Flash to try again then come back to this page.": "Flash Backup is not available. Navigate to {0}/Main/Settings/Flash to try again then come back to this page.",
-  "Backing up...this may take a few minutes. Please wait for the download to complete before starting the update.": "Backing up...this may take a few minutes. Please wait for the download to complete before starting the update.",
+  "Backing up...this may take a few minutes": "Backing up...this may take a few minutes",
   "Acklowledge that you have made a Flash Backup to enable this action": "Acklowledge that you have made a Flash Backup to enable this action",
   "You can also manually create a new backup by clicking the Create Flash Backup button.": "You can also manually create a new backup by clicking the Create Flash Backup button.",
   "You can manually create a backup by clicking the Create Flash Backup button.": "You can manually create a backup by clicking the Create Flash Backup button.",