From f9dd082d51595f49f0909a3fc556299a57962f52 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 1 Aug 2022 11:37:40 +0200
Subject: [PATCH] chore(gui-v2): move feedback form to useGlobal

---
 packages/nc-gui-v2/composables/useGlobal/state.ts  | 14 ++++++++++++--
 packages/nc-gui-v2/composables/useGlobal/types.ts  |  8 ++++++++
 .../useGlobalState/initialFeedBackForm.ts          |  5 -----
 packages/nc-gui-v2/lib/types.ts                    |  7 -------
 4 files changed, 20 insertions(+), 14 deletions(-)
 delete mode 100644 packages/nc-gui-v2/composables/useGlobalState/initialFeedBackForm.ts

diff --git a/packages/nc-gui-v2/composables/useGlobal/state.ts b/packages/nc-gui-v2/composables/useGlobal/state.ts
index 8bb3266504..344bcce2ab 100644
--- a/packages/nc-gui-v2/composables/useGlobal/state.ts
+++ b/packages/nc-gui-v2/composables/useGlobal/state.ts
@@ -24,7 +24,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
    * If the user has not set a preferred language, we fallback to 'en'.
    * If the user has set a preferred language, we try to find a matching locale in the available locales.
    */
-  const preferredLanguage = preferredLanguages.reduce<string>((locale, language) => {
+  const preferredLanguage = preferredLanguages.reduce((locale, language) => {
     /** split language to language and code, e.g. en-GB -> [en, GB] */
     const [lang, code] = language.split(/[_-]/)
 
@@ -46,7 +46,17 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
   }, 'en' /** fallback locale */)
 
   /** State */
-  const initialState: StoredState = { token: null, user: null, lang: preferredLanguage, darkMode: prefersDarkMode }
+  const initialState: StoredState = {
+    token: null,
+    user: 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,
+    },
+  }
 
   /** saves a reactive state, any change to these values will write/delete to localStorage */
   const storage = useStorage<StoredState>(storageKey, initialState)
diff --git a/packages/nc-gui-v2/composables/useGlobal/types.ts b/packages/nc-gui-v2/composables/useGlobal/types.ts
index 4eb70c6a8a..5a615a9179 100644
--- a/packages/nc-gui-v2/composables/useGlobal/types.ts
+++ b/packages/nc-gui-v2/composables/useGlobal/types.ts
@@ -4,11 +4,19 @@ import type { JwtPayload } from 'jwt-decode'
 import type { User } from '~/lib'
 import type { useCounter } from '#imports'
 
+export interface FeedbackForm {
+  url: string
+  createdAt: string
+  isHidden: boolean
+  lastFormPollDate?: string
+}
+
 export interface StoredState {
   token: string | null
   user: User | null
   lang: string
   darkMode: boolean
+  feedbackForm: FeedbackForm
 }
 
 export type State = ToRefs<Omit<StoredState, 'token'>> & {
diff --git a/packages/nc-gui-v2/composables/useGlobalState/initialFeedBackForm.ts b/packages/nc-gui-v2/composables/useGlobalState/initialFeedBackForm.ts
deleted file mode 100644
index e351e88a9c..0000000000
--- a/packages/nc-gui-v2/composables/useGlobalState/initialFeedBackForm.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  url: 'https://docs.google.com/forms/d/e/1FAIpQLSeTlAfZjszgr53lArz3NvUEnJGOT9JtG9NAU5d0oQwunDS2Pw/viewform?embedded=true',
-  createdAt: new Date('2020-01-01T00:00:00.000Z').toISOString(),
-  isHidden: false,
-}
diff --git a/packages/nc-gui-v2/lib/types.ts b/packages/nc-gui-v2/lib/types.ts
index 72182b80d6..968005a44f 100644
--- a/packages/nc-gui-v2/lib/types.ts
+++ b/packages/nc-gui-v2/lib/types.ts
@@ -8,11 +8,4 @@ export interface User {
   roles: Roles
 }
 
-export interface FeedbackForm {
-  url: string
-  createdAt: string
-  isHidden: boolean
-  lastFormPollDate?: string
-}
-
 export type Roles = Record<Role, boolean>