X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8c6209c45e4720c66dd53640142cbc9111748246..c276ce4c8dd3cf27ad6d17eca9af473f353fda55:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 7443aeae..4ce80d31 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -7,47 +7,73 @@ import * as ReactDOM from 'react-dom'; import { Provider } from "react-redux"; import { Workbench } from './views/workbench/workbench'; import './index.css'; -import { Route } from "react-router"; +import { Route } from 'react-router'; import createBrowserHistory from "history/createBrowserHistory"; -import { configureStore } from "./store/store"; +import { History } from "history"; +import { configureStore, RootStore } from './store/store'; import { ConnectedRouter } from "react-router-redux"; import { ApiToken } from "./views-components/api-token/api-token"; -import { authActions } from "./store/auth/auth-action"; -import { authService } from "./services/services"; -import { getProjectList } from "./store/project/project-action"; +import { initAuth } from "./store/auth/auth-action"; +import { createServices } from "./services/services"; import { MuiThemeProvider } from '@material-ui/core/styles'; import { CustomTheme } from './common/custom-theme'; import { fetchConfig } from './common/config'; -import { setBaseUrl } from './common/api/server-api'; import { addMenuActionSet, ContextMenuKind } from "./views-components/context-menu/context-menu"; import { rootProjectActionSet } from "./views-components/context-menu/action-sets/root-project-action-set"; import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set"; import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set'; import { favoriteActionSet } from "./views-components/context-menu/action-sets/favorite-action-set"; +import { collectionFilesActionSet } from './views-components/context-menu/action-sets/collection-files-action-set'; +import { collectionFilesItemActionSet } from './views-components/context-menu/action-sets/collection-files-item-action-set'; +import { collectionActionSet } from './views-components/context-menu/action-sets/collection-action-set'; +import { collectionResourceActionSet } from './views-components/context-menu/action-sets/collection-resource-action-set'; +import { processActionSet } from './views-components/context-menu/action-sets/process-action-set'; +import { addRouteChangeHandlers } from './routes/routes'; +import { loadWorkbench } from './store/workbench/workbench-actions'; +import { Routes } from '~/routes/routes'; +import { trashActionSet } from "~/views-components/context-menu/action-sets/trash-action-set"; +import { ServiceRepository } from '~/services/services'; +import { initWebSocket } from '~/websocket/websocket'; +import { Config } from '~/common/config'; -addMenuActionSet(ContextMenuKind.RootProject, rootProjectActionSet); -addMenuActionSet(ContextMenuKind.Project, projectActionSet); -addMenuActionSet(ContextMenuKind.Resource, resourceActionSet); -addMenuActionSet(ContextMenuKind.Favorite, favoriteActionSet); +const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); +const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); +const getBuildInfo = () => getBuildNumber() + " / " + getGitCommit(); -fetchConfig() - .then(config => { +const buildInfo = getBuildInfo(); + +console.log(`Starting arvados [${buildInfo}]`); - setBaseUrl(config.API_HOST); +addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet); +addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet); +addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet); +addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); +addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); +addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); +fetchConfig() + .then((config) => { const history = createBrowserHistory(); - const store = configureStore(history); + const services = createServices(config); + const store = configureStore(history, services); + + store.subscribe(initListener(history, store, services, config)); + store.dispatch(initAuth()); - store.dispatch(authActions.INIT()); - store.dispatch(getProjectList(authService.getUuid())); + const TokenComponent = (props: any) => ; + const WorkbenchComponent = (props: any) => ; const App = () =>
- - + +
@@ -57,6 +83,21 @@ fetchConfig() , document.getElementById('root') as HTMLElement ); + + }); +const initListener = (history: History, store: RootStore, services: ServiceRepository, config: Config) => { + let initialized = false; + return async () => { + const { router, auth } = store.getState(); + if (router.location && auth.user && !initialized) { + initialized = true; + initWebSocket(config, services.authService, store); + await store.dispatch(loadWorkbench()); + addRouteChangeHandlers(history, store); + } + }; +}; +