X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eeb82d50816250cc6287928e6d958affa73880ee..823ac8656c70068c6cd59bb96ec8b6d6201076d9:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 17329681..6d53e0d4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,62 +5,54 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { Provider } from "react-redux"; -import Workbench from './views/workbench/workbench'; -import ProjectList from './components/project-list/project-list'; +import { Workbench } from './views/workbench/workbench'; import './index.css'; import { Route } from "react-router"; import createBrowserHistory from "history/createBrowserHistory"; -import configureStore from "./store/store"; +import { configureStore } from "./store/store"; import { ConnectedRouter } from "react-router-redux"; -import ApiToken from "./components/api-token/api-token"; -import authActions from "./store/auth/auth-action"; -import { projectService } from "./services/services"; -import { TreeItem } from "./components/tree/tree"; -import { Project } from "./models/project"; +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 { 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"; -function buildProjectTree(tree: any[], level = 0): Array> { - const projects = tree.map((t, idx) => ({ - id: `l${level}i${idx}${t[0]}`, - open: false, - active: false, - data: { - name: t[0], - icon: level === 0 ? : , - createdAt: '2018-05-05', - }, - items: t.length > 1 ? buildProjectTree(t[1], level + 1) : [] - })); - return projects; -} -const history = createBrowserHistory(); -const projects = buildProjectTree(sampleProjects); +addMenuActionSet(ContextMenuKind.RootProject, rootProjectActionSet); +addMenuActionSet(ContextMenuKind.Project, projectActionSet); -const store = configureStore({ - projects: [ - ], - router: { - location: null - }, - auth: { - user: undefined - } -}, history); +fetchConfig() + .then(config => { -store.dispatch(authActions.INIT()); -store.dispatch(projectService.getProjectList()); + setBaseUrl(config.API_HOST); + const history = createBrowserHistory(); + const store = configureStore(history); + + store.dispatch(authActions.INIT()); + store.dispatch(getProjectList(authService.getUuid())); + + const App = () => + + + +
+ + +
+
+
+
; + + ReactDOM.render( + , + document.getElementById('root') as HTMLElement + ); + }); -const App = () => - - -
- - -
-
-
; -ReactDOM.render( - , - document.getElementById('root') as HTMLElement -);