From dfc051390f4f97eb0c443145eee9216aad3ac087 Mon Sep 17 00:00:00 2001 From: joenan Date: Wed, 5 Jul 2023 04:07:20 +0100 Subject: [PATCH 1/4] changed app data for view to remove test object in app data for production --- .../application/ApplicationApiService.java | 46 ++++++++++++++++--- .../main/resources/application-lowcoder.yml | 2 + 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java index 51440c317..5568915fe 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java @@ -15,10 +15,7 @@ import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.time.Instant; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Nonnull; @@ -366,8 +363,8 @@ public Mono publish(String applicationId) { } public Mono grantPermission(String applicationId, - Set userIds, - Set groupIds, ResourceRole role) { + Set userIds, + Set groupIds, ResourceRole role) { if (userIds.isEmpty() && groupIds.isEmpty()) { return Mono.just(true); } @@ -502,11 +499,48 @@ private Map sanitizeDsl(Map applicationDsl) { if (applicationDsl.get("queries") instanceof List queries) { List> list = queries.stream().map(this::doSanitizeQuery).toList(); applicationDsl.put("queries", list); + removeTestVariablesFromProductionView(applicationDsl); return applicationDsl; } + removeTestVariablesFromProductionView(applicationDsl); return applicationDsl; } + private void removeTestVariablesFromProductionView(Map applicationDsl) { + // Remove "test" object if it exists within "applicationDSL" + if (applicationDsl.containsKey("ui")) { + Map dataObject = (Map) applicationDsl.get("ui"); + if (dataObject.containsKey("comp")) { + Map applicationDSL = (Map) dataObject.get("comp"); + doRemoveTestVariablesFromProductionView(applicationDSL); + } + } + } + + private void doRemoveTestVariablesFromProductionView(Map map) { + if (map.containsKey("io")) { + Map io = (Map) map.get("io"); + if (io.containsKey("inputs")) { + List> inputs = (List>) io.get("inputs"); + for (Map inputMap : inputs) { + if (inputMap.containsKey("test")) { + inputMap.remove("test"); + } + } + } + + if (io.containsKey("outputs")) { + List> outputs = (List>) io.get("outputs"); + for (Map inputMap : outputs) { + if (inputMap.containsKey("test")) { + inputMap.remove("test"); + } + } + } + } + } + + @SuppressWarnings("unchecked") private Map doSanitizeQuery(Object query) { if (!(query instanceof Map)) { diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index 7994c4563..b72b27880 100644 --- a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml +++ b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml @@ -35,6 +35,8 @@ common: product: lowcoder domain: default-value: skipCheck + js-executor: + host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060} encrypt: password: lowcoder salt: lowcoder From a5f4c66be422c623760f30efcaed3d574eb239da Mon Sep 17 00:00:00 2001 From: joenan Date: Wed, 5 Jul 2023 11:51:58 +0100 Subject: [PATCH 2/4] added application-lowcoder.yml to gitignore --- server/api-service/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/server/api-service/.gitignore b/server/api-service/.gitignore index 07c69970f..044c6298e 100644 --- a/server/api-service/.gitignore +++ b/server/api-service/.gitignore @@ -35,3 +35,4 @@ package-lock.json coverage-summary.json app/client/cypress/locators/Widgets.json /openblocks-domain/logs/ +application-lowcoder.yml \ No newline at end of file From 089aad9d259bffbd77a7036e826186df3424bd75 Mon Sep 17 00:00:00 2001 From: joenan Date: Wed, 5 Jul 2023 11:53:41 +0100 Subject: [PATCH 3/4] added to gitignore --- .../lowcoder-server/src/main/resources/application-lowcoder.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index b72b27880..7994c4563 100644 --- a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml +++ b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml @@ -35,8 +35,6 @@ common: product: lowcoder domain: default-value: skipCheck - js-executor: - host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060} encrypt: password: lowcoder salt: lowcoder From 86e1fd9dd12a66e7ca9a997fcca6d463a5bfeee2 Mon Sep 17 00:00:00 2001 From: joenan Date: Wed, 5 Jul 2023 18:01:13 +0100 Subject: [PATCH 4/4] feat: removed the test object from modules view mode%0A%0AThis commit adds removes test object from the outputs and inputs array of a module view. --- .../org/lowcoder/api/application/ApplicationApiService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java index 5568915fe..43359e65f 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java @@ -507,7 +507,7 @@ private Map sanitizeDsl(Map applicationDsl) { } private void removeTestVariablesFromProductionView(Map applicationDsl) { - // Remove "test" object if it exists within "applicationDSL" + /**Remove "test" object if it exists within "applicationDSL**/ if (applicationDsl.containsKey("ui")) { Map dataObject = (Map) applicationDsl.get("ui"); if (dataObject.containsKey("comp")) {