From f43a85ee34c1e65fb914de5957d3261fd768186e Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Tue, 4 Mar 2025 03:42:14 +0000
Subject: [PATCH] Revert "Merge branch 'dev/fix-slowness' into 'main'"

This reverts merge request !164
---
 src/DeleteShopAccountSetting.vue | 126 +++++++++++++------------------
 src/delete-account-listeners.js  |   5 --
 2 files changed, 53 insertions(+), 78 deletions(-)

diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 7c28a59c..6c1f1ebb 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,68 +1,63 @@
 <template>
-	<div>
-		<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
-			<div>
-				<p>
+	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
+		<div>
+			<p>
+				{{
+					t(appName, 'We are going to proceed with your cloud account suppression.')
+				}}
+				<span v-if="!hasActiveSubscription">
 					{{
-						t(appName, 'We are going to proceed with your cloud account suppression.')
+						t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
 					}}
-					<span v-if="!hasActiveSubscription">
-						{{
-							t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
-						}}
-					</span>
-				</p>
+				</span>
+			</p>
 
-				<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
-				<p v-if="hasActiveSubscription">
-					<b>
-						{{
-							t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
-						}}
-					</b>
-				</p>
+			<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
+			<p v-if="hasActiveSubscription">
+				<b>
+					{{
+						t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
+					}}
+				</b>
+			</p>
 
-				<form @submit.prevent>
-					<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
-						<div class="delete-shop-input">
-							<CheckboxRadioSwitch id="shop-accounts_confirm"
-								:checked.sync="deleteShopAccount"
-								:disabled="hasActiveSubscription || !allowDelete"
-								@update:checked="updateDeleteShopPreference">
-								{{
-									t(
-										appName,
-										"I also want to delete my shop account"
-									)
-								}}
-							</CheckboxRadioSwitch>
-						</div>
-						<div v-if="!deleteShopAccount" class="delete-shop-input">
-							<label for="shop-alternate-email">
-								{{
-									t(
-										appName,
-										"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
-									)
-								}}
-							</label>
-							<input id="shop-alternate-email"
-								v-model="shopEmailPostDelete"
-								type="email"
-								name="shop-alternate-email"
-								:placeholder="t(appName, 'Email Address')"
-								class="form-control"
-								:disabled="hasActiveSubscription || !allowDelete"
-								@blur="updateEmailPostDelete($event)">
-						</div>
+			<form @submit.prevent>
+				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
+					<div class="delete-shop-input">
+						<CheckboxRadioSwitch id="shop-accounts_confirm"
+							:checked.sync="deleteShopAccount"
+							:disabled="hasActiveSubscription || !allowDelete"
+							@update:checked="updateDeleteShopPreference">
+							{{
+								t(
+									appName,
+									"I also want to delete my shop account"
+								)
+							}}
+						</CheckboxRadioSwitch>
+					</div>
+					<div v-if="!deleteShopAccount" class="delete-shop-input">
+						<label for="shop-alternate-email">
+							{{
+								t(
+									appName,
+									"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
+								)
+							}}
+						</label>
+						<input id="shop-alternate-email"
+							v-model="shopEmailPostDelete"
+							type="email"
+							name="shop-alternate-email"
+							:placeholder="t(appName, 'Email Address')"
+							class="form-control"
+							:disabled="hasActiveSubscription || !allowDelete"
+							@blur="updateEmailPostDelete($event)">
 					</div>
-				</form>
-			</div>
-		</SettingsSection>
-		<div id="delete-my-account-loader" class="spinner-container">
-			<NcLoadingIcon :size="40" />
+				</div>
+			</form>
 		</div>
-	</div>
+	</SettingsSection>
 </template>
 
 <script>
@@ -72,7 +67,6 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
-import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -81,7 +75,6 @@ export default {
 	components: {
 		SettingsSection,
 		CheckboxRadioSwitch,
-		NcLoadingIcon,
 	},
 	data() {
 		return {
@@ -290,17 +283,4 @@ input#shop-alternate-email:disabled {
 #delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label:hover{
 	background-color: unset;
 }
-.spinner-container {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 100px;
-	margin-top: 50px;
-}
-
-#delete-my-account-loader {
-	margin-left: auto;
-	margin-right: auto;
-	width: 40px;
-}
 </style>
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index 770867e4..f5461b73 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -4,20 +4,16 @@ document.addEventListener('DOMContentLoaded', function() {
 	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
 	const disabledClass = 'checkbox-radio-switch--disabled'
 	const deleteAccountSectionId = '#delete-account-settings-section'
-	const deleteMyAccountLoader = '#delete-my-account-loader'
-
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
 	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
-	document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
-	  document.querySelector(deleteMyAccountLoader).style.display = 'block'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
@@ -26,7 +22,6 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
-	  document.querySelector(deleteMyAccountLoader).style.display = 'none'
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })
-- 
GitLab