Merge branch 'main' into issues/300-regex-for-rbac

Author: Haarolean

.github/workflows/branch-deploy.yml

@@ -62,7 +62,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/build-public-image.yml

@@ -61,7 +61,7 @@ jobs:
           registry-type: 'public'
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/cve_checks.yml

@@ -53,7 +53,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/docker_build.yml

@@ -60,7 +60,7 @@ jobs:
 
       - name: Build docker image
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/e2e-run.yml

@@ -28,7 +28,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'
@@ -76,7 +76,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'

.github/workflows/separate_env_public_create.yml

@@ -62,7 +62,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

api/src/main/java/io/kafbat/ui/model/rbac/Role.java

@@ -14,10 +14,10 @@ public class Role {
   List<Permission> permissions;
 
   public void validate() {
-    checkArgument(!clusters.isEmpty(), "Role clusters cannot be empty");
-    checkArgument(!subjects.isEmpty(), "Role subjects cannot be empty");
-    permissions.forEach(Permission::transform);
+    checkArgument(clusters != null && !clusters.isEmpty(), "Role clusters cannot be empty");
+    checkArgument(subjects != null && !subjects.isEmpty(), "Role subjects cannot be empty");
     permissions.forEach(Permission::validate);
+    permissions.forEach(Permission::transform);
     subjects.forEach(Subject::validate);
   }
 

build.gradle

@@ -28,16 +28,14 @@ subprojects {
 
 boolean resolveBooleanProperty(String propertyName, boolean defaultValue = false) {
     def propertyValueStr = findProperty(propertyName)
-    return propertyValueStr == null ? defaultValue : propertyValueStr.toBoolean();
+    return propertyValueStr == null ? defaultValue : propertyValueStr.toBoolean()
 }
 
 ext {
     release = resolveBooleanProperty("release")
     includeFrontend = resolveBooleanProperty("include-frontend", release)
     buildDockerImages = resolveBooleanProperty("build-docker-images", release)
     runE2e = resolveBooleanProperty("run-e2e")
-    e2eHeadlessOff = resolveBooleanProperty("e2e-headless-off")
-    e2eSelenoidOff = resolveBooleanProperty("e2e-selenoid-off")
 }
 
 sonar {

e2e-tests/README.md

@@ -40,7 +40,7 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 2. To run test suite select its name (options: `regression`, `sanity`, `smoke`) and put it instead %s into command below
 
 ```
-./mvnw -Dsurefire.suiteXmlFiles='src/test/resources/%s.xml' -f 'e2e-tests' test -Pprod
+./gradlew :e2e-tests:test -Prun-e2e=true -Psuite_name=%s
 ```
 
 ### Reporting

e2e-tests/build.gradle

@@ -52,8 +52,6 @@ test {
             suiteXmlFiles = [suitePath.toFile()]
         }
 
-        systemProperty "headless", e2eHeadlessOff
-        systemProperty "selenoid", e2eSelenoidOff
         systemProperty "allure.results.directory",
                 project.layout.buildDirectory.dir("allure-results").get().getAsFile().getAbsolutePath()
     }

e2e-tests/src/main/java/io/kafbat/ui/screens/connectors/ConnectorDetails.java

@@ -21,7 +21,7 @@ public class ConnectorDetails extends BasePage {
   @Step
   public ConnectorDetails waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    dotMenuBtn.shouldBe(Condition.visible);
+    taskTab.shouldBe(Condition.visible);
     return this;
   }
 
@@ -48,7 +48,7 @@ public ConnectorDetails clickSubmitButton() {
 
   @Step
   public ConnectorDetails openDotMenu() {
-    WebUtil.clickByJavaScript(dotMenuBtn);
+    WebUtil.clickByActions(dotMenuBtn);
     return this;
   }
 

e2e-tests/src/main/java/io/kafbat/ui/screens/schemas/SchemaDetails.java

@@ -61,7 +61,7 @@ public SchemaDetails openCompareVersionMenu() {
 
   @Step
   public SchemaDetails removeSchema() {
-    WebUtil.clickByJavaScript(dotMenuBtn);
+    WebUtil.clickByActions(dotMenuBtn);
     removeBtn.shouldBe(Condition.enabled).click();
     schemaConfirmBtn.shouldBe(Condition.visible).click();
     schemaConfirmBtn.shouldBe(Condition.disappear);

e2e-tests/src/main/java/io/kafbat/ui/screens/topics/TopicDetails.java

@@ -91,7 +91,7 @@ public String getSettingsGridValueByKey(String key) {
 
   @Step
   public TopicDetails openDotMenu() {
-    WebUtil.clickByJavaScript(dotMenuBtn);
+    WebUtil.clickByActions(dotMenuBtn);
     return this;
   }
 

e2e-tests/src/main/java/io/kafbat/ui/settings/BaseSource.java

@@ -7,11 +7,12 @@
 public abstract class BaseSource {
 
   public static final boolean HEADLESS = parseBoolean(getOptionalString(TRUE, System.getProperty("headless")));
+  public static final boolean SELENOID = parseBoolean(getOptionalString(TRUE, System.getProperty("selenoid")));
   public static final String CLUSTER_NAME = "local";
   public static final String CONNECT_NAME = "first";
   private static final String LOCAL_HOST = "localhost";
   public static final String REMOTE_URL = String.format("http://%s:4444/wd/hub", LOCAL_HOST);
   public static final String BASE_API_URL = String.format("http://%s:8080", LOCAL_HOST);
-  public static final String BASE_HOST = "host.docker.internal";
+  public static final String BASE_HOST = SELENOID ? "host.docker.internal" : LOCAL_HOST;
   public static final String BASE_UI_URL = String.format("http://%s:8080", BASE_HOST);
 }

e2e-tests/src/main/java/io/kafbat/ui/settings/drivers/WebDriver.java

@@ -38,17 +38,17 @@ public static void browserSetup() {
         .addArguments("--disable-gpu")
         .addArguments("--no-sandbox")
         .addArguments("--lang=en_US");
-
-    Configuration.remote = BaseSource.REMOTE_URL;
-    Configuration.remoteConnectionTimeout = 180000;
-    Configuration.remoteReadTimeout = 180000;
-    Map<String, Object> selenoidOptions = new HashMap<>();
-    selenoidOptions.put("enableVNC", true);
-    selenoidOptions.put("enableLog", true);
-    selenoidOptions.put("enableVideo", false);
-    selenoidOptions.put("sessionTimeout", "30m");
-    chromeOptions.setCapability("selenoid:options", selenoidOptions);
-
+    if (BaseSource.SELENOID) {
+      Configuration.remote = BaseSource.REMOTE_URL;
+      Configuration.remoteConnectionTimeout = 180000;
+      Configuration.remoteReadTimeout = 180000;
+      Map<String, Object> selenoidOptions = new HashMap<>();
+      selenoidOptions.put("enableVNC", true);
+      selenoidOptions.put("enableLog", true);
+      selenoidOptions.put("enableVideo", false);
+      selenoidOptions.put("sessionTimeout", "30m");
+      chromeOptions.setCapability("selenoid:options", selenoidOptions);
+    }
     Configuration.browserCapabilities = chromeOptions;
   }
 

frontend/package.json

@@ -15,17 +15,17 @@
     "ace-builds": "1.33.0",
     "ajv": "8.8.2",
     "ajv-draft-04": "^1.0.0",
-    "ajv-formats": "2.1.1",
+    "ajv-formats": "3.0.1",
     "json-schema-faker": "0.5.6",
-    "jsonpath-plus": "10.2.0",
+    "jsonpath-plus": "10.3.0",
     "lossless-json": "2.0.11",
     "pretty-ms": "7.0.1",
     "react": "18.2.0",
     "react-ace": "11.0.1",
     "react-datepicker": "7.4.0",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.13",
-    "react-hook-form": "7.51.3",
+    "react-hook-form": "7.54.2",
     "react-hot-toast": "2.4.1",
     "react-is": "18.2.0",
     "react-multi-select-component": "4.3.4",
@@ -70,7 +70,7 @@
     "@types/react-router-dom": "5.3.3",
     "@types/styled-components": "5.1.34",
     "@types/testing-library__jest-dom": "5.14.9",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/eslint-plugin": "7.0.0",
     "@typescript-eslint/parser": "6.21.0",
     "@vitejs/plugin-react-swc": "3.6.0",
     "dotenv": "16.4.5",
@@ -97,7 +97,7 @@
     "ts-node": "10.9.2",
     "ts-prune": "0.10.3",
     "typescript": "5.3.3",
-    "vite": "5.2.14",
+    "vite": "6.2.1",
     "vite-plugin-checker": "0.6.4",
     "vite-plugin-ejs": "1.7.0",
     "vite-tsconfig-paths": "4.3.2",