X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5385afcada8666051658c6889c83848702497759..95bba613751af0c9371e15dc8d2d1612079a6fe5:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 522d8dc1..03840d49 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,64 +2,68 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import * as ReactDOM from 'react-dom'; +import React from 'react'; +import ReactDOM from 'react-dom'; import { Provider } from "react-redux"; -import { MainPanel } from '~/views/main-panel/main-panel'; -import '~/index.css'; +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 { AddSession } from "~/views-components/add-session/add-session"; -import { initAuth, logout } 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 { filterGroupActionSet, 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 { CustomTheme } from 'common/custom-theme'; +import { fetchConfig } from 'common/config'; +import servicesProvider from 'common/service-provider'; +import { addMenuActionSet, ContextMenuKind } from 'views-components/context-menu/context-menu'; +import { rootProjectActionSet } from "views-components/context-menu/action-sets/root-project-action-set"; +import { filterGroupActionSet, 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 { collectionDirectoryItemActionSet, collectionFileItemActionSet, readOnlyCollectionDirectoryItemActionSet, readOnlyCollectionFileItemActionSet } 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 { 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 { setTokenDialogApiHost } from '~/store/token-dialog/token-dialog-actions'; -import { processResourceActionSet, readOnlyProcessResourceActionSet } 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 { setBuildInfo } from '~/store/app-info/app-info-actions'; -import { getBuildInfo } from '~/common/app-info'; +import { setTokenDialogApiHost } from 'store/token-dialog/token-dialog-actions'; +import { + processResourceActionSet, + processResourceAdminActionSet, + readOnlyProcessResourceActionSet +} 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 { 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 { filterGroupAdminActionSet, projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set'; -import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; +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 { 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 { filterGroupAdminActionSet, projectAdminActionSet } from 'views-components/context-menu/action-sets/project-admin-action-set'; +import { permissionEditActionSet } from 'views-components/context-menu/action-sets/permission-edit-action-set'; +import { workflowActionSet } from 'views-components/context-menu/action-sets/workflow-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'; @@ -74,13 +78,14 @@ 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_DIRECTORY_ITEM, collectionDirectoryItemActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_DIRECTORY_ITEM, readOnlyCollectionDirectoryItemActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILE_ITEM, collectionFileItemActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILE_ITEM, readOnlyCollectionFileItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); 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.READONLY_PROCESS_RESOURCE, readOnlyProcessResourceActionSet); addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); @@ -90,7 +95,6 @@ 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); @@ -98,17 +102,26 @@ addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet); addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet); addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet); addMenuActionSet(ContextMenuKind.FILTER_GROUP_ADMIN, filterGroupAdminActionSet); +addMenuActionSet(ContextMenuKind.PERMISSION_EDIT, permissionEditActionSet); +addMenuActionSet(ContextMenuKind.WORKFLOW, workflowActionSet); storeRedirects(); fetchConfig() .then(({ config, apiHost }) => { const history = createBrowserHistory(); + + // Provide browser's history access to Cypress to allow programmatic + // navigation. + if ((window as any).Cypress) { + (window as any).appHistory = history; + } + const services = createServices(config, { progressFn: (id, working) => { store.dispatch(progressIndicatorActions.TOGGLE_WORKING({ id, working })); }, - errorFn: (id, error, showSnackBar) => { + errorFn: (id, error, showSnackBar: boolean) => { if (showSnackBar) { console.error("Backend error:", error); @@ -122,12 +135,17 @@ fetchConfig() ? error.errors[0] : error.message}`, kind: SnackbarKind.ERROR, - hideDuration: 8000}) + hideDuration: 8000 + }) ); } } } }); + + // be sure this is initiated before the app starts + servicesProvider.setServices(services); + const store = configureStore(history, services, config); store.subscribe(initListener(history, store, services, config)); @@ -168,7 +186,7 @@ const initListener = (history: History, store: RootStore, services: ServiceRepos let initialized = false; return async () => { const { router, auth } = store.getState(); - if (router.location && auth.user && !initialized) { + if (router.location && auth.user && services.authService.getApiToken() && !initialized) { initialized = true; initWebSocket(config, services.authService, store); await store.dispatch(loadWorkbench());