X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d2cc407a7649ca7807b78369f2f08351202cc77..72ee613468c6dee53b98ed1469ce9781a942dbe9:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index ff9a495e80..7e69a72873 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -8,7 +8,7 @@ import thunkMiddleware from 'redux-thunk'; import { History } from "history"; import { authReducer } from "./auth/auth-reducer"; -import { configReducer } from "./config/config-reducer"; +import { authMiddleware } from "./auth/auth-middleware"; import { dataExplorerReducer } from './data-explorer/data-explorer-reducer'; import { detailsPanelReducer } from './details-panel/details-panel-reducer'; import { contextMenuReducer } from './context-menu/context-menu-reducer'; @@ -27,7 +27,6 @@ import { ServiceRepository } from "~/services/services"; import { treePickerReducer } from './tree-picker/tree-picker-reducer'; import { resourcesReducer } from '~/store/resources/resources-reducer'; import { propertiesReducer } from './properties/properties-reducer'; -import { RootState } from './store'; import { fileUploaderReducer } from './file-uploader/file-uploader-reducer'; import { TrashPanelMiddlewareService } from "~/store/trash-panel/trash-panel-middleware-service"; import { TRASH_PANEL_ID } from "~/store/trash-panel/trash-panel-action"; @@ -62,6 +61,7 @@ import { ApiClientAuthorizationMiddlewareService } from '~/store/api-client-auth import { PublicFavoritesMiddlewareService } from '~/store/public-favorites-panel/public-favorites-middleware-service'; import { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action'; import { publicFavoritesReducer } from '~/store/public-favorites/public-favorites-reducer'; +import { linkAccountPanelReducer } from './link-account-panel/link-account-panel-reducer'; import { CollectionsWithSameContentAddressMiddlewareService } from '~/store/collections-content-address-panel/collections-content-address-middleware-service'; import { COLLECTIONS_CONTENT_ADDRESS_PANEL_ID } from '~/store/collections-content-address-panel/collections-content-address-panel-actions'; import { ownerNameReducer } from '~/store/owner-name/owner-name-reducer'; @@ -125,6 +125,7 @@ export function configureStore(history: History, services: ServiceRepository): R const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), + authMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, trashPanelMiddleware, @@ -146,7 +147,6 @@ export function configureStore(history: History, services: ServiceRepository): R const createRootReducer = (services: ServiceRepository) => combineReducers({ auth: authReducer(services), - config: configReducer, collectionPanel: collectionPanelReducer, collectionPanelFiles: collectionPanelFilesReducer, contextMenu: contextMenuReducer, @@ -172,5 +172,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ searchBar: searchBarReducer, virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, - keepServices: keepServicesReducer + keepServices: keepServicesReducer, + linkAccountPanel: linkAccountPanelReducer });