Skip to content

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

Move shared reference components into querying (#73066)

Frasera6db0c088126
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index d3a0e7987cc..6fcaa70463d 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -53,7 +53,7 @@ const elements = [
enforceOutgoing: true,
}),
createElement({ type: "feature", name: "admin" }),
- createElement({ type: "feature", name: "reference" }),
+ createElement({ type: "feature", name: "reference", enforceOutgoing: true }),
createElement({
type: "feature",
name: "enterprise",
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
index db43fe62932..0b837dfd70b 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
@@ -4,14 +4,14 @@ import { useEffect } from "react";
import { Link } from "react-router";
import { t } from "ttag";
-import {
- getSegmentQuery,
- getSegmentQueryDefinition,
-} from "metabase/admin/datamodel/utils/segments";
import { Button } from "metabase/common/components/Button/Button";
import { FieldSet } from "metabase/common/components/FieldSet";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { SegmentEditor } from "metabase/querying/segments/components/SegmentEditor";
+import {
+ getSegmentQuery,
+ getSegmentQueryDefinition,
+} from "metabase/querying/segments/utils";
import { getMetadata } from "metabase/selectors/metadata";
import { Alert } from "metabase/ui";
import { useSelector } from "metabase/utils/redux";
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
index 0eaa62c1d1d..d2211ff39d4 100644
--- a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
@@ -5,6 +5,7 @@ import { t } from "ttag";
import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
+import { Revision } from "metabase/querying/segments/components/revisions/Revision";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
import * as Urls from "metabase/utils/urls";
import type {
@@ -13,8 +14,6 @@ import type {
User,
} from "metabase-types/api";
-import { Revision } from "./Revision";
-
interface Props {
revisions?: RevisionType[] | null;
segment?: Segment;
diff --git a/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx
similarity index 93%
rename from frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx
rename to frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx
index a8c59fbfc41..bcf21da39d6 100644
--- a/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx
+++ b/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx
@@ -1,5 +1,5 @@
-import { getSegmentQuery } from "metabase/admin/datamodel/utils/segments";
import { FilterPill } from "metabase/querying/filters/components/FilterPanel/FilterPill";
+import { getSegmentQuery } from "metabase/querying/segments/utils";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex } from "metabase/ui";
import { useSelector } from "metabase/utils/redux";
diff --git a/frontend/src/metabase/admin/datamodel/components/QueryDefinition/index.ts b/frontend/src/metabase/querying/segments/components/QueryDefinition/index.ts
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/QueryDefinition/index.ts
rename to frontend/src/metabase/querying/segments/components/QueryDefinition/index.ts
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/QueryDiff.tsx b/frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx
similarity index 84%
rename from frontend/src/metabase/admin/datamodel/components/revisions/QueryDiff.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx
index b8aec5acdf0..6869038a8b2 100644
--- a/frontend/src/metabase/admin/datamodel/components/revisions/QueryDiff.tsx
+++ b/frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx
@@ -1,5 +1,5 @@
-import { QueryDefinition } from "metabase/admin/datamodel/components/QueryDefinition";
import CS from "metabase/css/core/index.css";
+import { QueryDefinition } from "metabase/querying/segments/components/QueryDefinition";
import type { QueryDiff as QueryDiffType, TableId } from "metabase-types/api";
type Props = {
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/Revision.tsx b/frontend/src/metabase/querying/segments/components/revisions/Revision.tsx
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/revisions/Revision.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/Revision.tsx
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiff.styled.tsx b/frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.styled.tsx
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiff.styled.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.styled.tsx
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiff.tsx b/frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.tsx
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiff.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.tsx
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiffIcon.tsx b/frontend/src/metabase/querying/segments/components/revisions/RevisionDiffIcon.tsx
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiffIcon.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/RevisionDiffIcon.tsx
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/TextDiff.tsx b/frontend/src/metabase/querying/segments/components/revisions/TextDiff.tsx
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/components/revisions/TextDiff.tsx
rename to frontend/src/metabase/querying/segments/components/revisions/TextDiff.tsx
diff --git a/frontend/src/metabase/admin/datamodel/utils/segments.ts b/frontend/src/metabase/querying/segments/utils.ts
similarity index 100%
rename from frontend/src/metabase/admin/datamodel/utils/segments.ts
rename to frontend/src/metabase/querying/segments/utils.ts
diff --git a/frontend/src/metabase/reference/components/Formula.tsx b/frontend/src/metabase/reference/components/Formula.tsx
index 36d9312f634..9e768a17256 100644
--- a/frontend/src/metabase/reference/components/Formula.tsx
+++ b/frontend/src/metabase/reference/components/Formula.tsx
@@ -1,7 +1,7 @@
import cx from "classnames";
import { t } from "ttag";
-import { QueryDefinition } from "metabase/admin/datamodel/components/QueryDefinition";
+import { QueryDefinition } from "metabase/querying/segments/components/QueryDefinition";
import { Icon, Transition, type TransitionProps } from "metabase/ui";
import type { Segment } from "metabase-types/api";
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
index ce085b10b8f..daac1d22ec4 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
@@ -4,11 +4,11 @@ import PropTypes from "prop-types";
import { Component } from "react";
import { t } from "ttag";
-import { Revision } from "metabase/admin/datamodel/components/revisions/Revision";
import { EmptyState } from "metabase/common/components/EmptyState";
import S from "metabase/common/components/List/List.module.css";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
+import { Revision } from "metabase/querying/segments/components/revisions/Revision";
import * as metadataActions from "metabase/redux/metadata";
import { getShallowTables as getTables } from "metabase/selectors/metadata";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";