X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8c399e89842f59ca0b86abde42545423f035695d..e954cfb45dbe418c151144cc42847b848c9b0ebf:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 0fc72217..014627a9 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,30 +5,32 @@ 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 { MainPanel } from '~/views/main-panel/main-panel'; +import '~/index.css'; +import { Route, Switch } from 'react-router'; import createBrowserHistory from "history/createBrowserHistory"; 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 { initAuth } from "~/store/auth/auth-action"; +import { configActions } from "~/store/config/config-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 } 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 { collectionFilesNotSelectedActionSet } from '~/views-components/context-menu/action-sets/collection-files-not-selected-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 { Routes } from '~/routes/routes'; import { trashActionSet } from "~/views-components/context-menu/action-sets/trash-action-set"; import { ServiceRepository } from '~/services/services'; @@ -47,6 +49,24 @@ import { getBuildInfo } from '~/common/app-info'; import { DragDropContextProvider } from 'react-dnd'; import HTML5Backend from 'react-dnd-html5-backend'; import { initAdvanceFormProjectsTree } 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 { collectionAdminActionSet } from '~/views-components/context-menu/action-sets/collection-admin-action-set'; +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 { ACCOUNT_LINK_STATUS_KEY } from '~/services/link-account-service/link-account-service'; +import { cancelLinking } from '~/store/link-account-panel/link-account-panel-actions'; +import { matchTokenRoute } from '~/routes/routes'; console.log(`Starting arvados [${getBuildInfo()}]`); @@ -55,6 +75,7 @@ addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet); addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet); addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesNotSelectedActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); @@ -62,6 +83,19 @@ 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); fetchConfig() .then(({ config, apiHost }) => { @@ -77,13 +111,21 @@ fetchConfig() }); const store = configureStore(history, services); + // Cancel any link account ops in progess unless the user has + // just logged in or there has been a successful link operation + const data = sessionStorage.getItem(ACCOUNT_LINK_STATUS_KEY); + if (!matchTokenRoute(history.location.pathname) && data === null) { + store.dispatch(cancelLinking()); + } + store.subscribe(initListener(history, store, services, config)); - store.dispatch(initAuth()); + store.dispatch(initAuth(config)); store.dispatch(setBuildInfo()); store.dispatch(setCurrentTokenDialogApiHost(apiHost)); - store.dispatch(setUuidPrefix(config.uuidPrefix)); + store.dispatch(loadVocabulary); + store.dispatch(loadFileViewersConfig); - const TokenComponent = (props: any) => ; + const TokenComponent = (props: any) => ; const MainPanelComponent = (props: any) => ; const App = () => @@ -91,10 +133,10 @@ fetchConfig() -
+ -
+ @@ -121,7 +163,7 @@ const initListener = (history: History, store: RootStore, services: ServiceRepos }; }; -const createDirectoriesArrayCollectorWorkflow = ({workflowService}: ServiceRepository) => { +const createDirectoriesArrayCollectorWorkflow = ({ workflowService }: ServiceRepository) => { workflowService.create({ name: 'Directories array collector', description: 'Workflow for collecting directories array', @@ -129,7 +171,15 @@ const createDirectoriesArrayCollectorWorkflow = ({workflowService}: ServiceRepos }); }; -const createFilesArrayCollectorWorkflow = ({workflowService}: ServiceRepository) => { +const createPrimitiveArraysCollectorWorkflow = ({ workflowService }: ServiceRepository) => { + workflowService.create({ + name: 'String, Int and Float arrays collector', + description: 'Workflow for collecting primitive data arrays', + definition: "cwlVersion: v1.0\n$graph:\n- class: CommandLineTool\n\n requirements:\n - listing:\n - entryname: input_collector.log\n entry: |\n \"string array\":\n $(inputs.example_string_array)\n \"int array\":\n $(inputs.example_int_array)\n \"float array\":\n $(inputs.example_float_array)\n\n class: InitialWorkDirRequirement\n inputs:\n - type:\n type: array\n items: string\n id: '#input_collector.cwl/example_string_array'\n - type:\n type: array\n items: int\n id: '#input_collector.cwl/example_int_array'\n - type:\n type: array\n items: float\n id: '#input_collector.cwl/example_float_array'\n \n outputs:\n - type: File\n outputBinding:\n glob: '*'\n id: '#input_collector.cwl/output'\n\n baseCommand: [echo]\n id: '#input_collector.cwl'\n- class: Workflow\n doc: This is the description of the workflow\n inputs:\n - type:\n type: array\n items: string\n label: Freetext Array\n doc: This should allow for entering multiple strings.\n id: '#main/example_string_array'\n default:\n - This is the first string\n - This is the second string\n - type:\n type: array\n items: int\n label: Integer Array\n doc: This should allow for entering multiple integers.\n id: '#main/example_int_array'\n default:\n - 3\n - 6\n - type:\n type: array\n items: float\n label: Float Array\n doc: This should allow for entering multiple floats.\n id: '#main/example_float_array'\n default:\n - 3.33\n - 66.6\n\n outputs:\n - type: File\n outputSource: '#main/input_collector/output'\n\n id: '#main/log_file'\n steps:\n - run: '#input_collector.cwl'\n in:\n - source: '#main/example_string_array'\n id: '#main/input_collector/example_string_array'\n - source: '#main/example_int_array'\n id: '#main/input_collector/example_int_array'\n - source: '#main/example_float_array'\n id: '#main/input_collector/example_float_array'\n out: ['#main/input_collector/output']\n id: '#main/input_collector'\n id: '#main'\n", + }); +}; + +const createFilesArrayCollectorWorkflow = ({ workflowService }: ServiceRepository) => { workflowService.create({ name: 'Files array collector', description: 'Workflow for collecting files array', @@ -290,3 +340,4 @@ const createSampleProcess = ({ containerRequestService }: ServiceRepository) => }); }; +// force build comment #1