projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tests refs #19295
[arvados.git]
/
src
/
store
/
store.ts
diff --git
a/src/store/store.ts
b/src/store/store.ts
index 94f110a09563ab17537b44445b964f650fef2ce5..1501fd4fb5be80db4e03d9f832e59116ec95b6f9 100644
(file)
--- a/
src/store/store.ts
+++ b/
src/store/store.ts
@@
-26,7
+26,8
@@
import { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-pr
import { collectionPanelReducer } from './collection-panel/collection-panel-reducer';
import { dialogReducer } from './dialog/dialog-reducer';
import { ServiceRepository } from "services/services";
import { collectionPanelReducer } from './collection-panel/collection-panel-reducer';
import { dialogReducer } from './dialog/dialog-reducer';
import { ServiceRepository } from "services/services";
-import { treePickerReducer } from './tree-picker/tree-picker-reducer';
+import { treePickerReducer, treePickerSearchReducer } from './tree-picker/tree-picker-reducer';
+import { treePickerSearchMiddleware } from './tree-picker/tree-picker-middleware';
import { resourcesReducer } from 'store/resources/resources-reducer';
import { propertiesReducer } from './properties/properties-reducer';
import { fileUploaderReducer } from './file-uploader/file-uploader-reducer';
import { resourcesReducer } from 'store/resources/resources-reducer';
import { propertiesReducer } from './properties/properties-reducer';
import { fileUploaderReducer } from './file-uploader/file-uploader-reducer';
@@
-73,10
+74,13
@@
import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-pane
import { Config } from 'common/config';
import { pluginConfig } from 'plugins';
import { MiddlewareListReducer } from 'common/plugintypes';
import { Config } from 'common/config';
import { pluginConfig } from 'plugins';
import { MiddlewareListReducer } from 'common/plugintypes';
+import { tooltipsMiddleware } from './tooltips/tooltips-middleware';
+import { sidePanelReducer } from './side-panel/side-panel-reducer'
+import { bannerReducer } from './banner/banner-reducer';
declare global {
interface Window {
declare global {
interface Window {
- __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose;
+
__REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose;
}
}
}
}
@@
-157,6
+161,7
@@
export function configureStore(history: History, services: ServiceRepository, co
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
+ tooltipsMiddleware(services),
projectPanelMiddleware,
favoritePanelMiddleware,
allProcessessPanelMiddleware,
projectPanelMiddleware,
favoritePanelMiddleware,
allProcessessPanelMiddleware,
@@
-174,6
+179,7
@@
export function configureStore(history: History, services: ServiceRepository, co
publicFavoritesMiddleware,
collectionsContentAddress,
subprocessMiddleware,
publicFavoritesMiddleware,
collectionsContentAddress,
subprocessMiddleware,
+ treePickerSearchMiddleware
];
const reduceMiddlewaresFn: (a: Middleware[],
];
const reduceMiddlewaresFn: (a: Middleware[],
@@
-187,6
+193,7
@@
export function configureStore(history: History, services: ServiceRepository, co
const createRootReducer = (services: ServiceRepository) => combineReducers({
auth: authReducer(services),
const createRootReducer = (services: ServiceRepository) => combineReducers({
auth: authReducer(services),
+ banner: bannerReducer,
collectionPanel: collectionPanelReducer,
collectionPanelFiles: collectionPanelFilesReducer,
contextMenu: contextMenuReducer,
collectionPanel: collectionPanelReducer,
collectionPanelFiles: collectionPanelFilesReducer,
contextMenu: contextMenuReducer,
@@
-203,6
+210,7
@@
const createRootReducer = (services: ServiceRepository) => combineReducers({
router: routerReducer,
snackbar: snackbarReducer,
treePicker: treePickerReducer,
router: routerReducer,
snackbar: snackbarReducer,
treePicker: treePickerReducer,
+ treePickerSearch: treePickerSearchReducer,
fileUploader: fileUploaderReducer,
processPanel: processPanelReducer,
progressIndicator: progressIndicatorReducer,
fileUploader: fileUploaderReducer,
processPanel: processPanelReducer,
progressIndicator: progressIndicatorReducer,
@@
-212,5
+220,6
@@
const createRootReducer = (services: ServiceRepository) => combineReducers({
virtualMachines: virtualMachinesReducer,
repositories: repositoriesReducer,
keepServices: keepServicesReducer,
virtualMachines: virtualMachinesReducer,
repositories: repositoriesReducer,
keepServices: keepServicesReducer,
- linkAccountPanel: linkAccountPanelReducer
+ linkAccountPanel: linkAccountPanelReducer,
+ sidePanel: sidePanelReducer
});
});