check if startQuery error is a string/message and use it instead

ingef · Jan 13, 2025 · 5c7b2cf · 5c7b2cf
1 parent 4754f71
commit 5c7b2cf
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 9 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java
@@ -1,12 +1,12 @@
 package com.bakdata.conquery.io.jetty;
 
-import com.bakdata.conquery.models.error.ConqueryError;
-import com.bakdata.conquery.models.error.SimpleErrorInfo;
-
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 
+import com.bakdata.conquery.models.error.ConqueryError;
+import com.bakdata.conquery.models.error.SimpleErrorInfo;
+
 public class ConqueryErrorExceptionMapper implements ExceptionMapper<ConqueryError> {
     @Override
     public Response toResponse(ConqueryError exception) {

diff --git a/cypress/e2e/frontend/test_1_runQuery.cy.js b/cypress/e2e/frontend/test_1_runQuery.cy.js
@@ -61,6 +61,30 @@ describe("Run query", () => {
     cy.get('@executionList').find('[data-test-id="project-item-delete-button"]').click();
     cy.get('@executionList').contains('Anfrage jetzt löschen').click();
   });
+
+  it("Check user error message", () => {
+    cy.get('[data-test-id="right-pane-container"] >div:visible').as("queryEditor");
+
+    // Drag concept to editor
+    cy.contains("MultiConnector").trigger("dragstart").trigger("dragleave");
+    cy.get("@queryEditor")
+      .trigger("dragenter")
+      .trigger("dragover")
+      .trigger("drop")
+      .trigger("dragend");
+
+    // Switch to secondary id mode
+    cy.get("@queryEditor").contains("Secondary Id").click()
+
+    // Exclude only concept from secondary id to create an invalid query
+    cy.get("@queryEditor").find('[data-test-id="secondary-id-toggle"]').click()
+
+    // Start query
+    cy.get("@queryEditor").find('[data-test-id="query-runner-button"]').click();
+
+    // Check for specific user error message
+    cy.get('[data-test-id="query-runner"]').contains("Die ausgewählte Analyseebenen konnte in keinem der ausgewählten Konzepten gefunden werden.")
+  })
 });
 
 describe("Reference list", () => {

diff --git a/cypress/support/test_data/sid.secondaryId.json b/cypress/support/test_data/sid.secondaryId.json
@@ -0,0 +1,5 @@
+{
+    "description": "SecondaryId for Dicing",
+    "label": "Secondary Id",
+    "name": "sid"
+}
diff --git a/cypress/support/test_data/table1.csv b/cypress/support/test_data/table1.csv
@@ -1,2 +1,2 @@
-id,STRING
-1,abc
+id,sid,STRING
+1,a,abc
diff --git a/cypress/support/test_data/table1.import.json b/cypress/support/test_data/table1.import.json
@@ -8,6 +8,12 @@
                     "inputType": "STRING",
                     "operation": "COPY"
                 },
+                {
+                    "inputColumn": "sid",
+                    "name": "sid",
+                    "inputType": "STRING",
+                    "operation": "COPY"
+                },
                 {
                     "inputColumn": "STRING",
                     "name": "STRING",

diff --git a/cypress/support/test_data/table1.table.json b/cypress/support/test_data/table1.table.json
@@ -5,6 +5,11 @@
             "name": "id",
             "type": "STRING"
         },
+        {
+            "name": "sid",
+            "type": "STRING",
+            "secondaryId": "sid"
+        },
         {
             "name": "STRING",
             "type": "STRING"

diff --git a/frontend/src/js/query-runner/QueryRunner.tsx b/frontend/src/js/query-runner/QueryRunner.tsx
@@ -67,7 +67,7 @@ const QueryRunner = ({
   );
 
   return (
-    <Root>
+    <Root data-test-id="query-runner">
       <Left>
         <WithTooltip text={buttonTooltip}>
           <QueryRunnerButton

diff --git a/frontend/src/js/query-runner/QueryRunnerInfo.tsx b/frontend/src/js/query-runner/QueryRunnerInfo.tsx
@@ -20,7 +20,11 @@ interface PropsT {
 const useMessage = (queryRunner: QueryRunnerStateT) => {
   const { t } = useTranslation();
 
-  if (queryRunner.startQuery.error) {
+  const error = queryRunner.startQuery.error
+  if (error) {
+    // Maybe use type guard here
+    if (typeof error === 'string' && error.trim().length > 0)
+      return { type: "error", value: error };
     return { type: "error", value: t("queryRunner.startError") };
   } else if (queryRunner.stopQuery.error) {
     return { type: "error", value: t("queryRunner.stopError") };

diff --git a/frontend/src/js/standard-query-editor/QueryNodeActions.tsx b/frontend/src/js/standard-query-editor/QueryNodeActions.tsx
@@ -112,6 +112,7 @@ const QueryNodeActions = (props: Props) => {
           <RelativeContainer>
             <StyledIconButton
               icon={faMicroscope}
+              data-test-id="secondary-id-toggle"
               onClick={(e) => {
                 e.stopPropagation();
                 props.onToggleSecondaryIdExclude(props.andIdx, props.orIdx);

diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>${java.required}</source>
-					<target>${java.required}</target>
+					<release>${java.required}</release>
 					<parameters>true</parameters>
 				</configuration>
 			</plugin>

diff --git a/scripts/load_e2e_data.sh b/scripts/load_e2e_data.sh
@@ -33,6 +33,10 @@ echo "Creating mappings"
 curl --fail -X POST  "$admin_api/datasets/dataset1/internToExtern" -H "$h_ct" -H "$h_auth" -d "@./cypress/support/test_data/mapping.mapping.json"
 sleep 3
 
+echo "Creating secondary ids"
+curl --fail -X POST  "$admin_api/datasets/dataset1/secondaryId" -H "$h_ct" -H "$h_auth" -d "@./cypress/support/test_data/sid.secondaryId.json"
+sleep 1
+
  # TODO secondary ID
 echo "Creating tables"
 for table_json in `ls ./cypress/support/test_data/*.table.json`