fix bug with study selector navigation

human-nature-lab · Mar 27, 2024 · c007b8a · c007b8a
1 parent 065af0e
commit c007b8a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 31 deletions.
diff --git a/src/helpers/user.helper.ts b/src/helpers/user.helper.ts
@@ -12,7 +12,9 @@ export async function loadUser () {
   loading.value = true
   try {
     user.value = await UserService.loadCurrentUser()
-    userPermissions.value = await PermissionService.fetchUserPermissions(user.value)
+    if (user.value) {
+      userPermissions.value = await PermissionService.fetchUserPermissions(user.value)
+    }
   } finally {
     loading.value = false
   }

diff --git a/src/router/guards/StudyGuard.ts b/src/router/guards/StudyGuard.ts
@@ -1,13 +1,13 @@
 import { Route } from 'vue-router'
-import SingletonService from '../../services/SingletonService'
+import SingletonService, { StorageKey } from '../../services/SingletonService'
 import StudyService from '../../services/study'
 import StorageService from '../../services/StorageService'
 import { GuardConfig } from '../GuardQueue'
 
 export default {
   name: 'StudyGuard',
   async condition (to: Route) {
-    const studyId = StorageService.get('current-study')
+    const studyId = StorageService.get(StorageKey.study)
     if (!studyId) {
       return false
     }
@@ -18,7 +18,7 @@ export default {
       }
       return !!study
     } catch (err) {
-      StorageService.delete('current-study')
+      StorageService.delete(StorageKey.study)
     }
     try {
       const study = to.params.studyId

diff --git a/src/services/SingletonService.ts b/src/services/SingletonService.ts
@@ -44,25 +44,6 @@ class SingletonService extends Emitter {
       singleton.darkTheme = storage.get(StorageKey.theme)
       theme.dark = singleton.darkTheme
     }
-    /* Moved to ValidateStudy Guard
-    if (storage.get(StorageKey.study)) {
-      const studyId = storage.get(StorageKey.study)
-      if (!studyId) return
-      singleton.study = await StudyService.getStudy(studyId)
-      this.dispatch('study', singleton.study)
-    }
-    */
-    /* Moved to ValidateLocale Guard
-    if (storage.get(StorageKey.locale)) {
-      const localeId = storage.get(StorageKey.locale)
-      if (!localeId) return
-      const locale = await LocaleService.getLocaleById(localeId)
-      if (locale) {
-        this.setCurrentLocale(locale)
-      }
-      console.log('loaded locale', singleton.locale)
-    }
-    */
     singleton.deviceId = await DeviceService.getUUID()
     if (config.appEnv === APP_ENV.CORDOVA && config.sentry) {
       const server = await DatabaseService.getServerIPAddress()
@@ -81,8 +62,6 @@ class SingletonService extends Emitter {
     const tag = locale.languageTag
     setLocale(tag)
     loadLanguageAsync(tag)
-    // i18n.locale = i18n.messages[locale.languageTag] ? locale.languageTag : 'en'
-    singleton
     singleton.locale = locale
     storage.set(StorageKey.locale, locale.id)
     this.dispatch(SingletonEvent.locale, locale)

diff --git a/src/services/locale/LocaleService.mobile.ts b/src/services/locale/LocaleService.mobile.ts
@@ -14,7 +14,6 @@ export class LocaleService extends LocaleServiceAbstract {
 
   async getStudyLocales (studyId: string): Promise<Locale[]> {
     const study = await StudyService.getStudy(studyId)
-    console.log('study', study)
     return study ? await study.locales : []
   }
 

diff --git a/src/services/permission/PermissionServiceAbstract.ts b/src/services/permission/PermissionServiceAbstract.ts
@@ -23,12 +23,10 @@ export default abstract class PermissionServiceAbstract {
    * @param user
    */
   public async getUserPermissions (user: User): Promise<PermissionMap> {
-
     this.resetUserPermissions()
-
     // Get permissions for this user only if they've logged in
     if (user) {
-      let updatedPermissions = await this.fetchUserPermissions(user)
+      const updatedPermissions = await this.fetchUserPermissions(user)
       for (const p of updatedPermissions) {
         this.userPermissions[TrellisPermission[p]] = true
       }

diff --git a/src/services/study/StudyServiceAbstract.ts b/src/services/study/StudyServiceAbstract.ts
@@ -1,10 +1,10 @@
 import User from '../../entities/trellis/User'
 import Study from '../../entities/trellis/Study'
-import SingletonService from '../SingletonService'
+import SingletonService, { StorageKey } from '../SingletonService'
 
 export abstract class StudyServiceAbstract {
   getCurrentStudy (): Study | undefined {
-    const study = SingletonService.get('study')
+    const study = SingletonService.get(StorageKey.study)
     return (study instanceof Study) ? study : undefined
   }