X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/25216cc7acedc987c26a159f0b640210c0ef101e..5ec1472f3309b09bfcbba16148181d5d4a343f63:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 10fa1f5b..0b04c29e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,8 +2,8 @@ // // 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'; @@ -19,6 +19,7 @@ import { createServices } from "services/services"; import { MuiThemeProvider } from '@material-ui/core/styles'; 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"; @@ -51,7 +52,6 @@ import { keepServiceActionSet } from 'views-components/context-menu/action-sets/ 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'; @@ -59,6 +59,7 @@ import { linkActionSet } from 'views-components/context-menu/action-sets/link-ac 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 { permissionEditActionSet } from 'views-components/context-menu/action-sets/permission-edit-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'; @@ -92,7 +93,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); @@ -100,6 +100,7 @@ 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); storeRedirects(); @@ -138,6 +139,10 @@ fetchConfig() } } }); + + // 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));