X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/00bf04d74afad9970678b87c02942003e0712cd2..7177f95ebc5a3da43da1d299f7ae9837381e58d6:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index a921b47138..5285284735 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { Provider } from "react-redux"; -import { Workbench } from './views/workbench/workbench'; +import { MainPanel } from './views/main-panel/main-panel'; import './index.css'; import { Route } from 'react-router'; import createBrowserHistory from "history/createBrowserHistory"; @@ -18,7 +18,7 @@ import { createServices } from "./services/services"; import { MuiThemeProvider } from '@material-ui/core/styles'; import { CustomTheme } from './common/custom-theme'; import { fetchConfig } from './common/config'; -import { addMenuActionSet, ContextMenuKind } from "./views-components/context-menu/context-menu"; +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'; @@ -35,6 +35,10 @@ import { ServiceRepository } from '~/services/services'; import { initWebSocket } from '~/websocket/websocket'; import { Config } from '~/common/config'; import { addRouteChangeHandlers } from './routes/route-change-handlers'; +import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions'; +import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set'; +import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; +import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set'; const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); @@ -52,20 +56,31 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); +addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); +addMenuActionSet(ContextMenuKind.PROCESS_RESOURCE, processResourceActionSet); addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); fetchConfig() - .then((config) => { + .then(({ config, apiHost }) => { const history = createBrowserHistory(); - const services = createServices(config); + const services = createServices(config, { + progressFn: (id, working) => { + store.dispatch(progressIndicatorActions.TOGGLE_WORKING({ id, working })); + }, + errorFn: (id, error) => { + // console.error("Backend error:", error); + // store.dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Backend error", kind: SnackbarKind.ERROR })); + } + }); const store = configureStore(history, services); store.subscribe(initListener(history, store, services, config)); store.dispatch(initAuth()); + store.dispatch(setCurrentTokenDialogApiHost(apiHost)); const TokenComponent = (props: any) => ; - const WorkbenchComponent = (props: any) => ; + const MainPanelComponent = (props: any) => ; const App = () => @@ -73,7 +88,7 @@ fetchConfig()
- +
@@ -83,8 +98,6 @@ fetchConfig() , document.getElementById('root') as HTMLElement ); - - }); const initListener = (history: History, store: RootStore, services: ServiceRepository, config: Config) => {