Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1428081

Browse files
Merge branch 'main' into dependabot/maven/server/api-service/org.springframework-spring-test-6.0.10
2 parents c113590 + e7da639 commit 1428081

File tree

6 files changed

+71
-36
lines changed

6 files changed

+71
-36
lines changed

‎deploy/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ CMD [ "/bin/sh", "/lowcoder/node-service/entrypoint.sh" ]
111111
##
112112
## Build lowcoder client application
113113
##
114-
FROM node:20.0-slim AS build-client
114+
FROM node:20.3-slim AS build-client
115115
COPY ./client /lowcoder-client
116116
WORKDIR /lowcoder-client
117117
RUN yarn --immutable
@@ -132,7 +132,7 @@ RUN yarn build
132132
## To create a separate image out of it, build it with:
133133
## DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcoder-ce-frontend --target lowcoder-ce-frontend .
134134
##
135-
FROM nginx:1.23.4 as lowcoder-ce-frontend
135+
FROM nginx:1.25.1 as lowcoder-ce-frontend
136136
LABEL maintainer="lowcoder"
137137

138138
# Change default nginx user into lowcoder user and remove default nginx config

‎server/api-service/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ package-lock.json
3535
coverage-summary.json
3636
app/client/cypress/locators/Widgets.json
3737
/openblocks-domain/logs/
38+
application-lowcoder.yml

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
1616

1717
import java.time.Instant;
18-
import java.util.HashSet;
19-
import java.util.List;
20-
import java.util.Map;
21-
import java.util.Set;
18+
import java.util.*;
2219
import java.util.stream.Collectors;
2320

2421
import javax.annotation.Nonnull;
@@ -366,8 +363,8 @@ public Mono<ApplicationView> publish(String applicationId) {
366363
}
367364

368365
public Mono<Boolean> grantPermission(String applicationId,
369-
Set<String> userIds,
370-
Set<String> groupIds, ResourceRole role) {
366+
Set<String> userIds,
367+
Set<String> groupIds, ResourceRole role) {
371368
if (userIds.isEmpty() && groupIds.isEmpty()) {
372369
return Mono.just(true);
373370
}
@@ -502,11 +499,48 @@ private Map<String, Object> sanitizeDsl(Map<String, Object> applicationDsl) {
502499
if (applicationDsl.get("queries") instanceof List<?> queries) {
503500
List<Map<String, Object>> list = queries.stream().map(this::doSanitizeQuery).toList();
504501
applicationDsl.put("queries", list);
502+
removeTestVariablesFromProductionView(applicationDsl);
505503
return applicationDsl;
506504
}
505+
removeTestVariablesFromProductionView(applicationDsl);
507506
return applicationDsl;
508507
}
509508

509+
private void removeTestVariablesFromProductionView(Map<String, Object> applicationDsl) {
510+
/**Remove "test" object if it exists within "applicationDSL**/
511+
if (applicationDsl.containsKey("ui")) {
512+
Map<String, Object> dataObject = (Map<String, Object>) applicationDsl.get("ui");
513+
if (dataObject.containsKey("comp")) {
514+
Map<String, Object> applicationDSL = (Map<String, Object>) dataObject.get("comp");
515+
doRemoveTestVariablesFromProductionView(applicationDSL);
516+
}
517+
}
518+
}
519+
520+
private void doRemoveTestVariablesFromProductionView(Map<String, Object> map) {
521+
if (map.containsKey("io")) {
522+
Map<String, Object> io = (Map<String, Object>) map.get("io");
523+
if (io.containsKey("inputs")) {
524+
List<Map<String, Object>> inputs = (List<Map<String, Object>>) io.get("inputs");
525+
for (Map<String, Object> inputMap : inputs) {
526+
if (inputMap.containsKey("test")) {
527+
inputMap.remove("test");
528+
}
529+
}
530+
}
531+
532+
if (io.containsKey("outputs")) {
533+
List<Map<String, Object>> outputs = (List<Map<String, Object>>) io.get("outputs");
534+
for (Map<String, Object> inputMap : outputs) {
535+
if (inputMap.containsKey("test")) {
536+
inputMap.remove("test");
537+
}
538+
}
539+
}
540+
}
541+
}
542+
543+
510544
@SuppressWarnings("unchecked")
511545
private Map<String, Object> doSanitizeQuery(Object query) {
512546
if (!(query instanceof Map)) {

‎server/api-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<dependency>
132132
<groupId>commons-io</groupId>
133133
<artifactId>commons-io</artifactId>
134-
<version>2.7</version>
134+
<version>2.13.0</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>org.glassfish</groupId>

‎server/node-service/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@aws-sdk/s3-request-presigner": "^3.332.0",
3737
"@google-cloud/bigquery": "^6.1.0",
3838
"@google-cloud/storage": "^6.10.1",
39-
"@supabase/supabase-js": "^2.10.0",
39+
"@supabase/supabase-js": "^2.26.0",
4040
"@types/axios": "^0.14.0",
4141
"@types/express": "^4.17.14",
4242
"@types/jsonpath": "^0.2.0",
@@ -64,7 +64,7 @@
6464
"pino": "^8.14.1",
6565
"prom-client": "^14.2.0",
6666
"proxy-agent": "^5.0.0",
67-
"stylis": "^4.1.3",
67+
"stylis": "^4.3.0",
6868
"swagger-client": "^3.19.7",
6969
"typescript": "^4.9.3",
7070
"yaml": "^2.2.2"

‎server/node-service/yarn.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,32 +2615,32 @@ __metadata:
26152615
languageName: node
26162616
linkType: hard
26172617

2618-
"@supabase/gotrue-js@npm:^2.26.0":
2619-
version: 2.27.2
2620-
resolution: "@supabase/gotrue-js@npm:2.27.2"
2618+
"@supabase/gotrue-js@npm:^2.31.0":
2619+
version: 2.37.0
2620+
resolution: "@supabase/gotrue-js@npm:2.37.0"
26212621
dependencies:
26222622
cross-fetch: ^3.1.5
2623-
checksum: e591a70654310428b5728feb0aced0e86fafe7b6bea1a416ac11c2851b20953892c11df7a429a836d20b1e7409d3c0c2aa6e2d63e89cade2b30c87e5d083c92e
2623+
checksum: 58275e0fde14e218ba69af4c33b095347a18f268149d1a78aa2bd9301190255fbad33aa20eaed5544a760354c94cbb2bab6dd5fe59653787836fb9e1236fabcf
26242624
languageName: node
26252625
linkType: hard
26262626

2627-
"@supabase/postgrest-js@npm:^1.1.1":
2628-
version: 1.6.1
2629-
resolution: "@supabase/postgrest-js@npm:1.6.1"
2627+
"@supabase/postgrest-js@npm:^1.7.0":
2628+
version: 1.7.1
2629+
resolution: "@supabase/postgrest-js@npm:1.7.1"
26302630
dependencies:
26312631
cross-fetch: ^3.1.5
2632-
checksum: 3001ca15a15f9ff8e75105f4b3ef1afcb30929b4b2a7f8ab54aa233d6eb2317b9b01f6acba4aba0ddbe09eb50e42325e2e29433277e5c69a5b2795db410552ca
2632+
checksum: 97f6e45a0420a304a20e89e7c2cf5790315708800965565ef34aa42b96dc97849462f2fd5c6e16095f29dc03c15d4671cd5f607a7f596095fc15e225e9e8074a
26332633
languageName: node
26342634
linkType: hard
26352635

2636-
"@supabase/realtime-js@npm:^2.7.2":
2637-
version: 2.7.2
2638-
resolution: "@supabase/realtime-js@npm:2.7.2"
2636+
"@supabase/realtime-js@npm:^2.7.3":
2637+
version: 2.7.3
2638+
resolution: "@supabase/realtime-js@npm:2.7.3"
26392639
dependencies:
26402640
"@types/phoenix": ^1.5.4
26412641
"@types/websocket": ^1.0.3
26422642
websocket: ^1.0.34
2643-
checksum: 0d6071991dfeeafcbfada30f39f6ed76ae83aefbdede611788879d493f7500c796050e0bef0bd589b9cf79cce0e170defe8a1d364e8cec3c8783cc4ac5314a3c
2643+
checksum: a6e789098ef7c388faf3a3b483ae91e1d45f8b7d02ae4ae1ad8ef0d7246678777aab1e0f3f2cbaf25549b27926c94bce9adc5c90f3f2693e1ccf780d5941411d
26442644
languageName: node
26452645
linkType: hard
26462646

@@ -2653,17 +2653,17 @@ __metadata:
26532653
languageName: node
26542654
linkType: hard
26552655

2656-
"@supabase/supabase-js@npm:^2.10.0":
2657-
version: 2.22.0
2658-
resolution: "@supabase/supabase-js@npm:2.22.0"
2656+
"@supabase/supabase-js@npm:^2.26.0":
2657+
version: 2.26.0
2658+
resolution: "@supabase/supabase-js@npm:2.26.0"
26592659
dependencies:
26602660
"@supabase/functions-js": ^2.1.0
2661-
"@supabase/gotrue-js": ^2.26.0
2662-
"@supabase/postgrest-js": ^1.1.1
2663-
"@supabase/realtime-js": ^2.7.2
2661+
"@supabase/gotrue-js": ^2.31.0
2662+
"@supabase/postgrest-js": ^1.7.0
2663+
"@supabase/realtime-js": ^2.7.3
26642664
"@supabase/storage-js": ^2.5.1
26652665
cross-fetch: ^3.1.5
2666-
checksum: ede087eb21c8aaf6f2e6cecffb63bedeaa2adae0683d10057d38ceeb7ab24da2a49e57f32d12399764a08e42880fa08d4c32bfc46d3180a97c278558249be704
2666+
checksum: bf53886a2314e8e0b119be224fdd08976ad3ce1da35db095dbbc960c1bfe7e1458054bcf11bdd72dd83d3bbaec2c78f8e897e225afe5cf1767233094b72a02dc
26672667
languageName: node
26682668
linkType: hard
26692669

@@ -8861,10 +8861,10 @@ __metadata:
88618861
languageName: node
88628862
linkType: hard
88638863

8864-
"stylis@npm:^4.1.3":
8865-
version: 4.2.0
8866-
resolution: "stylis@npm:4.2.0"
8867-
checksum: 0eb6cc1b866dc17a6037d0a82ac7fa877eba6a757443e79e7c4f35bacedbf6421fadcab4363b39667b43355cbaaa570a3cde850f776498e5450f32ed2f9b7584
8864+
"stylis@npm:^4.3.0":
8865+
version: 4.3.0
8866+
resolution: "stylis@npm:4.3.0"
8867+
checksum: 6120de3f03eacf3b5adc8e7919c4cca991089156a6badc5248752a3088106afaaf74996211a6817a7760ebeadca09004048eea31875bd8d4df51386365c50025
88688868
languageName: node
88698869
linkType: hard
88708870

@@ -8955,7 +8955,7 @@ __metadata:
89558955
"@aws-sdk/s3-request-presigner": ^3.332.0
89568956
"@google-cloud/bigquery": ^6.1.0
89578957
"@google-cloud/storage": ^6.10.1
8958-
"@supabase/supabase-js": ^2.10.0
8958+
"@supabase/supabase-js": ^2.26.0
89598959
"@types/axios": ^0.14.0
89608960
"@types/express": ^4.17.14
89618961
"@types/jest": ^29.2.4
@@ -8990,7 +8990,7 @@ __metadata:
89908990
postman-to-openapi: ^3.0.1
89918991
prom-client: ^14.2.0
89928992
proxy-agent: ^5.0.0
8993-
stylis: ^4.1.3
8993+
stylis: ^4.3.0
89948994
svgo: ^3.0.2
89958995
swagger-client: ^3.19.7
89968996
ts-jest: ^29.0.3

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /