Skip to content

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

Import only the metadata actions the reference module uses (#79869)

Romeo Van Snickc9c8b101cdc9
diff --git a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx b/frontend/src/metabase/reference/databases/DatabaseDetail.tsx
index cca70342cde..5c3301c5ed5 100644
--- a/frontend/src/metabase/reference/databases/DatabaseDetail.tsx
+++ b/frontend/src/metabase/reference/databases/DatabaseDetail.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateDatabase } from "metabase/redux/metadata";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";
@@ -48,7 +48,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateDatabase,
...actions,
onSubmit: actions.rUpdateDatabaseDetail,
};
diff --git a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.tsx b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.tsx
index 59871a6be8f..025dcfeec2d 100644
--- a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.tsx
+++ b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.tsx
@@ -4,7 +4,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchDatabaseMetadata } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import DatabaseDetail from "metabase/reference/databases/DatabaseDetail";
import * as actions from "metabase/reference/reference";
@@ -21,7 +21,7 @@ import {
import DatabaseSidebar from "./DatabaseSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchDatabaseMetadata,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/DatabaseList.tsx b/frontend/src/metabase/reference/databases/DatabaseList.tsx
index df9ea5fc57e..6ae242fe5bf 100644
--- a/frontend/src/metabase/reference/databases/DatabaseList.tsx
+++ b/frontend/src/metabase/reference/databases/DatabaseList.tsx
@@ -6,7 +6,6 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { NoDatabasesEmptyState } from "metabase/common/components/NoDatabasesEmptyState";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import { List } from "metabase/reference/components/List";
import S from "metabase/reference/components/List/List.module.css";
import { ListItem } from "metabase/reference/components/ListItem";
@@ -29,10 +28,6 @@ const mapStateToProps = (state: StateWithReference) => ({
loadingError: getError(state),
});
-const mapDispatchToProps = {
- ...metadataActions,
-};
-
class DatabaseList extends Component<DatabaseListProps> {
render() {
const { entities, loadingError, loading } = this.props;
@@ -84,4 +79,4 @@ class DatabaseList extends Component<DatabaseListProps> {
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default connect(mapStateToProps, mapDispatchToProps)(DatabaseList);
+export default connect(mapStateToProps)(DatabaseList);
diff --git a/frontend/src/metabase/reference/databases/DatabaseListContainer.tsx b/frontend/src/metabase/reference/databases/DatabaseListContainer.tsx
index 437bd24fe56..a08031b6465 100644
--- a/frontend/src/metabase/reference/databases/DatabaseListContainer.tsx
+++ b/frontend/src/metabase/reference/databases/DatabaseListContainer.tsx
@@ -4,7 +4,7 @@ import { useMount, usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchRealDatabases } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import DatabaseList from "metabase/reference/databases/DatabaseList";
import BaseSidebar from "metabase/reference/guide/BaseSidebar";
@@ -14,7 +14,7 @@ import { useLocation } from "metabase/router";
import type { ClearStateProps, FetchProps } from "../reference";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchRealDatabases,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/FieldDetail.tsx b/frontend/src/metabase/reference/databases/FieldDetail.tsx
index 5cb0a563195..4b3acf4fe5b 100644
--- a/frontend/src/metabase/reference/databases/FieldDetail.tsx
+++ b/frontend/src/metabase/reference/databases/FieldDetail.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateField } from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -109,7 +109,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateField,
...actions,
onSubmit: actions.rUpdateFieldDetail,
};
diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
index 989e4629d36..a4a5f239029 100644
--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.tsx
@@ -4,7 +4,6 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import FieldDetail from "metabase/reference/databases/FieldDetail";
@@ -25,7 +24,6 @@ import {
import FieldSidebar from "./FieldSidebar";
const mapDispatchToProps = {
- ...metadataActions,
fetchTableMetadataAndForeignKeys,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/FieldList.tsx b/frontend/src/metabase/reference/databases/FieldList.tsx
index de1abd1eb44..8a980e88db3 100644
--- a/frontend/src/metabase/reference/databases/FieldList.tsx
+++ b/frontend/src/metabase/reference/databases/FieldList.tsx
@@ -6,7 +6,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateField } from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
import { EditHeader } from "metabase/reference/components/EditHeader";
import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";
@@ -58,7 +58,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateField,
...actions,
onSubmit: actions.rUpdateFields,
};
diff --git a/frontend/src/metabase/reference/databases/FieldListContainer.tsx b/frontend/src/metabase/reference/databases/FieldListContainer.tsx
index f6976063e97..7d96c92ee10 100644
--- a/frontend/src/metabase/reference/databases/FieldListContainer.tsx
+++ b/frontend/src/metabase/reference/databases/FieldListContainer.tsx
@@ -4,7 +4,6 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import FieldList from "metabase/reference/databases/FieldList";
@@ -23,7 +22,6 @@ import {
import TableSidebar from "./TableSidebar";
const mapDispatchToProps = {
- ...metadataActions,
fetchTableMetadataAndForeignKeys,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/TableDetail.tsx b/frontend/src/metabase/reference/databases/TableDetail.tsx
index f4ebf659ac4..7e114e48e99 100644
--- a/frontend/src/metabase/reference/databases/TableDetail.tsx
+++ b/frontend/src/metabase/reference/databases/TableDetail.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateTable } from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -83,7 +83,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateTable,
...actions,
onSubmit: actions.rUpdateTableDetail,
};
diff --git a/frontend/src/metabase/reference/databases/TableDetailContainer.tsx b/frontend/src/metabase/reference/databases/TableDetailContainer.tsx
index 5f1b00ef1f1..0d5b5f9f0aa 100644
--- a/frontend/src/metabase/reference/databases/TableDetailContainer.tsx
+++ b/frontend/src/metabase/reference/databases/TableDetailContainer.tsx
@@ -4,7 +4,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchDatabaseMetadata } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import TableDetail from "metabase/reference/databases/TableDetail";
import * as actions from "metabase/reference/reference";
@@ -22,7 +22,7 @@ import {
import TableSidebar from "./TableSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchDatabaseMetadata,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/TableList.tsx b/frontend/src/metabase/reference/databases/TableList.tsx
index e051d9761a0..3fd9d2cb28d 100644
--- a/frontend/src/metabase/reference/databases/TableList.tsx
+++ b/frontend/src/metabase/reference/databases/TableList.tsx
@@ -7,7 +7,6 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
import { List } from "metabase/reference/components/List";
import S from "metabase/reference/components/List/List.module.css";
@@ -41,10 +40,6 @@ const mapStateToProps = (
loadingError: getError(state),
});
-const mapDispatchToProps = {
- ...metadataActions,
-};
-
interface TableLike {
id?: number | string;
name?: string;
@@ -153,6 +148,5 @@ class TableList extends Component<TableListProps> {
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default connect(
mapStateToProps,
- mapDispatchToProps,
// Unjustified type cast. FIXME
)(TableList as unknown as React.ComponentType);
diff --git a/frontend/src/metabase/reference/databases/TableListContainer.tsx b/frontend/src/metabase/reference/databases/TableListContainer.tsx
index ba2a1a90674..dca69e3cac3 100644
--- a/frontend/src/metabase/reference/databases/TableListContainer.tsx
+++ b/frontend/src/metabase/reference/databases/TableListContainer.tsx
@@ -4,7 +4,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchDatabaseMetadata } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import TableList from "metabase/reference/databases/TableList";
import * as actions from "metabase/reference/reference";
@@ -21,7 +21,7 @@ import {
import DatabaseSidebar from "./DatabaseSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchDatabaseMetadata,
...actions,
};
diff --git a/frontend/src/metabase/reference/databases/TableQuestions.tsx b/frontend/src/metabase/reference/databases/TableQuestions.tsx
index 35f5bc3c6a8..ee29a6cde98 100644
--- a/frontend/src/metabase/reference/databases/TableQuestions.tsx
+++ b/frontend/src/metabase/reference/databases/TableQuestions.tsx
@@ -7,7 +7,6 @@ import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmpty
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import { List } from "metabase/reference/components/List";
import S from "metabase/reference/components/List/List.module.css";
import { ListItem } from "metabase/reference/components/ListItem";
@@ -52,10 +51,6 @@ const mapStateToProps = (
metadata: getMetadata(state),
});
-const mapDispatchToProps = {
- ...metadataActions,
-};
-
interface TableQuestionsProps {
table: StubbedTable;
metadata: Metadata;
@@ -116,6 +111,5 @@ class TableQuestions extends Component<TableQuestionsProps> {
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default connect(
mapStateToProps,
- mapDispatchToProps,
// Unjustified type cast. FIXME
)(TableQuestions as unknown as React.ComponentType);
diff --git a/frontend/src/metabase/reference/databases/TableQuestionsContainer.tsx b/frontend/src/metabase/reference/databases/TableQuestionsContainer.tsx
index 18cbe8a884d..dcc48d69ca2 100644
--- a/frontend/src/metabase/reference/databases/TableQuestionsContainer.tsx
+++ b/frontend/src/metabase/reference/databases/TableQuestionsContainer.tsx
@@ -6,7 +6,7 @@ import { cardApi } from "metabase/api";
import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchDatabaseMetadata } from "metabase/redux/metadata";
import type { Dispatch } from "metabase/redux/store";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import TableQuestions from "metabase/reference/databases/TableQuestions";
@@ -27,7 +27,7 @@ import TableSidebar from "./TableSidebar";
const mapDispatchToProps = {
fetchQuestions: () => (dispatch: Dispatch) =>
runRtkEndpoint({}, dispatch, cardApi.endpoints.listCards),
- ...metadataActions,
+ fetchDatabaseMetadata,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentDetail.tsx b/frontend/src/metabase/reference/segments/SegmentDetail.tsx
index 68165496a0d..59580e0b4de 100644
--- a/frontend/src/metabase/reference/segments/SegmentDetail.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentDetail.tsx
@@ -7,7 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { modelIconMap } from "metabase/common/utils/icon";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateSegment } from "metabase/redux/metadata";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";
@@ -96,7 +96,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateSegment,
...actions,
onSubmit: actions.rUpdateSegmentDetail,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentDetailContainer.tsx b/frontend/src/metabase/reference/segments/SegmentDetailContainer.tsx
index f364c7cd7a6..89e79c96dec 100644
--- a/frontend/src/metabase/reference/segments/SegmentDetailContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentDetailContainer.tsx
@@ -4,7 +4,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchSegmentTable } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import * as actions from "metabase/reference/reference";
import SegmentDetail from "metabase/reference/segments/SegmentDetail";
@@ -22,7 +22,7 @@ import {
import SegmentSidebar from "./SegmentSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchSegmentTable,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx b/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx
index b052a497b7d..1bf3e547359 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetail.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateField } from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -95,7 +95,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateField,
...actions,
onSubmit: actions.rUpdateSegmentFieldDetail,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.tsx b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.tsx
index 5b54f15fc17..4cac4736ad7 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.tsx
@@ -4,7 +4,11 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import {
+ fetchSegmentFields,
+ fetchSegmentTable,
+ fetchSegments,
+} from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import * as actions from "metabase/reference/reference";
import SegmentFieldDetail from "metabase/reference/segments/SegmentFieldDetail";
@@ -22,7 +26,9 @@ import {
import SegmentFieldSidebar from "./SegmentFieldSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchSegmentFields,
+ fetchSegmentTable,
+ fetchSegments,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldList.tsx b/frontend/src/metabase/reference/segments/SegmentFieldList.tsx
index b316dc3bf8c..cea0278a65d 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldList.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldList.tsx
@@ -7,7 +7,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { modelIconMap } from "metabase/common/utils/icon";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { updateField } from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
import { EditHeader } from "metabase/reference/components/EditHeader";
import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";
@@ -64,7 +64,7 @@ const mapStateToProps = (
};
const mapDispatchToProps = {
- ...metadataActions,
+ updateField,
...actions,
onSubmit: actions.rUpdateFields,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.tsx b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.tsx
index 6486ee03db7..65ac2369497 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.tsx
@@ -4,7 +4,11 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import {
+ fetchSegmentFields,
+ fetchSegmentTable,
+ fetchSegments,
+} from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import * as actions from "metabase/reference/reference";
import SegmentFieldList from "metabase/reference/segments/SegmentFieldList";
@@ -23,7 +27,9 @@ import {
import SegmentSidebar from "./SegmentSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchSegmentFields,
+ fetchSegmentTable,
+ fetchSegments,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentListContainer.tsx b/frontend/src/metabase/reference/segments/SegmentListContainer.tsx
index 1e3d4ffd7e8..ad630a26097 100644
--- a/frontend/src/metabase/reference/segments/SegmentListContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentListContainer.tsx
@@ -4,7 +4,7 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchSegments } from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import BaseSidebar from "metabase/reference/guide/BaseSidebar";
import * as actions from "metabase/reference/reference";
@@ -15,7 +15,7 @@ import type { ClearStateProps, FetchProps } from "../reference";
import { getIsEditing } from "../selectors";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchSegments,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx b/frontend/src/metabase/reference/segments/SegmentQuestions.tsx
index cdfd669ab17..42b199e3c44 100644
--- a/frontend/src/metabase/reference/segments/SegmentQuestions.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.tsx
@@ -7,7 +7,6 @@ import { useQuestionListQuery } from "metabase/common/hooks";
import { modelIconMap } from "metabase/common/utils/icon";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import { List } from "metabase/reference/components/List";
import S from "metabase/reference/components/List/List.module.css";
import { ListItem } from "metabase/reference/components/ListItem";
@@ -49,10 +48,6 @@ const mapStateToProps = (
metadata: getMetadata(state),
});
-const mapDispatchToProps = {
- ...metadataActions,
-};
-
interface SegmentQuestionsInnerProps {
style: React.CSSProperties;
table: StubbedTable;
@@ -119,6 +114,5 @@ const SegmentQuestionsInner = ({
export const SegmentQuestions = connect(
mapStateToProps,
- mapDispatchToProps,
// Unjustified type cast. FIXME
)(SegmentQuestionsInner as unknown as React.ComponentType);
diff --git a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.tsx b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.tsx
index 49ebfca797d..dfeafd840eb 100644
--- a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.tsx
@@ -6,7 +6,7 @@ import { cardApi } from "metabase/api";
import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import { fetchSegmentTable, fetchSegments } from "metabase/redux/metadata";
import type { Dispatch } from "metabase/redux/store";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import * as actions from "metabase/reference/reference";
@@ -27,7 +27,8 @@ import SegmentSidebar from "./SegmentSidebar";
const mapDispatchToProps = {
fetchQuestions: () => (dispatch: Dispatch) =>
runRtkEndpoint({}, dispatch, cardApi.endpoints.listCards),
- ...metadataActions,
+ fetchSegmentTable,
+ fetchSegments,
...actions,
};
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx b/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
index deda144afab..3349a3384b2 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
@@ -9,7 +9,6 @@ import { modelIconMap } from "metabase/common/utils/icon";
import CS from "metabase/css/core/index.css";
import { Revision } from "metabase/querying/segments/components/revisions/Revision";
import { connect } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
import S from "metabase/reference/components/List/List.module.css";
import { getShallowTables as getTables } from "metabase/selectors/metadata";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
@@ -50,10 +49,6 @@ const mapStateToProps = (
};
};
-const mapDispatchToProps = {
- ...metadataActions,
-};
-
interface SegmentRevisionsProps {
style: React.CSSProperties;
revisions: Record<string, RevisionData>;
@@ -143,6 +138,5 @@ class SegmentRevisions extends Component<SegmentRevisionsProps> {
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default connect(
mapStateToProps,
- mapDispatchToProps,
// Unjustified type cast. FIXME
)(SegmentRevisions as unknown as React.ComponentType);
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.tsx b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.tsx
index 2d4402e21dd..37c50c7a1b4 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.tsx
@@ -4,7 +4,11 @@ import { usePrevious } from "react-use";
import CS from "metabase/css/core/index.css";
import { connect, useSelector } from "metabase/redux";
-import * as metadataActions from "metabase/redux/metadata";
+import {
+ fetchSegmentRevisions,
+ fetchSegmentTable,
+ fetchSegments,
+} from "metabase/redux/metadata";
import { SidebarLayout } from "metabase/reference/components/SidebarLayout";
import * as actions from "metabase/reference/reference";
import SegmentRevisions from "metabase/reference/segments/SegmentRevisions";
@@ -22,7 +26,9 @@ import {
import SegmentSidebar from "./SegmentSidebar";
const mapDispatchToProps = {
- ...metadataActions,
+ fetchSegmentRevisions,
+ fetchSegmentTable,
+ fetchSegments,
...actions,
};