Skip to content

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

Remove dead code from admin settings redux (#68976)

Fraserd818c6dd46da
diff --git a/frontend/src/metabase-types/store/admin.ts b/frontend/src/metabase-types/store/admin.ts
index e4f50dd9425..8249eafff16 100644
--- a/frontend/src/metabase-types/store/admin.ts
+++ b/frontend/src/metabase-types/store/admin.ts
@@ -2,7 +2,6 @@ import type {
CollectionPermissions,
DatabaseId,
GroupsPermissions,
- SettingDefinition,
} from "metabase-types/api";
export type AdminPathKey =
@@ -42,9 +41,6 @@ export interface AdminState {
hasChanged: boolean;
};
};
- settings: {
- settings: SettingDefinition[];
- };
databases: {
deletionError: null | unknown;
deletes: DatabaseId[];
diff --git a/frontend/src/metabase-types/store/mocks/admin.ts b/frontend/src/metabase-types/store/mocks/admin.ts
index f216a437c57..60990281685 100644
--- a/frontend/src/metabase-types/store/mocks/admin.ts
+++ b/frontend/src/metabase-types/store/mocks/admin.ts
@@ -5,7 +5,6 @@ export const createMockAdminState = (
): AdminState => ({
app: createMockAdminAppState(),
permissions: createMockPermissionsState(),
- settings: { settings: [] },
databases: {
deletionError: null,
deletes: [],
diff --git a/frontend/src/metabase/admin/admin.js b/frontend/src/metabase/admin/admin.js
index 1fce0b0774e..c6a14b8b196 100644
--- a/frontend/src/metabase/admin/admin.js
+++ b/frontend/src/metabase/admin/admin.js
@@ -5,7 +5,6 @@ import { databasesReducer as databases } from "metabase/admin/databases/database
import { datamodel } from "metabase/admin/datamodel/datamodel";
import { people } from "metabase/admin/people/people";
import { permissions } from "metabase/admin/permissions/permissions";
-import { settings } from "metabase/admin/settings/settings";
import { combineReducers } from "metabase/lib/redux";
export const admin = combineReducers({
@@ -14,5 +13,4 @@ export const admin = combineReducers({
datamodel,
people,
permissions,
- settings,
});
diff --git a/frontend/src/metabase/admin/settings/settings.js b/frontend/src/metabase/admin/settings/settings.js
index 476b3452f67..3bfd321015e 100644
--- a/frontend/src/metabase/admin/settings/settings.js
+++ b/frontend/src/metabase/admin/settings/settings.js
@@ -1,38 +1,18 @@
-import {
- combineReducers,
- createAction,
- createThunkAction,
- handleActions,
-} from "metabase/lib/redux";
+import { createThunkAction } from "metabase/lib/redux";
import { refreshSiteSettings } from "metabase/redux/settings";
import { SettingsApi } from "metabase/services";
// ACTION TYPES AND ACTION CREATORS
-export const reloadSettings = () => async (dispatch, getState) => {
- return await Promise.all([
- dispatch(refreshSettingsList()),
- dispatch(refreshSiteSettings()),
- ]);
+export const reloadSettings = () => async (dispatch) => {
+ await dispatch(refreshSiteSettings());
};
-const REFRESH_SETTINGS_LIST = "metabase/admin/settings/REFRESH_SETTINGS_LIST";
-export const refreshSettingsList = createAction(
- REFRESH_SETTINGS_LIST,
- async () => {
- const settingsList = await SettingsApi.list();
- return settingsList.map((setting) => ({
- ...setting,
- originalValue: setting.value,
- }));
- },
-);
-
export const INITIALIZE_SETTINGS =
"metabase/admin/settings/INITIALIZE_SETTINGS";
export const initializeSettings = createThunkAction(
INITIALIZE_SETTINGS,
- () => async (dispatch, getState) => {
+ () => async (dispatch) => {
try {
await dispatch(reloadSettings());
} catch (error) {
@@ -63,7 +43,7 @@ export const UPDATE_SETTINGS = "metabase/admin/settings/UPDATE_SETTINGS";
export const updateSettings = createThunkAction(
UPDATE_SETTINGS,
function (settings) {
- return async function (dispatch, getState) {
+ return async function (dispatch) {
try {
await SettingsApi.putAll(settings);
} catch (error) {
@@ -75,15 +55,3 @@ export const updateSettings = createThunkAction(
};
},
);
-
-// REDUCERS
-const settingsReducer = handleActions(
- {
- [REFRESH_SETTINGS_LIST]: { next: (state, { payload }) => payload },
- },
- [],
-);
-
-export const settings = combineReducers({
- settingsReducer,
-});