X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b6958027ba915d64ab7d6e6c2ee4cae765324294..ba4e011fc9132aa17cc6c4e8e74a6310a308291e:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 542ce6cd8d..b32066a46c 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,63 +5,98 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { Provider } from "react-redux"; -import { MainPanel } from './views/main-panel/main-panel'; -import './index.css'; -import { Route } from 'react-router'; -import createBrowserHistory from "history/createBrowserHistory"; +import { MainPanel } from '~/views/main-panel/main-panel'; +import '~/index.css'; +import { Route, Switch } from 'react-router'; +import { createBrowserHistory } from "history"; import { History } from "history"; -import { configureStore, RootStore } from './store/store'; +import { configureStore, RootStore } from '~/store/store'; import { ConnectedRouter } from "react-router-redux"; -import { ApiToken } from "./views-components/api-token/api-token"; -import { initAuth } from "./store/auth/auth-action"; -import { createServices } from "./services/services"; +import { ApiToken } from "~/views-components/api-token/api-token"; +import { AddSession } from "~/views-components/add-session/add-session"; +import { initAuth, logout } 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 { 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 { loadWorkbench } from './store/workbench/workbench-actions'; +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, readOnlyProjectActionSet } 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, readOnlyCollectionFilesActionSet } from '~/views-components/context-menu/action-sets/collection-files-action-set'; +import { collectionFilesItemActionSet, readOnlyCollectionFilesItemActionSet } from '~/views-components/context-menu/action-sets/collection-files-item-action-set'; +import { collectionFilesNotSelectedActionSet } from '~/views-components/context-menu/action-sets/collection-files-not-selected-action-set'; +import { collectionActionSet, collectionAdminActionSet, oldCollectionVersionActionSet, readOnlyCollectionActionSet } from '~/views-components/context-menu/action-sets/collection-action-set'; +import { processActionSet } from '~/views-components/context-menu/action-sets/process-action-set'; +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'; import { addRouteChangeHandlers } from './routes/route-change-handlers'; -import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions'; +import { setTokenDialogApiHost } from '~/store/token-dialog/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'; -import { ContainerRequestState } from '~/models/container-request'; -import { MountKind } from './models/mount-types'; +import { setBuildInfo } from '~/store/app-info/app-info-actions'; +import { getBuildInfo } from '~/common/app-info'; +import { DragDropContextProvider } from 'react-dnd'; +import HTML5Backend from 'react-dnd-html5-backend'; +import { initAdvancedFormProjectsTree } from '~/store/search-bar/search-bar-actions'; +import { repositoryActionSet } from '~/views-components/context-menu/action-sets/repository-action-set'; +import { sshKeyActionSet } from '~/views-components/context-menu/action-sets/ssh-key-action-set'; +import { keepServiceActionSet } from '~/views-components/context-menu/action-sets/keep-service-action-set'; +import { loadVocabulary } from '~/store/vocabulary/vocabulary-actions'; +import { virtualMachineActionSet } from '~/views-components/context-menu/action-sets/virtual-machine-action-set'; +import { userActionSet } from '~/views-components/context-menu/action-sets/user-action-set'; +import { computeNodeActionSet } from '~/views-components/context-menu/action-sets/compute-node-action-set'; +import { apiClientAuthorizationActionSet } from '~/views-components/context-menu/action-sets/api-client-authorization-action-set'; +import { groupActionSet } from '~/views-components/context-menu/action-sets/group-action-set'; +import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set'; +import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set'; +import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions'; +import { processResourceAdminActionSet } from '~/views-components/context-menu/action-sets/process-resource-admin-action-set'; +import { projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set'; +import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; +import { openNotFoundDialog } from './store/not-found-panel/not-found-panel-action'; +import { storeRedirects } from './common/redirect-to'; -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(); - -const buildInfo = getBuildInfo(); - -console.log(`Starting arvados [${buildInfo}]`); +console.log(`Starting arvados [${getBuildInfo()}]`); addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet); addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet); +addMenuActionSet(ContextMenuKind.READONLY_PROJECT, readOnlyProjectActionSet); addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet); addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES, readOnlyCollectionFilesActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesNotSelectedActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES_ITEM, readOnlyCollectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); -addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION, readOnlyCollectionActionSet); +addMenuActionSet(ContextMenuKind.OLD_VERSION_COLLECTION, oldCollectionVersionActionSet); addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); addMenuActionSet(ContextMenuKind.PROCESS_RESOURCE, processResourceActionSet); addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); +addMenuActionSet(ContextMenuKind.REPOSITORY, repositoryActionSet); +addMenuActionSet(ContextMenuKind.SSH_KEY, sshKeyActionSet); +addMenuActionSet(ContextMenuKind.VIRTUAL_MACHINE, virtualMachineActionSet); +addMenuActionSet(ContextMenuKind.KEEP_SERVICE, keepServiceActionSet); +addMenuActionSet(ContextMenuKind.USER, userActionSet); +addMenuActionSet(ContextMenuKind.LINK, linkActionSet); +addMenuActionSet(ContextMenuKind.NODE, computeNodeActionSet); +addMenuActionSet(ContextMenuKind.API_CLIENT_AUTHORIZATION, apiClientAuthorizationActionSet); +addMenuActionSet(ContextMenuKind.GROUPS, groupActionSet); +addMenuActionSet(ContextMenuKind.GROUP_MEMBER, groupMemberActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet); +addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet); +addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet); + +storeRedirects(); fetchConfig() .then(({ config, apiHost }) => { @@ -70,30 +105,54 @@ fetchConfig() 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 })); + errorFn: (id, error, showSnackBar) => { + if (showSnackBar) { + console.error("Backend error:", error); + + if (error.status === 404) { + store.dispatch(openNotFoundDialog()); + } else if (error.status === 401 && error.errors[0].indexOf("Not logged in") > -1) { + store.dispatch(logout()); + } else { + store.dispatch(snackbarActions.OPEN_SNACKBAR({ + message: `${error.errors + ? error.errors[0] + : error.message}`, + kind: SnackbarKind.ERROR, + hideDuration: 8000}) + ); + } + } } }); - const store = configureStore(history, services); + const store = configureStore(history, services, config); store.subscribe(initListener(history, store, services, config)); - store.dispatch(initAuth()); - store.dispatch(setCurrentTokenDialogApiHost(apiHost)); + store.dispatch(initAuth(config)); + store.dispatch(setBuildInfo()); + store.dispatch(setTokenDialogApiHost(apiHost)); + store.dispatch(loadVocabulary); + store.dispatch(loadFileViewersConfig); - const TokenComponent = (props: any) => ; - const MainPanelComponent = (props: any) => ; + const TokenComponent = (props: any) => ; + const AddSessionComponent = (props: any) => ; + const FedTokenComponent = (props: any) => ; + const MainPanelComponent = (props: any) => ; const App = () => - - -
- - -
- - + + + + + + + + + + + + ; ReactDOM.render( @@ -111,130 +170,8 @@ const initListener = (history: History, store: RootStore, services: ServiceRepos initWebSocket(config, services.authService, store); await store.dispatch(loadWorkbench()); addRouteChangeHandlers(history, store); - // createSampleProcess(services); + // ToDo: move to searchBar component + store.dispatch(initAdvancedFormProjectsTree()); } }; }; - - -const createSampleProcess = ({ containerRequestService }: ServiceRepository) => { - containerRequestService.create({ - ownerUuid: 'c97qk-j7d0g-s3ngc1z0748hsmf', - name: 'Simple process 7', - state: ContainerRequestState.COMMITTED, - mounts: { - '/var/spool/cwl': { - kind: MountKind.COLLECTION, - writable: true, - }, - 'stdout': { - kind: MountKind.MOUNTED_FILE, - path: '/var/spool/cwl/cwl.output.json' - }, - '/var/lib/cwl/workflow.json': { - kind: MountKind.JSON, - content: { - "cwlVersion": "v1.0", - "$graph": [ - { - "class": "CommandLineTool", - "requirements": [ - { - "listing": [ - { - "entryname": "input_collector.log", - "entry": "$(inputs.single_file.basename)\n" - } - ], - "class": "InitialWorkDirRequirement" - } - ], - "inputs": [ - { - "type": "File", - "id": "#input_collector.cwl/single_file" - } - ], - "outputs": [ - { - "type": "File", - "outputBinding": { - "glob": "*" - }, - "id": "#input_collector.cwl/output" - } - ], - "baseCommand": [ - "echo" - ], - "id": "#input_collector.cwl" - }, - { - "class": "Workflow", - "doc": "This is the description of the workflow", - "inputs": [ - { - "type": "File", - "label": "Single File", - "doc": "This should allow for single File selection only.", - "id": "#main/single_file" - } - ], - "outputs": [ - { - "type": "File", - "outputSource": "#main/input_collector/output", - "id": "#main/log_file" - } - ], - "steps": [ - { - "run": "#input_collector.cwl", - "in": [ - { - "source": "#main/single_file", - "id": "#main/input_collector/single_file" - } - ], - "out": [ - "#main/input_collector/output" - ], - "id": "#main/input_collector" - } - ], - "id": "#main" - } - ] - }, - }, - '/var/lib/cwl/cwl.input.json': { - kind: MountKind.JSON, - content: { - "single_file": { - "class": "File", - "location": "keep:233454526794c0a2d56a305baeff3d30+145/1.txt", - "basename": "fileA" - } - }, - } - }, - runtimeConstraints: { - API: true, - vcpus: 1, - ram: 1073741824, - }, - containerImage: 'arvados/jobs:1.1.4.20180618144723', - cwd: '/var/spool/cwl', - command: [ - 'arvados-cwl-runner', - '--local', - '--api=containers', - "--project-uuid=c97qk-j7d0g-s3ngc1z0748hsmf", - '/var/lib/cwl/workflow.json#main', - '/var/lib/cwl/cwl.input.json' - ], - outputPath: '/var/spool/cwl', - priority: 1, - }); -}; -