Merge branch 'master' into release

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')"

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;
   }

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;
   }>;
 };