Skip to content

Beautiful Open-Source Form Builder

Refactor loading state management and improve logging in admin components

Julien Nahumf04822405983
diff --git a/api/app/Http/Controllers/Admin/ImpersonationController.php b/api/app/Http/Controllers/Admin/ImpersonationController.php
index 259f6757e..a0bb49b82 100644
--- a/api/app/Http/Controllers/Admin/ImpersonationController.php
+++ b/api/app/Http/Controllers/Admin/ImpersonationController.php
@@ -26,10 +26,7 @@ class ImpersonationController extends Controller
}
AdminController::log('Impersonation started', [
- 'from_id' => auth()->id(),
- 'from_email' => auth()->user()->email,
- 'target_id' => $user->id,
- 'target_email' => $user->email,
+ 'impersonated_user' => $user->email . ' (' . $user->id . ')',
'target_is_blocked' => $user->is_blocked,
]);
diff --git a/client/components/pages/admin/BillingEmail.vue b/client/components/pages/admin/BillingEmail.vue
index 2db72b56d..d0c247e1e 100644
--- a/client/components/pages/admin/BillingEmail.vue
+++ b/client/components/pages/admin/BillingEmail.vue
@@ -8,7 +8,7 @@
You can update the billing email of the subscriber.
</p>
<div
- v-if="loading"
+ v-if="loadingBillingEmail"
class="text-neutral-600 dark:text-neutral-400"
>
<Loader class="h-6 w-6 mx-auto m-10" />
diff --git a/client/components/pages/admin/DeletedForms.vue b/client/components/pages/admin/DeletedForms.vue
index 2b3e796a7..e1bb2aefa 100644
--- a/client/components/pages/admin/DeletedForms.vue
+++ b/client/components/pages/admin/DeletedForms.vue
@@ -14,7 +14,7 @@
>
<template #actions-cell="{ row }">
<UButton
- :loading="restoreFormForm.busy"
+ :loading="restoringForm"
size="sm"
color="neutral"
variant="outline"
@@ -45,14 +45,11 @@ const props = defineProps({
})
const loading = ref(true)
+const restoringForm = ref(false)
const forms = ref([])
const page = ref(1)
const pageCount = 5
-const restoreFormForm = useForm({
- slug: null
-})
-
const rows = computed(() => {
return forms.value.slice((page.value - 1) * pageCount, (page.value) * pageCount)
})
@@ -75,11 +72,13 @@ const restoreForm = (slug) => {
return useAlert().confirm(
"Are you sure you want to restore this form?",
() => {
- restoreFormForm.slug = slug
- restoreFormForm.patch(`/moderator/forms/${slug}/restore`).then(data => {
+ restoringForm.value = true
+ adminApi.forms.restore(slug).then(data => {
+ restoringForm.value = false
useAlert().success(data.message)
getDeletedForms()
}).catch(error => {
+ restoringForm.value = false
useAlert().error(error.data.message)
})
})
diff --git a/client/components/pages/admin/ImpersonateUser.vue b/client/components/pages/admin/ImpersonateUser.vue
index a81518d82..4914b060f 100644
--- a/client/components/pages/admin/ImpersonateUser.vue
+++ b/client/components/pages/admin/ImpersonateUser.vue
@@ -1,7 +1,7 @@
<template>
<UButton
icon="i-heroicons-eye-16-solid"
- :loading="form.busy"
+ :loading="loading"
@click="impersonate"
label="Impersonate User"
/>
@@ -17,17 +17,17 @@ const props = defineProps({
const authStore = useAuthStore()
const queryClient = useQueryClient()
-
-const form = useForm({
- user_id: props.user.id
-})
+const loading = ref(false)
const { user } = useAuth()
const { data: userData } = user()
const impersonate = () => {
+ loading.value = true
authStore.startImpersonating()
- form.post(`/moderator/impersonate/${props.user.id}`).then(async (data) => {
+ opnFetch(`/moderator/impersonate/${props.user.id}`).then(async (data) => {
+ loading.value = false
+
// Save the token with its expiration time.
authStore.setToken(data.token, data.expires_in)
await queryClient.invalidateQueries()
@@ -36,7 +36,8 @@ const impersonate = () => {
useRouter().push({ name: 'home' })
})
.catch((error) => {
- useAlert().error(error.data.message)
+ useAlert().error(error.data?.message || 'Failed to impersonate user')
+ loading.value = false
})
}
</script>
diff --git a/client/components/pages/admin/SendPasswordResetEmail.vue b/client/components/pages/admin/SendPasswordResetEmail.vue
index 4f813fb1f..3f13b474c 100644
--- a/client/components/pages/admin/SendPasswordResetEmail.vue
+++ b/client/components/pages/admin/SendPasswordResetEmail.vue
@@ -17,7 +17,7 @@ const form = useForm({
user_id: props.user.id
})
-const resetPassword = ()=>{
+const resetPassword = () => {
return useAlert().confirm(
"Are you sure you want to send a password reset email?",
() => {
@@ -27,7 +27,7 @@ const resetPassword = ()=>{
useAlert().success(data.message)
})
.catch((error) => {
- useAlert().error(error.data.message)
+ useAlert().error(error.data?.message || 'Failed to send password reset email')
})
})
}