Skip to content

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

Convert query builder redux store to ts (#71063)

Romeo Van Snick8be374db14a0
diff --git a/frontend/src/metabase-lib/v1/types/utils/isa.ts b/frontend/src/metabase-lib/v1/types/utils/isa.ts
index 7476dda715e..aca9b0da4e0 100644
--- a/frontend/src/metabase-lib/v1/types/utils/isa.ts
+++ b/frontend/src/metabase-lib/v1/types/utils/isa.ts
@@ -262,7 +262,7 @@ export function hasLatitudeAndLongitudeColumns(cols: FieldTypeInfo[]) {
}
export const getIsPKFromTablePredicate =
- (tableId: TableId | undefined) =>
+ (tableId: TableId | null | undefined) =>
(column: FieldTypeInfo & { table_id?: TableId }): boolean => {
const isPrimaryKey = isPK(column);
diff --git a/frontend/src/metabase-types/store/mocks/qb.ts b/frontend/src/metabase-types/store/mocks/qb.ts
index 0be02a3a858..096ad49c125 100644
--- a/frontend/src/metabase-types/store/mocks/qb.ts
+++ b/frontend/src/metabase-types/store/mocks/qb.ts
@@ -24,7 +24,7 @@ export const createMockQueryBuilderUIControlsState = (
isShowingRawTable: false,
isNativeEditorOpen: false,
queryBuilderMode: "view",
- previousQueryBuilderMode: false,
+ previousQueryBuilderMode: null,
snippetCollectionId: null,
datasetEditorTab: "query",
isShowingNotebookNativePreview: false,
@@ -35,6 +35,8 @@ export const createMockQueryBuilderUIControlsState = (
dataReferenceStack: null,
highlightedNativeQueryLineNumbers: [],
isShowingListViewConfiguration: false,
+ questionDetailsTimelineDrawerState: null,
+ nativeEditorSelectedRange: [],
...opts,
});
@@ -76,6 +78,7 @@ export const createMockQueryBuilderState = (
selectedTimelineEventIds: [],
metadataDiff: {},
+ visibleTimelineEventIds: [],
currentState: null,
diff --git a/frontend/src/metabase-types/store/qb.ts b/frontend/src/metabase-types/store/qb.ts
index 589b0d247e6..cc1ed716726 100644
--- a/frontend/src/metabase-types/store/qb.ts
+++ b/frontend/src/metabase-types/store/qb.ts
@@ -6,6 +6,7 @@ import type {
CollectionItemModel,
Dataset,
Field,
+ NativeQuerySnippet,
ParameterValuesMap,
TimelineEventId,
} from "metabase-types/api";
@@ -23,6 +24,16 @@ export type ForeignKeyReference = {
value: number;
};
+type Position = {
+ row: number;
+ column: number;
+};
+
+export type Range = {
+ start: Position;
+ end: Position;
+};
+
export interface QueryBuilderUIControls {
isModifiedFromNotebook: boolean;
isShowingDataReference: boolean;
@@ -40,8 +51,8 @@ export interface QueryBuilderUIControls {
isShowingAIQuestionAnalysisSidebar: boolean;
initialChartSetting: InitialChartSettingState;
isShowingRawTable: boolean;
- queryBuilderMode: QueryBuilderMode | false;
- previousQueryBuilderMode: boolean;
+ queryBuilderMode: QueryBuilderMode;
+ previousQueryBuilderMode: QueryBuilderMode | null;
snippetCollectionId: number | null;
datasetEditorTab: DatasetEditorTab;
isShowingNotebookNativePreview: boolean;
@@ -49,9 +60,17 @@ export interface QueryBuilderUIControls {
showSidebarTitle: boolean;
modal: QueryModalType | null;
modalContext: TimelineEventId | null;
- dataReferenceStack: null;
+ modalSnippet?:
+ | NativeQuerySnippet
+ | Partial<Omit<NativeQuerySnippet, "id">>
+ | null;
+ dataReferenceStack: unknown[] | null;
highlightedNativeQueryLineNumbers: number[];
isShowingListViewConfiguration: boolean;
+ scrollToLastColumn?: boolean;
+ questionDetailsTimelineDrawerState: string | null;
+ recentlySaved?: boolean;
+ nativeEditorSelectedRange: Range[];
}
export interface QueryBuilderLoadingControls {
@@ -94,4 +113,6 @@ export interface QueryBuilderState {
cardId?: number;
serializedCard: string;
} | null;
+
+ visibleTimelineEventIds: TimelineEventId[];
}
diff --git a/frontend/src/metabase/entities/model-indexes/actions.ts b/frontend/src/metabase/entities/model-indexes/actions.ts
index 0583bfab704..ca596ef3576 100644
--- a/frontend/src/metabase/entities/model-indexes/actions.ts
+++ b/frontend/src/metabase/entities/model-indexes/actions.ts
@@ -7,7 +7,7 @@ import {
listModelIndexes,
} from "metabase/api";
import type Question from "metabase-lib/v1/Question";
-import type { Field, FieldReference } from "metabase-types/api";
+import type { DatasetColumn, Field, FieldReference } from "metabase-types/api";
import type { ModelIndex } from "metabase-types/api/modelIndexes";
import type { Dispatch } from "metabase-types/store";
@@ -125,14 +125,16 @@ function getIndexIdsToRemove(
return indexIdsToRemove;
}
-export function cleanIndexFlags(fields: Field[] = []) {
+export function cleanIndexFlags<T extends DatasetColumn | Field>(
+ fields: T[] = [],
+): T[] {
const indexesToClean = fields.reduce(
(
indexesToClean: number[],
- field: FieldWithMaybeIndex,
+ field: FieldWithMaybeIndex | DatasetColumn,
thisIndex: number,
) => {
- if (field.should_index !== undefined) {
+ if ("should_index" in field && field.should_index !== undefined) {
indexesToClean.push(thisIndex);
}
return indexesToClean;
diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.ts
index 8bac823b1fb..7ffb4a6822e 100644
--- a/frontend/src/metabase/query_builder/actions/core/core.ts
+++ b/frontend/src/metabase/query_builder/actions/core/core.ts
@@ -67,7 +67,7 @@ export const softReloadCard = createThunkAction(SOFT_RELOAD_CARD, () => {
const outdatedCard = getCard(getState());
const action = await dispatch(
- Questions.actions.fetch({ id: outdatedCard.id }, { reload: true }),
+ Questions.actions.fetch({ id: outdatedCard?.id }, { reload: true }),
);
return Questions.HACK_getObjectFromAction(action);
@@ -295,7 +295,7 @@ export const apiUpdateQuestion = (
const { isNative } = Lib.queryDisplayInfo(question.query());
if (!isNative) {
- rerunQuery = rerunQuery ?? isResultDirty;
+ rerunQuery = rerunQuery ?? isResultDirty ?? false;
}
const submittableQuestion = getSubmittableQuestion(getState(), question);
diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.ts
index f06fbb0c3d2..cff77f62314 100644
--- a/frontend/src/metabase/query_builder/actions/native.ts
+++ b/frontend/src/metabase/query_builder/actions/native.ts
@@ -43,11 +43,10 @@ export const PUSH_DATA_REFERENCE_STACK =
"metabase/qb/PUSH_DATA_REFERENCE_STACK";
export const pushDataReferenceStack = createThunkAction(
PUSH_DATA_REFERENCE_STACK,
- (item: { type: string; item: unknown }) =>
- (dispatch: Dispatch, getState: GetState) => {
- const stack = getDataReferenceStack(getState());
- dispatch(setDataReferenceStack(stack.concat([item])));
- },
+ (item: unknown) => (dispatch: Dispatch, getState: GetState) => {
+ const stack = getDataReferenceStack(getState());
+ dispatch(setDataReferenceStack(stack.concat([item])));
+ },
);
export const OPEN_DATA_REFERENCE_AT_QUESTION =
@@ -141,14 +140,17 @@ export const insertSnippet =
return;
}
const query = question.legacyNativeQuery() as NativeQuery;
- const nativeEditorCursorOffset = getNativeEditorCursorOffset(getState());
- const nativeEditorSelectedText = getNativeEditorSelectedText(getState());
+ const queryText = query.queryText();
+ const nativeEditorCursorOffset =
+ getNativeEditorCursorOffset(getState()) ?? queryText.length;
+ const nativeEditorSelectedText =
+ getNativeEditorSelectedText(getState()) ?? "";
const selectionStart =
- nativeEditorCursorOffset - (nativeEditorSelectedText || "").length;
+ nativeEditorCursorOffset - nativeEditorSelectedText.length;
const newText =
- query.queryText().slice(0, selectionStart) +
+ queryText.slice(0, selectionStart) +
`{{snippet: ${name}}}` +
- query.queryText().slice(nativeEditorCursorOffset);
+ queryText.slice(nativeEditorCursorOffset);
const datasetQuery = query.setQueryText(newText).datasetQuery();
dispatch(updateQuestion(question.setDatasetQuery(datasetQuery)));
};
diff --git a/frontend/src/metabase/query_builder/actions/object-detail.ts b/frontend/src/metabase/query_builder/actions/object-detail.ts
index 57bb61de322..391e54c8edd 100644
--- a/frontend/src/metabase/query_builder/actions/object-detail.ts
+++ b/frontend/src/metabase/query_builder/actions/object-detail.ts
@@ -117,7 +117,7 @@ export const loadObjectDetailFKReferences = createThunkAction(
return null;
}
- const card: Card = getCard(state);
+ const card = getCard(state);
const queryResult = getFirstQueryResult(state);
async function getFKCount(
@@ -174,18 +174,20 @@ export const loadObjectDetailFKReferences = createThunkAction(
// run a query on FK origin table where FK origin field = objectDetailIdValue
const fkReferences: Record<FieldId, FKInfo | undefined> = {};
- for (let i = 0; i < tableForeignKeys.length; i++) {
- const fk = tableForeignKeys[i];
- const info = await getFKCount(card, fk);
+ if (card) {
+ for (let i = 0; i < tableForeignKeys.length; i++) {
+ const fk = tableForeignKeys[i];
+ const info = await getFKCount(card, fk);
- fkReferences[fk.origin_id] = info;
+ fkReferences[fk.origin_id] = info;
+ }
}
// It's possible that while we were running those queries, the object
// detail id changed. If so, these fk reference are stale and we shouldn't
// put them in state. The detail id is used in the query so we check that.
const updatedQueryResult = getFirstQueryResult(getState());
- if (!_.isEqual(queryResult.json_query, updatedQueryResult.json_query)) {
+ if (!_.isEqual(queryResult?.json_query, updatedQueryResult?.json_query)) {
return null;
}
return fkReferences;
@@ -199,7 +201,8 @@ export const CLEAR_OBJECT_DETAIL_FK_REFERENCES =
export const viewNextObjectDetail = () => {
return (dispatch: Dispatch, getState: GetState) => {
if (getCanZoomNextRow(getState())) {
- const objectId = getNextRowPKValue(getState());
+ // TODO(romeovs): remove this cast once we have a proper type for ObjectId
+ const objectId = getNextRowPKValue(getState()) as ObjectId;
dispatch(zoomInRow({ objectId }));
}
};
@@ -208,7 +211,8 @@ export const viewNextObjectDetail = () => {
export const viewPreviousObjectDetail = () => {
return (dispatch: Dispatch, getState: GetState) => {
if (getCanZoomPreviousRow(getState())) {
- const objectId = getPreviousRowPKValue(getState());
+ // TODO(romeovs): remove this cast once we have a proper type for ObjectId
+ const objectId = getPreviousRowPKValue(getState()) as ObjectId;
dispatch(zoomInRow({ objectId }));
}
};
diff --git a/frontend/src/metabase/query_builder/actions/querying.ts b/frontend/src/metabase/query_builder/actions/querying.ts
index 266269c7800..b511ac281fd 100644
--- a/frontend/src/metabase/query_builder/actions/querying.ts
+++ b/frontend/src/metabase/query_builder/actions/querying.ts
@@ -205,12 +205,14 @@ export const queryCompleted = (question: Question, queryResults: Dataset[]) => {
const originalQuestion = getOriginalQuestionWithParameterValues(getState());
const { isEditable } = Lib.queryDisplayInfo(question.query());
- const isDirty = isEditable && question.isDirtyComparedTo(originalQuestion);
+ const isDirty =
+ isEditable &&
+ (!originalQuestion || question.isDirtyComparedTo(originalQuestion));
if (isDirty) {
const series = [{ card: question.card(), data, error }];
const previousSeries =
- prevCard && (prevData || prevError)
+ prevCard && prevData
? [{ card: prevCard, data: prevData, error: prevError }]
: null;
if (series && previousSeries) {
diff --git a/frontend/src/metabase/query_builder/actions/ui.ts b/frontend/src/metabase/query_builder/actions/ui.ts
index 31a7b9be4ff..cc50731b58e 100644
--- a/frontend/src/metabase/query_builder/actions/ui.ts
+++ b/frontend/src/metabase/query_builder/actions/ui.ts
@@ -54,43 +54,56 @@ export const setQueryBuilderMode =
}
};
-export const onEditSummary = createAction("metabase/qb/EDIT_SUMMARY");
-export const onCloseSummary = createAction("metabase/qb/CLOSE_SUMMARY");
+export const EDIT_SUMMARY = "metabase/qb/EDIT_SUMMARY";
+export const editSummary = createAction(EDIT_SUMMARY);
+export const ON_CLOSE_SUMMARY = "metabase/qb/ON_CLOSE_SUMMARY";
+export const onCloseSummary = createAction(ON_CLOSE_SUMMARY);
+
+export const OPEN_AI_QUESTION_ANALYSIS_SIDEBAR =
+ "metabase/qb/OPEN_AI_QUESTION_ANALYSIS_SIDEBAR";
export const onOpenAIQuestionAnalysisSidebar = createAction(
- "metabase/qb/OPEN_AI_QUESTION_ANALYSIS_SIDEBAR",
+ OPEN_AI_QUESTION_ANALYSIS_SIDEBAR,
);
+
+export const CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR =
+ "metabase/qb/CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR";
export const onCloseAIQuestionAnalysisSidebar = createAction(
- "metabase/qb/CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR",
+ CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR,
);
-export const onOpenChartSettings = createAction(
- "metabase/qb/OPEN_CHART_SETTINGS",
-);
-export const onCloseChartSettings = createAction(
- "metabase/qb/CLOSE_CHART_SETTINGS",
-);
-export const onOpenChartType = createAction("metabase/qb/OPEN_CHART_TYPE");
+export const OPEN_CHART_SETTINGS = "metabase/qb/OPEN_CHART_SETTINGS";
+export const onOpenChartSettings = createAction(OPEN_CHART_SETTINGS);
-export const onOpenQuestionInfo = createAction(
- "metabase/qb/OPEN_QUESTION_INFO",
-);
-export const onCloseQuestionInfo = createAction(
- "metabase/qb/CLOSE_QUESTION_INFO",
-);
+export const CLOSE_CHART_SETTINGS = "metabase/qb/CLOSE_CHART_SETTINGS";
+export const onCloseChartSettings = createAction(CLOSE_CHART_SETTINGS);
-export const onOpenQuestionSettings = createAction(
- "metabase/qb/OPEN_QUESTION_SETTINGS",
-);
-export const onCloseQuestionSettings = createAction(
- "metabase/qb/CLOSE_QUESTION_SETTINGS",
-);
+export const OPEN_CHART_TYPE = "metabase/qb/OPEN_CHART_TYPE";
+export const onOpenChartType = createAction(OPEN_CHART_TYPE);
+
+export const OPEN_QUESTION_INFO = "metabase/qb/OPEN_QUESTION_INFO";
+export const onOpenQuestionInfo = createAction(OPEN_QUESTION_INFO);
+
+export const CLOSE_QUESTION_INFO = "metabase/qb/CLOSE_QUESTION_INFO";
+export const onCloseQuestionInfo = createAction(CLOSE_QUESTION_INFO);
+
+export const OPEN_QUESTION_SETTINGS = "metabase/qb/OPEN_QUESTION_SETTINGS";
+export const onOpenQuestionSettings = createAction(OPEN_QUESTION_SETTINGS);
+
+export const CLOSE_QUESTION_SETTINGS = "metabase/qb/CLOSE_QUESTION_SETTINGS";
+export const onCloseQuestionSettings = createAction(CLOSE_QUESTION_SETTINGS);
+
+export const OPEN_TIMELINES = "metabase/qb/OPEN_TIMELINES";
+export const onOpenTimelines = createAction(OPEN_TIMELINES);
+
+export const CLOSE_TIMELINES = "metabase/qb/CLOSE_TIMELINES";
+export const onCloseTimelines = createAction(CLOSE_TIMELINES);
-export const onOpenTimelines = createAction("metabase/qb/OPEN_TIMELINES");
-export const onCloseTimelines = createAction("metabase/qb/CLOSE_TIMELINES");
+export const CLOSE_CHART_TYPE = "metabase/qb/CLOSE_CHART_TYPE";
+export const onCloseChartType = createAction(CLOSE_CHART_TYPE);
-export const onCloseChartType = createAction("metabase/qb/CLOSE_CHART_TYPE");
-export const onCloseSidebars = createAction("metabase/qb/CLOSE_SIDEBARS");
+export const CLOSE_SIDEBARS = "metabase/qb/CLOSE_SIDEBARS";
+export const onCloseSidebars = createAction(CLOSE_SIDEBARS);
export const SHOW_CHART_SETTINGS = "metabase/qb/SHOW_CHART_SETTINGS";
export const showChartSettings = createAction(SHOW_CHART_SETTINGS);
diff --git a/frontend/src/metabase/query_builder/actions/url.ts b/frontend/src/metabase/query_builder/actions/url.ts
index 0789fb65671..27ebe253ab7 100644
--- a/frontend/src/metabase/query_builder/actions/url.ts
+++ b/frontend/src/metabase/query_builder/actions/url.ts
@@ -78,7 +78,9 @@ export const updateUrl = createThunkAction(
datasetEditorTab = getDatasetEditorTab(getState());
}
- const card = isAdHocModelOrMetric ? getCard(getState()) : question.card();
+ const card = isAdHocModelOrMetric
+ ? getCard(getState())!
+ : question.card();
const newState = {
card,
cardId: question.id(),
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
index 3b77fe35f56..18462605a77 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
@@ -70,7 +70,7 @@ type NativeQueryEditorProps = Omit<CodeMirrorEditorProps, "query"> & {
hasParametersList?: boolean;
hasRunButton?: boolean;
hasTopBar?: boolean;
- highlightedLineNumbers?: number;
+ highlightedLineNumbers?: number[];
insertSnippet?: (snippet: NativeQuerySnippet) => void;
isInitiallyOpen?: boolean;
isNativeEditorOpen: boolean;
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
index eb547e7d42e..6faa08de9cd 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
@@ -28,11 +28,11 @@ export const RightViewFooterButtonGroup = () => {
result,
isObjectDetail,
}) && <QuestionRowCount />}
- {ExecutionTime.shouldRender({ result }) && (
+ {result && ExecutionTime.shouldRender({ result }) && (
<ExecutionTime time={result.running_time} />
)}
<Group gap="sm" wrap="nowrap">
- {QuestionLastUpdated.shouldRender({ result }) && (
+ {result && QuestionLastUpdated.shouldRender({ result }) && (
<QuestionLastUpdated
className={cx(CS.hide, CS.smShow)}
result={result}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
index 2997a27fcee..81f19374ef7 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
@@ -16,6 +16,7 @@ export const ViewFooterDownloadWidget = () => {
return (
question &&
+ result &&
QuestionDownloadPopover.shouldRender({ result }) && (
<QuestionDownloadPopover
className={cx(CS.hide, CS.smShow)}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
index 20d58ca5125..1eac9e4bca0 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
@@ -54,7 +54,7 @@ interface ViewTitleHeaderProps {
}) => void;
cancelQuery: () => void;
onOpenModal: (modalType: QueryModalType) => void;
- onEditSummary: () => void;
+ editSummary: () => void;
onCloseSummary: () => void;
setQueryBuilderMode: (
mode: QueryBuilderMode,
@@ -98,7 +98,7 @@ export function ViewTitleHeader({
isActionListVisible,
runQuestionQuery,
cancelQuery,
- onEditSummary,
+ editSummary,
onCloseSummary,
setQueryBuilderMode,
isShowingQuestionInfoSidebar,
@@ -191,7 +191,7 @@ export function ViewTitleHeader({
runQuestionQuery={runQuestionQuery}
cancelQuery={cancelQuery}
onOpenModal={onOpenModal}
- onEditSummary={onEditSummary}
+ editSummary={editSummary}
onCloseSummary={onCloseSummary}
setQueryBuilderMode={setQueryBuilderMode}
toggleBookmark={toggleBookmark}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
index 64e204a4e69..fd2f56723b8 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
@@ -139,7 +139,7 @@ function setup({
onOpenModal: jest.fn(),
onAddFilter: jest.fn(),
onCloseFilter: jest.fn(),
- onEditSummary: jest.fn(),
+ editSummary: jest.fn(),
onOpenQuestionInfo: jest.fn(),
onCloseSummary: jest.fn(),
onSave: jest.fn(),
@@ -320,12 +320,12 @@ describe("ViewTitleHeader", () => {
});
it("offers to summarize query results", () => {
- const { onEditSummary } = setup({
+ const { editSummary } = setup({
card,
queryBuilderMode: "view",
});
fireEvent.click(screen.getByText("Summarize"));
- expect(onEditSummary).toHaveBeenCalled();
+ expect(editSummary).toHaveBeenCalled();
});
it("allows to open notebook editor", () => {
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index 8cf0a3490c0..dbb73b6ef12 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -41,9 +41,12 @@ export function QueryBuilderBackButton({
onClick?.();
};
- const url = Urls.modelToUrl(parent);
+ if (!parent.model) {
+ return null;
+ }
- if (!parent.model || !url) {
+ const url = Urls.modelToUrl(parent as Urls.UrlableModel);
+ if (!url) {
return null;
}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
index 87c92d879ab..4419ccfa337 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionSummarizeWidget.tsx
@@ -10,20 +10,20 @@ import ViewTitleHeaderS from "../ViewTitleHeader.module.css";
interface QuestionSummarizeWidgetProps {
isShowingSummarySidebar: boolean;
- onEditSummary: () => void;
+ editSummary: () => void;
onCloseSummary: () => void;
}
export function QuestionSummarizeWidget({
isShowingSummarySidebar,
- onEditSummary,
+ editSummary,
onCloseSummary,
}: QuestionSummarizeWidgetProps) {
const handleClick = () => {
if (isShowingSummarySidebar) {
onCloseSummary();
} else {
- onEditSummary();
+ editSummary();
}
};
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
index 6e5303a8f61..8cc27d68e71 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
@@ -49,7 +49,7 @@ interface ViewTitleHeaderRightSideProps {
}) => void;
cancelQuery: () => void;
onOpenModal: (modalType: QueryModalType) => void;
- onEditSummary: () => void;
+ editSummary: () => void;
onCloseSummary: () => void;
setQueryBuilderMode: (
mode: QueryBuilderMode,
@@ -85,7 +85,7 @@ export function ViewTitleHeaderRightSide({
runQuestionQuery,
cancelQuery,
onOpenModal,
- onEditSummary,
+ editSummary,
onCloseSummary,
setQueryBuilderMode,
areFiltersExpanded,
@@ -182,7 +182,7 @@ export function ViewTitleHeaderRightSide({
}) && (
<QuestionSummarizeWidget
isShowingSummarySidebar={isShowingSummarySidebar}
- onEditSummary={onEditSummary}
+ editSummary={editSummary}
onCloseSummary={onCloseSummary}
/>
)}
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
index 80060999b20..850b5ebd6e1 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
@@ -271,7 +271,9 @@ function QueryBuilderInner(props: QueryBuilderInnerProps) {
!didTrackFirstNonTableChartGeneratedRef.current &&
isNonTable
) {
- setDidFirstNonTableChartRender(card);
+ if (card) {
+ setDidFirstNonTableChartRender(card);
+ }
didTrackFirstNonTableChartGeneratedRef.current = true;
}
},
@@ -319,7 +321,9 @@ function QueryBuilderInner(props: QueryBuilderInnerProps) {
trackCardBookmarkAdded(card);
}
- toggleBookmark(card.id);
+ if (card) {
+ toggleBookmark(card.id.toString());
+ }
};
/**
@@ -432,7 +436,7 @@ function QueryBuilderInner(props: QueryBuilderInnerProps) {
) {
showNotification(
t`All Set! Your question is ready.`,
- t`${card.name} is loaded.`,
+ t`${card?.name} is loaded.`,
);
}
}
diff --git a/frontend/src/metabase/query_builder/defaults.ts b/frontend/src/metabase/query_builder/defaults.ts
index 44004c8933c..35be345b119 100644
--- a/frontend/src/metabase/query_builder/defaults.ts
+++ b/frontend/src/metabase/query_builder/defaults.ts
@@ -21,7 +21,7 @@ export const DEFAULT_UI_CONTROLS: QueryBuilderUIControls = {
initialChartSetting: {},
isShowingRawTable: false, // table/viz toggle
queryBuilderMode: "view", // "view" | "notebook" | "dataset"
- previousQueryBuilderMode: false,
+ previousQueryBuilderMode: null,
snippetCollectionId: null,
datasetEditorTab: "query",
isShowingQuestionDetailsSidebar: false,
@@ -33,6 +33,8 @@ export const DEFAULT_UI_CONTROLS: QueryBuilderUIControls = {
modalContext: null,
highlightedNativeQueryLineNumbers: [],
isShowingListViewConfiguration: false,
+ nativeEditorSelectedRange: [],
+ questionDetailsTimelineDrawerState: null,
};
export const DEFAULT_LOADING_CONTROLS: QueryBuilderLoadingControls = {
diff --git a/frontend/src/metabase/query_builder/reducers-typed.ts b/frontend/src/metabase/query_builder/reducers-typed.ts
deleted file mode 100644
index 34efaf0c780..00000000000
--- a/frontend/src/metabase/query_builder/reducers-typed.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { createReducer } from "@reduxjs/toolkit";
-
-import {
- createCardPublicLink,
- deleteCardPublicLink,
- updateCardEmbeddingParams,
- updateCardEnableEmbedding,
-} from "metabase/api";
-import type { Card } from "metabase-types/api";
-
-import {
- API_CREATE_QUESTION,
- API_UPDATE_QUESTION,
- CANCEL_QUESTION_CHANGES,
- CLOSE_QB,
- INITIALIZE_QB,
- QUERY_COMPLETED,
- RELOAD_CARD,
- RESET_QB,
- SET_CARD_AND_RUN,
- SOFT_RELOAD_CARD,
- UPDATE_QUESTION,
-} from "./actions";
-
-// the card that is actively being worked on
-export const card = createReducer<Card | null>(null, (builder) => {
- // @ts-expect-error — Draft<Card> triggers TS2589 due to Card's recursive types (StructuredQuery, Field, etc.)
- builder
- .addCase(RESET_QB, () => null)
- .addCase(CLOSE_QB, () => null)
- .addCase<
- string,
- {
- type: string;
- payload: {
- card: Card;
- };
- }
- >(INITIALIZE_QB, (state, action) =>
- action.payload ? action.payload.card : null,
- )
- .addCase<
- string,
- {
- type: string;
- payload: Card;
- }
- >(SOFT_RELOAD_CARD, (state, action) => action.payload)
- .addCase<
- string,
- {
- type: string;
- payload: Card;
- }
- >(RELOAD_CARD, (state, action) => action.payload)
- .addCase<
- string,
- {
- type: string;
- payload: {
- card: Card;
- };
- }
- >(SET_CARD_AND_RUN, (state, action) => action.payload.card)
- .addCase<
- string,
- {
- type: string;
- payload: Card;
- }
- >(API_CREATE_QUESTION, (state, action) => action.payload)
- .addCase<
- string,
- {
- type: string;
- payload: Card;
- }
- >(API_UPDATE_QUESTION, (state, action) => action.payload)
- .addCase<
- string,
- {
- type: string;
- payload: {
- card: Card;
- };
- }
- >(CANCEL_QUESTION_CHANGES, (state, action) => action.payload.card)
- .addCase<
- string,
- {
- type: string;
- payload: {
- card: Card;
- };
- }
- >(UPDATE_QUESTION, (state, action) => action.payload.card)
- .addCase<
- string,
- {
- type: string;
- payload: {
- card: Card;
- };
- }
- >(QUERY_COMPLETED, (state, action) => {
- if (!state) {
- return state;
- }
- return {
- ...state,
- display: action.payload.card.display,
- result_metadata: action.payload.card.result_metadata,
- visualization_settings: action.payload.card.visualization_settings,
- };
- })
- .addMatcher(createCardPublicLink.matchFulfilled, (state, action) => {
- if (!state) {
- return state;
- }
- return {
- ...state,
- public_uuid: action.payload.uuid,
- };
- })
- .addMatcher(deleteCardPublicLink.matchFulfilled, (state) => {
- if (!state) {
- return state;
- }
-
- return {
- ...state,
- public_uuid: null,
- };
- })
- .addMatcher(updateCardEnableEmbedding.matchFulfilled, (state, action) => {
- if (!state) {
- return state;
- }
- return {
- ...state,
- enable_embedding: action.payload.enable_embedding,
- };
- })
- .addMatcher(updateCardEmbeddingParams.matchFulfilled, (state, action) => {
- if (!state) {
- return state;
- }
-
- return {
- ...state,
- embedding_params: action.payload.embedding_params,
- initially_published_at: action.payload.initially_published_at,
- };
- });
-});
diff --git a/frontend/src/metabase/query_builder/reducers.js b/frontend/src/metabase/query_builder/reducers.js
deleted file mode 100644
index 2d9cc43fc49..00000000000
--- a/frontend/src/metabase/query_builder/reducers.js
+++ /dev/null
@@ -1,533 +0,0 @@
-import { assoc, merge } from "icepick";
-import { handleActions } from "redux-actions";
-import _ from "underscore";
-
-import {
- EDIT_QUESTION,
- NAVIGATE_TO_NEW_CARD,
-} from "metabase/dashboard/actions";
-import { TimelineEvents } from "metabase/entities/timeline-events";
-import { copy } from "metabase/lib/utils";
-
-import {
- API_CREATE_QUESTION,
- API_UPDATE_QUESTION,
- CANCEL_QUERY,
- CANCEL_QUESTION_CHANGES,
- CLEAR_OBJECT_DETAIL_FK_REFERENCES,
- CLEAR_QUERY_RESULT,
- CLOSE_QB,
- CLOSE_QB_NEWB_MODAL,
- DESELECT_TIMELINE_EVENTS,
- HIDE_TIMELINE_EVENTS,
- INITIALIZE_QB,
- LOAD_OBJECT_DETAIL_FK_REFERENCES,
- OPEN_DATA_REFERENCE_AT_QUESTION,
- QUERY_COMPLETED,
- QUERY_ERRORED,
- RELOAD_CARD,
- RESET_QB,
- RESET_ROW_ZOOM,
- RESET_UI_CONTROLS,
- RUN_QUERY,
- SELECT_TIMELINE_EVENTS,
- SET_CARD_AND_RUN,
- SET_CURRENT_STATE,
- SET_DATA_REFERENCE_STACK,
- SET_DOCUMENT_TITLE,
- SET_DOCUMENT_TITLE_TIMEOUT_ID,
- SET_IS_SHOWING_TEMPLATE_TAGS_EDITOR,
- SET_METADATA_DIFF,
- SET_MODAL_SNIPPET,
- SET_NATIVE_EDITOR_SELECTED_RANGE,
- SET_PARAMETER_VALUE,
- SET_SHOW_LOADING_COMPLETE_FAVICON,
- SET_SNIPPET_COLLECTION_ID,
- SET_UI_CONTROLS,
- SHOW_CHART_SETTINGS,
- SHOW_TIMELINE_EVENTS,
- TOGGLE_DATA_REFERENCE,
- TOGGLE_SNIPPET_SIDEBAR,
- TOGGLE_TEMPLATE_TAGS_EDITOR,
- UPDATE_QUESTION,
- ZOOM_IN_ROW,
- onCloseAIQuestionAnalysisSidebar,
- onCloseChartSettings,
- onCloseChartType,
- onCloseQuestionInfo,
- onCloseQuestionSettings,
- onCloseSidebars,
- onCloseSummary,
- onCloseTimelines,
- onEditSummary,
- onOpenAIQuestionAnalysisSidebar,
- onOpenChartSettings,
- onOpenChartType,
- onOpenQuestionInfo,
- onOpenQuestionSettings,
- onOpenTimelines,
-} from "./actions";
-import {
- CLOSED_NATIVE_EDITOR_SIDEBARS,
- DEFAULT_LOADING_CONTROLS,
- DEFAULT_PARENT_ENTITY_STATE,
- DEFAULT_QUERY_STATUS,
- DEFAULT_UI_CONTROLS,
- UI_CONTROLS_SIDEBAR_DEFAULTS,
-} from "./defaults";
-
-function setUIControls(state, changes) {
- const { queryBuilderMode: currentQBMode, ...currentState } = state;
- const { queryBuilderMode: nextQBMode, ...nextStateChanges } = changes;
-
- const isChangingQBMode = nextQBMode && currentQBMode !== nextQBMode;
- const isOpeningEditingQBMode = isChangingQBMode && nextQBMode !== "view";
-
- const queryBuilderMode = nextQBMode || currentQBMode;
- const previousQueryBuilderMode = isChangingQBMode
- ? currentQBMode
- : state.previousQueryBuilderMode;
-
- // Close all the sidebars when entering notebook/dataset QB modes
- const extraState = isOpeningEditingQBMode ? UI_CONTROLS_SIDEBAR_DEFAULTS : {};
-
- return {
- ...currentState,
- ...extraState,
- ...nextStateChanges,
- queryBuilderMode,
- previousQueryBuilderMode,
- };
-}
-
-export const uiControls = handleActions(
- {
- [SET_UI_CONTROLS]: {
- next: (state, { payload }) => setUIControls(state, payload),
- },
-
- [RESET_UI_CONTROLS]: {
- next: (state) => ({
- ...DEFAULT_UI_CONTROLS,
- isRunning: state.isRunning,
- }),
- },
-
- [INITIALIZE_QB]: {
- next: (state, { payload }) => {
- return {
- ...state,
- ...DEFAULT_UI_CONTROLS,
- ...payload.uiControls,
- };
- },
- },
-
- [UPDATE_QUESTION]: {
- next: (state, { payload }) => ({
- ...state,
- highlightedNativeQueryLineNumbers:
- DEFAULT_UI_CONTROLS.highlightedNativeQueryLineNumbers,
- }),
- },
- [TOGGLE_DATA_REFERENCE]: {
- next: (state, { payload }) => ({
- ...state,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingDataReference: !state.isShowingDataReference,
- }),
- },
- [SET_DATA_REFERENCE_STACK]: {
- next: (state, { payload }) => ({
- ...state,
- dataReferenceStack: payload,
- }),
- },
- [OPEN_DATA_REFERENCE_AT_QUESTION]: {
- next: (state, { payload }) => {
- return payload
- ? {
- ...state,
- dataReferenceStack: payload,
- isShowingDataReference: true,
- }
- : state;
- },
- },
- [TOGGLE_TEMPLATE_TAGS_EDITOR]: {
- next: (state, { payload }) => ({
- ...state,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingTemplateTagsEditor: !state.isShowingTemplateTagsEditor,
- }),
- },
- [TOGGLE_SNIPPET_SIDEBAR]: {
- next: (state, { payload }) => ({
- ...state,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingSnippetSidebar: !state.isShowingSnippetSidebar,
- snippetCollectionId: null,
- }),
- },
- [SET_IS_SHOWING_TEMPLATE_TAGS_EDITOR]: {
- next: (state, { isShowingTemplateTagsEditor }) => ({
- ...state,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingTemplateTagsEditor,
- }),
- },
- [SET_NATIVE_EDITOR_SELECTED_RANGE]: (state, { payload }) => ({
- ...state,
- nativeEditorSelectedRange: payload,
- }),
- [SET_MODAL_SNIPPET]: (state, { payload }) => ({
- ...state,
- modalSnippet: payload,
- }),
- [SET_SNIPPET_COLLECTION_ID]: (state, { payload }) => ({
- ...state,
- snippetCollectionId: payload,
- }),
- [CLOSE_QB_NEWB_MODAL]: {
- next: (state, { payload }) => ({ ...state, isShowingNewbModal: false }),
- },
-
- [RUN_QUERY]: (state) => ({
- ...state,
- isRunning: true,
- highlightedNativeQueryLineNumbers:
- DEFAULT_UI_CONTROLS.highlightedNativeQueryLineNumbers,
- }),
- [CANCEL_QUERY]: {
- next: (state, { payload }) => ({ ...state, isRunning: false }),
- },
- [QUERY_COMPLETED]: {
- next: (state, { payload }) => ({
- ...state,
- isRunning: false,
- }),
- },
- [QUERY_ERRORED]: {
- next: (state, { payload }) => ({ ...state, isRunning: false }),
- },
-
- [SHOW_CHART_SETTINGS]: {
- next: (state, { payload }) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingChartSettingsSidebar: true,
- initialChartSetting: payload,
- }),
- },
- [CANCEL_QUESTION_CHANGES]: {
- next: (state) => ({
- ...state,
- isModifiedFromNotebook: false,
- }),
- },
- // AGGREGATION
- [onEditSummary]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingSummarySidebar: true,
- }),
- [onCloseSummary]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- [onOpenAIQuestionAnalysisSidebar]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingAIQuestionAnalysisSidebar: true,
- }),
- [onCloseAIQuestionAnalysisSidebar]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- [onOpenChartSettings]: (
- state,
- { payload: { initialChartSettings, showSidebarTitle = false } = {} },
- ) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingChartSettingsSidebar: true,
- initialChartSetting: initialChartSettings,
- showSidebarTitle: showSidebarTitle,
- }),
- [onCloseChartSettings]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- [onOpenChartType]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingChartTypeSidebar: true,
- }),
- [onCloseChartType]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- [onOpenQuestionInfo]: (state) =>
- setUIControls(state, {
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingQuestionInfoSidebar: true,
- queryBuilderMode: "view",
- }),
- [onCloseQuestionInfo]: (state) => ({
- ...state,
- isShowingQuestionInfoSidebar: false,
- }),
- [onOpenQuestionSettings]: (state) =>
- setUIControls(state, {
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- isShowingQuestionSettingsSidebar: true,
- queryBuilderMode: "view",
- }),
- [onCloseQuestionSettings]: (state) => ({
- ...state,
- isShowingQuestionSettingsSidebar: false,
- }),
- [onOpenTimelines]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingTimelineSidebar: true,
- }),
- [onCloseTimelines]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- [onCloseSidebars]: (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- }),
- },
- DEFAULT_UI_CONTROLS,
-);
-
-export const loadingControls = handleActions(
- {
- [SET_DOCUMENT_TITLE]: (state, { payload }) => ({
- ...state,
- documentTitle: payload,
- }),
- [SET_SHOW_LOADING_COMPLETE_FAVICON]: (state, { payload }) => ({
- ...state,
- showLoadCompleteFavicon: payload,
- }),
- [SET_DOCUMENT_TITLE_TIMEOUT_ID]: (state, { payload }) => ({
- ...state,
- timeoutId: payload,
- }),
- },
- DEFAULT_LOADING_CONTROLS,
-);
-
-export const queryStatus = handleActions(
- {
- [RUN_QUERY]: (state) => "running",
- [QUERY_COMPLETED]: (state) => "complete",
- [CANCEL_QUERY]: (state) => "idle",
- },
- DEFAULT_QUERY_STATUS,
-);
-
-export const zoomedRowObjectId = handleActions(
- {
- [INITIALIZE_QB]: {
- next: (state, { payload }) => payload?.objectId ?? null,
- },
- [ZOOM_IN_ROW]: {
- next: (state, { payload }) => payload.objectId,
- },
- [RESET_ROW_ZOOM]: { next: () => null },
- [RESET_QB]: { next: () => null },
- },
- null,
-);
-
-// a copy of the card being worked on at it's last known saved state. if the card is NEW then this should be null.
-// NOTE: we use JSON serialization/deserialization to ensure a deep clone of the object which is required
-// because we can't have any links between the active card being modified and the "originalCard" for testing dirtiness
-// ALSO: we consistently check for payload.id because an unsaved card has no "originalCard"
-export const originalCard = handleActions(
- {
- [INITIALIZE_QB]: {
- next: (state, { payload }) =>
- payload.originalCard ? copy(payload.originalCard) : null,
- },
- [RELOAD_CARD]: {
- next: (state, { payload }) => (payload.id ? copy(payload) : null),
- },
- [SET_CARD_AND_RUN]: {
- next: (state, { payload }) =>
- payload.originalCard ? copy(payload.originalCard) : null,
- },
- [API_CREATE_QUESTION]: {
- next: (state, { payload }) => copy(payload),
- },
- [API_UPDATE_QUESTION]: {
- next: (state, { payload }) => copy(payload),
- },
- },
- null,
-);
-
-// references to FK tables specifically used on the ObjectDetail page.
-export const tableForeignKeyReferences = handleActions(
- {
- [LOAD_OBJECT_DETAIL_FK_REFERENCES]: {
- next: (state, { payload }) => payload,
- },
- [CLEAR_OBJECT_DETAIL_FK_REFERENCES]: () => null,
- },
- null,
-);
-
-export const lastRunCard = handleActions(
- {
- [RESET_QB]: { next: (state, { payload }) => null },
- [QUERY_COMPLETED]: { next: (state, { payload }) => payload.card },
- [QUERY_ERRORED]: { next: (state, { payload }) => null },
- },
- null,
-);
-
-// The results of a query execution. optionally an error if the query fails to complete successfully.
-export const queryResults = handleActions(
- {
- [RESET_QB]: { next: (state, { payload }) => null },
- [QUERY_COMPLETED]: {
- next: (state, { payload: { queryResults } }) => queryResults,
- },
- [QUERY_ERRORED]: {
- next: (state, { payload }) => (payload ? [payload] : state),
- },
- [CLEAR_QUERY_RESULT]: { next: (state, { payload }) => null },
- },
- null,
-);
-
-export const metadataDiff = handleActions(
- {
- [RESET_QB]: { next: () => ({}) },
- [API_CREATE_QUESTION]: { next: () => ({}) },
- [API_UPDATE_QUESTION]: { next: () => ({}) },
- [SET_METADATA_DIFF]: {
- next: (state, { payload }) => {
- const { name, changes } = payload;
- return {
- ...state,
- [name]: state[name] ? merge(state[name], changes) : changes,
- };
- },
- },
- [CANCEL_QUESTION_CHANGES]: { next: () => ({}) },
- },
- {},
-);
-
-// promise used for tracking a query execution in progress. when a query is started we capture this.
-export const cancelQueryDeferred = handleActions(
- {
- [RUN_QUERY]: {
- next: (state, { payload: { cancelQueryDeferred } }) =>
- cancelQueryDeferred,
- },
- [CANCEL_QUERY]: { next: (state, { payload }) => null },
- [QUERY_COMPLETED]: { next: (state, { payload }) => null },
- [QUERY_ERRORED]: { next: (state, { payload }) => null },
- },
- null,
-);
-
-export const queryStartTime = handleActions(
- {
- [RUN_QUERY]: { next: (state, { payload }) => performance.now() },
- [CANCEL_QUERY]: { next: (state, { payload }) => null },
- [QUERY_COMPLETED]: { next: (state, { payload }) => null },
- [QUERY_ERRORED]: { next: (state, { payload }) => null },
- },
- null,
-);
-
-export const parameterValues = handleActions(
- {
- [INITIALIZE_QB]: {
- next: (state, { payload: { parameterValues } }) => parameterValues,
- },
- [SET_PARAMETER_VALUE]: {
- next: (state, { payload: { id, value } }) => assoc(state, id, value),
- },
- },
- {},
-);
-
-export const currentState = handleActions(
- {
- [SET_CURRENT_STATE]: { next: (state, { payload }) => payload },
- },
- null,
-);
-
-export const parentEntity = handleActions(
- {
- [NAVIGATE_TO_NEW_CARD]: {
- next: (_state, { payload: { id, model, name } }) => ({
- id,
- model,
- name,
- isEditing: false,
- }),
- },
- [EDIT_QUESTION]: {
- next: (_state, { payload: { id, model, name } }) => ({
- id,
- model,
- name,
- isEditing: true,
- }),
- },
- [CLOSE_QB]: { next: () => DEFAULT_PARENT_ENTITY_STATE },
- },
- DEFAULT_PARENT_ENTITY_STATE,
-);
-
-export const visibleTimelineEventIds = handleActions(
- {
- [INITIALIZE_QB]: { next: () => [] },
- [SHOW_TIMELINE_EVENTS]: {
- next: (state, { payload: events }) =>
- _.uniq([...state, ...events.map((event) => event.id)]),
- },
- [HIDE_TIMELINE_EVENTS]: {
- next: (state, { payload: events }) => {
- const eventIdsToHide = events.map((event) => event.id);
- return state.filter((eventId) => !eventIdsToHide.includes(eventId));
- },
- },
- [TimelineEvents.actionTypes.CREATE]: {
- next: (state, { payload }) => [...state, payload.timelineEvent.id],
- },
- [RESET_QB]: { next: () => [] },
- },
- [],
-);
-
-export const selectedTimelineEventIds = handleActions(
- {
- [INITIALIZE_QB]: { next: () => [] },
- [SELECT_TIMELINE_EVENTS]: {
- next: (state, { payload: events = [] }) => events.map((e) => e.id),
- },
- [DESELECT_TIMELINE_EVENTS]: {
- next: () => [],
- },
- [onCloseTimelines]: { next: () => [] },
- [RESET_QB]: { next: () => [] },
- },
- [],
-);
-
-export * from "./reducers-typed";
diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.ts
new file mode 100644
index 00000000000..7f36940b2a5
--- /dev/null
+++ b/frontend/src/metabase/query_builder/reducers.ts
@@ -0,0 +1,758 @@
+import { createReducer } from "@reduxjs/toolkit";
+import { assoc, merge } from "icepick";
+import _ from "underscore";
+
+import {
+ createCardPublicLink,
+ deleteCardPublicLink,
+ updateCardEmbeddingParams,
+ updateCardEnableEmbedding,
+} from "metabase/api";
+import {
+ EDIT_QUESTION,
+ NAVIGATE_TO_NEW_CARD,
+} from "metabase/dashboard/actions";
+import { TimelineEvents } from "metabase/entities/timeline-events";
+import type { Deferred } from "metabase/lib/promise";
+import { copy } from "metabase/lib/utils";
+import type {
+ Card,
+ CollectionItemModel,
+ Dataset,
+ Field,
+ NativeQuerySnippet,
+ ParameterValuesMap,
+ TimelineEvent,
+} from "metabase-types/api";
+import type {
+ ForeignKeyReference,
+ InitialChartSettingState,
+ QueryBuilderLoadingControls,
+ QueryBuilderParentEntityState,
+ QueryBuilderQueryStatus,
+ QueryBuilderUIControls,
+ Range,
+} from "metabase-types/store";
+
+import {
+ API_CREATE_QUESTION,
+ API_UPDATE_QUESTION,
+ CANCEL_QUERY,
+ CANCEL_QUESTION_CHANGES,
+ CLEAR_OBJECT_DETAIL_FK_REFERENCES,
+ CLEAR_QUERY_RESULT,
+ CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR,
+ CLOSE_CHART_SETTINGS,
+ CLOSE_CHART_TYPE,
+ CLOSE_QB,
+ CLOSE_QB_NEWB_MODAL,
+ CLOSE_QUESTION_INFO,
+ CLOSE_QUESTION_SETTINGS,
+ CLOSE_SIDEBARS,
+ CLOSE_TIMELINES,
+ DESELECT_TIMELINE_EVENTS,
+ EDIT_SUMMARY,
+ HIDE_TIMELINE_EVENTS,
+ INITIALIZE_QB,
+ LOAD_OBJECT_DETAIL_FK_REFERENCES,
+ ON_CLOSE_SUMMARY,
+ OPEN_AI_QUESTION_ANALYSIS_SIDEBAR,
+ OPEN_CHART_SETTINGS,
+ OPEN_CHART_TYPE,
+ OPEN_DATA_REFERENCE_AT_QUESTION,
+ OPEN_QUESTION_INFO,
+ OPEN_QUESTION_SETTINGS,
+ OPEN_TIMELINES,
+ QUERY_COMPLETED,
+ QUERY_ERRORED,
+ RELOAD_CARD,
+ RESET_QB,
+ RESET_ROW_ZOOM,
+ RESET_UI_CONTROLS,
+ RUN_QUERY,
+ SELECT_TIMELINE_EVENTS,
+ SET_CARD_AND_RUN,
+ SET_CURRENT_STATE,
+ SET_DATA_REFERENCE_STACK,
+ SET_DOCUMENT_TITLE,
+ SET_DOCUMENT_TITLE_TIMEOUT_ID,
+ SET_IS_SHOWING_TEMPLATE_TAGS_EDITOR,
+ SET_METADATA_DIFF,
+ SET_MODAL_SNIPPET,
+ SET_NATIVE_EDITOR_SELECTED_RANGE,
+ SET_PARAMETER_VALUE,
+ SET_SHOW_LOADING_COMPLETE_FAVICON,
+ SET_SNIPPET_COLLECTION_ID,
+ SET_UI_CONTROLS,
+ SHOW_CHART_SETTINGS,
+ SHOW_TIMELINE_EVENTS,
+ SOFT_RELOAD_CARD,
+ TOGGLE_DATA_REFERENCE,
+ TOGGLE_SNIPPET_SIDEBAR,
+ TOGGLE_TEMPLATE_TAGS_EDITOR,
+ UPDATE_QUESTION,
+ ZOOM_IN_ROW,
+} from "./actions";
+import {
+ CLOSED_NATIVE_EDITOR_SIDEBARS,
+ DEFAULT_LOADING_CONTROLS,
+ DEFAULT_PARENT_ENTITY_STATE,
+ DEFAULT_QUERY_STATUS,
+ DEFAULT_UI_CONTROLS,
+ UI_CONTROLS_SIDEBAR_DEFAULTS,
+} from "./defaults";
+
+function setUIControls(
+ state: QueryBuilderUIControls,
+ changes: Partial<QueryBuilderUIControls>,
+): QueryBuilderUIControls {
+ const { queryBuilderMode: currentQBMode, ...currentState } = state;
+ const { queryBuilderMode: nextQBMode, ...nextStateChanges } = changes;
+
+ const isChangingQBMode = nextQBMode && currentQBMode !== nextQBMode;
+ const isOpeningEditingQBMode = isChangingQBMode && nextQBMode !== "view";
+
+ const queryBuilderMode = nextQBMode || currentQBMode;
+ // previousQueryBuilderMode is typed as boolean but stores QueryBuilderMode | false in practice
+ const previousQueryBuilderMode = isChangingQBMode
+ ? currentQBMode
+ : state.previousQueryBuilderMode;
+
+ // Close all the sidebars when entering notebook/dataset QB modes
+ const extraState = isOpeningEditingQBMode ? UI_CONTROLS_SIDEBAR_DEFAULTS : {};
+
+ return {
+ ...currentState,
+ ...extraState,
+ ...nextStateChanges,
+ queryBuilderMode,
+ previousQueryBuilderMode,
+ };
+}
+
+export const uiControls = createReducer<QueryBuilderUIControls>(
+ DEFAULT_UI_CONTROLS,
+ (builder) => {
+ builder
+ .addCase<
+ string,
+ { type: string; payload: Partial<QueryBuilderUIControls> }
+ >(SET_UI_CONTROLS, (state, action) =>
+ setUIControls(state, action.payload),
+ )
+ .addCase(RESET_UI_CONTROLS, (state) => ({
+ ...DEFAULT_UI_CONTROLS,
+ isRunning: state.isRunning,
+ }))
+ .addCase<
+ string,
+ { type: string; payload: { uiControls: QueryBuilderUIControls } }
+ >(INITIALIZE_QB, (state, action) => ({
+ ...state,
+ ...DEFAULT_UI_CONTROLS,
+ ...action.payload.uiControls,
+ }))
+ .addCase(UPDATE_QUESTION, (state) => ({
+ ...state,
+ highlightedNativeQueryLineNumbers:
+ DEFAULT_UI_CONTROLS.highlightedNativeQueryLineNumbers,
+ }))
+ .addCase(TOGGLE_DATA_REFERENCE, (state) => ({
+ ...state,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingDataReference: !state.isShowingDataReference,
+ }))
+ .addCase<
+ string,
+ { type: string; payload: QueryBuilderUIControls["dataReferenceStack"] }
+ >(SET_DATA_REFERENCE_STACK, (state, action) => ({
+ ...state,
+ dataReferenceStack: action.payload,
+ }))
+ .addCase<
+ string,
+ { type: string; payload: QueryBuilderUIControls["dataReferenceStack"] }
+ >(OPEN_DATA_REFERENCE_AT_QUESTION, (state, action) =>
+ action.payload
+ ? {
+ ...state,
+ dataReferenceStack: action.payload,
+ isShowingDataReference: true,
+ }
+ : state,
+ )
+ .addCase(TOGGLE_TEMPLATE_TAGS_EDITOR, (state) => ({
+ ...state,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingTemplateTagsEditor: !state.isShowingTemplateTagsEditor,
+ }))
+ .addCase(TOGGLE_SNIPPET_SIDEBAR, (state) => ({
+ ...state,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingSnippetSidebar: !state.isShowingSnippetSidebar,
+ snippetCollectionId: null,
+ }))
+ .addCase<string, { type: string; isShowingTemplateTagsEditor: boolean }>(
+ SET_IS_SHOWING_TEMPLATE_TAGS_EDITOR,
+ (state, action) => ({
+ ...state,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingTemplateTagsEditor: action.isShowingTemplateTagsEditor,
+ }),
+ )
+ .addCase<string, { type: string; payload: Range[] }>(
+ SET_NATIVE_EDITOR_SELECTED_RANGE,
+ (state, action) => ({
+ ...state,
+ nativeEditorSelectedRange: action.payload,
+ }),
+ )
+ .addCase<
+ string,
+ {
+ type: string;
+ payload:
+ | NativeQuerySnippet
+ | Partial<Omit<NativeQuerySnippet, "id">>
+ | null;
+ }
+ >(SET_MODAL_SNIPPET, (state, action) => ({
+ ...state,
+ modalSnippet: action.payload,
+ }))
+ .addCase<
+ string,
+ { type: string; payload: QueryBuilderUIControls["snippetCollectionId"] }
+ >(SET_SNIPPET_COLLECTION_ID, (state, action) => ({
+ ...state,
+ snippetCollectionId: action.payload,
+ }))
+ .addCase(CLOSE_QB_NEWB_MODAL, (state) => ({
+ ...state,
+ isShowingNewbModal: false,
+ }))
+ .addCase(RUN_QUERY, (state) => ({
+ ...state,
+ isRunning: true,
+ highlightedNativeQueryLineNumbers:
+ DEFAULT_UI_CONTROLS.highlightedNativeQueryLineNumbers,
+ }))
+ .addCase(CANCEL_QUERY, (state) => ({ ...state, isRunning: false }))
+ .addCase(QUERY_COMPLETED, (state) => ({ ...state, isRunning: false }))
+ .addCase(QUERY_ERRORED, (state) => ({ ...state, isRunning: false }))
+ .addCase<string, { type: string; payload: InitialChartSettingState }>(
+ SHOW_CHART_SETTINGS,
+ (state, action) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ isShowingChartSettingsSidebar: true,
+ initialChartSetting: action.payload,
+ }),
+ )
+ .addCase(CANCEL_QUESTION_CHANGES, (state) => ({
+ ...state,
+ isModifiedFromNotebook: false,
+ }))
+ .addCase(EDIT_SUMMARY, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ isShowingSummarySidebar: true,
+ }))
+ .addCase(ON_CLOSE_SUMMARY, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }))
+ .addCase(OPEN_AI_QUESTION_ANALYSIS_SIDEBAR, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ isShowingAIQuestionAnalysisSidebar: true,
+ }))
+ .addCase(CLOSE_AI_QUESTION_ANALYSIS_SIDEBAR, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }))
+ .addCase<
+ string,
+ {
+ type: string;
+ payload:
+ | {
+ initialChartSettings?: InitialChartSettingState;
+ showSidebarTitle?: boolean;
+ }
+ | undefined;
+ }
+ >(OPEN_CHART_SETTINGS, (state, action) => {
+ const { initialChartSettings, showSidebarTitle = false } =
+ action.payload ?? {};
+ return {
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ isShowingChartSettingsSidebar: true,
+ initialChartSetting: initialChartSettings ?? {},
+ showSidebarTitle,
+ };
+ })
+ .addCase(CLOSE_CHART_SETTINGS, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }))
+ .addCase(OPEN_CHART_TYPE, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ isShowingChartTypeSidebar: true,
+ }))
+ .addCase(CLOSE_CHART_TYPE, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }))
+ .addCase(OPEN_QUESTION_INFO, (state) =>
+ setUIControls(state, {
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingQuestionInfoSidebar: true,
+ queryBuilderMode: "view",
+ }),
+ )
+ .addCase(CLOSE_QUESTION_INFO, (state) => ({
+ ...state,
+ isShowingQuestionInfoSidebar: false,
+ }))
+ .addCase(OPEN_QUESTION_SETTINGS, (state) =>
+ setUIControls(state, {
+ ...(UI_CONTROLS_SIDEBAR_DEFAULTS as Partial<QueryBuilderUIControls>),
+ isShowingQuestionSettingsSidebar: true,
+ queryBuilderMode: "view",
+ } as Partial<QueryBuilderUIControls>),
+ )
+ .addCase(CLOSE_QUESTION_SETTINGS, (state) => ({
+ ...state,
+ isShowingQuestionSettingsSidebar: false,
+ }))
+ .addCase(OPEN_TIMELINES, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingTimelineSidebar: true,
+ }))
+ .addCase(CLOSE_TIMELINES, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }))
+ .addCase(CLOSE_SIDEBARS, (state) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ }));
+ },
+);
+
+export const loadingControls = createReducer<QueryBuilderLoadingControls>(
+ DEFAULT_LOADING_CONTROLS,
+ (builder) => {
+ builder
+ .addCase<string, { type: string; payload: string }>(
+ SET_DOCUMENT_TITLE,
+ (state, action) => ({
+ ...state,
+ documentTitle: action.payload,
+ }),
+ )
+ .addCase<string, { type: string; payload: boolean }>(
+ SET_SHOW_LOADING_COMPLETE_FAVICON,
+ (state, action) => ({
+ ...state,
+ showLoadCompleteFavicon: action.payload,
+ }),
+ )
+ .addCase<string, { type: string; payload: string }>(
+ SET_DOCUMENT_TITLE_TIMEOUT_ID,
+ (state, action) => ({
+ ...state,
+ timeoutId: action.payload,
+ }),
+ );
+ },
+);
+
+export const queryStatus = createReducer<QueryBuilderQueryStatus>(
+ DEFAULT_QUERY_STATUS,
+ (builder) => {
+ builder
+ .addCase(RUN_QUERY, () => "running" as const)
+ .addCase(QUERY_COMPLETED, () => "complete" as const)
+ .addCase(CANCEL_QUERY, () => "idle" as const);
+ },
+);
+
+export const zoomedRowObjectId = createReducer<number | string | null>(
+ null,
+ (builder) => {
+ builder
+ .addCase<
+ string,
+ { type: string; payload: { objectId?: number | string } | undefined }
+ >(INITIALIZE_QB, (_state, action) => action.payload?.objectId ?? null)
+ .addCase<
+ string,
+ { type: string; payload: { objectId: number | string } }
+ >(ZOOM_IN_ROW, (_state, action) => action.payload.objectId)
+ .addCase(RESET_ROW_ZOOM, () => null)
+ .addCase(RESET_QB, () => null);
+ },
+);
+
+// a copy of the card being worked on at its last known saved state. if the card is NEW then this should be null.
+// NOTE: we use JSON serialization/deserialization to ensure a deep clone of the object which is required
+// because we can't have any links between the active card being modified and the "originalCard" for testing dirtiness
+// ALSO: we consistently check for payload.id because an unsaved card has no "originalCard"
+export const originalCard = createReducer<Card | null>(null, (builder) => {
+ builder
+ .addCase<string, { type: string; payload: { originalCard?: Card } }>(
+ INITIALIZE_QB,
+ (_state, action) =>
+ action.payload.originalCard ? copy(action.payload.originalCard) : null,
+ )
+ .addCase<string, { type: string; payload: Card }>(
+ RELOAD_CARD,
+ (_state, action) => (action.payload.id ? copy(action.payload) : null),
+ )
+ .addCase<string, { type: string; payload: { originalCard?: Card } }>(
+ SET_CARD_AND_RUN,
+ (_state, action) =>
+ action.payload.originalCard ? copy(action.payload.originalCard) : null,
+ )
+ .addCase<string, { type: string; payload: Card }>(
+ API_CREATE_QUESTION,
+ (_state, action) => copy(action.payload),
+ )
+ .addCase<string, { type: string; payload: Card }>(
+ API_UPDATE_QUESTION,
+ (_state, action) => copy(action.payload),
+ );
+});
+
+// references to FK tables specifically used on the ObjectDetail page.
+export const tableForeignKeyReferences = createReducer<Record<
+ number,
+ ForeignKeyReference
+> | null>(null, (builder) => {
+ builder
+ .addCase<
+ string,
+ { type: string; payload: Record<number, ForeignKeyReference> }
+ >(LOAD_OBJECT_DETAIL_FK_REFERENCES, (_state, action) => action.payload)
+ .addCase(CLEAR_OBJECT_DETAIL_FK_REFERENCES, () => null);
+});
+
+export const lastRunCard = createReducer<Card | null>(null, (builder) => {
+ builder
+ .addCase(RESET_QB, () => null)
+ .addCase<string, { type: string; payload: { card: Card } }>(
+ QUERY_COMPLETED,
+ (_state, action) => action.payload.card,
+ )
+ .addCase(QUERY_ERRORED, () => null);
+});
+
+// The results of a query execution. optionally an error if the query fails to complete successfully.
+export const queryResults = createReducer<Dataset[] | null>(null, (builder) => {
+ builder
+ .addCase(RESET_QB, () => null)
+ .addCase<string, { type: string; payload: { queryResults: Dataset[] } }>(
+ QUERY_COMPLETED,
+ (_state, action) => action.payload.queryResults,
+ )
+ .addCase<string, { type: string; payload: Dataset | null }>(
+ QUERY_ERRORED,
+ // @ts-expect-error — Draft<Dataset[]> triggers TS2589 due to Dataset's recursive types
+ (state, action) => (action.payload ? [action.payload] : state),
+ )
+ .addCase(CLEAR_QUERY_RESULT, () => null);
+});
+
+export const metadataDiff = createReducer<Record<string, Partial<Field>>>(
+ {},
+ (builder) => {
+ builder
+ .addCase(RESET_QB, () => ({}))
+ .addCase(API_CREATE_QUESTION, () => ({}))
+ .addCase(API_UPDATE_QUESTION, () => ({}))
+ .addCase<
+ string,
+ { type: string; payload: { name: string; changes: Partial<Field> } }
+ >(SET_METADATA_DIFF, (state, action) => {
+ const { name, changes } = action.payload;
+ return {
+ ...state,
+ [name]: state[name] ? merge(state[name], changes) : changes,
+ };
+ })
+ .addCase(CANCEL_QUESTION_CHANGES, () => ({}));
+ },
+);
+
+// promise used for tracking a query execution in progress. when a query is started we capture this.
+export const cancelQueryDeferred = createReducer<Deferred<void> | null>(
+ null,
+ (builder) => {
+ builder
+ .addCase<
+ string,
+ { type: string; payload: { cancelQueryDeferred: Deferred<void> } }
+ >(RUN_QUERY, (_state, action) => action.payload.cancelQueryDeferred)
+ .addCase(CANCEL_QUERY, () => null)
+ .addCase(QUERY_COMPLETED, () => null)
+ .addCase(QUERY_ERRORED, () => null);
+ },
+);
+
+export const queryStartTime = createReducer<number | null>(null, (builder) => {
+ builder
+ .addCase(RUN_QUERY, () => performance.now())
+ .addCase(CANCEL_QUERY, () => null)
+ .addCase(QUERY_COMPLETED, () => null)
+ .addCase(QUERY_ERRORED, () => null);
+});
+
+export const parameterValues = createReducer<ParameterValuesMap>(
+ {},
+ (builder) => {
+ builder
+ .addCase<
+ string,
+ { type: string; payload: { parameterValues: ParameterValuesMap } }
+ >(INITIALIZE_QB, (_state, action) => action.payload.parameterValues)
+ .addCase<
+ string,
+ { type: string; payload: { id: string; value: unknown } }
+ >(SET_PARAMETER_VALUE, (state, action) => assoc(state, action.payload.id, action.payload.value));
+ },
+);
+
+export const currentState = createReducer<{
+ card: Card;
+ cardId?: number;
+ serializedCard: string;
+} | null>(null, (builder) => {
+ builder.addCase<
+ string,
+ {
+ type: string;
+ payload: { card: Card; cardId?: number; serializedCard: string };
+ }
+ >(SET_CURRENT_STATE, (_state, action) => action.payload);
+});
+
+export const parentEntity = createReducer<QueryBuilderParentEntityState>(
+ DEFAULT_PARENT_ENTITY_STATE,
+ (builder) => {
+ builder
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ id: number | string | null;
+ model: CollectionItemModel | null;
+ name: string | null;
+ };
+ }
+ >(NAVIGATE_TO_NEW_CARD, (_state, action) => ({
+ id: action.payload.id,
+ model: action.payload.model,
+ name: action.payload.name,
+ isEditing: false,
+ }))
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ id: number | string | null;
+ model: CollectionItemModel | null;
+ name: string | null;
+ };
+ }
+ >(EDIT_QUESTION, (_state, action) => ({
+ id: action.payload.id,
+ model: action.payload.model,
+ name: action.payload.name,
+ isEditing: true,
+ }))
+ .addCase(CLOSE_QB, () => DEFAULT_PARENT_ENTITY_STATE);
+ },
+);
+
+export const visibleTimelineEventIds = createReducer<number[]>(
+ [],
+ (builder) => {
+ builder
+ .addCase(INITIALIZE_QB, () => [])
+ .addCase<string, { type: string; payload: TimelineEvent[] }>(
+ SHOW_TIMELINE_EVENTS,
+ (state, action) =>
+ _.uniq([...state, ...action.payload.map((event) => event.id)]),
+ )
+ .addCase<string, { type: string; payload: TimelineEvent[] }>(
+ HIDE_TIMELINE_EVENTS,
+ (state, action) => {
+ const eventIdsToHide = action.payload.map((event) => event.id);
+ return state.filter((eventId) => !eventIdsToHide.includes(eventId));
+ },
+ )
+ .addCase<
+ string,
+ { type: string; payload: { timelineEvent: { id: number } } }
+ >(TimelineEvents.actionTypes.CREATE, (state, action) => [
+ ...state,
+ action.payload.timelineEvent.id,
+ ])
+ .addCase(RESET_QB, () => []);
+ },
+);
+
+export const selectedTimelineEventIds = createReducer<number[]>(
+ [],
+ (builder) => {
+ builder
+ .addCase(INITIALIZE_QB, () => [])
+ .addCase<string, { type: string; payload: TimelineEvent[] | undefined }>(
+ SELECT_TIMELINE_EVENTS,
+ (_state, action) => (action.payload ?? []).map((e) => e.id),
+ )
+ .addCase(DESELECT_TIMELINE_EVENTS, () => [])
+ .addCase(CLOSE_TIMELINES, () => [])
+ .addCase(RESET_QB, () => []);
+ },
+);
+
+// the card that is actively being worked on
+export const card = createReducer<Card | null>(null, (builder) => {
+ builder
+ .addCase(RESET_QB, () => null)
+ .addCase(CLOSE_QB, () => null)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ card: Card;
+ };
+ }
+ >(INITIALIZE_QB, (state, action) =>
+ action.payload ? action.payload.card : null,
+ )
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: Card;
+ }
+ >(SOFT_RELOAD_CARD, (state, action) => action.payload)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: Card;
+ }
+ >(RELOAD_CARD, (state, action) => action.payload)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ card: Card;
+ };
+ }
+ >(SET_CARD_AND_RUN, (state, action) => action.payload.card)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: Card;
+ }
+ >(API_CREATE_QUESTION, (state, action) => action.payload)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: Card;
+ }
+ >(API_UPDATE_QUESTION, (state, action) => action.payload)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ card: Card;
+ };
+ }
+ >(CANCEL_QUESTION_CHANGES, (state, action) => action.payload.card)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ card: Card;
+ };
+ }
+ >(UPDATE_QUESTION, (state, action) => action.payload.card)
+ .addCase<
+ string,
+ {
+ type: string;
+ payload: {
+ card: Card;
+ };
+ }
+ >(QUERY_COMPLETED, (state, action) => {
+ if (!state) {
+ return state;
+ }
+ return {
+ ...state,
+ display: action.payload.card.display,
+ result_metadata: action.payload.card.result_metadata,
+ visualization_settings: action.payload.card.visualization_settings,
+ };
+ })
+ .addMatcher(createCardPublicLink.matchFulfilled, (state, action) => {
+ if (!state) {
+ return state;
+ }
+ return {
+ ...state,
+ public_uuid: action.payload.uuid,
+ };
+ })
+ .addMatcher(deleteCardPublicLink.matchFulfilled, (state) => {
+ if (!state) {
+ return state;
+ }
+
+ return {
+ ...state,
+ public_uuid: null,
+ };
+ })
+ .addMatcher(updateCardEnableEmbedding.matchFulfilled, (state, action) => {
+ if (!state) {
+ return state;
+ }
+ return {
+ ...state,
+ enable_embedding: action.payload.enable_embedding,
+ };
+ })
+ .addMatcher(updateCardEmbeddingParams.matchFulfilled, (state, action) => {
+ if (!state) {
+ return state;
+ }
+
+ return {
+ ...state,
+ embedding_params: action.payload.embedding_params,
+ initially_published_at: action.payload.initially_published_at,
+ };
+ });
+});
diff --git a/frontend/src/metabase/query_builder/selectors.js b/frontend/src/metabase/query_builder/selectors.ts
similarity index 79%
rename from frontend/src/metabase/query_builder/selectors.js
rename to frontend/src/metabase/query_builder/selectors.ts
index c65b84ce8db..ace265807ea 100644
--- a/frontend/src/metabase/query_builder/selectors.js
+++ b/frontend/src/metabase/query_builder/selectors.ts
@@ -1,6 +1,7 @@
/*eslint no-use-before-define: "error"*/
import { createSelector } from "@reduxjs/toolkit";
import * as d3 from "d3";
+import dayjs from "dayjs";
import { merge, updateIn } from "icepick";
import _ from "underscore";
@@ -25,6 +26,8 @@ import {
extractRemappings,
getVisualizationTransformed,
} from "metabase/visualizations";
+import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
+import type { TimeSeriesInterval } from "metabase/visualizations/echarts/cartesian/model/types";
import {
computeTimeseriesDataInterval,
minTimeseriesUnit,
@@ -36,34 +39,46 @@ import {
import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
+import type Table from "metabase-lib/v1/metadata/Table";
import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";
import {
normalizeParameterValue,
normalizeParameters,
} from "metabase-lib/v1/parameters/utils/parameter-values";
import { getIsPKFromTablePredicate } from "metabase-lib/v1/types/utils/isa";
+import type {
+ Bookmark,
+ Dataset,
+ DatasetColumn,
+ DatasetQuery,
+ Field,
+ Series,
+ Timeline,
+ TimelineEvent,
+} from "metabase-types/api";
import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
+import type { State } from "metabase-types/store";
import { getQuestionWithDefaultVisualizationSettings } from "./actions/core/utils";
import { createRawSeries, getWritableColumnProperties } from "./utils";
// This selector can be called from public questions / dashboards, which do not have state.qb
-export const getUiControls = (state) => state.qb?.uiControls;
-export const getQueryStatus = (state) => state.qb.queryStatus;
-export const getLoadingControls = (state) => state.qb.loadingControls;
+export const getUiControls = (state: State) => state.qb?.uiControls;
+export const getQueryStatus = (state: State) => state.qb.queryStatus;
+export const getLoadingControls = (state: State) => state.qb.loadingControls;
-export const getIsShowingTemplateTagsEditor = (state) =>
+export const getIsShowingTemplateTagsEditor = (state: State) =>
getUiControls(state).isShowingTemplateTagsEditor;
-export const getIsShowingSnippetSidebar = (state) =>
+export const getIsShowingSnippetSidebar = (state: State) =>
getUiControls(state).isShowingSnippetSidebar;
-export const getIsShowingDataReference = (state) =>
+export const getIsShowingDataReference = (state: State) =>
getUiControls(state).isShowingDataReference;
-export const getHighlightedNativeQueryLineNumbers = (state) =>
+export const getHighlightedNativeQueryLineNumbers = (state: State) =>
getUiControls(state).highlightedNativeQueryLineNumbers;
// This selector can be called from public questions / dashboards, which do not
// have state.qb
-export const getIsShowingRawTable = (state) =>
+export const getIsShowingRawTable = (state: State) =>
!!state.qb?.uiControls.isShowingRawTable;
const SIDEBARS = [
@@ -78,37 +93,38 @@ const SIDEBARS = [
"isShowingDataReference",
"isShowingTemplateTagsEditor",
"isShowingSnippetSidebar",
-];
+] as const;
export const getIsAnySidebarOpen = createSelector(
[getUiControls],
(uiControls) => SIDEBARS.some((sidebar) => uiControls[sidebar]),
);
-export const getIsRunning = (state) => getUiControls(state).isRunning;
-export const getIsLoadingComplete = (state) =>
+export const getIsRunning = (state: State) => getUiControls(state).isRunning;
+export const getIsLoadingComplete = (state: State) =>
getQueryStatus(state) === "complete";
-export const getCard = (state) => state.qb.card;
-export const getOriginalCard = (state) => state.qb.originalCard;
-export const getLastRunCard = (state) => state.qb.lastRunCard;
+export const getCard = (state: State) => state.qb.card;
+export const getOriginalCard = (state: State) => state.qb.originalCard;
+export const getLastRunCard = (state: State) => state.qb.lastRunCard;
-export const getParameterValues = (state) => state.qb.parameterValues;
-export const getParameterValuesSearchCache = (state) =>
- state.qb.parameterValuesSearchCache;
+export const getParameterValues = (state: State) => state.qb.parameterValues;
-export const getMetadataDiff = (state) => state.qb.metadataDiff;
+export const getMetadataDiff = (state: State) => state.qb.metadataDiff;
-export const getEntities = (state) => state.entities;
-export const getVisibleTimelineEventIds = (state) =>
+export const getEntities = (state: State) => state.entities;
+export const getVisibleTimelineEventIds = (state: State) =>
state.qb.visibleTimelineEventIds;
-export const getSelectedTimelineEventIds = (state) =>
+export const getSelectedTimelineEventIds = (state: State) =>
state.qb.selectedTimelineEventIds;
-const getRawQueryResults = (state) => state.qb.queryResults;
+const getRawQueryResults = (state: State) => state.qb.queryResults;
-export const getIsBookmarked = (state, props) =>
- props.bookmarks.some(
+export const getIsBookmarked = (
+ state: State,
+ { bookmarks }: { bookmarks: Bookmark[] },
+) =>
+ bookmarks.some(
(bookmark) =>
bookmark.type === "card" && bookmark.item_id === state.qb.card?.id,
);
@@ -118,20 +134,20 @@ export const getQueryBuilderMode = createSelector(
(uiControls) => uiControls.queryBuilderMode,
);
-export const getQueryStartTime = (state) => state.qb.queryStartTime;
+export const getQueryStartTime = (state: State) => state.qb.queryStartTime;
export const getDatabaseId = createSelector(
[getCard],
(card) => card && card.dataset_query && card.dataset_query.database,
);
-export const getTableForeignKeyReferences = (state) =>
+export const getTableForeignKeyReferences = (state: State) =>
state.qb.tableForeignKeyReferences;
export const getParameters = createSelector(
[getCard, getMetadata, getParameterValues],
(card, metadata, parameterValues) =>
- getCardUiParameters(card, metadata, parameterValues),
+ card ? getCardUiParameters(card, metadata, parameterValues) : [],
);
const getLastRunDatasetQuery = createSelector(
@@ -151,7 +167,8 @@ export const getDatasetEditorTab = createSelector(
export const getOriginalQuestion = createSelector(
[getMetadata, getOriginalCard],
- (metadata, card) => metadata && card && new Question(card, metadata),
+ (metadata, card) =>
+ (metadata && card && new Question(card, metadata)) ?? undefined,
);
export const getOriginalQuestionWithParameterValues = createSelector(
@@ -203,9 +220,8 @@ export const getQuestion = createSelector(
/**
* Returns whether the current question is a native query
*/
-export const getIsNative = createSelector(
- [getQuestion],
- (question) => question && Lib.queryDisplayInfo(question.query()).isNative,
+export const getIsNative = createSelector([getQuestion], (question) =>
+ question ? Lib.queryDisplayInfo(question.query()).isNative : false,
);
const getCardResultMetadata = createSelector(
@@ -237,7 +253,7 @@ const getModelMetadataDiff = createSelector(
export const getQueryResults = createSelector(
[getRawQueryResults, getModelMetadataDiff],
- (queryResults, metadataDiff) => {
+ (queryResults, metadataDiff): Dataset[] | null => {
if (!Array.isArray(queryResults) || !queryResults.length) {
return null;
}
@@ -248,7 +264,7 @@ export const getQueryResults = createSelector(
}
const { cols, results_metadata } = result.data;
- function applyMetadataDiff(column) {
+ function applyMetadataDiff<T extends DatasetColumn | Field>(column: T): T {
const columnDiff = metadataDiff[column.name];
return columnDiff ? merge(column, columnDiff) : column;
}
@@ -346,19 +362,24 @@ export const getPKColumnIndex = createSelector(
},
);
+function isSafeInteger(value: unknown): value is number {
+ return Number.isSafeInteger(value);
+}
+
export const getPKRowIndexMap = createSelector(
[getFirstQueryResult, getPKColumnIndex],
(result, PKColumnIndex) => {
- if (!result || !result.data || !Number.isSafeInteger(PKColumnIndex)) {
+ if (!result || !result.data || !isSafeInteger(PKColumnIndex)) {
return {};
}
const { rows } = result.data;
if (PKColumnIndex < 0) {
return rows.map((_, index) => index);
}
- const map = {};
+ const map: Record<ObjectId, number> = {};
rows.forEach((row, index) => {
- const PKValue = row[PKColumnIndex];
+ // TODO(romeovs): ObjectId should probably be RowValue
+ const PKValue = row[PKColumnIndex] as ObjectId;
map[PKValue] = index;
});
return map;
@@ -372,27 +393,37 @@ export const getPKRowIndexMap = createSelector(
export const getRowIndexToPKMap = createSelector(
[getFirstQueryResult, getPKColumnIndex],
(result, PKColumnIndex) => {
- if (!result || !Number.isSafeInteger(PKColumnIndex)) {
+ if (!result || !isSafeInteger(PKColumnIndex)) {
return {};
}
const { rows } = result.data;
if (PKColumnIndex < 0) {
return rows.map((_, index) => index);
}
- const map = {};
+ const map: Record<number, ObjectId> = {};
rows.forEach((row, index) => {
const PKValue = row[PKColumnIndex];
- map[index] = PKValue;
+ // TODO(romeovs): remove this cast once we have a proper type for ObjectId
+ map[index] = PKValue as ObjectId;
});
return map;
},
);
-function areLegacyQueriesEqual(queryA, queryB, tableMetadata) {
+function areLegacyQueriesEqual(
+ queryA: DatasetQuery | undefined,
+ queryB: DatasetQuery | undefined,
+ tableMetadata?: Table | null,
+) {
+ if (queryA == null || queryB == null) {
+ return false;
+ }
return Lib.areLegacyQueriesEqual(
queryA,
queryB,
- tableMetadata?.fields.map(({ id }) => id),
+ tableMetadata?.fields
+ ?.map(({ id }) => id)
+ ?.filter((id): id is number => typeof id === "number") ?? [],
);
}
@@ -405,6 +436,11 @@ function areComposedEntitiesEquivalent({
lastRunQuestion,
currentQuestion,
tableMetadata,
+}: {
+ originalQuestion?: Question | null;
+ lastRunQuestion?: Question | null;
+ currentQuestion?: Question | null;
+ tableMetadata?: Table | null;
}) {
const isQuestion = originalQuestion?.type() === "question";
if (!originalQuestion || !lastRunQuestion || !currentQuestion || isQuestion) {
@@ -448,6 +484,11 @@ export function areQueriesEquivalent({
lastRunQuestion,
currentQuestion,
tableMetadata,
+}: {
+ originalQuestion?: Question | null;
+ lastRunQuestion?: Question | null;
+ currentQuestion?: Question | null;
+ tableMetadata?: Table | null;
}) {
return (
areLegacyQueriesEqual(
@@ -485,35 +526,43 @@ export const getIsResultDirty = createSelector(
const isEditable =
!!currentQuestion &&
Lib.queryDisplayInfo(currentQuestion.query()).isEditable;
- return (
+ return Boolean(
haveParametersChanged ||
- (isEditable &&
- !areQueriesEquivalent({
- originalQuestion,
- lastRunQuestion,
- currentQuestion,
- tableMetadata,
- }))
+ (isEditable &&
+ !areQueriesEquivalent({
+ originalQuestion,
+ lastRunQuestion,
+ currentQuestion,
+ tableMetadata,
+ })),
);
},
);
-export const getZoomedObjectId = (state) => state.qb.zoomedRowObjectId;
+export const getZoomedObjectId = (state: State) => state.qb.zoomedRowObjectId;
export const getZoomedObjectRowIndex = createSelector(
[getPKRowIndexMap, getZoomedObjectId],
(PKRowIndexMap, objectId) => {
- if (!PKRowIndexMap) {
+ if (!PKRowIndexMap || objectId == null) {
return;
}
- return PKRowIndexMap[objectId] ?? PKRowIndexMap[parseInt(objectId)];
+
+ const parsedObjectId =
+ typeof objectId === "string" ? parseInt(objectId) : objectId;
+
+ if (Array.isArray(PKRowIndexMap)) {
+ return PKRowIndexMap[parsedObjectId];
+ }
+
+ return PKRowIndexMap[parsedObjectId] ?? PKRowIndexMap[objectId];
},
);
export const getPreviousRowPKValue = createSelector(
[getFirstQueryResult, getPKColumnIndex, getZoomedObjectRowIndex],
(result, PKColumnIndex, rowIndex) => {
- if (!result) {
+ if (!result || rowIndex == null || !isSafeInteger(PKColumnIndex)) {
return;
}
if (PKColumnIndex === -1) {
@@ -527,7 +576,7 @@ export const getPreviousRowPKValue = createSelector(
export const getNextRowPKValue = createSelector(
[getFirstQueryResult, getPKColumnIndex, getZoomedObjectRowIndex],
(result, PKColumnIndex, rowIndex) => {
- if (!result) {
+ if (!result || rowIndex == null || !isSafeInteger(PKColumnIndex)) {
return;
}
if (PKColumnIndex === -1) {
@@ -557,9 +606,14 @@ export const getCanZoomNextRow = createSelector(
export const getZoomRow = createSelector(
[getQueryResults, getZoomedObjectRowIndex],
(queryResults, rowIndex) => {
- if (!Array.isArray(queryResults) || !queryResults.length) {
+ if (
+ !Array.isArray(queryResults) ||
+ !queryResults.length ||
+ rowIndex == null
+ ) {
return;
}
+
return queryResults[0].data.rows[rowIndex];
},
);
@@ -647,9 +701,9 @@ export const getShouldShowUnsavedChangesWarning = createSelector(
*/
export const getRawSeries = createSelector(
[getCard, getFirstQueryResult, getLastRunDatasetQuery, getIsShowingRawTable],
- (card, queryResult, lastRunDatasetQuery, isShowingRawTable) => {
+ (card, queryResult, lastRunDatasetQuery, isShowingRawTable): Series => {
const rawSeries = createRawSeries({
- card,
+ card: card!,
queryResult,
datasetQuery: lastRunDatasetQuery,
});
@@ -687,12 +741,12 @@ const _getVisualizationTransformed = createSelector(
*/
export const getTransformedSeries = createSelector(
[_getVisualizationTransformed],
- (transformed) => transformed && transformed.series,
+ (transformed) => transformed?.series,
);
export const getTransformedVisualization = createSelector(
[_getVisualizationTransformed],
- (transformed) => transformed && transformed.visualization,
+ (transformed) => transformed?.visualization,
);
/**
@@ -713,12 +767,12 @@ export const getIsNativeEditorOpen = createSelector(
export const getNativeEditorSelectedRange = createSelector(
[getUiControls],
- (uiControls) => uiControls && uiControls.nativeEditorSelectedRange?.[0],
+ (uiControls) => uiControls?.nativeEditorSelectedRange?.[0],
);
const getNativeEditorSelectedRanges = createSelector(
[getUiControls],
- (uiControls) => uiControls && uiControls.nativeEditorSelectedRange,
+ (uiControls) => uiControls?.nativeEditorSelectedRange,
);
export const getIsTimeseries = createSelector(
@@ -729,7 +783,9 @@ export const getIsTimeseries = createSelector(
export const getTimeseriesXValues = createSelector(
[getIsTimeseries, getTransformedSeries, getVisualizationSettings],
(isTimeseries, series, settings) =>
- isTimeseries && series && settings && getXValues({ series, settings }),
+ isTimeseries && series && settings
+ ? getXValues({ series, settings })
+ : null,
);
const getTimeseriesDataInterval = createSelector(
@@ -739,7 +795,7 @@ const getTimeseriesDataInterval = createSelector(
getIsTimeseries,
getTimeseriesXValues,
],
- (series, settings, isTimeseries, xValues) => {
+ (series, settings, isTimeseries, xValues): TimeSeriesInterval | null => {
if (!isTimeseries || !xValues) {
return null;
}
@@ -753,29 +809,33 @@ const getTimeseriesDataInterval = createSelector(
isAbsoluteDateTimeUnit(column?.unit) ? column.unit : null,
)
.filter(isNotNull);
- return computeTimeseriesDataInterval(
- xValues,
- minTimeseriesUnit(columnUnits),
+ return (
+ computeTimeseriesDataInterval(xValues, minTimeseriesUnit(columnUnits)) ??
+ null
);
},
);
+type Numeric = string | number | boolean | object | dayjs.Dayjs;
+type Domain<T extends Numeric = Numeric> = [T, T];
+
export const getTimeseriesXDomain = createSelector(
[getIsTimeseries, getTimeseriesXValues],
(isTimeseries, xValues) => {
- return (
- isTimeseries &&
- Array.isArray(xValues) &&
- xValues.length > 0 &&
- d3.extent(xValues)
- );
+ if (isTimeseries && Array.isArray(xValues) && xValues.length > 0) {
+ return d3.extent(xValues as Array<d3.Numeric>) as Domain<dayjs.Dayjs>;
+ }
+ return null;
},
);
-export const getFetchedTimelines = createSelector([getEntities], (entities) => {
- const entityQuery = { include: "events" };
- return Timelines.selectors.getList({ entities }, { entityQuery }) ?? [];
-});
+export const getFetchedTimelines = createSelector(
+ [getEntities],
+ (entities): Timeline[] => {
+ const entityQuery = { include: "events" };
+ return Timelines.selectors.getList({ entities }, { entityQuery }) ?? [];
+ },
+);
export const getTransformedTimelines = createSelector(
[getFetchedTimelines],
@@ -793,15 +853,31 @@ export const getTransformedTimelines = createSelector(
},
);
-function isEventWithinDomain(event, xDomain) {
- return event.timestamp.isBetween(xDomain[0], xDomain[1], undefined, "[]");
+function isEventWithinDomain(
+ event: TimelineEvent,
+ xDomain: Domain<dayjs.Dayjs>,
+) {
+ return dayjs(event.timestamp).isBetween(
+ xDomain[0],
+ xDomain[1],
+ undefined,
+ "[]",
+ );
}
-function getXDomainForTimelines(xDomain, dataInterval) {
+function getXDomainForTimelines<T extends Numeric>(
+ xDomain: Domain<T> | null,
+ dataInterval: TimeSeriesInterval | null,
+): Domain<T> | null {
// When looking at, let's say, count of orders over years, last year value is Jan 1, 2024
// If we filter timeline events up until Jan 1, 2024, we won't see any events from 2024,
// so we need to extend xDomain by dataInterval.count * dataInterval.unit to include them
- if (xDomain && isAbsoluteDateTimeUnit(dataInterval?.unit)) {
+ if (
+ xDomain &&
+ isAbsoluteDateTimeUnit(dataInterval?.unit) &&
+ dayjs.isDayjs(xDomain[0]) &&
+ dayjs.isDayjs(xDomain[1])
+ ) {
let maxValue = xDomain[1]
.clone()
.add(dataInterval.count, dataInterval.unit);
@@ -810,7 +886,7 @@ function getXDomainForTimelines(xDomain, dataInterval) {
maxValue = maxValue.subtract(1, "day");
}
- return [xDomain[0], maxValue];
+ return [xDomain[0], maxValue as T];
}
return xDomain;
@@ -822,15 +898,17 @@ export const getFilteredTimelines = createSelector(
const timelineXDomain = getXDomainForTimelines(xDomain, dataInterval);
return timelines
.map((timeline) =>
- updateIn(timeline, ["events"], (events) =>
+ updateIn(timeline, ["events"], (events: TimelineEvent[]) =>
xDomain
- ? events.filter((event) =>
- isEventWithinDomain(event, timelineXDomain),
+ ? events.filter(
+ (event) =>
+ timelineXDomain &&
+ isEventWithinDomain(event, timelineXDomain),
)
: events,
),
)
- .filter((timeline) => timeline.events.length > 0);
+ .filter((timeline) => (timeline.events ?? []).length > 0);
},
);
@@ -846,7 +924,10 @@ export const getVisibleTimelineEvents = createSelector(
.value(),
);
-export function getOffsetForQueryAndPosition(queryText, { row, column }) {
+export function getOffsetForQueryAndPosition(
+ queryText: string,
+ { row, column }: { row: number; column: number },
+) {
const queryLines = queryText.split("\n");
return (
// the total length of the previous rows
@@ -911,12 +992,12 @@ export const getAllNativeEditorSelectedText = createSelector(
export const getModalSnippet = createSelector(
[getUiControls],
- (uiControls) => uiControls && uiControls.modalSnippet,
+ (uiControls) => uiControls?.modalSnippet,
);
export const getSnippetCollectionId = createSelector(
[getUiControls],
- (uiControls) => uiControls && uiControls.snippetCollectionId,
+ (uiControls) => uiControls?.snippetCollectionId,
);
export const getIsVisualized = createSelector(
@@ -951,7 +1032,7 @@ export const getIsLiveResizable = createSelector(
export const getQuestionDetailsTimelineDrawerState = createSelector(
[getUiControls],
- (uiControls) => uiControls && uiControls.questionDetailsTimelineDrawerState,
+ (uiControls) => uiControls?.questionDetailsTimelineDrawerState,
);
export const isBasedOnExistingQuestion = createSelector(
@@ -1007,14 +1088,14 @@ export const getDataReferenceStack = createSelector(
: [],
);
-export const getIsEditingInDashboard = (state) => {
+export const getIsEditingInDashboard = (state: State) => {
return (
state.qb.parentEntity.model === "dashboard" &&
state.qb.parentEntity.isEditing
);
};
-export const getParentEntity = (state) => {
+export const getParentEntity = (state: State) => {
return state.qb.parentEntity;
};
@@ -1029,7 +1110,7 @@ export const getEmbeddingParameters = createSelector([getCard], (card) => {
// Embeddings might be published without passing embedding_params to the server,
// in which case it's an empty object. We should treat such situations with
// caution, assuming that an absent parameter is "disabled".
-export function getEmbeddedParameterVisibility(state, slug) {
+export function getEmbeddedParameterVisibility(state: State, slug: string) {
const card = getCard(state);
if (!card?.enable_embedding) {
return null;
@@ -1039,9 +1120,10 @@ export function getEmbeddedParameterVisibility(state, slug) {
return embeddingParams[slug] ?? "disabled";
}
-export const getSubmittableQuestion = (state, question) => {
+export const getSubmittableQuestion = (state: State, question: Question) => {
+ const card = getCard(state) ?? question.card();
const rawSeries = createRawSeries({
- card: getCard(state),
+ card,
queryResult: getFirstQueryResult(state),
datasetQuery: getLastRunDatasetQuery(state),
});
@@ -1074,7 +1156,7 @@ export const getSubmittableQuestion = (state, question) => {
return submittableQuestion;
};
-export const getNotebookNativePreviewSidebarWidth = (state) =>
+export const getNotebookNativePreviewSidebarWidth = (state: State) =>
getSetting(state, "notebook-native-preview-sidebar-width");
export const getIsListViewConfigurationShown = createSelector(
diff --git a/frontend/src/metabase/query_builder/selectors.unit.spec.js b/frontend/src/metabase/query_builder/selectors.unit.spec.ts
similarity index 78%
rename from frontend/src/metabase/query_builder/selectors.unit.spec.js
rename to frontend/src/metabase/query_builder/selectors.unit.spec.ts
index 1bf674d1ccc..925e4e11f59 100644
--- a/frontend/src/metabase/query_builder/selectors.unit.spec.js
+++ b/frontend/src/metabase/query_builder/selectors.unit.spec.ts
@@ -12,6 +12,11 @@ import {
import registerVisualizations from "metabase/visualizations/register";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
+import type {
+ ConcreteFieldReference,
+ NativeQuery,
+ StructuredQuery,
+} from "metabase-types/api";
import {
createMockCard,
createMockColumn,
@@ -31,6 +36,11 @@ import {
SAMPLE_DB_ID,
createSampleDatabase,
} from "metabase-types/api/mocks/presets";
+import type {
+ QueryBuilderState,
+ QueryBuilderUIControls,
+ Range,
+} from "metabase-types/store";
import {
createMockQueryBuilderState,
createMockQueryBuilderUIControlsState,
@@ -39,7 +49,12 @@ import {
registerVisualizations();
-function getBaseState({ uiControls = {}, ...state } = {}) {
+function getBaseState({
+ uiControls = {},
+ ...state
+}: Partial<Omit<QueryBuilderState, "uiControls">> & {
+ uiControls?: Partial<QueryBuilderUIControls>;
+} = {}) {
return createMockState({
entities: createMockEntitiesState({
databases: [createSampleDatabase()],
@@ -55,16 +70,6 @@ function getBaseState({ uiControls = {}, ...state } = {}) {
});
}
-function getBaseCard(opts) {
- return {
- ...opts,
- dataset_query: {
- database: 1,
- ...opts.dataset_query,
- },
- };
-}
-
describe("getQuestion", () => {
it("should be nothing if card data is missing", () => {
const state = getBaseState({ card: null });
@@ -72,7 +77,7 @@ describe("getQuestion", () => {
});
it("should return question instance correctly", () => {
- const card = {
+ const card = createMockCard({
id: 5,
dataset_query: {
database: 1,
@@ -81,16 +86,16 @@ describe("getQuestion", () => {
"source-table": 1,
},
},
- };
+ });
const question = getQuestion(getBaseState({ card }));
expect(question).toBeInstanceOf(Question);
- expect(question._doNotCallSerializableCard()).toEqual(card);
+ expect(question?._doNotCallSerializableCard()).toEqual(card);
});
it("should return composed dataset when dataset is open", () => {
- const card = {
+ const card = createMockCard({
id: 1,
type: "model",
dataset_query: {
@@ -100,15 +105,17 @@ describe("getQuestion", () => {
"source-table": ORDERS_ID,
},
},
- };
+ });
const question = getQuestion(getBaseState({ card }));
- expect(Lib.sourceTableOrCardId(question.query())).toBe("card__1");
+ expect(question && Lib.sourceTableOrCardId(question.query())).toBe(
+ "card__1",
+ );
});
it("should return real dataset when dataset is open in 'dataset' QB mode", () => {
- const card = {
+ const card = createMockCard({
id: 5,
type: "model",
dataset_query: {
@@ -118,7 +125,7 @@ describe("getQuestion", () => {
"source-table": 1,
},
},
- };
+ });
const question = getQuestion(
getBaseState({
@@ -129,17 +136,22 @@ describe("getQuestion", () => {
}),
);
- expect(question.card()).toEqual(assoc(card, "displayIsLocked", true));
+ expect(question?.card()).toEqual(assoc(card, "displayIsLocked", true));
});
});
describe("getIsResultDirty", () => {
describe("structured query", () => {
- function getCard(query) {
- return getBaseCard({ dataset_query: { type: "query", query } });
+ function getCard(query: StructuredQuery) {
+ return createMockCard({
+ dataset_query: { type: "query", database: 1, query },
+ });
}
- function getState(lastRunCardQuery, cardQuery) {
+ function getState(
+ lastRunCardQuery: StructuredQuery,
+ cardQuery: StructuredQuery,
+ ) {
return getBaseState({
card: getCard(cardQuery),
lastRunCard: getCard(lastRunCardQuery),
@@ -165,34 +177,25 @@ describe("getIsResultDirty", () => {
});
it("converts clauses into plain MBQL objects", () => {
- const aggregation = ["count"];
- const breakout = ["field", ORDERS.CREATED_AT, null];
- const filter = [">", ["field", ORDERS.TOTAL, null], 20];
- const join = {
- alias: "Products",
- fields: "all",
- "source-table": PRODUCTS_ID,
- condition: [
- "=",
- ["field", ORDERS.PRODUCT_ID, null],
- ["field", PRODUCTS.ID, null],
+ const query: StructuredQuery = {
+ aggregation: [["count"]],
+ breakout: [["field", ORDERS.CREATED_AT, null]],
+ filter: [">", ["field", ORDERS.TOTAL, null], 20],
+ joins: [
+ {
+ alias: "Products",
+ fields: "all",
+ "source-table": PRODUCTS_ID,
+ condition: [
+ "=",
+ ["field", ORDERS.PRODUCT_ID, null],
+ ["field", PRODUCTS.ID, null],
+ ],
+ },
],
};
- const state = getState(
- {
- aggregation: [aggregation],
- breakout: [breakout],
- filter,
- joins: [join],
- },
- {
- aggregation: [aggregation],
- breakout: [breakout],
- filter,
- joins: [join],
- },
- );
+ const state = getState(query, query);
expect(getIsResultDirty(state)).toBe(false);
});
@@ -239,11 +242,9 @@ describe("getIsResultDirty", () => {
it("should not be dirty if fields were just made explicit", () => {
const orderTableFieldIds = Object.values(ORDERS);
- const orderTableFieldRefs = orderTableFieldIds.map((id) => [
- "field",
- id,
- null,
- ]);
+ const orderTableFieldRefs = orderTableFieldIds.map(
+ (id): ConcreteFieldReference => ["field", id, null],
+ );
const state = getState(
{ "source-table": ORDERS_ID },
@@ -257,13 +258,17 @@ describe("getIsResultDirty", () => {
});
describe("native query", () => {
- function getCard(native) {
- return getBaseCard({
- dataset_query: { type: "native", native },
+ function getCard(native: NativeQuery) {
+ return createMockCard({
+ dataset_query: {
+ database: 1,
+ type: "native",
+ native,
+ },
});
}
- function getState(lastRunCardQuery, cardQuery) {
+ function getState(lastRunCardQuery: NativeQuery, cardQuery: NativeQuery) {
return getBaseState({
card: getCard(cardQuery),
lastRunCard: getCard(lastRunCardQuery),
@@ -271,7 +276,12 @@ describe("getIsResultDirty", () => {
}
it("should not be dirty if template-tags is empty vs an empty object", () => {
- const state = getState({}, { "template-tags": {} });
+ const state = getState(
+ {
+ query: "SELECT 1",
+ },
+ { query: "SELECT 1", "template-tags": {} },
+ );
expect(getIsResultDirty(state)).toBe(false);
});
@@ -290,11 +300,12 @@ describe("getIsResultDirty", () => {
});
describe("native editor selection/cursor", () => {
- function getStateWithSelectedQueryText(ranges) {
+ function getStateWithSelectedQueryText(ranges: Range[]) {
return getBaseState({
- card: getBaseCard({
+ card: createMockCard({
dataset_query: {
type: "native",
+ database: 1,
native: { query: "1\n22\n333" },
},
}),
@@ -305,9 +316,9 @@ describe("getIsResultDirty", () => {
}
[
- [{ row: 0, column: 0 }, 0],
- [{ row: 1, column: 1 }, 3],
- [{ row: 2, column: 3 }, 8],
+ [{ row: 0, column: 0 }, 0] as const,
+ [{ row: 1, column: 1 }, 3] as const,
+ [{ row: 2, column: 3 }, 8] as const,
].forEach(([position, offset]) =>
it(`should correctly determine the cursor offset for ${JSON.stringify(
position,
@@ -320,9 +331,9 @@ describe("getIsResultDirty", () => {
);
[
- [{ row: 0, column: 0 }, { row: 0, column: 0 }, ""],
- [{ row: 0, column: 0 }, { row: 2, column: 3 }, "1\n22\n333"],
- [{ row: 1, column: 0 }, { row: 1, column: 2 }, "22"],
+ [{ row: 0, column: 0 }, { row: 0, column: 0 }, ""] as const,
+ [{ row: 0, column: 0 }, { row: 2, column: 3 }, "1\n22\n333"] as const,
+ [{ row: 1, column: 0 }, { row: 1, column: 2 }, "22"] as const,
].forEach(([start, end, text]) =>
it(`should correctly get selected text from ${JSON.stringify(
start,
@@ -343,22 +354,18 @@ describe("getIsResultDirty", () => {
});
describe("models", () => {
- function getDataset(query) {
- return getBaseCard({
+ function getDataset(query: StructuredQuery) {
+ return createMockCard({
id: 1,
type: "model",
- dataset_query: { type: "query", query },
+ dataset_query: { type: "query", database: 1, query },
});
}
- function getState(state) {
- return getBaseState(state);
- }
-
const dataset = getDataset({ "source-table": 1 });
it("should not be dirty if model is not changed", () => {
- const state = getState({
+ const state = getBaseState({
card: dataset,
originalCard: dataset,
lastRunCard: dataset,
@@ -367,7 +374,7 @@ describe("getIsResultDirty", () => {
});
it("should be dirty if model is changed", () => {
- const state = getState({
+ const state = getBaseState({
card: dataset,
originalCard: dataset,
lastRunCard: getDataset({ "source-table": 2 }),
@@ -377,7 +384,7 @@ describe("getIsResultDirty", () => {
it("should not be dirty if model simple mode is active", () => {
const adHocDatasetCard = getDataset({ "source-table": "card__1" });
- const state = getState({
+ const state = getBaseState({
card: adHocDatasetCard,
originalCard: dataset,
lastRunCard: adHocDatasetCard,
@@ -386,16 +393,17 @@ describe("getIsResultDirty", () => {
});
it("should be dirty when building a new question on a model", () => {
- const card = getBaseCard({
+ const card = createMockCard({
dataset_query: {
+ database: 1,
type: "query",
query: {
- aggregate: [["count"]],
+ aggregation: [["count"]],
"source-table": "card__1",
},
},
});
- const state = getState({
+ const state = getBaseState({
card,
originalCard: dataset,
lastRunCard: dataset,
@@ -405,7 +413,7 @@ describe("getIsResultDirty", () => {
it("should not be dirty when the last run question is the composed model and the current question is equivalent to the original", () => {
const adHocDatasetCard = getDataset({ "source-table": "card__1" });
- const state = getState({
+ const state = getBaseState({
card: dataset,
originalCard: dataset,
lastRunCard: adHocDatasetCard,
@@ -417,13 +425,11 @@ describe("getIsResultDirty", () => {
describe("getQuestionDetailsTimelineDrawerState", () => {
it("should return a string representing the state of the question history timeline drawer", () => {
- const state = {
- qb: {
- uiControls: {
- questionDetailsTimelineDrawerState: "foo",
- },
+ const state = getBaseState({
+ uiControls: {
+ questionDetailsTimelineDrawerState: "foo",
},
- };
+ });
expect(getQuestionDetailsTimelineDrawerState(state)).toBe("foo");
});
});
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
index 82f0911479c..3f6a5be07b1 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
@@ -66,7 +66,7 @@ export class VisualizationResult extends Component {
className,
isRunning,
isShowingSummarySidebar,
- onEditSummary,
+ editSummary,
renderEmptyMessage,
} = this.props;
const { showCreateAlertModal } = this.state;
@@ -142,7 +142,7 @@ export class VisualizationResult extends Component {
isQueryBuilder={true}
isShowingSummarySidebar={isShowingSummarySidebar}
isRunning={isRunning}
- onEditSummary={onEditSummary}
+ editSummary={editSummary}
queryBuilderMode={queryBuilderMode}
showTitle={false}
canToggleSeriesVisibility
diff --git a/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts b/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
index ceded2c090a..0c81b97c110 100644
--- a/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/summarize-column-drill.ts
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import { editSummary } from "metabase/query_builder/actions";
import type {
ClickActionBase,
Drill,
@@ -46,6 +47,6 @@ export const summarizeColumnDrill: Drill<Lib.SummarizeColumnDrillThruInfo> = ({
question: () => applyDrill(drill, operator).setDefaultDisplay(),
action: () => (dispatch: Dispatch) =>
// HACK: drill through closes sidebars, so open sidebar asynchronously
- setTimeout(() => dispatch({ type: "metabase/qb/EDIT_SUMMARY" })),
+ setTimeout(() => dispatch(editSummary())),
}));
};
diff --git a/frontend/src/metabase/querying/viz-settings/utils/sync-viz-settings.ts b/frontend/src/metabase/querying/viz-settings/utils/sync-viz-settings.ts
index f85de61141f..947a0dda577 100644
--- a/frontend/src/metabase/querying/viz-settings/utils/sync-viz-settings.ts
+++ b/frontend/src/metabase/querying/viz-settings/utils/sync-viz-settings.ts
@@ -39,14 +39,14 @@ export function syncVizSettingsWithSeries(
settings: VisualizationSettings,
newQuery: Lib.Query,
newSeries: Series,
- oldSeries: Series,
+ oldSeries?: Series,
): VisualizationSettings {
if (!isNativeQuery(newQuery)) {
return settings;
}
const [newSingleSeries] = newSeries;
- const [oldSingleSeries] = oldSeries;
+ const [oldSingleSeries] = oldSeries ?? [];
if (!isValidSeries(newSingleSeries) || !isValidSeries(oldSingleSeries)) {
return settings;
}
diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx
index 410a1b99a1c..a03bc4fefaa 100644
--- a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx
+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx
@@ -14,7 +14,7 @@ import { getEmptyVizConfig } from "./utils";
export interface EmptyVizStateProps {
chartType?: VisualizationDisplay;
isSummarizeSidebarOpen?: boolean;
- onEditSummary?: () => void;
+ editSummary?: () => void;
isNativeView: boolean;
}
@@ -28,7 +28,7 @@ const utmTags = {
export const EmptyVizState = ({
chartType,
isSummarizeSidebarOpen,
- onEditSummary,
+ editSummary,
isNativeView,
}: EmptyVizStateProps) => {
const isValidChartType =
@@ -53,7 +53,7 @@ export const EmptyVizState = ({
const hasDocsLink = !!docsLink;
const showNativeEmptyState = !hasDocsLink && isNativeView;
- const showQBEmptyState = !hasDocsLink && !isNativeView && !!onEditSummary;
+ const showQBEmptyState = !hasDocsLink && !isNativeView && !!editSummary;
return (
<Flex
@@ -96,7 +96,7 @@ export const EmptyVizState = ({
isSummarizeSidebarOpen ? (
<strong key="summarize">{t`Summarize`}</strong>
) : (
- <SummarizeCTA onClick={onEditSummary} key="summarize-cta" />
+ <SummarizeCTA onClick={editSummary} key="summarize-cta" />
)
} at the top right corner. ${primaryText}`}
</Text>
diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
index 7b3a9155a08..d27f43b1488 100644
--- a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
@@ -55,8 +55,8 @@ describe("EmptyVizState", () => {
it.each(docsCTAChartTypes)(
"should render the documentation CTA for %s visualization",
(chartType) => {
- const onEditSummary = jest.fn();
- setup({ chartType, onEditSummary });
+ const editSummary = jest.fn();
+ setup({ chartType, editSummary });
const { primaryText, secondaryText, docsLink } =
getEmptyVizConfig(chartType);
@@ -79,8 +79,8 @@ describe("EmptyVizState", () => {
it.each(CTAChartTypes)(
"should prompt to open the summarize sidebar for %s visualization",
(chartType) => {
- const onEditSummary = jest.fn();
- setup({ chartType, onEditSummary });
+ const editSummary = jest.fn();
+ setup({ chartType, editSummary });
const { secondaryText } = getEmptyVizConfig(chartType);
@@ -99,32 +99,32 @@ describe("EmptyVizState", () => {
},
);
- it("should call `onEditSummary` when clicking the Summarize button", async () => {
- const onEditSummary = jest.fn();
+ it("should call `editSummary` when clicking the Summarize button", async () => {
+ const editSummary = jest.fn();
setup({
chartType: "line",
- onEditSummary,
+ editSummary,
isSummarizeSidebarOpen: false,
});
await userEvent.click(screen.getByLabelText("Open summarize sidebar"));
- expect(onEditSummary).toHaveBeenCalledTimes(1);
+ expect(editSummary).toHaveBeenCalledTimes(1);
});
it("should not render the summarize CTA button if the sidebar is already open", async () => {
- const onEditSummary = jest.fn();
- setup({ chartType: "line", onEditSummary, isSummarizeSidebarOpen: true });
+ const editSummary = jest.fn();
+ setup({ chartType: "line", editSummary, isSummarizeSidebarOpen: true });
expect(
screen.queryByLabelText("Open summarize sidebar"),
).not.toBeInTheDocument();
await userEvent.click(screen.getByText("Summarize"));
- expect(onEditSummary).not.toHaveBeenCalled();
+ expect(editSummary).not.toHaveBeenCalled();
});
- it("should not render the summarize CTA button if onEditSummary is undefined", async () => {
- setup({ chartType: "line", onEditSummary: undefined });
+ it("should not render the summarize CTA button if editSummary is undefined", async () => {
+ setup({ chartType: "line", editSummary: undefined });
expect(
screen.queryByLabelText("Open summarize sidebar"),
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
index 8361ac0cbfa..12d1db95e16 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
@@ -48,8 +48,8 @@ const mapStateToProps = (state: State, { data }: ObjectDetailProps) => {
question: getQuestion(state),
table,
tableForeignKeys: getTableForeignKeys(state),
- tableForeignKeyReferences: getTableForeignKeyReferences(state),
- zoomedRowID,
+ tableForeignKeyReferences: getTableForeignKeyReferences(state) ?? undefined,
+ zoomedRowID: zoomedRowID ?? undefined,
zoomedRow,
canZoom: isZooming && !!zoomedRow,
canZoomPreviousRow,
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
index 0cbabf89644..1c04ef76b83 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
@@ -121,7 +121,7 @@ export const getIdValue = ({
};
export function getSingleResultsRow(data: DatasetData) {
- return data.rows.length === 1 ? data.rows[0] : null;
+ return data.rows.length === 1 ? data.rows[0] : undefined;
}
export const getSinglePKIndex = (cols: DatasetColumn[]) => {
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index efe87391df9..958f62cc00e 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -150,7 +150,7 @@ type VisualizationOwnProps = {
renderLoadingView?: (props: LoadingViewProps) => JSX.Element | null;
metadata?: Metadata;
mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
- onEditSummary?: () => void;
+ editSummary?: () => void;
rawSeries?: (
| SingleSeries
| {
@@ -212,7 +212,7 @@ const mapStateToProps = (state: State): StateProps => ({
fontFamily: getFont(state),
isRawTable: getIsShowingRawTable(state),
isEmbeddingSdk: isEmbeddingSdk(),
- scrollToLastColumn: getUiControls(state)?.scrollToLastColumn,
+ scrollToLastColumn: getUiControls(state)?.scrollToLastColumn ?? false,
isDownloadingToImage: getIsDownloadingToImage(state),
});
@@ -682,7 +682,7 @@ class Visualization extends PureComponent<
isDownloadingToImage,
metadata,
mode,
- onEditSummary,
+ editSummary,
queryBuilderMode,
rawSeries = [],
isSelectable,
@@ -895,7 +895,7 @@ class Visualization extends PureComponent<
<EmptyVizState
chartType={visualization?.identifier}
isSummarizeSidebarOpen={isShowingSummarySidebar}
- onEditSummary={isDashboard ? undefined : onEditSummary}
+ editSummary={isDashboard ? undefined : editSummary}
isNativeView={isNativeView}
/>
) : (