Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

deps: Remove redux-promise and reduce-reducers (#64945)

Fraser1c649fb56fb5
diff --git a/e2e/embedding-sdk-host-apps/angular-20-host-app/package-lock.json b/e2e/embedding-sdk-host-apps/angular-20-host-app/package-lock.json
index 684f98c26ff..a5959948438 100644
--- a/e2e/embedding-sdk-host-apps/angular-20-host-app/package-lock.json
+++ b/e2e/embedding-sdk-host-apps/angular-20-host-app/package-lock.json
@@ -122,10 +122,8 @@
"react-transition-group": "^4.4.5",
"react-use": "^17.5.1",
"react-virtualized": "9.22.5",
- "reduce-reducers": "^1.0.4",
"redux-actions": "^2.0.1",
"redux-auth-wrapper": "^2.1.0",
- "redux-promise": "^0.6.0",
"redux-undo": "^1.1.0",
"rehype-external-links": "^2.0.1",
"remark-gfm": "1.0.0",
diff --git a/frontend/src/metabase/dashboard/reducers.js b/frontend/src/metabase/dashboard/reducers.js
index b5c567a119b..67079e2c22f 100644
--- a/frontend/src/metabase/dashboard/reducers.js
+++ b/frontend/src/metabase/dashboard/reducers.js
@@ -1,5 +1,4 @@
import { assoc, assocIn, chain, dissoc, merge, updateIn } from "icepick";
-import reduceReducers from "reduce-reducers";
import _ from "underscore";
import Actions from "metabase/entities/actions";
@@ -197,27 +196,26 @@ const draftParameterValues = handleActions(
{},
);
-export const dashboardReducers = reduceReducers(
- INITIAL_DASHBOARD_STATE,
- combineReducers({
- dashboardId,
- missingActionParameters,
- autoApplyFilters,
- slowCards,
- isNavigatingBackToDashboard,
- isAddParameterPopoverOpen,
- editingDashboard,
- loadingControls,
- sidebar,
- parameterValues,
- dashboards,
- loadingDashCards,
- dashcards,
- dashcardData,
- draftParameterValues,
- // Combined reducer needs to init state for every slice
- selectedTabId: (state = INITIAL_DASHBOARD_STATE.selectedTabId) => state,
- tabDeletions: (state = INITIAL_DASHBOARD_STATE.tabDeletions) => state,
- }),
- tabsReducer,
-);
+const combinedDashboardReducer = combineReducers({
+ dashboardId,
+ missingActionParameters,
+ autoApplyFilters,
+ slowCards,
+ isNavigatingBackToDashboard,
+ isAddParameterPopoverOpen,
+ editingDashboard,
+ loadingControls,
+ sidebar,
+ parameterValues,
+ dashboards,
+ loadingDashCards,
+ dashcards,
+ dashcardData,
+ draftParameterValues,
+ // Combined reducer needs to init state for every slice
+ selectedTabId: (state = INITIAL_DASHBOARD_STATE.selectedTabId) => state,
+ tabDeletions: (state = INITIAL_DASHBOARD_STATE.tabDeletions) => state,
+});
+
+export const dashboardReducers = (state = INITIAL_DASHBOARD_STATE, action) =>
+ tabsReducer(combinedDashboardReducer(state, action), action);
diff --git a/frontend/src/metabase/entities/actions/actions.ts b/frontend/src/metabase/entities/actions/actions.ts
index eed11a83cef..161123fad19 100644
--- a/frontend/src/metabase/entities/actions/actions.ts
+++ b/frontend/src/metabase/entities/actions/actions.ts
@@ -65,7 +65,7 @@ const defaultImplicitActionCreateOptions = {
};
const enableImplicitActionsForModel =
- async (modelId: number, options = defaultImplicitActionCreateOptions) =>
+ (modelId: number, options = defaultImplicitActionCreateOptions) =>
async (dispatch: Dispatch) => {
// We're ordering actions that's most recently created first.
// So if we want to show Create, Update, Delete, then we need
diff --git a/frontend/src/metabase/entities/groups.js b/frontend/src/metabase/entities/groups.js
index d9011e7b7f2..82eea67a075 100644
--- a/frontend/src/metabase/entities/groups.js
+++ b/frontend/src/metabase/entities/groups.js
@@ -57,7 +57,7 @@ const Groups = createEntity({
actions: {
clearMember:
- async ({ id }) =>
+ ({ id }) =>
async (dispatch) => {
await dispatch(
entityCompatibleQuery(
diff --git a/frontend/src/metabase/lib/entities.unit.spec.js b/frontend/src/metabase/lib/entities.unit.spec.js
index 8078ffa9008..9228b115844 100644
--- a/frontend/src/metabase/lib/entities.unit.spec.js
+++ b/frontend/src/metabase/lib/entities.unit.spec.js
@@ -1,5 +1,4 @@
import { combineReducers, configureStore } from "@reduxjs/toolkit";
-import promise from "redux-promise";
import { combineEntities, createEntity } from "metabase/lib/entities";
import requestsReducer from "metabase/redux/requests";
@@ -41,7 +40,7 @@ function setup() {
getDefaultMiddleware({
immutableCheck: false,
serializableCheck: false,
- }).concat([promise]),
+ }),
});
return { widgets, store, initialState };
diff --git a/frontend/src/metabase/store.js b/frontend/src/metabase/store.js
index c419e2c3e35..377a3990ccc 100644
--- a/frontend/src/metabase/store.js
+++ b/frontend/src/metabase/store.js
@@ -1,6 +1,5 @@
import { combineReducers, configureStore } from "@reduxjs/toolkit";
import { routerMiddleware, routerReducer as routing } from "react-router-redux";
-import promise from "redux-promise";
import { Api } from "metabase/api";
import { PLUGIN_REDUX_MIDDLEWARES } from "metabase/plugins";
@@ -20,7 +19,6 @@ export function getStore(reducers, history, initialState) {
immutableCheck: false,
serializableCheck: false,
}).concat([
- promise,
Api.middleware,
...(history ? [routerMiddleware(history)] : []),
...PLUGIN_REDUX_MIDDLEWARES,
diff --git a/frontend/test/__support__/entities-store.js b/frontend/test/__support__/entities-store.js
index 9ce829abf64..96417d21580 100644
--- a/frontend/test/__support__/entities-store.js
+++ b/frontend/test/__support__/entities-store.js
@@ -1,5 +1,4 @@
import { combineReducers, configureStore } from "@reduxjs/toolkit";
-import promise from "redux-promise";
import * as entities from "metabase/redux/entities";
import requestsReducer from "metabase/redux/requests";
@@ -19,6 +18,6 @@ export function getStore(reducers = {}, initialState = {}, middleware = []) {
getDefaultMiddleware({
immutableCheck: false,
serializableCheck: false,
- }).concat([promise, ...middleware]),
+ }).concat(middleware),
});
}
diff --git a/package.json b/package.json
index 604503df687..f7ce0972ca9 100644
--- a/package.json
+++ b/package.json
@@ -126,10 +126,8 @@
"react-transition-group": "^4.4.5",
"react-use": "^17.5.1",
"react-virtualized": "9.22.6",
- "reduce-reducers": "^1.0.4",
"redux-actions": "^2.0.1",
"redux-auth-wrapper": "^2.1.0",
- "redux-promise": "^0.6.0",
"redux-undo": "^1.1.0",
"rehype-external-links": "^2.0.1",
"remark-gfm": "1.0.0",
@@ -239,7 +237,6 @@
"@types/react-transition-group": "^4.4.5",
"@types/react-virtualized": "^9.22.2",
"@types/redux-actions": "^2.6.5",
- "@types/redux-promise": "^0.5.32",
"@types/tether": "^1.4.6",
"@types/underscore": "^1.11.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
diff --git a/yarn.lock b/yarn.lock
index 3a19fe42d15..cdb7c6e178b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5712,13 +5712,6 @@
"@types/react" "*"
redux "^3.7.2"
-"@types/redux-promise@^0.5.32":
- version "0.5.32"
- resolved "https://registry.yarnpkg.com/@types/redux-promise/-/redux-promise-0.5.32.tgz#c1d136deac84cee6a3a8f0850a8691ad7c56bf11"
- integrity sha512-ks2zqxOVumCPCPjxMNmOM8I5J1Gzs0oYhmlpjbIySuDKxgjSlOUANIy8cZq/sxl6dnShoGoIWLXcHVkUbVuKkg==
- dependencies:
- redux "^3.6.0"
-
"@types/resolve@^1.20.2":
version "1.20.6"
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.6.tgz#e6e60dad29c2c8c206c026e6dd8d6d1bdda850b8"
@@ -11495,14 +11488,6 @@ flatted@^3.3.3:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
-flux-standard-action@^2.0.3:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/flux-standard-action/-/flux-standard-action-2.1.2.tgz#76141a9b8660585b773db32bab8aa9cc49b22da2"
- integrity sha512-7vdgawlphCjzaMLdpZv8hlGC/FJCXu6sqE3Wuqe3HLZ22KcDiO4IFplxLDePDhEt6hgCrugt45RoUObuzZP6Kg==
- dependencies:
- lodash.isplainobject "^4.0.6"
- lodash.isstring "^4.0.1"
-
follow-redirects@^1.0.0, follow-redirects@^1.15.5:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
@@ -13283,11 +13268,6 @@ is-potential-custom-element-name@^1.0.1:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-promise@^2.1.0:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
- integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
is-property@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -14620,11 +14600,6 @@ lodash.isobject@^3.0.2:
resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
integrity sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==
-lodash.isplainobject@^4.0.6:
- version "4.0.6"
- resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
- integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
lodash.isstring@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
@@ -18442,11 +18417,6 @@ reduce-reducers@^0.4.3:
resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw==
-reduce-reducers@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-1.0.4.tgz#fb77e751a9eb0201760ac5a605ca8c9c2d0537f8"
- integrity sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw==
-
redux-actions@^2.0.1:
version "2.6.5"
resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e"
@@ -18469,14 +18439,6 @@ redux-auth-wrapper@^2.1.0:
prop-types "^15.5.0"
query-string "^5.1.1"
-redux-promise@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/redux-promise/-/redux-promise-0.6.0.tgz#c64723b5213bb5603c11b74302883b682e06b319"
- integrity sha512-R2mGxJbPFgXyCNbFDE6LjTZhCEuACF54g1bxld3nqBhnRMX0OsUyWk77moF7UMGkUdl5WOAwc4BC5jOd1dunqQ==
- dependencies:
- flux-standard-action "^2.0.3"
- is-promise "^2.1.0"
-
redux-thunk@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-3.1.0.tgz#94aa6e04977c30e14e892eae84978c1af6058ff3"