diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts index 8d443d7879..fd743c5a70 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug28287_Spec.ts @@ -37,8 +37,6 @@ describe("Bug 28287: Binding query to widget, check query response in query edit agHelper.Sleep(1000); entityExplorer.SelectEntityByName(queryName, "Queries/JS"); - debuggerHelper.ClickDebuggerIcon(); - debuggerHelper.ClickResponseTab(); agHelper.AssertElementVisibility(dataSources._queryResponse("TABLE")); }); diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx index 7db6aab123..c2e871407a 100644 --- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx +++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx @@ -1,4 +1,4 @@ -import { useContext } from "react"; +import { useContext, useEffect } from "react"; import type { RefObject } from "react"; import React, { useCallback, useRef, useState } from "react"; import type { InjectedFormProps } from "redux-form"; @@ -443,6 +443,9 @@ export function EditorJSONtoForm(props: Props) { (state: AppState) => getCurrentAppWorkspace(state).userPermissions ?? [], ); + const [showResponseOnFirstLoad, setShowResponseOnFirstLoad] = + useState(false); + const canCreateDatasource = getHasCreateDatasourcePermission( isFeatureEnabled, userWorkspacePermissions, @@ -503,6 +506,30 @@ export function EditorJSONtoForm(props: Props) { } } + // These useEffects are used to open the response tab by default for page load queries + // as for page load queries, query response is available and can be shown in response tab + useEffect(() => { + // output and responseDisplayFormat is present only when query has response available + if ( + responseDisplayFormat && + !!responseDisplayFormat?.title && + output && + !showResponseOnFirstLoad + ) { + dispatch(showDebugger(true)); + dispatch(setDebuggerSelectedTab(DEBUGGER_TAB_KEYS.RESPONSE_TAB)); + setShowResponseOnFirstLoad(true); + } + }, [responseDisplayFormat, output, showResponseOnFirstLoad]); + + // When multiple page load queries exist, we want to response tab by default for all of them + // Hence this useEffect will reset showResponseOnFirstLoad flag used to track whether to show response tab or not + useEffect(() => { + if (!!currentActionConfig?.id) { + setShowResponseOnFirstLoad(false); + } + }, [currentActionConfig?.id]); + const dispatch = useDispatch(); const handleDocumentationClick = (e: React.MouseEvent) => {