From 839f7fe719393450623f2ce09877a93ea2707ef4 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 5 Jun 2024 16:07:44 +0530
Subject: [PATCH] fix: Reset loader state on error (#9597)

- Replace `showAlert` with `showAlertMessage` in auth related pages.
---
 .../v3/views/auth/reset/password/Index.vue           | 12 ++++++------
 app/javascript/v3/views/login/Index.vue              |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/javascript/v3/views/auth/reset/password/Index.vue b/app/javascript/v3/views/auth/reset/password/Index.vue
index 5bad15e72..44be9fd0c 100644
--- a/app/javascript/v3/views/auth/reset/password/Index.vue
+++ b/app/javascript/v3/views/auth/reset/password/Index.vue
@@ -1,18 +1,18 @@
 <template>
   <div
-    class="flex flex-col bg-woot-25 min-h-full w-full py-12 sm:px-6 lg:px-8 justify-center dark:bg-slate-900"
+    class="flex flex-col justify-center w-full min-h-full py-12 bg-woot-25 sm:px-6 lg:px-8 dark:bg-slate-900"
   >
     <form
-      class="sm:mx-auto sm:w-full sm:max-w-lg bg-white dark:bg-slate-800 p-11 shadow sm:shadow-lg sm:rounded-lg"
+      class="bg-white shadow sm:mx-auto sm:w-full sm:max-w-lg dark:bg-slate-800 p-11 sm:shadow-lg sm:rounded-lg"
       @submit.prevent="submit"
     >
       <h1
-        class="mb-1 text-left text-2xl font-medium tracking-tight text-slate-900 dark:text-white"
+        class="mb-1 text-2xl font-medium tracking-tight text-left text-slate-900 dark:text-white"
       >
         {{ $t('RESET_PASSWORD.TITLE') }}
       </h1>
       <p
-        class="text-sm text-slate-600 dark:text-woot-50 tracking-normal font-normal leading-6 mb-4"
+        class="mb-4 text-sm font-normal leading-6 tracking-normal text-slate-600 dark:text-woot-50"
       >
         {{
           useInstallationName(
@@ -36,7 +36,7 @@
           :loading="resetPassword.showLoading"
         />
       </div>
-      <p class="text-sm text-slate-600 dark:text-woot-50 mt-4 -mb-1">
+      <p class="mt-4 -mb-1 text-sm text-slate-600 dark:text-woot-50">
         {{ $t('RESET_PASSWORD.GO_BACK_TO_LOGIN') }}
         <router-link to="/auth/login" class="text-link">
           {{ $t('COMMON.CLICK_HERE') }}.
@@ -101,7 +101,7 @@ export default {
           if (error?.response?.data?.message) {
             errorMessage = error.response.data.message;
           }
-          this.showAlert(errorMessage);
+          this.showAlertMessage(errorMessage);
         });
     },
   },
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index c6d8affd5..5a481dd5a 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -214,7 +214,7 @@ export default {
 
       login(credentials)
         .then(() => {
-          this.showAlert(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
+          this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
         })
         .catch(response => {
           // Reset URL Params if the authentication is invalid
@@ -222,7 +222,9 @@ export default {
             window.location = '/app/login';
           }
           this.loginApi.hasErrored = true;
-          this.showAlert(response?.message || this.$t('LOGIN.API.UNAUTH'));
+          this.showAlertMessage(
+            response?.message || this.$t('LOGIN.API.UNAUTH')
+          );
         });
     },
   },