From 5c4880f1fa30189798c0b0ea42df67c7fd0aea75 Mon Sep 17 00:00:00 2001 From: Alex Vasilev Date: Fri, 11 Nov 2022 17:02:31 +0530 Subject: [PATCH] fix(playground): schemaVersion updates --- packages/cubejs-client-react/src/QueryBuilder.jsx | 12 +++++------- .../PlaygroundQueryBuilder/QueryBuilderContainer.tsx | 8 +++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/cubejs-client-react/src/QueryBuilder.jsx b/packages/cubejs-client-react/src/QueryBuilder.jsx index bfd7c6637e34..7a71e16b02b4 100644 --- a/packages/cubejs-client-react/src/QueryBuilder.jsx +++ b/packages/cubejs-client-react/src/QueryBuilder.jsx @@ -31,7 +31,7 @@ const granularities = [ export default class QueryBuilder extends React.Component { static contextType = CubeContext; - + static defaultProps = { cubejsApi: null, stateChangeHeuristics: null, @@ -42,7 +42,7 @@ export default class QueryBuilder extends React.Component { defaultQuery: {}, initialVizState: null, onVizStateChanged: null, - + // deprecated query: null, setQuery: null, @@ -134,7 +134,6 @@ export default class QueryBuilder extends React.Component { async componentDidUpdate(prevProps) { const { schemaVersion, onSchemaChange } = this.props; - const { meta } = this.state; if (this.prevContext?.cubejsApi !== this.context?.cubejsApi) { this.prevContext = this.context; @@ -143,8 +142,7 @@ export default class QueryBuilder extends React.Component { if (prevProps.schemaVersion !== schemaVersion) { try { - const newMeta = await this.cubejsApi().meta(); - if (!equals(newMeta, meta) && typeof onSchemaChange === 'function') { + if (typeof onSchemaChange === 'function') { onSchemaChange({ schemaVersion, refresh: async () => { @@ -223,7 +221,7 @@ export default class QueryBuilder extends React.Component { prepareRenderProps(queryRendererProps) { const getName = (member) => member.name; - + const toTimeDimension = (member) => { const rangeSelection = member.compareDateRange ? { compareDateRange: member.compareDateRange } @@ -235,7 +233,7 @@ export default class QueryBuilder extends React.Component { ...rangeSelection, }); }; - + const toFilter = (member) => ({ member: member.member?.name || member.dimension?.name, operator: member.operator, diff --git a/packages/cubejs-playground/src/components/PlaygroundQueryBuilder/QueryBuilderContainer.tsx b/packages/cubejs-playground/src/components/PlaygroundQueryBuilder/QueryBuilderContainer.tsx index 58c999d42d5c..f3dc752328bb 100644 --- a/packages/cubejs-playground/src/components/PlaygroundQueryBuilder/QueryBuilderContainer.tsx +++ b/packages/cubejs-playground/src/components/PlaygroundQueryBuilder/QueryBuilderContainer.tsx @@ -73,8 +73,10 @@ export function QueryBuilderContainer(props: QueryBuilderContainerProps) { token={currentToken!} dashboardSource={props.dashboardSource} securityContextToken={securityContextToken} - onTabChange={props.onTabChange} extra={props.extra} + schemaVersion={props.schemaVersion} + onSchemaChange={props.onSchemaChange} + onTabChange={props.onTabChange} onVizStateChanged={props.onVizStateChanged} onSecurityContextModalOpen={() => setIsModalOpen(true)} /> @@ -105,7 +107,6 @@ function QueryTabsRenderer({ token, securityContextToken, dashboardSource, - schemaVersion, onSecurityContextModalOpen, ...props }: QueryTabsRendererProps) { @@ -158,8 +159,9 @@ function QueryTabsRenderer({ chartType, }} dashboardSource={dashboardSource} - schemaVersion={schemaVersion} + schemaVersion={props.schemaVersion} extra={props.extra} + onSchemaChange={props.onSchemaChange} onVizStateChanged={(vizState) => { saveTab({ query: vizState.query || {},