Skip to content

Commit 365b9fe

Browse files
authored
BE: Fixed consumer groups fts search (#1481)
1 parent 6415979 commit 365b9fe

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

api/src/main/java/io/kafbat/ui/controller/ConsumerGroupsController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
143143
Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
144144
Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),
145145
search,
146+
fts,
146147
Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),
147148
Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)
148149
)

api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,12 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
152152
int pageNum,
153153
int perPage,
154154
@Nullable String search,
155+
Boolean fts,
155156
ConsumerGroupOrderingDTO orderBy,
156157
SortOrderDTO sortOrderDto) {
157158
return adminClientService.get(cluster).flatMap(ac ->
158159
ac.listConsumerGroups()
159-
.map(listing -> filterGroups(listing, search)
160+
.map(listing -> filterGroups(listing, search, fts)
160161
)
161162
.flatMapIterable(lst -> lst)
162163
.filterWhen(cg -> accessControlService.isConsumerGroupAccessible(cg.groupId(), cluster.getName()))
@@ -169,9 +170,11 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
169170
(allGroups.size() / perPage) + (allGroups.size() % perPage == 0 ? 0 : 1))))));
170171
}
171172

172-
private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search) {
173-
ClustersProperties.ClusterFtsProperties fts = clustersProperties.getFts();
174-
ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts.isEnabled(), fts.getConsumers());
173+
private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search,
174+
Boolean useFts) {
175+
ClustersProperties.ClusterFtsProperties ftsProperties = clustersProperties.getFts();
176+
boolean fts = ftsProperties.use(useFts);
177+
ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts, ftsProperties.getConsumers());
175178
return filter.find(search);
176179
}
177180

0 commit comments

Comments
 (0)