Browse Source

fix: drop await / errors from feed-back form handler

Signed-off-by: mertmit <mertmit99@gmail.com>
pull/3572/head
mertmit 2 years ago
parent
commit
407d3dd8bd
  1. 40
      packages/nc-gui/plugins/initializeFeedbackForm.ts
  2. 2
      packages/nocodb/src/lib/meta/api/utilApis.ts

40
packages/nc-gui/plugins/initializeFeedbackForm.ts

@ -1,4 +1,3 @@
import type { Dayjs } from 'dayjs'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { defineNuxtPlugin } from '#app' import { defineNuxtPlugin } from '#app'
@ -8,32 +7,33 @@ const handleFeedbackForm = async () => {
const { $api } = useNuxtApp() 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 isFirstTimePolling = !currentFeedbackForm.lastFormPollDate
const now = dayjs() const now = dayjs()
const lastFormPolledDate = dayjs(currentFeedbackForm.lastFormPollDate) const lastFormPolledDate = dayjs(currentFeedbackForm.lastFormPollDate)
if (isFirstTimePolling || dayjs.duration(now.diff(lastFormPolledDate)).days() > 0) { 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 () => { export default defineNuxtPlugin(() => {
await handleFeedbackForm() handleFeedbackForm()
}) })

2
packages/nocodb/src/lib/meta/api/utilApis.ts

@ -89,7 +89,7 @@ export async function feedbackFormGet(_req: Request, res: Response) {
res.json(response.data); res.json(response.data);
}) })
.catch((e) => { .catch((e) => {
res.status(500).json({ error: e.message }); res.json({ error: e.message });
}); });
} }

Loading…
Cancel
Save