X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cf035c0589f045849ba635a82b6857fdd6f618ed..5e11adf6c0acffbd9e78f6a0a1fe39bcecf75047:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index ae16dce3..fcc02f1e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,66 +5,76 @@ 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, Router } from "react-router"; +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 { TreeItem } from "./components/tree/tree"; -import { Project } from "./models/project"; +import { ApiToken } from "./views-components/api-token/api-token"; +import { initAuth } from "./store/auth/auth-action"; +import { createServices } 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 { 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 { initPickerProjectTree } from './views-components/project-tree-picker/project-tree-picker'; -const sampleProjects = [ - [ - 'Project 1', [ - ['Project 1.1', [['Project 1.1.1'], ['Project 1.1.2']]], - ['Project 1.2', [['Project 1.2.1'], ['Project 1.2.2'], ['Project 1.2.3']]] - ] - ], - [ - 'Project 2' - ], - [ - 'Project 3', [['Project 3.1'], ['Project 3.2']] - ] -]; +const getBuildNumber = () => "BN-" + (process.env.BUILD_NUMBER || "dev"); +const getGitCommit = () => "GIT-" + (process.env.GIT_COMMIT || "latest").substr(0, 7); +const getBuildInfo = () => getBuildNumber() + " / " + getGitCommit(); +const buildInfo = getBuildInfo(); -function buildProjectTree(tree: any[], level = 0): Array> { - const projects = tree.map((t, idx) => ({ - id: `l${level}i${idx}`, - open: false, - data: { - name: t[0], - createdAt: '2018-05-05', - }, - items: t.length > 1 ? buildProjectTree(t[1], level + 1) : [] - })); - return projects; -} +console.log(`Starting arvados [${buildInfo}]`); +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); -const history = createBrowserHistory(); -const projects = buildProjectTree(sampleProjects); +fetchConfig() + .then(config => { + const history = createBrowserHistory(); + const services = createServices(config); + const store = configureStore(history, services); -const store = configureStore({ - projects, - router: { - location: null - } -}, history); + store.dispatch(initAuth()); + store.dispatch(getProjectList(services.authService.getUuid())); + store.dispatch(initPickerProjectTree()); + + const TokenComponent = (props: any) => ; + const WorkbenchComponent = (props: any) => ; + + const App = () => + + + +
+ + +
+
+
+
; + + ReactDOM.render( + , + document.getElementById('root') as HTMLElement + ); + }); -const App = () => - - -
- -
-
-
; -ReactDOM.render( - , - document.getElementById('root') as HTMLElement -);