diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts index 903e1687b6..21e1b7dec7 100644 --- a/app/client/cypress/support/Pages/JSEditor.ts +++ b/app/client/cypress/support/Pages/JSEditor.ts @@ -5,6 +5,7 @@ export class JSEditor { public ee = ObjectsRegistry.EntityExplorer; private _runButton = "//li//*[local-name() = 'svg' and @class='run-button']"; + private _outputConsole = ".CodeEditorTarget"; private _jsObjName = ".t--js-action-name-edit-field span"; private _jsObjTxt = ".t--js-action-name-edit-field input"; private _newJSobj = "span:contains('New JS Object')" diff --git a/app/client/src/api/ApiUtils.ts b/app/client/src/api/ApiUtils.ts index c3bcca256b..5a9482ab43 100644 --- a/app/client/src/api/ApiUtils.ts +++ b/app/client/src/api/ApiUtils.ts @@ -16,6 +16,7 @@ import store from "store"; import { logoutUser } from "actions/userActions"; import { AUTH_LOGIN_URL } from "constants/routes"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; +import getQueryParamsObject from "utils/getQueryParamsObject"; const executeActionRegex = /actions\/execute/; const timeoutErrorRegex = /timeout of (\d+)ms exceeded/; @@ -38,7 +39,8 @@ const is404orAuthPath = () => { // this will be used to calculate the time taken for an action // execution request export const apiRequestInterceptor = (config: AxiosRequestConfig) => { - const branch = getCurrentGitBranch(store.getState()); + const branch = + getCurrentGitBranch(store.getState()) || getQueryParamsObject().branch; if (branch) { config.headers.branchName = branch; } diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx index 80e15e75bc..0a3040d0ce 100644 --- a/app/client/src/api/PageApi.tsx +++ b/app/client/src/api/PageApi.tsx @@ -52,8 +52,8 @@ export type SavePageResponseData = { actionUpdates: Array<{ executeOnLoad: boolean; id: string; - collectionId?: string; name: string; + collectionId?: string; }>; };