From e0f2c87ed36221384406c4d356f5e415c4e920ee Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Mon, 2 Dec 2024 14:04:16 +0700
Subject: [PATCH] Fix test suite and test run default selection (#7250)

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../components/test-run/CreateTestRun.svelte  |  2 +-
 .../src/navigation.ts                         |  8 +++--
 .../components/folders/FoldersBrowser.svelte  | 35 +++++++++++--------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/plugins/test-management-resources/src/components/test-run/CreateTestRun.svelte b/plugins/test-management-resources/src/components/test-run/CreateTestRun.svelte
index 6b9990529a..4748e32721 100644
--- a/plugins/test-management-resources/src/components/test-run/CreateTestRun.svelte
+++ b/plugins/test-management-resources/src/components/test-run/CreateTestRun.svelte
@@ -107,7 +107,7 @@
         throw new Error('Failed to create test run')
       } else {
         Analytics.handleEvent(TestManagementEvents.TestRunCreated, { id })
-        navigate(getTestRunsLink(id))
+        navigate(getTestRunsLink(space, id))
       }
     } catch (err: any) {
       console.error(err)
diff --git a/plugins/test-management-resources/src/navigation.ts b/plugins/test-management-resources/src/navigation.ts
index 7d0ab508eb..00ba0f82b0 100644
--- a/plugins/test-management-resources/src/navigation.ts
+++ b/plugins/test-management-resources/src/navigation.ts
@@ -79,10 +79,12 @@ export function getTestSuiteIdFromLocation (): Ref<TestSuite> {
   return (location?.query?.[SUITE_KEY] as Ref<TestSuite>) ?? testManagement.ids.NoParent
 }
 
-export function getTestRunsLink (parentDoc: Ref<Doc>): Location {
+export function getTestRunsLink (space: Ref<TestProject>, parentDoc: Ref<Doc>): Location {
   const loc = getCurrentResolvedLocation()
-  loc.path.length = 4
-  loc.path[3] = 'testRuns'
+  loc.path.length = 5
+  loc.path[2] = testManagementId
+  loc.path[3] = space
+  loc.path[4] = 'testRuns'
   loc.fragment = undefined
   loc.query = parentDoc === undefined ? undefined : { attachedTo: parentDoc }
 
diff --git a/plugins/view-resources/src/components/folders/FoldersBrowser.svelte b/plugins/view-resources/src/components/folders/FoldersBrowser.svelte
index 9fd06fbd3e..0995e1f6fc 100644
--- a/plugins/view-resources/src/components/folders/FoldersBrowser.svelte
+++ b/plugins/view-resources/src/components/folders/FoldersBrowser.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { Class, Doc, DocumentQuery, Ref, SortingOrder } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import { Action, IconEdit, navigate, type Location, Scroller } from '@hcengineering/ui'
+  import { Action, IconEdit, navigate, type Location, Scroller, location, getLocation } from '@hcengineering/ui'
   import { getResource, type Resource } from '@hcengineering/platform'
   import { IntlString, Asset } from '@hcengineering/platform'
 
@@ -34,6 +34,10 @@
   export let allObjectsLabel: IntlString
   export let plainList: boolean = false
 
+  const getFolderId = (): Ref<Doc> => {
+    return (getLocation()?.query?.attachedTo as Ref<Doc>) ?? noParentId
+  }
+
   export let forciblyСollapsed: boolean = false
 
   const client = getClient()
@@ -46,17 +50,23 @@
     foldersState = newState
   })
 
-  let selected: Ref<Doc> = noParentId
-  let visibleItem: Doc | undefined
+  let selected: Ref<Doc> = getFolderId()
+  let visibleItem: Doc | undefined = foldersState.folderById.get(selected)
+  location.subscribe(() => {
+    selected = getFolderId()
+    visibleItem = foldersState.folderById.get(selected)
+  })
 
   const q = createQuery()
   q.query(
     _class,
     query ?? {},
-    (result) => {
+    async (result) => {
       foldersManager.setFolders(result)
       if (plainList && foldersState.folders?.length > 0) {
-        handleFolderSelected(foldersState.folders[0])
+        if (selected === undefined) {
+          await handleFolderSelected(foldersState.folders[0])
+        }
       }
     },
     {
@@ -67,17 +77,12 @@
   )
 
   async function handleFolderSelected (_id: Ref<Doc>): Promise<void> {
-    selected = _id
-    visibleItem = selected !== undefined ? foldersState.folderById.get(selected) : undefined
     const getFolderLinkFunction = await getResource(getFolderLink)
     navigate(getFolderLinkFunction(_id))
   }
 
   async function handleAllItemsSelected (): Promise<void> {
-    selected = noParentId
-    visibleItem = undefined
-    const getFolderLinkFunction = await getResource(getFolderLink)
-    navigate(getFolderLinkFunction(undefined))
+    await handleFolderSelected(noParentId)
   }
 
   async function getFolderActions (obj: Doc): Promise<Action[]> {
@@ -119,8 +124,8 @@
         descendants={foldersState.descendants}
         folderById={foldersState.folderById}
         {selected}
-        on:selected={(ev) => {
-          handleFolderSelected(ev.detail)
+        on:selected={async (ev) => {
+          await handleFolderSelected(ev.detail)
         }}
       />
       <svelte:fragment slot="visible">
@@ -147,8 +152,8 @@
       descendants={foldersState.descendants}
       folderById={foldersState.folderById}
       {selected}
-      on:selected={(ev) => {
-        handleFolderSelected(ev.detail)
+      on:selected={async (ev) => {
+        await handleFolderSelected(ev.detail)
       }}
     />
   {/if}