From cc90c6a33a2b5d4e247e9cd33dce641b77d8bbdb Mon Sep 17 00:00:00 2001 From: Aman Agarwal Date: Fri, 7 Jan 2022 17:27:51 +0530 Subject: [PATCH] fix: url action execution order for actions on page load (#10224) Order of execution was not proper because the dynamic parameters embedded inside url without any trailing slashes and query params did not match with url grouping regex to convert the query params to dsl params. Fixes #10049 Fixes #10055 --- .../src/constants/AppsmithActionConstants/ActionConstants.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx index 150dc9a605..ceaf0ef1da 100644 --- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx +++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx @@ -115,7 +115,7 @@ export interface ExecuteErrorPayload extends ErrorActionPayload { // Group 1 = datasource (https://www.domain.com) // Group 2 = path (/nested/path) // Group 3 = params (?param=123¶m2=12) -export const urlGroupsRegexExp = /^(https?:\/{2}\S+?)(\/[\s\S]*?)(\?(?![^{]*})[\s\S]*)?$/; +export const urlGroupsRegexExp = /^(https?:\/{2}\S+?)(\/[\s\S]*?)?(\?(?![^{]*})[\s\S]*)?$/; export const EXECUTION_PARAM_KEY = "executionParams"; export const THIS_DOT_PARAMS_KEY = "params";