@cubejs-client/playground 1.7.36 → 1.7.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/assets/{index-MOwyNLiE.js → index-ux1YpTSs.js} +21 -21
- package/build/index.html +1 -1
- package/build/vizard/download/react-typescript-antd-table.zip +0 -0
- package/build/vizard/download/react-typescript-chartjs-area+bar+doughnut+line+pie.zip +0 -0
- package/lib/.tsbuildinfo +1 -1
- package/lib/App.d.ts +1 -1
- package/lib/App.js +5 -5
- package/lib/App.js.map +1 -1
- package/lib/ChartContainer.js +9 -10
- package/lib/ChartContainer.js.map +1 -1
- package/lib/QueryBuilder/ButtonDropdown.js +1 -1
- package/lib/QueryBuilder/ButtonDropdown.js.map +1 -1
- package/lib/QueryBuilder/FilterGroup.js +4 -6
- package/lib/QueryBuilder/FilterGroup.js.map +1 -1
- package/lib/QueryBuilder/FilterInput.js +5 -5
- package/lib/QueryBuilder/FilterInput.js.map +1 -1
- package/lib/QueryBuilder/MemberDropdown.js +23 -25
- package/lib/QueryBuilder/MemberDropdown.js.map +1 -1
- package/lib/QueryBuilder/TimeGroup.js +3 -3
- package/lib/QueryBuilder/TimeGroup.js.map +1 -1
- package/lib/QueryBuilder/TimeRangeSelector.js.map +1 -1
- package/lib/QueryBuilderV2/Pivot/DroppableArea.js +5 -8
- package/lib/QueryBuilderV2/Pivot/DroppableArea.js.map +1 -1
- package/lib/QueryBuilderV2/Pivot/Options.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilder.js +12 -15
- package/lib/QueryBuilderV2/QueryBuilder.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderChart.js +12 -13
- package/lib/QueryBuilderV2/QueryBuilderChart.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderExtras.js +15 -15
- package/lib/QueryBuilderV2/QueryBuilderExtras.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderFilters.js +28 -19
- package/lib/QueryBuilderV2/QueryBuilderFilters.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderGeneratedSQL.js +4 -4
- package/lib/QueryBuilderV2/QueryBuilderGeneratedSQL.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderGraphQL.js +3 -3
- package/lib/QueryBuilderV2/QueryBuilderGraphQL.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderInternals.js +3 -7
- package/lib/QueryBuilderV2/QueryBuilderInternals.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderRest.js +1 -1
- package/lib/QueryBuilderV2/QueryBuilderRest.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderResults.js +83 -83
- package/lib/QueryBuilderV2/QueryBuilderResults.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderSQL.js +1 -1
- package/lib/QueryBuilderV2/QueryBuilderSQL.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderSidePanel.js +32 -34
- package/lib/QueryBuilderV2/QueryBuilderSidePanel.js.map +1 -1
- package/lib/QueryBuilderV2/QueryBuilderToolBar.js +1 -1
- package/lib/QueryBuilderV2/QueryBuilderToolBar.js.map +1 -1
- package/lib/QueryBuilderV2/components/Accordion/AccordionDetails.js +1 -1
- package/lib/QueryBuilderV2/components/Accordion/AccordionDetails.js.map +1 -1
- package/lib/QueryBuilderV2/components/Accordion/AccordionItemTitle.js +8 -8
- package/lib/QueryBuilderV2/components/Accordion/AccordionItemTitle.js.map +1 -1
- package/lib/QueryBuilderV2/components/AddFilterInput.js +36 -46
- package/lib/QueryBuilderV2/components/AddFilterInput.js.map +1 -1
- package/lib/QueryBuilderV2/components/Arrow.js +5 -5
- package/lib/QueryBuilderV2/components/Arrow.js.map +1 -1
- package/lib/QueryBuilderV2/components/Badge.js +1 -3
- package/lib/QueryBuilderV2/components/Badge.js.map +1 -1
- package/lib/QueryBuilderV2/components/ChartRenderer.js +23 -25
- package/lib/QueryBuilderV2/components/ChartRenderer.js.map +1 -1
- package/lib/QueryBuilderV2/components/CopyIcon.js +1 -1
- package/lib/QueryBuilderV2/components/CopyIcon.js.map +1 -1
- package/lib/QueryBuilderV2/components/DateRangeFilter.js +4 -6
- package/lib/QueryBuilderV2/components/DateRangeFilter.js.map +1 -1
- package/lib/QueryBuilderV2/components/EditQueryDialogForm.js +48 -63
- package/lib/QueryBuilderV2/components/EditQueryDialogForm.js.map +1 -1
- package/lib/QueryBuilderV2/components/FilterLabel.js +1 -1
- package/lib/QueryBuilderV2/components/FilterLabel.js.map +1 -1
- package/lib/QueryBuilderV2/components/FilterMember.js +13 -14
- package/lib/QueryBuilderV2/components/FilterMember.js.map +1 -1
- package/lib/QueryBuilderV2/components/FilterOptionsButton.js +8 -8
- package/lib/QueryBuilderV2/components/FilterOptionsButton.js.map +1 -1
- package/lib/QueryBuilderV2/components/InfoIconButton.js +1 -1
- package/lib/QueryBuilderV2/components/InfoIconButton.js.map +1 -1
- package/lib/QueryBuilderV2/components/InstanceTooltipProvider.js +1 -1
- package/lib/QueryBuilderV2/components/InstanceTooltipProvider.js.map +1 -1
- package/lib/QueryBuilderV2/components/ListCube.js +15 -1
- package/lib/QueryBuilderV2/components/ListCube.js.map +1 -1
- package/lib/QueryBuilderV2/components/ListMember.js +7 -7
- package/lib/QueryBuilderV2/components/ListMember.js.map +1 -1
- package/lib/QueryBuilderV2/components/ListMemberOptionButton.js +1 -0
- package/lib/QueryBuilderV2/components/ListMemberOptionButton.js.map +1 -1
- package/lib/QueryBuilderV2/components/LocalError.js +1 -3
- package/lib/QueryBuilderV2/components/LocalError.js.map +1 -1
- package/lib/QueryBuilderV2/components/LogicalFilter.js +22 -12
- package/lib/QueryBuilderV2/components/LogicalFilter.js.map +1 -1
- package/lib/QueryBuilderV2/components/MemberSection.js +1 -1
- package/lib/QueryBuilderV2/components/MemberSection.js.map +1 -1
- package/lib/QueryBuilderV2/components/OutdatedLabel.js +2 -2
- package/lib/QueryBuilderV2/components/OutdatedLabel.js.map +1 -1
- package/lib/QueryBuilderV2/components/ReorderableList.d.ts +1 -1
- package/lib/QueryBuilderV2/components/ReorderableList.js +16 -18
- package/lib/QueryBuilderV2/components/ReorderableList.js.map +1 -1
- package/lib/QueryBuilderV2/components/SegmentFilter.js +1 -1
- package/lib/QueryBuilderV2/components/SegmentFilter.js.map +1 -1
- package/lib/QueryBuilderV2/components/SidePanelCubeItem.js +156 -178
- package/lib/QueryBuilderV2/components/SidePanelCubeItem.js.map +1 -1
- package/lib/QueryBuilderV2/components/Tabs/Tabs.js +4 -6
- package/lib/QueryBuilderV2/components/Tabs/Tabs.js.map +1 -1
- package/lib/QueryBuilderV2/components/TimeDateRangeSelector.js.map +1 -1
- package/lib/QueryBuilderV2/components/TimeListMember.js +25 -27
- package/lib/QueryBuilderV2/components/TimeListMember.js.map +1 -1
- package/lib/QueryBuilderV2/components/ValuesInput.js +48 -27
- package/lib/QueryBuilderV2/components/ValuesInput.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/auto-size.js +8 -8
- package/lib/QueryBuilderV2/hooks/auto-size.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/debounced-callback.js +1 -1
- package/lib/QueryBuilderV2/hooks/debounced-callback.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/debounced-state.js +1 -1
- package/lib/QueryBuilderV2/hooks/debounced-state.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/filtered-cubes.d.ts +1 -2
- package/lib/QueryBuilderV2/hooks/filtered-cubes.js +14 -18
- package/lib/QueryBuilderV2/hooks/filtered-cubes.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/filtered-members.js +8 -10
- package/lib/QueryBuilderV2/hooks/filtered-members.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/has-overflow.js +2 -2
- package/lib/QueryBuilderV2/hooks/has-overflow.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/local-storage.js +8 -8
- package/lib/QueryBuilderV2/hooks/local-storage.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/query-builder.d.ts +2 -2
- package/lib/QueryBuilderV2/hooks/query-builder.js +172 -202
- package/lib/QueryBuilderV2/hooks/query-builder.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/raw-filter.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/server-core-version-gte.js +4 -5
- package/lib/QueryBuilderV2/hooks/server-core-version-gte.js.map +1 -1
- package/lib/QueryBuilderV2/hooks/uniq-id.js.map +1 -1
- package/lib/QueryBuilderV2/icons/ChevronIcon.js +1 -1
- package/lib/QueryBuilderV2/icons/ChevronIcon.js.map +1 -1
- package/lib/QueryBuilderV2/icons/ItemInfoIcon.js +1 -1
- package/lib/QueryBuilderV2/icons/ItemInfoIcon.js.map +1 -1
- package/lib/QueryBuilderV2/icons/NonPublicIcon.js +1 -3
- package/lib/QueryBuilderV2/icons/NonPublicIcon.js.map +1 -1
- package/lib/QueryBuilderV2/icons/PrimaryKeyIcon.js +1 -3
- package/lib/QueryBuilderV2/icons/PrimaryKeyIcon.js.map +1 -1
- package/lib/QueryBuilderV2/utils/contains.js +1 -1
- package/lib/QueryBuilderV2/utils/contains.js.map +1 -1
- package/lib/QueryBuilderV2/utils/cube-sql-converter.js +6 -9
- package/lib/QueryBuilderV2/utils/cube-sql-converter.js.map +1 -1
- package/lib/QueryBuilderV2/utils/format-date-by-granularity.js +2 -2
- package/lib/QueryBuilderV2/utils/format-date-by-granularity.js.map +1 -1
- package/lib/QueryBuilderV2/utils/formatters.js +5 -7
- package/lib/QueryBuilderV2/utils/formatters.js.map +1 -1
- package/lib/QueryBuilderV2/utils/get-member-search-name.js +10 -7
- package/lib/QueryBuilderV2/utils/get-member-search-name.js.map +1 -1
- package/lib/QueryBuilderV2/utils/get-used-cubes-and-members.js +2 -2
- package/lib/QueryBuilderV2/utils/get-used-cubes-and-members.js.map +1 -1
- package/lib/QueryBuilderV2/utils/graphql-converters.d.ts +4 -4
- package/lib/QueryBuilderV2/utils/graphql-converters.js +17 -13
- package/lib/QueryBuilderV2/utils/graphql-converters.js.map +1 -1
- package/lib/QueryBuilderV2/utils/loadable.js +1 -1
- package/lib/QueryBuilderV2/utils/loadable.js.map +1 -1
- package/lib/QueryBuilderV2/utils/move-pivot-config.js +2 -2
- package/lib/QueryBuilderV2/utils/move-pivot-config.js.map +1 -1
- package/lib/QueryBuilderV2/utils/prepare-query.js +2 -1
- package/lib/QueryBuilderV2/utils/prepare-query.js.map +1 -1
- package/lib/QueryBuilderV2/utils/titleize.js +2 -1
- package/lib/QueryBuilderV2/utils/titleize.js.map +1 -1
- package/lib/QueryBuilderV2/utils/validate-query.js +27 -27
- package/lib/QueryBuilderV2/utils/validate-query.js.map +1 -1
- package/lib/atoms/CodeSnippet.js.map +1 -1
- package/lib/atoms/CubeLoader.js +1 -3
- package/lib/atoms/CubeLoader.js.map +1 -1
- package/lib/cloud/index.js.map +1 -1
- package/lib/components/AppContext.js +3 -3
- package/lib/components/AppContext.js.map +1 -1
- package/lib/components/CachePane.js +6 -6
- package/lib/components/CachePane.js.map +1 -1
- package/lib/components/ChartRenderer/ChartRenderer.js +19 -18
- package/lib/components/ChartRenderer/ChartRenderer.js.map +1 -1
- package/lib/components/DrilldownModal/DrilldownModal.js +1 -1
- package/lib/components/DrilldownModal/DrilldownModal.js.map +1 -1
- package/lib/components/DrilldownModal/TableQueryRenderer.js +7 -11
- package/lib/components/DrilldownModal/TableQueryRenderer.js.map +1 -1
- package/lib/components/Error/FatalError.js +3 -5
- package/lib/components/Error/FatalError.js.map +1 -1
- package/lib/components/GlobalStyles.js +1 -3
- package/lib/components/GlobalStyles.js.map +1 -1
- package/lib/components/GraphQL/CubeGraphQLConverter.js +3 -3
- package/lib/components/GraphQL/CubeGraphQLConverter.js.map +1 -1
- package/lib/components/GraphQL/GraphiQLSandbox.js +9 -13
- package/lib/components/GraphQL/GraphiQLSandbox.js.map +1 -1
- package/lib/components/Header/Header.js +1 -1
- package/lib/components/Header/Header.js.map +1 -1
- package/lib/components/Header/RunOnCubeCloud.js +2 -2
- package/lib/components/Header/RunOnCubeCloud.js.map +1 -1
- package/lib/components/LivePreviewContext/LivePreviewContextProvider.js +49 -53
- package/lib/components/LivePreviewContext/LivePreviewContextProvider.js.map +1 -1
- package/lib/components/Pivot/Options.js.map +1 -1
- package/lib/components/PlaygroundQueryBuilder/QueryBuilderContainer.js +2 -2
- package/lib/components/PlaygroundQueryBuilder/QueryBuilderContainer.js.map +1 -1
- package/lib/components/PlaygroundQueryBuilder/components/PlaygroundQueryBuilder.js +7 -7
- package/lib/components/PlaygroundQueryBuilder/components/PlaygroundQueryBuilder.js.map +1 -1
- package/lib/components/PlaygroundQueryBuilder/components/PreAggregationStatus.js +1 -1
- package/lib/components/PlaygroundQueryBuilder/components/PreAggregationStatus.js.map +1 -1
- package/lib/components/QueryTabs/QueryTabs.js +34 -32
- package/lib/components/QueryTabs/QueryTabs.js.map +1 -1
- package/lib/components/SecurityContext/SecurityContext.js +2 -2
- package/lib/components/SecurityContext/SecurityContext.js.map +1 -1
- package/lib/components/SecurityContext/SecurityContextProvider.js +10 -10
- package/lib/components/SecurityContext/SecurityContextProvider.js.map +1 -1
- package/lib/components/Settings/Settings.js +6 -6
- package/lib/components/Settings/Settings.js.map +1 -1
- package/lib/components/SqlQueryTab.js +2 -2
- package/lib/components/SqlQueryTab.js.map +1 -1
- package/lib/components/Vizard/Vizard.js +7 -9
- package/lib/components/Vizard/Vizard.js.map +1 -1
- package/lib/events.d.ts +2 -2
- package/lib/events.js +7 -3
- package/lib/events.js.map +1 -1
- package/lib/grid/Box.js.map +1 -1
- package/lib/grid/Flex.js +8 -7
- package/lib/grid/Flex.js.map +1 -1
- package/lib/grid/index.js.map +1 -1
- package/lib/hooks/app-context.js.map +1 -1
- package/lib/hooks/local-storage.js +4 -4
- package/lib/hooks/local-storage.js.map +1 -1
- package/lib/hooks/server-core-version.js +4 -5
- package/lib/hooks/server-core-version.js.map +1 -1
- package/lib/index.js +3 -5
- package/lib/index.js.map +1 -1
- package/lib/loadable.js +1 -1
- package/lib/loadable.js.map +1 -1
- package/lib/pages/ConnectionWizard/ConnectionWizardPage.js +9 -9
- package/lib/pages/ConnectionWizard/ConnectionWizardPage.js.map +1 -1
- package/lib/pages/ConnectionWizard/components/Base64Upload.js +4 -3
- package/lib/pages/ConnectionWizard/components/Base64Upload.js.map +1 -1
- package/lib/pages/ConnectionWizard/components/ConnectionTest.js +1 -1
- package/lib/pages/ConnectionWizard/components/ConnectionTest.js.map +1 -1
- package/lib/pages/ConnectionWizard/components/DatabaseForm.js +14 -5
- package/lib/pages/ConnectionWizard/components/DatabaseForm.js.map +1 -1
- package/lib/pages/ConnectionWizard/components/LocalhostTipBox.js +1 -1
- package/lib/pages/ConnectionWizard/components/LocalhostTipBox.js.map +1 -1
- package/lib/pages/Explore/ExplorePage.js +5 -5
- package/lib/pages/Explore/ExplorePage.js.map +1 -1
- package/lib/pages/FrontendIntegrations/FrontendIntegrationsPage.js +2 -2
- package/lib/pages/FrontendIntegrations/FrontendIntegrationsPage.js.map +1 -1
- package/lib/pages/Index/IndexPage.js +2 -2
- package/lib/pages/Index/IndexPage.js.map +1 -1
- package/lib/pages/Schema/SchemaPage.js +5 -5
- package/lib/pages/Schema/SchemaPage.js.map +1 -1
- package/lib/playground/components/QueryBuilder.js +1 -5
- package/lib/playground/components/QueryBuilder.js.map +1 -1
- package/lib/rollup-designer/Context.js +6 -6
- package/lib/rollup-designer/Context.js.map +1 -1
- package/lib/rollup-designer/RollupDesigner.js +45 -40
- package/lib/rollup-designer/RollupDesigner.js.map +1 -1
- package/lib/rollup-designer/components/Cubes.js +25 -29
- package/lib/rollup-designer/components/Cubes.js.map +1 -1
- package/lib/rollup-designer/components/RollupDesignerModal.js +1 -1
- package/lib/rollup-designer/components/RollupDesignerModal.js.map +1 -1
- package/lib/rollup-designer/components/Settings.d.ts +3 -7
- package/lib/rollup-designer/components/Settings.js +7 -12
- package/lib/rollup-designer/components/Settings.js.map +1 -1
- package/lib/rollup-designer/utils.js +14 -16
- package/lib/rollup-designer/utils.js.map +1 -1
- package/lib/shared/helpers.js +3 -11
- package/lib/shared/helpers.js.map +1 -1
- package/lib/shared/icons/GraphQLIcon.js +1 -3
- package/lib/shared/icons/GraphQLIcon.js.map +1 -1
- package/lib/shared/members.js.map +1 -1
- package/lib/utils.js +2 -3
- package/lib/utils.js.map +1 -1
- package/package.json +4 -7
- package/public/vizard/download/react-typescript-antd-table.zip +0 -0
- package/public/vizard/download/react-typescript-chartjs-area+bar+doughnut+line+pie.zip +0 -0
|
@@ -83,48 +83,45 @@ export function useQueryBuilder(props) {
|
|
|
83
83
|
});
|
|
84
84
|
const selectedCube = cubes.find((cube) => cube.name === selectedCubeName) ?? null;
|
|
85
85
|
const [dateRangesStore, setDateRangesStore] = useState((query?.timeDimensions || [])
|
|
86
|
-
.filter((timeDimension) =>
|
|
87
|
-
return !!timeDimension.dateRange;
|
|
88
|
-
})
|
|
86
|
+
.filter((timeDimension) => !!timeDimension.dateRange)
|
|
89
87
|
.map((timeDimension) => timeDimension.dimension));
|
|
90
|
-
const [pivotConfig, setPivotConfig] = useState(() => {
|
|
91
|
-
return ResultSet.getNormalizedPivotConfig({ ...query, queryType: 'regularQuery' }, defaultPivotConfig);
|
|
92
|
-
});
|
|
88
|
+
const [pivotConfig, setPivotConfig] = useState(() => ResultSet.getNormalizedPivotConfig({ ...query, queryType: 'regularQuery' }, defaultPivotConfig));
|
|
93
89
|
const progressCallback = (progressResult) => {
|
|
94
90
|
setProgress(progressResult);
|
|
95
91
|
};
|
|
96
|
-
const { usedCubes, usedMembers, usedMembersInFilters, usedMembersInGrouping, usedGranularities } = useMemo(() => getUsedCubesAndMembers(query, dateRangesStore), [query, dateRangesStore.join()]);
|
|
97
|
-
const [missingCubes, missingMembers] = useMemo(() =>
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
];
|
|
122
|
-
}, [usedCubes, usedMembers, meta, members]);
|
|
92
|
+
const { usedCubes, usedMembers, usedMembersInFilters, usedMembersInGrouping, usedGranularities, } = useMemo(() => getUsedCubesAndMembers(query, dateRangesStore), [query, dateRangesStore.join()]);
|
|
93
|
+
const [missingCubes, missingMembers] = useMemo(() => [
|
|
94
|
+
usedCubes.filter((cube) => !cubes.some((c) => c.name === cube)),
|
|
95
|
+
[
|
|
96
|
+
...(query.dimensions
|
|
97
|
+
?.filter((dimension) => !members.dimensions[dimension])
|
|
98
|
+
.map((name) => ({ name, category: 'dimensions' })) || []),
|
|
99
|
+
...(query.measures
|
|
100
|
+
?.filter((measure) => !members.measures[measure])
|
|
101
|
+
.map((name) => ({ name, category: 'measures' })) || []),
|
|
102
|
+
...(query.segments
|
|
103
|
+
?.filter((segment) => !members.segments[segment])
|
|
104
|
+
.map((name) => ({ name, category: 'segments' })) || []),
|
|
105
|
+
...(query.timeDimensions
|
|
106
|
+
?.filter((timeDimension) => !members.dimensions[timeDimension.dimension])
|
|
107
|
+
.map(({ dimension, granularity }) => ({
|
|
108
|
+
name: dimension,
|
|
109
|
+
category: 'timeDimensions',
|
|
110
|
+
granularity,
|
|
111
|
+
})) || []),
|
|
112
|
+
...(usedMembersInFilters
|
|
113
|
+
.filter((dimension) => !members.dimensions[dimension] && !members.measures[dimension])
|
|
114
|
+
.map((name) => ({ name, category: 'dimensions' })) || []),
|
|
115
|
+
],
|
|
116
|
+
], [usedCubes, usedMembers, meta, members]);
|
|
123
117
|
// place joined cubes first
|
|
124
118
|
cubes.sort((c1, c2) => {
|
|
125
119
|
const c1joined = isCubeUsed(c1.name);
|
|
126
120
|
const c2joined = isCubeUsed(c2.name);
|
|
127
|
-
|
|
121
|
+
if (c1joined === c2joined) {
|
|
122
|
+
return 0;
|
|
123
|
+
}
|
|
124
|
+
return c1joined > c2joined ? -1 : 1;
|
|
128
125
|
});
|
|
129
126
|
async function runQuery() {
|
|
130
127
|
const currentRequest = ++loadingRef.current;
|
|
@@ -143,7 +140,7 @@ export function useQueryBuilder(props) {
|
|
|
143
140
|
}),
|
|
144
141
|
cubeApi.sql(query),
|
|
145
142
|
])
|
|
146
|
-
.then(([
|
|
143
|
+
.then(([loadedResultSet, loadedSqlQuery]) => {
|
|
147
144
|
if (currentRequest !== loadingRef.current) {
|
|
148
145
|
return;
|
|
149
146
|
}
|
|
@@ -151,20 +148,20 @@ export function useQueryBuilder(props) {
|
|
|
151
148
|
setIsDataModelChanged(false);
|
|
152
149
|
setIsLoading(false);
|
|
153
150
|
setExecutedQuery(queryCopy);
|
|
154
|
-
setResultSet(
|
|
155
|
-
setSqlQuery(
|
|
151
|
+
setResultSet(loadedResultSet);
|
|
152
|
+
setSqlQuery(loadedSqlQuery);
|
|
156
153
|
setProgress(null);
|
|
157
154
|
tracking?.event('load_request_success:frontend', {
|
|
158
155
|
isNewPlayground: true,
|
|
159
156
|
});
|
|
160
157
|
})
|
|
161
|
-
.catch((
|
|
158
|
+
.catch((loadError) => {
|
|
162
159
|
if (currentRequest !== loadingRef.current) {
|
|
163
160
|
return;
|
|
164
161
|
}
|
|
165
162
|
setIsLoading(false);
|
|
166
163
|
setProgress(null);
|
|
167
|
-
setError(
|
|
164
|
+
setError(loadError);
|
|
168
165
|
});
|
|
169
166
|
}
|
|
170
167
|
function stopQuery() {
|
|
@@ -195,9 +192,7 @@ export function useQueryBuilder(props) {
|
|
|
195
192
|
if (currentRequest !== metaLoadingRef.current) {
|
|
196
193
|
return;
|
|
197
194
|
}
|
|
198
|
-
const visibilityFilter = (item) =>
|
|
199
|
-
return !displayPrivateItems ? item.public : true;
|
|
200
|
-
};
|
|
195
|
+
const visibilityFilter = (item) => (!displayPrivateItems ? item.public : true);
|
|
201
196
|
setIsMetaLoading(false);
|
|
202
197
|
const memberData = {
|
|
203
198
|
dimensions: {},
|
|
@@ -218,24 +213,22 @@ export function useQueryBuilder(props) {
|
|
|
218
213
|
setMembers(memberData);
|
|
219
214
|
setCubes(newMeta.meta.cubes
|
|
220
215
|
.filter(visibilityFilter)
|
|
221
|
-
.map((cube) => {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
};
|
|
228
|
-
})
|
|
216
|
+
.map((cube) => ({
|
|
217
|
+
...cube,
|
|
218
|
+
measures: cube.measures.filter(visibilityFilter),
|
|
219
|
+
dimensions: cube.dimensions.filter(visibilityFilter),
|
|
220
|
+
segments: cube.segments.filter(visibilityFilter),
|
|
221
|
+
}))
|
|
229
222
|
.sort((a, b) => a.name.localeCompare(b.name)));
|
|
230
223
|
setMeta(newMeta);
|
|
231
224
|
})
|
|
232
|
-
.catch((
|
|
225
|
+
.catch((sqlError) => {
|
|
233
226
|
if (currentRequest !== metaLoadingRef.current) {
|
|
234
227
|
return;
|
|
235
228
|
}
|
|
236
229
|
setIsMetaLoading(false);
|
|
237
|
-
setMetaError(
|
|
238
|
-
setRichMetaError(
|
|
230
|
+
setMetaError(sqlError.response?.plainError?.trim() || String(sqlError));
|
|
231
|
+
setRichMetaError(sqlError);
|
|
239
232
|
// metaErrorStack = error.response?.stack?.replace(error.message || '', '') || '';
|
|
240
233
|
});
|
|
241
234
|
}
|
|
@@ -247,32 +240,32 @@ export function useQueryBuilder(props) {
|
|
|
247
240
|
setIsVerifying(true);
|
|
248
241
|
cubeApi
|
|
249
242
|
.dryRun(query)
|
|
250
|
-
.then((
|
|
243
|
+
.then((response) => {
|
|
251
244
|
if (currentRequest !== verificationRef.current) {
|
|
252
245
|
return;
|
|
253
246
|
}
|
|
254
247
|
setVerificationError(null);
|
|
255
248
|
setIsVerifying(false);
|
|
256
|
-
setDryRunResponse(
|
|
257
|
-
setPivotConfig(ResultSet.getNormalizedPivotConfig(
|
|
249
|
+
setDryRunResponse(response);
|
|
250
|
+
setPivotConfig(ResultSet.getNormalizedPivotConfig(response.pivotQuery, pivotConfig));
|
|
258
251
|
})
|
|
259
|
-
.catch((
|
|
252
|
+
.catch((dryRunError) => {
|
|
260
253
|
if (currentRequest !== verificationRef.current) {
|
|
261
254
|
return;
|
|
262
255
|
}
|
|
263
256
|
setIsVerifying(false);
|
|
264
|
-
setVerificationError(
|
|
257
|
+
setVerificationError(dryRunError.response?.plainError || dryRunError.message || String(dryRunError));
|
|
265
258
|
});
|
|
266
259
|
}
|
|
267
|
-
function setQuery(
|
|
260
|
+
function setQuery(nextQuery) {
|
|
268
261
|
setQueryInstance((originalQuery) => {
|
|
269
262
|
try {
|
|
270
263
|
const originalHash = getQueryHash(originalQuery);
|
|
271
|
-
|
|
264
|
+
const validatedQuery = queryValidation(nextQuery);
|
|
272
265
|
return originalHash !== getQueryHash(validatedQuery) ? validatedQuery : originalQuery;
|
|
273
266
|
}
|
|
274
|
-
catch
|
|
275
|
-
console.error('An invalid query has been set',
|
|
267
|
+
catch {
|
|
268
|
+
console.error('An invalid query has been set', nextQuery);
|
|
276
269
|
return originalQuery;
|
|
277
270
|
}
|
|
278
271
|
});
|
|
@@ -282,24 +275,24 @@ export function useQueryBuilder(props) {
|
|
|
282
275
|
const copiedQuery = JSON.parse(JSON.stringify(originalQuery));
|
|
283
276
|
try {
|
|
284
277
|
const originalHash = getQueryHash(copiedQuery);
|
|
285
|
-
let
|
|
278
|
+
let resolvedQuery;
|
|
286
279
|
if (typeof queryPart === 'function') {
|
|
287
280
|
const newQuery = queryPart(copiedQuery);
|
|
288
281
|
// if function returns nothing we don't need to update query
|
|
289
282
|
if (!newQuery) {
|
|
290
283
|
return originalQuery;
|
|
291
284
|
}
|
|
292
|
-
|
|
285
|
+
resolvedQuery = queryValidation({ ...copiedQuery, ...newQuery });
|
|
293
286
|
}
|
|
294
287
|
else {
|
|
295
|
-
|
|
288
|
+
resolvedQuery = queryValidation({
|
|
296
289
|
...copiedQuery,
|
|
297
290
|
...queryPart,
|
|
298
291
|
});
|
|
299
292
|
}
|
|
300
|
-
return originalHash !== getQueryHash(
|
|
293
|
+
return originalHash !== getQueryHash(resolvedQuery) ? resolvedQuery : originalQuery;
|
|
301
294
|
}
|
|
302
|
-
catch
|
|
295
|
+
catch {
|
|
303
296
|
console.error('An invalid query has been set', query);
|
|
304
297
|
return originalQuery;
|
|
305
298
|
}
|
|
@@ -328,12 +321,10 @@ export function useQueryBuilder(props) {
|
|
|
328
321
|
const cube = getCubeByName(cubeName);
|
|
329
322
|
if (cube) {
|
|
330
323
|
// Find all hierarchies that include the given dimension
|
|
331
|
-
const hierarchiesToFill = (cube.hierarchies ?? []).filter((hierarchy) =>
|
|
332
|
-
return hierarchy.levels.includes(name);
|
|
333
|
-
});
|
|
324
|
+
const hierarchiesToFill = (cube.hierarchies ?? []).filter((hierarchy) => hierarchy.levels.includes(name));
|
|
334
325
|
// If there is only one hierarchy that can be filled, we can add all levels that are above the given dimension
|
|
335
326
|
if (hierarchiesToFill.length === 1) {
|
|
336
|
-
const levels = hierarchiesToFill[0]
|
|
327
|
+
const { levels } = hierarchiesToFill[0];
|
|
337
328
|
// If no dimension in the hierarchy selected, then we can proceed
|
|
338
329
|
if (!levels.some((dimensionName) => query.dimensions?.includes(dimensionName))) {
|
|
339
330
|
levels
|
|
@@ -363,11 +354,11 @@ export function useQueryBuilder(props) {
|
|
|
363
354
|
if (type === 'dimensions') {
|
|
364
355
|
names = getConnectedDimensionNames(name);
|
|
365
356
|
}
|
|
366
|
-
updateQuery((
|
|
367
|
-
const list =
|
|
368
|
-
names.forEach((
|
|
369
|
-
if (!list?.includes(
|
|
370
|
-
list.push(
|
|
357
|
+
updateQuery((currentQuery) => {
|
|
358
|
+
const list = currentQuery[type] || [];
|
|
359
|
+
names.forEach((memberName) => {
|
|
360
|
+
if (!list?.includes(memberName)) {
|
|
361
|
+
list.push(memberName);
|
|
371
362
|
}
|
|
372
363
|
});
|
|
373
364
|
return { [type]: list };
|
|
@@ -375,8 +366,8 @@ export function useQueryBuilder(props) {
|
|
|
375
366
|
return true;
|
|
376
367
|
},
|
|
377
368
|
remove(name) {
|
|
378
|
-
updateQuery((
|
|
379
|
-
const list =
|
|
369
|
+
updateQuery((currentQuery) => {
|
|
370
|
+
const list = currentQuery[type] || [];
|
|
380
371
|
const index = list?.indexOf(name);
|
|
381
372
|
if (index !== -1) {
|
|
382
373
|
list.splice(index, 1);
|
|
@@ -386,8 +377,8 @@ export function useQueryBuilder(props) {
|
|
|
386
377
|
return true;
|
|
387
378
|
},
|
|
388
379
|
toggle(name) {
|
|
389
|
-
updateQuery((
|
|
390
|
-
const list =
|
|
380
|
+
updateQuery((currentQuery) => {
|
|
381
|
+
const list = currentQuery[type] || [];
|
|
391
382
|
const index = list?.indexOf(name);
|
|
392
383
|
if (index === -1) {
|
|
393
384
|
const member = members[type][name];
|
|
@@ -410,11 +401,9 @@ export function useQueryBuilder(props) {
|
|
|
410
401
|
return true;
|
|
411
402
|
},
|
|
412
403
|
clear() {
|
|
413
|
-
updateQuery(() => {
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
};
|
|
417
|
-
});
|
|
404
|
+
updateQuery(() => ({
|
|
405
|
+
[type]: [],
|
|
406
|
+
}));
|
|
418
407
|
},
|
|
419
408
|
get list() {
|
|
420
409
|
return query[type] || [];
|
|
@@ -436,8 +425,8 @@ export function useQueryBuilder(props) {
|
|
|
436
425
|
});
|
|
437
426
|
return false;
|
|
438
427
|
}
|
|
439
|
-
updateQuery((
|
|
440
|
-
const { timeDimensions = [] } =
|
|
428
|
+
updateQuery((currentQuery) => {
|
|
429
|
+
const { timeDimensions = [] } = currentQuery;
|
|
441
430
|
const component = timeDimensions.find((d) => d.dimension === name);
|
|
442
431
|
if (!component) {
|
|
443
432
|
timeDimensions.push({ dimension: name, granularity });
|
|
@@ -450,8 +439,8 @@ export function useQueryBuilder(props) {
|
|
|
450
439
|
return true;
|
|
451
440
|
},
|
|
452
441
|
remove(name) {
|
|
453
|
-
updateQuery((
|
|
454
|
-
let { timeDimensions = [] } =
|
|
442
|
+
updateQuery((currentQuery) => {
|
|
443
|
+
let { timeDimensions = [] } = currentQuery;
|
|
455
444
|
const component = timeDimensions.find((d) => d.dimension === name);
|
|
456
445
|
if (!component) {
|
|
457
446
|
return;
|
|
@@ -466,8 +455,8 @@ export function useQueryBuilder(props) {
|
|
|
466
455
|
return true;
|
|
467
456
|
},
|
|
468
457
|
toggle(name, granularity) {
|
|
469
|
-
updateQuery((
|
|
470
|
-
let { timeDimensions = [] } =
|
|
458
|
+
updateQuery((currentQuery) => {
|
|
459
|
+
let { timeDimensions = [] } = currentQuery;
|
|
471
460
|
const component = timeDimensions.find((d) => d.dimension === name);
|
|
472
461
|
if (!component) {
|
|
473
462
|
const member = members.dimensions[name];
|
|
@@ -484,18 +473,16 @@ export function useQueryBuilder(props) {
|
|
|
484
473
|
}
|
|
485
474
|
timeDimensions.push({ dimension: name, granularity });
|
|
486
475
|
}
|
|
487
|
-
else {
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
timeDimensions = timeDimensions.filter((d) => d.dimension !== name);
|
|
493
|
-
}
|
|
494
|
-
}
|
|
495
|
-
else {
|
|
496
|
-
component.granularity = granularity;
|
|
476
|
+
else if (component.granularity === granularity) {
|
|
477
|
+
delete component.granularity;
|
|
478
|
+
// If component has no date range either we can remove it
|
|
479
|
+
if (!component.dateRange) {
|
|
480
|
+
timeDimensions = timeDimensions.filter((d) => d.dimension !== name);
|
|
497
481
|
}
|
|
498
482
|
}
|
|
483
|
+
else {
|
|
484
|
+
component.granularity = granularity;
|
|
485
|
+
}
|
|
499
486
|
return { timeDimensions };
|
|
500
487
|
});
|
|
501
488
|
return true;
|
|
@@ -509,8 +496,8 @@ export function useQueryBuilder(props) {
|
|
|
509
496
|
return timeDimensions.filter((timeDimension) => timeDimension.granularity);
|
|
510
497
|
},
|
|
511
498
|
reorder(names) {
|
|
512
|
-
updateQuery((
|
|
513
|
-
const { timeDimensions = [] } =
|
|
499
|
+
updateQuery((currentQuery) => {
|
|
500
|
+
const { timeDimensions = [] } = currentQuery;
|
|
514
501
|
const reordered = timeDimensions.sort((a, b) => {
|
|
515
502
|
const aIndex = names.indexOf(a.dimension);
|
|
516
503
|
const bIndex = names.indexOf(b.dimension);
|
|
@@ -520,11 +507,9 @@ export function useQueryBuilder(props) {
|
|
|
520
507
|
});
|
|
521
508
|
},
|
|
522
509
|
clear() {
|
|
523
|
-
updateQuery((
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
};
|
|
527
|
-
});
|
|
510
|
+
updateQuery((currentQuery) => ({
|
|
511
|
+
timeDimensions: currentQuery.timeDimensions?.filter((d) => !d.granularity),
|
|
512
|
+
}));
|
|
528
513
|
},
|
|
529
514
|
};
|
|
530
515
|
const dateRanges = {
|
|
@@ -541,15 +526,15 @@ export function useQueryBuilder(props) {
|
|
|
541
526
|
});
|
|
542
527
|
return false;
|
|
543
528
|
}
|
|
544
|
-
setDateRangesStore((
|
|
545
|
-
if (!
|
|
546
|
-
return [...
|
|
529
|
+
setDateRangesStore((prevDateRanges) => {
|
|
530
|
+
if (!prevDateRanges.includes(name)) {
|
|
531
|
+
return [...prevDateRanges, name];
|
|
547
532
|
}
|
|
548
|
-
return
|
|
533
|
+
return prevDateRanges;
|
|
549
534
|
});
|
|
550
535
|
if (dateRange) {
|
|
551
|
-
updateQuery((
|
|
552
|
-
const { timeDimensions = [] } =
|
|
536
|
+
updateQuery((currentQuery) => {
|
|
537
|
+
const { timeDimensions = [] } = currentQuery;
|
|
553
538
|
const component = timeDimensions.find((d) => d.dimension === name);
|
|
554
539
|
if (!component) {
|
|
555
540
|
timeDimensions.push({ dimension: name, dateRange });
|
|
@@ -563,8 +548,8 @@ export function useQueryBuilder(props) {
|
|
|
563
548
|
return true;
|
|
564
549
|
},
|
|
565
550
|
remove(name) {
|
|
566
|
-
updateQuery((
|
|
567
|
-
let { timeDimensions = [] } =
|
|
551
|
+
updateQuery((currentQuery) => {
|
|
552
|
+
let { timeDimensions = [] } = currentQuery;
|
|
568
553
|
const component = timeDimensions.find((d) => d.dimension === name);
|
|
569
554
|
if (!component) {
|
|
570
555
|
return;
|
|
@@ -576,47 +561,43 @@ export function useQueryBuilder(props) {
|
|
|
576
561
|
}
|
|
577
562
|
return { timeDimensions };
|
|
578
563
|
});
|
|
579
|
-
setDateRangesStore((
|
|
580
|
-
return dateRanges.filter((d) => d !== name);
|
|
581
|
-
});
|
|
564
|
+
setDateRangesStore((prevDateRanges) => prevDateRanges.filter((d) => d !== name));
|
|
582
565
|
return true;
|
|
583
566
|
},
|
|
584
567
|
get list() {
|
|
585
568
|
return dateRangesStore;
|
|
586
569
|
},
|
|
587
570
|
clear() {
|
|
588
|
-
updateQuery((
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
};
|
|
592
|
-
});
|
|
571
|
+
updateQuery((currentQuery) => ({
|
|
572
|
+
timeDimensions: currentQuery.timeDimensions?.filter((d) => !d.dateRange),
|
|
573
|
+
}));
|
|
593
574
|
setDateRangesStore([]);
|
|
594
575
|
},
|
|
595
576
|
};
|
|
596
577
|
const order = {
|
|
597
|
-
set(name,
|
|
578
|
+
set(name, memberOrder) {
|
|
598
579
|
const member = members.dimensions[name] || members.measures[name];
|
|
599
580
|
if (!member) {
|
|
600
581
|
console.log('Unable to set order. Member is not found', name);
|
|
601
582
|
return false;
|
|
602
583
|
}
|
|
603
|
-
updateQuery((
|
|
604
|
-
const orderMap = (
|
|
605
|
-
if (orderMap[name] ===
|
|
584
|
+
updateQuery((currentQuery) => {
|
|
585
|
+
const orderMap = (currentQuery.order || {});
|
|
586
|
+
if (orderMap[name] === memberOrder) {
|
|
606
587
|
return;
|
|
607
588
|
}
|
|
608
589
|
return {
|
|
609
590
|
order: {
|
|
610
591
|
...orderMap,
|
|
611
|
-
[name]:
|
|
592
|
+
[name]: memberOrder,
|
|
612
593
|
},
|
|
613
594
|
};
|
|
614
595
|
});
|
|
615
596
|
return true;
|
|
616
597
|
},
|
|
617
598
|
remove(name) {
|
|
618
|
-
updateQuery((
|
|
619
|
-
const orderMap = (
|
|
599
|
+
updateQuery((currentQuery) => {
|
|
600
|
+
const orderMap = (currentQuery.order || {});
|
|
620
601
|
if (!orderMap[name]) {
|
|
621
602
|
return;
|
|
622
603
|
}
|
|
@@ -635,9 +616,9 @@ export function useQueryBuilder(props) {
|
|
|
635
616
|
return (query.order || {});
|
|
636
617
|
},
|
|
637
618
|
setOrder(names) {
|
|
638
|
-
updateQuery((
|
|
619
|
+
updateQuery((currentQuery) => {
|
|
639
620
|
names = [...names];
|
|
640
|
-
const orderMap = (
|
|
621
|
+
const orderMap = (currentQuery.order || {});
|
|
641
622
|
Object.keys(orderMap).forEach((name) => {
|
|
642
623
|
// suppress TS warning
|
|
643
624
|
if (typeof name !== 'string') {
|
|
@@ -647,14 +628,14 @@ export function useQueryBuilder(props) {
|
|
|
647
628
|
names.push(orderMap[name]);
|
|
648
629
|
}
|
|
649
630
|
});
|
|
650
|
-
const
|
|
631
|
+
const nextOrder = names.reduce((acc, name) => {
|
|
651
632
|
if (name in orderMap) {
|
|
652
633
|
acc[name] = orderMap[name];
|
|
653
634
|
}
|
|
654
635
|
return acc;
|
|
655
636
|
}, {});
|
|
656
637
|
return {
|
|
657
|
-
order,
|
|
638
|
+
order: nextOrder,
|
|
658
639
|
};
|
|
659
640
|
});
|
|
660
641
|
},
|
|
@@ -663,11 +644,9 @@ export function useQueryBuilder(props) {
|
|
|
663
644
|
return Object.keys(orderMap);
|
|
664
645
|
},
|
|
665
646
|
clear() {
|
|
666
|
-
updateQuery(() => {
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
};
|
|
670
|
-
});
|
|
647
|
+
updateQuery(() => ({
|
|
648
|
+
order: undefined,
|
|
649
|
+
}));
|
|
671
650
|
},
|
|
672
651
|
};
|
|
673
652
|
const filters = {
|
|
@@ -680,39 +659,38 @@ export function useQueryBuilder(props) {
|
|
|
680
659
|
return false;
|
|
681
660
|
}
|
|
682
661
|
}
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
filters.push(filter);
|
|
662
|
+
updateQuery((currentQuery) => {
|
|
663
|
+
const currentFilters = currentQuery?.filters || [];
|
|
664
|
+
currentFilters.push(filter);
|
|
687
665
|
return {
|
|
688
|
-
filters,
|
|
666
|
+
filters: currentFilters,
|
|
689
667
|
};
|
|
690
668
|
});
|
|
691
669
|
return true;
|
|
692
670
|
},
|
|
693
671
|
remove(index) {
|
|
694
|
-
updateQuery((
|
|
695
|
-
const
|
|
696
|
-
|
|
672
|
+
updateQuery((currentQuery) => {
|
|
673
|
+
const currentFilters = currentQuery?.filters || [];
|
|
674
|
+
currentFilters.splice(index, 1);
|
|
697
675
|
return {
|
|
698
|
-
filters,
|
|
676
|
+
filters: currentFilters,
|
|
699
677
|
};
|
|
700
678
|
});
|
|
701
679
|
return true;
|
|
702
680
|
},
|
|
703
681
|
removeByMember(name) {
|
|
704
|
-
updateQuery((
|
|
705
|
-
const
|
|
706
|
-
return { filters: removeFiltersByMember(
|
|
682
|
+
updateQuery((currentQuery) => {
|
|
683
|
+
const currentFilters = currentQuery.filters || [];
|
|
684
|
+
return { filters: removeFiltersByMember(currentFilters, name) };
|
|
707
685
|
});
|
|
708
686
|
return true;
|
|
709
687
|
},
|
|
710
688
|
update(index, filter) {
|
|
711
|
-
updateQuery((
|
|
712
|
-
const
|
|
713
|
-
|
|
689
|
+
updateQuery((currentQuery) => {
|
|
690
|
+
const currentFilters = currentQuery?.filters || [];
|
|
691
|
+
currentFilters[index] = filter;
|
|
714
692
|
return {
|
|
715
|
-
filters,
|
|
693
|
+
filters: currentFilters,
|
|
716
694
|
};
|
|
717
695
|
});
|
|
718
696
|
return true;
|
|
@@ -721,11 +699,9 @@ export function useQueryBuilder(props) {
|
|
|
721
699
|
return query?.filters || [];
|
|
722
700
|
},
|
|
723
701
|
clear() {
|
|
724
|
-
updateQuery(() => {
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
};
|
|
728
|
-
});
|
|
702
|
+
updateQuery(() => ({
|
|
703
|
+
filters: [],
|
|
704
|
+
}));
|
|
729
705
|
},
|
|
730
706
|
};
|
|
731
707
|
// UI state management
|
|
@@ -760,9 +736,7 @@ export function useQueryBuilder(props) {
|
|
|
760
736
|
const timeDimensions = query?.timeDimensions || [];
|
|
761
737
|
// ...make sure that all the related dateRanges are added
|
|
762
738
|
timeDimensions
|
|
763
|
-
.filter((timeDimension) =>
|
|
764
|
-
return !!timeDimension.dateRange;
|
|
765
|
-
})
|
|
739
|
+
.filter((timeDimension) => !!timeDimension.dateRange)
|
|
766
740
|
.map((timeDimension) => timeDimension.dimension)
|
|
767
741
|
.forEach((dimensionName) => {
|
|
768
742
|
if (!dateRangesStore.includes(dimensionName)) {
|
|
@@ -780,29 +754,29 @@ export function useQueryBuilder(props) {
|
|
|
780
754
|
}, [JSON.stringify(query.timeDimensions), JSON.stringify(dateRangesStore)]);
|
|
781
755
|
// Each time schema is changed we need to reload meta
|
|
782
756
|
useEffect(() => {
|
|
783
|
-
|
|
757
|
+
loadMeta();
|
|
784
758
|
}, [schemaVersion, cubeApi]);
|
|
785
|
-
const isQueryEmpty = !query.measures?.length
|
|
786
|
-
!query.dimensions?.length
|
|
787
|
-
!query.timeDimensions?.length
|
|
788
|
-
!query.filters?.length
|
|
789
|
-
!query.segments?.length;
|
|
759
|
+
const isQueryEmpty = !query.measures?.length
|
|
760
|
+
&& !query.dimensions?.length
|
|
761
|
+
&& !query.timeDimensions?.length
|
|
762
|
+
&& !query.filters?.length
|
|
763
|
+
&& !query.segments?.length;
|
|
764
|
+
const connectedCubeName = usedCubes.find(
|
|
765
|
+
// @ts-ignore
|
|
766
|
+
(name) => getCubeByName(name)?.connectedComponent);
|
|
790
767
|
// @ts-ignore
|
|
791
|
-
const connectionId =
|
|
792
|
-
?
|
|
793
|
-
(() => {
|
|
794
|
-
const cubeName = usedCubes.find((cubeName) => getCubeByName(cubeName)?.connectedComponent);
|
|
795
|
-
return cubeName ? getCubeByName(cubeName)?.connectedComponent : undefined;
|
|
796
|
-
})()
|
|
768
|
+
const connectionId = connectedCubeName
|
|
769
|
+
? getCubeByName(connectedCubeName)?.connectedComponent
|
|
797
770
|
: undefined;
|
|
798
771
|
// @ts-ignore
|
|
799
772
|
const joinableCubes = !usedCubes.length
|
|
800
773
|
? [...cubes]
|
|
801
|
-
: cubes.filter((cube) =>
|
|
802
|
-
|
|
803
|
-
|
|
774
|
+
: cubes.filter((cube) => (connectionId != null
|
|
775
|
+
// @ts-ignore
|
|
776
|
+
? cube.connectedComponent === connectionId
|
|
777
|
+
: cube.name === usedCubes[0]));
|
|
804
778
|
const joinableCubeNames = joinableCubes.map((cube) => cube.name);
|
|
805
|
-
const joinableMembers = useMemo(() => !usedCubes.length
|
|
779
|
+
const joinableMembers = useMemo(() => (!usedCubes.length
|
|
806
780
|
? {
|
|
807
781
|
dimensions: members.dimensions,
|
|
808
782
|
measures: members.measures,
|
|
@@ -812,7 +786,7 @@ export function useQueryBuilder(props) {
|
|
|
812
786
|
dimensions: Object.fromEntries(Object.entries(members.dimensions).filter(([name]) => joinableCubeNames.includes(name.split('.')[0]))),
|
|
813
787
|
measures: Object.fromEntries(Object.entries(members.measures).filter(([name]) => joinableCubeNames.includes(name.split('.')[0]))),
|
|
814
788
|
segments: Object.fromEntries(Object.entries(members.segments).filter(([name]) => joinableCubeNames.includes(name.split('.')[0]))),
|
|
815
|
-
}, [joinableCubeNames.join(',')]);
|
|
789
|
+
}), [joinableCubeNames.join(',')]);
|
|
816
790
|
const updatePivotConfig = {
|
|
817
791
|
moveItem: ({ sourceIndex, destinationIndex, sourceAxis, destinationAxis, }) => {
|
|
818
792
|
setPivotConfig(ResultSet.getNormalizedPivotConfig({ ...query, queryType: 'regularQuery' }, {
|
|
@@ -831,14 +805,14 @@ export function useQueryBuilder(props) {
|
|
|
831
805
|
const measures = query?.measures || [];
|
|
832
806
|
const dimensions = query?.dimensions || [];
|
|
833
807
|
const segments = query?.segments || [];
|
|
834
|
-
const
|
|
835
|
-
const
|
|
808
|
+
const filterMembers = extractMembersFromFilters(query?.filters || []);
|
|
809
|
+
const dateRangeMembers = query?.timeDimensions
|
|
836
810
|
?.filter((timeDimension) => timeDimension.dateRange)
|
|
837
811
|
.map((timeDimension) => timeDimension.dimension) || [];
|
|
838
|
-
const
|
|
812
|
+
const groupingMembers = query?.timeDimensions
|
|
839
813
|
?.filter((timeDimension) => timeDimension.granularity)
|
|
840
814
|
.map((timeDimension) => timeDimension.dimension) || [];
|
|
841
|
-
const all = [...measures, ...dimensions, ...segments, ...
|
|
815
|
+
const all = [...measures, ...dimensions, ...segments, ...filterMembers, ...dateRangeMembers, ...groupingMembers];
|
|
842
816
|
const allCubeNames = [];
|
|
843
817
|
all.forEach((member) => {
|
|
844
818
|
const cubeName = member.split('.')[0];
|
|
@@ -880,19 +854,19 @@ export function useQueryBuilder(props) {
|
|
|
880
854
|
stats.isUsed = true;
|
|
881
855
|
}
|
|
882
856
|
});
|
|
883
|
-
|
|
857
|
+
filterMembers.forEach((member) => {
|
|
884
858
|
if (member.includes(cubePrefix)) {
|
|
885
859
|
stats.filters.push(member);
|
|
886
860
|
stats.isUsed = true;
|
|
887
861
|
}
|
|
888
862
|
});
|
|
889
|
-
|
|
863
|
+
dateRangeMembers.forEach((member) => {
|
|
890
864
|
if (member.includes(cubePrefix)) {
|
|
891
865
|
stats.dateRanges.push(member);
|
|
892
866
|
stats.isUsed = true;
|
|
893
867
|
}
|
|
894
868
|
});
|
|
895
|
-
|
|
869
|
+
groupingMembers.forEach((member) => {
|
|
896
870
|
if (member.includes(cubePrefix)) {
|
|
897
871
|
stats.grouping.push(member);
|
|
898
872
|
stats.isUsed = true;
|
|
@@ -907,10 +881,10 @@ export function useQueryBuilder(props) {
|
|
|
907
881
|
cube?.hierarchies?.forEach((hierarchy) => {
|
|
908
882
|
const hierarchyName = hierarchy.name;
|
|
909
883
|
stats.hierarchies[hierarchyName] = [];
|
|
910
|
-
const
|
|
884
|
+
const hierarchyDimensions = stats.hierarchies[hierarchyName];
|
|
911
885
|
hierarchy.levels.forEach((dimensionName) => {
|
|
912
886
|
if (stats.dimensions.includes(dimensionName)) {
|
|
913
|
-
|
|
887
|
+
hierarchyDimensions.push(dimensionName);
|
|
914
888
|
}
|
|
915
889
|
});
|
|
916
890
|
});
|
|
@@ -947,7 +921,7 @@ export function useQueryBuilder(props) {
|
|
|
947
921
|
}
|
|
948
922
|
});
|
|
949
923
|
}
|
|
950
|
-
if (
|
|
924
|
+
if (groupingMembers.includes(memberName)) {
|
|
951
925
|
folderStats.grouping.push(memberName);
|
|
952
926
|
}
|
|
953
927
|
});
|
|
@@ -956,15 +930,11 @@ export function useQueryBuilder(props) {
|
|
|
956
930
|
return allStats;
|
|
957
931
|
}, {});
|
|
958
932
|
}, [queryHash, meta, cubes.length]);
|
|
959
|
-
const memberList = useMemo(() =>
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
const member = memberList.find((m) => m.name === memberName);
|
|
965
|
-
return !member?.public;
|
|
966
|
-
});
|
|
967
|
-
}, [usedCubes, usedMembers]);
|
|
933
|
+
const memberList = useMemo(() => [...Object.values(members.dimensions), ...Object.values(members.measures)], [members]);
|
|
934
|
+
const hasPrivateMembers = useMemo(() => usedMembers.some((memberName) => {
|
|
935
|
+
const member = memberList.find((m) => m.name === memberName);
|
|
936
|
+
return !member?.public;
|
|
937
|
+
}), [usedCubes, usedMembers]);
|
|
968
938
|
return {
|
|
969
939
|
// options
|
|
970
940
|
memberViewType,
|
|
@@ -1028,8 +998,8 @@ export function useQueryBuilder(props) {
|
|
|
1028
998
|
isQueryEmpty,
|
|
1029
999
|
isApiTokenChanged,
|
|
1030
1000
|
isDataModelChanged,
|
|
1031
|
-
isResultOutdated: !!(executedQuery
|
|
1032
|
-
(queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged)),
|
|
1001
|
+
isResultOutdated: !!(executedQuery
|
|
1002
|
+
&& (queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged)),
|
|
1033
1003
|
// api
|
|
1034
1004
|
cubeApi,
|
|
1035
1005
|
mutexObj: mutexRef.current,
|