Fix double-clicking on a search category logging out the desktop client

Closes #7319.
tutao · Aug 2, 2024 · 8fe0319 · 8fe0319
1 parent d8c32e0
commit 8fe0319
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/src/common/search/view/SearchRouter.ts b/src/common/search/view/SearchRouter.ts
@@ -1,5 +1,5 @@
 import { SearchRestriction } from "../../api/worker/search/SearchTypes.js"
-import { getRestriction, getSearchUrl } from "../../../mail-app/search/model/SearchUtils.js"
+import { getRestriction, getSearchParameters } from "../../../mail-app/search/model/SearchUtils.js"
 import m from "mithril"
 import { Router } from "../../gui/ScopedRouter.js"
 import { memoizedWithHiddenArgument } from "@tutao/tutanota-utils"
@@ -15,7 +15,7 @@ export class SearchRouter {
 	readonly getRestriction: () => SearchRestriction = memoizedWithHiddenArgument(() => m.route.get(), getRestriction)
 
 	routeTo(query: string, restriction: SearchRestriction, selectionKey: string | null = null): void {
-		const { path, params } = getSearchUrl(query, restriction, selectionKey)
+		const { path, params } = getSearchParameters(query, restriction, selectionKey)
 		this.router.routeTo(path, params)
 	}
 }
diff --git a/src/mail-app/search/model/SearchUtils.ts b/src/mail-app/search/model/SearchUtils.ts
@@ -113,7 +113,13 @@ export function searchCategoryForRestriction(restriction: SearchRestriction): Se
 	return assertNotNull(SEARCH_CATEGORIES.find((c) => isSameTypeRef(c.typeRef, restriction.type))).name
 }
 
-export function getSearchUrl(
+// Gets the resulting URL if the output of `getSearchParameters()` was routed to
+export function getSearchUrl(query: string | null, restriction: SearchRestriction, selectionKey: string | null = null): string {
+	const { path, params } = getSearchParameters(query, restriction, selectionKey)
+	return m.buildPathname(path, params as m.Params)
+}
+
+export function getSearchParameters(
 	query: string | null,
 	restriction: SearchRestriction,
 	selectionKey: string | null,

diff --git a/src/mail-app/search/view/SearchView.ts b/src/mail-app/search/view/SearchView.ts
@@ -151,9 +151,9 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 										m(NavButton, {
 											label: "emails_label",
 											icon: () => BootIcons.Mail,
-											href: "#",
+											href: this.searchViewModel.getUrlFromSearchCategory(SearchCategoryTypes.mail),
 											click: () => {
-												this.switchCategory(SearchCategoryTypes.mail)
+												this.viewSlider.focus(this.resultListColumn)
 											},
 											isSelectedPrefix: "/search/mail",
 											colors: NavButtonColor.Nav,
@@ -165,9 +165,9 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 										m(NavButton, {
 											label: "contacts_label",
 											icon: () => BootIcons.Contacts,
-											href: "#",
+											href: this.searchViewModel.getUrlFromSearchCategory(SearchCategoryTypes.contact),
 											click: () => {
-												this.switchCategory(SearchCategoryTypes.contact)
+												this.viewSlider.focus(this.resultListColumn)
 											},
 											isSelectedPrefix: "/search/contact",
 											colors: NavButtonColor.Nav,
@@ -179,9 +179,9 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 										m(NavButton, {
 											label: "calendar_label",
 											icon: () => BootIcons.Calendar,
-											href: "#",
+											href: this.searchViewModel.getUrlFromSearchCategory(SearchCategoryTypes.calendar),
 											click: () => {
-												this.switchCategory(SearchCategoryTypes.calendar)
+												this.viewSlider.focus(this.resultListColumn)
 											},
 											isSelectedPrefix: "/search/calendar",
 											colors: NavButtonColor.Nav,
@@ -243,11 +243,6 @@ export class SearchView extends BaseTopLevelView implements TopLevelView<SearchV
 		this.viewSlider = new ViewSlider([this.folderColumn, this.resultListColumn, this.resultDetailsColumn])
 	}
 
-	private switchCategory(category: SearchCategoryTypes): void {
-		this.searchViewModel.switchSearchCategory(category)
-		this.viewSlider.focus(this.resultListColumn)
-	}
-
 	private getResultColumnLayout() {
 		return m(SearchListView, {
 			listModel: this.searchViewModel.listModel,

diff --git a/src/mail-app/search/view/SearchViewModel.ts b/src/mail-app/search/view/SearchViewModel.ts
@@ -42,6 +42,7 @@ import {
 	decodeCalendarSearchKey,
 	encodeCalendarSearchKey,
 	getRestriction,
+	getSearchUrl,
 	searchCategoryForRestriction,
 	SearchCategoryTypes,
 } from "../model/SearchUtils.js"
@@ -448,7 +449,7 @@ export class SearchViewModel {
 		}
 	}
 
-	switchSearchCategory(category: SearchCategoryTypes) {
+	getUrlFromSearchCategory(category: SearchCategoryTypes): string {
 		if (this.currentQuery) {
 			let latestRestriction: SearchRestriction | null = null
 			switch (category) {
@@ -464,12 +465,12 @@ export class SearchViewModel {
 			}
 
 			if (latestRestriction) {
-				this.router.routeTo(this.currentQuery, latestRestriction)
+				return getSearchUrl(this.currentQuery, latestRestriction)
 			} else {
-				this.router.routeTo(this.currentQuery, createRestriction(category, null, null, null, [], null))
+				return getSearchUrl(this.currentQuery, createRestriction(category, null, null, null, [], null))
 			}
 		} else {
-			this.router.routeTo("", createRestriction(category, null, null, null, [], null))
+			return getSearchUrl("", createRestriction(category, null, null, null, [], null))
 		}
 	}