Prompt the user to delete the profile when deleting its last site

filips123 · Nov 16, 2023 · 1141f5d · 1141f5d
1 parent 1fb74e6
commit 1141f5d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/extension/src/sites/manage.html b/extension/src/sites/manage.html
@@ -376,8 +376,16 @@ <h5 class="modal-title" id="site-remove-label">Remove web app</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
           <div class="modal-body">
-            Are you sure you want to remove this web app? App data will <strong>not</strong> be
-            removed, but you can remove them through the app browser or by deleting app's profile.
+            Are you sure you want to remove this web app?
+            <div id="site-remove-not-last">
+              Other apps are present in this profile, so app data will <strong>not</strong> be
+              removed, but you can remove it by deleting the profile.
+            </div>
+            <div id="site-remove-last">
+              This is the last app in this profile, so you can choose to delete it, and the associated app data
+              <br>
+              <input id="site-remove-last-checkbox" type="checkbox" checked> Delete profile & app data</input>
+            </div>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>

diff --git a/extension/src/sites/manage.js b/extension/src/sites/manage.js
@@ -367,17 +367,31 @@ async function createSiteList () {
 
     const removeElement = siteElement.querySelector('#sites-list-template-remove')
     removeElement.addEventListener('click', () => {
+
+      const lastSiteInProfile = profiles[site.profile].sites.length <= 1;
+
       document.getElementById('site-remove-button').onclick = async function () {
         this.disabled = true
         this.innerText = 'Removing...'
-
-        const response = await browser.runtime.sendNativeMessage('firefoxpwa', {
-          cmd: 'UninstallSite',
-          params: { id: site.ulid }
-        })
-
-        if (response.type === 'Error') throw new Error(response.data)
-        if (response.type !== 'SiteUninstalled') throw new Error(`Received invalid response type: ${response.type}`)
+
+        let deleteProfileCheckbox = document.getElementById("site-remove-last-checkbox");
+        if (lastSiteInProfile && deleteProfileCheckbox.checked) {
+          const response = await browser.runtime.sendNativeMessage('firefoxpwa', {
+            cmd: 'RemoveProfile',
+            params: { id: site.profile }
+          })
+
+          if (response.type === 'Error') throw new Error(response.data)
+          if (response.type !== 'ProfileRemoved') throw new Error(`Received invalid response type: ${response.type}`)
+        } else {
+          const response = await browser.runtime.sendNativeMessage('firefoxpwa', {
+            cmd: 'UninstallSite',
+            params: { id: site.ulid }
+          })
+
+          if (response.type === 'Error') throw new Error(response.data)
+          if (response.type !== 'SiteUninstalled') throw new Error(`Received invalid response type: ${response.type}`)
+        }
 
         this.disabled = true
         this.innerText = 'Removed!'
@@ -388,6 +402,14 @@ async function createSiteList () {
         }, 5000)
       }
 
+      if (lastSiteInProfile) {
+        document.getElementById('site-remove-last').hidden = false;
+        document.getElementById('site-remove-not-last').hidden = true;
+      } else {
+        document.getElementById('site-remove-last').hidden = true;
+        document.getElementById('site-remove-not-last').hidden = false;
+      }
+
       Modal.getOrCreateInstance(document.getElementById('site-remove-modal')).show()
     })
     removeElement.removeAttribute('id')