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

Redirect to new routes when visiting a board with the legacy ones (#1746)

Browse Source
This commit is contained in:
Miguel de la Cruz 2021-11-04 18:24:57 +01:00 committed by GitHub
parent 13ef8e85f3
commit f566a7d7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webapp/src/app.tsx
View File

@ -85,13 +85,6 @@ const App = React.memo((): JSX.Element => {
const me = useAppSelector<IUser|null>(getMe)
const dispatch = useAppDispatch()
// this is a temporary solution while we're using legacy routes
// for shared boards as a way to disable websockets, and should be
// removed when anonymous plugin routes are implemented. This
// check is used to detect if we're running inside the plugin but
// in a legacy route
const inPluginLegacy = window.location.pathname.includes('/plugins/focalboard/')
useEffect(() => {
dispatch(fetchLanguage())
dispatch(fetchMe())
@ -106,7 +99,12 @@ const App = React.memo((): JSX.Element => {
}, [])
}
if (!inPluginLegacy) {
// this is a temporary solution while we're using legacy routes
// for shared boards as a way to disable websockets, and should be
// removed when anonymous plugin routes are implemented. This
// check is used to detect if we're running inside the plugin but
// in a legacy route
if (!Utils.isFocalboardLegacy()) {
useEffect(() => {
wsClient.open()
return () => {

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

@ -53,6 +53,12 @@ const BoardPage = (props: Props): JSX.Element => {
let workspaceId = match.params.workspaceId || UserSettings.lastWorkspaceId || '0'
// if we're in a legacy route and not showing a shared board,
// redirect to the new URL schema equivalent
if (Utils.isFocalboardLegacy() && !props.readonly) {
window.location.href = window.location.href.replace('/plugins/focalboard', '/boards')
}
// TODO: Make this less brittle. This only works because this is the root render function
useEffect(() => {
workspaceId = match.params.workspaceId || workspaceId

7
webapp/src/utils.ts
View File

@ -508,6 +508,13 @@ class Utils {
return Boolean(window.isFocalboardPlugin)
}
// this is a temporary solution while we're using legacy routes
// for shared boards as a way to check if we're accessing the
// legacy routes inside the plugin
static isFocalboardLegacy(): boolean {
return window.location.pathname.includes('/plugins/focalboard')
}
static fixBlock(block: Block): Block {
switch (block.type) {
case 'board':