From f2402c32087ad27cf66d4238ccdc335fa0a8e966 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:01:13 +0700
Subject: [PATCH] Fix current space selection on page load (#927)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .../src/components/Workbench.svelte           | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index 54285ddac0..e5f614ebe6 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -17,7 +17,8 @@
   import core, { Client, getCurrentAccount, Ref, Space } from '@anticrm/core'
   import { Avatar, createQuery, setClient } from '@anticrm/presentation'
   import {
-    AnyComponent, closeTooltip,
+    AnyComponent,
+    closeTooltip,
     Component,
     getCurrentLocation,
     location,
@@ -60,7 +61,7 @@
         navigatorModel = currentApplication?.navigatorModel
       }
       const currentFolder = loc.path[2] as Ref<Space>
-  
+
       if (currentSpecial !== currentFolder) {
         specialComponent = getSpecialComponent(currentFolder)
         if (specialComponent !== undefined) {
@@ -69,7 +70,7 @@
         }
       }
 
-      updateSpace(currentSpace)
+      updateSpace(currentFolder)
     })
   )
 
@@ -84,7 +85,7 @@
     if (space) {
       currentSpace = spaceId
       currentSpecial = undefined
-  
+
       const spaceClass = client.getHierarchy().getClass(space._class) // (await client.findAll(core.class.Class, { _id: space._class }))[0]
       const view = client.getHierarchy().as(spaceClass, workbench.mixin.SpaceView)
       currentView = view.view
@@ -143,20 +144,31 @@
   let employee: Employee | undefined
   const accountQ = createQuery()
   const employeeQ = createQuery()
-  $: accountQ.query(contact.class.EmployeeAccount, {
-    _id: getCurrentAccount()._id as Ref<EmployeeAccount>
-  }, (res) => {
-    account = res[0]
-  }, { limit: 1 })
+  $: accountQ.query(
+    contact.class.EmployeeAccount,
+    {
+      _id: getCurrentAccount()._id as Ref<EmployeeAccount>
+    },
+    (res) => {
+      account = res[0]
+    },
+    { limit: 1 }
+  )
 
-  $: account && employeeQ.query(contact.class.Employee, {
-    _id: account.employee
-  }, (res) => {
-    employee = res[0]
-  }, { limit: 1 })
+  $: account &&
+    employeeQ.query(
+      contact.class.Employee,
+      {
+        _id: account.employee
+      },
+      (res) => {
+        employee = res[0]
+      },
+      { limit: 1 }
+    )
 
   let isNavigate: boolean = false
-  $: isNavigate = navigatorModel ? true : false
+  $: isNavigate = !!navigatorModel
 </script>
 
 {#if client}
@@ -213,7 +225,7 @@
     {/if}
     <div class="antiPanel-component indent antiComponent" class:filled={isNavigate}>
       {#if currentApplication && currentApplication.component}
-        <Component is={currentApplication.component} />      
+        <Component is={currentApplication.component} />
       {:else if specialComponent}
         <Component is={specialComponent} />
       {:else}