wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-02-02 17:02:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Select workspace fixes (#4701)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-02-20 21:18:11 +06:00 committed by GitHub
parent bdf6f3e80d
commit b9fd44ca62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/tracker/src/viewlets.ts
View File

@ -38,10 +38,10 @@ export const issuesOptions = (kanban: boolean): ViewOptionsModel => ({
'reportedTime' 'reportedTime'
], ],
orderBy: [ orderBy: [
['modifiedOn', SortingOrder.Descending],
['status', SortingOrder.Ascending], ['status', SortingOrder.Ascending],
['kind', SortingOrder.Ascending], ['kind', SortingOrder.Ascending],
['priority', SortingOrder.Ascending], ['priority', SortingOrder.Ascending],
['modifiedOn', SortingOrder.Descending],
['createdOn', SortingOrder.Descending], ['createdOn', SortingOrder.Descending],
['dueDate', SortingOrder.Ascending], ['dueDate', SortingOrder.Ascending],
['rank', SortingOrder.Ascending], ['rank', SortingOrder.Ascending],

10
plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
View File

@ -48,10 +48,6 @@
} }
async function clickHandler (e: MouseEvent, ws: string): Promise<void> { async function clickHandler (e: MouseEvent, ws: string): Promise<void> {
if (!e.metaKey && !e.ctrlKey) {
e.preventDefault()
closePopup()
closePopup()
if (ws !== getCurrentLocation().path[1]) { if (ws !== getCurrentLocation().path[1]) {
const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {} const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
const token = tokens[ws] const token = tokens[ws]
@ -63,6 +59,12 @@
} }
setMetadataLocalStorage(login.metadata.LoginTokens, tokens) setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
} }
}
if (!e.metaKey && !e.ctrlKey) {
e.preventDefault()
closePopup()
closePopup()
if (ws !== getCurrentLocation().path[1]) {
const last = localStorage.getItem(`${locationStorageKeyId}_${ws}`) const last = localStorage.getItem(`${locationStorageKeyId}_${ws}`)
if (last !== null) { if (last !== null) {
navigate(JSON.parse(last)) navigate(JSON.parse(last))

2
tests/sanity/tests/tracker/issues-duplicate.spec.ts
View File

@ -48,7 +48,7 @@ test.describe('Tracker duplicate issue tests', () => {
await trackerNavigationMenuPage.openTemplateForProject('Default') await trackerNavigationMenuPage.openTemplateForProject('Default')
await trackerNavigationMenuPage.openIssuesForProject('Default') await trackerNavigationMenuPage.openIssuesForProject('Default')
await issuesPage.searchIssueByName(secondIssue.title) await issuesPage.searchIssueByName(secondIssue.title)
const secondIssueId = await issuesPage.getIssueId(secondIssue.title, 1) const secondIssueId = await issuesPage.getIssueId(secondIssue.title, 0)
expect(firstIssueId).not.toEqual(secondIssueId) expect(firstIssueId).not.toEqual(secondIssueId)
await issuesPage.checkIssuesCount(firstIssue.title, 2) await issuesPage.checkIssuesCount(firstIssue.title, 2)

3
tests/sanity/tests/tracker/tracker.spec.ts
View File

@ -189,9 +189,6 @@ test.describe('Tracker tests', () => {
await navigate(page) await navigate(page)
await page.click('text="Issues"') await page.click('text="Issues"')
await page.click('button:has-text("View")')
await page.click('.ordering >> nth=0')
await page.click('text="Modified date"')
await page.keyboard.press('Escape') await page.keyboard.press('Escape')
const values = [2, 4, 6, 8] const values = [2, 4, 6, 8]