diff --git a/packages/nc-gui/components/tabs/auth/UserManagement.vue b/packages/nc-gui/components/tabs/auth/UserManagement.vue index 71d92ed282..3321944e41 100644 --- a/packages/nc-gui/components/tabs/auth/UserManagement.vue +++ b/packages/nc-gui/components/tabs/auth/UserManagement.vue @@ -360,8 +360,6 @@ const isSuperAdmin = (user: { main_roles?: string }) => { show-less-items @change="loadUsers" /> - - diff --git a/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue b/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue deleted file mode 100644 index e9031f4406..0000000000 --- a/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts index abd75a133f..c036002117 100644 --- a/packages/nc-gui/composables/useGlobal/state.ts +++ b/packages/nc-gui/composables/useGlobal/state.ts @@ -59,11 +59,6 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State { token: null, lang: preferredLanguage, darkMode: prefersDarkMode, - feedbackForm: { - url: 'https://docs.google.com/forms/d/e/1FAIpQLSeTlAfZjszgr53lArz3NvUEnJGOT9JtG9NAU5d0oQwunDS2Pw/viewform?embedded=true', - createdAt: new Date('2020-01-01T00:00:00.000Z').toISOString(), - isHidden: false, - }, filterAutoSave: true, previewAs: null, includeM2M: false, diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts index c495dc34f8..ce9975e519 100644 --- a/packages/nc-gui/composables/useGlobal/types.ts +++ b/packages/nc-gui/composables/useGlobal/types.ts @@ -4,13 +4,6 @@ import type { JwtPayload } from 'jwt-decode' import type { Language, ProjectRole, User } from '~/lib' import type { useCounter } from '#imports' -export interface FeedbackForm { - url: string - createdAt: string - isHidden: boolean - lastFormPollDate?: string -} - export interface AppInfo { ncSiteUrl: string authType: 'jwt' | 'none' @@ -32,7 +25,6 @@ export interface StoredState { token: string | null lang: keyof typeof Language darkMode: boolean - feedbackForm: FeedbackForm filterAutoSave: boolean previewAs: ProjectRole | null includeM2M: boolean diff --git a/packages/nc-gui/plugins/feedbackForm.ts b/packages/nc-gui/plugins/feedbackForm.ts deleted file mode 100644 index 5c6e58955f..0000000000 --- a/packages/nc-gui/plugins/feedbackForm.ts +++ /dev/null @@ -1,41 +0,0 @@ -import dayjs from 'dayjs' -import { defineNuxtPlugin, useGlobal, useNuxtApp } from '#imports' - -const handleFeedbackForm = async () => { - let { feedbackForm: currentFeedbackForm } = $(useGlobal()) - - if (!currentFeedbackForm) return - - const { $api } = useNuxtApp() - - const isFirstTimePolling = !currentFeedbackForm.lastFormPollDate - - const now = dayjs() - - const lastFormPolledDate = dayjs(currentFeedbackForm.lastFormPollDate) - - if (isFirstTimePolling || dayjs.duration(now.diff(lastFormPolledDate)).days() > 0) { - $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(() => { - handleFeedbackForm() -}) diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts index 6b7acef4eb..7db15d7243 100644 --- a/packages/nocodb/src/lib/meta/api/utilApis.ts +++ b/packages/nocodb/src/lib/meta/api/utilApis.ts @@ -16,7 +16,6 @@ import NcConfigFactory, { import User from '../../models/User'; import catchError from '../helpers/catchError'; import axios from 'axios'; -import { feedbackForm } from 'nc-help'; const versionCache = { releaseVersion: null, @@ -94,12 +93,6 @@ export async function versionInfo(_req: Request, res: Response) { res.json(response); } -export function feedbackFormGet(_req: Request, res: Response) { - feedbackForm() - .then((form) => res.json(form)) - .catch((e) => res.json({ error: e.message })); -} - export async function appHealth(_: Request, res: Response) { res.json({ message: 'OK', @@ -379,7 +372,6 @@ export default (router) => { router.post('/api/v1/db/meta/axiosRequestMake', catchError(axiosRequestMake)); router.get('/api/v1/version', catchError(versionInfo)); router.get('/api/v1/health', catchError(appHealth)); - router.get('/api/v1/feedback_form', catchError(feedbackFormGet)); router.post('/api/v1/url_to_config', catchError(urlToDbConfig)); router.get( '/api/v1/aggregated-meta-info',