fix: some minor fixes

bimdata · Jun 4, 2021 · b944dff · b944dff
1 parent a4bc877
commit b944dff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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([]);