Skip to content

removed the test object from modules view mode #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 5, 2023
Merged

removed the test object from modules view mode #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfc0513
changed app data for view to remove test object in app data for produ…
joenan Jul 5, 2023
a5f4c66
added application-lowcoder.yml to gitignore
joenan Jul 5, 2023
089aad9
added to gitignore
joenan Jul 5, 2023
86e1fd9
feat: removed the test object from modules view mode%0A%0AThis commit…
joenan Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/api-service/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ package-lock.json
coverage-summary.json
app/client/cypress/locators/Widgets.json
/openblocks-domain/logs/
application-lowcoder.yml
46 changes: 40 additions & 6 deletions ...ice/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -366,8 +363,8 @@ public Mono<ApplicationView> publish(String applicationId) {
}

public Mono<Boolean> grantPermission(String applicationId,
Set<String> userIds,
Set<String> groupIds, ResourceRole role) {
Set<String> userIds,
Set<String> groupIds, ResourceRole role) {
if (userIds.isEmpty() && groupIds.isEmpty()) {
return Mono.just(true);
}
Expand Down Expand Up @@ -502,11 +499,48 @@ private Map<String, Object> sanitizeDsl(Map<String, Object> applicationDsl) {
if (applicationDsl.get("queries") instanceof List<?> queries) {
List<Map<String, Object>> list = queries.stream().map(this::doSanitizeQuery).toList();
applicationDsl.put("queries", list);
removeTestVariablesFromProductionView(applicationDsl);
return applicationDsl;
}
removeTestVariablesFromProductionView(applicationDsl);
return applicationDsl;
}

private void removeTestVariablesFromProductionView(Map<String, Object> applicationDsl) {
/**Remove "test" object if it exists within "applicationDSL**/
if (applicationDsl.containsKey("ui")) {
Map<String, Object> dataObject = (Map<String, Object>) applicationDsl.get("ui");
if (dataObject.containsKey("comp")) {
Map<String, Object> applicationDSL = (Map<String, Object>) dataObject.get("comp");
doRemoveTestVariablesFromProductionView(applicationDSL);
}
}
}

private void doRemoveTestVariablesFromProductionView(Map<String, Object> map) {
if (map.containsKey("io")) {
Map<String, Object> io = (Map<String, Object>) map.get("io");
if (io.containsKey("inputs")) {
List<Map<String, Object>> inputs = (List<Map<String, Object>>) io.get("inputs");
for (Map<String, Object> inputMap : inputs) {
if (inputMap.containsKey("test")) {
inputMap.remove("test");
}
}
}

if (io.containsKey("outputs")) {
List<Map<String, Object>> outputs = (List<Map<String, Object>>) io.get("outputs");
for (Map<String, Object> inputMap : outputs) {
if (inputMap.containsKey("test")) {
inputMap.remove("test");
}
}
}
}
}


@SuppressWarnings("unchecked")
private Map<String, Object> doSanitizeQuery(Object query) {
if (!(query instanceof Map)) {
Expand Down