From 84e7ca38111dc72fb4049258fa4cc478584611a7 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:15:57 +0200
Subject: [PATCH] chore(nc-gui): narrow down language types

---
 .../components/general/language/Menu.vue      | 20 ++++++-------------
 .../nc-gui/composables/useGlobal/state.ts     |  6 +++---
 .../nc-gui/composables/useGlobal/types.ts     |  4 ++--
 packages/nc-gui/layouts/base.vue              |  4 +---
 packages/nc-gui/plugins/a.i18n.ts             | 10 +++++++---
 packages/nc-gui/plugins/state.ts              |  9 ++++-----
 6 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/packages/nc-gui/components/general/language/Menu.vue b/packages/nc-gui/components/general/language/Menu.vue
index 7789ce02ae..d1ce5fbdc2 100644
--- a/packages/nc-gui/components/general/language/Menu.vue
+++ b/packages/nc-gui/components/general/language/Menu.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
 import { Language } from '~/lib'
 import { onMounted, useGlobal, useI18n, useNuxtApp } from '#imports'
-import { loadLocaleMessages } from '~/plugins/a.i18n'
+import { setI18nLanguage } from '~/plugins/a.i18n'
 
-const { $e, vueApp } = useNuxtApp()
+const { $e } = useNuxtApp()
 
 const { lang: currentLang } = useGlobal()
 
-const { availableLocales = ['en'], locale } = useI18n()
+const { locale } = useI18n()
 
 const languages = $computed(() => Object.entries(Language).sort())
 
@@ -23,12 +23,10 @@ function applyDirection() {
 }
 
 async function changeLanguage(lang: string) {
-  if (!availableLocales.includes(lang)) {
-    await loadLocaleMessages(vueApp.i18n, lang)
-  }
+  const nextLang = lang as keyof typeof Language
 
-  currentLang.value = lang
-  locale.value = lang
+  await setI18nLanguage(nextLang)
+  currentLang.value = nextLang
 
   applyDirection()
 
@@ -38,12 +36,6 @@ async function changeLanguage(lang: string) {
 onMounted(() => {
   applyDirection()
 })
-
-defineExpose({
-  languages,
-  currentLang,
-  changeLanguage,
-})
 </script>
 
 <template>
diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts
index 7588949f8f..5c90a25002 100644
--- a/packages/nc-gui/composables/useGlobal/state.ts
+++ b/packages/nc-gui/composables/useGlobal/state.ts
@@ -4,7 +4,7 @@ import type { JwtPayload } from 'jwt-decode'
 import type { AppInfo, State, StoredState } from './types'
 import { BASE_URL } from '~/lib'
 import { computed, ref, toRefs, useCounter, useNuxtApp, useTimestamp } from '#imports'
-import type { User } from '~/lib'
+import type { Language, User } from '~/lib'
 
 export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
   /** get the preferred languages of a user, according to browser settings */
@@ -25,7 +25,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
    * If the user has not set a preferred language, we fall back 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((locale, language) => {
+  const preferredLanguage = preferredLanguages.reduce<keyof typeof Language>((locale, language) => {
     /** split language to language and code, e.g. en-GB -> [en, GB] */
     const [lang, code] = language.split(/[_-]/)
 
@@ -41,7 +41,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
     const availableLocale = availableLocales[0]
 
     /** if we found a matching locale, return it */
-    if (availableLocale) locale = availableLocale
+    if (availableLocale) locale = availableLocale as keyof typeof Language
 
     return locale
   }, 'en' /** fallback locale */)
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index e598332022..f1ec9534ee 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -1,7 +1,7 @@
 import type { ComputedRef, Ref, ToRefs } from 'vue'
 import type { WritableComputedRef } from '@vue/reactivity'
 import type { JwtPayload } from 'jwt-decode'
-import type { User } from '~/lib'
+import type { Language, User } from '~/lib'
 import type { useCounter } from '#imports'
 
 export interface FeedbackForm {
@@ -30,7 +30,7 @@ export interface AppInfo {
 export interface StoredState {
   token: string | null
   user: User | null
-  lang: string
+  lang: keyof typeof Language
   darkMode: boolean
   feedbackForm: FeedbackForm
   filterAutoSave: boolean
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index c8f1f9226d..fdb6fed99c 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -102,9 +102,7 @@ hooks.hook('page:finish', () => {
       <a-tooltip placement="bottom">
         <template #title> Switch language</template>
 
-        <Transition name="layout">
-          <GeneralLanguage v-if="!signedIn" class="nc-lang-btn" />
-        </Transition>
+        <GeneralLanguage class="nc-lang-btn" />
       </a-tooltip>
 
       <div class="w-full h-full overflow-hidden">
diff --git a/packages/nc-gui/plugins/a.i18n.ts b/packages/nc-gui/plugins/a.i18n.ts
index 8653289c29..0d97b9aca1 100644
--- a/packages/nc-gui/plugins/a.i18n.ts
+++ b/packages/nc-gui/plugins/a.i18n.ts
@@ -1,7 +1,7 @@
 import { defineNuxtPlugin } from 'nuxt/app'
 import { createI18n } from 'vue-i18n'
 import { nextTick } from 'vue'
-import type { NocoI18n } from '~/lib'
+import type { Language, NocoI18n } from '~/lib'
 
 let globalI18n: NocoI18n
 
@@ -18,11 +18,15 @@ export const createI18nPlugin = async (): Promise<NocoI18n> =>
 
 export const getI18n = () => globalI18n
 
-export function setI18nLanguage(i18n: NocoI18n, locale: string): void {
+export async function setI18nLanguage(locale: keyof typeof Language, i18n = globalI18n) {
+  if (!i18n.global.availableLocales.includes(locale)) {
+    await loadLocaleMessages(locale)
+  }
+
   i18n.global.locale.value = locale
 }
 
-export async function loadLocaleMessages(i18n: NocoI18n, locale: string) {
+export async function loadLocaleMessages(locale: keyof typeof Language, i18n: NocoI18n = globalI18n) {
   // load locale messages with dynamic import
   const messages = await import(`../lang/${locale}.json`)
 
diff --git a/packages/nc-gui/plugins/state.ts b/packages/nc-gui/plugins/state.ts
index 6f41aec30b..83bc44aed3 100644
--- a/packages/nc-gui/plugins/state.ts
+++ b/packages/nc-gui/plugins/state.ts
@@ -13,19 +13,18 @@ import { loadLocaleMessages, setI18nLanguage } from '~/plugins/a.i18n'
  * console.log($state.lang.value) // 'en'
  * ```
  */
-export default defineNuxtPlugin(async (nuxtApp) => {
+export default defineNuxtPlugin(async () => {
   const state = useGlobal()
 
   const { api } = useApi()
 
-  const i18n = nuxtApp.vueApp.i18n
-
   const currentLang = state.lang.value
 
-  await loadLocaleMessages(i18n, currentLang)
+  /** force load initial locale messages */
+  await loadLocaleMessages(currentLang)
 
   /** set i18n locale to stored language */
-  setI18nLanguage(i18n, state.lang.value)
+  await setI18nLanguage(currentLang)
 
   try {
     state.appInfo.value = await api.utils.appInfo()