Beautiful Open-Source Form Builder
Refactor form data retrieval and authorization handling
JhumanJd28d0ffaa198
diff --git a/api/app/Http/Controllers/Forms/FormController.php b/api/app/Http/Controllers/Forms/FormController.phpindex cc6b25845..cd6caa36b 100644--- a/api/app/Http/Controllers/Forms/FormController.php+++ b/api/app/Http/Controllers/Forms/FormController.php@@ -59,12 +59,7 @@ class FormController extends Controllerpublic function show($slug){$form = Form::whereSlug($slug)->firstOrFail();-- try {- $this->authorize('view', $form);- } catch (\Illuminate\Auth\Access\AuthorizationException $e) {- return redirect()->route('forms.show', ['slug' => $slug]);- }+ $this->authorize('view', $form);// Add attributes for faster loading$workspace = $form->workspace;diff --git a/client/components/global/Navbar.vue b/client/components/global/Navbar.vueindex 2cb02d44d..7346f9c31 100644--- a/client/components/global/Navbar.vue+++ b/client/components/global/Navbar.vue@@ -189,6 +189,7 @@ const route = useRoute()const isFormSlugRoute = computed(() => route.name && route.name.startsWith('forms-slug'))const formSlug = computed(() => isFormSlugRoute.value ? route.params.slug : null)const { data: form } = useForms().detail(formSlug.value, {+ usePrivate: true,enabled: computed(() => !!formSlug.value)})diff --git a/client/components/layouts/FormSidebar.vue b/client/components/layouts/FormSidebar.vueindex 2cbdb29bc..4b6a636fe 100644--- a/client/components/layouts/FormSidebar.vue+++ b/client/components/layouts/FormSidebar.vue@@ -106,26 +106,26 @@ const formNavigationItems = computed(() => [createNavItem({label: 'Submissions',icon: 'i-heroicons-document-text',- to: { name: 'forms-slug-show-submissions', params: { slug: props.form.slug } },+ to: { name: 'forms-slug-show-submissions', params: { slug: props.form?.slug } },active: isActiveRoute('forms-slug-show-submissions')}),// Hide integrations for read-only workspaces...(workspace.value?.is_readonly ? [] : [createNavItem({label: 'Integrations',icon: 'i-heroicons-puzzle-piece',- to: { name: 'forms-slug-show-integrations', params: { slug: props.form.slug } },+ to: { name: 'forms-slug-show-integrations', params: { slug: props.form?.slug } },active: isActiveRoute('forms-slug-show-integrations')})]),createNavItem({label: 'Analytics',icon: 'i-heroicons-chart-bar',- to: { name: 'forms-slug-show-stats', params: { slug: props.form.slug } },+ to: { name: 'forms-slug-show-stats', params: { slug: props.form?.slug } },active: isActiveRoute('forms-slug-show-stats')}),createNavItem({label: 'Share',icon: 'i-heroicons-share',- to: { name: 'forms-slug-show-share', params: { slug: props.form.slug } },+ to: { name: 'forms-slug-show-share', params: { slug: props.form?.slug } },active: isActiveRoute('forms-slug-show-share')})])diff --git a/client/composables/query/forms/useForms.js b/client/composables/query/forms/useForms.jsindex 93aba0dd5..1242bdf45 100644--- a/client/composables/query/forms/useForms.js+++ b/client/composables/query/forms/useForms.js@@ -10,10 +10,12 @@ export function useForms() {const formsListCache = useFormsListCache()const detail = (slug, options = {}) => {+ const { usePrivate = false, ...queryOptions } = options+return useQuery({queryKey: ['forms', 'slug', slug],queryFn: () => {- if (isAuthenticated.value) {+ if (usePrivate && isAuthenticated.value) {return formsApi.get(slug, options)}return formsApi.publicGet(slug, options)@@ -24,15 +26,17 @@ export function useForms() {queryClient.setQueryData(['forms', form.id], form)}},- ...options,+ ...queryOptions,})}const detailById = (id, options = {}) => {+ const { usePrivate = false, ...queryOptions } = options+return useQuery({queryKey: ['forms', id],queryFn: () => {- if (isAuthenticated.value) {+ if (usePrivate && isAuthenticated.value) {return formsApi.getById(id, options)}return formsApi.publicGetById(id, options)@@ -43,7 +47,7 @@ export function useForms() {queryClient.setQueryData(['forms', 'slug', form.slug], form)}},- ...options,+ ...queryOptions,})}@@ -178,21 +182,6 @@ export function useForms() {})}- // Utility functions- const prefetchDetail = (slug) => {- return queryClient.prefetchQuery({- queryKey: ['forms', 'slug', slug],- queryFn: () => formsApi.get(slug)- })- }-- const prefetchDetailById = (id) => {- return queryClient.prefetchQuery({- queryKey: ['forms', id],- queryFn: () => formsApi.getById(id)- })- }-const invalidateAll = () => {queryClient.removeQueries({ queryKey: ['forms', 'list'], exact: false })}@@ -225,8 +214,6 @@ export function useForms() {deleteZapierWebhook,// Utilities- prefetchDetail,- prefetchDetailById,invalidateAll,invalidateDetail}diff --git a/client/composables/query/useTemplates.js b/client/composables/query/useTemplates.jsindex 393ba5f0e..6dd800874 100644--- a/client/composables/query/useTemplates.js+++ b/client/composables/query/useTemplates.js@@ -156,24 +156,6 @@ export function useTemplates() {})}- // Utility functions- const prefetchDetail = (slug) => {- return queryClient.prefetchQuery({- queryKey: ['templates', 'slug', slug],- queryFn: () => templatesApi.get(slug)- })- }-- const prefetchDetailById = (id) => {- return queryClient.prefetchQuery({- queryKey: ['templates', id],- queryFn: () => {- const cachedTemplates = queryClient.getQueryData(['templates', 'list'])- return cachedTemplates?.find(t => t.id === id) || null- }- })- }-const invalidateAll = () => {queryClient.invalidateQueries(['templates'])}@@ -207,8 +189,6 @@ export function useTemplates() {remove,// Utilities- prefetchDetail,- prefetchDetailById,invalidateAll,invalidateDetail,invalidateList,diff --git a/client/pages/forms/[slug]/edit.vue b/client/pages/forms/[slug]/edit.vueindex 9f0fe73a6..6badf2e52 100644--- a/client/pages/forms/[slug]/edit.vue+++ b/client/pages/forms/[slug]/edit.vue@@ -44,8 +44,9 @@ const { detail: formDetail } = useForms()const slug = route.params.slug-// Get form by slug using TanStack Query-const { data: form, isLoading: formsLoading, error } = formDetail(slug,{+// Get form by slug using TanStack Query with private authenticated endpoint+const { data: form, isLoading: formsLoading, error } = formDetail(slug, {+ usePrivate: true,enabled: import.meta.client,})diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vueindex 4b96e3561..d3e9c5b1d 100644--- a/client/pages/forms/[slug]/show.vue+++ b/client/pages/forms/[slug]/show.vue@@ -202,8 +202,8 @@ const slug = route.params.slugconst { current: workspaceRef } = useCurrentWorkspace()const workspace = workspaceRef.value-// Get form by slug-const { data: form, isLoading: isFormLoading, isFetched: isFormFinished } = formDetail(slug)+// Get form by slug using private authenticated endpoint+const { data: form, isLoading: isFormLoading, isFetched: isFormFinished } = formDetail(slug, { usePrivate: true })// Combined loading stateconst isLoading = computed(() => isFormLoading.value)