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

Commit691a168

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
Add search by category feature
1 parent5987c18 commit691a168

File tree

12 files changed

+40
-23
lines changed

12 files changed

+40
-23
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,18 @@ public Map<String, Object> getEditingApplicationDSL() {
179179
returndsl;
180180
}
181181

182+
publicStringgetCategory() {
183+
if(editingApplicationDSL ==null ||editingApplicationDSL.get("settings") ==null)return"";
184+
ObjectsettingsObject =editingApplicationDSL.get("settings");
185+
if (settingsObjectinstanceofMap) {
186+
@SuppressWarnings("unchecked")
187+
Map<String,Object>settings = (Map<String,Object>)editingApplicationDSL.get("settings");
188+
return (String)settings.get("category");
189+
}else {
190+
return"";
191+
}
192+
}
193+
182194
publicMap<String,Object>getEditingApplicationDSLOrNull() {returneditingApplicationDSL; }
183195

184196
publicObjectgetLiveContainerSize() {

‎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
publicinterfaceApplicationApiService {
1818
Mono<ApplicationView>create(ApplicationEndpoints.CreateApplicationRequestcreateApplicationRequest);
1919

20-
Flux<ApplicationInfoView>getRecycledApplications(Stringname);
20+
Flux<ApplicationInfoView>getRecycledApplications(Stringname,Stringcategory);
2121

2222
Mono<ApplicationView>delete(StringapplicationId);
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-
publicFlux<ApplicationInfoView>getRecycledApplications(Stringname) {
173-
returnuserHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null,ApplicationStatus.RECYCLED,false,name);
172+
publicFlux<ApplicationInfoView>getRecycledApplications(Stringname,Stringcategory) {
173+
returnuserHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null,ApplicationStatus.RECYCLED,false,name,category);
174174
}
175175

176176
privateMono<Void>checkCurrentUserApplicationPermission(StringapplicationId,ResourceActionaction) {

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

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

8080
@Override
81-
publicMono<ResponseView<List<ApplicationInfoView>>>getRecycledApplications(@RequestParam(required =false)Stringname) {
82-
returnapplicationApiService.getRecycledApplications(name)
81+
publicMono<ResponseView<List<ApplicationInfoView>>>getRecycledApplications(@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringcategory) {
82+
returnapplicationApiService.getRecycledApplications(name,category)
8383
.collectList()
8484
.map(ResponseView::success);
8585
}
@@ -159,13 +159,14 @@ public Mono<ResponseView<UserHomepageView>> getUserHomePage(@RequestParam(requir
159159

160160
@Override
161161
publicMono<ResponseView<List<ApplicationInfoView>>>getApplications(@RequestParam(required =false)IntegerapplicationType,
162-
@RequestParam(required =false)ApplicationStatusapplicationStatus,
163-
@RequestParam(defaultValue ="true")booleanwithContainerSize,
164-
@RequestParam(required =false)Stringname,
165-
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
166-
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
162+
@RequestParam(required =false)ApplicationStatusapplicationStatus,
163+
@RequestParam(defaultValue ="true")booleanwithContainerSize,
164+
@RequestParam(required =false)Stringname,
165+
@RequestParam(required =false)Stringcategory,
166+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
167+
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
167168
ApplicationTypeapplicationTypeEnum =applicationType ==null ?null :ApplicationType.fromValue(applicationType);
168-
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name).cache();
169+
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name,category).cache();
169170
Mono<Long>countMono =flux.count();
170171
varflux1 =flux.skip((long) (pageNum -1) *pageSize);
171172
if(pageSize >0)flux1 =flux1.take(pageSize);

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

Lines changed: 2 additions & 1 deletion
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-
publicMono<ResponseView<List<ApplicationInfoView>>>getRecycledApplications(@RequestParam(required =false)Stringname);
74+
publicMono<ResponseView<List<ApplicationInfoView>>>getRecycledApplications(@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringcategory);
7575

7676
@Operation(
7777
tags =TAG_APPLICATION_MANAGEMENT,
@@ -167,6 +167,7 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
167167
@RequestParam(required =false)ApplicationStatusapplicationStatus,
168168
@RequestParam(defaultValue ="true")booleanwithContainerSize,
169169
@RequestParam(required =false)Stringname,
170+
@RequestParam(required =false)Stringcategory,
170171
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
171172
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
172173

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface FolderApiService {
2727

2828
Mono<Void>upsertLastViewTime(@NullableStringfolderId);
2929

30-
Flux<?>getElements(@NullableStringfolderId,@NullableApplicationTypeapplicationType,@NullableStringname);
30+
Flux<?>getElements(@NullableStringfolderId,@NullableApplicationTypeapplicationType,@NullableStringname,@NullableStringcategory);
3131

3232
Mono<Void>grantPermission(StringfolderId,Set<String>userIds,Set<String>groupIds,ResourceRolerole);
3333

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ public Mono<Void> upsertLastViewTime(@Nullable String folderId) {
233233
* @return flux of {@link ApplicationInfoView} or {@link FolderInfoView}
234234
*/
235235
@Override
236-
publicFlux<?>getElements(@NullableStringfolderId,@NullableApplicationTypeapplicationType,@NullableStringname) {
237-
returnbuildApplicationInfoViewTree(applicationType,name)
236+
publicFlux<?>getElements(@NullableStringfolderId,@NullableApplicationTypeapplicationType,@NullableStringname,@NullableStringcategory) {
237+
returnbuildApplicationInfoViewTree(applicationType,name,category)
238238
.flatMap(tree -> {
239239
FolderNode<ApplicationInfoView,FolderInfoView>folderNode =tree.get(folderId);
240240
if (folderNode ==null) {
@@ -278,13 +278,13 @@ private Mono<Tree<Object, Folder>> buildFolderTree(String orgId) {
278278
.map(folders ->newTree<>(folders,Folder::getId,Folder::getParentFolderId,Collections.emptyList(),null,null));
279279
}
280280

281-
privateMono<Tree<ApplicationInfoView,FolderInfoView>>buildApplicationInfoViewTree(@NullableApplicationTypeapplicationType,@NullableStringname) {
281+
privateMono<Tree<ApplicationInfoView,FolderInfoView>>buildApplicationInfoViewTree(@NullableApplicationTypeapplicationType,@NullableStringname,@NullableStringcategory) {
282282

283283
Mono<OrgMember>orgMemberMono =sessionUserService.getVisitorOrgMemberCache()
284284
.cache();
285285

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ public Mono<ResponseView<FolderInfoView>> update(@RequestBody Folder folder) {
7070
publicMono<PageResponseView<?>>getElements(@RequestParam(value ="id",required =false)StringfolderId,
7171
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
7272
@RequestParam(required =false)Stringname,
73+
@RequestParam(required =false)Stringcategory,
7374
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7475
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
7576
StringobjectId =gidService.convertFolderIdToObjectId(folderId);
76-
varflux =folderApiService.getElements(objectId,applicationType,name).cache();
77+
varflux =folderApiService.getElements(objectId,applicationType,name,category).cache();
7778
varcountMono =flux.count();
7879
varflux1 =flux.skip((long) (pageNum -1) *pageSize);
7980
if(pageSize >0)flux1 =flux1.take(pageSize);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public interface FolderEndpoints
7171
publicMono<PageResponseView<?>>getElements(@RequestParam(value ="id",required =false)StringfolderId,
7272
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
7373
@RequestParam(required =false)Stringname,
74+
@RequestParam(required =false)Stringcategory,
7475
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7576
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
7677

‎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(ApplicationTypeapplicationType);
2525

2626
Flux<ApplicationInfoView>getAllAuthorisedApplications4CurrentOrgMember(@NullableApplicationTypeapplicationType,
27-
@NullableApplicationStatusapplicationStatus,booleanwithContainerSize,@NullableStringname);
27+
@NullableApplicationStatusapplicationStatus,booleanwithContainerSize,@NullableStringname,@NullableStringcategory);
2828

2929
Flux<BundleInfoView>getAllAuthorisedBundles4CurrentOrgMember(@NullableBundleStatusbundleStatus);
3030

0 commit comments

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