mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-08 21:28:12 +08:00
remove obsolete URL middleware (#639)
This commit is contained in:
@@ -1,87 +0,0 @@
|
|||||||
// jshint esversion: 6
|
|
||||||
// import uri from "urijs";
|
|
||||||
|
|
||||||
/*
|
|
||||||
NOTE: file currently not used, but retained as we expect to reinstate features in this
|
|
||||||
area shortly.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
https://medium.com/@jacobp100/you-arent-using-redux-middleware-enough-94ffe991e6
|
|
||||||
storeInstance
|
|
||||||
=> functionToCallWithAnActionThatWillSendItToTheNextMiddleware
|
|
||||||
=> actionThatDispatchWasCalledWith
|
|
||||||
=> valueToUseAsTheReturnValueOfTheDispatchCall
|
|
||||||
*/
|
|
||||||
|
|
||||||
const updateURLMiddleware = (/* store */) => next => action => {
|
|
||||||
// const oldState = store.getState();
|
|
||||||
const nextAction = next(action);
|
|
||||||
|
|
||||||
if (action.type === "url changed") {
|
|
||||||
/* we don't handle pop state here - we handle it in the url reducer */
|
|
||||||
return nextAction;
|
|
||||||
}
|
|
||||||
|
|
||||||
// const state = store.getState();
|
|
||||||
|
|
||||||
/************************************************************************
|
|
||||||
*************************************************************************
|
|
||||||
1. Redux app state just changed. Clear URL, and then update it.
|
|
||||||
1a. We get the whole state tree to construct the url!
|
|
||||||
1b. But (see reducers/url.js) we try to centralize it because...
|
|
||||||
1c. ...the back button / initial load case ('url changed' return above)
|
|
||||||
means that we have to listen for 'url changed' and construct state
|
|
||||||
from the browser
|
|
||||||
*************************************************************************
|
|
||||||
************************************************************************/
|
|
||||||
|
|
||||||
// const oldURI = URI(window.location.href)
|
|
||||||
// const newURI = URI(oldURI).setQuery({})
|
|
||||||
|
|
||||||
// if (window.location.search === "") {
|
|
||||||
// newURL = uri.addQuery(category, value).toString(); /* #1 */
|
|
||||||
// } else if (uri.hasQuery(category, value) || uri.hasQuery(category, value, true)) { /* true param here means check arrays as well http://medialize.github.io/URI.js/docs.html#search-has */
|
|
||||||
// newURL = uri.removeQuery(category, value).toString(); /* #4 */
|
|
||||||
// } else {
|
|
||||||
// newURL = uri.addQuery(category, value).toString(); /* #2 & #3 are handled by URI */
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// window.history.pushState("", "", newURL)
|
|
||||||
|
|
||||||
//
|
|
||||||
// // Internal helper for working with URIs
|
|
||||||
// const oldURI = new URI(window.location.href);
|
|
||||||
// const newURI = new URI(oldURI).setQueryData({});
|
|
||||||
//
|
|
||||||
// newURI.setPath('/foo/bar');
|
|
||||||
//
|
|
||||||
// // Set the path based on state
|
|
||||||
// if (!state.isOnLandingPage && state.project.id) {
|
|
||||||
// newURI.setPath(newURI.getPath() + state.project.id + '/');
|
|
||||||
// newURI.addQueryData('baz', state.mode);
|
|
||||||
// newURI.addQueryData('bat', state.selection.activePageID);
|
|
||||||
// } else {
|
|
||||||
// newURI.setPath(newURI.getPath() + state.landingSection + '/');
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // Avoid URL thrashing by replacing state while loading instead of pushing
|
|
||||||
// const newPath = newURI.toString();
|
|
||||||
// const oldPath = oldURI.toString();
|
|
||||||
// if (newPath !== oldPath) {
|
|
||||||
// if (
|
|
||||||
// (oldState.mode === 'asdf' &&
|
|
||||||
// state.mode === 'asdf' &&
|
|
||||||
// !oldState.isOnLandingPage) ||
|
|
||||||
// oldState.isLoadingProject !== state.isLoadingProject
|
|
||||||
// ) {
|
|
||||||
// window.history.replaceState(null, null, newPath);
|
|
||||||
// } else {
|
|
||||||
// window.history.pushState(null, null, newPath);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
return nextAction;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default updateURLMiddleware;
|
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
import { combineReducers, createStore, applyMiddleware } from "redux";
|
import { combineReducers, createStore, applyMiddleware } from "redux";
|
||||||
import thunk from "redux-thunk";
|
import thunk from "redux-thunk";
|
||||||
import { composeWithDevTools } from "redux-devtools-extension";
|
import { composeWithDevTools } from "redux-devtools-extension";
|
||||||
import updateURLMiddleware from "../middleware/updateURLMiddleware";
|
|
||||||
import updateCellColors from "../middleware/updateCellColors";
|
import updateCellColors from "../middleware/updateCellColors";
|
||||||
|
|
||||||
import config from "./config";
|
import config from "./config";
|
||||||
@@ -19,9 +18,7 @@ const Reducer = combineReducers({
|
|||||||
|
|
||||||
const store = createStore(
|
const store = createStore(
|
||||||
Reducer,
|
Reducer,
|
||||||
composeWithDevTools(
|
composeWithDevTools(applyMiddleware(thunk, updateCellColors))
|
||||||
applyMiddleware(thunk, updateURLMiddleware, updateCellColors)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
export default store;
|
export default store;
|
||||||
|
|||||||
Reference in New Issue
Block a user