From 1141f5dddff33473274d9b59dd55f4c325833061 Mon Sep 17 00:00:00 2001
From: iTrooz <hey@itrooz.fr>
Date: Thu, 16 Nov 2023 21:35:33 +0100
Subject: [PATCH 1/4] Prompt the user to delete the profile when deleting its
 last site

---
 extension/src/sites/manage.html | 12 +++++++++--
 extension/src/sites/manage.js   | 38 ++++++++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/extension/src/sites/manage.html b/extension/src/sites/manage.html
index 35394c4b..a48b85f0 100644
--- 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
index 3082f151..bc670e5c 100644
--- 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')

From 52d7575c267d38389d8730828379a0342653748a Mon Sep 17 00:00:00 2001
From: iTrooz <hey@itrooz.fr>
Date: Thu, 16 Nov 2023 21:42:09 +0100
Subject: [PATCH 2/4] fix linting

---
 extension/src/sites/manage.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/extension/src/sites/manage.js b/extension/src/sites/manage.js
index bc670e5c..f39283ff 100644
--- a/extension/src/sites/manage.js
+++ b/extension/src/sites/manage.js
@@ -367,20 +367,19 @@ async function createSiteList () {
 
     const removeElement = siteElement.querySelector('#sites-list-template-remove')
     removeElement.addEventListener('click', () => {
-
-      const lastSiteInProfile = profiles[site.profile].sites.length <= 1;
+      const lastSiteInProfile = profiles[site.profile].sites.length <= 1
 
       document.getElementById('site-remove-button').onclick = async function () {
         this.disabled = true
         this.innerText = 'Removing...'
-        
-        let deleteProfileCheckbox = document.getElementById("site-remove-last-checkbox");
+
+        const 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 {
@@ -388,7 +387,7 @@ async function createSiteList () {
             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}`)
         }
@@ -403,11 +402,11 @@ async function createSiteList () {
       }
 
       if (lastSiteInProfile) {
-        document.getElementById('site-remove-last').hidden = false;
-        document.getElementById('site-remove-not-last').hidden = true;
+        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;
+        document.getElementById('site-remove-last').hidden = true
+        document.getElementById('site-remove-not-last').hidden = false
       }
 
       Modal.getOrCreateInstance(document.getElementById('site-remove-modal')).show()

From c676da77bc2d8189e760c70f834cf17d686ebc4b Mon Sep 17 00:00:00 2001
From: iTrooz <hey@itrooz.fr>
Date: Thu, 16 Nov 2023 21:52:29 +0100
Subject: [PATCH 3/4] re-add app browser to site removal message

---
 extension/src/sites/manage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/src/sites/manage.html b/extension/src/sites/manage.html
index a48b85f0..4fdb5c49 100644
--- a/extension/src/sites/manage.html
+++ b/extension/src/sites/manage.html
@@ -379,7 +379,7 @@ <h5 class="modal-title" id="site-remove-label">Remove web app</h5>
             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.
+              removed, but you can remove it through the app browser by deleting app's 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

From 82fdf2f7212b37a39c968b59715159c1fb0c229f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0?= <filip.stamcar@hotmail.com>
Date: Sat, 18 Nov 2023 19:03:27 +0100
Subject: [PATCH 4/4] Slightly improve wording and checkbox

---
 extension/src/sites/manage.html | 12 +++++++-----
 extension/src/sites/manage.js   |  5 ++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/extension/src/sites/manage.html b/extension/src/sites/manage.html
index 4fdb5c49..bb80c463 100644
--- a/extension/src/sites/manage.html
+++ b/extension/src/sites/manage.html
@@ -378,13 +378,15 @@ <h5 class="modal-title" id="site-remove-label">Remove web app</h5>
           <div class="modal-body">
             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 through the app browser by deleting app's profile.
+              Other apps are present in this profile, so the profile will <strong>not</strong> be removed.
+              The app data will <strong>remain</strong>, but you can remove them through the app browser or by deleting the app's 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>
+              This is the last app in this profile, so you can choose to delete it and the associated app data.
+              <div class="form-check pt-2">
+                <input class="form-check-input" type="checkbox" id="site-remove-last-checkbox" checked>
+                <label class="form-check-label" for="site-remove-last-checkbox">Delete profile and app data</label>
+              </div>
             </div>
           </div>
           <div class="modal-footer">
diff --git a/extension/src/sites/manage.js b/extension/src/sites/manage.js
index f39283ff..7fc6609f 100644
--- a/extension/src/sites/manage.js
+++ b/extension/src/sites/manage.js
@@ -374,7 +374,10 @@ async function createSiteList () {
         this.innerText = 'Removing...'
 
         const deleteProfileCheckbox = document.getElementById('site-remove-last-checkbox')
-        if (lastSiteInProfile && deleteProfileCheckbox.checked) {
+        const deleteProfileEnabled = deleteProfileCheckbox.checked
+        deleteProfileCheckbox.disabled = true
+
+        if (lastSiteInProfile && deleteProfileEnabled) {
           const response = await browser.runtime.sendNativeMessage('firefoxpwa', {
             cmd: 'RemoveProfile',
             params: { id: site.profile }