Merge branch 'main' into fe/hadnle_connectors_statistics

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/resources/logback-spring.xml

@@ -1,7 +1,6 @@
 import React from 'react';
 import { FullConnectorInfo } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
-import { useNavigate } from 'react-router-dom';
 import { MultiLineTag } from 'components/common/Tag/Tag.styled';
 import { ClusterNameRoute, clusterTopicPath } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -13,31 +12,18 @@ const TopicsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
 }) => {
   const { topics } = row.original;
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const navigate = useNavigate();
-
-  const navigateToTopic = (
-    e: React.KeyboardEvent | React.MouseEvent,
-    topic: string
-  ) => {
-    e.preventDefault();
-    e.stopPropagation();
-    navigate(clusterTopicPath(clusterName, topic));
-  };
 
   return (
     <S.TagsWrapper>
-      {topics?.map((t) => (
-        <MultiLineTag key={t} color="green">
-          <span
-            role="link"
-            onClick={(e) => navigateToTopic(e, t)}
-            onKeyDown={(e) => navigateToTopic(e, t)}
-            tabIndex={0}
-          >
-            {t}
-          </span>
-        </MultiLineTag>
-      ))}
+      {topics?.map((t) => {
+        const href = clusterTopicPath(clusterName, t);
+
+        return (
+          <MultiLineTag key={t} color="green">
+            <a href={href}>{t}</a>
+          </MultiLineTag>
+        );
+      })}
     </S.TagsWrapper>
   );
 };

frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/cells/TopicsCell.tsx

@@ -72,9 +72,9 @@ const TopicTable: React.FC = () => {
         },
       },
       {
+        id: TopicColumnsToSort.REPLICATION_FACTOR,
         header: 'Replication Factor',
         accessorKey: 'replicationFactor',
-        enableSorting: false,
         size: 148,
         maxSize: 148,
       },

frontend/src/components/Topics/List/TopicTable.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>