luisgulo/focalboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix redirect problems on product switch (#972)

Browse Source 
Co-authored-by: Hossein <hahmadia@users.noreply.github.com>
This commit is contained in:
Jesús Espino 2021-08-14 17:26:53 +02:00 committed by GitHub
parent a8b0f68e1e
commit f983a59973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
webapp/src/pages/boardPage.tsx
View File

@ -64,39 +64,36 @@ const BoardPage = (props: Props) => {
}
}, [])
useEffect(() => {
if (!match.params.boardId) {
// Load last viewed boardView
const boardId = localStorage.getItem('lastBoardId') || undefined
const viewId = localStorage.getItem('lastViewId') || undefined
if (boardId) {
const newPath = generatePath(match.path, {...match.params, boardId, viewId})
history.replace(newPath)
}
}
}, [])
useEffect(() => {
const boardId = match.params.boardId
const viewId = match.params.viewId
Utils.log(`attachToBoard: ${boardId}`)
if (boardId && !viewId && boardViews.length > 0) {
const newPath = generatePath(match.path, {...match.params, boardId, viewId: boardViews[0].id})
history.replace(newPath)
if (!boardId) {
// Load last viewed boardView
const lastBoardId = localStorage.getItem('lastBoardId') || undefined
const lastViewId = localStorage.getItem('lastViewId') || undefined
if (lastBoardId) {
let newPath = generatePath(match.path, {...match.params, boardId: lastBoardId})
if (lastViewId) {
newPath = generatePath(match.path, {...match.params, boardId: lastBoardId, viewId: lastViewId})
}
history.replace(newPath)
return
}
return
}
const view = boardViews.find((v) => v.id === viewId)
if (!view && boardViews.length > 0) {
Utils.log(`attachToBoard: ${boardId}`)
if (!viewId && boardViews.length > 0) {
const newPath = generatePath(match.path, {...match.params, boardId, viewId: boardViews[0].id})
history.replace(newPath)
return
}
localStorage.setItem('lastBoardId', boardId || '')
localStorage.setItem('lastViewId', view?.id || '')
localStorage.setItem('lastViewId', viewId || '')
dispatch(setCurrentBoard(boardId || ''))
dispatch(setCurrentView(view?.id || ''))
dispatch(setCurrentView(viewId || ''))
}, [match.params.boardId, match.params.viewId, history, boardViews])
useEffect(() => {