RBAC: Fix connect deletion permissions, minor FE fixes (#107)

Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com> Co-authored-by: Zuev Kirill <Zuev.kirill95@yandex.ru> Co-authored-by: ramadhan.rahmat <ramadhan.rahmat@bps.go.id> Co-authored-by: Oldřich Jedlička <oldium.pro@gmail.com>
kafbat · Feb 17, 2024 · e280c8e · e280c8e
1 parent a8d111e
commit e280c8e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/api/src/main/java/io/kafbat/ui/config/CustomWebFilter.java b/api/src/main/java/io/kafbat/ui/config/CustomWebFilter.java
@@ -1,5 +1,6 @@
 package io.kafbat.ui.config;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
@@ -10,13 +11,13 @@
 public class CustomWebFilter implements WebFilter {
 
   @Override
-  public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+  public @NotNull Mono<Void> filter(ServerWebExchange exchange, @NotNull WebFilterChain chain) {
 
     final String basePath = exchange.getRequest().getPath().contextPath().value();
 
     final String path = exchange.getRequest().getPath().pathWithinApplication().value();
 
-    if (path.startsWith("/ui") || path.equals("") || path.equals("/")) {
+    if (path.startsWith("/ui") || path.isEmpty() || path.equals("/")) {
       return chain.filter(
           exchange.mutate().request(
               exchange.getRequest().mutate()

diff --git a/api/src/main/java/io/kafbat/ui/controller/KafkaConnectController.java b/api/src/main/java/io/kafbat/ui/controller/KafkaConnectController.java
@@ -111,7 +111,7 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
     var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
-        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .connectActions(ConnectAction.DELETE)
         .operationName("deleteConnector")
         .operationParams(Map.of(CONNECTOR_NAME, connectName))
         .build();

diff --git a/api/src/main/java/io/kafbat/ui/model/rbac/permission/ConnectAction.java b/api/src/main/java/io/kafbat/ui/model/rbac/permission/ConnectAction.java
@@ -9,11 +9,12 @@ public enum ConnectAction implements PermissibleAction {
   VIEW,
   EDIT,
   CREATE,
+  DELETE,
   RESTART
 
   ;
 
-  public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, RESTART);
+  public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, DELETE, RESTART);
 
   @Nullable
   public static ConnectAction fromString(String name) {

diff --git a/frontend/src/components/Topics/Topic/Messages/PreviewModal.tsx b/frontend/src/components/Topics/Topic/Messages/PreviewModal.tsx
@@ -89,6 +89,7 @@ const PreviewModal: React.FC<InfoModalProps> = ({
       <div>
         <InputLabel htmlFor="previewFormField">Field</InputLabel>
         <Input
+          autoFocus
           type="text"
           id="previewFormField"
           min="1"

diff --git a/frontend/src/components/common/Search/Search.tsx b/frontend/src/components/common/Search/Search.tsx
@@ -52,6 +52,9 @@ const Search: React.FC<SearchProps> = ({
     if (ref.current != null) {
       ref.current.value = '';
     }
+    if (onChange) {
+      onChange('');
+    }
   };
 
   return (