Skip to content

Brokers: Improve accessibility for r/o clusters #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Brokers: Improve accessibility for r/o clusters #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ace1e89
Make tooltip font regular for edit button of broker configs (#556)
hadisfr Sep 21, 2024
0d523e5
Allow topic analysis in read only clusters (#556)
hadisfr Sep 21, 2024
0bc9747
Fix linter warning (#556)
hadisfr Sep 21, 2024
bec34c5
Mark all broker configs as read-only in read-only clusters (#556)
hadisfr Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/io/kafbat/ui/config/ReadOnlyModeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/io/kafbat/ui/model/InternalBrokerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/io/kafbat/ui/service/BrokerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 4 additions & 2 deletions ...end/src/components/Brokers/Broker/Configs/TableComponents/InputCell/InputCellViewMode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/components/Brokers/Broker/Configs/TableComponents/InputCell/styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
Loading