Brokers: Improve accessibility for r/o clusters (#556)

Co-authored-by: Roman Zabaluev <gpg@haarolean.dev>
kafbat · Oct 16, 2024 · 8d742ba · 8d742ba
1 parent 19b13ea
commit 8d742ba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/api/src/main/java/io/kafbat/ui/config/ReadOnlyModeFilter.java b/api/src/main/java/io/kafbat/ui/config/ReadOnlyModeFilter.java
@@ -25,7 +25,7 @@ public class ReadOnlyModeFilter implements WebFilter {
       Pattern.compile("/api/clusters/(?<clusterName>[^/]++)");
 
   private static final Set<Pattern> SAFE_ENDPOINTS = Set.of(
-      Pattern.compile("/api/clusters/[^/]+/topics/[^/]+/(smartfilters)$")
+      Pattern.compile("/api/clusters/[^/]+/topics/[^/]+/(smartfilters|analysis)$")
   );
 
   private final ClustersStorage clustersStorage;

diff --git a/api/src/main/java/io/kafbat/ui/model/InternalBrokerConfig.java b/api/src/main/java/io/kafbat/ui/model/InternalBrokerConfig.java
@@ -16,12 +16,12 @@ public class InternalBrokerConfig {
   private final boolean isReadOnly;
   private final List<ConfigEntry.ConfigSynonym> synonyms;
 
-  public static InternalBrokerConfig from(ConfigEntry configEntry) {
+  public static InternalBrokerConfig from(ConfigEntry configEntry, boolean readOnlyCluster) {
     InternalBrokerConfig.InternalBrokerConfigBuilder builder = InternalBrokerConfig.builder()
         .name(configEntry.name())
         .value(configEntry.value())
         .source(configEntry.source())
-        .isReadOnly(configEntry.isReadOnly())
+        .isReadOnly(readOnlyCluster || configEntry.isReadOnly())
         .isSensitive(configEntry.isSensitive())
         .synonyms(configEntry.synonyms());
     return builder.build();

diff --git a/api/src/main/java/io/kafbat/ui/service/BrokerService.java b/api/src/main/java/io/kafbat/ui/service/BrokerService.java
@@ -59,7 +59,7 @@ private Flux<InternalBrokerConfig> getBrokersConfig(KafkaCluster cluster, Intege
     }
     return loadBrokersConfig(cluster, brokerId)
         .map(list -> list.stream()
-            .map(InternalBrokerConfig::from)
+            .map(configEntry -> InternalBrokerConfig.from(configEntry, cluster.isReadOnly()))
             .collect(Collectors.toList()))
         .flatMapMany(Flux::fromIterable);
   }

diff --git a/...end/src/components/Brokers/Broker/Configs/TableComponents/InputCell/InputCellViewMode.tsx b/...end/src/components/Brokers/Broker/Configs/TableComponents/InputCell/InputCellViewMode.tsx
@@ -31,8 +31,10 @@ const InputCellViewMode: FC<InputCellViewModeProps> = ({
   );
 
   return (
-    <S.ValueWrapper $isDynamic={isDynamic}>
-      <S.Value title={title}>{displayValue}</S.Value>
+    <S.ValueWrapper>
+      <S.Value $isDynamic={isDynamic} title={title}>
+        {displayValue}
+      </S.Value>
       <Tooltip
         value={
           <Button

diff --git a/frontend/src/components/Brokers/Broker/Configs/TableComponents/InputCell/styled.ts b/frontend/src/components/Brokers/Broker/Configs/TableComponents/InputCell/styled.ts
@@ -1,22 +1,23 @@
 import styled from 'styled-components';
 
-export const ValueWrapper = styled.div<{ $isDynamic?: boolean }>`
+export const ValueWrapper = styled.div`
   display: flex;
   justify-content: space-between;
-  font-weight: ${({ $isDynamic }) => ($isDynamic ? 600 : 400)};
+  font-weight: 400;
 
   button {
     margin: 0 10px;
   }
 `;
 
-export const Value = styled.span`
+export const Value = styled.span<{ $isDynamic?: boolean }>`
   line-height: 24px;
   margin-right: 10px;
   text-overflow: ellipsis;
   max-width: 400px;
   overflow: hidden;
   white-space: nowrap;
+  font-weight: ${({ $isDynamic }) => ($isDynamic ? 600 : 400)};
 `;
 
 export const ButtonsWrapper = styled.div`