Fix auto query selection behavior (pinterest#484)

pinterest#484
justinmpier · Mar 30, 2021 · c2aaf9a · c2aaf9a
1 parent e3f9edc
commit c2aaf9a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/querybook/webapp/components/DataDocQueryExecutions/DataDocQueryExecutions.tsx b/querybook/webapp/components/DataDocQueryExecutions/DataDocQueryExecutions.tsx
@@ -71,13 +71,13 @@ export const DataDocQueryExecutions: React.FunctionComponent<IProps> = React.mem
  dispatch(queryExecutionsActions.fetchQueryExecutionsByCell(cellId));
  }, [cellId]);
 
- React.useEffect(() => {
+ useEffect(() => {
  selectExecutionIndex(0);
  }, [queryExecutions.length]);
 
  const [usedQueryParam, setUsedQueryParam] = useState(false);
  useEffect(() => {
- if (!usedQueryParam) {
+ if (!usedQueryParam && queryExecutions.length) {
  const queryParam = getQueryString();
  if ('executionId' in queryParam && queryParam['executionId']) {
  const executionId = Number(queryParam['executionId']);
@@ -87,10 +87,10 @@ export const DataDocQueryExecutions: React.FunctionComponent<IProps> = React.mem
  ] of queryExecutions.entries()) {
  if (queryExecution.id === executionId) {
  selectExecutionIndex(index);
- setUsedQueryParam(true);
  }
  }
  }
+ setUsedQueryParam(true);
  }
  }, [queryExecutions, usedQueryParam]);