The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Resolve the segment thunks' table and database from responses, not the mirror (#80058)
Romeo Van Snickb8584138cb6d
diff --git a/frontend/src/metabase/redux/metadata.ts b/frontend/src/metabase/redux/metadata.tsindex 536d4764a2e..3d28aac6a58 100644--- a/frontend/src/metabase/redux/metadata.ts+++ b/frontend/src/metabase/redux/metadata.ts@@ -6,8 +6,12 @@ import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { createThunkAction } from "metabase/redux";import { fetchRevisions } from "metabase/redux/revisions";import type { Dispatch } from "metabase/redux/store";-import { fetchTableMetadataAndForeignKeys } from "metabase/redux/tables";+import {+ fetchTableMetadata,+ fetchTableMetadataAndForeignKeys,+} from "metabase/redux/tables";import { DatabaseSchema, FieldSchema, TableSchema } from "metabase/schema";+import { checkNotNull } from "metabase/utils/types";import type {Database,DatabaseId,@@ -16,6 +20,7 @@ import type {Segment,SegmentId,Table,+ TableId,} from "metabase-types/api";const UPDATE = "metabase/entities/UPDATE";@@ -31,9 +36,21 @@ export function updateMetadata(data: unknown, schema: Schema) {export const fetchSegments =() =>- (dispatch: Dispatch): Promise<unknown> =>+ (dispatch: Dispatch): Promise<Segment[]> =>runRtkEndpoint(undefined, dispatch, segmentApi.endpoints.listSegments);+/**+ * Resolves a segment's table from the list response rather than from+ * `state.entities`, so these thunks do not read the mirror they feed.+ */+const fetchSegmentTableId =+ (segmentId: SegmentId) =>+ async (dispatch: Dispatch): Promise<TableId> => {+ const segments = await fetchSegments()(dispatch);+ const segment = segments.find(({ id }) => id === segmentId);+ return checkNotNull(segment).table_id;+ };+export const updateSegment =(segment: Segment) =>(dispatch: Dispatch): Promise<unknown> =>@@ -100,12 +117,15 @@ const FETCH_SEGMENT_FIELDS = "metabase/metadata/FETCH_SEGMENT_FIELDS";export const fetchSegmentFields = createThunkAction(FETCH_SEGMENT_FIELDS,(segmentId: SegmentId) => {- return async (dispatch, getState) => {- await dispatch(fetchSegments());- const tableId = getState().entities.segments[segmentId].table_id;+ return async (dispatch) => {+ const tableId = await dispatch(fetchSegmentTableId(segmentId));await dispatch(fetchTableMetadataAndForeignKeys({ id: tableId }));- const databaseId = getState().entities.tables[tableId].db_id;- await dispatch(fetchDatabaseMetadata(databaseId));+ // Annotated, not cast: `fetchTableMetadata` returns the endpoint's+ // untyped result and `db_id` is the only field this needs.+ const table: { db_id: DatabaseId } = await dispatch(+ fetchTableMetadata({ id: tableId }),+ );+ await dispatch(fetchDatabaseMetadata(table.db_id));};},);@@ -114,9 +134,8 @@ const FETCH_SEGMENT_TABLE = "metabase/metadata/FETCH_SEGMENT_TABLE";export const fetchSegmentTable = createThunkAction(FETCH_SEGMENT_TABLE,(segmentId: SegmentId) => {- return async (dispatch, getState) => {- await dispatch(fetchSegments());- const tableId = getState().entities.segments[segmentId].table_id;+ return async (dispatch) => {+ const tableId = await dispatch(fetchSegmentTableId(segmentId));await dispatch(fetchTableMetadataAndForeignKeys({ id: tableId }));};},@@ -126,12 +145,11 @@ const FETCH_SEGMENT_REVISIONS = "metabase/metadata/FETCH_SEGMENT_REVISIONS";export const fetchSegmentRevisions = createThunkAction(FETCH_SEGMENT_REVISIONS,(segmentId: SegmentId) => {- return async (dispatch, getState) => {- await Promise.all([+ return async (dispatch) => {+ const [, tableId] = await Promise.all([dispatch(fetchRevisions("segment", segmentId)),- dispatch(fetchSegments()),+ dispatch(fetchSegmentTableId(segmentId)),]);- const tableId = getState().entities.segments[segmentId].table_id;await dispatch(fetchTableMetadataAndForeignKeys({ id: tableId }));};},