Merge branch 'main' into issues/1332-be

Author: germanosin

api/Dockerfile

@@ -1,7 +1,7 @@
 # The tag is ignored when a sha is included but the reason to add it are:
 # 1. Self Documentation: It is difficult to find out what the expected tag is given a sha alone
 # 2. Helps dependabot during discovery of upgrades
-FROM azul/zulu-openjdk-alpine:21.0.8-jre-headless@sha256:49992ca94d08736b6827ad3289114acc7934a0da543f3bff208c3df46ed1108c
+FROM azul/zulu-openjdk-alpine:21.0.8-jre-headless@sha256:48356cf1b81243b6e236509bb6ae281969fc0eade03f622220973a4e224cd768
 
 RUN apk add --no-cache \
     # snappy codec

api/src/main/java/io/kafbat/ui/mapper/KafkaConnectMapper.java

@@ -2,8 +2,10 @@
 
 import io.kafbat.ui.config.ClustersProperties;
 import io.kafbat.ui.connect.model.ClusterInfo;
+import io.kafbat.ui.connect.model.Connector;
 import io.kafbat.ui.connect.model.ConnectorStatusConnector;
 import io.kafbat.ui.connect.model.ConnectorTask;
+import io.kafbat.ui.connect.model.ConnectorTopics;
 import io.kafbat.ui.connect.model.ExpandedConnector;
 import io.kafbat.ui.connect.model.NewConnector;
 import io.kafbat.ui.model.ConnectDTO;
@@ -42,6 +44,14 @@ default ClusterInfo toClient(KafkaConnectState state) {
   @Mapping(target = "connect", ignore = true)
   ConnectorDTO fromClient(io.kafbat.ui.connect.model.Connector connector);
 
+  default ConnectorDTO fromClient(Connector connector, ConnectorTopics topics) {
+    ConnectorDTO connectorDto = this.fromClient(connector);
+    if (topics != null) {
+      return connectorDto.topics(topics.getTopics());
+    }
+    return connectorDto;
+  }
+
   ConnectorStatusDTO fromClient(ConnectorStatusConnector connectorStatus);
 
   @Mapping(target = "status", ignore = true)
@@ -177,6 +187,4 @@ default KafkaConnectState.ConnectorState toScrapeState(InternalConnectorInfo con
         connector.getTopics()
     );
   }
-
-
 }

api/src/main/java/io/kafbat/ui/model/rbac/permission/TopicAction.java

@@ -12,7 +12,7 @@ public enum TopicAction implements PermissibleAction {
   DELETE(VIEW),
   MESSAGES_READ(VIEW),
   MESSAGES_PRODUCE(VIEW),
-  MESSAGES_DELETE(VIEW, EDIT),
+  MESSAGES_DELETE(VIEW),
   ANALYSIS_VIEW(VIEW),
   ANALYSIS_RUN(VIEW, ANALYSIS_VIEW),
 

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

@@ -226,8 +226,9 @@ private Mono<Boolean> connectorExists(KafkaCluster cluster, String connectName,
   public Mono<ConnectorDTO> getConnector(KafkaCluster cluster, String connectName,
                                          String connectorName) {
     return api(cluster, connectName)
-        .mono(client -> client.getConnector(connectorName)
-            .map(kafkaConnectMapper::fromClient)
+        .mono(client ->
+            Mono.zip(client.getConnector(connectorName), getConnectorTopics(cluster, connectName, connectorName))
+            .map(t -> kafkaConnectMapper.fromClient(t.getT1(), t.getT2()))
             .flatMap(connector ->
                 client.getConnectorStatus(connector.getName())
                     // status request can return 404 if tasks not assigned yet

contract-typespec/api/kafka-connect.tsp

@@ -225,6 +225,7 @@ model Connector {
   type: ConnectorType;
   status: ConnectorStatus;
   connect: string;
+  topics?: string[];
 }
 
 enum ConnectorAction {

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

@@ -3674,6 +3674,10 @@ components:
               $ref: '#/components/schemas/ConnectorStatus'
             connect:
               type: string
+            topics:
+              type: array
+              items:
+                type: string
           required:
             - type
             - status

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

@@ -26,6 +26,7 @@ import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourceP
 import BreakableTextCell from 'components/common/NewTable/BreakableTextCell';
 import { useQueryPersister } from 'components/common/NewTable/ColumnFilter';
 import { ActionPermissionWrapper } from 'components/common/ActionComponent';
+import ClusterContext from 'components/contexts/ClusterContext';
 
 import * as S from './List.styled';
 
@@ -35,6 +36,7 @@ const ACList: React.FC = () => {
   const [search, setSearch] = useState(searchParams.get('q') || '');
   const { data: aclList } = useAcls({ clusterName, search });
   const { deleteResource } = useDeleteAcl(clusterName);
+  const { isReadOnly } = React.useContext(ClusterContext);
   const modal = useConfirm(true);
   const theme = useTheme();
   const {
@@ -198,6 +200,7 @@ const ACList: React.FC = () => {
           buttonType="primary"
           buttonSize="M"
           onClick={openFrom}
+          disabled={isReadOnly}
           permission={{
             resource: ResourceType.ACL,
             action: Action.EDIT,

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

@@ -0,0 +1,42 @@
+import React 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 { connectorsColumns } from './connectorsColumns/columns';
+
+const setRowId = (originalRow: FullConnectorInfo) =>
+  `${originalRow.name}-${originalRow.connect}`;
+
+type ConnectorsTableProps = {
+  connectors: FullConnectorInfo[];
+  columnSizingPersistKey?: string;
+  columnVisibility?: VisibilityState;
+};
+
+export const ConnectorsTable = ({
+  connectors,
+  columnSizingPersistKey = 'KafkaConnect',
+  columnVisibility,
+}: ConnectorsTableProps) => {
+  const filterPersister = useQueryPersister(connectorsColumns);
+  const columnSizingPersister = useLocalStoragePersister(
+    columnSizingPersistKey
+  );
+
+  return (
+    <Table
+      data={connectors}
+      columns={connectorsColumns}
+      enableSorting
+      enableColumnResizing
+      columnSizingPersister={columnSizingPersister}
+      emptyMessage="No connectors found"
+      setRowId={setRowId}
+      filterPersister={filterPersister}
+      columnVisibility={columnVisibility}
+    />
+  );
+};

frontend/src/components/Connect/List/ActionsCell.tsx renamed to frontend/src/components/Connect/List/ConnectorsTable/connectorsColumns/cells/ActionsCell.tsx

@@ -7,7 +7,7 @@ import {
   ResourceType,
 } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
-import { ClusterNameRoute } from 'lib/paths';
+import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { Dropdown } from 'components/common/Dropdown';
 import {
@@ -24,7 +24,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
   row,
 }) => {
   const { connect, name, status } = row.original;
-  const { clusterName } = useAppParams<ClusterNameRoute>();
+  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const { isReadOnly } = useContext(ClusterContext);
   const mutationsNumber = useIsMutating();
   const isMutating = mutationsNumber > 0;
@@ -33,16 +33,19 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
     clusterName,
     connectName: connect,
     connectorName: name,
+    topicName,
   });
   const stateMutation = useUpdateConnectorState({
     clusterName,
     connectName: connect,
     connectorName: name,
+    topicName,
   });
   const resetConnectorOffsetsMutation = useResetConnectorOffsets({
     clusterName,
     connectName: connect,
     connectorName: name,
+    topicName,
   });
   const handleDelete = () => {
     confirm(
@@ -54,7 +57,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
       }
     );
   };
-  // const stateMutation = useUpdateConnectorState(routerProps);
+
   const resumeConnectorHandler = () =>
     stateMutation.mutateAsync(ConnectorAction.RESUME);
   const restartConnectorHandler = () =>