Merge branch 'kafbat:main' into main

yeikel · web-flow · commit 1bb3cd5caddc · 2025-11-11T18:35:50.000-05:00
diff --git a/api/src/main/java/io/kafbat/ui/controller/ConsumerGroupsController.java b/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)
             )
diff --git a/api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java b/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);
   }
 
diff --git a/api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java b/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()
+              );
             }
           }
         }
diff --git a/api/src/main/resources/logback-spring.xml b/api/src/main/resources/logback-spring.xml
diff --git a/frontend/src/components/Connect/List/ConnectorsTable/ConnectorsTable.tsx b/frontend/src/components/Connect/List/ConnectorsTable/ConnectorsTable.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { FullConnectorInfo } from 'generated-sources';
 import Table from 'components/common/NewTable';
 import { useLocalStoragePersister } from 'components/common/NewTable/ColumnResizer/lib';
 import { useQueryPersister } from 'components/common/NewTable/ColumnFilter';
 import { VisibilityState } from '@tanstack/react-table';
+import { useFilteredConnectorsDispatch } from 'components/Connect/model/FilteredConnectorsProvider';
 
 import { connectorsColumns } from './connectorsColumns/columns';
 
@@ -21,11 +22,16 @@ export const ConnectorsTable = ({
   columnSizingPersistKey = 'KafkaConnect',
   columnVisibility,
 }: ConnectorsTableProps) => {
+  const dispath = useFilteredConnectorsDispatch();
   const filterPersister = useQueryPersister(connectorsColumns);
   const columnSizingPersister = useLocalStoragePersister(
     columnSizingPersistKey
   );
 
+  const onFilterRows = useCallback((rows: FullConnectorInfo[]) => {
+    dispath({ type: 'updated', connectors: rows });
+  }, []);
+
   return (
     <Table
       data={connectors}
@@ -37,6 +43,7 @@ export const ConnectorsTable = ({
       setRowId={setRowId}
       filterPersister={filterPersister}
       columnVisibility={columnVisibility}
+      onFilterRows={onFilterRows}
     />
   );
 };
diff --git a/frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/cells/TopicsCell.tsx b/frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/cells/TopicsCell.tsx
@@ -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>
   );
 };
diff --git a/frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/columns.tsx b/frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/columns.tsx
@@ -19,7 +19,7 @@ export const connectorsColumns: ColumnDef<FullConnectorInfo, string>[] = [
     header: 'Connect',
     accessorKey: 'connect',
     cell: BreakableTextCell,
-    filterFn: 'arrIncludesSome',
+    filterFn: 'includesSome',
     meta: { filterVariant: 'multi-select' },
     enableResizing: true,
   },
diff --git a/frontend/src/components/Connect/List/ListPage.tsx b/frontend/src/components/Connect/List/ListPage.tsx
@@ -8,6 +8,7 @@ import { useSearchParams } from 'react-router-dom';
 import useFts from 'components/common/Fts/useFts';
 import Fts from 'components/common/Fts/Fts';
 import { FullConnectorInfo } from 'generated-sources';
+import { FilteredConnectorsProvider } from 'components/Connect/model/FilteredConnectorsProvider';
 
 import * as S from './ListPage.styled';
 import List from './List';
@@ -26,8 +27,8 @@ const ListPage: React.FC = () => {
   );
 
   return (
-    <>
-      <ConnectorsStatistics connectors={connectors} isLoading={isLoading} />
+    <FilteredConnectorsProvider>
+      <ConnectorsStatistics isLoading={isLoading} />
       <S.Search hasInput>
         <Search
           placeholder="Search by Connect Name, Status or Type"
@@ -37,7 +38,7 @@ const ListPage: React.FC = () => {
       <Suspense fallback={<PageLoader />}>
         <List connectors={connectors} />
       </Suspense>
-    </>
+    </FilteredConnectorsProvider>
   );
 };
 
diff --git a/frontend/src/components/Connect/List/Statistics/Statistics.tsx b/frontend/src/components/Connect/List/Statistics/Statistics.tsx
@@ -1,18 +1,18 @@
 import React, { FC, useMemo } from 'react';
 import * as Statistics from 'components/common/Statistics';
-import { FullConnectorInfo } from 'generated-sources';
+import { useFilteredConnectors } from 'components/Connect/model/FilteredConnectorsProvider';
 
 import { computeStatistics } from './models/computeStatistics';
 
 interface ConnectorsStatisticsProps {
-  connectors: FullConnectorInfo[];
   isLoading: boolean;
 }
-const ConnectorsStatistics: FC<ConnectorsStatisticsProps> = ({
-  connectors,
-  isLoading,
-}) => {
-  const statistics = useMemo(() => computeStatistics(connectors), [connectors]);
+const ConnectorsStatistics: FC<ConnectorsStatisticsProps> = ({ isLoading }) => {
+  const connectors = useFilteredConnectors();
+
+  const statistics = useMemo(() => {
+    return computeStatistics(connectors);
+  }, [connectors]);
 
   return (
     <Statistics.Container role="group">
diff --git a/frontend/src/components/Connect/List/Statistics/__tests__/Statistics.spec.tsx b/frontend/src/components/Connect/List/Statistics/__tests__/Statistics.spec.tsx
@@ -5,6 +5,7 @@ import ConnectorsStatistics from 'components/Connect/List/Statistics/Statistics'
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 import { connectors } from 'lib/fixtures/kafkaConnect';
 import { FullConnectorInfo } from 'generated-sources';
+import { FilteredConnectorsProvider } from 'components/Connect/model/FilteredConnectorsProvider';
 
 jest.mock('lib/hooks/api/kafkaConnect');
 jest.mock('lib/hooks/useAppParams', () => ({
@@ -25,7 +26,11 @@ describe('Kafka Connect Connectors Statistics', () => {
   function renderComponent({ data = [], isLoading }: RenderComponentProps) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     useConnectorsMock.mockReturnValue({ data, isLoading } as any);
-    render(<ConnectorsStatistics connectors={data} isLoading={isLoading} />);
+    render(
+      <FilteredConnectorsProvider initialData={data}>
+        <ConnectorsStatistics isLoading={isLoading} />
+      </FilteredConnectorsProvider>
+    );
   }
 
   describe('when data loading', () => {
diff --git a/frontend/src/components/Connect/List/Statistics/models/computeStatistics.ts b/frontend/src/components/Connect/List/Statistics/models/computeStatistics.ts
@@ -1,6 +1,6 @@
 import { ConnectorState, FullConnectorInfo } from 'generated-sources';
 
-interface Statistic {
+export interface Statistic {
   connectorsCount: number;
   failedConnectorsCount: number;
   tasksCount: number;
diff --git a/frontend/src/components/Connect/List/__tests__/List.spec.tsx b/frontend/src/components/Connect/List/__tests__/List.spec.tsx
@@ -16,6 +16,7 @@ import {
   useUpdateConnectorState,
 } from 'lib/hooks/api/kafkaConnect';
 import { FullConnectorInfo } from 'generated-sources';
+import { FilteredConnectorsProvider } from 'components/Connect/model/FilteredConnectorsProvider';
 
 const mockedUsedNavigate = jest.fn();
 const mockDelete = jest.fn();
@@ -42,7 +43,9 @@ const renderComponent = (
   render(
     <ClusterContext.Provider value={contextValue}>
       <WithRoute path={clusterConnectorsPath()}>
-        <List connectors={data} />
+        <FilteredConnectorsProvider>
+          <List connectors={data} />
+        </FilteredConnectorsProvider>
       </WithRoute>
     </ClusterContext.Provider>,
     { initialEntries: [clusterConnectorsPath(clusterName)] }
diff --git a/frontend/src/components/Connect/model/FilteredConnectorsProvider.tsx b/frontend/src/components/Connect/model/FilteredConnectorsProvider.tsx
@@ -0,0 +1,58 @@
+import { FullConnectorInfo } from 'generated-sources';
+import React, {
+  createContext,
+  Dispatch,
+  FC,
+  PropsWithChildren,
+  useContext,
+  useReducer,
+} from 'react';
+
+const initialConnectors: FullConnectorInfo[] = [];
+type Action = { type: 'updated'; connectors: FullConnectorInfo[] };
+
+function reducer(connectors: FullConnectorInfo[], action: Action) {
+  switch (action.type) {
+    case 'updated': {
+      return action.connectors;
+    }
+    default: {
+      throw Error(`Unknown action: ${action.type}`);
+    }
+  }
+}
+
+const ConnectorsContext = createContext<FullConnectorInfo[] | null>(null);
+const ConnectorsDispatchContext = createContext<Dispatch<Action> | null>(null);
+
+export const FilteredConnectorsProvider: FC<
+  PropsWithChildren<{ initialData?: FullConnectorInfo[] }>
+> = ({ children, initialData }) => {
+  const [connectors, dispatch] = useReducer(
+    reducer,
+    initialData ?? initialConnectors
+  );
+  return (
+    <ConnectorsContext.Provider value={connectors}>
+      <ConnectorsDispatchContext.Provider value={dispatch}>
+        {children}
+      </ConnectorsDispatchContext.Provider>
+    </ConnectorsContext.Provider>
+  );
+};
+
+export const useFilteredConnectors = () => {
+  const context = useContext(ConnectorsContext);
+  if (!context) {
+    throw new Error('useCounter must be used within a CounterProvider');
+  }
+  return context;
+};
+
+export const useFilteredConnectorsDispatch = () => {
+  const context = useContext(ConnectorsDispatchContext);
+  if (!context) {
+    throw new Error('useCounter must be used within a CounterProvider');
+  }
+  return context;
+};
diff --git a/frontend/src/components/Dashboard/ClusterName.tsx b/frontend/src/components/Dashboard/ClusterName.tsx
@@ -9,7 +9,11 @@ const ClusterName: React.FC<ClusterNameProps> = ({ row }) => {
   const { readOnly, name } = row.original;
   return (
     <div style={{ wordBreak: 'break-word', whiteSpace: 'pre-wrap' }}>
-      {readOnly && <Tag color="blue">readonly</Tag>}
+      {readOnly && (
+        <Tag color="blue" style={{ marginRight: '0.75em' }}>
+          readonly
+        </Tag>
+      )}
       {name}
     </div>
   );
diff --git a/frontend/src/components/Topics/List/TopicTable.tsx b/frontend/src/components/Topics/List/TopicTable.tsx
@@ -72,9 +72,9 @@ const TopicTable: React.FC = () => {
         },
       },
       {
+        id: TopicColumnsToSort.REPLICATION_FACTOR,
         header: 'Replication Factor',
         accessorKey: 'replicationFactor',
-        enableSorting: false,
         size: 148,
         maxSize: 148,
       },
diff --git a/frontend/src/components/Topics/List/TopicTitleCell.tsx b/frontend/src/components/Topics/List/TopicTitleCell.tsx
@@ -15,10 +15,9 @@ export const TopicTitleCell: React.FC<CellContext<Topic, unknown>> = ({
       style={{ wordBreak: 'break-word', whiteSpace: 'pre-wrap' }}
     >
       {internal && (
-        <>
-          <Tag color="gray">IN</Tag>
-          &nbsp;
-        </>
+        <Tag color="gray" style={{ marginRight: '0.75em' }}>
+          IN
+        </Tag>
       )}
       {name}
     </NavLink>
diff --git a/frontend/src/components/Topics/Topic/Messages/PreviewModal.tsx b/frontend/src/components/Topics/Topic/Messages/PreviewModal.tsx
diff --git a/frontend/src/components/common/Icons/WarningIcon.tsx b/frontend/src/components/common/Icons/WarningIcon.tsx
diff --git a/frontend/src/components/common/NewTable/Table.tsx b/frontend/src/components/common/NewTable/Table.tsx
diff --git a/frontend/src/theme/theme.ts b/frontend/src/theme/theme.ts

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage`
`143`	`143`	`Optional.ofNullable(page).filter(i -> i > 0).orElse(1),`
`144`	`144`	`Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),`
`145`	`145`	`search,`
	`146`	`+ fts,`
`146`	`147`	`Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),`
`147`	`148`	`Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)`
`148`	`149`	`)`