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

Commit720f1ec

Browse files
authored
Merge pull request#1380 from lowcoder-org/fix/folderId4AppList
#1331: Populate folderId for app list endpoint
2 parents73c39e8 +318d736 commit720f1ec

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
packageorg.lowcoder.api.application;
22

3-
importstaticorg.apache.commons.collections4.SetUtils.emptyIfNull;
4-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_CREATE;
5-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_DELETE;
6-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_RECYCLED;
7-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_RESTORE;
8-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_UPDATE;
9-
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_VIEW;
10-
importstaticorg.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
11-
importstaticorg.lowcoder.sdk.util.ExceptionUtils.ofError;
12-
13-
importjava.util.List;
14-
3+
importlombok.RequiredArgsConstructor;
154
importorg.lowcoder.api.application.view.ApplicationInfoView;
165
importorg.lowcoder.api.application.view.ApplicationPermissionView;
176
importorg.lowcoder.api.application.view.ApplicationView;
187
importorg.lowcoder.api.application.view.MarketplaceApplicationInfoView;
19-
// should we not have a AgencyApplicationInfoView
208
importorg.lowcoder.api.framework.view.PageResponseView;
219
importorg.lowcoder.api.framework.view.ResponseView;
2210
importorg.lowcoder.api.home.SessionUserService;
@@ -28,15 +16,21 @@
2816
importorg.lowcoder.domain.application.model.ApplicationRequestType;
2917
importorg.lowcoder.domain.application.model.ApplicationStatus;
3018
importorg.lowcoder.domain.application.model.ApplicationType;
19+
importorg.lowcoder.domain.folder.service.FolderElementRelationService;
3120
importorg.lowcoder.domain.permission.model.ResourceRole;
3221
importorg.springframework.web.bind.annotation.PathVariable;
3322
importorg.springframework.web.bind.annotation.RequestBody;
3423
importorg.springframework.web.bind.annotation.RequestParam;
3524
importorg.springframework.web.bind.annotation.RestController;
36-
37-
importlombok.RequiredArgsConstructor;
3825
importreactor.core.publisher.Mono;
3926

27+
importjava.util.List;
28+
29+
importstaticorg.apache.commons.collections4.SetUtils.emptyIfNull;
30+
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.*;
31+
importstaticorg.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
32+
importstaticorg.lowcoder.sdk.util.ExceptionUtils.ofError;
33+
4034
@RequiredArgsConstructor
4135
@RestController
4236
publicclassApplicationControllerimplementsApplicationEndpoints {
@@ -46,6 +40,7 @@ public class ApplicationController implements ApplicationEndpoints {
4640
privatefinalBusinessEventPublisherbusinessEventPublisher;
4741
privatefinalSessionUserServicesessionUserService;
4842
privatefinalGidServicegidService;
43+
privatefinalFolderElementRelationServicefolderElementRelationService;
4944

5045
@Override
5146
publicMono<ResponseView<ApplicationView>>create(@RequestBodyCreateApplicationRequestcreateApplicationRequest) {
@@ -166,7 +161,15 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
166161
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
167162
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
168163
ApplicationTypeapplicationTypeEnum =applicationType ==null ?null :ApplicationType.fromValue(applicationType);
169-
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name,category).cache();
164+
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name,category)
165+
.delayUntil(applicationInfoView -> {
166+
StringapplicationId =applicationInfoView.getApplicationId();
167+
returnfolderElementRelationService.getByElementIds(List.of(applicationId))
168+
.doOnNext(folderElement -> {
169+
applicationInfoView.setFolderId(folderElement.folderId());
170+
}).then();
171+
})
172+
.cache();
170173
Mono<Long>countMono =flux.count();
171174
varflux1 =flux.skip((long) (pageNum -1) *pageSize);
172175
if(pageSize >0)flux1 =flux1.take(pageSize);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ApplicationInfoView {
2828
@JsonInclude(Include.NON_NULL)
2929
privatefinalObjectcontainerSize;// for module size
3030
@Nullable
31-
privatefinalStringfolderId;
31+
privateStringfolderId;
3232

3333
@Nullable
3434
privatefinalInstantlastViewTime;// user last visit time for this app
@@ -61,4 +61,7 @@ public long getLastEditedAt() {
6161
publicbooleanisFolder() {
6262
returnfalse;
6363
}
64+
publicvoidsetFolderId(@NullableStringfolderId) {
65+
this.folderId =folderId;
66+
}
6467
}

0 commit comments

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