Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
Trisha Anand 2022-04-12 14:06:53 +05:30 committed by GitHub
commit 85ebed6d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/cypress/support/Pages/JSEditor.ts
View File

@ -5,6 +5,7 @@ export class JSEditor {
public ee = ObjectsRegistry.EntityExplorer; public ee = ObjectsRegistry.EntityExplorer;
private _runButton = "//li//*[local-name() = 'svg' and @class='run-button']"; private _runButton = "//li//*[local-name() = 'svg' and @class='run-button']";
private _outputConsole = ".CodeEditorTarget";
private _jsObjName = ".t--js-action-name-edit-field span"; private _jsObjName = ".t--js-action-name-edit-field span";
private _jsObjTxt = ".t--js-action-name-edit-field input"; private _jsObjTxt = ".t--js-action-name-edit-field input";
private _newJSobj = "span:contains('New JS Object')" private _newJSobj = "span:contains('New JS Object')"

4
app/client/src/api/ApiUtils.ts
View File

@ -16,6 +16,7 @@ import store from "store";
import { logoutUser } from "actions/userActions"; import { logoutUser } from "actions/userActions";
import { AUTH_LOGIN_URL } from "constants/routes"; import { AUTH_LOGIN_URL } from "constants/routes";
import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
import getQueryParamsObject from "utils/getQueryParamsObject";
const executeActionRegex = /actions\/execute/; const executeActionRegex = /actions\/execute/;
const timeoutErrorRegex = /timeout of (\d+)ms exceeded/; 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 // this will be used to calculate the time taken for an action
// execution request // execution request
export const apiRequestInterceptor = (config: AxiosRequestConfig) => { export const apiRequestInterceptor = (config: AxiosRequestConfig) => {
const branch = getCurrentGitBranch(store.getState()); const branch =
getCurrentGitBranch(store.getState()) || getQueryParamsObject().branch;
if (branch) { if (branch) {
config.headers.branchName = branch; config.headers.branchName = branch;
} }

2
app/client/src/api/PageApi.tsx
View File

@ -52,8 +52,8 @@ export type SavePageResponseData = {
actionUpdates: Array<{ actionUpdates: Array<{
executeOnLoad: boolean; executeOnLoad: boolean;
id: string; id: string;
collectionId?: string;
name: string; name: string;
collectionId?: string;
}>; }>;
}; };