Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 38a32d5

Browse files
Thomasrludomikula
Thomasr
authored and
ludomikula
committed
Add name param to application list endpoint
1 parent 4d8ac38 commit 38a32d5

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public interface ApplicationApiService {
1818
Mono<ApplicationView> create(ApplicationEndpoints.CreateApplicationRequest createApplicationRequest);
1919

20-
Flux<ApplicationInfoView> getRecycledApplications();
20+
Flux<ApplicationInfoView> getRecycledApplications(String name);
2121

2222
Mono<ApplicationView> delete(String applicationId);
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ private Mono<Void> autoGrantPermissionsByFolderDefault(String applicationId, @Nu
169169
}
170170

171171
@Override
172-
public Flux<ApplicationInfoView> getRecycledApplications() {
173-
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false);
172+
public Flux<ApplicationInfoView> getRecycledApplications(String name) {
173+
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name);
174174
}
175175

176176
private Mono<Void> checkCurrentUserApplicationPermission(String applicationId, ResourceAction action) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
7777
}
7878

7979
@Override
80-
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications() {
81-
return applicationApiService.getRecycledApplications()
80+
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name) {
81+
return applicationApiService.getRecycledApplications(name)
8282
.collectList()
8383
.map(ResponseView::success);
8484
}
@@ -159,9 +159,10 @@ public Mono<ResponseView<UserHomepageView>> getUserHomePage(@RequestParam(requir
159159
@Override
160160
public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestParam(required = false) Integer applicationType,
161161
@RequestParam(required = false) ApplicationStatus applicationStatus,
162-
@RequestParam(defaultValue = "true") boolean withContainerSize) {
162+
@RequestParam(defaultValue = "true") boolean withContainerSize,
163+
@RequestParam(required = false) String name) {
163164
ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
164-
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize)
165+
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name)
165166
.collectList()
166167
.map(ResponseView::success);
167168
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface ApplicationEndpoints
7171
description = "List all the recycled Lowcoder Applications in the recycle bin where the authenticated or impersonated user has access."
7272
)
7373
@GetMapping("/recycle/list")
74-
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications();
74+
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name);
7575

7676
@Operation(
7777
tags = TAG_APPLICATION_MANAGEMENT,
@@ -165,7 +165,8 @@ public Mono<ResponseView<Boolean>> updateEditState(@PathVariable String applicat
165165
@GetMapping("/list")
166166
public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestParam(required = false) Integer applicationType,
167167
@RequestParam(required = false) ApplicationStatus applicationStatus,
168-
@RequestParam(defaultValue = "true") boolean withContainerSize);
168+
@RequestParam(defaultValue = "true") boolean withContainerSize,
169+
@RequestParam(required = false) String name);
169170

170171
@Operation(
171172
tags = TAG_APPLICATION_MANAGEMENT,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
284284
.cache();
285285

286286
Flux<ApplicationInfoView> applicationInfoViewFlux =
287-
userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false)
287+
userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationType, ApplicationStatus.NORMAL, false, null)
288288
.cache();
289289

290290
Mono<Map<String, String>> application2FolderMapMono = applicationInfoViewFlux

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public interface UserHomeApiService {
2424
Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationType);
2525

2626
Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@Nullable ApplicationType applicationType,
27-
@Nullable ApplicationStatus applicationStatus, boolean withContainerSize);
27+
@Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name);
2828

2929
Flux<BundleInfoView> getAllAuthorisedBundles4CurrentOrgMember(@Nullable BundleStatus bundleStatus);
3030

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public Mono<UserHomepageView> getUserHomePageView(ApplicationType applicationTyp
189189

190190
@Override
191191
public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@Nullable ApplicationType applicationType,
192-
@Nullable ApplicationStatus applicationStatus, boolean withContainerSize) {
192+
@Nullable ApplicationStatus applicationStatus, boolean withContainerSize, @Nullable String name) {
193193

194194
return sessionUserService.getVisitorOrgMemberCache()
195195
.flatMapMany(orgMember -> {
@@ -202,8 +202,9 @@ public Flux<ApplicationInfoView> getAllAuthorisedApplications4CurrentOrgMember(@
202202
}
203203
return applicationService.findByOrganizationIdWithoutDsl(currentOrgId);
204204
})
205-
.filter(application -> isNull(applicationType) || application.getApplicationType() == applicationType.getValue())
206-
.filter(application -> isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus)
205+
.filter(application -> (isNull(applicationType) || application.getApplicationType() == applicationType.getValue())
206+
&& (isNull(applicationStatus) || application.getApplicationStatus() == applicationStatus)
207+
&& (isNull(name) || application.getName().toLowerCase().contains(name.toLowerCase())))
207208
.cache()
208209
.collectList()
209210
.flatMapIterable(Function.identity());

0 commit comments

Comments
 (0)