Merge branch 'kafbat:main' into main

Author: AspidDark

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

@@ -26,6 +26,7 @@
 import io.kafbat.ui.model.TopicCreationDTO;
 import io.kafbat.ui.model.TopicUpdateDTO;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -288,6 +289,18 @@ private Map<TopicPartition, Optional<NewPartitionReassignment>> getPartitionsRea
     Map<Integer, Integer> brokersUsage = getBrokersMap(cluster, currentAssignment);
     int currentReplicationFactor = topic.getReplicationFactor();
 
+    // Get online nodes
+    List<Integer> onlineNodes = statisticsCache.get(cluster).getClusterDescription().getNodes()
+        .stream().map(Node::id).toList();
+
+    // keep only online nodes
+    for (Map.Entry<Integer, List<Integer>> parition : currentAssignment.entrySet()) {
+      parition.getValue().retainAll(onlineNodes);
+    }
+
+    brokersUsage.keySet().retainAll(onlineNodes);
+
+
     // If we should to increase Replication factor
     if (replicationFactorChange.getTotalReplicationFactor() > currentReplicationFactor) {
       // For each partition
@@ -320,28 +333,35 @@ private Map<TopicPartition, Optional<NewPartitionReassignment>> getPartitionsRea
         var partition = assignmentEntry.getKey();
         var brokers = assignmentEntry.getValue();
 
+        // Copy from online nodes if all nodes are offline
+        if (brokers.isEmpty()) {
+          brokers = new ArrayList<>(onlineNodes);
+        }
+
         // Get brokers list sorted by usage in reverse order
         var brokersUsageList = brokersUsage.entrySet().stream()
             .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
             .map(Map.Entry::getKey)
             .toList();
 
+        Integer leader = topic.getPartitions().get(partition).getLeader();
+
         // Iterate brokers and try to remove them from assignment
         // while partition replicas count != requested replication factor
         for (Integer broker : brokersUsageList) {
+          if (brokers.size() == replicationFactorChange.getTotalReplicationFactor()) {
+            break;
+          }
           // Check is the broker the leader of partition
-          if (!topic.getPartitions().get(partition).getLeader()
-              .equals(broker)) {
+          if (leader == null || !leader.equals(broker)) {
             brokers.remove(broker);
             brokersUsage.merge(broker, -1, Integer::sum);
           }
-          if (brokers.size() == replicationFactorChange.getTotalReplicationFactor()) {
-            break;
-          }
         }
         if (brokers.size() != replicationFactorChange.getTotalReplicationFactor()) {
           throw new ValidationException("Something went wrong during removing replicas");
         }
+        currentAssignment.put(partition, brokers);
       }
     } else {
       throw new ValidationException("Replication factor already equals requested");
@@ -374,7 +394,7 @@ private Map<Integer, Integer> getBrokersMap(KafkaCluster cluster,
             c -> 0
         ));
     currentAssignment.values().forEach(brokers -> brokers
-        .forEach(broker -> result.put(broker, result.get(broker) + 1)));
+        .forEach(broker -> result.put(broker, result.getOrDefault(broker, 0) + 1)));
 
     return result;
   }

contract/src/main/resources/swagger/kafbat-ui-api.yaml

@@ -4101,7 +4101,6 @@ components:
     KafkaAclNamePatternType:
       type: string
       enum:
-        - MATCH
         - LITERAL
         - PREFIXED
 

frontend/src/components/ACLPage/Form/CustomACL/lib.ts

@@ -1,5 +1,4 @@
 import { KafkaAcl, KafkaAclNamePatternType } from 'generated-sources';
-import isRegex from 'lib/isRegex';
 import { MatchType } from 'components/ACLPage/Form/types';
 
 import { FormValues } from './types';
@@ -8,8 +7,6 @@ export function toRequest(formValue: FormValues): KafkaAcl {
   let namePatternType: KafkaAclNamePatternType;
   if (formValue.namePatternType === MatchType.PREFIXED) {
     namePatternType = KafkaAclNamePatternType.PREFIXED;
-  } else if (isRegex(formValue.resourceName)) {
-    namePatternType = KafkaAclNamePatternType.MATCH;
   } else {
     namePatternType = KafkaAclNamePatternType.LITERAL;
   }

frontend/src/components/ACLPage/List/List.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ColumnDef, Row } from '@tanstack/react-table';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import Table from 'components/common/NewTable';
 import { useConfirm } from 'lib/hooks/useConfirm';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -20,6 +19,8 @@ import { useTheme } from 'styled-components';
 import ACLFormContext from 'components/ACLPage/Form/AclFormContext';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import ActionButton from 'components/common/ActionComponent/ActionButton/ActionButton';
+import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
+import BreakableTextCell from 'components/common/NewTable/BreakableTextCell';
 
 import * as S from './List.styled';
 
@@ -56,6 +57,7 @@ const ACList: React.FC = () => {
         header: 'Principal',
         accessorKey: 'principal',
         size: 257,
+        cell: BreakableTextCell,
       },
       {
         header: 'Resource',
@@ -149,7 +151,7 @@ const ACList: React.FC = () => {
 
   return (
     <S.Container>
-      <PageHeading text="Access Control List">
+      <ResourcePageHeading text="Access Control List">
         <ActionButton
           buttonType="primary"
           buttonSize="M"
@@ -161,7 +163,7 @@ const ACList: React.FC = () => {
         >
           <PlusIcon /> Create ACL
         </ActionButton>
-      </PageHeading>
+      </ResourcePageHeading>
       <Table
         columns={columns}
         data={aclList ?? []}

frontend/src/components/Brokers/Broker/Broker.tsx

@@ -1,5 +1,4 @@
 import React, { Suspense } from 'react';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -21,6 +20,7 @@ import Navbar from 'components/common/Navigation/Navbar.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { ActionNavLink } from 'components/common/ActionComponent';
 import { Action, ResourceType } from 'generated-sources';
+import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
 
 import Configs from './Configs/Configs';
 
@@ -38,7 +38,7 @@ const Broker: React.FC = () => {
   );
   return (
     <>
-      <PageHeading
+      <ResourcePageHeading
         text={`Broker ${brokerId}`}
         backTo={clusterBrokersPath(clusterName)}
         backText="Brokers"

frontend/src/components/Brokers/BrokersList/BrokersList.tsx

@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react';
 import { ClusterName } from 'lib/interfaces/cluster';
 import { useNavigate } from 'react-router-dom';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import useAppParams from 'lib/hooks/useAppParams';
 import Table from 'components/common/NewTable';
 import { clusterBrokerPath } from 'lib/paths';
 import { useBrokers } from 'lib/hooks/api/brokers';
 import { useClusterStats } from 'lib/hooks/api/clusters';
+import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
 
 import { BrokersMetrics } from './BrokersMetrics/BrokersMetrics';
 import { getBrokersTableColumns, getBrokersTableRows } from './lib';
@@ -45,7 +45,7 @@ const BrokersList: React.FC = () => {
 
   return (
     <>
-      <PageHeading text="Brokers" />
+      <ResourcePageHeading text="Brokers" />
 
       <BrokersMetrics
         brokerCount={brokerCount}

frontend/src/components/Brokers/BrokersList/lib/utils.ts

@@ -3,6 +3,7 @@ import * as Cell from 'components/Brokers/BrokersList/TableCells/TableCells';
 import { createColumnHelper } from '@tanstack/react-table';
 import { keyBy } from 'lib/functions/keyBy';
 import SkewHeader from 'components/Brokers/BrokersList/SkewHeader/SkewHeader';
+import BreakableTextCell from 'components/common/NewTable/BreakableTextCell';
 
 import { BrokersTableRow } from './types';
 import { NA_DISK_USAGE } from './constants';
@@ -75,6 +76,6 @@ export const getBrokersTableColumns = () => {
       cell: Cell.Skew,
     }),
     columnHelper.accessor('port', { header: 'Port' }),
-    columnHelper.accessor('host', { header: 'Host' }),
+    columnHelper.accessor('host', { header: 'Host', cell: BreakableTextCell }),
   ];
 };

frontend/src/components/Connect/Details/DetailsPage.tsx

@@ -9,8 +9,8 @@ import {
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
 import Navbar from 'components/common/Navigation/Navbar.styled';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import PageLoader from 'components/common/PageLoader/PageLoader';
+import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
 
 import Overview from './Overview/Overview';
 import Tasks from './Tasks/Tasks';
@@ -23,13 +23,13 @@ const DetailsPage: React.FC = () => {
 
   return (
     <div>
-      <PageHeading
+      <ResourcePageHeading
         text={connectorName}
         backTo={clusterConnectorsPath(clusterName)}
         backText="Connectors"
       >
         <Actions />
-      </PageHeading>
+      </ResourcePageHeading>
       <Overview />
       <Navbar role="navigation">
         <NavLink

frontend/src/components/Connect/List/List.tsx

@@ -6,6 +6,7 @@ import { FullConnectorInfo } from 'generated-sources';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 import { ColumnDef } from '@tanstack/react-table';
 import { useNavigate, useSearchParams } from 'react-router-dom';
+import BreakableTextCell from 'components/common/NewTable/BreakableTextCell';
 
 import ActionsCell from './ActionsCell';
 import TopicsCell from './TopicsCell';
@@ -23,9 +24,13 @@ const List: React.FC = () => {
   const columns = React.useMemo<ColumnDef<FullConnectorInfo>[]>(
     () => [
       { header: 'Name', accessorKey: 'name' },
-      { header: 'Connect', accessorKey: 'connect' },
+      { header: 'Connect', accessorKey: 'connect', cell: BreakableTextCell },
       { header: 'Type', accessorKey: 'type' },
-      { header: 'Plugin', accessorKey: 'connectorClass' },
+      {
+        header: 'Plugin',
+        accessorKey: 'connectorClass',
+        cell: BreakableTextCell,
+      },
       { header: 'Topics', cell: TopicsCell },
       { header: 'Status', accessorKey: 'status.state', cell: TagCell },
       { header: 'Running Tasks', cell: RunningTasksCell },

frontend/src/components/Connect/List/ListPage.tsx

@@ -4,13 +4,13 @@ import { ClusterNameRoute, clusterConnectorNewRelativePath } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Search from 'components/common/Search/Search';
 import * as Metrics from 'components/common/Metrics';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import Tooltip from 'components/common/Tooltip/Tooltip';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { ConnectorState, Action, ResourceType } from 'generated-sources';
 import { useConnectors, useConnects } from 'lib/hooks/api/kafkaConnect';
 import { ActionButton } from 'components/common/ActionComponent';
+import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
 
 import List from './List';
 
@@ -33,7 +33,7 @@ const ListPage: React.FC = () => {
 
   return (
     <>
-      <PageHeading text="Connectors">
+      <ResourcePageHeading text="Connectors">
         {!isReadOnly && (
           <Tooltip
             value={
@@ -55,7 +55,7 @@ const ListPage: React.FC = () => {
             placement="left"
           />
         )}
-      </PageHeading>
+      </ResourcePageHeading>
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator