From 024e4f6ada6dad8bc928ac88d046ca1b9ed6c1d1 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 27 Sep 2023 12:34:18 +0530
Subject: [PATCH] fix: refactor user list

---
 packages/nc-gui/components/account/UserList.vue |  3 +--
 .../components/dashboard/settings/AppStore.vue  |  2 +-
 packages/nc-gui/pages/reset/[id].vue            | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index d8043aa151..712fd66609 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -2,7 +2,7 @@
 import { OrgUserRoles } from 'nocodb-sdk'
 import type { OrgUserReqType, RequestParams, Roles, UserType } from 'nocodb-sdk'
 import type { User } from '#imports'
-import { extractSdkResponseErrorMsg, iconMap, useApi, useCopy, useDashboard, useNuxtApp } from '#imports'
+import { extractSdkResponseErrorMsg, iconMap, useApi, useCopy, useDashboard, useDebounceFn, useNuxtApp } from '#imports'
 
 const { api, isLoading } = useApi()
 
@@ -329,7 +329,6 @@ const copyPasswordResetUrl = async (user: User) => {
           </span>
         </template>
       </GeneralDeleteModal>
->>>>>>> 85fee1233 (feat: pagination)
 
       <LazyAccountUsersModal :key="userMadalKey" :show="showUserModal" @closed="showUserModal = false" @reload="loadUsers" />
     </div>
diff --git a/packages/nc-gui/components/dashboard/settings/AppStore.vue b/packages/nc-gui/components/dashboard/settings/AppStore.vue
index 7b3016fc5c..c4effcef0b 100644
--- a/packages/nc-gui/components/dashboard/settings/AppStore.vue
+++ b/packages/nc-gui/components/dashboard/settings/AppStore.vue
@@ -102,7 +102,7 @@ onMounted(async () => {
           {{ `Click on confirm to reset ${pluginApp && pluginApp.title}` }}
         </div>
         <div class="flex mt-6 justify-center space-x-2">
-          <NcButton type="ghost" @click="showPluginUninstallModal = false"> {{ $t('general.cancel') }} </NcButton>
+          <NcButton type="secondary" @click="showPluginUninstallModal = false"> {{ $t('general.cancel') }} </NcButton>
           <NcButton type="danger" @click="resetPlugin"> {{ $t('general.confirm') }} </NcButton>
         </div>
       </div>
diff --git a/packages/nc-gui/pages/reset/[id].vue b/packages/nc-gui/pages/reset/[id].vue
index 3ef1a450e7..41530eb037 100644
--- a/packages/nc-gui/pages/reset/[id].vue
+++ b/packages/nc-gui/pages/reset/[id].vue
@@ -1,6 +1,17 @@
 <script setup lang="ts">
 import { validatePassword } from 'nocodb-sdk'
-import { definePageMeta, iconMap, reactive, ref, useApi } from '#imports'
+import {
+  definePageMeta,
+  extractSdkResponseErrorMsg,
+  iconMap,
+  message,
+  reactive,
+  ref,
+  useApi,
+  useI18n,
+  useRoute,
+  useRouter,
+} from '#imports'
 
 definePageMeta({
   requiresAuth: false,
@@ -16,6 +27,8 @@ const form = reactive({
   newPassword: '',
 })
 
+const { t } = useI18n()
+
 const formValidator = ref()
 
 async function resetPassword() {
@@ -38,7 +51,7 @@ async function resetPassword() {
     })
     navigator.push(`/#/sigin`)
   } catch (e: any) {
-    await extractSdkResponseErrorMsg(e)
+    message.error(await extractSdkResponseErrorMsg(e))
   }
 }