diff --git a/packages/nc-gui/plugins/initializeFeedbackForm.ts b/packages/nc-gui/plugins/initializeFeedbackForm.ts index 4323f5e0a5..314131afc7 100644 --- a/packages/nc-gui/plugins/initializeFeedbackForm.ts +++ b/packages/nc-gui/plugins/initializeFeedbackForm.ts @@ -1,4 +1,3 @@ -import type { Dayjs } from 'dayjs' import dayjs from 'dayjs' import { defineNuxtPlugin } from '#app' @@ -8,32 +7,33 @@ const handleFeedbackForm = async () => { const { $api } = useNuxtApp() - const fetchFeedbackForm = async (now: Dayjs) => { - try { - const { data: feedbackForm } = await $api.instance.get('/api/v1/feedback_form') - const isFetchedFormDuplicate = currentFeedbackForm.url === feedbackForm.url - - currentFeedbackForm = { - url: feedbackForm.url, - lastFormPollDate: now.toISOString(), - createdAt: feedbackForm.created_at, - isHidden: isFetchedFormDuplicate ? currentFeedbackForm.isHidden : false, - } - } catch (e) { - console.error(e) - } - } - const isFirstTimePolling = !currentFeedbackForm.lastFormPollDate const now = dayjs() const lastFormPolledDate = dayjs(currentFeedbackForm.lastFormPollDate) if (isFirstTimePolling || dayjs.duration(now.diff(lastFormPolledDate)).days() > 0) { - await fetchFeedbackForm(now) + $api.instance + .get('/api/v1/feedback_form') + .then((response) => { + try { + const { data: feedbackForm } = response + if (!feedbackForm.error) { + const isFetchedFormDuplicate = currentFeedbackForm.url === feedbackForm.url + + currentFeedbackForm = { + url: feedbackForm.url, + lastFormPollDate: now.toISOString(), + createdAt: feedbackForm.created_at, + isHidden: isFetchedFormDuplicate ? currentFeedbackForm.isHidden : false, + } + } + } catch (e) {} + }) + .catch(() => {}) } } -export default defineNuxtPlugin(async () => { - await handleFeedbackForm() +export default defineNuxtPlugin(() => { + handleFeedbackForm() }) diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts index 6e4b1205cb..7d5b462345 100644 --- a/packages/nocodb/src/lib/meta/api/utilApis.ts +++ b/packages/nocodb/src/lib/meta/api/utilApis.ts @@ -89,7 +89,7 @@ export async function feedbackFormGet(_req: Request, res: Response) { res.json(response.data); }) .catch((e) => { - res.status(500).json({ error: e.message }); + res.json({ error: e.message }); }); }