Adding backward compatibility for 5.38 (#922)

* Adding backward compatibility for 5.38 * Fixing problem with urls
mattermost · Aug 11, 2021 · 4296b7d · 4296b7d
1 parent 75e9930
commit 4296b7d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/mattermost-plugin/webapp/src/index.tsx b/mattermost-plugin/webapp/src/index.tsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import React, {useEffect, useState} from 'react'
+import React, {useEffect} from 'react'
 import {Store, Action} from 'redux'
 import {Provider as ReduxProvider} from 'react-redux'
-import {useHistory} from 'react-router-dom'
+import {useHistory} from 'mm-react-router-dom'
 
 import {GlobalState} from 'mattermost-redux/types/store'
 
@@ -80,21 +80,35 @@ export default class Plugin {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
     public async initialize(registry: PluginRegistry, store: Store<GlobalState, Action<Record<string, unknown>>>) {
         this.registry = registry
-        const goToFocalboardWorkspace = () => {
-            const currentChannel = store.getState().entities.channels.currentChannelId
-            window.open(`${window.location.origin}/boards/workspace/${currentChannel}`)
-        }
-        this.channelHeaderButtonId = registry.registerChannelHeaderButtonAction(<FocalboardIcon/>, goToFocalboardWorkspace, '', 'Focalboard Workspace')
-
-        this.registry.registerCustomRoute('go-to-current-workspace', () => {
-            const history = useHistory()
-            const currentChannel = store.getState().entities.channels.currentChannelId
-            history.push(`/boards/workspace/${currentChannel}`)
-            return <></>
-        })
 
         if (this.registry.registerProduct) {
+            windowAny.frontendBaseURL = '/boards'
+            const goToFocalboardWorkspace = () => {
+                const currentChannel = store.getState().entities.channels.currentChannelId
+                window.open(`${window.location.origin}/boards/workspace/${currentChannel}`)
+            }
+            this.channelHeaderButtonId = registry.registerChannelHeaderButtonAction(<FocalboardIcon/>, goToFocalboardWorkspace, '', 'Focalboard Workspace')
+
+            this.registry.registerCustomRoute('go-to-current-workspace', () => {
+                const history = useHistory()
+                useEffect(() => {
+                    const currentChannel = store.getState().entities.channels.currentChannelId
+                    if (currentChannel) {
+                        history.push(`/boards/workspace/${currentChannel}`)
+                    } else {
+                        history.goBack()
+                    }
+                }, [])
+                return <></>
+            })
             this.registry.registerProduct('/boards', GlobalHeaderIcon, 'Boards', '/plug/focalboard/go-to-current-workspace', MainApp, HeaderComponent)
+        } else {
+            windowAny.frontendBaseURL = '/plug/focalboard'
+            this.channelHeaderButtonId = registry.registerChannelHeaderButtonAction(<FocalboardIcon/>, () => {
+                const currentChannel = store.getState().entities.channels.currentChannelId
+                window.open(`${window.location.origin}/plug/focalboard/workspace/${currentChannel}`)
+            }, '', 'Focalboard Workspace')
+            this.registry.registerCustomRoute('/', MainApp)
         }
     }
 

diff --git a/mattermost-plugin/webapp/src/types/mm-react-router-dom/index.d.ts b/mattermost-plugin/webapp/src/types/mm-react-router-dom/index.d.ts
@@ -0,0 +1 @@
+declare module "mm-react-router-dom"
diff --git a/mattermost-plugin/webapp/webpack.config.js b/mattermost-plugin/webapp/webpack.config.js
@@ -125,6 +125,7 @@ module.exports = {
         react: 'React',
         redux: 'Redux',
         'react-redux': 'ReactRedux',
+        'mm-react-router-dom': 'ReactRouterDom',
         'prop-types': 'PropTypes',
         'react-bootstrap': 'ReactBootstrap',
     },