Movatterモバイル変換

[0]ホーム
URL:

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

Commite5f2d29

Browse files
committed
Move ptm apps data to application dsl
1 parent82c3de8 commite5f2d29

File tree

4 files changed

+56
-13
lines changed

4 files changed

+56
-13
lines changed

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

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
importstaticorg.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl;
55

6-
importjava.util.Collection;
7-
importjava.util.List;
8-
importjava.util.Map;
9-
importjava.util.Set;
6+
importjava.util.*;
107
importjava.util.stream.Collectors;
118

129
importorg.lowcoder.domain.application.model.Application;
@@ -155,11 +152,41 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub
155152
returnmongoUpsertHelper.updateById(application,applicationId);
156153
}
157154

158-
publicMono<Boolean>setApplicationPublicToMarketplace(StringapplicationId,booleanpublicToMarketplace) {
159-
Applicationapplication =Application.builder()
160-
.publicToMarketplace(publicToMarketplace)
161-
.build();
162-
returnmongoUpsertHelper.updateById(application,applicationId);
155+
publicMono<Boolean>setApplicationPublicToMarketplace(StringapplicationId,BooleanpublicToMarketplace,Stringtitle,Stringcategory,Stringdescription) {
156+
157+
returnfindById(applicationId)
158+
.map(application -> {
159+
Map<String,Object>applicationDsl =application.getEditingApplicationDSL();
160+
if (applicationDsl.containsKey("ui")) {
161+
Map<String,Object>dataObject = (Map<String,Object>)applicationDsl.get("ui");
162+
163+
if(publicToMarketplace) {
164+
Map<String,Object>marketplaceMeta =newHashMap<>();
165+
marketplaceMeta.put("title",title);
166+
marketplaceMeta.put("description",description);
167+
marketplaceMeta.put("category",category);
168+
if (dataObject.containsKey("marketplaceMeta")) {
169+
dataObject.replace("marketplaceMeta",marketplaceMeta);
170+
}else {
171+
dataObject.put("marketplaceMeta",marketplaceMeta);
172+
}
173+
}else {
174+
dataObject.remove("marketplaceMeta");
175+
}
176+
177+
applicationDsl.replace("ui",dataObject);
178+
179+
}
180+
181+
returnApplication.builder()
182+
.publicToMarketplace(publicToMarketplace)
183+
.editingApplicationDSL(applicationDsl)
184+
.build();
185+
186+
})
187+
.flatMap(application ->mongoUpsertHelper.updateById(application,applicationId));
188+
189+
163190
}
164191

165192
publicMono<Boolean>setApplicationAsAgencyProfile(StringapplicationId,booleanagencyProfile) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ public Mono<Boolean> setApplicationPublicToAll(String applicationId, boolean pub
514514
.then(applicationService.setApplicationPublicToAll(applicationId,publicToAll));
515515
}
516516

517-
publicMono<Boolean>setApplicationPublicToMarketplace(StringapplicationId,booleanpublicToMarketplace) {
517+
publicMono<Boolean>setApplicationPublicToMarketplace(StringapplicationId,ApplicationEndpoints.ApplicationPublicToMarketplaceRequestrequest) {
518518
returncheckCurrentUserApplicationPermission(applicationId,ResourceAction.SET_APPLICATIONS_PUBLIC_TO_MARKETPLACE)
519519
.then(checkApplicationStatus(applicationId,NORMAL))
520-
.then(applicationService.setApplicationPublicToMarketplace(applicationId,publicToMarketplace));
520+
.then(applicationService.setApplicationPublicToMarketplace(applicationId,request.publicToMarketplace(),request.title(),request.category(),request.description()));
521521
}
522522

523523
publicMono<Boolean>setApplicationAsAgencyProfile(StringapplicationId,booleanagencyProfile) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable Strin
214214
@Override
215215
publicMono<ResponseView<Boolean>>setApplicationPublicToMarketplace(@PathVariableStringapplicationId,
216216
@RequestBodyApplicationPublicToMarketplaceRequestrequest) {
217-
returnapplicationApiService.setApplicationPublicToMarketplace(applicationId,request.publicToMarketplace())
217+
returnapplicationApiService.setApplicationPublicToMarketplace(applicationId,request)
218218
.map(ResponseView::success);
219219
}
220220

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,27 @@ public Boolean publicToAll() {
270270
}
271271
}
272272

273-
publicrecordApplicationPublicToMarketplaceRequest(BooleanpublicToMarketplace) {
273+
publicrecordApplicationPublicToMarketplaceRequest(BooleanpublicToMarketplace,Stringtitle,Stringdescription,Stringcategory) {
274274
@Override
275275
publicBooleanpublicToMarketplace() {
276276
returnBooleanUtils.isTrue(publicToMarketplace);
277277
}
278+
279+
@Override
280+
publicStringtitle() {
281+
returntitle;
282+
}
283+
284+
@Override
285+
publicStringdescription() {
286+
returndescription;
287+
}
288+
289+
@Override
290+
publicStringcategory() {
291+
returncategory;
292+
}
293+
278294
}
279295

280296
publicrecordApplicationAsAgencyProfileRequest(BooleanagencyProfile) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp