Merge branch 'main' into issues/1245

germanosin · web-flow · commit 76998e587a44 · 2025-09-15T11:21:39.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,6 +11,11 @@ updates:
   labels:
     - "type/dependencies"
     - "scope/backend"
+  ignore:
+    # Disable dependabot pull requests for Netty
+    # In general, our Netty references are temporary overrides, usually applied to address transitive Spring vulnerabilities, and should be configured with caution
+    # In general, having conflicting Netty versions in the classpath is not recommended
+    - dependency-name: "io.netty:*"
   groups:
     spring-boot-dependencies:
       patterns:
@@ -23,16 +28,10 @@ updates:
       exclude-patterns:
           - "org.springframework.boot:*"
           - "io.spring.dependency-management"
-          # All netty references are temporary overwrites that must be set carefully
-          # We do not need dependabot to send pull requests
-          - "io.netty:*"    
     other-dependencies:
       exclude-patterns:
         - "org.springframework.boot:*"
         - "io.spring.dependency-management"
-        # All netty references are temporary overwrites that must be set carefully
-        # We do not need dependabot to send pull requests
-        - "io.netty:*"
       patterns:
         - "*"
       update-types:
diff --git a/api/src/main/java/io/kafbat/ui/controller/TopicsController.java b/api/src/main/java/io/kafbat/ui/controller/TopicsController.java
@@ -7,7 +7,6 @@
 import static io.kafbat.ui.model.rbac.permission.TopicAction.EDIT;
 import static io.kafbat.ui.model.rbac.permission.TopicAction.VIEW;
 import static java.util.stream.Collectors.toList;
-import static org.apache.commons.lang3.Strings.CI;
 
 import io.kafbat.ui.api.TopicsApi;
 import io.kafbat.ui.config.ClustersProperties;
@@ -362,6 +361,10 @@ private Comparator<InternalTopic> getComparatorForTopic(
       case OUT_OF_SYNC_REPLICAS -> Comparator.comparing(t -> t.getReplicas() - t.getInSyncReplicas());
       case REPLICATION_FACTOR -> Comparator.comparing(InternalTopic::getReplicationFactor);
       case SIZE -> Comparator.comparing(InternalTopic::getSegmentSize);
+      case MESSAGES_COUNT ->  Comparator.comparing(
+          InternalTopic::getMessagesCount,
+          Comparator.nullsLast(Long::compareTo)
+      );
       default -> defaultComparator;
     };
   }
diff --git a/api/src/main/java/io/kafbat/ui/mapper/ClusterMapper.java b/api/src/main/java/io/kafbat/ui/mapper/ClusterMapper.java
@@ -51,6 +51,7 @@
 import org.apache.kafka.common.resource.ResourceType;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.openapitools.jackson.nullable.JsonNullable;
 
 @Mapper(componentModel = "spring")
 public interface ClusterMapper {
@@ -104,6 +105,14 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   TopicDTO toTopic(InternalTopic topic);
 
+  default <T> JsonNullable<T> toJsonNullable(T value) {
+    if (value == null) {
+      return JsonNullable.undefined();
+    } else {
+      return JsonNullable.of(value);
+    }
+  }
+
   PartitionDTO toPartition(InternalPartition topic);
 
   BrokerDTO toBrokerDto(InternalBroker broker);
diff --git a/api/src/main/java/io/kafbat/ui/model/InternalTopic.java b/api/src/main/java/io/kafbat/ui/model/InternalTopic.java
@@ -10,7 +10,6 @@
 import lombok.Data;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.common.TopicPartition;
 
 @Data
 @Builder(toBuilder = true)
@@ -143,4 +142,16 @@ public static InternalTopic from(TopicDescription topicDescription,
     return topic.build();
   }
 
+  public @Nullable Long getMessagesCount() {
+    Long result = null;
+    if (cleanUpPolicy.equals(CleanupPolicy.DELETE)) {
+      result = 0L;
+      if (partitions != null && !partitions.isEmpty()) {
+        for (InternalPartition partition : partitions.values()) {
+          result += (partition.getOffsetMax() - partition.getOffsetMin());
+        }
+      }
+    }
+    return result;
+  }
 }
diff --git a/contract-typespec/api/topics.tsp b/contract-typespec/api/topics.tsp
@@ -156,6 +156,7 @@ enum TopicColumnsToSort {
   TOTAL_PARTITIONS,
   REPLICATION_FACTOR,
   SIZE,
+  MESSAGES_COUNT
 }
 
 model Topic {
@@ -170,6 +171,7 @@ model Topic {
   bytesInPerSec?: float64;
   bytesOutPerSec?: float64;
   underReplicatedPartitions?: int32;
+  messagesCount?: int64 | null;
   cleanUpPolicy?: CleanUpPolicy;
   partitions?: Partition[];
 }
diff --git a/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml
@@ -2692,6 +2692,7 @@ components:
         - TOTAL_PARTITIONS
         - REPLICATION_FACTOR
         - SIZE
+        - MESSAGES_COUNT
 
     SchemaColumnsToSort:
       type: string
@@ -2747,6 +2748,10 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/Partition"
+        messagesCount:
+          type: integer
+          format: int64
+          nullable: true
       required:
         - name
 
diff --git a/frontend/src/components/ConsumerGroups/Details/ListItem.tsx b/frontend/src/components/ConsumerGroups/Details/ListItem.tsx
@@ -31,6 +31,9 @@ const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
     useDeleteConsumerGroupOffsetsMutation(consumerProps);
 
   const getTotalconsumerLag = () => {
+    if (consumers.every((consumer) => consumer?.consumerLag === null)) {
+      return 'N/A';
+    }
     let count = 0;
     consumers.forEach((consumer) => {
       count += consumer?.consumerLag || 0;
diff --git a/frontend/src/components/ConsumerGroups/List.tsx b/frontend/src/components/ConsumerGroups/List.tsx
@@ -16,6 +16,7 @@ import { CONSUMER_GROUP_STATE_TOOLTIPS, PER_PAGE } from 'lib/constants';
 import { useConsumerGroups } from 'lib/hooks/api/consumers';
 import Tooltip from 'components/common/Tooltip/Tooltip';
 import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
+import { useLocalStoragePersister } from 'components/common/NewTable/ColumnResizer/lib';
 
 const List = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
@@ -47,6 +48,7 @@ const List = () => {
             to={encodeURIComponent(`${getValue<string | number>()}`)}
           />
         ),
+        size: 600,
       },
       {
         id: ConsumerGroupOrdering.MEMBERS,
@@ -96,6 +98,8 @@ const List = () => {
     []
   );
 
+  const columnSizingPersister = useLocalStoragePersister('Consumers');
+
   return (
     <>
       <ResourcePageHeading text="Consumers" />
@@ -118,6 +122,8 @@ const List = () => {
             clusterConsumerGroupDetailsPath(clusterName, original.groupId)
           )
         }
+        enableColumnResizing
+        columnSizingPersister={columnSizingPersister}
         disabled={consumerGroups.isFetching}
       />
     </>
diff --git a/frontend/src/components/Nav/ClusterMenu/ClusterMenu.tsx b/frontend/src/components/Nav/ClusterMenu/ClusterMenu.tsx
@@ -14,7 +14,7 @@ import {
   clusterTopicsPath,
   kafkaConnectPath,
 } from 'lib/paths';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useLocalStorage } from 'lib/hooks/useLocalStorage';
 import { ClusterColorKey } from 'theme/theme';
 import useScrollIntoView from 'lib/hooks/useScrollIntoView';
@@ -34,8 +34,10 @@ const ClusterMenu: FC<ClusterMenuProps> = ({
 }) => {
   const hasFeatureConfigured = (key: ClusterFeaturesEnum) =>
     features?.includes(key);
+
   const [isOpen, setIsOpen] = useState(!!opened);
   const location = useLocation();
+  const navigate = useNavigate();
   const [colorKey, setColorKey] = useLocalStorage<ClusterColorKey>(
     `clusterColor-${name}`,
     'transparent'
@@ -47,13 +49,25 @@ const ClusterMenu: FC<ClusterMenuProps> = ({
 
   const { ref } = useScrollIntoView<HTMLUListElement>(opened);
 
+  const handleClusterNameClick = () => {
+    if (!isOpen) {
+      setIsOpen(true);
+    }
+    navigate(clusterBrokersPath(name));
+  };
+
+  const handleToggleMenu = () => {
+    setIsOpen((prev) => !prev);
+  };
+
   return (
     <S.ClusterList role="menu" $colorKey={colorKey} ref={ref}>
       <MenuTab
         title={name}
         status={status}
         isOpen={isOpen}
-        toggleClusterMenu={() => setIsOpen((prev) => !prev)}
+        toggleClusterMenu={handleToggleMenu}
+        onClusterNameClick={handleClusterNameClick}
         setColorKey={setColorKey}
         isActive={opened}
       />
diff --git a/frontend/src/components/Nav/ClusterMenu/__tests__/ClusterMenu.spec.tsx b/frontend/src/components/Nav/ClusterMenu/__tests__/ClusterMenu.spec.tsx
@@ -22,25 +22,33 @@ describe('ClusterMenu', () => {
     />
   );
   const getMenuItems = () => screen.getAllByRole('menuitem');
-  const getMenuItem = () => screen.getByRole('menuitem');
   const getBrokers = () => screen.getByTitle('Brokers');
-  const getTopics = () => screen.getByTitle('Brokers');
-  const getConsumers = () => screen.getByTitle('Brokers');
+  const getTopics = () => screen.getByTitle('Topics');
+  const getConsumers = () => screen.getByTitle('Consumers');
   const getKafkaConnect = () => screen.getByTitle('Kafka Connect');
   const getCluster = () => screen.getByText(onlineClusterPayload.name);
 
+  // Хелпер для клика по шеврону - ищем SVG с шевроном
+  const clickChevron = async () => {
+    const chevronSvg = document.querySelector('svg[viewBox="0 0 10 6"]');
+    if (chevronSvg) {
+      await userEvent.click(chevronSvg as Element);
+    }
+  };
+
   it('renders cluster menu with default set of features', async () => {
     render(setupComponent(onlineClusterPayload));
     expect(getCluster()).toBeInTheDocument();
 
     expect(getMenuItems().length).toEqual(1);
-    await userEvent.click(getMenuItem());
+    await clickChevron();
     expect(getMenuItems().length).toEqual(4);
 
     expect(getBrokers()).toBeInTheDocument();
     expect(getTopics()).toBeInTheDocument();
     expect(getConsumers()).toBeInTheDocument();
   });
+
   it('renders cluster menu with correct set of features', async () => {
     render(
       setupComponent({
@@ -53,7 +61,7 @@ describe('ClusterMenu', () => {
       })
     );
     expect(getMenuItems().length).toEqual(1);
-    await userEvent.click(getMenuItem());
+    await clickChevron();
     expect(getMenuItems().length).toEqual(7);
 
     expect(getBrokers()).toBeInTheDocument();
@@ -63,6 +71,7 @@ describe('ClusterMenu', () => {
     expect(getKafkaConnect()).toBeInTheDocument();
     expect(screen.getByTitle('KSQL DB')).toBeInTheDocument();
   });
+
   it('renders open cluster menu', () => {
     render(setupComponent(onlineClusterPayload, true), {
       initialEntries: [clusterConnectorsPath(onlineClusterPayload.name)],
@@ -74,6 +83,7 @@ describe('ClusterMenu', () => {
     expect(getTopics()).toBeInTheDocument();
     expect(getConsumers()).toBeInTheDocument();
   });
+
   it('makes Kafka Connect link active', async () => {
     render(
       setupComponent({
@@ -83,7 +93,7 @@ describe('ClusterMenu', () => {
       { initialEntries: [clusterConnectorsPath(onlineClusterPayload.name)] }
     );
     expect(getMenuItems().length).toEqual(1);
-    await userEvent.click(getMenuItem());
+    await clickChevron();
     expect(getMenuItems().length).toEqual(5);
 
     const kafkaConnect = getKafkaConnect();
diff --git a/frontend/src/components/Nav/Menu/MenuTab.tsx b/frontend/src/components/Nav/Menu/MenuTab.tsx
@@ -10,43 +10,55 @@ export interface MenuTabProps {
   status: ServerStatus;
   isOpen: boolean;
   toggleClusterMenu: () => void;
+  onClusterNameClick: () => void;
   setColorKey: Dispatch<SetStateAction<ClusterColorKey>>;
   isActive?: boolean;
 }
 
 const MenuTab: FC<MenuTabProps> = ({
   title,
   toggleClusterMenu,
+  onClusterNameClick,
   status,
   isOpen,
   setColorKey,
   isActive = false,
-}) => (
-  <S.MenuItem
-    $variant="primary"
-    onClick={toggleClusterMenu}
-    $isActive={isActive}
-  >
-    <S.ContentWrapper>
-      <S.StatusIconWrapper>
-        <S.StatusIcon status={status} aria-label="status">
-          <title>{status}</title>
-        </S.StatusIcon>
-      </S.StatusIconWrapper>
-
-      <S.Title title={title}>{title}</S.Title>
-    </S.ContentWrapper>
-
-    <S.ActionsWrapper>
-      <S.ColorPickerWrapper>
-        <MenuColorPicker setColorKey={setColorKey} />
-      </S.ColorPickerWrapper>
-
-      <S.ChevronWrapper>
-        <S.ChevronIcon $isOpen={isOpen} />
-      </S.ChevronWrapper>
-    </S.ActionsWrapper>
-  </S.MenuItem>
-);
+}) => {
+  const handleNameClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    onClusterNameClick();
+  };
+
+  const handleChevronClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    toggleClusterMenu();
+  };
+
+  return (
+    <S.MenuItem $variant="primary" $isActive={isActive}>
+      <S.ContentWrapper onClick={handleNameClick} style={{ cursor: 'pointer' }}>
+        <S.StatusIconWrapper>
+          <S.StatusIcon status={status} aria-label="status">
+            <title>{status}</title>
+          </S.StatusIcon>
+        </S.StatusIconWrapper>
+
+        <S.Title title={title}>{title}</S.Title>
+      </S.ContentWrapper>
+
+      <S.ActionsWrapper>
+        <S.ColorPickerWrapper>
+          <MenuColorPicker setColorKey={setColorKey} />
+        </S.ColorPickerWrapper>
+
+        <S.ChevronClickArea onClick={handleChevronClick}>
+          <S.ChevronWrapper>
+            <S.ChevronIcon $isOpen={isOpen} />
+          </S.ChevronWrapper>
+        </S.ChevronClickArea>
+      </S.ActionsWrapper>
+    </S.MenuItem>
+  );
+};
 
 export default MenuTab;
diff --git a/frontend/src/components/Nav/Menu/__tests__/MenuTab.spec.tsx b/frontend/src/components/Nav/Menu/__tests__/MenuTab.spec.tsx
@@ -11,6 +11,7 @@ const toggleClusterMenuMock = jest.fn();
 describe('MenuTab component', () => {
   const setupWrapper = (props?: Partial<MenuTabProps>) => (
     <MenuTab
+      onClusterNameClick={() => {}}
       setColorKey={() => {}}
       status={ServerStatus.ONLINE}
       isOpen
diff --git a/frontend/src/components/Nav/Menu/styled.ts b/frontend/src/components/Nav/Menu/styled.ts
diff --git a/frontend/src/components/Schemas/List/List.tsx b/frontend/src/components/Schemas/List/List.tsx
diff --git a/frontend/src/components/Schemas/Schemas.tsx b/frontend/src/components/Schemas/Schemas.tsx
diff --git a/frontend/src/components/Topics/List/TopicTable.tsx b/frontend/src/components/Topics/List/TopicTable.tsx
diff --git a/frontend/src/lib/fixtures/topics.ts b/frontend/src/lib/fixtures/topics.ts
diff --git a/frontend/src/lib/hooks/api/schemas.ts b/frontend/src/lib/hooks/api/schemas.ts

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ enum TopicColumnsToSort {`
`156`	`156`	`TOTAL_PARTITIONS,`
`157`	`157`	`REPLICATION_FACTOR,`
`158`	`158`	`SIZE,`
	`159`	`+ MESSAGES_COUNT`
`159`	`160`	`}`
`160`	`161`
`161`	`162`	`model Topic {`
`@@ -170,6 +171,7 @@ model Topic {`
`170`	`171`	`bytesInPerSec?: float64;`
`171`	`172`	`bytesOutPerSec?: float64;`
`172`	`173`	`underReplicatedPartitions?: int32;`
	`174`	`+ messagesCount?: int64 \| null;`
`173`	`175`	`cleanUpPolicy?: CleanUpPolicy;`
`174`	`176`	`partitions?: Partition[];`
`175`	`177`	`}`