From b944dff1fec3fe1ec3fc8ef6c47496d85affadd1 Mon Sep 17 00:00:00 2001
From: NicolasRichel <nicolas@bimdata.io>
Date: Wed, 19 May 2021 11:08:44 +0200
Subject: [PATCH] fix: some minor fixes

---
 src/router/index.js                      | 3 +--
 src/views/model-viewer/ModelViewer.vue   | 8 +++++---
 src/views/project-board/ProjectBoard.vue | 7 ++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 8f4d3d833..500510fc6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -84,8 +84,7 @@ const routes = [
         }
       },
       {
-        path:
-          "/spaces/:spaceID(\\d+)/projects/:projectID(\\d+)/viewer/:modelIDs",
+        path: "/spaces/:spaceID(\\d+)/projects/:projectID(\\d+)/viewer/:modelIDs",
         name: routeNames.modelViewer,
         component: ModelViewer,
         meta: {
diff --git a/src/views/model-viewer/ModelViewer.vue b/src/views/model-viewer/ModelViewer.vue
index d4e543062..329624ee1 100644
--- a/src/views/model-viewer/ModelViewer.vue
+++ b/src/views/model-viewer/ModelViewer.vue
@@ -6,7 +6,7 @@
 
 <script>
 import { merge, set } from "lodash";
-import { onMounted, onUnmounted, watch } from "vue";
+import { onBeforeUnmount, onMounted, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
 import makeBIMDataViewer from "@bimdata/viewer";
@@ -108,7 +108,9 @@ export default {
         bimdataViewer.registerPlugin(pluginModule.default);
       });
 
-      const viewer = bimdataViewer.mount("#viewer", defaultWindow);
+      bimdataViewer.mount("#viewer", defaultWindow);
+
+      // Keep viewer access token and locale in sync with application
       unwatchAccessToken = watch(accessToken, token => {
         bimdataViewer.setAccessToken(token);
       });
@@ -117,7 +119,7 @@ export default {
       });
     });
 
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       unwatchAccessToken();
       unwatchLocale();
     });
diff --git a/src/views/project-board/ProjectBoard.vue b/src/views/project-board/ProjectBoard.vue
index 9c126c18a..8f951589e 100644
--- a/src/views/project-board/ProjectBoard.vue
+++ b/src/views/project-board/ProjectBoard.vue
@@ -97,11 +97,8 @@ export default {
   },
   setup() {
     const { t } = useI18n();
-    const {
-      currentProject,
-      currentProjectUsers,
-      currentProjectInvitations
-    } = useProjects();
+    const { currentProject, currentProjectUsers, currentProjectInvitations } =
+      useProjects();
     const { projectModels, loadProjectModels } = useModels();
 
     const tabs = ref([]);