Failing query range request due to top level operation dependency (#3182)

* fix: dependency check for top level operation

* refactor: one on one mapping

* fix: removed the unwanted if checks

---------

Co-authored-by: Palash Gupta <palashgdev@gmail.com>
This commit is contained in:
Rajat Dabade 2023-07-21 16:17:31 +05:30 committed by GitHub
parent c4ce057d7a
commit ace2d8a3b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -60,6 +60,7 @@ function GridCardGraph({
allowDelete,
allowClone,
allowEdit,
isQueryEnabled,
}: GridCardGraphProps): JSX.Element {
const { ref: graphRef, inView: isGraphVisible } = useInView({
threshold: 0,
@ -115,7 +116,7 @@ function GridCardGraph({
variables,
],
keepPreviousData: true,
enabled: isGraphVisible && !isEmptyWidget,
enabled: isGraphVisible && !isEmptyWidget && isQueryEnabled,
refetchOnMount: false,
onError: (error) => {
setErrorMessage(error.message);
@ -287,7 +288,7 @@ function GridCardGraph({
);
}
if (prevChartDataSetRef?.labels === undefined && queryResponse.isLoading) {
if (queryResponse.status === 'loading' || queryResponse.status === 'idle') {
return (
<span ref={graphRef}>
{!isEmpty(widget) && prevChartDataSetRef?.labels ? (
@ -399,6 +400,7 @@ interface GridCardGraphProps extends DispatchProps {
allowDelete?: boolean;
allowClone?: boolean;
allowEdit?: boolean;
isQueryEnabled?: boolean;
}
GridCardGraph.defaultProps = {
@ -407,6 +409,7 @@ GridCardGraph.defaultProps = {
allowDelete: true,
allowClone: true,
allowEdit: true,
isQueryEnabled: true,
};
const mapDispatchToProps = (

View File

@ -49,6 +49,8 @@ function ServiceOverview({
[servicename, tagFilterItems, isSpanMetricEnable, topLevelOperationsRoute],
);
const isQueryEnabled = topLevelOperationsRoute.length > 0;
return (
<>
<Button
@ -74,6 +76,7 @@ function ServiceOverview({
allowClone={false}
allowDelete={false}
allowEdit={false}
isQueryEnabled={isQueryEnabled}
/>
</GraphContainer>
</Card>