Browse Source

Subsribed to change topics methods, replaced path of ts class

Roman Nedzvetskiy 5 years ago
parent
commit
891b4cfcac

+ 1 - 1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/ClustersMetricsScheduler.java

@@ -26,7 +26,7 @@ public class ClustersMetricsScheduler {
                 .subscribeOn(Schedulers.parallel())
                 .subscribeOn(Schedulers.parallel())
                 .map(Map.Entry::getValue)
                 .map(Map.Entry::getValue)
                 .flatMap(metricsUpdateService::updateMetrics)
                 .flatMap(metricsUpdateService::updateMetrics)
-                .doOnNext(s -> clustersStorage.setKafkaCluster(s.getId(), s))
+                .doOnNext(s -> clustersStorage.setKafkaCluster(s.getName(), s))
                 .subscribe();
                 .subscribe();
     }
     }
 }
 }

+ 2 - 2
kafka-ui-api/src/main/java/com/provectus/kafka/ui/kafka/KafkaService.java

@@ -270,7 +270,7 @@ public class KafkaService {
     private void incrementalAlterConfig(TopicFormData topicFormData, ConfigResource topicCR, ExtendedAdminClient ac) {
     private void incrementalAlterConfig(TopicFormData topicFormData, ConfigResource topicCR, ExtendedAdminClient ac) {
         List<AlterConfigOp> listOp = topicFormData.getConfigs().entrySet().stream()
         List<AlterConfigOp> listOp = topicFormData.getConfigs().entrySet().stream()
                 .flatMap(cfg -> Stream.of(new AlterConfigOp(new ConfigEntry(cfg.getKey(), cfg.getValue()), AlterConfigOp.OpType.SET))).collect(Collectors.toList());
                 .flatMap(cfg -> Stream.of(new AlterConfigOp(new ConfigEntry(cfg.getKey(), cfg.getValue()), AlterConfigOp.OpType.SET))).collect(Collectors.toList());
-        ac.getAdminClient().incrementalAlterConfigs(Collections.singletonMap(topicCR, listOp));
+        ClusterUtil.toMono(ac.getAdminClient().incrementalAlterConfigs(Collections.singletonMap(topicCR, listOp)).all()).subscribe();
     }
     }
 
 
     private void alterConfig(TopicFormData topicFormData, ConfigResource topicCR, ExtendedAdminClient ac) {
     private void alterConfig(TopicFormData topicFormData, ConfigResource topicCR, ExtendedAdminClient ac) {
@@ -278,6 +278,6 @@ public class KafkaService {
                 .flatMap(cfg -> Stream.of(new ConfigEntry(cfg.getKey(), cfg.getValue()))).collect(Collectors.toList());
                 .flatMap(cfg -> Stream.of(new ConfigEntry(cfg.getKey(), cfg.getValue()))).collect(Collectors.toList());
         Config config = new Config(configEntries);
         Config config = new Config(configEntries);
         Map<ConfigResource, Config> map = Collections.singletonMap(topicCR, config);
         Map<ConfigResource, Config> map = Collections.singletonMap(topicCR, config);
-        ac.getAdminClient().alterConfigs(map);
+        ClusterUtil.toMono(ac.getAdminClient().alterConfigs(map).all()).subscribe();
     }
     }
 }
 }

+ 0 - 0
kafka-ui-react-app/src/components/Topics/New/TimeToRetainBtn.tsx → kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtn.tsx


+ 0 - 0
kafka-ui-react-app/src/components/Topics/New/TimeToRetainBtns.tsx → kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx