Merge branch 'main' into topic-right-click

Author: germanosin

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

@@ -143,6 +143,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
                 Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
                 Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),
                 search,
+                fts,
                 Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),
                 Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)
             )

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

@@ -152,11 +152,12 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
       int pageNum,
       int perPage,
       @Nullable String search,
+      Boolean fts,
       ConsumerGroupOrderingDTO orderBy,
       SortOrderDTO sortOrderDto) {
     return adminClientService.get(cluster).flatMap(ac ->
         ac.listConsumerGroups()
-            .map(listing -> filterGroups(listing, search)
+            .map(listing -> filterGroups(listing, search, fts)
             )
             .flatMapIterable(lst -> lst)
             .filterWhen(cg -> accessControlService.isConsumerGroupAccessible(cg.groupId(), cluster.getName()))
@@ -169,9 +170,11 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
                             (allGroups.size() / perPage) + (allGroups.size() % perPage == 0 ? 0 : 1))))));
   }
 
-  private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search) {
-    ClustersProperties.ClusterFtsProperties fts = clustersProperties.getFts();
-    ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts.isEnabled(), fts.getConsumers());
+  private Collection<ConsumerGroupListing> filterGroups(Collection<ConsumerGroupListing> groups, String search,
+                                                        Boolean useFts) {
+    ClustersProperties.ClusterFtsProperties ftsProperties = clustersProperties.getFts();
+    boolean fts = ftsProperties.use(useFts);
+    ConsumerGroupFilter filter = new ConsumerGroupFilter(groups, fts, ftsProperties.getConsumers());
     return filter.find(search);
   }
 

api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java

@@ -15,6 +15,7 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -40,6 +41,7 @@
 import org.apache.lucene.store.ByteBuffersDirectory;
 import org.apache.lucene.store.Directory;
 
+@Slf4j
 public class LuceneTopicsIndex implements TopicsIndex {
   public static final String FIELD_NAME_RAW = "name_raw";
 
@@ -74,9 +76,15 @@ private Directory build(List<InternalTopic> topics) {
         doc.add(new LongPoint(FIELD_SIZE, topic.getSegmentSize()));
         if (topic.getTopicConfigs() != null && !topic.getTopicConfigs().isEmpty()) {
           for (InternalTopicConfig topicConfig : topic.getTopicConfigs()) {
-            if (topicConfig.getName() != null || topicConfig.getValue() != null) {
+            final String topicConfigValue = topicConfig.getValue();
+            if (topicConfigValue != null) {
               doc.add(new StringField(FIELD_CONFIG_PREFIX + "_" + topicConfig.getName(), topicConfig.getValue(),
                   Field.Store.NO));
+            } else {
+              log.info(
+                  "Topic configuration item '{}' on internal topic '{}' has an unexpected value of null"
+                  + "; skipping processing", topicConfig.getName(), topic.getName()
+              );
             }
           }
         }

frontend/src/components/Topics/Topic/Messages/PreviewModal.tsx

@@ -6,6 +6,7 @@ import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import EditIcon from 'components/common/Icons/EditIcon';
 import CancelIcon from 'components/common/Icons/CancelIcon';
+import { JSONPath } from 'jsonpath-plus';
 
 import * as S from './PreviewModal.styled';
 import { PreviewFilter } from './Message';
@@ -33,8 +34,14 @@ const PreviewModal: React.FC<InfoModalProps> = ({
       newErrors.push('field');
     }
 
-    if (path === '') {
+    if (path.trim() === '') {
       newErrors.push('path');
+    } else {
+      try {
+        JSONPath({ path, json: {} });
+      } catch {
+        newErrors.push('invalidPath');
+      }
     }
 
     if (newErrors?.length) {
@@ -111,6 +118,7 @@ const PreviewModal: React.FC<InfoModalProps> = ({
         />
         <FormError>
           {errors.includes('path') && 'Json path is required'}
+          {errors.includes('invalidPath') && 'Invalid JSONPath syntax'}
         </FormError>
       </div>
       <S.ButtonWrapper>