Skip to content

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

Create the segments module (#81864)

Fraser63e4a7ccb211
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 0b6e2f07eb3..c15e95f8f86 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -239,6 +239,7 @@ const elements = [
createElement({ type: "shared", name: "redux", enforceSharedTiers: false }),
createElement({ type: "shared", name: "rich_text_editing" }),
createElement({ type: "shared", name: "route-guards" }),
+ createElement({ type: "shared", name: "segments", enforcePublicApi: true }),
createElement({ type: "shared", name: "selectors" }),
createElement({ type: "shared", name: "settings", enforcePublicApi: true }),
createElement({ type: "feature", name: "setup" }),
diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjs
index ee626e0889d..a1126e1ab2d 100644
--- a/frontend/lint/shared-tiers.mjs
+++ b/frontend/lint/shared-tiers.mjs
@@ -67,6 +67,7 @@ const SHARED_DOMAIN = [
"shared/nav",
"shared/notifications",
"shared/palette",
+ "shared/segments",
"shared/static-viz",
"shared/status",
"shared/timelines",
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
index a2e7ba50544..41a59423447 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
@@ -7,12 +7,12 @@ import { FieldSet } from "metabase/common/components/FieldSet";
import { Link } from "metabase/common/components/Link";
import { getMetadata } from "metabase/metadata-store";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
-import { SegmentEditor } from "metabase/querying/segments/components/SegmentEditor";
+import { useSelector } from "metabase/redux";
import {
+ SegmentEditor,
getSegmentQuery,
getSegmentQueryDefinition,
-} from "metabase/querying/segments/utils";
-import { useSelector } from "metabase/redux";
+} from "metabase/segments";
import { Alert, Button } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
index 83722d1deb7..b26da15a143 100644
--- a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
@@ -5,7 +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 { Revision } from "metabase/segments";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
import * as Urls from "metabase/urls";
import type {
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
index da1ed6d50bf..d5f1f61429f 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentEditor/SegmentEditor.tsx
@@ -2,7 +2,7 @@ import { t } from "ttag";
import { EditableText } from "metabase/common/components/EditableText";
import { Markdown } from "metabase/common/components/Markdown";
-import { SegmentFilterEditor } from "metabase/querying/segments";
+import { SegmentFilterEditor } from "metabase/segments";
import { Card, Stack, Text } from "metabase/ui";
import type * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/segments/index.ts b/frontend/src/metabase/querying/segments/index.ts
deleted file mode 100644
index b052308246e..00000000000
--- a/frontend/src/metabase/querying/segments/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SegmentFilterEditor } from "./components/SegmentFilterEditor";
diff --git a/frontend/src/metabase/reference/components/Formula.tsx b/frontend/src/metabase/reference/components/Formula.tsx
index cc41a956e67..e17741d9b89 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/querying/segments/components/QueryDefinition";
+import { QueryDefinition } from "metabase/segments";
import { Icon, Transition, type TransitionProps } from "metabase/ui";
import type { DatasetQuery, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx b/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
index ad9aee0832d..0b5793a498f 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.tsx
@@ -8,9 +8,9 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { modelIconMap } from "metabase/common/utils/icon";
import CS from "metabase/css/core/index.css";
import { getShallowTables as getTables } from "metabase/metadata-store";
-import { Revision } from "metabase/querying/segments/components/revisions/Revision";
import { connect } from "metabase/redux";
import S from "metabase/reference/components/List/List.module.css";
+import { Revision } from "metabase/segments";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
import type {
NormalizedTable,
diff --git a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx b/frontend/src/metabase/segments/components/QueryDefinition/QueryDefinition.tsx
similarity index 93%
rename from frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx
rename to frontend/src/metabase/segments/components/QueryDefinition/QueryDefinition.tsx
index d56374fe9c2..1240fa06b18 100644
--- a/frontend/src/metabase/querying/segments/components/QueryDefinition/QueryDefinition.tsx
+++ b/frontend/src/metabase/segments/components/QueryDefinition/QueryDefinition.tsx
@@ -1,11 +1,12 @@
import { getMetadata } from "metabase/metadata-store";
import { FilterPill } from "metabase/querying/filters/components/FilterPanel/FilterPill";
-import { getSegmentQuery } from "metabase/querying/segments/utils";
import { useSelector } from "metabase/redux";
import { Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { DatasetQuery, TableId } from "metabase-types/api";
+import { getSegmentQuery } from "../../utils";
+
const STAGE_INDEX = -1;
type QueryDefinitionProps = {
diff --git a/frontend/src/metabase/querying/segments/components/QueryDefinition/index.ts b/frontend/src/metabase/segments/components/QueryDefinition/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/QueryDefinition/index.ts
rename to frontend/src/metabase/segments/components/QueryDefinition/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css b/frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css
rename to frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/ClauseStep.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.tsx
rename to frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/ClauseStep.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/index.ts b/frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/index.ts
rename to frontend/src/metabase/segments/components/SegmentEditor/ClauseStep/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
rename to frontend/src/metabase/segments/components/SegmentEditor/DataStep/DataStep.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/index.ts b/frontend/src/metabase/segments/components/SegmentEditor/DataStep/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/index.ts
rename to frontend/src/metabase/segments/components/SegmentEditor/DataStep/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
rename to frontend/src/metabase/segments/components/SegmentEditor/FilterStep/FilterStep.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/index.ts b/frontend/src/metabase/segments/components/SegmentEditor/FilterStep/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/index.ts
rename to frontend/src/metabase/segments/components/SegmentEditor/FilterStep/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx b/frontend/src/metabase/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
rename to frontend/src/metabase/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/index.ts b/frontend/src/metabase/segments/components/SegmentEditor/PreviewStep/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/index.ts
rename to frontend/src/metabase/segments/components/SegmentEditor/PreviewStep/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/SegmentEditor.module.css b/frontend/src/metabase/segments/components/SegmentEditor/SegmentEditor.module.css
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/SegmentEditor.module.css
rename to frontend/src/metabase/segments/components/SegmentEditor/SegmentEditor.module.css
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/SegmentEditor.tsx b/frontend/src/metabase/segments/components/SegmentEditor/SegmentEditor.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/SegmentEditor.tsx
rename to frontend/src/metabase/segments/components/SegmentEditor/SegmentEditor.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/index.ts b/frontend/src/metabase/segments/components/SegmentEditor/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentEditor/index.ts
rename to frontend/src/metabase/segments/components/SegmentEditor/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx b/frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
rename to frontend/src/metabase/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
diff --git a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/index.ts b/frontend/src/metabase/segments/components/SegmentFilterEditor/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/SegmentFilterEditor/index.ts
rename to frontend/src/metabase/segments/components/SegmentFilterEditor/index.ts
diff --git a/frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx b/frontend/src/metabase/segments/components/revisions/QueryDiff.tsx
similarity index 84%
rename from frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx
rename to frontend/src/metabase/segments/components/revisions/QueryDiff.tsx
index 6869038a8b2..533b33fdee5 100644
--- a/frontend/src/metabase/querying/segments/components/revisions/QueryDiff.tsx
+++ b/frontend/src/metabase/segments/components/revisions/QueryDiff.tsx
@@ -1,7 +1,8 @@
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";
+import { QueryDefinition } from "../QueryDefinition";
+
type Props = {
diff: QueryDiffType;
tableId: TableId;
diff --git a/frontend/src/metabase/querying/segments/components/revisions/Revision.tsx b/frontend/src/metabase/segments/components/revisions/Revision.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/Revision.tsx
rename to frontend/src/metabase/segments/components/revisions/Revision.tsx
diff --git a/frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.styled.tsx b/frontend/src/metabase/segments/components/revisions/RevisionDiff.styled.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.styled.tsx
rename to frontend/src/metabase/segments/components/revisions/RevisionDiff.styled.tsx
diff --git a/frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.tsx b/frontend/src/metabase/segments/components/revisions/RevisionDiff.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/RevisionDiff.tsx
rename to frontend/src/metabase/segments/components/revisions/RevisionDiff.tsx
diff --git a/frontend/src/metabase/querying/segments/components/revisions/RevisionDiffIcon.tsx b/frontend/src/metabase/segments/components/revisions/RevisionDiffIcon.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/RevisionDiffIcon.tsx
rename to frontend/src/metabase/segments/components/revisions/RevisionDiffIcon.tsx
diff --git a/frontend/src/metabase/querying/segments/components/revisions/TextDiff.tsx b/frontend/src/metabase/segments/components/revisions/TextDiff.tsx
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/TextDiff.tsx
rename to frontend/src/metabase/segments/components/revisions/TextDiff.tsx
diff --git a/frontend/src/metabase/querying/segments/components/revisions/guards.ts b/frontend/src/metabase/segments/components/revisions/guards.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/components/revisions/guards.ts
rename to frontend/src/metabase/segments/components/revisions/guards.ts
diff --git a/frontend/src/metabase/segments/index.ts b/frontend/src/metabase/segments/index.ts
new file mode 100644
index 00000000000..c02a6be8ea9
--- /dev/null
+++ b/frontend/src/metabase/segments/index.ts
@@ -0,0 +1,5 @@
+export { QueryDefinition } from "./components/QueryDefinition";
+export { SegmentEditor } from "./components/SegmentEditor";
+export { SegmentFilterEditor } from "./components/SegmentFilterEditor";
+export { Revision } from "./components/revisions/Revision";
+export { getSegmentQuery, getSegmentQueryDefinition } from "./utils";
diff --git a/frontend/src/metabase/querying/segments/utils.ts b/frontend/src/metabase/segments/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/segments/utils.ts
rename to frontend/src/metabase/segments/utils.ts