Skip to content

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

Move DataSelector into querying (#73071)

Fraser7ef50e0a79ec
diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
index f4d180cf42e..1a943c67a3a 100644
--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { CONTAINER_WIDTH } from "metabase/query_builder/components/DataSelector/constants";
+import { CONTAINER_WIDTH } from "metabase/querying/common/components/DataSelector/constants";
import { Flex, Icon, NavLink, Paper, ScrollArea, TextInput } from "metabase/ui";
import type { TableId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
index 1f95e46d3e5..6ddf05e3137 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
@@ -4,7 +4,7 @@ import {
useGetDatabaseQuery,
useListDatabasesQuery,
} from "metabase/api";
-import { DatabaseDataSelector } from "metabase/query_builder/components/DataSelector";
+import { DatabaseDataSelector } from "metabase/querying/common/components/DataSelector";
import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";
import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";
import { Flex } from "metabase/ui";
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 6fcaa70463d..6ad9111ce97 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -52,7 +52,7 @@ const elements = [
name: "query_builder",
enforceOutgoing: true,
}),
- createElement({ type: "feature", name: "admin" }),
+ createElement({ type: "feature", name: "admin", enforceOutgoing: true }),
createElement({ type: "feature", name: "reference", enforceOutgoing: true }),
createElement({
type: "feature",
diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
index e53bb89a42c..933c50157e5 100644
--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
@@ -7,7 +7,7 @@ import { t } from "ttag";
import { FieldSet } from "metabase/common/components/FieldSet";
import CS from "metabase/css/core/index.css";
import { Tables } from "metabase/entities/tables";
-import { DatabaseSchemaAndTableDataSelector } from "metabase/query_builder/components/DataSelector";
+import { DatabaseSchemaAndTableDataSelector } from "metabase/querying/common/components/DataSelector";
import type { State } from "metabase/redux/store";
import { Icon } from "metabase/ui";
import { connect } from "metabase/utils/redux";
diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
index 87fc6b9dded..41741ac7ec0 100644
--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx
@@ -14,7 +14,7 @@ import { useMetadataToasts } from "metabase/metadata/hooks";
import type { MetadataEditEventDetail } from "metabase/metadata/pages/shared/analytics";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
-import { FieldDataSelector } from "metabase/query_builder/components/DataSelector";
+import { FieldDataSelector } from "metabase/querying/common/components/DataSelector";
import {
Alert,
Button,
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
index 74e3676360a..c37d9032486 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
@@ -6,7 +6,7 @@ import { t } from "ttag";
import { useGetFieldQuery } from "metabase/api";
import { SelectButton } from "metabase/common/components/SelectButton";
import CS from "metabase/css/core/index.css";
-import { SchemaTableAndFieldDataSelector } from "metabase/query_builder/components/DataSelector";
+import { SchemaTableAndFieldDataSelector } from "metabase/querying/common/components/DataSelector";
import { Text } from "metabase/ui";
import Field from "metabase-lib/v1/metadata/Field";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
index 6492ea70e2a..47cae62f5f9 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
@@ -9,7 +9,7 @@ import { getNativeQueryLanguage } from "metabase/databases/utils/engine";
import {
DatabaseDataSelector,
SchemaAndTableDataSelector,
-} from "metabase/query_builder/components/DataSelector";
+} from "metabase/querying/common/components/DataSelector";
import { Flex } from "metabase/ui";
const DataSourceSelectorsPropTypes = {
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
index f4e9ab43c1f..a6150f3e422 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { SchemaTableAndFieldDataSelector } from "metabase/query_builder/components/DataSelector";
+import { SchemaTableAndFieldDataSelector } from "metabase/querying/common/components/DataSelector";
import { Text } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import type Field from "metabase-lib/v1/metadata/Field";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
index b716ac04af1..0891ef7f7ff 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
@@ -2,7 +2,7 @@ import { useId } from "react";
import { t } from "ttag";
import { LabelWithInfo } from "metabase/common/components/LabelWithInfo";
-import { SchemaAndTableDataSelector } from "metabase/query_builder/components/DataSelector";
+import { SchemaAndTableDataSelector } from "metabase/querying/common/components/DataSelector";
import { Group, Switch } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import type { TableId, TemplateTag } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.css b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelector.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js
similarity index 99%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelector.unit.spec.js
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js
index 3e4cfaeb70c..c8fb540032a 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.unit.spec.js
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
import { createMockMetadata } from "__support__/metadata";
import { getIcon, render, renderWithProviders, screen } from "__support__/ui";
import { delay } from "__support__/utils";
-import { UnconnectedDataSelector as DataSelector } from "metabase/query_builder/components/DataSelector";
+import { UnconnectedDataSelector as DataSelector } from "metabase/querying/common/components/DataSelector";
import {
createMockSettingsState,
createMockState,
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDataBucketPicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorLoading/DataSelectorLoading.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorLoading/DataSelectorLoading.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorLoading/DataSelectorLoading.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorLoading/DataSelectorLoading.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorLoading/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorLoading/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorLoading/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorLoading/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSchemaPicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSectionHeader/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/index.ts b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/index.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/index.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/RawDataBackButton.tsx b/frontend/src/metabase/querying/common/components/DataSelector/RawDataBackButton.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/RawDataBackButton.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/RawDataBackButton.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsx b/frontend/src/metabase/querying/common/components/DataSelector/TriggerComponents.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/TriggerComponents.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/TriggerComponents.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/constants.ts b/frontend/src/metabase/querying/common/components/DataSelector/constants.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/constants.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/constants.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/index.tsx b/frontend/src/metabase/querying/common/components/DataSelector/index.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/index.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/index.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.module.css b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/constants.ts b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/constants.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/constants.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/constants.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/types.ts b/frontend/src/metabase/querying/common/components/DataSelector/types.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/types.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/types.ts
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/utils.ts b/frontend/src/metabase/querying/common/components/DataSelector/utils.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/DataSelector/utils.ts
rename to frontend/src/metabase/querying/common/components/DataSelector/utils.ts