IKC-478 fixes after merge

pbelke · pbelke · commit e2ca0b5deac0 · 2025-10-18T16:23:48.000+02:00
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/KouncilApplication.java b/kouncil-backend/src/main/java/com/consdata/kouncil/KouncilApplication.java
@@ -2,8 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {LdapAutoConfiguration.class})
 public class KouncilApplication {
 
     public static void main(String[] args) {
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/broker/BrokersController.java b/kouncil-backend/src/main/java/com/consdata/kouncil/broker/BrokersController.java
@@ -45,24 +45,27 @@ public class BrokersController {
     @GetMapping("/brokers")
     @EntryExitLogger
     public BrokersDto getBrokers(@RequestParam("serverId") String serverId) {
-        try {
-            DescribeClusterResult describeClusterResult = kafkaConnectionService.getAdminClient(serverId).describeCluster();
-            Collection<Node> nodes = describeClusterResult.nodes().get();
-            List<KafkaBroker> kafkaBrokers = new ArrayList<>();
-            nodes.forEach(node -> kafkaBrokers.add(KafkaBroker.builder()
-                    .host(node.host())
-                    .port(node.port())
-                    .port(node.port())
-                    .id(node.idString())
-                    .rack(node.rack())
-                    .build()));
-            loadJmxMetrics(serverId, kafkaBrokers);
-            Collections.sort(kafkaBrokers);
-            return BrokersDto.builder().brokers(kafkaBrokers).build();
-        } catch (Exception e) {
-            Thread.currentThread().interrupt();
-            throw new KouncilRuntimeException(e);
+        if (serverId != null && !serverId.isBlank()) {
+            try {
+                DescribeClusterResult describeClusterResult = kafkaConnectionService.getAdminClient(serverId).describeCluster();
+                Collection<Node> nodes = describeClusterResult.nodes().get();
+                List<KafkaBroker> kafkaBrokers = new ArrayList<>();
+                nodes.forEach(node -> kafkaBrokers.add(KafkaBroker.builder()
+                        .host(node.host())
+                        .port(node.port())
+                        .port(node.port())
+                        .id(node.idString())
+                        .rack(node.rack())
+                        .build()));
+                loadJmxMetrics(serverId, kafkaBrokers);
+                Collections.sort(kafkaBrokers);
+                return BrokersDto.builder().brokers(kafkaBrokers).build();
+            } catch (Exception e) {
+                Thread.currentThread().interrupt();
+                throw new KouncilRuntimeException(e);
+            }
         }
+        throw new KouncilRuntimeException("Clusters are not defined. Please register new clusters or reach out to your administrator for further information.");
     }
 
     private void loadJmxMetrics(String serverId, List<KafkaBroker> kafkaBrokers) {
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/config/security/ldap/CustomLdapAuthoritiesPopulator.java b/kouncil-backend/src/main/java/com/consdata/kouncil/config/security/ldap/CustomLdapAuthoritiesPopulator.java
@@ -14,9 +14,7 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.ldap.SpringSecurityLdapTemplate;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
-import org.springframework.stereotype.Component;
 
-@Component
 @Data
 public class CustomLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator {
 
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/config/security/sso/SSOWebSecurityConfig.java b/kouncil-backend/src/main/java/com/consdata/kouncil/config/security/sso/SSOWebSecurityConfig.java
@@ -68,6 +68,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .oauth2Login(oauth2 -> oauth2
                         .authorizationEndpoint(authEndpoint -> authEndpoint.authorizationRequestRepository(new InMemoryAuthRepository()))
                         .userInfoEndpoint(userInfo -> userInfo.userService(customUserService).userAuthoritiesMapper(this.authoritiesMapper()))
+                        .successHandler((HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) -> {})
                 )
                 .exceptionHandling(handling -> handling.authenticationEntryPoint(this::authenticationEntryPoint));
 
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/consumergroup/ConsumerGroupController.java b/kouncil-backend/src/main/java/com/consdata/kouncil/consumergroup/ConsumerGroupController.java
@@ -22,12 +22,6 @@ public class ConsumerGroupController {
 
     private final ConsumerGroupService consumerGroupService;
 
-    @RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_LIST)
-    @GetMapping
-    public ConsumerGroupsResponse getConsumerGroups(@RequestParam("serverId") String serverId) throws ExecutionException, InterruptedException {
-        return consumerGroupService.getConsumerGroups(serverId);
-    }
-
     @RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_DETAILS)
     @GetMapping("/{groupId}")
     public ConsumerGroupResponse getConsumerGroup(@PathVariable("groupId") String groupId, @RequestParam("serverId") String serverId)
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/consumergroup/ConsumerGroupsController.java b/kouncil-backend/src/main/java/com/consdata/kouncil/consumergroup/ConsumerGroupsController.java
@@ -1,43 +1,30 @@
 package com.consdata.kouncil.consumergroup;
 
-import com.consdata.kouncil.KafkaConnectionService;
+import com.consdata.kouncil.KouncilRuntimeException;
 import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
 import jakarta.annotation.security.RolesAllowed;
+import java.util.concurrent.ExecutionException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.admin.ConsumerGroupDescription;
-import org.apache.kafka.clients.admin.ConsumerGroupListing;
-import org.apache.kafka.clients.admin.ListConsumerGroupsResult;
-import org.apache.kafka.common.KafkaFuture;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
 @AllArgsConstructor
+@RequestMapping("/api/consumer-groups")
 public class ConsumerGroupsController {
 
-    private final KafkaConnectionService kafkaConnectionService;
+    private final ConsumerGroupService consumerGroupService;
 
     @RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_LIST)
-    @GetMapping("/api/consumer-groups")
+    @GetMapping
     public ConsumerGroupsResponse getConsumerGroups(@RequestParam("serverId") String serverId) throws ExecutionException, InterruptedException {
-        ConsumerGroupsResponse result = ConsumerGroupsResponse
-                .builder()
-                .consumerGroups(new ArrayList<>())
-                .build();
-        ListConsumerGroupsResult groups = kafkaConnectionService.getAdminClient(serverId).listConsumerGroups();
-        List<String> groupIds = groups.all().get().stream().map(ConsumerGroupListing::groupId).toList();
-        Map<String, KafkaFuture<ConsumerGroupDescription>> consumerGroupSummary = kafkaConnectionService.getAdminClient(serverId)
-                .describeConsumerGroups(groupIds).describedGroups();
-        for (Map.Entry<String, KafkaFuture<ConsumerGroupDescription>> entry : consumerGroupSummary.entrySet()) {
-            result.getConsumerGroups().add(ConsumerGroup.builder().groupId(entry.getKey()).status(entry.getValue().get().state().toString()).build());
+        if (serverId != null && !serverId.isBlank()) {
+            return consumerGroupService.getConsumerGroups(serverId);
         }
-        return result;
+        throw new KouncilRuntimeException("Clusters are not defined. Please register new clusters or reach out to your administrator for further information.");
     }
 }
diff --git a/kouncil-backend/src/main/java/com/consdata/kouncil/topic/TopicsController.java b/kouncil-backend/src/main/java/com/consdata/kouncil/topic/TopicsController.java
@@ -1,5 +1,6 @@
 package com.consdata.kouncil.topic;
 
+import com.consdata.kouncil.KouncilRuntimeException;
 import com.consdata.kouncil.logging.EntryExitLogger;
 import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
 import jakarta.annotation.security.RolesAllowed;
@@ -19,6 +20,9 @@ public class TopicsController {
     @GetMapping("/api/topics")
     @EntryExitLogger
     public TopicsDto getTopics(@RequestParam("serverId") String serverId) {
-        return topicsService.getTopics(serverId);
+        if (serverId != null && !serverId.isBlank()) {
+            return topicsService.getTopics(serverId);
+        }
+        throw new KouncilRuntimeException("Clusters are not defined. Please register new clusters or reach out to your administrator for further information.");
     }
 }
diff --git a/kouncil-backend/src/main/resources/kouncil.yaml b/kouncil-backend/src/main/resources/kouncil.yaml
@@ -32,8 +32,6 @@ kouncil:
         providers: github,okta
   topics:
     exclude-regex-patterns: __.*
-  survey:
-    base-path: "https://kouncil-eximee-survey-n22nwdfueq-lm.a.run.app/kouncil"
 
 spring:
   flyway:
diff --git a/kouncil-frontend/apps/kouncil/src/app/survey/survey.component.ts b/kouncil-frontend/apps/kouncil/src/app/survey/survey.component.ts
@@ -76,7 +76,6 @@ export class SurveyComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.surveyService.fetchSurvey$(this.router.url);
   }
 
   ngOnDestroy(): void {
diff --git a/kouncil-frontend/apps/kouncil/src/app/track/track-result/track-result.component.ts b/kouncil-frontend/apps/kouncil/src/app/track/track-result/track-result.component.ts
@@ -9,13 +9,11 @@ import {
   ViewChild,
 } from '@angular/core';
 import {Subscription} from 'rxjs';
-import {ActivatedRoute} from '@angular/router';
-import {Title} from '@angular/platform-browser';
 import {MessageViewComponent} from '../../topic/message/message-view.component';
 import {TrackService} from '../track.service';
 import {TrackFilter} from '../track-filter/track-filter';
 import {MessageData, MessageDataService} from '@app/message-data';
-import {Crypto, DrawerService, ProgressBarService, SearchService} from '@app/common-utils';
+import {Crypto, DrawerService, SearchService} from '@app/common-utils';
 import {NoDataPlaceholderComponent} from '@app/feat-no-data';
 import {ServersService} from '@app/common-servers';
 import {AbstractTableComponent, TableColumn} from '@app/common-components';
@@ -112,10 +110,7 @@ export class TrackResultComponent extends AbstractTableComponent implements OnIn
   ];
 
   constructor(
-    private route: ActivatedRoute,
     private searchService: SearchService,
-    private titleService: Title,
-    private progressBarService: ProgressBarService,
     private trackService: TrackService,
     private drawerService: DrawerService,
     private servers: ServersService,
@@ -300,8 +295,8 @@ export class TrackResultComponent extends AbstractTableComponent implements OnIn
           });
         });
 
-        this.parseObjectValues(items);
       }
+      this.parseObjectValues(items);
 
       let columns: TableColumn[] = [...this.commonColumns];
       if (gridColumns) {
diff --git a/kouncil-frontend/libs/common-servers/src/lib/servers/servers.backend.service.ts b/kouncil-frontend/libs/common-servers/src/lib/servers/servers.backend.service.ts
@@ -32,6 +32,11 @@ export class ServersBackendService extends ServersService {
             && this.servers.length > 0) {
             this.selectedServerId = this.servers[0].serverId;
           }
+
+          if (this.servers.length === 0) {
+            this.selectedServerId = null;
+          }
+
           this.updateServers(this.servers);
         }
         resolve(true);
diff --git a/kouncil-frontend/libs/common-utils/src/lib/util/http-client.interceptor.ts b/kouncil-frontend/libs/common-utils/src/lib/util/http-client.interceptor.ts
@@ -13,9 +13,6 @@ import {ProgressBarService} from './progress-bar.service';
 import {Router} from '@angular/router';
 import {SnackBarComponent} from './snack-bar.component';
 import {SnackBarData, SnackBarType} from './snack-bar-data';
-import {LoggerFactory} from '@consdata/logger-api';
-
-const log = LoggerFactory.getLogger('HttpClientInterceptor');
 
 @Injectable({
   providedIn: 'root'
@@ -30,12 +27,12 @@ export class HttpClientInterceptor implements HttpInterceptor {
     return next.handle(request)
     .pipe(
       catchError((error: HttpErrorResponse) => {
+        console.log(error)
         this.progressBarService.setProgress(false);
         if (error.status === 401 || error.status === 403) {
           this.router.navigate(['/login']);
           return null;
         } else {
-          log.error(JSON.stringify(error));
           const consoleErrorMessage = `Error Code: ${error.status}<br>Message: ${error.message}\nError message: ${error.error}`;
           this.snackBar.openFromComponent(SnackBarComponent, {
             data: new SnackBarData(error.error, SnackBarType.ERROR),
diff --git a/kouncil-frontend/libs/feat-clusters/src/lib/clusters/clusters.component.ts b/kouncil-frontend/libs/feat-clusters/src/lib/clusters/clusters.component.ts
@@ -194,7 +194,7 @@ export class ClustersComponent extends AbstractTableComponent implements OnInit,
         this.snackbar.openFromComponent(SnackBarComponent, {
           data: new SnackBarData(`Cluster ${clusterName} deleted`, SnackBarType.SUCCESS),
           panelClass: ['snackbar', 'snackbar-container-success'],
-          duration: 3000
+          duration: 1000
         });
         this.reloadServers();
       },
diff --git a/kouncil-frontend/libs/feat-topics/src/lib/topics/list/topics.component.scss b/kouncil-frontend/libs/feat-topics/src/lib/topics/list/topics.component.scss
@@ -27,6 +27,10 @@
     @include buttons.button-blue;
   }
 
+  .action-button-blue:disabled {
+    @include buttons.button-disabled;
+  }
+
   .action-button-white {
     @include buttons.button-white;
     @include buttons.table-button;
diff --git a/kouncil-frontend/libs/feat-topics/src/lib/topics/list/topics.component.ts b/kouncil-frontend/libs/feat-topics/src/lib/topics/list/topics.component.ts
@@ -31,7 +31,8 @@ const TOPICS_FAVOURITE_KEY = 'kouncil-topics-favourites';
     <div class="main-container" *ngIf="authService.canAccess([SystemFunctionName.TOPIC_CREATE])">
       <div class="toolbar-container">
         <div class="toolbar">
-          <button mat-button class="action-button-blue" (click)="createTopic()">
+          <button mat-button class="action-button-blue" (click)="createTopic()"
+                  [disabled]="serverNotSelected()">
             Create topic
           </button>
         </div>
@@ -285,4 +286,8 @@ export class TopicsComponent extends AbstractTableComponent implements OnInit, O
       }
     }));
   }
+
+  serverNotSelected(): boolean {
+    return this.servers.getSelectedServerId() === null;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {`
`68`	`68`	`.oauth2Login(oauth2 -> oauth2`
`69`	`69`	`.authorizationEndpoint(authEndpoint -> authEndpoint.authorizationRequestRepository(new InMemoryAuthRepository()))`
`70`	`70`	`.userInfoEndpoint(userInfo -> userInfo.userService(customUserService).userAuthoritiesMapper(this.authoritiesMapper()))`
	`71`	`+ .successHandler((HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) -> {})`
`71`	`72`	`)`
`72`	`73`	`.exceptionHandling(handling -> handling.authenticationEntryPoint(this::authenticationEntryPoint));`
`73`	`74`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ export class SurveyComponent implements OnInit, OnDestroy {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`ngOnInit(): void {`
`79`		`- this.surveyService.fetchSurvey$(this.router.url);`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`ngOnDestroy(): void {`