Revert unnecessary changes

Author: Haarolean

.dev/dev.yaml

@@ -3,6 +3,28 @@ name: "kafbat-ui-dev"
 
 services:
 
+  kafbat-ui:
+    container_name: kafbat-ui
+    image: ghcr.io/kafbat/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - kafka0
+      - schema-registry0
+      - kafka-connect0
+      - ksqldb0
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schema-registry0:8085
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
+      KAFKA_CLUSTERS_0_KSQLDBSERVER: http://ksqldb0:8088
+      DYNAMIC_CONFIG_ENABLED: 'true'
+      KAFKA_CLUSTERS_0_AUDIT_TOPICAUDITENABLED: 'true'
+      KAFKA_CLUSTERS_0_AUDIT_CONSOLEAUDITENABLED: 'true'
+
   kafka0:
     image: confluentinc/cp-kafka:7.8.0
     hostname: kafka0
@@ -26,8 +48,8 @@ services:
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
       KAFKA_JMX_PORT: 9997
-      KAFKA_JMX_HOSTNAME: localhost # uncomment this line and comment the next one if running with kafka-ui as a jar
-#      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+#      KAFKA_JMX_HOSTNAME: localhost # uncomment this line and comment the next one if running with kafka-ui as a jar
+      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
       CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
 
   schema-registry0:
@@ -69,9 +91,7 @@ services:
       CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
-      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components,/usr/share/filestream-connectors,/tmp/connectors"
-    volumes:
-      - /tmp/connectors:/tmp/connectors
+      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components,/usr/local/share/kafka/plugins,/usr/share/filestream-connectors"
 
   ksqldb0:
     image: confluentinc/cp-ksqldb-server:7.8.0

api/src/main/java/io/kafbat/ui/util/DynamicConfigOperations.java

@@ -65,7 +65,7 @@ public boolean dynamicConfigEnabled() {
     return "true".equalsIgnoreCase(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY));
   }
 
-  public Path dynamicConfigFilePath() {
+  private Path dynamicConfigFilePath() {
     return Paths.get(
         Optional.ofNullable(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_PATH_ENV_PROPERTY))
             .orElse(DYNAMIC_CONFIG_PATH_ENV_PROPERTY_DEFAULT)

api/src/main/resources/application-local.yml

@@ -22,8 +22,7 @@ spring:
     user-filter-search-filter: "(&(uid={0})(objectClass=inetOrgPerson))"
     group-filter-search-base: "ou=people,dc=planetexpress,dc=com"
 
-
-kaf1ka:
+kafka:
   clusters:
     - name: local
       bootstrapServers: localhost:9092
@@ -82,7 +81,7 @@ auth:
           type: github
 
 rbac:
-  ro1les:
+  roles:
     - name: "memelords"
       clusters:
         - local

frontend/build.gradle

@@ -33,3 +33,14 @@ tasks.register('generateContract', PnpmTask) {
   outputs.dir(project.layout.projectDirectory.dir("src/generated-sources"))
   args = ['gen:sources']
 }
+
+tasks.register('buildFrontend', PnpmTask) {
+  dependsOn generateContract
+  inputs.files(fileTree("src/"))
+  outputs.dir(project.layout.buildDirectory.dir("vite/static"))
+  args = ['build']
+  environment = System.getenv() + [
+    "VITE_TAG"   : project.version,
+    "VITE_COMMIT": "git rev-parse --short HEAD".execute().text.trim()
+  ]
+}