From cb72fd9ffca6da4036bd0402de6112e1ba9404e3 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:53:19 +0100
Subject: [PATCH 01/86] first draft draft of an OpenAPI spec

---
 .../com/bakdata/conquery/apiv1/IdLabel.java   |   2 +
 openapi.yaml                                  | 177 ++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 openapi.yaml

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java b/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java
index 2dc0857dc0..39fe58b4ba 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java
@@ -6,6 +6,7 @@
 import com.bakdata.conquery.models.identifiable.ids.Id;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 
 /**
  * Container class for the frontend to provide a tuple of id and a corresponding label.
@@ -14,6 +15,7 @@
  */
 @Getter
 @RequiredArgsConstructor
+@ToString
 public class IdLabel<I extends Id<?>> implements Comparable<IdLabel<I>> {
 	@NotEmpty
 	private final I id;
diff --git a/openapi.yaml b/openapi.yaml
new file mode 100644
index 0000000000..d5b0415059
--- /dev/null
+++ b/openapi.yaml
@@ -0,0 +1,177 @@
+openapi: 3.1.3
+info:
+  version: 1.0.0
+  title: Conquery API
+  description: Conquery API
+  license:
+    name: TODO
+    url: http://TODO/
+securityDefinitions:
+  Bearer:
+    type: apiKey
+    name: Authorization
+    in: header
+components:
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+    Ingef:
+      type: http
+      scheme: bearer
+      
+  responses:
+    unauthorized:
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/error"
+      description: The user is not logged in.
+  schemas:
+    mail:
+      type: string
+      format: mail
+    column-config:
+      type: object
+      properties:
+        name:
+          description: Name of the Column-Config to be used when resolving with Upload.
+          type: string
+        label:
+          description: Map of Localized labels.
+          type: object
+          items:
+            type: string
+        description:
+          description: Map of Localized descriptions.
+          type: object
+          items:
+            type: string
+        field:
+          type: string
+          description: Name of column in csv
+      additionalProperties:
+        properties:
+          pad:
+            description: Pad-String when uploading data, to avoid problems with some tools truncating leading zeros or similar.
+            type: string
+          length:
+            description: In conjunction with pad, the length of the padded string.
+            type: integer
+          resolvable:
+            description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
+            type: boolean
+          print:
+            description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
+            type: boolean
+          fillAnon:
+            description: True, if the field will be used to fill with anonymized ids, when the user is not allowed seeing real ids.
+            type: boolean
+    upload-config:
+      description: Describes the format of ids for EXTERNAL and entity-preview id kinds. Also describes the output format for ids in the result files.
+      type: object
+      properties:
+        ids:
+          type: array
+          items:
+            $ref: "#/components/schemas/column-config"
+
+    currency-config:
+      description: Describes how the frontend shall interpret and display currency values.
+      type: object
+      properties:
+        prefix:
+          type: string
+        thousandSeparator:
+          type: string
+        decimalSeparator:
+          type: string
+        decimalScale:
+          type: string
+
+    frontend-config:
+      type: object
+      properties:
+        version:
+          type: string
+        manualUrl:
+          type: string
+          format: url
+        contactEmail:
+          $ref: "#/components/schemas/mail"
+        currency:
+          $ref: "#/components/schemas/currency-config"
+        upload:
+          $ref: "#/components/schemas/upload-config"
+    id:
+      type: string
+    error:
+      type: object
+      properties:
+        message:
+          type: string
+        code:
+          type: string
+    id-label:
+      type: object
+      properties:
+        id:
+          $ref: "#/components/schemas/id"
+        label:
+          type: string
+    datasetAbility:
+      type: object
+      properties:
+        canUpload:
+          type: boolean
+    me:
+      type: object
+      properties:
+        userName:
+          type: string
+        hideLogoutButton:
+          type: boolean
+        datasetAbilities:
+          description: per dataset abilities of the logged in User.
+          type: object
+          additionalProperties:
+            $ref: "#/components/schemas/datasetAbility"
+        groups:
+          type: array
+          items:
+            $ref: "#/components/schemas/id-label"
+
+security:
+  - BasicAuth: []
+  - Bearer: []
+
+servers:
+  - url: http://lyo-peva02:8080/api
+paths:
+  /frontend/config:
+    get:
+      summary: An Endpoint describing configuration for the frontend.
+      operationId: get-frontend-config
+      responses:
+        "200":
+          description: The Configuration for the Frontend
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/frontend-config"
+        "401":
+          $ref: "#/components/responses/unauthorized"
+
+  /me:
+    get:
+      operationId: get-me
+      summary: Fetches description of the currently logged in user
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/me"
+          description: Description of the user
+        "401":
+          $ref: "#/components/responses/unauthorized"

From 24bed104c0aaf06994e5d98e5b141f4d2da2a853 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 16 Nov 2022 10:48:48 +0100
Subject: [PATCH 02/86] more work on openapi.yaml

---
 .../resources/api/ConceptResource.java        |  4 +-
 openapi.yaml                                  | 90 +++++++++++++++++--
 2 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java
index bceb2c9203..02e515c088 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java
@@ -29,6 +29,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Produces({ ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING })
 @Consumes({ ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING })
@@ -56,7 +57,7 @@ public Response getNode() {
 	public ResolvedConceptsResult resolve(@NotNull ConceptCodeList conceptCodes) {
 		List<String> codes = conceptCodes.getConcepts().stream().map(String::trim).collect(Collectors.toList());
 
-		if (concept instanceof TreeConcept) {
+		if (concept instanceof TreeConcept treeConcept && treeConcept.countElements() > 1) {
 			return processor.resolveConceptElements((TreeConcept) concept, codes);
 		}
 		throw new WebApplicationException("can only resolved elements on tree concepts", Status.BAD_REQUEST);
@@ -66,6 +67,7 @@ public ResolvedConceptsResult resolve(@NotNull ConceptCodeList conceptCodes) {
 	@Getter
 	@Setter
 	@RequiredArgsConstructor(onConstructor_ = @JsonCreator)
+	@ToString
 	public static class ConceptCodeList {
 		private final List<String> concepts;
 	}
diff --git a/openapi.yaml b/openapi.yaml
index d5b0415059..bc9a89b4f5 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.3
+openapi: 3.0.0
 info:
   version: 1.0.0
   title: Conquery API
@@ -6,11 +6,6 @@ info:
   license:
     name: TODO
     url: http://TODO/
-securityDefinitions:
-  Bearer:
-    type: apiKey
-    name: Authorization
-    in: header
 components:
   securitySchemes:
     BasicAuth:
@@ -28,6 +23,54 @@ components:
             $ref: "#/components/schemas/error"
       description: The user is not logged in.
   schemas:
+    id:
+      type: string
+    tableId:
+      $ref: "#/components/schemas/id"
+    filterId:
+      $ref: "#/components/schemas/id"
+    conceptId:
+      $ref: "#/components/schemas/id"
+    executionId:
+      $ref: "#/components/schemas/id"
+    
+    feValue:
+      type: object
+      properties:
+        value: 
+          type: string
+        label:
+          type: string
+        optionValue:
+          type: string
+      required:
+        - "value"
+    resolved-filter-result:
+      type: object
+      properties:
+        tableId:
+          $ref: "#/components/schemas/tableId"
+        filterId:
+          $ref: "#/components/schemas/filterId"
+        value:
+          type: array
+          items:
+            $ref: "#/components/schemas/feValue"
+    resolved-concepts-result:
+      type: object
+      properties:
+        resolvedConcepts:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+        unkownCodes:
+          type: array
+          uniqueItems: true
+          items:
+            type: string
+        resolvedFilter:
+          $ref: "#/components/responses/resolved-filter-result"
     mail:
       type: string
       format: mail
@@ -112,6 +155,14 @@ components:
           type: string
         code:
           type: string
+    concept-code-list:
+      type: object
+      properties:
+        concepts:
+          type: array
+          items:
+            type: string
+        
     id-label:
       type: object
       properties:
@@ -175,3 +226,30 @@ paths:
           description: Description of the user
         "401":
           $ref: "#/components/responses/unauthorized"
+
+  /datasets/{dataset}/concepts/{concept}/resolve/:
+    post:
+      operationId: resolve-concepts
+      summary: Resolve values to concept-ids
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/concept-code-list"
+      responses:
+        '400':
+            description: When the requested Concept does not have children.
+            content:
+              application/json:
+                schema:
+                  $ref: "#/components/responses/unauthorized"
+        '200':
+          description: Resolved Concepts
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/responses/unauthorized"
+
+ 
+            

From 32d3b032c452d3e1b45df79d770863be6f1492c8 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 21 Nov 2022 10:48:59 +0100
Subject: [PATCH 03/86] fixes reference of schemsa

---
 openapi.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index bc9a89b4f5..a6d37c3724 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -70,7 +70,7 @@ components:
           items:
             type: string
         resolvedFilter:
-          $ref: "#/components/responses/resolved-filter-result"
+          $ref: "#/components/schemas/resolved-filter-result"
     mail:
       type: string
       format: mail
@@ -146,8 +146,6 @@ components:
           $ref: "#/components/schemas/currency-config"
         upload:
           $ref: "#/components/schemas/upload-config"
-    id:
-      type: string
     error:
       type: object
       properties:
@@ -240,16 +238,12 @@ paths:
       responses:
         '400':
             description: When the requested Concept does not have children.
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/responses/unauthorized"
         '200':
           description: Resolved Concepts
           content:
             application/json:
               schema:
-                $ref: "#/components/responses/unauthorized"
+                $ref: "#/components/schemas/resolved-concepts-result"
 
  
             

From b9c1b5f7058fd7bf0c4e37930a4ef92a4bc3761d Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 21 Nov 2022 14:24:51 +0100
Subject: [PATCH 04/86] Update openapi.yaml

---
 openapi.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openapi.yaml b/openapi.yaml
index a6d37c3724..4d671ca6bf 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -195,7 +195,7 @@ security:
   - Bearer: []
 
 servers:
-  - url: http://lyo-peva02:8080/api
+  - url: http://localhost:8080/api
 paths:
   /frontend/config:
     get:

From c2d5e6bdb63719e8c1dcbf040681672e4fd4c818 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 13 Dec 2022 11:06:34 +0100
Subject: [PATCH 05/86] more work towards openapi

---
 openapi.yaml | 480 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 473 insertions(+), 7 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index a6d37c3724..312cd41689 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -7,6 +7,7 @@ info:
     name: TODO
     url: http://TODO/
 components:
+
   securitySchemes:
     BasicAuth:
       type: http
@@ -14,7 +15,13 @@ components:
     Ingef:
       type: http
       scheme: bearer
-      
+  parameters:
+    dataset:
+      in: path
+      name: dataset
+      required: true
+      schema:
+        $ref: "#/components/schemas/datasetId"
   responses:
     unauthorized:
       content:
@@ -29,10 +36,44 @@ components:
       $ref: "#/components/schemas/id"
     filterId:
       $ref: "#/components/schemas/id"
+    datasetId:
+      $ref: "#/components/schemas/id"
+    selectId:
+      $ref: "#/components/schemas/id"
     conceptId:
       $ref: "#/components/schemas/id"
+    connectorId:
+      $ref: "#/components/schemas/id"
+    secondaryIdId:
+      $ref: "#/components/schemas/id"
+    columnId:
+      $ref: "#/components/schemas/id"
     executionId:
       $ref: "#/components/schemas/id"
+    userId:
+      $ref: "#/components/schemas/id"
+    dateTime: #TODO
+      type: string
+      format: date-time
+    date: #TODO
+      type: string
+      format: date
+    query-state:
+      type: string
+      enum:
+        - NEW
+        - RUNNING
+        - FAILED
+        - DONE
+
+    fe-dataset-id:
+      type: object
+      properties:
+        id: 
+          $ref: "#/components/schemas/datasetId"
+        label:
+          type: string
+        
     
     feValue:
       type: object
@@ -190,12 +231,265 @@ components:
           items:
             $ref: "#/components/schemas/id-label"
 
+    query-status:
+      type: object
+      properties:
+        label:
+          type: string
+        isPristineLabel:
+          type: boolean
+        tags:
+          type: array
+          items:
+            type: string
+          uniqueItems: true
+        createdAt:
+          $ref: "#/components/schemas/dateTime"
+        lastUsed::
+          $ref: "#/components/schemas/dateTime"
+        owner:
+          $ref: "#/components/schemas/userId"
+        
+
+        ownerName:
+          type: string
+        shared:
+          type: boolean
+        own:
+          type: boolean
+        system:
+          type: boolean
+        id:
+          $ref: "#/components/schemas/executionId"
+        status:
+          $ref: "#/components/schemas/query-state"
+        numberOfResults:
+          type: integer
+        requiredTime:
+          type: integer
+        startTime:
+          $ref: "#/components/schemas/dateTime"
+        finishTime:
+          $ref: "#/components/schemas/dateTime"
+        queryType:
+          type: string # TODO use discriminator from Query
+        secondaryId:
+          $ref: "#/components/schemas/secondaryIdId"
+        resultUrls:
+          type: array
+          items:
+            type: string #TODO url?
+
+    labeled:
+      type: object
+      properties:
+        name: 
+          type: string
+        label: 
+          type: string
+
+    secondaryId:
+      allOf:
+        - $ref: "#/components/schemas/labeled"
+        - type: object
+          properties:
+            description: 
+              type: string
+    column-type:
+      oneOf:
+        - type: string
+          enum:
+            - STRING
+            - INTEGER
+            - BOOLEAN
+            - REAL
+            - DECIMAL
+            - MONEY
+            - DATE
+            - DATE_RANGE
+        - type: string
+          format: "LIST[.*]"
+
+    semantic-event-date: #TODO descriptions for all
+      type: object
+    semantic-sources:
+      type: object
+    semantic-categorical:
+      type: object
+    semantic-group:
+      type: object
+    semantic-hidden:
+      type: object
+    semantic-select:
+      type: object
+      properties:
+        select:
+          $ref: "#/components/schemas/selectId"
+    semantic-concept-column:
+      type: object
+      properties:
+        concept:
+          $ref: "#/components/schemas/conceptId"
+    semantic-column:
+      type: object
+      properties:
+        concept:
+          $ref: "#/components/schemas/columnId"
+    
+    semantic-id:
+      type: object
+      properties:
+        kind: 
+          type: string
+
+    semantic-secondaryId:
+      type: object
+      properties:
+        secondaryId:
+          $ref: "#/components/schemas/secondaryIdId"
+      
+    semantics:
+      type: object
+      discriminator:
+        propertyName: type
+        mapping:
+          EVENT_DATE: "#/components/schemas/semantic-event-date"
+          SOURCES: "#/components/schemas/semantic-sources"
+          CATEGORICAL: "#/components/schemas/semantic-categorical"
+          GROUP: "#/components/schemas/semantic-group"
+          HIDDEN: "#/components/schemas/semantic-hidden"
+          SELECT: "#/components/schemas/semantic-select"
+          CONCEPT_COLUMN: "#/components/schemas/semantic-concept-column"
+          COLUMN: "#/components/schemas/semantic-column"
+      allOf:
+        - type: object
+          properties:
+            type:
+              type: string
+      oneOf:
+        - $ref: "#/components/schemas/semantic-event-date"
+        - $ref: "#/components/schemas/semantic-sources"
+        - $ref: "#/components/schemas/semantic-categorical"
+        - $ref: "#/components/schemas/semantic-group"
+        - $ref: "#/components/schemas/semantic-hidden"
+        - $ref: "#/components/schemas/semantic-select"
+        - $ref: "#/components/schemas/semantic-concept-column"
+        - $ref: "#/components/schemas/semantic-column"
+
+        
+
+    column-description:
+      type: object
+      properties:
+        label:
+          type: string
+        description:
+          type: string
+        defaultLabel:
+          type: string
+        type:
+          $ref: "#/components/schemas/column-type"
+        semantics:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/semantics"
+    date-range:
+      type: object
+      properties:
+        min:
+          $ref: "#/components/schemas/date"
+        max:
+          $ref: "#/components/schemas/date"
+    query:
+      type: object
+      #TODO but in separate file
+    error-info:
+      readOnly: true
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        code:
+          type: string
+        message:
+          type: string
+        context:
+          type: object
+          additionalProperties: true
+        
+    entity-priview-config:
+      readOnly: true
+      type: object
+      properties:
+        all:
+          type: array
+          items:
+            properties:
+              name:
+                type: string
+              label:
+                type: string
+        default:
+          type: array
+          items:
+            properties:
+              name:
+                type: string
+              label:
+                type: string
+            
+    entity-history-execution-status:
+      allOf:
+        - $ref: "#/components/schemas/full-execution-status"
+        - type: object
+          properties:
+            infos:
+              type: array
+              items:
+                type: object
+                properties:
+                  label:
+                    type: string
+                  description:
+                    type: string
+                  typeInfo:
+                    type: string
+                  value:
+                    type: string
+                  semantics:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/semantics"
+                  
+
+    full-execution-status:
+      allOf:
+        - $ref: "#/components/schemas/query-status"
+        - type: object
+          properties:
+            progress:
+              type: number
+              minimum: 0
+              maximum: 1
+            columnDescriptions:
+              type: array
+              items:
+                $ref: "#/components/schemas/column-description"
+            canExpand:
+              type: boolean
+            query:
+              $ref: "#/components/schemas/query" #TODO
+            error:
+              $ref: "#/components/schemas/error-info"
+            availableSecondaryIds:
+              type: array
+              items:
+                $ref: "#/components/schemas/secondaryId"
 security:
   - BasicAuth: []
   - Bearer: []
-
-servers:
-  - url: http://lyo-peva02:8080/api
 paths:
   /frontend/config:
     get:
@@ -210,6 +504,19 @@ paths:
                 $ref: "#/components/schemas/frontend-config"
         "401":
           $ref: "#/components/responses/unauthorized"
+  /datasets/{dataset}/entity-preview:
+    parameters:
+      - $ref: "#/components/parameters/dataset"
+    get:
+      operationId: get-entity-preview-config
+      description: Gets entity-preview config and defaults for frontend.
+      responses:
+        '200':
+          description: The config.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/entity-priview-config"
 
   /me:
     get:
@@ -224,8 +531,28 @@ paths:
           description: Description of the user
         "401":
           $ref: "#/components/responses/unauthorized"
-
+  /datasets:
+    get:
+      operationId: list-datasets
+      description: Lists all datasets available to the User.
+      responses:
+        '200':
+          description: The available datasets.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/fe-dataset-id"
   /datasets/{dataset}/concepts/{concept}/resolve/:
+    parameters:
+        - $ref: "#/components/parameters/dataset"
+        - in: path
+          name: concept
+          required: true
+          schema:
+            $ref: "#/components/schemas/conceptId"
+        
     post:
       operationId: resolve-concepts
       summary: Resolve values to concept-ids
@@ -245,5 +572,144 @@ paths:
               schema:
                 $ref: "#/components/schemas/resolved-concepts-result"
 
- 
-            
+  /datasets/{dataset}/queries:
+    parameters:
+      - $ref: "#/components/parameters/dataset"
+    get:
+      operationId: get-query-status
+      summary: Get Status and metadata of Queries
+      responses:
+        '400':
+          description: The Status and Metadata.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/query-status"
+    post:
+      operationId: post-query
+      description: Submit a query for execution in the dataset.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/query"
+      responses:
+        '400':
+          description: Status of the submitted query.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/full-execution-status"
+        
+  /datasets/{dataset}/queries/{query}:
+    parameters:
+      - $ref: "#/components/parameters/dataset"
+      - in: path
+        name: query
+        required: true
+        schema:
+          $ref: "#/components/schemas/executionId"
+        
+    get:
+      operationId: get-query-status
+      summary: Get Status and metadata of Query 
+      responses:
+        '400':
+          description: The Status and Metadata.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/full-execution-status"
+    patch:
+      description: update a query.
+      operationId: patch-query
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/query"
+      responses:
+        '200':
+          description: Desription of the updated execution
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/full-execution-status"
+    delete:
+      operationId: delete-query
+      description: delete the query.
+      responses:
+        '200': 
+          description: Query was deleted.
+  /datasets/{dataset}/queries/{query}/cancel:
+    parameters:
+      - in: path
+        name: dataset
+        required: true
+        schema:
+          $ref: "#/components/schemas/datasetId"
+      - in: path
+        name: query
+        required: true
+        schema:
+          $ref: "#/components/schemas/executionId"
+    post:
+      operationId: cancel-query
+      responses:
+        '200':
+          description: Query was cancelled.
+  /datasets/{dataset}/queries/{query}/reexecute:
+    parameters:
+      - $ref: "#/components/parameters/dataset"
+      - in: path
+        name: query
+        required: true
+        schema:
+          $ref: "#/components/schemas/executionId"
+    post:
+      operationId: reexecute-query
+      responses:
+        '200':
+          description: Description of restarted Query.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/query"
+
+  /datasets/{dataset}/queries/entity:
+    parameters:
+      - $ref: "#/components/parameters/dataset"
+    post:
+      operationId: get-entity-preview
+      description: Fetch a history of a single entity
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                idKind:
+                  type: string
+                entityId:
+                  type: string
+                time:
+                  $ref: "#/components/schemas/date-range"
+                sources:
+                  type: array
+                  items:
+                    $ref: "#/components/schemas/connectorId"
+      responses:
+        '200':
+          description: description of the history of the entity.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/full-execution-status"
+
+
+
+    
+
+  
\ No newline at end of file

From 68c4e5b8cf61914ba17dedaf6730593228ea240f Mon Sep 17 00:00:00 2001
From: Fabian Kovacs <Fabian.Kovacs@Ingef.de>
Date: Tue, 13 Dec 2022 11:08:23 +0100
Subject: [PATCH 06/86] fixes for openapi.

---
 openapi.yaml | 74 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index bc9a89b4f5..8086330566 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,9 +1,10 @@
-openapi: 3.0.0
+openapi: 3.1.0
 info:
   version: 1.0.0
   title: Conquery API
   description: Conquery API
   license:
+    identifier: TODO
     name: TODO
     url: http://TODO/
 components:
@@ -11,9 +12,6 @@ components:
     BasicAuth:
       type: http
       scheme: basic
-    Ingef:
-      type: http
-      scheme: bearer
       
   responses:
     unauthorized:
@@ -27,6 +25,8 @@ components:
       type: string
     tableId:
       $ref: "#/components/schemas/id"
+    datasetId:
+      $ref: "#/components/schemas/id"
     filterId:
       $ref: "#/components/schemas/id"
     conceptId:
@@ -46,7 +46,7 @@ components:
       required:
         - "value"
     resolved-filter-result:
-      type: object
+      type: [object, null]
       properties:
         tableId:
           $ref: "#/components/schemas/tableId"
@@ -70,7 +70,8 @@ components:
           items:
             type: string
         resolvedFilter:
-          $ref: "#/components/responses/resolved-filter-result"
+          $ref: "#/components/schemas/resolved-filter-result"
+      
     mail:
       type: string
       format: mail
@@ -93,23 +94,22 @@ components:
         field:
           type: string
           description: Name of column in csv
-      additionalProperties:
-        properties:
-          pad:
-            description: Pad-String when uploading data, to avoid problems with some tools truncating leading zeros or similar.
-            type: string
-          length:
-            description: In conjunction with pad, the length of the padded string.
-            type: integer
-          resolvable:
-            description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
-            type: boolean
-          print:
-            description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
-            type: boolean
-          fillAnon:
-            description: True, if the field will be used to fill with anonymized ids, when the user is not allowed seeing real ids.
-            type: boolean
+        pad:
+          description: Pad-String when uploading data, to avoid problems with some tools truncating leading zeros or similar.
+          type: string
+        length:
+          description: In conjunction with pad, the length of the padded string.
+          type: integer
+        resolvable:
+          description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
+          type: boolean
+        print:
+          description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
+          type: boolean
+        fillAnon:
+          description: True, if the field will be used to fill with anonymized ids, when the user is not allowed seeing real ids.
+          type: boolean
+         
     upload-config:
       description: Describes the format of ids for EXTERNAL and entity-preview id kinds. Also describes the output format for ids in the result files.
       type: object
@@ -146,15 +146,13 @@ components:
           $ref: "#/components/schemas/currency-config"
         upload:
           $ref: "#/components/schemas/upload-config"
-    id:
-      type: string
     error:
       type: object
       properties:
         message:
           type: string
         code:
-          type: string
+          type: number
     concept-code-list:
       type: object
       properties:
@@ -229,6 +227,17 @@ paths:
 
   /datasets/{dataset}/concepts/{concept}/resolve/:
     post:
+      parameters:
+        - in: path
+          name: dataset
+          required: true
+          schema:
+            $ref: "#/components/schemas/datasetId"
+        - in: path
+          name: concept
+          required: true
+          schema:
+            $ref: "#/components/schemas/conceptId"
       operationId: resolve-concepts
       summary: Resolve values to concept-ids
       requestBody:
@@ -239,17 +248,18 @@ paths:
               $ref: "#/components/schemas/concept-code-list"
       responses:
         '400':
-            description: When the requested Concept does not have children.
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/responses/unauthorized"
+          description: When the requested Concept does not have children.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/error"
         '200':
           description: Resolved Concepts
           content:
             application/json:
               schema:
-                $ref: "#/components/responses/unauthorized"
+                $ref: "#/components/schemas/resolved-concepts-result"
+                
 
  
             

From 31efc6ca93724e8d8fea51a8db7957736d832055 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 13 Dec 2022 11:11:50 +0100
Subject: [PATCH 07/86] remove dupe

---
 openapi.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index a3a3c097c5..07b4ee4601 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -40,8 +40,6 @@ components:
       $ref: "#/components/schemas/id"
     filterId:
       $ref: "#/components/schemas/id"
-    datasetId:
-      $ref: "#/components/schemas/id"
     selectId:
       $ref: "#/components/schemas/id"
     conceptId:

From 801cdb72be1f392bf8523d23d60f03db6a0c74ee Mon Sep 17 00:00:00 2001
From: Fabian Kovacs <Fabian.Kovacs@Ingef.de>
Date: Tue, 13 Dec 2022 16:32:07 +0100
Subject: [PATCH 08/86] Implementation of FullExecutionStatus

---
 openapi.yaml | 260 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 144 insertions(+), 116 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 07b4ee4601..e3f5273ea6 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,12 +1,11 @@
-openapi: 3.1.0
+openapi: 3.0.0
 info:
   version: 1.0.0
   title: Conquery API
   description: Conquery API
   license:
-    identifier: TODO
     name: TODO
-    url: http://TODO/
+    url: http://TODO/  
 components:
 
   securitySchemes:
@@ -24,6 +23,18 @@ components:
       required: true
       schema:
         $ref: "#/components/schemas/datasetId"
+    query:
+      in: path
+      name: query
+      required: true
+      schema:
+        $ref: "#/components/schemas/executionId"
+    concept:
+      in: path
+      name: concept
+      required: true
+      schema:
+        $ref: "#/components/schemas/conceptId"
   responses:
     unauthorized:
       content:
@@ -56,7 +67,7 @@ components:
       $ref: "#/components/schemas/id"
     dateTime: #TODO
       type: string
-      format: date-time
+      # format: date-time TODO not compatible: Value does not conform to the required ISO-8601 datetime format. Invalid value '2022-12-13T13:33:32.455901838Z' for type datetime at
     date: #TODO
       type: string
       format: date
@@ -67,7 +78,10 @@ components:
         - RUNNING
         - FAILED
         - DONE
-
+    fe-dataset-ids:
+      type: array
+      items:
+        $ref: "#/components/schemas/fe-dataset-id"
     fe-dataset-id:
       type: object
       properties:
@@ -76,7 +90,6 @@ components:
         label:
           type: string
 
-
     feValue:
       type: object
       properties:
@@ -89,7 +102,7 @@ components:
       required:
         - "value"
     resolved-filter-result:
-      type: [object, null]
+      type: object
       properties:
         tableId:
           $ref: "#/components/schemas/tableId"
@@ -246,12 +259,12 @@ components:
           uniqueItems: true
         createdAt:
           $ref: "#/components/schemas/dateTime"
-        lastUsed::
-          $ref: "#/components/schemas/dateTime"
+        lastUsed:
+          oneOf:
+            - $ref: "#/components/schemas/dateTime"
+            - type: 'null'
         owner:
           $ref: "#/components/schemas/userId"
-
-
         ownerName:
           type: string
         shared:
@@ -267,15 +280,21 @@ components:
         numberOfResults:
           type: integer
         requiredTime:
-          type: integer
+          oneOf:
+            - type: integer
+            - type: 'null'
         startTime:
-          $ref: "#/components/schemas/dateTime"
+          oneOf:
+            - $ref: "#/components/schemas/dateTime"
+            - type: 'null'
         finishTime:
           $ref: "#/components/schemas/dateTime"
         queryType:
           type: string # TODO use discriminator from Query
         secondaryId:
-          $ref: "#/components/schemas/secondaryIdId"
+          oneOf:
+            - $ref: "#/components/schemas/secondaryIdId"
+            - type: 'null'
         resultUrls:
           type: array
           items:
@@ -303,91 +322,115 @@ components:
             - STRING
             - INTEGER
             - BOOLEAN
-            - REAL
-            - DECIMAL
+            - NUMERIC
             - MONEY
             - DATE
             - DATE_RANGE
         - type: string
-          format: "LIST[.*]"
+          pattern: "LIST\\[.*\\]"
 
     semantic-event-date: #TODO descriptions for all
-      type: object
+      properties:
+            type:
+              type: string
+      required:
+        - "type"
     semantic-sources:
-      type: object
+      properties:
+        type:
+          type: string
+      required:
+        - "type"
     semantic-categorical:
-      type: object
+      properties:
+        type:
+          type: string
+      required:
+        - "type"
     semantic-group:
-      type: object
+      properties:
+          type:
+            type: string
+      required:
+          - "type"
     semantic-hidden:
-      type: object
+      properties:
+          type:
+            type: string
+      required:
+        - "type"
     semantic-select:
-      type: object
       properties:
-        select:
-          $ref: "#/components/schemas/selectId"
+          type:
+            type: string
+          select:
+            $ref: "#/components/schemas/selectId"
+      required:
+        - "type"
     semantic-concept-column:
-      type: object
       properties:
-        concept:
-          $ref: "#/components/schemas/conceptId"
+          type:
+            type: string
+          concept:
+            $ref: "#/components/schemas/conceptId"
+      required:
+        - "type"
     semantic-column:
-      type: object
       properties:
-        concept:
+        type:
+          type: string
+        column:
           $ref: "#/components/schemas/columnId"
-
+      required:
+        - "type"
+            
     semantic-id:
-      type: object
       properties:
+        type:
+          type: string
         kind:
           type: string
-
+      required:
+        - "type"
+            
+    
     semantic-secondaryId:
-      type: object
       properties:
+        type:
+          type: string
         secondaryId:
           $ref: "#/components/schemas/secondaryIdId"
-
+      required:
+        - "type"
     semantics:
-      type: object
+      # NOTE: Documentation asks us to provide both mapping and oneOf, that does seem to be wrong and cannot be deserialized.
       discriminator:
-        propertyName: type
+        propertyName: "type"
         mapping:
-          EVENT_DATE: "#/components/schemas/semantic-event-date"
-          SOURCES: "#/components/schemas/semantic-sources"
-          CATEGORICAL: "#/components/schemas/semantic-categorical"
-          GROUP: "#/components/schemas/semantic-group"
-          HIDDEN: "#/components/schemas/semantic-hidden"
-          SELECT: "#/components/schemas/semantic-select"
-          CONCEPT_COLUMN: "#/components/schemas/semantic-concept-column"
-          COLUMN: "#/components/schemas/semantic-column"
-      allOf:
-        - type: object
-          properties:
-            type:
-              type: string
+          "CATEGORICAL": "#/components/schemas/semantic-categorical"
+          "COLUMN": "#/components/schemas/semantic-column"
+          "CONCEPT_COLUMN": "#/components/schemas/semantic-concept-column"
+          "EVENT_DATE": "#/components/schemas/semantic-event-date"
+          "GROUP": "#/components/schemas/semantic-group"
+          "HIDDEN": "#/components/schemas/semantic-hidden"
+          "ID": "#/components/schemas/semantic-id"
+          "SELECT": "#/components/schemas/semantic-select"
+          "SOURCES": "#/components/schemas/semantic-sources"
+      
+
+    nullable-string:
       oneOf:
-        - $ref: "#/components/schemas/semantic-event-date"
-        - $ref: "#/components/schemas/semantic-sources"
-        - $ref: "#/components/schemas/semantic-categorical"
-        - $ref: "#/components/schemas/semantic-group"
-        - $ref: "#/components/schemas/semantic-hidden"
-        - $ref: "#/components/schemas/semantic-select"
-        - $ref: "#/components/schemas/semantic-concept-column"
-        - $ref: "#/components/schemas/semantic-column"
-
-
-
+        - type: 'null'
+        - type: string
     column-description:
       type: object
       properties:
         label:
           type: string
         description:
-          type: string
+          $ref: "#/components/schemas/nullable-string"
         defaultLabel:
-          type: string
+          $ref: "#/components/schemas/nullable-string"
         type:
           $ref: "#/components/schemas/column-type"
         semantics:
@@ -404,6 +447,7 @@ components:
           $ref: "#/components/schemas/date"
     query:
       type: object
+      additionalProperties: true
       #TODO but in separate file
     error-info:
       readOnly: true
@@ -440,7 +484,21 @@ components:
                 type: string
               label:
                 type: string
-
+    entity-history-execution-status-info:
+      type: object
+      properties:
+        label:
+          type: string
+        description:
+          type: string
+        typeInfo:
+          type: string
+        value:
+          type: string
+        semantics:
+          type: array
+          items:
+            $ref: "#/components/schemas/semantics"
     entity-history-execution-status:
       allOf:
         - $ref: "#/components/schemas/full-execution-status"
@@ -449,31 +507,18 @@ components:
             infos:
               type: array
               items:
-                type: object
-                properties:
-                  label:
-                    type: string
-                  description:
-                    type: string
-                  typeInfo:
-                    type: string
-                  value:
-                    type: string
-                  semantics:
-                    type: array
-                    items:
-                      $ref: "#/components/schemas/semantics"
-
-
+                $ref: "#/components/schemas/entity-history-execution-status-info"
     full-execution-status:
       allOf:
         - $ref: "#/components/schemas/query-status"
         - type: object
           properties:
             progress:
-              type: number
-              minimum: 0
-              maximum: 1
+              oneOf:
+                - type: number
+                  minimum: 0
+                  maximum: 1
+                - type: 'null'
             columnDescriptions:
               type: array
               items:
@@ -483,15 +528,13 @@ components:
             query:
               $ref: "#/components/schemas/query" #TODO
             error:
-              $ref: "#/components/schemas/error-info"
+              oneOf:
+                - $ref: "#/components/schemas/error-info"
+                - type: 'null'
             availableSecondaryIds:
               type: array
               items:
-                $ref: "#/components/schemas/secondaryId"
-security:
-  - BasicAuth: []
-  - Bearer: []
-
+                $ref: "#/components/schemas/secondaryIdId"
 servers:
   - url: http://localhost:8080/api
 paths:
@@ -545,18 +588,10 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/fe-dataset-id"
-  /datasets/{dataset}/concepts/{concept}/resolve/:
-    parameters:
-        - $ref: "#/components/parameters/dataset"
-        - in: path
-          name: concept
-          required: true
-          schema:
-            $ref: "#/components/schemas/conceptId"
-
+                $ref: "#/components/schemas/fe-dataset-ids"
+                
+                  
+  /concepts/{concept}/resolve/:
     post:
       parameters:
         - in: path
@@ -595,10 +630,10 @@ paths:
     parameters:
       - $ref: "#/components/parameters/dataset"
     get:
-      operationId: get-query-status
+      operationId: list-queries
       summary: Get Status and metadata of Queries
       responses:
-        '400':
+        '200':
           description: The Status and Metadata.
           content:
             application/json:
@@ -615,16 +650,15 @@ paths:
             schema:
               $ref: "#/components/schemas/query"
       responses:
-        '400':
+        '200':
           description: Status of the submitted query.
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
 
-  /datasets/{dataset}/queries/{query}:
+  /queries/{query}:
     parameters:
-      - $ref: "#/components/parameters/dataset"
       - in: path
         name: query
         required: true
@@ -635,10 +669,10 @@ paths:
       operationId: get-query-status
       summary: Get Status and metadata of Query
       responses:
-        '400':
+        '200':
           description: The Status and Metadata.
           content:
-            application/json:
+            application/json;charset=utf-8:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
     patch:
@@ -662,13 +696,8 @@ paths:
       responses:
         '200':
           description: Query was deleted.
-  /datasets/{dataset}/queries/{query}/cancel:
+  /queries/{query}/cancel:
     parameters:
-      - in: path
-        name: dataset
-        required: true
-        schema:
-          $ref: "#/components/schemas/datasetId"
       - in: path
         name: query
         required: true
@@ -679,9 +708,8 @@ paths:
       responses:
         '200':
           description: Query was cancelled.
-  /datasets/{dataset}/queries/{query}/reexecute:
+  /queries/{query}/reexecute:
     parameters:
-      - $ref: "#/components/parameters/dataset"
       - in: path
         name: query
         required: true

From 6462883a3b314b69a3b34fb17f57754d03ab8671 Mon Sep 17 00:00:00 2001
From: Fabian Kovacs <Fabian.Kovacs@Ingef.de>
Date: Thu, 15 Dec 2022 19:22:33 +0100
Subject: [PATCH 09/86] Proper implementation of discriminator&oneOf for
 semantics

---
 openapi.yaml | 133 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 86 insertions(+), 47 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index e3f5273ea6..be7a985945 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -330,80 +330,109 @@ components:
           pattern: "LIST\\[.*\\]"
 
     semantic-event-date: #TODO descriptions for all
+      allOf:
+        - $ref: "#/components/schemas/semantic-base"
       properties:
-            type:
-              type: string
-      required:
-        - "type"
+        type:
+          type: string
+          enum:
+              - "EVENT_DATE"
     semantic-sources:
+      allOf:
+        - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
-      required:
-        - "type"
+          enum:
+              - "SOURCES"
     semantic-categorical:
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
-      required:
-        - "type"
+          enum:
+              - "CATEGORICAL"
     semantic-group:
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
       properties:
-          type:
-            type: string
-      required:
-          - "type"
+        type:
+          type: string
+          enum:
+              - "GROUP"
     semantic-hidden:
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
       properties:
-          type:
-            type: string
-      required:
-        - "type"
+        type:
+          type: string
+          enum:
+              - "HIDDEN"
     semantic-select:
       properties:
-          type:
-            type: string
+        type:
+          type: string
+          enum:
+              - "SELECT"
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
+      - type: object
+        properties:
           select:
             $ref: "#/components/schemas/selectId"
-      required:
-        - "type"
     semantic-concept-column:
       properties:
-          type:
-            type: string
+        type:
+          type: string
+          enum:
+              - "CONCEPT_COLUMN"
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
+      - type: object
+        properties:
           concept:
             $ref: "#/components/schemas/conceptId"
-      required:
-        - "type"
     semantic-column:
       properties:
-        type:
-          type: string
-        column:
-          $ref: "#/components/schemas/columnId"
-      required:
-        - "type"
-            
+          type:
+            type: string
+            enum:
+              - "COLUMN"
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
+      - type: object
+        properties:
+          column:
+            $ref: "#/components/schemas/columnId"
+          
     semantic-id:
       properties:
         type:
           type: string
-        kind:
-          type: string
-      required:
-        - "type"
-            
-    
+          enum:
+              - "ID"
+      allOf:
+      - $ref: "#/components/schemas/semantic-base"
+      - type: object
+        properties:
+          kind:
+            type: string
     semantic-secondaryId:
+      allOf:
+        - $ref: "#/components/schemas/semantic-base"
+        - type: object
+          properties:
+            secondaryId:
+              $ref: "#/components/schemas/secondaryIdId"
+    semantic-base:
+      type: object
       properties:
         type:
           type: string
-        secondaryId:
-          $ref: "#/components/schemas/secondaryIdId"
       required:
         - "type"
     semantics:
-      # NOTE: Documentation asks us to provide both mapping and oneOf, that does seem to be wrong and cannot be deserialized.
       discriminator:
         propertyName: "type"
         mapping:
@@ -416,21 +445,31 @@ components:
           "ID": "#/components/schemas/semantic-id"
           "SELECT": "#/components/schemas/semantic-select"
           "SOURCES": "#/components/schemas/semantic-sources"
-      
-
-    nullable-string:
       oneOf:
-        - type: 'null'
-        - type: string
+        - $ref: "#/components/schemas/semantic-categorical"
+        - $ref: "#/components/schemas/semantic-column"
+        - $ref: "#/components/schemas/semantic-concept-column"
+        - $ref: "#/components/schemas/semantic-event-date"
+        - $ref: "#/components/schemas/semantic-group"
+        - $ref: "#/components/schemas/semantic-hidden"
+        - $ref: "#/components/schemas/semantic-id"
+        - $ref: "#/components/schemas/semantic-select"
+        - $ref: "#/components/schemas/semantic-sources"
+
+
     column-description:
       type: object
       properties:
         label:
           type: string
         description:
-          $ref: "#/components/schemas/nullable-string"
+          oneOf:
+            - type: 'null'
+            - type: string
         defaultLabel:
-          $ref: "#/components/schemas/nullable-string"
+          oneOf:
+            - type: 'null'
+            - type: string
         type:
           $ref: "#/components/schemas/column-type"
         semantics:

From 644f4c16a92f8309117dc696a1b4f5373d8f2d5f Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 20 Dec 2022 16:46:45 +0100
Subject: [PATCH 10/86] fixes typos

---
 openapi.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index be7a985945..5176b1fec2 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -120,7 +120,7 @@ components:
           uniqueItems: true
           items:
             type: string
-        unkownCodes:
+        unknownCodes:
           type: array
           uniqueItems: true
           items:
@@ -503,7 +503,7 @@ components:
           type: object
           additionalProperties: true
 
-    entity-priview-config:
+    entity-preview-config:
       readOnly: true
       type: object
       properties:

From c6abd012afd26720c2cc68fdc7fd3686f7ac77f1 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 20 Dec 2022 16:52:03 +0100
Subject: [PATCH 11/86] cleanup after linting

---
 openapi.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 5176b1fec2..7393256bef 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -630,14 +630,9 @@ paths:
                 $ref: "#/components/schemas/fe-dataset-ids"
                 
                   
-  /concepts/{concept}/resolve/:
+  /concepts/{concept}/resolve:
     post:
       parameters:
-        - in: path
-          name: dataset
-          required: true
-          schema:
-            $ref: "#/components/schemas/datasetId"
         - in: path
           name: concept
           required: true

From 52ca62e5652bce51a33d0e79f8814644accdc908 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 2 Jan 2023 15:35:18 +0100
Subject: [PATCH 12/86] Adjust import description

---
 frontend/src/localization/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index 8d717472da..700a65069f 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -492,7 +492,7 @@
   },
   "importModal": {
     "headline": "Zeilenweise Importieren",
-    "subtitle": "Neben Drag & Drop können Werte zeilenweise importiert werden, zum Beispiel aus der Zwischenablage (Kopieren und Einfügen STRG+C / STRG+V).",
+    "subtitle": "Importiere Werte zeilenweise, zum Beispiel aus der Zwischenablage: Kopieren (STRG+C) und Einfügen (STRG+V). Wähle alternativ eine Datei im Textformat (TXT) aus, oder lege sie direkt im Textfeld ab.",
     "paste": "Aus Zwischenablage einfügen",
     "submit": "Übernehmen",
     "pasted": "Importiert"

From 333ffe1de99c44a7b0cd6a08ff5536cd46cfcaf2 Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:09:42 +0100
Subject: [PATCH 13/86] adds locale serdes

---
 .../io/jackson/ConquerySerializersModule.java |  8 ++++-
 .../serializer/LocaleDeserializer.java        | 36 +++++++++++++++++++
 .../jackson/serializer/LocaleSerializer.java  | 20 +++++++++++
 .../conquery/models/config/ColumnConfig.java  |  9 +----
 .../conquery/models/SerializationTests.java   | 15 ++++++++
 5 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
 create mode 100644 backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleSerializer.java

diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java
index 7949705912..3434ee5bc8 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.Currency;
 import java.util.List;
+import java.util.Locale;
 
 import com.bakdata.conquery.io.cps.CPSTypeIdResolver;
 import com.bakdata.conquery.io.jackson.serializer.CharArrayBufferDeserializer;
@@ -12,6 +13,8 @@
 import com.bakdata.conquery.io.jackson.serializer.CurrencyUnitDeserializer;
 import com.bakdata.conquery.io.jackson.serializer.CurrencyUnitSerializer;
 import com.bakdata.conquery.io.jackson.serializer.IdKeyDeserializer;
+import com.bakdata.conquery.io.jackson.serializer.LocaleDeserializer;
+import com.bakdata.conquery.io.jackson.serializer.LocaleSerializer;
 import com.bakdata.conquery.models.identifiable.ids.Id;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
@@ -54,11 +57,14 @@ public Object createUsingDefault(DeserializationContext ctxt) throws IOException
 				.getSubclasses(Id.class.getName())
 				.loadClasses();
 
-		for(Class<?> type : idTypes) {
+		for (Class<?> type : idTypes) {
 			addKeyDeserializer(type, new IdKeyDeserializer<>());
 		}
 		addSerializer(new ConqueryDoubleSerializer());
 		addDeserializer(CharArrayBuffer.class, new CharArrayBufferDeserializer());
 		addSerializer(CharArrayBuffer.class, new CharArrayBufferSerializer());
+
+		addDeserializer(Locale.class, new LocaleDeserializer());
+		addSerializer(Locale.class, new LocaleSerializer());
 	}
 }
\ No newline at end of file
diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
new file mode 100644
index 0000000000..88ed676f72
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
@@ -0,0 +1,36 @@
+package com.bakdata.conquery.io.jackson.serializer;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Parses a language tag as a locale using {@link Locale#forLanguageTag(String)}.
+ * Fails if the provided token is not a string token or the tag cannot be matched to a locale.
+ */
+public class LocaleDeserializer extends JsonDeserializer<Locale> {
+	@Override
+	public Locale deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+		final JsonToken jsonToken = p.currentToken();
+		if (jsonToken != JsonToken.VALUE_STRING) {
+			throw MismatchedInputException.from(p, Locale.class, "Expected a string token but found: " + jsonToken);
+		}
+
+		final String languageTag = p.getText();
+		final Locale locale = Locale.forLanguageTag(languageTag);
+
+		if (StringUtils.isNotBlank(languageTag) && !languageTag.equals(Locale.ROOT.toLanguageTag()) && locale == Locale.ROOT) {
+			// When Locale#forLanguageTag does not recognize the tag it defaults to Locale.ROOT
+			// This should only be intended if the tag was blank or "und" (undefined ~= Locale.ROOT.toLanguageTag())
+			throw MismatchedInputException.from(p, Locale.class, "Unable to language tag '" + languageTag + "' to locale");
+		}
+
+		return locale;
+	}
+}
diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleSerializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleSerializer.java
new file mode 100644
index 0000000000..0d0554c8c9
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleSerializer.java
@@ -0,0 +1,20 @@
+package com.bakdata.conquery.io.jackson.serializer;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * Uses the language tag provided by {@link Locale#toLanguageTag()} to serialize a locale as a string token.
+ * Without this serializer Jackson would write out {@link Locale#GERMANY} as {@code \"de_DE\"}.
+ * This serializer writes the locale as {@code de-DE}.
+ */
+public class LocaleSerializer extends JsonSerializer<Locale> {
+	@Override
+	public void serialize(Locale value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+		gen.writeString(value.toLanguageTag());
+	}
+}
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
index 659da93b77..702e281a43 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
@@ -71,7 +71,7 @@ public EntityIdMap.ExternalId read(String value) {
 	 * Map of Localized description.
 	 */
 	@Builder.Default
-	private Map<String, String> description = Collections.emptyMap();
+	private Map<Locale, String> description = Collections.emptyMap();
 
 	/**
 	 * Name of column in csv for {@link AdminDatasetProcessor#setIdMapping(java.io.InputStream, com.bakdata.conquery.models.worker.Namespace)}.
@@ -116,11 +116,4 @@ public EntityIdMap.ExternalId read(String value) {
 	public boolean isLabelKeysLocale() {
 		return getLabel().keySet().stream().map(Locale::forLanguageTag).noneMatch(Objects::isNull);
 	}
-
-	@JsonIgnore
-	@ValidationMethod(message = "Keys must be valid Locales.")
-	public boolean isDescriptionKeysLocale() {
-		return getDescription().keySet().stream().map(Locale::forLanguageTag).noneMatch(Objects::isNull);
-	}
-
 }
diff --git a/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java b/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java
index 6cff19072a..5ed7d47df8 100644
--- a/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java
+++ b/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java
@@ -8,6 +8,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
@@ -714,4 +715,18 @@ public void test(Range<Integer> range) throws IOException, JSONException {
 				.test(range);
 	}
 
+	@Test
+	public void locale() throws JSONException, IOException {
+		SerializationTestUtil.forType(Locale.class)
+							 .objectMappers(getApiMapper(), getManagerInternalMapper())
+							 .test(Locale.GERMANY);
+	}
+
+	@Test
+	public void localeArray() throws JSONException, IOException {
+		SerializationTestUtil.forType(Locale[].class)
+							 .objectMappers(getApiMapper(), getManagerInternalMapper())
+							 .test(new Locale[]{Locale.GERMANY, Locale.ROOT, Locale.ENGLISH, Locale.US, Locale.UK});
+	}
+
 }

From e7b97579fb6bb1e0c4c7f49cb1ea498beea93832 Mon Sep 17 00:00:00 2001
From: MT <12283268+thoniTUB@users.noreply.github.com>
Date: Fri, 16 Dec 2022 09:35:50 +0100
Subject: [PATCH 14/86] Update
 backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java

thx

Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com>
---
 .../conquery/io/jackson/serializer/LocaleDeserializer.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
index 88ed676f72..0129156ebc 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
@@ -28,7 +28,7 @@ public Locale deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 		if (StringUtils.isNotBlank(languageTag) && !languageTag.equals(Locale.ROOT.toLanguageTag()) && locale == Locale.ROOT) {
 			// When Locale#forLanguageTag does not recognize the tag it defaults to Locale.ROOT
 			// This should only be intended if the tag was blank or "und" (undefined ~= Locale.ROOT.toLanguageTag())
-			throw MismatchedInputException.from(p, Locale.class, "Unable to language tag '" + languageTag + "' to locale");
+			throw MismatchedInputException.from(p, Locale.class, "Unable to map language tag '" + languageTag + "' to locale");
 		}
 
 		return locale;

From ed2e07b7e9199f34ada057422b8896f7c4966984 Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:20:06 +0100
Subject: [PATCH 15/86] cache root language tag

---
 .../io/jackson/serializer/LocaleDeserializer.java     |  5 ++++-
 .../bakdata/conquery/models/config/ColumnConfig.java  | 11 +----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
index 0129156ebc..a5f101ec79 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/LocaleDeserializer.java
@@ -15,6 +15,9 @@
  * Fails if the provided token is not a string token or the tag cannot be matched to a locale.
  */
 public class LocaleDeserializer extends JsonDeserializer<Locale> {
+
+	public static final String ROOT_LOCALE_TAG = Locale.ROOT.toLanguageTag();
+
 	@Override
 	public Locale deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
 		final JsonToken jsonToken = p.currentToken();
@@ -25,7 +28,7 @@ public Locale deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 		final String languageTag = p.getText();
 		final Locale locale = Locale.forLanguageTag(languageTag);
 
-		if (StringUtils.isNotBlank(languageTag) && !languageTag.equals(Locale.ROOT.toLanguageTag()) && locale == Locale.ROOT) {
+		if (StringUtils.isNotBlank(languageTag) && !languageTag.equals(ROOT_LOCALE_TAG) && locale == Locale.ROOT) {
 			// When Locale#forLanguageTag does not recognize the tag it defaults to Locale.ROOT
 			// This should only be intended if the tag was blank or "und" (undefined ~= Locale.ROOT.toLanguageTag())
 			throw MismatchedInputException.from(p, Locale.class, "Unable to map language tag '" + languageTag + "' to locale");
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
index 702e281a43..b923c7bad4 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java
@@ -3,17 +3,14 @@
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 
 import javax.validation.constraints.NotEmpty;
 
 import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.identifiable.mapping.EntityIdMap;
 import com.bakdata.conquery.resources.admin.rest.AdminDatasetProcessor;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.google.common.base.Strings;
-import io.dropwizard.validation.ValidationMethod;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -65,7 +62,7 @@ public EntityIdMap.ExternalId read(String value) {
 	 */
 	@NotEmpty
 	@Builder.Default
-	private Map<String, String> label = Collections.emptyMap();
+	private Map<Locale, String> label = Collections.emptyMap();
 
 	/**
 	 * Map of Localized description.
@@ -110,10 +107,4 @@ public EntityIdMap.ExternalId read(String value) {
 	@Builder.Default
 	@JsonView(View.Persistence.class)
 	private boolean fillAnon = false;
-
-	@JsonIgnore
-	@ValidationMethod(message = "Keys must be valid Locales.")
-	public boolean isLabelKeysLocale() {
-		return getLabel().keySet().stream().map(Locale::forLanguageTag).noneMatch(Objects::isNull);
-	}
 }

From 30165df599ac860ecab331661d036009d2c7fd16 Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Mon, 9 Jan 2023 10:53:43 +0100
Subject: [PATCH 16/86] fix default value after type change

---
 .../com/bakdata/conquery/models/config/IdColumnConfig.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
index a8292502da..b5b4ca1870 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
@@ -4,6 +4,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -51,7 +52,7 @@ public class IdColumnConfig {
 			ColumnConfig.builder()
 						.name("ID")
 						.field("result")
-						.label(Map.of("", "result")) // "" ~= Locale.ROOT
+						.label(Map.of(Locale.ROOT, "result"))
 						.resolvable(true)
 						.fillAnon(true)
 						.print(true)

From d3b26e4452ff04930b5483272f65fac17bc1bbc6 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 9 Jan 2023 12:36:50 +0100
Subject: [PATCH 17/86] Start iterating entity ids

---
 frontend/src/js/entity-history/EntityIdsList.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/js/entity-history/EntityIdsList.tsx b/frontend/src/js/entity-history/EntityIdsList.tsx
index 10de1c8bbd..13b44f8635 100644
--- a/frontend/src/js/entity-history/EntityIdsList.tsx
+++ b/frontend/src/js/entity-history/EntityIdsList.tsx
@@ -41,12 +41,18 @@ const EntityStatus = styled("div")`
 const TheEntityId = styled("div")<{ active?: boolean }>`
   font-weight: 700;
 `;
+
 const Number = styled("div")`
   font-size: ${({ theme }) => theme.font.xs};
   color: ${({ theme }) => theme.col.gray};
   flex-shrink: 0;
 `;
 
+const Gray = styled("span")`
+  font-weight: 300;
+  color: ${({ theme }) => theme.col.gray};
+`;
+
 interface Props {
   currentEntityId: EntityId | null;
   entityIds: EntityId[];
@@ -77,7 +83,9 @@ export const EntityIdsList = ({
         onClick={() => updateHistorySession({ entityId, years: [] })}
       >
         <Number style={{ width: numberWidth }}>#{index + 1}</Number>
-        <TheEntityId>{entityId.id}</TheEntityId>
+        <TheEntityId>
+          {entityId.id} <Gray>({entityId.kind})</Gray>
+        </TheEntityId>
         <Statuses>
           {entityIdsStatus[entityId.id] &&
             entityIdsStatus[entityId.id].map((val) => (

From fceabd184821dd954dfaf00853305f8514166678 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 9 Jan 2023 17:20:58 +0100
Subject: [PATCH 18/86] Fix layout

---
 frontend/src/js/entity-history/EntityIdsList.tsx     | 1 +
 frontend/src/js/entity-history/Timeline.tsx          | 2 +-
 frontend/src/js/entity-history/timeline/YearHead.tsx | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/js/entity-history/EntityIdsList.tsx b/frontend/src/js/entity-history/EntityIdsList.tsx
index 13b44f8635..1d7da5ae22 100644
--- a/frontend/src/js/entity-history/EntityIdsList.tsx
+++ b/frontend/src/js/entity-history/EntityIdsList.tsx
@@ -40,6 +40,7 @@ const EntityStatus = styled("div")`
 `;
 const TheEntityId = styled("div")<{ active?: boolean }>`
   font-weight: 700;
+  flex-shrink: 0;
 `;
 
 const Number = styled("div")`
diff --git a/frontend/src/js/entity-history/Timeline.tsx b/frontend/src/js/entity-history/Timeline.tsx
index 52a8fc9d56..646f96a6ef 100644
--- a/frontend/src/js/entity-history/Timeline.tsx
+++ b/frontend/src/js/entity-history/Timeline.tsx
@@ -29,7 +29,7 @@ const Root = styled("div")`
   -webkit-overflow-scrolling: touch;
   padding: 0 20px 0 10px;
   display: inline-grid;
-  grid-template-columns: 100px auto;
+  grid-template-columns: 125px auto;
   grid-auto-rows: minmax(min-content, max-content);
   gap: 20px 4px;
   width: 100%;
diff --git a/frontend/src/js/entity-history/timeline/YearHead.tsx b/frontend/src/js/entity-history/timeline/YearHead.tsx
index d51839a32d..1db4f50751 100644
--- a/frontend/src/js/entity-history/timeline/YearHead.tsx
+++ b/frontend/src/js/entity-history/timeline/YearHead.tsx
@@ -46,7 +46,7 @@ const YearHead = ({
         <div>
           <SmallHeading>{year}</SmallHeading>
           <div>
-            {totalEvents} {t("history.events", { count: totalEvents })}
+            {totalEvents}&nbsp;{t("history.events", { count: totalEvents })}
           </div>
         </div>
       </StickyWrap>

From ed95bf5ab28421b0c1fbc1c4a4666f5822cf8812 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 10 Jan 2023 17:10:41 +0100
Subject: [PATCH 19/86] Save and load ID kind

---
 frontend/src/js/entity-history/History.tsx    |  8 +++---
 .../js/entity-history/LoadHistoryDropzone.tsx | 25 ++++++++++-------
 frontend/src/js/entity-history/Navigation.tsx | 27 +++++++++++--------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/frontend/src/js/entity-history/History.tsx b/frontend/src/js/entity-history/History.tsx
index bd502dabd7..37c59653a5 100644
--- a/frontend/src/js/entity-history/History.tsx
+++ b/frontend/src/js/entity-history/History.tsx
@@ -19,7 +19,7 @@ import type { LoadingPayload } from "./LoadHistoryDropzone";
 import { Navigation } from "./Navigation";
 import SourcesControl from "./SourcesControl";
 import Timeline from "./Timeline";
-import { DEFAULT_ID_KIND, useUpdateHistorySession } from "./actions";
+import { useUpdateHistorySession } from "./actions";
 import { EntityId } from "./reducer";
 
 const FullScreen = styled("div")`
@@ -145,10 +145,8 @@ export const History = () => {
     }: LoadingPayload) => {
       updateHistorySession({
         label,
-        // Here, we're assuming that ids from the uploaded file have a default id kind
-        // TODO: possibly allow users to specifiy the id kind from the file they're uploading
-        entityIds: loadedEntityIds.map((id) => ({ id, kind: DEFAULT_ID_KIND })),
-        entityId: { id: loadedEntityIds[0], kind: DEFAULT_ID_KIND },
+        entityIds: loadedEntityIds,
+        entityId: loadedEntityIds[0],
       });
       setEntityIdsStatus(loadedEntityStatus);
       setEntityStatusOptions(loadedEntityStatusOptions);
diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index 8a31f1c9c2..6ccc3c98ed 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -11,6 +11,7 @@ import DropzoneWithFileInput, {
 } from "../ui-components/DropzoneWithFileInput";
 
 import type { EntityIdsStatus } from "./History";
+import { EntityId } from "./reducer";
 
 const ImportButtonSpacer = styled("div")`
   height: 30px;
@@ -20,7 +21,7 @@ const acceptedDropTypes = [NativeTypes.FILE];
 
 export interface LoadingPayload {
   label: string;
-  loadedEntityIds: string[];
+  loadedEntityIds: EntityId[];
   loadedEntityStatus: EntityIdsStatus;
   loadedEntityStatusOptions: SelectOptionT[];
 }
@@ -46,22 +47,26 @@ export const LoadHistoryDropzone = ({
     label: string;
     data: string[][];
   }) => {
-    const loadedEntityIds = [];
+    const loadedEntityIds: EntityId[] = [];
     const loadedEntityStatus: EntityIdsStatus = {};
     const loadedEntityStatusOptionsRaw: string[] = [];
 
     for (const row of data) {
-      if (row.length !== 2) {
+      if (row.length < 2) {
         continue;
       }
 
-      loadedEntityIds.push(row[0]);
-      if (row[1]) {
-        loadedEntityStatus[row[0]] = row[1].split(",").map((s) => {
-          const opt = s.trim();
-          loadedEntityStatusOptionsRaw.push(s);
-          return { label: opt, value: opt };
-        });
+      loadedEntityIds.push({ kind: row[0], id: row[1] });
+
+      if (row.length > 2) {
+        loadedEntityStatus[row[1]] = row
+          .slice(2)
+          .filter((str) => str.length > 0)
+          .map((s) => {
+            const opt = s.trim();
+            loadedEntityStatusOptionsRaw.push(opt);
+            return { label: opt, value: opt };
+          });
       }
     }
 
diff --git a/frontend/src/js/entity-history/Navigation.tsx b/frontend/src/js/entity-history/Navigation.tsx
index d5c0fa7169..142abf5a51 100644
--- a/frontend/src/js/entity-history/Navigation.tsx
+++ b/frontend/src/js/entity-history/Navigation.tsx
@@ -104,17 +104,22 @@ export const Navigation = memo(
     }, [entityIds, currentEntityIndex, updateHistorySession]);
 
     const onDownload = useCallback(() => {
-      const idToRow = (entityId: EntityId) => [
-        entityId.id,
-        entityIdsStatus[entityId.id]
-          ? entityIdsStatus[entityId.id].map((o) => o.value)
-          : "",
-      ];
-
-      const csvString = entityIds
-        .map(idToRow)
-        .map((row) => row.join(";"))
-        .join("\n");
+      const usedStatuses = Object.values(entityIdsStatus).reduce(
+        (longest, el) => (longest.length > el.length ? longest : el),
+        [],
+      );
+      const idToRow = (entityId: EntityId) =>
+        [
+          entityId.kind,
+          entityId.id,
+          usedStatuses
+            .map((opt) =>
+              entityIdsStatus[entityId.id]?.includes(opt) ? opt.value : "",
+            )
+            .join(";"),
+        ].join(";");
+
+      const csvString = entityIds.map(idToRow).join("\n");
 
       const blob = new Blob([csvString], {
         type: "application/csv",

From 6dfee5250a26ab85ce8a67856fd759193c318743 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 10 Jan 2023 17:10:50 +0100
Subject: [PATCH 20/86] Cleanup HoverNavigatable

---
 .../src/js/small-tab-navigation/HoverNavigatable.tsx  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/js/small-tab-navigation/HoverNavigatable.tsx b/frontend/src/js/small-tab-navigation/HoverNavigatable.tsx
index 0d2ff66f7a..8e5e11471f 100644
--- a/frontend/src/js/small-tab-navigation/HoverNavigatable.tsx
+++ b/frontend/src/js/small-tab-navigation/HoverNavigatable.tsx
@@ -27,8 +27,8 @@ export const HoverNavigatable = ({
   children,
   className,
 }: PropsT) => {
-  // Type Number is in Browser, however local typescript does not recognize it
-  let [timeout, setTimeoutVariable] = useState<null | NodeJS.Timeout>(null);
+  const [timeoutVar, setTimeoutVar] = useState<null | NodeJS.Timeout>(null);
+
   const [{ isOver }, drop] = useDrop({
     accept: [
       DNDType.FORM_CONFIG,
@@ -37,10 +37,10 @@ export const HoverNavigatable = ({
       DNDType.PREVIOUS_SECONDARY_ID_QUERY,
     ],
     hover: (_, monitor) => {
-      if (timeout == null) {
-        setTimeoutVariable(
+      if (timeoutVar == null) {
+        setTimeoutVar(
           setTimeout(() => {
-            setTimeoutVariable(null);
+            setTimeoutVar(null);
             if (monitor.isOver()) {
               triggerNavigate();
             }
@@ -52,6 +52,7 @@ export const HoverNavigatable = ({
       isOver: monitor.isOver(),
     }),
   });
+
   return (
     <Root ref={drop} isOver={isOver} className={className}>
       {children}

From 30d9400fdcaea52132e3355fdf37c9da8d86a1ba Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 10 Jan 2023 17:44:19 +0100
Subject: [PATCH 21/86] Add import placeholder and description

---
 .../js/entity-history/LoadHistoryDropzone.tsx |  5 +++++
 .../ui-components/DropzoneWithFileInput.tsx   |  9 +++++++-
 frontend/src/js/ui-components/ImportModal.tsx | 21 ++++++++++++++++++-
 frontend/src/localization/de.json             |  2 ++
 frontend/src/localization/en.json             |  2 ++
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index 6ccc3c98ed..4b29b64b85 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -11,6 +11,7 @@ import DropzoneWithFileInput, {
 } from "../ui-components/DropzoneWithFileInput";
 
 import type { EntityIdsStatus } from "./History";
+import { DEFAULT_ID_KIND } from "./actions";
 import { EntityId } from "./reducer";
 
 const ImportButtonSpacer = styled("div")`
@@ -113,6 +114,10 @@ export const LoadHistoryDropzone = ({
       disableClick
       showImportButton
       onImportLines={onImportLines}
+      importPlaceholder={t("history.load.importPlaceholder", {
+        idkind: DEFAULT_ID_KIND,
+      })}
+      importDescription={t("history.load.importDescription")}
     >
       {() => (
         <>
diff --git a/frontend/src/js/ui-components/DropzoneWithFileInput.tsx b/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
index f7177425a9..9d470d9c0d 100644
--- a/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
+++ b/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
@@ -57,10 +57,13 @@ interface PropsT<DroppableObject> {
   acceptedDropTypes?: string[];
   accept?: string;
   disableClick?: boolean;
-  showImportButton?: boolean;
   isInitial?: boolean;
   className?: string;
+
+  showImportButton?: boolean;
   onImportLines?: (lines: string[]) => void;
+  importPlaceholder?: string;
+  importDescription?: string;
 }
 
 /*
@@ -77,6 +80,8 @@ const DropzoneWithFileInput = <
   {
     onSelectFile,
     onImportLines,
+    importPlaceholder,
+    importDescription,
     acceptedDropTypes,
     disableClick,
     showImportButton,
@@ -135,6 +140,8 @@ const DropzoneWithFileInput = <
             <ImportModal
               onClose={() => setImportModalOpen(false)}
               onSubmit={onSubmitImport}
+              placeholder={importPlaceholder}
+              description={importDescription}
             />
           )}
           {showImportButton && onImportLines && (
diff --git a/frontend/src/js/ui-components/ImportModal.tsx b/frontend/src/js/ui-components/ImportModal.tsx
index fbd4be8e0f..7b9810f4e2 100644
--- a/frontend/src/js/ui-components/ImportModal.tsx
+++ b/frontend/src/js/ui-components/ImportModal.tsx
@@ -32,6 +32,11 @@ const HiddenFileInput = styled("input")`
   display: none;
 `;
 
+const Subtitle = styled(`p`)`
+  margin: 0;
+  max-width: 600px;
+`;
+
 const acceptedDropTypes = [NativeTypes.FILE];
 
 const useCanReadClipboard = () => {
@@ -54,9 +59,13 @@ const useCanReadClipboard = () => {
 };
 
 export const ImportModal = ({
+  placeholder,
+  description,
   onClose,
   onSubmit,
 }: {
+  description?: string;
+  placeholder?: string;
   onClose: () => void;
   onSubmit: (lines: string[]) => void;
 }) => {
@@ -138,13 +147,23 @@ export const ImportModal = ({
       onClose={onClose}
     >
       <Content>
+        {description && (
+          <Subtitle dangerouslySetInnerHTML={{ __html: description }} />
+        )}
         <DropzoneWithFileInput
           onDrop={onDrop}
           acceptedDropTypes={acceptedDropTypes}
           disableClick
           accept="text/plain,text/csv"
         >
-          {() => <Textarea rows={15} value={textInput} onChange={onChange} />}
+          {() => (
+            <Textarea
+              rows={15}
+              value={textInput}
+              onChange={onChange}
+              placeholder={placeholder}
+            />
+          )}
         </DropzoneWithFileInput>
         <Row>
           <IconButton icon="file" onClick={onOpenFileDialog}>
diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index 8d717472da..a1e96f3679 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -487,6 +487,8 @@
       "selectStatusTooltip": "Hier werden die möglichen Status-Werte festgelegt, die danach an die einzelnen Entitäten vergeben werden können."
     },
     "load": {
+      "importDescription": "Bitte CSV-format mit folgenden Spalten verwenden<br /><code><strong>ID-Art</strong>;<strong>ID</strong> (+ optional: ;<strong>Status 1</strong>;<strong>Status 2</strong>;...)</code>",
+      "importPlaceholder": "{{idkind}};A0123456788;auffällig;\n{{idkind}};A0123456789;;unauffällig",
       "error": "Konnte Historie für diese Datei nicht laden."
     }
   },
diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index 6f49dfef75..76c900bf32 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -488,6 +488,8 @@
       "selectStatusTooltip": "Set possible status values, that may be assigned to individual entites during the history session."
     },
     "load": {
+      "importDescription": "Please provide aa CSV format with columns<br /><code><strong>ID kind</strong>;<strong>ID</strong> (+ optionally: ;<strong>status 1</strong>;<strong>status 2</strong>;...)</code>",
+      "importPlaceholder": "{{idkind}};A0123456788;interesting;\n{{idkind}};A0123456789;;not interesting",
       "error": "Couldn't load history for this file."
     }
   },

From d02298a29c4174d4f157d8150b9ae8ae14dc8d68 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 10 Jan 2023 17:45:39 +0100
Subject: [PATCH 22/86] Iterate copy

---
 frontend/src/localization/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index a1e96f3679..54e97ab30a 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -487,7 +487,7 @@
       "selectStatusTooltip": "Hier werden die möglichen Status-Werte festgelegt, die danach an die einzelnen Entitäten vergeben werden können."
     },
     "load": {
-      "importDescription": "Bitte CSV-format mit folgenden Spalten verwenden<br /><code><strong>ID-Art</strong>;<strong>ID</strong> (+ optional: ;<strong>Status 1</strong>;<strong>Status 2</strong>;...)</code>",
+      "importDescription": "Bitte CSV-Format mit folgenden Spalten verwenden:<br /><code><strong>ID-Art</strong>;<strong>ID</strong> (+ optional: ;<strong>Status 1</strong>;<strong>Status 2</strong>;...)</code>",
       "importPlaceholder": "{{idkind}};A0123456788;auffällig;\n{{idkind}};A0123456789;;unauffällig",
       "error": "Konnte Historie für diese Datei nicht laden."
     }

From 1b4f11d6c50af29b1c69e5da1988815b42d64fd6 Mon Sep 17 00:00:00 2001
From: Marco Korinth <marco@bizfactory.tech>
Date: Wed, 11 Jan 2023 06:13:51 +0100
Subject: [PATCH 23/86] readded autoLabel feature with minor adjustments

---
 .../js/query-node-editor/QueryNodeEditor.tsx  | 30 ++++++++-----------
 .../src/js/query-node-editor/useAutoLabel.ts  |  7 +++--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
index 8df328cdb9..5d58d29725 100644
--- a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
+++ b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
@@ -26,8 +26,7 @@ import MenuColumn from "./MenuColumn";
 import NodeName from "./NodeName";
 import ResetAndClose from "./ResetAndClose";
 
-// TEMPORARILY DISABLED UNTIL FEATURE IS COMPLETE
-// import { useAutoLabel } from "./useAutoLabel";
+import { useAutoLabel } from "./useAutoLabel";
 
 const Root = styled("div")`
   padding: 10px;
@@ -160,20 +159,16 @@ const QueryNodeEditor = ({ node, ...props }: QueryNodeEditorPropsT) => {
       ? RIGHT_SIDE_WIDTH_COMPACT
       : RIGHT_SIDE_WIDTH);
 
-  // TEMPORARILY DISABLED UNTIL FEATURE IS COMPLETE
-  // const { autoLabel, autoLabelEnabled, setAutoLabelEnabled } = useAutoLabel({
-  //   node,
-  //   onUpdateLabel: props.onUpdateLabel,
-  // });
-  // const nodeLabel =
-  //   autoLabelEnabled && autoLabel
-  //     ? autoLabel
-  //     : nodeIsConceptQueryNode(node)
-  //     ? node.label
-  //     : node.label || node.id;
-  const nodeLabel = nodeIsConceptQueryNode(node)
-    ? node.label
-    : node.label || node.id;
+  const { autoLabel, autoLabelEnabled, setAutoLabelEnabled } = useAutoLabel({
+    node,
+    onUpdateLabel: props.onUpdateLabel,
+  });
+  const nodeLabel =
+    autoLabelEnabled && autoLabel
+      ? autoLabel
+      : nodeIsConceptQueryNode(node)
+      ? node.label
+      : node.label || node.id;
 
   return (
     <Root
@@ -191,8 +186,7 @@ const QueryNodeEditor = ({ node, ...props }: QueryNodeEditorPropsT) => {
             allowEditing={nodeIsConceptQueryNode(node)}
             label={nodeLabel}
             onUpdateLabel={(label) => {
-              // TEMPORARILY DISABLED UNTIL FEATURE IS COMPLETE
-              // setAutoLabelEnabled(false);
+              setAutoLabelEnabled(false);
               props.onUpdateLabel(label);
             }}
           />
diff --git a/frontend/src/js/query-node-editor/useAutoLabel.ts b/frontend/src/js/query-node-editor/useAutoLabel.ts
index c67156f34c..dbec564239 100644
--- a/frontend/src/js/query-node-editor/useAutoLabel.ts
+++ b/frontend/src/js/query-node-editor/useAutoLabel.ts
@@ -11,11 +11,12 @@ interface AutoLabelProps {
 
 export function useAutoLabel({ node, onUpdateLabel }: AutoLabelProps) {
   const MAX_AUTOLABEL_LENGTH = 30;
+  const DELIMITER = ' ';
 
   const formatConceptLabels = (labels: string[]) =>
     labels
-      .map((label) => label.match(/[a-zA-Z0-9]*/g)?.join(""))
-      .join("_")
+      .sort()
+      .join(DELIMITER)
       .substring(0, MAX_AUTOLABEL_LENGTH);
 
   const autoLabel = useMemo(() => {
@@ -28,7 +29,7 @@ export function useAutoLabel({ node, onUpdateLabel }: AutoLabelProps) {
 
   const [autoLabelEnabled, setAutoLabelEnabled] = useState(
     nodeIsConceptQueryNode(node) &&
-      formatConceptLabels(node.label.split("_")) === autoLabel,
+      formatConceptLabels(node.label.split(DELIMITER)) === autoLabel,
   );
 
   const onUpdateLabelRef = useRef(onUpdateLabel);

From 6695c2a4edbda9d9138c3cb0f699e453d80605e4 Mon Sep 17 00:00:00 2001
From: Marco Korinth <marco@bizfactory.tech>
Date: Wed, 11 Jan 2023 10:14:24 +0100
Subject: [PATCH 24/86] fixed issue with space containing labels

---
 frontend/src/js/query-node-editor/QueryNodeEditor.tsx |  1 -
 frontend/src/js/query-node-editor/useAutoLabel.ts     | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
index 5d58d29725..3880ce33d3 100644
--- a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
+++ b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
@@ -25,7 +25,6 @@ import ContentColumn from "./ContentColumn";
 import MenuColumn from "./MenuColumn";
 import NodeName from "./NodeName";
 import ResetAndClose from "./ResetAndClose";
-
 import { useAutoLabel } from "./useAutoLabel";
 
 const Root = styled("div")`
diff --git a/frontend/src/js/query-node-editor/useAutoLabel.ts b/frontend/src/js/query-node-editor/useAutoLabel.ts
index dbec564239..931b17f0c9 100644
--- a/frontend/src/js/query-node-editor/useAutoLabel.ts
+++ b/frontend/src/js/query-node-editor/useAutoLabel.ts
@@ -11,13 +11,10 @@ interface AutoLabelProps {
 
 export function useAutoLabel({ node, onUpdateLabel }: AutoLabelProps) {
   const MAX_AUTOLABEL_LENGTH = 30;
-  const DELIMITER = ' ';
+  const DELIMITER = " ";
 
   const formatConceptLabels = (labels: string[]) =>
-    labels
-      .sort()
-      .join(DELIMITER)
-      .substring(0, MAX_AUTOLABEL_LENGTH);
+    labels.sort().join(DELIMITER).substring(0, MAX_AUTOLABEL_LENGTH);
 
   const autoLabel = useMemo(() => {
     return nodeIsConceptQueryNode(node)
@@ -28,8 +25,7 @@ export function useAutoLabel({ node, onUpdateLabel }: AutoLabelProps) {
   }, [node]);
 
   const [autoLabelEnabled, setAutoLabelEnabled] = useState(
-    nodeIsConceptQueryNode(node) &&
-      formatConceptLabels(node.label.split(DELIMITER)) === autoLabel,
+    nodeIsConceptQueryNode(node) && node.label === autoLabel,
   );
 
   const onUpdateLabelRef = useRef(onUpdateLabel);

From c8d2b911b70a04eb1479ad3598ff9250d667f2fe Mon Sep 17 00:00:00 2001
From: Fabian Blank <fabian.blank@bizfactory.tech>
Date: Wed, 11 Jan 2023 11:27:49 +0100
Subject: [PATCH 25/86] fix tooltip not shown when hover available

---
 frontend/src/js/pane/TabNavigation.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/js/pane/TabNavigation.tsx b/frontend/src/js/pane/TabNavigation.tsx
index 8c29cf9ce9..7a9691d269 100644
--- a/frontend/src/js/pane/TabNavigation.tsx
+++ b/frontend/src/js/pane/TabNavigation.tsx
@@ -81,8 +81,8 @@ const TabNavigation: FC<PropsT> = ({
     <Root data-test-id={dataTestId}>
       {tabs.map(({ key, label, tooltip, loading }) => {
         return (
-          <SxWithTooltip text={tooltip} lazy key={key}>
-            <HoverNavigatable triggerNavigate={createClickHandler(key)}>
+          <HoverNavigatable triggerNavigate={createClickHandler(key)}>
+            <SxWithTooltip text={tooltip} lazy key={key}>
               <Headline
                 active={activeTab === key}
                 onClick={createClickHandler(key)}
@@ -90,8 +90,8 @@ const TabNavigation: FC<PropsT> = ({
                 {label}
                 {loading && <SxFaIcon icon="spinner" />}
               </Headline>
-            </HoverNavigatable>
-          </SxWithTooltip>
+            </SxWithTooltip>
+          </HoverNavigatable>
         );
       })}
     </Root>

From b2ecfdc100ded98a1d4b93ea6776d78159fecc7f Mon Sep 17 00:00:00 2001
From: Marco Korinth <marco@bizfactory.tech>
Date: Wed, 11 Jan 2023 14:25:28 +0100
Subject: [PATCH 26/86] added padding to the bottom of scroll into view
 container

---
 .../InputMultiSelect/InputMultiSelect.tsx     | 111 +++++++++---------
 .../ui-components/InputSelect/InputSelect.tsx |  78 ++++++------
 .../InputSelect/InputSelectComponents.tsx     |  11 +-
 3 files changed, 102 insertions(+), 98 deletions(-)

diff --git a/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx b/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
index e0788bcae8..3fd6516c2b 100644
--- a/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
+++ b/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
@@ -16,6 +16,7 @@ import {
   ItemsInputContainer,
   List,
   Menu,
+  MenuContainer,
   ResetButton,
   SelectContainer,
   VerticalSeparator,
@@ -98,7 +99,7 @@ const InputMultiSelect = ({
     onResolve,
   });
 
-  const menuRef = useRef<HTMLDivElement | null>(null);
+  const menuContainerRef = useRef<HTMLDivElement | null>(null);
   const [inputValue, setInputValue] = useState("");
   const { t } = useTranslation();
 
@@ -268,7 +269,7 @@ const InputMultiSelect = ({
   useEffect(
     function scrollIntoView() {
       if (isOpen) {
-        menuRef.current?.scrollIntoView({
+        menuContainerRef.current?.scrollIntoView({
           behavior: "smooth",
           block: "nearest",
         });
@@ -365,60 +366,58 @@ const InputMultiSelect = ({
         />
       </Control>
       {isOpen ? (
-        <Menu
-          {...menuProps}
-          ref={(instance) => {
-            menuRef.current = instance;
-            menuPropsRef(instance);
-          }}
-        >
-          <MenuActionBar
-            total={total}
-            optionsCount={filterOptionsCount}
-            onInsertAllClick={() => {
-              const moreInsertableThanCurrentlyLoaded =
-                exists(total) && total > filterOptionsCount;
-
-              if (!!onLoadAndInsertAll && moreInsertableThanCurrentlyLoaded) {
-                onLoadAndInsertAll(inputValue);
-              } else {
-                const optionsWithoutCreatable =
-                  creatable && inputValue.length > 0
-                    ? filteredOptions.slice(1)
-                    : filteredOptions;
-
-                setSelectedItems([
-                  ...selectedItems,
-                  ...optionsWithoutCreatable,
-                ]);
-                setInputValue("");
-              }
-            }}
-          />
-          <List>
-            {!creatable && filteredOptions.length === 0 && <EmptyPlaceholder />}
-            {filteredOptions.map((option, index) => (
-              <Fragment key={`${index}${option.value}${option.label}`}>
-                <ListItem
-                  index={index}
-                  highlightedIndex={highlightedIndex}
-                  item={filteredOptions[index]}
-                  getItemProps={getItemProps}
-                />
-                {index === getSentinelInsertIndex(filteredOptions.length) &&
-                  exists(onLoadMore) && (
-                    <LoadMoreSentinel
-                      onLoadMore={() => {
-                        if (!loading) {
-                          onLoadMore(inputValue);
-                        }
-                      }}
-                    />
-                  )}
-              </Fragment>
-            ))}
-          </List>
-        </Menu>
+        <MenuContainer ref={menuContainerRef}>
+          <Menu {...menuProps} ref={(instance) => menuPropsRef(instance)}>
+            <MenuActionBar
+              total={total}
+              optionsCount={filterOptionsCount}
+              onInsertAllClick={() => {
+                const moreInsertableThanCurrentlyLoaded =
+                  exists(total) && total > filterOptionsCount;
+
+                if (!!onLoadAndInsertAll && moreInsertableThanCurrentlyLoaded) {
+                  onLoadAndInsertAll(inputValue);
+                } else {
+                  const optionsWithoutCreatable =
+                    creatable && inputValue.length > 0
+                      ? filteredOptions.slice(1)
+                      : filteredOptions;
+
+                  setSelectedItems([
+                    ...selectedItems,
+                    ...optionsWithoutCreatable,
+                  ]);
+                  setInputValue("");
+                }
+              }}
+            />
+            <List>
+              {!creatable && filteredOptions.length === 0 && (
+                <EmptyPlaceholder />
+              )}
+              {filteredOptions.map((option, index) => (
+                <Fragment key={`${index}${option.value}${option.label}`}>
+                  <ListItem
+                    index={index}
+                    highlightedIndex={highlightedIndex}
+                    item={filteredOptions[index]}
+                    getItemProps={getItemProps}
+                  />
+                  {index === getSentinelInsertIndex(filteredOptions.length) &&
+                    exists(onLoadMore) && (
+                      <LoadMoreSentinel
+                        onLoadMore={() => {
+                          if (!loading) {
+                            onLoadMore(inputValue);
+                          }
+                        }}
+                      />
+                    )}
+                </Fragment>
+              ))}
+            </List>
+          </Menu>
+        </MenuContainer>
       ) : (
         <span ref={menuPropsRef} /> // To avoid a warning / error by downshift that ref is not applied
       )}
diff --git a/frontend/src/js/ui-components/InputSelect/InputSelect.tsx b/frontend/src/js/ui-components/InputSelect/InputSelect.tsx
index c118f0593b..f5f8d154d7 100644
--- a/frontend/src/js/ui-components/InputSelect/InputSelect.tsx
+++ b/frontend/src/js/ui-components/InputSelect/InputSelect.tsx
@@ -17,6 +17,7 @@ import {
   ItemsInputContainer,
   List,
   Menu,
+  MenuContainer,
   ResetButton,
   SelectContainer,
   SxSelectListOption,
@@ -73,7 +74,7 @@ const InputSelect = ({
   const previousValue = usePrevious(value);
   const previousOptions = usePrevious(options);
   const inputRef = useRef<HTMLInputElement | null>(null);
-  const menuRef = useRef<HTMLDivElement | null>(null);
+  const menuContainerRef = useRef<HTMLDivElement | null>(null);
 
   const [filteredOptions, setFilteredOptions] = useState(() => {
     if (!value) return options;
@@ -228,7 +229,7 @@ const InputSelect = ({
   useEffect(
     function scrollIntoView() {
       if (isOpen) {
-        menuRef.current?.scrollIntoView({
+        menuContainerRef.current?.scrollIntoView({
           behavior: "smooth",
           block: "nearest",
         });
@@ -301,44 +302,43 @@ const InputSelect = ({
         />
       </Control>
       {isOpen ? (
-        <Menu
-          {...menuProps}
-          onMouseDown={(e) => {
-            // To prevent causing input blur too soon, when selecting an option
-            // otherwise, input blur resets the search, which resets the filtered options list
-            // leading to a wrong click behavior when filtered
-            e.stopPropagation();
-          }}
-          ref={(instance) => {
-            menuRef.current = instance;
-            menuPropsRef(instance);
-          }}
-        >
-          <List small={smallMenu}>
-            {filteredOptions.length === 0 && <SelectEmptyPlaceholder />}
-            {filteredOptions.map((option, index) => {
-              const { ref: itemPropsRef, ...itemProps } = getItemProps({
-                index,
-                item: filteredOptions[index],
-              });
+        <MenuContainer ref={menuContainerRef}>
+          <Menu
+            {...menuProps}
+            onMouseDown={(e) => {
+              // To prevent causing input blur too soon, when selecting an option
+              // otherwise, input blur resets the search, which resets the filtered options list
+              // leading to a wrong click behavior when filtered
+              e.stopPropagation();
+            }}
+            ref={(instance) => menuPropsRef(instance)}
+          >
+            <List small={smallMenu}>
+              {filteredOptions.length === 0 && <SelectEmptyPlaceholder />}
+              {filteredOptions.map((option, index) => {
+                const { ref: itemPropsRef, ...itemProps } = getItemProps({
+                  index,
+                  item: filteredOptions[index],
+                });
 
-              return (
-                <SxSelectListOption
-                  key={`${option.value}`}
-                  option={option}
-                  active={
-                    highlightedIndex === index ||
-                    selectedItem?.value === option.value
-                  }
-                  {...itemProps}
-                  ref={(instance) => {
-                    itemPropsRef(instance);
-                  }}
-                />
-              );
-            })}
-          </List>
-        </Menu>
+                return (
+                  <SxSelectListOption
+                    key={`${option.value}`}
+                    option={option}
+                    active={
+                      highlightedIndex === index ||
+                      selectedItem?.value === option.value
+                    }
+                    {...itemProps}
+                    ref={(instance) => {
+                      itemPropsRef(instance);
+                    }}
+                  />
+                );
+              })}
+            </List>
+          </Menu>
+        </MenuContainer>
       ) : (
         <span ref={menuPropsRef} /> // To avoid a warning / error by downshift that ref is not applied
       )}
diff --git a/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx b/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
index e47d50a17f..aff140c8ca 100644
--- a/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
+++ b/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
@@ -37,14 +37,19 @@ export const ItemsInputContainer = styled("div")`
   width: 100%;
 `;
 
-export const Menu = styled("div")`
+export const MenuContainer = styled("div")`
   position: absolute;
+  width: 100%;
+  z-index: 3;
+  margin-top: 3px;
+  padding-bottom: 5px;
+`;
+
+export const Menu = styled("div")`
   width: 100%;
   border-radius: 4px;
   box-shadow: 0 0 0 1px hsl(0deg 0% 0% / 10%), 0 4px 11px hsl(0deg 0% 0% / 10%);
   background-color: ${({ theme }) => theme.col.bg};
-  z-index: 3;
-  margin-top: 3px;
 `;
 
 export const List = styled("div")<{ small?: boolean }>`

From 5b4b47d3e61158d300f6428f371d584e0f534ed8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 04:04:01 +0000
Subject: [PATCH 27/86] Bump java-jwt from 3.18.1 to 4.2.2

Bumps [java-jwt](https://github.com/auth0/java-jwt) from 3.18.1 to 4.2.2.
- [Release notes](https://github.com/auth0/java-jwt/releases)
- [Changelog](https://github.com/auth0/java-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/java-jwt/compare/3.18.1...4.2.2)

---
updated-dependencies:
- dependency-name: com.auth0:java-jwt
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f767a17021..033f7ed060 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -285,7 +285,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.18.1</version>
+            <version>4.2.2</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>

From 6d2b3ee23c1e9c02d5982f286b39085672cd2d52 Mon Sep 17 00:00:00 2001
From: Marco Korinth <marco@bizfactory.tech>
Date: Thu, 12 Jan 2023 14:28:28 +0100
Subject: [PATCH 28/86] autolabel is now only applied to nodes with more than 1
 element

---
 .../js/query-node-editor/QueryNodeEditor.tsx    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
index 3880ce33d3..72bd818399 100644
--- a/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
+++ b/frontend/src/js/query-node-editor/QueryNodeEditor.tsx
@@ -1,5 +1,5 @@
 import styled from "@emotion/styled";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 
 import type { PostPrefixForSuggestionsParams } from "../api/api";
@@ -162,12 +162,15 @@ const QueryNodeEditor = ({ node, ...props }: QueryNodeEditorPropsT) => {
     node,
     onUpdateLabel: props.onUpdateLabel,
   });
-  const nodeLabel =
-    autoLabelEnabled && autoLabel
-      ? autoLabel
-      : nodeIsConceptQueryNode(node)
-      ? node.label
-      : node.label || node.id;
+  const nodeLabel = useMemo(
+    () =>
+      !nodeIsConceptQueryNode(node)
+        ? node.label || node.id
+        : autoLabelEnabled && autoLabel && node.ids.length > 1
+        ? autoLabel
+        : node.label,
+    [autoLabel, autoLabelEnabled, node],
+  );
 
   return (
     <Root

From 428bb57be6612ab0b0fa3e0d8a94cda6aa836b08 Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Fri, 13 Jan 2023 16:03:24 +0100
Subject: [PATCH 29/86] allows external implementation to provide the response
 builder

---
 .../bakdata/conquery/io/result/ResultUtil.java   | 16 ++++------------
 .../io/result/arrow/ResultArrowProcessor.java    |  2 +-
 .../io/result/csv/ResultCsvProcessor.java        |  2 +-
 .../io/result/excel/ResultExcelProcessor.java    |  2 +-
 .../result/parquet/ResultParquetProcessor.java   |  2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java b/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java
index bb317061dc..47c80e2ba9 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java
@@ -4,10 +4,12 @@
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
 
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.auth.permissions.Ability;
@@ -18,15 +20,6 @@
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Locale;
-
 @Slf4j
 public class ResultUtil {
 
@@ -42,8 +35,7 @@ String getHeaderValue() {
 	}
 
 
-	public static Response makeResponseWithFileName(StreamingOutput out, String label, String fileExtension, MediaType mediaType, ContentDispositionOption disposition) {
-		Response.ResponseBuilder response = Response.ok(out);
+	public static Response makeResponseWithFileName(Response.ResponseBuilder response, String label, String fileExtension, MediaType mediaType, ContentDispositionOption disposition) {
 		response.header(HttpHeaders.CONTENT_TYPE, mediaType);
 		if (!(Strings.isNullOrEmpty(label) || label.isBlank())) {
 			// Set filename from label if the label was set, otherwise the browser will name the file according to the request path
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java
index 1f1a79df71..61a32303d0 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java
@@ -142,7 +142,7 @@ public static <E extends ManagedExecution<?> & SingleTableResult> Response getAr
 			}
 		};
 
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), fileExtension, mediaType, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), fileExtension, mediaType, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java
index 2817c18732..0c6b7c2375 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java
@@ -74,7 +74,7 @@ public <E extends ManagedExecution<?> & SingleTableResult> Response createResult
 			}
 		};
 
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "csv", new MediaType("text", "csv", charset.toString()), ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), "csv", new MediaType("text", "csv", charset.toString()), ResultUtil.ContentDispositionOption.ATTACHMENT);
 
 	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java
index 8fd257177b..f96e906683 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java
@@ -63,7 +63,7 @@ public <E extends ManagedExecution<?> & SingleTableResult> Response createResult
 			log.trace("FINISHED downloading {}", exec.getId());
 		};
 
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), "xlsx", MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 
 
diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java
index cc9a948930..bee9a72e10 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java
@@ -74,6 +74,6 @@ public Response createResultFile(Subject subject, ManagedExecution<?> exec, bool
 		};
 
 
-		return makeResponseWithFileName(out, exec.getLabelWithoutAutoLabelSuffix(), FILE_EXTENTION_PARQUET, PARQUET_MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
+		return makeResponseWithFileName(Response.ok(out), exec.getLabelWithoutAutoLabelSuffix(), FILE_EXTENTION_PARQUET, PARQUET_MEDIA_TYPE, ResultUtil.ContentDispositionOption.ATTACHMENT);
 	}
 }

From b5ef9171532f048f5ec7c0b62da5c6db01c3543d Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Thu, 12 Jan 2023 17:45:51 +0100
Subject: [PATCH 30/86] reword dataset as a single word

---
 frontend/src/localization/en.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index 6f49dfef75..be2be8b15b 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -82,10 +82,10 @@
     "aConceptList": "a concept list"
   },
   "datasetSelector": {
-    "label": "Data sets",
-    "pleaseChoose": "Choose a data set",
-    "error": "Could not load data sets",
-    "disabled": "Can't change the data set at the moment."
+    "label": "Datasets",
+    "pleaseChoose": "Choose a dataset",
+    "error": "Could not load datasets",
+    "disabled": "Can't change the dataset at the moment."
   },
   "queryNodeEditor": {
     "conceptTree": "Concept Tree",
@@ -442,7 +442,7 @@
     "tabQueryEditor": "In the Editor, a query may be built and sent.",
     "tabTimebasedEditor": "In the Timebased Editor, a time-based query may be built and sent. That means, previous queries may be combined using time based relations, such as 'before' and 'after'.",
     "tabFormEditor": "The Form Editor allows for further analysis and statistics of previous queries.",
-    "datasetSelector": "Select the data set – concept trees, previous queries and forms will be loaded.",
+    "datasetSelector": "Select the dataset – concept trees, previous queries and forms will be loaded.",
     "excludeTimestamps": "If selected, will avoid using the date values from this concept within a query.",
     "excludeFromSecondaryId": "If selected, will avoid using this concept in the analysis layer, should an analysis layer be selected.",
     "editConceptName": "Edit concept name",

From aa748810eafd74f23872ba214c114403c2d5f013 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 16 Jan 2023 11:29:43 +0100
Subject: [PATCH 31/86] Group save and load code, explain data, reuse toCSV

---
 .../js/entity-history/LoadHistoryDropzone.tsx |  48 +-------
 frontend/src/js/entity-history/Navigation.tsx |  25 +----
 frontend/src/js/entity-history/saveAndLoad.ts | 103 ++++++++++++++++++
 3 files changed, 107 insertions(+), 69 deletions(-)
 create mode 100644 frontend/src/js/entity-history/saveAndLoad.ts

diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index 4b29b64b85..b1d0d180e2 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -13,6 +13,7 @@ import DropzoneWithFileInput, {
 import type { EntityIdsStatus } from "./History";
 import { DEFAULT_ID_KIND } from "./actions";
 import { EntityId } from "./reducer";
+import { useLoadHistory } from "./saveAndLoad";
 
 const ImportButtonSpacer = styled("div")`
   height: 30px;
@@ -41,52 +42,7 @@ export const LoadHistoryDropzone = ({
   const { t } = useTranslation();
   const dispatch = useDispatch();
 
-  const loadHistory = ({
-    label,
-    data,
-  }: {
-    label: string;
-    data: string[][];
-  }) => {
-    const loadedEntityIds: EntityId[] = [];
-    const loadedEntityStatus: EntityIdsStatus = {};
-    const loadedEntityStatusOptionsRaw: string[] = [];
-
-    for (const row of data) {
-      if (row.length < 2) {
-        continue;
-      }
-
-      loadedEntityIds.push({ kind: row[0], id: row[1] });
-
-      if (row.length > 2) {
-        loadedEntityStatus[row[1]] = row
-          .slice(2)
-          .filter((str) => str.length > 0)
-          .map((s) => {
-            const opt = s.trim();
-            loadedEntityStatusOptionsRaw.push(opt);
-            return { label: opt, value: opt };
-          });
-      }
-    }
-
-    const loadedEntityStatusOptions = [
-      ...new Set(loadedEntityStatusOptionsRaw),
-    ].map((item) => ({ label: item, value: item }));
-
-    if (loadedEntityIds.length === 0) {
-      dispatch(setMessage({ message: t("history.load.error") }));
-      return;
-    }
-
-    onLoadFromFile({
-      label,
-      loadedEntityIds,
-      loadedEntityStatus,
-      loadedEntityStatusOptions,
-    });
-  };
+  const loadHistory = useLoadHistory({ onLoadFromFile });
 
   const onDrop = async ({ files }: DragItemFile) => {
     const file = files[0];
diff --git a/frontend/src/js/entity-history/Navigation.tsx b/frontend/src/js/entity-history/Navigation.tsx
index 142abf5a51..10ae6bf5d8 100644
--- a/frontend/src/js/entity-history/Navigation.tsx
+++ b/frontend/src/js/entity-history/Navigation.tsx
@@ -6,7 +6,6 @@ import { useDispatch } from "react-redux";
 
 import { SelectOptionT } from "../api/types";
 import IconButton from "../button/IconButton";
-import { downloadBlob } from "../common/helpers/downloadBlob";
 import WithTooltip from "../tooltip/WithTooltip";
 
 import { EntityIdsList } from "./EntityIdsList";
@@ -15,6 +14,7 @@ import { LoadHistoryDropzone, LoadingPayload } from "./LoadHistoryDropzone";
 import { NavigationHeader } from "./NavigationHeader";
 import { closeHistory, useUpdateHistorySession } from "./actions";
 import { EntityId } from "./reducer";
+import { saveHistory } from "./saveAndLoad";
 
 const Root = styled("div")`
   display: grid;
@@ -104,28 +104,7 @@ export const Navigation = memo(
     }, [entityIds, currentEntityIndex, updateHistorySession]);
 
     const onDownload = useCallback(() => {
-      const usedStatuses = Object.values(entityIdsStatus).reduce(
-        (longest, el) => (longest.length > el.length ? longest : el),
-        [],
-      );
-      const idToRow = (entityId: EntityId) =>
-        [
-          entityId.kind,
-          entityId.id,
-          usedStatuses
-            .map((opt) =>
-              entityIdsStatus[entityId.id]?.includes(opt) ? opt.value : "",
-            )
-            .join(";"),
-        ].join(";");
-
-      const csvString = entityIds.map(idToRow).join("\n");
-
-      const blob = new Blob([csvString], {
-        type: "application/csv",
-      });
-
-      downloadBlob(blob, "list.csv");
+      saveHistory({ entityIds, entityIdsStatus });
     }, [entityIds, entityIdsStatus]);
 
     useHotkeys("shift+up", goToPrev, [goToPrev]);
diff --git a/frontend/src/js/entity-history/saveAndLoad.ts b/frontend/src/js/entity-history/saveAndLoad.ts
new file mode 100644
index 0000000000..750ee657a9
--- /dev/null
+++ b/frontend/src/js/entity-history/saveAndLoad.ts
@@ -0,0 +1,103 @@
+import { useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
+
+import { downloadBlob } from "../common/helpers/downloadBlob";
+import { toCSV } from "../file/csv";
+import { setMessage } from "../snack-message/actions";
+
+import { EntityIdsStatus } from "./History";
+import { LoadingPayload } from "./LoadHistoryDropzone";
+import { EntityId } from "./reducer";
+
+export const saveHistory = ({
+  entityIds,
+  entityIdsStatus,
+}: {
+  entityIds: EntityId[];
+  entityIdsStatus: EntityIdsStatus;
+}) => {
+  console.log(entityIdsStatus);
+  const usedStatuses = Object.values(entityIdsStatus).reduce(
+    (longest, el) => (longest.length > el.length ? longest : el),
+    [],
+  );
+
+  // Store data as CSV in format:
+  // kind;id;status1;status2;...
+  const idToRow = (entityId: EntityId) => [
+    entityId.kind, // First column
+    entityId.id, // Second column
+    ...usedStatuses // Rest of the columns
+      .map((opt) =>
+        entityIdsStatus[entityId.id].find((s) => s.value === opt.value)
+          ? (opt.value as string)
+          : "",
+      ),
+  ];
+
+  const csvString = toCSV(entityIds.map(idToRow));
+
+  const blob = new Blob([csvString], {
+    type: "application/csv",
+  });
+
+  downloadBlob(blob, "list.csv");
+};
+
+export const useLoadHistory = ({
+  onLoadFromFile,
+}: {
+  onLoadFromFile: (payload: LoadingPayload) => void;
+}) => {
+  const { t } = useTranslation();
+  const dispatch = useDispatch();
+
+  return useCallback(
+    ({ label, data }: { label: string; data: string[][] }) => {
+      const loadedEntityIds: EntityId[] = [];
+      const loadedEntityStatus: EntityIdsStatus = {};
+      const loadedEntityStatusOptionsRaw: string[] = [];
+
+      // Expect data to be a CSV in format:
+      // kind;id;status1;status2;...
+      for (const row of data) {
+        if (row.length < 2) {
+          continue;
+        }
+
+        const [kind, id] = row;
+
+        loadedEntityIds.push({ kind, id });
+
+        if (row.length > 2) {
+          loadedEntityStatus[id] = row
+            .slice(2)
+            .filter((str) => str.length > 0)
+            .map((s) => {
+              const opt = s.trim();
+              loadedEntityStatusOptionsRaw.push(opt);
+              return { label: opt, value: opt };
+            });
+        }
+      }
+
+      const loadedEntityStatusOptions = [
+        ...new Set(loadedEntityStatusOptionsRaw),
+      ].map((item) => ({ label: item, value: item }));
+
+      if (loadedEntityIds.length === 0) {
+        dispatch(setMessage({ message: t("history.load.error") }));
+        return;
+      }
+
+      onLoadFromFile({
+        label,
+        loadedEntityIds,
+        loadedEntityStatus,
+        loadedEntityStatusOptions,
+      });
+    },
+    [dispatch],
+  );
+};

From 35a2849f35061f49b7b8ff5c410638651c1a6d1b Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 16 Jan 2023 11:32:05 +0100
Subject: [PATCH 32/86] Add memoization

---
 frontend/src/js/entity-history/saveAndLoad.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/js/entity-history/saveAndLoad.ts b/frontend/src/js/entity-history/saveAndLoad.ts
index 750ee657a9..b5de3cade7 100644
--- a/frontend/src/js/entity-history/saveAndLoad.ts
+++ b/frontend/src/js/entity-history/saveAndLoad.ts
@@ -98,6 +98,6 @@ export const useLoadHistory = ({
         loadedEntityStatusOptions,
       });
     },
-    [dispatch],
+    [dispatch, t, onLoadFromFile],
   );
 };

From 910ce90078cfe176efdde4a5f12eeb1785df4054 Mon Sep 17 00:00:00 2001
From: Fabian Blank <fabian.blank@bizfactory.tech>
Date: Mon, 16 Jan 2023 14:58:20 +0100
Subject: [PATCH 33/86] add Notification Type

---
 frontend/src/js/dataset/actions.ts            |  7 ++-
 .../js/entity-history/LoadHistoryDropzone.tsx | 14 +++++-
 .../js/external-forms/FormConfigLoader.tsx    |  8 ++-
 .../src/js/previous-queries/list/actions.ts   | 50 ++++++++++++++++---
 .../list/useDeleteProjectItemFolder.tsx       |  7 ++-
 .../upload/UploadQueryResults.tsx             |  5 +-
 .../src/js/snack-message/SnackMessage.tsx     | 22 +++++---
 frontend/src/js/snack-message/actions.ts      |  3 ++
 frontend/src/js/snack-message/reducer.ts      |  9 +++-
 9 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/frontend/src/js/dataset/actions.ts b/frontend/src/js/dataset/actions.ts
index 2712fc5db8..7f6a731cd6 100644
--- a/frontend/src/js/dataset/actions.ts
+++ b/frontend/src/js/dataset/actions.ts
@@ -57,7 +57,12 @@ export const useLoadDatasets = () => {
 
       return loadTrees(defaultId);
     } catch (e) {
-      dispatch(setMessage({ message: t("datasetSelector.error") }));
+      dispatch(
+        setMessage({
+          message: t("datasetSelector.error"),
+          notificationType: "error",
+        }),
+      );
       dispatch(loadDatasets.failure(e as Error));
     }
   }, [dispatch, getDatasets, loadDefaultHistoryParams, loadTrees, t]);
diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index 8a31f1c9c2..4aab595a58 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -70,7 +70,12 @@ export const LoadHistoryDropzone = ({
     ].map((item) => ({ label: item, value: item }));
 
     if (loadedEntityIds.length === 0) {
-      dispatch(setMessage({ message: t("history.load.error") }));
+      dispatch(
+        setMessage({
+          message: t("history.load.error"),
+          notificationType: "error",
+        }),
+      );
       return;
     }
 
@@ -87,7 +92,12 @@ export const LoadHistoryDropzone = ({
     const { data } = await parseCSV(file, ";");
 
     if (data.length === 0) {
-      dispatch(setMessage({ message: t("history.load.error") }));
+      dispatch(
+        setMessage({
+          message: t("history.load.error"),
+          notificationType: "error",
+        }),
+      );
       return;
     }
 
diff --git a/frontend/src/js/external-forms/FormConfigLoader.tsx b/frontend/src/js/external-forms/FormConfigLoader.tsx
index 00f4ac33a7..d211f60ba0 100644
--- a/frontend/src/js/external-forms/FormConfigLoader.tsx
+++ b/frontend/src/js/external-forms/FormConfigLoader.tsx
@@ -147,6 +147,7 @@ const FormConfigLoader: FC<Props> = ({
           message: t("formConfig.loadSuccess", {
             label: formConfigToLoadNext.label,
           }),
+          notificationType: "success",
         }),
       );
     },
@@ -171,7 +172,12 @@ const FormConfigLoader: FC<Props> = ({
 
       setFormConfigToLoadNext(config);
     } catch (e) {
-      dispatch(setMessage({ message: t("formConfig.loadError") }));
+      dispatch(
+        setMessage({
+          message: t("formConfig.loadError"),
+          notificationType: "error",
+        }),
+      );
     }
   }
 
diff --git a/frontend/src/js/previous-queries/list/actions.ts b/frontend/src/js/previous-queries/list/actions.ts
index 564ef86d48..215b03bc51 100644
--- a/frontend/src/js/previous-queries/list/actions.ts
+++ b/frontend/src/js/previous-queries/list/actions.ts
@@ -55,7 +55,12 @@ export const useLoadQueries = () => {
 
         dispatch(loadQueriesSuccess({ data }));
       } catch (e) {
-        dispatch(setMessage({ message: t("previousQueries.error") }));
+        dispatch(
+          setMessage({
+            message: t("previousQueries.error"),
+            notificationType: "error",
+          }),
+        );
       }
       setLoading(false);
     },
@@ -88,7 +93,12 @@ export const useLoadQuery = () => {
 
         dispatch(loadQuerySuccess({ id: queryId, data: query }));
       } catch (e) {
-        dispatch(setMessage({ message: t("previousQuery.loadError") }));
+        dispatch(
+          setMessage({
+            message: t("previousQuery.loadError"),
+            notificationType: "error",
+          }),
+        );
       }
       setLoading(false);
     },
@@ -128,7 +138,9 @@ export const useUpdateQuery = () => {
 
       dispatch(patchQuerySuccess({ id, data: attributes }));
     } catch (e) {
-      dispatch(setMessage({ message: errorMessage }));
+      dispatch(
+        setMessage({ message: errorMessage, notificationType: "error" }),
+      );
     }
     setLoading(false);
   };
@@ -153,7 +165,12 @@ export const useRemoveQuery = () => {
 
       dispatch(deleteQuerySuccess({ queryId }));
     } catch (e) {
-      dispatch(setMessage({ message: t("previousQuery.deleteError") }));
+      dispatch(
+        setMessage({
+          message: t("previousQuery.deleteError"),
+          notificationType: "error",
+        }),
+      );
     }
     setLoading(false);
   };
@@ -194,7 +211,12 @@ export const useLoadFormConfigs = () => {
 
         dispatch(loadFormConfigsSuccess({ data }));
       } catch (e) {
-        dispatch(setMessage({ message: t("formConfigs.error") }));
+        dispatch(
+          setMessage({
+            message: t("formConfigs.error"),
+            notificationType: "error",
+          }),
+        );
       }
       setLoading(false);
     },
@@ -228,7 +250,12 @@ export const useLoadFormConfig = () => {
 
         dispatch(patchFormConfigSuccess({ id, data }));
       } catch (e) {
-        dispatch(setMessage({ message: t("formConfig.loadError") }));
+        dispatch(
+          setMessage({
+            message: t("formConfig.loadError"),
+            notificationType: "error",
+          }),
+        );
       }
       setLoading(false);
     },
@@ -263,7 +290,9 @@ export const useUpdateFormConfig = () => {
 
       dispatch(patchFormConfigSuccess({ id: configId, data: attributes }));
     } catch (e) {
-      dispatch(setMessage({ message: errorMessage }));
+      dispatch(
+        setMessage({ message: errorMessage, notificationType: "error" }),
+      );
     }
     setLoading(false);
   };
@@ -289,7 +318,12 @@ export const useRemoveFormConfig = () => {
 
       dispatch(deleteFormConfigSuccess({ configId }));
     } catch (e) {
-      dispatch(setMessage({ message: t("formConfig.deleteError") }));
+      dispatch(
+        setMessage({
+          message: t("formConfig.deleteError"),
+          notificationType: "error",
+        }),
+      );
     }
     setLoading(false);
   };
diff --git a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
index 54fbb0ea65..cdfd0df920 100644
--- a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
+++ b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
@@ -70,7 +70,12 @@ export const useDeleteProjectItemFolder = () => {
 
       return Promise.all([loadQueries(datasetId), loadFormConfigs(datasetId)]);
     } catch (e) {
-      dispatch(setMessage({ message: t("previousQuery.retagError") }));
+      dispatch(
+        setMessage({
+          message: t("previousQuery.retagError"),
+          notificationType: "error",
+        }),
+      );
       return Promise.reject();
     }
   };
diff --git a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
index 0707fce589..0a1fbae723 100644
--- a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
+++ b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
@@ -65,7 +65,10 @@ const UploadQueryResults = ({ className, datasetId }: PropsT) => {
         setUploadResult(e as UploadQueryResponseT);
       } else {
         dispatch(
-          setMessage({ message: t("uploadQueryResultsModal.uploadFailed") }),
+          setMessage({
+            message: t("uploadQueryResultsModal.uploadFailed"),
+            notificationType: "error",
+          }),
         );
       }
     }
diff --git a/frontend/src/js/snack-message/SnackMessage.tsx b/frontend/src/js/snack-message/SnackMessage.tsx
index 8aa5aff1da..2b7f0371bf 100644
--- a/frontend/src/js/snack-message/SnackMessage.tsx
+++ b/frontend/src/js/snack-message/SnackMessage.tsx
@@ -7,13 +7,21 @@ import { useClickOutside } from "../common/helpers/useClickOutside";
 import FaIcon from "../icon/FaIcon";
 
 import { setMessage } from "./actions";
+import { SnackMessageStateT, SnackMessageTypeT } from "./reducer";
 
-const Root = styled("div")`
+const colorLookupTable = {
+  error: "rgba(0, 0, 0, 0.75)",
+  success: "rgba(12, 100, 39, 0.75)", // #0C6427
+  default: "rgba(0, 0, 0, 0.75)",
+};
+
+const Root = styled("div")<{ notificationType: SnackMessageTypeT }>`
   position: fixed;
   z-index: 10;
   bottom: 20px;
   right: 20px;
-  background-color: rgba(0, 0, 0, 0.75);
+  background-color: ${({ notificationType }) =>
+    colorLookupTable[notificationType ?? "default"]};
   color: white;
   display: flex;
   flex-direction: row;
@@ -41,11 +49,12 @@ const ClearZone = styled("div")`
 
 const SnackMessage: FC = memo(function SnackMessageComponent() {
   const ref = useRef(null);
-  const message = useSelector<StateT, string | null>(
-    (state) => state.snackMessage.message,
+  const { message, notificationType } = useSelector<StateT, SnackMessageStateT>(
+    (state) => state.snackMessage,
   );
   const dispatch = useDispatch();
-  const resetMessage = () => dispatch(setMessage({ message: null }));
+  const resetMessage = () =>
+    dispatch(setMessage({ message: null, notificationType: null }));
 
   useClickOutside(ref, () => {
     if (message) {
@@ -53,10 +62,11 @@ const SnackMessage: FC = memo(function SnackMessageComponent() {
     }
   });
 
+  console.log("type is: ", notificationType);
   return (
     <div ref={ref}>
       {message && (
-        <Root>
+        <Root notificationType={notificationType}>
           <Relative>
             <div dangerouslySetInnerHTML={{ __html: message }} />
             <ClearZone onClick={resetMessage}>
diff --git a/frontend/src/js/snack-message/actions.ts b/frontend/src/js/snack-message/actions.ts
index 2348768fe1..f93c95e191 100644
--- a/frontend/src/js/snack-message/actions.ts
+++ b/frontend/src/js/snack-message/actions.ts
@@ -1,11 +1,14 @@
 import { ActionType, createAction } from "typesafe-actions";
 
+import { SnackMessageTypeT } from "./reducer";
+
 export type SnackMessageActions = ActionType<
   typeof setMessage | typeof resetMessage
 >;
 
 export const setMessage = createAction("snack-message/SET")<{
   message: string | null;
+  notificationType: SnackMessageTypeT;
 }>();
 
 export const resetMessage = createAction("snack-message/RESET")();
diff --git a/frontend/src/js/snack-message/reducer.ts b/frontend/src/js/snack-message/reducer.ts
index 7e91759ab0..d3e0bc2ded 100644
--- a/frontend/src/js/snack-message/reducer.ts
+++ b/frontend/src/js/snack-message/reducer.ts
@@ -4,12 +4,15 @@ import { Action } from "../app/actions";
 
 import { resetMessage, setMessage } from "./actions";
 
+export type SnackMessageTypeT = "success" | "error" | null;
 export interface SnackMessageStateT {
   message: string | null;
+  notificationType: SnackMessageTypeT;
 }
 
 const initialState: SnackMessageStateT = {
   message: null,
+  notificationType: null,
 };
 
 function reducer(
@@ -18,7 +21,11 @@ function reducer(
 ): SnackMessageStateT {
   switch (action.type) {
     case getType(setMessage):
-      return { ...state, message: action.payload.message };
+      return {
+        ...state,
+        message: action.payload.message,
+        notificationType: action.payload.notificationType,
+      };
     case getType(resetMessage):
       return initialState;
     default:

From dcbda3923331bafa07ad8803e8e75e926d1aade1 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 16 Jan 2023 16:26:17 +0100
Subject: [PATCH 34/86] Replace InputMultiSelectDropzone with
 DropzoneWithFileInput

---
 .../ui-components/DropzoneWithFileInput.tsx   | 24 +++--
 .../InputMultiSelect/InputMultiSelect.tsx     | 21 +++--
 .../InputMultiSelect/useResolvableSelect.ts   | 11 ---
 .../InputMultiSelectDropzone.tsx              | 87 -------------------
 4 files changed, 31 insertions(+), 112 deletions(-)
 delete mode 100644 frontend/src/js/ui-components/InputMultiSelectDropzone.tsx

diff --git a/frontend/src/js/ui-components/DropzoneWithFileInput.tsx b/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
index 9d470d9c0d..da89f4bd29 100644
--- a/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
+++ b/frontend/src/js/ui-components/DropzoneWithFileInput.tsx
@@ -1,3 +1,4 @@
+import { css } from "@emotion/react";
 import styled from "@emotion/styled";
 import {
   useRef,
@@ -26,20 +27,25 @@ const FileInput = styled("input")`
   display: none;
 `;
 
-const SxDropzone = styled(Dropzone)<{ isInitial?: boolean }>`
+const SxDropzone = styled(Dropzone)<{ isInitial?: boolean; tight?: boolean }>`
   cursor: ${({ isInitial }) => (isInitial ? "initial" : "pointer")};
   transition: box-shadow ${({ theme }) => theme.transitionTime};
   position: relative;
+  ${({ tight }) =>
+    tight &&
+    css`
+      padding: 5px;
+    `}
 
   &:hover {
     box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2);
   }
 `;
 
-const SxSelectFileButton = styled(SelectFileButton)`
+const SxSelectFileButton = styled(SelectFileButton)<{ outside?: boolean }>`
   position: absolute;
-  top: 3px;
-  right: 0;
+  top: ${({ outside }) => (outside ? "-26px" : "3px")};
+  right: ${({ outside }) => (outside ? "-12px" : "0")};
 `;
 
 const SxFaIcon = styled(FaIcon)`
@@ -59,8 +65,10 @@ interface PropsT<DroppableObject> {
   disableClick?: boolean;
   isInitial?: boolean;
   className?: string;
+  tight?: boolean;
 
   showImportButton?: boolean;
+  importButtonOutside?: boolean;
   onImportLines?: (lines: string[]) => void;
   importPlaceholder?: string;
   importDescription?: string;
@@ -82,6 +90,7 @@ const DropzoneWithFileInput = <
     onImportLines,
     importPlaceholder,
     importDescription,
+    importButtonOutside,
     acceptedDropTypes,
     disableClick,
     showImportButton,
@@ -90,6 +99,7 @@ const DropzoneWithFileInput = <
     isInitial,
     className,
     accept,
+    tight,
   }: PropsT<DroppableObject>,
   ref: Ref<HTMLDivElement>,
 ) => {
@@ -112,6 +122,7 @@ const DropzoneWithFileInput = <
 
   return (
     <SxDropzone /* <FC<DropzoneProps<DroppableObject | DragItemFile>>> */
+      tight={tight}
       acceptedDropTypes={dropTypes}
       onClick={() => {
         if (disableClick) return;
@@ -145,7 +156,10 @@ const DropzoneWithFileInput = <
             />
           )}
           {showImportButton && onImportLines && (
-            <SxSelectFileButton onClick={() => setImportModalOpen(true)}>
+            <SxSelectFileButton
+              outside={importButtonOutside}
+              onClick={() => setImportModalOpen(true)}
+            >
               <SxFaIcon icon="file-import" gray />
               {t("common.import")}
             </SxSelectFileButton>
diff --git a/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx b/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
index e0788bcae8..3b8d0605cd 100644
--- a/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
+++ b/frontend/src/js/ui-components/InputMultiSelect/InputMultiSelect.tsx
@@ -8,7 +8,7 @@ import { exists } from "../../common/helpers/exists";
 import { useDebounce } from "../../common/helpers/useDebounce";
 import FaIcon from "../../icon/FaIcon";
 import InfoTooltip from "../../tooltip/InfoTooltip";
-import InputMultiSelectDropzone from "../InputMultiSelectDropzone";
+import DropzoneWithFileInput from "../DropzoneWithFileInput";
 import {
   Control,
   DropdownToggleButton,
@@ -46,10 +46,6 @@ const getSentinelInsertIndex = (optionsLength: number) => {
   return optionsLength - SENTINEL_INSERT_INDEX_FROM_BOTTOM;
 };
 
-const SxInputMultiSelectDropzone = styled(InputMultiSelectDropzone)`
-  display: block;
-`;
-
 const SxFaIcon = styled(FaIcon)`
   margin: 3px 6px;
 `;
@@ -93,7 +89,7 @@ const InputMultiSelect = ({
   onLoadMore,
   onLoadAndInsertAll,
 }: Props) => {
-  const { onDropFile } = useResolvableSelect({
+  useResolvableSelect({
     defaultValue,
     onResolve,
   });
@@ -433,10 +429,17 @@ const InputMultiSelect = ({
         <TooManyValues count={value.length} onClear={() => onChange([])} />
       )}
       {!hasTooManyValues && !onResolve && Select}
-      {!hasTooManyValues && !!onResolve && onDropFile && (
-        <SxInputMultiSelectDropzone disabled={disabled} onDropFile={onDropFile}>
+      {!hasTooManyValues && !!onResolve && (
+        <DropzoneWithFileInput
+          onDrop={() => {}}
+          disableClick
+          tight
+          importButtonOutside
+          showImportButton={!disabled}
+          onImportLines={onResolve}
+        >
           {() => Select}
-        </SxInputMultiSelectDropzone>
+        </DropzoneWithFileInput>
       )}
     </>
   );
diff --git a/frontend/src/js/ui-components/InputMultiSelect/useResolvableSelect.ts b/frontend/src/js/ui-components/InputMultiSelect/useResolvableSelect.ts
index 3429ad3a4f..88f4d1e7fe 100644
--- a/frontend/src/js/ui-components/InputMultiSelect/useResolvableSelect.ts
+++ b/frontend/src/js/ui-components/InputMultiSelect/useResolvableSelect.ts
@@ -1,7 +1,6 @@
 import { useEffect } from "react";
 
 import { SelectOptionT } from "../../api/types";
-import { getUniqueFileRows } from "../../common/helpers/fileHelper";
 import { usePrevious } from "../../common/helpers/usePrevious";
 
 export const useResolvableSelect = ({
@@ -33,14 +32,4 @@ export const useResolvableSelect = ({
     },
     [onResolve, previousDefaultValue, defaultValue],
   );
-
-  const onDropFile = async (file: File) => {
-    const rows = await getUniqueFileRows(file);
-
-    if (onResolve) {
-      onResolve(rows);
-    }
-  };
-
-  return { onDropFile: onResolve ? onDropFile : undefined };
 };
diff --git a/frontend/src/js/ui-components/InputMultiSelectDropzone.tsx b/frontend/src/js/ui-components/InputMultiSelectDropzone.tsx
deleted file mode 100644
index 324f237aaf..0000000000
--- a/frontend/src/js/ui-components/InputMultiSelectDropzone.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import styled from "@emotion/styled";
-import { FC, ReactNode, useRef } from "react";
-import { NativeTypes } from "react-dnd-html5-backend";
-import { useTranslation } from "react-i18next";
-
-import { SelectFileButton } from "../button/SelectFileButton";
-import FaIcon from "../icon/FaIcon";
-
-import Dropzone from "./Dropzone";
-import type { DragItemFile } from "./DropzoneWithFileInput";
-
-const Root = styled("div")`
-  position: relative;
-`;
-
-const SxDropzone = styled(Dropzone)`
-  padding: 5px;
-`;
-
-const FileInput = styled("input")`
-  display: none;
-`;
-
-const SxSelectFileButton = styled(SelectFileButton)`
-  position: absolute;
-  top: -15px;
-  right: 0;
-`;
-
-const SxFaIcon = styled(FaIcon)`
-  height: 10px;
-  padding-right: 3px;
-`;
-
-interface PropsT {
-  className?: string;
-  disabled?: boolean;
-  onDropFile: (file: File) => void;
-  children: () => ReactNode;
-}
-
-const InputMultiSelectDropzone: FC<PropsT> = ({
-  className,
-  disabled,
-  onDropFile,
-  children,
-}) => {
-  const { t } = useTranslation();
-  const fileInputRef = useRef<HTMLInputElement>(null);
-
-  function onOpenFileDialog() {
-    if (fileInputRef.current) {
-      fileInputRef.current.click();
-    }
-  }
-
-  return (
-    <Root className={className}>
-      <SxDropzone /* TODO: ADD GENERIC TYPE <DragItemFile> */
-        acceptedDropTypes={[NativeTypes.FILE]}
-        onDrop={(item) => {
-          onDropFile((item as DragItemFile).files[0]);
-        }}
-      >
-        {children}
-      </SxDropzone>
-      <SxSelectFileButton bare disabled={disabled} onClick={onOpenFileDialog}>
-        <SxFaIcon icon="file" regular gray />
-        {t("common.import")}
-        <FileInput
-          ref={fileInputRef}
-          type="file"
-          onChange={(e) => {
-            if (e.target.files) {
-              onDropFile(e.target.files[0]);
-              if (fileInputRef.current) {
-                fileInputRef.current.value = "";
-              }
-            }
-          }}
-        />
-      </SxSelectFileButton>
-    </Root>
-  );
-};
-
-export default InputMultiSelectDropzone;

From d36df17df4ff3ef75e94134005e22d4b78b43ae5 Mon Sep 17 00:00:00 2001
From: Fabian Blank <fabian.blank@bizfactory.tech>
Date: Mon, 16 Jan 2023 16:39:08 +0100
Subject: [PATCH 35/86] fix issues that occured from merging

---
 frontend/src/js/entity-history/LoadHistoryDropzone.tsx | 3 +--
 frontend/src/js/entity-history/saveAndLoad.ts          | 7 ++++++-
 frontend/src/js/snack-message/SnackMessage.tsx         | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index d8ea149619..dbf01cdad0 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -48,8 +48,7 @@ export const LoadHistoryDropzone = ({
     const { data } = await parseCSV(file, ";");
 
     if (data.length === 0) {
-      
-      (
+      dispatch(
         setMessage({
           message: t("history.load.error"),
           notificationType: "error",
diff --git a/frontend/src/js/entity-history/saveAndLoad.ts b/frontend/src/js/entity-history/saveAndLoad.ts
index b5de3cade7..8aa0f2f0e5 100644
--- a/frontend/src/js/entity-history/saveAndLoad.ts
+++ b/frontend/src/js/entity-history/saveAndLoad.ts
@@ -87,7 +87,12 @@ export const useLoadHistory = ({
       ].map((item) => ({ label: item, value: item }));
 
       if (loadedEntityIds.length === 0) {
-        dispatch(setMessage({ message: t("history.load.error") }));
+        dispatch(
+          setMessage({
+            message: t("history.load.error"),
+            notificationType: "error",
+          }),
+        );
         return;
       }
 
diff --git a/frontend/src/js/snack-message/SnackMessage.tsx b/frontend/src/js/snack-message/SnackMessage.tsx
index 2b7f0371bf..531bc00456 100644
--- a/frontend/src/js/snack-message/SnackMessage.tsx
+++ b/frontend/src/js/snack-message/SnackMessage.tsx
@@ -62,7 +62,6 @@ const SnackMessage: FC = memo(function SnackMessageComponent() {
     }
   });
 
-  console.log("type is: ", notificationType);
   return (
     <div ref={ref}>
       {message && (

From 1ef5875ff978a6762e58e9bad95bd29301b8d56e Mon Sep 17 00:00:00 2001
From: Marco Korinth <marco@bizfactory.tech>
Date: Tue, 17 Jan 2023 10:37:22 +0100
Subject: [PATCH 36/86] adjusted MAX_AUTOLABEL_LENGTH to 250

---
 frontend/src/js/query-node-editor/useAutoLabel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/js/query-node-editor/useAutoLabel.ts b/frontend/src/js/query-node-editor/useAutoLabel.ts
index 931b17f0c9..4d6774a333 100644
--- a/frontend/src/js/query-node-editor/useAutoLabel.ts
+++ b/frontend/src/js/query-node-editor/useAutoLabel.ts
@@ -10,7 +10,7 @@ interface AutoLabelProps {
 }
 
 export function useAutoLabel({ node, onUpdateLabel }: AutoLabelProps) {
-  const MAX_AUTOLABEL_LENGTH = 30;
+  const MAX_AUTOLABEL_LENGTH = 250;
   const DELIMITER = " ";
 
   const formatConceptLabels = (labels: string[]) =>

From e7e201e2984fe785d252d7f23eff8ac67b9fb1f0 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 17 Jan 2023 10:17:02 +0100
Subject: [PATCH 37/86] Rename HistoryButton

---
 .../{HistoryButton.tsx => QueryResultHistoryButton.tsx}      | 5 +----
 frontend/src/js/query-runner/QueryResults.tsx                | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename frontend/src/js/button/{HistoryButton.tsx => QueryResultHistoryButton.tsx} (90%)

diff --git a/frontend/src/js/button/HistoryButton.tsx b/frontend/src/js/button/QueryResultHistoryButton.tsx
similarity index 90%
rename from frontend/src/js/button/HistoryButton.tsx
rename to frontend/src/js/button/QueryResultHistoryButton.tsx
index 99ca8e241a..cadf41ca99 100644
--- a/frontend/src/js/button/HistoryButton.tsx
+++ b/frontend/src/js/button/QueryResultHistoryButton.tsx
@@ -20,7 +20,7 @@ interface PropsT {
   url: string;
 }
 
-const HistoryButton = ({ url, label, columns, ...restProps }: PropsT) => {
+export const QueryResultHistoryButton = ({ url, label, columns }: PropsT) => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
   const isLoading = useSelector<StateT, boolean>(
@@ -38,11 +38,8 @@ const HistoryButton = ({ url, label, columns, ...restProps }: PropsT) => {
         await newHistorySession(getAuthorizedUrl(url), columns, label);
         dispatch(openHistory());
       }}
-      {...restProps}
     >
       {t("history.history")}
     </SxIconButton>
   );
 };
-
-export default HistoryButton;
diff --git a/frontend/src/js/query-runner/QueryResults.tsx b/frontend/src/js/query-runner/QueryResults.tsx
index a3cb0e263e..06554212d0 100644
--- a/frontend/src/js/query-runner/QueryResults.tsx
+++ b/frontend/src/js/query-runner/QueryResults.tsx
@@ -3,8 +3,8 @@ import { FC } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { ColumnDescription } from "../api/types";
-import HistoryButton from "../button/HistoryButton";
 import PreviewButton from "../button/PreviewButton";
+import { QueryResultHistoryButton } from "../button/QueryResultHistoryButton";
 import { isEmpty } from "../common/helpers/commonHelper";
 import { exists } from "../common/helpers/exists";
 import FaIcon from "../icon/FaIcon";
@@ -69,7 +69,7 @@ const QueryResults: FC<PropsT> = ({
       {!!csvUrl && exists(resultColumns) && (
         <>
           <PreviewButton columns={resultColumns} url={csvUrl} />
-          <HistoryButton
+          <QueryResultHistoryButton
             columns={resultColumns}
             url={csvUrl}
             label={resultLabel}

From c33fd16b4eb507d9e4c74d47fcd59678605e6290 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 17 Jan 2023 10:56:05 +0100
Subject: [PATCH 38/86] update mock api endpoints

---
 frontend/mock-api/index.js | 146 ++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 77 deletions(-)

diff --git a/frontend/mock-api/index.js b/frontend/mock-api/index.js
index ebb700dd8d..afb4aeb211 100644
--- a/frontend/mock-api/index.js
+++ b/frontend/mock-api/index.js
@@ -51,7 +51,7 @@ module.exports = function (app, port) {
   );
 
   app.post(
-    "/api/datasets/:datasetId/queries/:id/cancel",
+    "/api/queries/:id/cancel",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -99,7 +99,7 @@ module.exports = function (app, port) {
   );
 
   app.delete(
-    "/api/datasets/:datasetId/queries/:id",
+    "/api/queries/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -109,68 +109,64 @@ module.exports = function (app, port) {
     },
   );
 
-  app.get(
-    "/api/datasets/:datasetId/queries/:id",
-    mockAuthMiddleware,
-    function response(req, res) {
-      if (req.params.id !== 1) {
-        setTimeout(() => {
-          res.sendFile(path.join(__dirname, "./stored-queries/25.json"));
-        }, LONG_DELAY);
-      } else {
-        setTimeout(() => {
-          res.setHeader("Content-Type", "application/json");
+  app.get("/api/queries/:id", mockAuthMiddleware, function response(req, res) {
+    if (req.params.id !== 1) {
+      setTimeout(() => {
+        res.sendFile(path.join(__dirname, "./stored-queries/25.json"));
+      }, LONG_DELAY);
+    } else {
+      setTimeout(() => {
+        res.setHeader("Content-Type", "application/json");
+
+        const dice = Math.random();
 
-          const dice = Math.random();
-
-          if (dice <= 0.1) {
-            res.status(422);
-            res.send(ERROR);
-          } else if (dice > 0.1 && dice <= 0.7) {
-            res.send(
-              JSON.stringify({
-                id: 1,
-                status: "RUNNING",
-                progress: Math.floor(Math.random() * 10) / 10,
-              }),
-            );
-          } else if (dice > 0.7 && dice <= 0.75) {
-            res.send(
-              JSON.stringify({
-                id: 1,
-                status: "FAILED",
-                error: {
-                  code: "EXAMPLE_ERROR_INTERPOLATED",
-                  context: {
-                    adjective: "easy",
-                  },
+        if (dice <= 0.1) {
+          res.status(422);
+          res.send(ERROR);
+        } else if (dice > 0.1 && dice <= 0.7) {
+          res.send(
+            JSON.stringify({
+              id: 1,
+              status: "RUNNING",
+              progress: Math.floor(Math.random() * 10) / 10,
+            }),
+          );
+        } else if (dice > 0.7 && dice <= 0.75) {
+          res.send(
+            JSON.stringify({
+              id: 1,
+              status: "FAILED",
+              error: {
+                code: "EXAMPLE_ERROR_INTERPOLATED",
+                context: {
+                  adjective: "easy",
                 },
-              }),
-            );
-          } else {
-            res.send(
-              JSON.stringify({
-                id: 1,
-                status: "DONE",
-                numberOfResults: 5,
-                resultUrls: [
-                  `/api/results/results.xlsx`,
-                  `/api/results/results.csv`,
-                ],
-                columnDescriptions: [
-                  {
-                    label: "Money Range",
-                    selectId: null,
-                    type: "MONEY",
-                  },
-                ],
-              }),
-            );
-          }
-        }, LONG_DELAY);
-      }
-    },
-  );
+              },
+            }),
+          );
+        } else {
+          res.send(
+            JSON.stringify({
+              id: 1,
+              status: "DONE",
+              numberOfResults: 5,
+              resultUrls: [
+                `/api/results/results.xlsx`,
+                `/api/results/results.csv`,
+              ],
+              columnDescriptions: [
+                {
+                  label: "Money Range",
+                  selectId: null,
+                  type: "MONEY",
+                },
+              ],
+            }),
+          );
+        }
+      }, LONG_DELAY);
+    }
+  });
 
   /*
     DATASETS
@@ -212,13 +208,9 @@ module.exports = function (app, port) {
     },
   );
 
-  app.get(
-    "/api/datasets/:datasetId/concepts/:id",
-    mockAuthMiddleware,
-    function response(req, res) {
-      res.sendFile(path.join(__dirname, `./concepts/${req.params.id}.json`));
-    },
-  );
+  app.get("/api/concepts/:id", mockAuthMiddleware, function response(req, res) {
+    res.sendFile(path.join(__dirname, `./concepts/${req.params.id}.json`));
+  });
 
   /*
     STORED QUERIES
@@ -283,7 +275,7 @@ module.exports = function (app, port) {
   );
 
   app.patch(
-    "/api/datasets/:datasetId/queries/:id",
+    "/api/queries/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -293,7 +285,7 @@ module.exports = function (app, port) {
   );
 
   app.delete(
-    "/api/datasets/:datasetId/queries/:id",
+    "/api/queries/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -332,7 +324,7 @@ module.exports = function (app, port) {
   );
 
   app.post(
-    "/api/datasets/:datasetId/concepts/:conceptId/tables/:tableId/filters/:filterId/autocomplete",
+    "/api/filters/:filterId/autocomplete",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -373,7 +365,7 @@ module.exports = function (app, port) {
   );
 
   app.post(
-    "/api/datasets/:datasetId/concepts/:conceptId/resolve",
+    "/api/concepts/:conceptId/resolve",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -405,7 +397,7 @@ module.exports = function (app, port) {
     For DND File see ./app/api/dnd
   */
   app.post(
-    "/api/datasets/:datasetId/concepts/:conceptId/tables/:tableId/filters/:filterId/resolve",
+    "/api/filters/:filterId/resolve",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -548,7 +540,7 @@ module.exports = function (app, port) {
   );
 
   app.get(
-    "/api/datasets/:datasetId/form-configs/:id",
+    "/api/form-configs/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -558,7 +550,7 @@ module.exports = function (app, port) {
   );
 
   app.patch(
-    "/api/datasets/:datasetId/form-configs/:id",
+    "/api/form-configs/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {
@@ -569,7 +561,7 @@ module.exports = function (app, port) {
   );
 
   app.delete(
-    "/api/datasets/:datasetId/form-configs/:id",
+    "/api/form-configs/:id",
     mockAuthMiddleware,
     function response(req, res) {
       setTimeout(() => {

From 98352e401228eb059a7666be2aae954bc44720fb Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Tue, 17 Jan 2023 12:12:17 +0100
Subject: [PATCH 39/86] Allow a history reset

---
 frontend/src/js/button/HistoryButton.tsx      | 29 ++++++++++++++++++
 frontend/src/js/entity-history/History.tsx    | 15 +++++-----
 frontend/src/js/entity-history/Navigation.tsx |  7 ++++-
 .../js/entity-history/NavigationHeader.tsx    | 30 +++++++++++++++----
 frontend/src/js/entity-history/actions.ts     |  2 ++
 frontend/src/js/entity-history/reducer.ts     | 15 ++++++++++
 frontend/src/js/header/Header.tsx             |  2 ++
 frontend/src/js/pane/TabNavigation.tsx        |  4 +--
 frontend/src/localization/de.json             |  2 ++
 frontend/src/localization/en.json             |  2 ++
 10 files changed, 92 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/js/button/HistoryButton.tsx

diff --git a/frontend/src/js/button/HistoryButton.tsx b/frontend/src/js/button/HistoryButton.tsx
new file mode 100644
index 0000000000..ff6930429a
--- /dev/null
+++ b/frontend/src/js/button/HistoryButton.tsx
@@ -0,0 +1,29 @@
+import styled from "@emotion/styled";
+import { useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
+
+import { openHistory } from "../entity-history/actions";
+
+import IconButton from "./IconButton";
+
+const Button = styled(IconButton)`
+  white-space: nowrap;
+  padding: 5px 12px;
+  height: 30px;
+`;
+
+export const HistoryButton = () => {
+  const { t } = useTranslation();
+  const dispatch = useDispatch();
+
+  const onClick = useCallback(() => {
+    dispatch(openHistory());
+  }, [dispatch]);
+
+  return (
+    <Button icon="list-ul" frame onClick={onClick}>
+      {t("history.history")}
+    </Button>
+  );
+};
diff --git a/frontend/src/js/entity-history/History.tsx b/frontend/src/js/entity-history/History.tsx
index 37c59653a5..b35e418a4f 100644
--- a/frontend/src/js/entity-history/History.tsx
+++ b/frontend/src/js/entity-history/History.tsx
@@ -61,6 +61,7 @@ const SidebarBottom = styled("div")`
 
 const Header = styled("div")`
   display: flex;
+  flex-direction: row-reverse;
   gap: 15px;
   justify-content: space-between;
 `;
@@ -177,6 +178,13 @@ export const History = () => {
         <ErrorBoundary FallbackComponent={ErrorFallback}>
           <Main>
             <Header>
+              <Controls>
+                <SxSourcesControl
+                  options={options}
+                  sourcesFilter={sourcesFilter}
+                  setSourcesFilter={setSourcesFilter}
+                />
+              </Controls>
               {currentEntityId && (
                 <EntityHeader
                   currentEntityIndex={currentEntityIndex}
@@ -187,13 +195,6 @@ export const History = () => {
                   entityStatusOptions={entityStatusOptions}
                 />
               )}
-              <Controls>
-                <SxSourcesControl
-                  options={options}
-                  sourcesFilter={sourcesFilter}
-                  setSourcesFilter={setSourcesFilter}
-                />
-              </Controls>
             </Header>
             <Flex>
               <Sidebar>
diff --git a/frontend/src/js/entity-history/Navigation.tsx b/frontend/src/js/entity-history/Navigation.tsx
index 10ae6bf5d8..333421a30f 100644
--- a/frontend/src/js/entity-history/Navigation.tsx
+++ b/frontend/src/js/entity-history/Navigation.tsx
@@ -12,7 +12,7 @@ import { EntityIdsList } from "./EntityIdsList";
 import type { EntityIdsStatus } from "./History";
 import { LoadHistoryDropzone, LoadingPayload } from "./LoadHistoryDropzone";
 import { NavigationHeader } from "./NavigationHeader";
-import { closeHistory, useUpdateHistorySession } from "./actions";
+import { closeHistory, resetHistory, useUpdateHistorySession } from "./actions";
 import { EntityId } from "./reducer";
 import { saveHistory } from "./saveAndLoad";
 
@@ -107,6 +107,10 @@ export const Navigation = memo(
       saveHistory({ entityIds, entityIdsStatus });
     }, [entityIds, entityIdsStatus]);
 
+    const onReset = useCallback(() => {
+      dispatch(resetHistory());
+    }, [dispatch]);
+
     useHotkeys("shift+up", goToPrev, [goToPrev]);
     useHotkeys("shift+down", goToNext, [goToNext]);
 
@@ -130,6 +134,7 @@ export const Navigation = memo(
           idsCount={entityIds.length}
           entityStatusOptions={entityStatusOptions}
           setEntityStatusOptions={setEntityStatusOptions}
+          onReset={onReset}
         />
         <EntityIdNav>
           <TopActions>
diff --git a/frontend/src/js/entity-history/NavigationHeader.tsx b/frontend/src/js/entity-history/NavigationHeader.tsx
index ea71702014..e92c000e44 100644
--- a/frontend/src/js/entity-history/NavigationHeader.tsx
+++ b/frontend/src/js/entity-history/NavigationHeader.tsx
@@ -8,6 +8,7 @@ import type { StateT } from "../app/reducers";
 import IconButton from "../button/IconButton";
 import ProgressBar from "../common/components/ProgressBar";
 import { Heading3 } from "../headings/Headings";
+import { ConfirmableTooltip } from "../tooltip/ConfirmableTooltip";
 import WithTooltip from "../tooltip/WithTooltip";
 
 import { SettingsModal } from "./SettingsModal";
@@ -28,6 +29,11 @@ const BaseInfo = styled("div")`
   overflow: hidden;
 `;
 
+const Row = styled("div")`
+  display: flex;
+  align-items: center;
+`;
+
 const SxHeading3 = styled(Heading3)`
   flex-shrink: 0;
   margin: 0;
@@ -66,6 +72,7 @@ interface Props {
   markedCount: number;
   entityStatusOptions: SelectOptionT[];
   setEntityStatusOptions: Dispatch<SetStateAction<SelectOptionT[]>>;
+  onReset: () => void;
 }
 export const NavigationHeader = memo(
   ({
@@ -74,6 +81,7 @@ export const NavigationHeader = memo(
     markedCount,
     setEntityStatusOptions,
     entityStatusOptions,
+    onReset,
   }: Props) => {
     const { t } = useTranslation();
     const label = useSelector<StateT, string>(
@@ -96,12 +104,22 @@ export const NavigationHeader = memo(
             <SxHeading3 title={label}>{label}</SxHeading3>
             <SpecialText>{t("history.history")}</SpecialText>
           </div>
-          <WithTooltip text={t("history.settings.headline")}>
-            <IconButton
-              icon="sliders"
-              onClick={() => setSettingsModalOpen(true)}
-            />
-          </WithTooltip>
+          <Row>
+            <ConfirmableTooltip
+              onConfirm={onReset}
+              confirmationText={t("history.settings.reset")}
+            >
+              <WithTooltip text={t("history.settings.reset")}>
+                <IconButton icon="trash" />
+              </WithTooltip>
+            </ConfirmableTooltip>
+            <WithTooltip text={t("history.settings.headline")}>
+              <IconButton
+                icon="sliders"
+                onClick={() => setSettingsModalOpen(true)}
+              />
+            </WithTooltip>
+          </Row>
         </BaseInfo>
         <StatsGrid>
           <Count>{idsCount}</Count>
diff --git a/frontend/src/js/entity-history/actions.ts b/frontend/src/js/entity-history/actions.ts
index de939f6304..2d0415f664 100644
--- a/frontend/src/js/entity-history/actions.ts
+++ b/frontend/src/js/entity-history/actions.ts
@@ -32,6 +32,7 @@ export type EntityHistoryActions = ActionType<
   | typeof loadHistoryData
   | typeof loadDefaultHistoryParamsSuccess
   | typeof resetCurrentEntity
+  | typeof resetHistory
 >;
 
 export const openHistory = createAction("history/OPEN")();
@@ -63,6 +64,7 @@ export const useLoadDefaultHistoryParams = () => {
 export const resetCurrentEntity = createAction(
   "history/RESET_CURRENT_ENTITY",
 )();
+export const resetHistory = createAction("history/RESET")();
 
 export const loadHistoryData = createAsyncAction(
   "history/LOAD_START",
diff --git a/frontend/src/js/entity-history/reducer.ts b/frontend/src/js/entity-history/reducer.ts
index 5bd0b21a2e..9ddd4184e9 100644
--- a/frontend/src/js/entity-history/reducer.ts
+++ b/frontend/src/js/entity-history/reducer.ts
@@ -14,6 +14,7 @@ import {
   loadDefaultHistoryParamsSuccess,
   openHistory,
   resetCurrentEntity,
+  resetHistory,
 } from "./actions";
 
 // TODO: This is quite inaccurate
@@ -96,6 +97,20 @@ export default function reducer(
         currentEntityCsvUrl: "",
         currentEntityInfos: [],
       };
+    case getType(resetHistory):
+      return {
+        ...state,
+        label: "",
+        columns: {},
+        columnDescriptions: [],
+        resultUrls: [],
+        entityIds: [],
+        currentEntityUniqueSources: [],
+        currentEntityId: null,
+        currentEntityData: [],
+        currentEntityCsvUrl: "",
+        currentEntityInfos: [],
+      };
     case getType(openHistory):
       return { ...state, isOpen: true };
     case getType(closeHistory):
diff --git a/frontend/src/js/header/Header.tsx b/frontend/src/js/header/Header.tsx
index d25a5f24ef..3e5f5e8e44 100644
--- a/frontend/src/js/header/Header.tsx
+++ b/frontend/src/js/header/Header.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 
 import type { StateT } from "../app/reducers";
+import { HistoryButton } from "../button/HistoryButton";
 import DatasetSelector from "../dataset/DatasetSelector";
 import { useHideLogoutButton } from "../user/selectors";
 
@@ -117,6 +118,7 @@ const Header: FC = () => {
       </OverflowHidden>
       <Right>
         <DatasetSelector />
+        <HistoryButton />
         {(manualUrl || contactEmail) && (
           <HelpMenu manualUrl={manualUrl} contactEmail={contactEmail} />
         )}
diff --git a/frontend/src/js/pane/TabNavigation.tsx b/frontend/src/js/pane/TabNavigation.tsx
index 7a9691d269..7f1816980d 100644
--- a/frontend/src/js/pane/TabNavigation.tsx
+++ b/frontend/src/js/pane/TabNavigation.tsx
@@ -81,8 +81,8 @@ const TabNavigation: FC<PropsT> = ({
     <Root data-test-id={dataTestId}>
       {tabs.map(({ key, label, tooltip, loading }) => {
         return (
-          <HoverNavigatable triggerNavigate={createClickHandler(key)}>
-            <SxWithTooltip text={tooltip} lazy key={key}>
+          <HoverNavigatable key={key} triggerNavigate={createClickHandler(key)}>
+            <SxWithTooltip text={tooltip} lazy>
               <Headline
                 active={activeTab === key}
                 onClick={createClickHandler(key)}
diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index 1184c5b984..daf29036f7 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -482,6 +482,8 @@
     },
     "settings": {
       "headline": "Historie-Einstellungen",
+      "reset": "Historie zurücksetzen",
+      "resetConfirm": "Jetzt zurücksetzen",
       "selectStatusHeadline": "Möglicher Status pro Eintrag",
       "selectStatusPlaceholder": "Optionen ...",
       "selectStatusTooltip": "Hier werden die möglichen Status-Werte festgelegt, die danach an die einzelnen Entitäten vergeben werden können."
diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index 68544cbe34..f8845de435 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -483,6 +483,8 @@
     },
     "settings": {
       "headline": "History session settings",
+      "reset": "Reset history",
+      "resetConfirm": "Reset now",
       "selectStatusHeadline": "Possible status values",
       "selectStatusPlaceholder": "Options ...",
       "selectStatusTooltip": "Set possible status values, that may be assigned to individual entites during the history session."

From a76c112b0b59745f4f9e13c4742ed2783c924ed7 Mon Sep 17 00:00:00 2001
From: Marco Korinth <103998475+MarcoKorinth@users.noreply.github.com>
Date: Tue, 17 Jan 2023 13:37:53 +0100
Subject: [PATCH 40/86] increased the padding of the scroll into view container

Co-authored-by: Kai Rollmann <kai.rollmann@gmail.com>
---
 .../src/js/ui-components/InputSelect/InputSelectComponents.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx b/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
index aff140c8ca..6e1df9d332 100644
--- a/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
+++ b/frontend/src/js/ui-components/InputSelect/InputSelectComponents.tsx
@@ -42,7 +42,7 @@ export const MenuContainer = styled("div")`
   width: 100%;
   z-index: 3;
   margin-top: 3px;
-  padding-bottom: 5px;
+  padding-bottom: 10px;
 `;
 
 export const Menu = styled("div")`

From 0146352d4f62c779abd8ac650c015366aa10449d Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:40:47 +0100
Subject: [PATCH 41/86] general cleanup especially linting

---
 openapi.yaml | 178 +++++++++++++++++++++------------------------------
 1 file changed, 74 insertions(+), 104 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 7393256bef..230464c335 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,11 +1,12 @@
 openapi: 3.0.0
 info:
-  version: 1.0.0
+  version: 0.0.0
   title: Conquery API
   description: Conquery API
   license:
+    #TODO find a fitting license
     name: TODO
-    url: http://TODO/  
+    url: http://TODO/
 components:
 
   securitySchemes:
@@ -13,7 +14,7 @@ components:
       type: http
       scheme: basic
 
-    Ingef:
+    Bearer:
       type: http
       scheme: bearer
   parameters:
@@ -44,6 +45,7 @@ components:
       description: The user is not logged in.
   schemas:
     id:
+      description: Typed identifier of an object. Usually consists of a recursive structure separated by dots, starting with the dataset. The dataset can be omitted, when the url is already in a context with a bound dataset.
       type: string
     tableId:
       $ref: "#/components/schemas/id"
@@ -78,11 +80,11 @@ components:
         - RUNNING
         - FAILED
         - DONE
-    fe-dataset-ids:
+    frontend-dataset-ids:
       type: array
       items:
-        $ref: "#/components/schemas/fe-dataset-id"
-    fe-dataset-id:
+        $ref: "#/components/schemas/frontend-dataset-id"
+    frontend-dataset-id:
       type: object
       properties:
         id:
@@ -90,10 +92,11 @@ components:
         label:
           type: string
 
-    feValue:
+    frontend-value:
+      description: General purpose value container to describe labelled values to the frontend.
       type: object
       properties:
-        value: 
+        value:
           type: string
         label:
           type: string
@@ -111,7 +114,7 @@ components:
         value:
           type: array
           items:
-            $ref: "#/components/schemas/feValue"
+            $ref: "#/components/schemas/frontend-value"
     resolved-concepts-result:
       type: object
       properties:
@@ -215,7 +218,6 @@ components:
           type: array
           items:
             type: string
-        
     id-label:
       type: object
       properties:
@@ -244,7 +246,6 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/id-label"
-
     query-status:
       type: object
       properties:
@@ -260,9 +261,7 @@ components:
         createdAt:
           $ref: "#/components/schemas/dateTime"
         lastUsed:
-          oneOf:
-            - $ref: "#/components/schemas/dateTime"
-            - type: 'null'
+          $ref: "#/components/schemas/dateTime"
         owner:
           $ref: "#/components/schemas/userId"
         ownerName:
@@ -280,21 +279,16 @@ components:
         numberOfResults:
           type: integer
         requiredTime:
-          oneOf:
-            - type: integer
-            - type: 'null'
+          nullable: true
+          type: integer
         startTime:
-          oneOf:
-            - $ref: "#/components/schemas/dateTime"
-            - type: 'null'
+          $ref: "#/components/schemas/dateTime"
         finishTime:
           $ref: "#/components/schemas/dateTime"
         queryType:
           type: string # TODO use discriminator from Query
         secondaryId:
-          oneOf:
-            - $ref: "#/components/schemas/secondaryIdId"
-            - type: 'null'
+          $ref: "#/components/schemas/secondaryIdId"
         resultUrls:
           type: array
           items:
@@ -329,14 +323,15 @@ components:
         - type: string
           pattern: "LIST\\[.*\\]"
 
-    semantic-event-date: #TODO descriptions for all
+    #TODO descriptions for semantics
+    semantic-event-date:
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
           enum:
-              - "EVENT_DATE"
+            - "EVENT_DATE"
     semantic-sources:
       allOf:
         - $ref: "#/components/schemas/semantic-base"
@@ -344,80 +339,79 @@ components:
         type:
           type: string
           enum:
-              - "SOURCES"
+            - "SOURCES"
     semantic-categorical:
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
+        - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
           enum:
-              - "CATEGORICAL"
+            - "CATEGORICAL"
     semantic-group:
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
+        - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
           enum:
-              - "GROUP"
+            - "GROUP"
     semantic-hidden:
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
+        - $ref: "#/components/schemas/semantic-base"
       properties:
         type:
           type: string
           enum:
-              - "HIDDEN"
+            - "HIDDEN"
     semantic-select:
       properties:
         type:
           type: string
           enum:
-              - "SELECT"
+            - "SELECT"
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
-      - type: object
-        properties:
-          select:
-            $ref: "#/components/schemas/selectId"
+        - $ref: "#/components/schemas/semantic-base"
+        - type: object
+          properties:
+            select:
+              $ref: "#/components/schemas/selectId"
     semantic-concept-column:
       properties:
         type:
           type: string
           enum:
-              - "CONCEPT_COLUMN"
+            - "CONCEPT_COLUMN"
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
-      - type: object
-        properties:
-          concept:
-            $ref: "#/components/schemas/conceptId"
+        - $ref: "#/components/schemas/semantic-base"
+        - type: object
+          properties:
+            concept:
+              $ref: "#/components/schemas/conceptId"
     semantic-column:
       properties:
-          type:
-            type: string
-            enum:
-              - "COLUMN"
+        type:
+          type: string
+          enum:
+            - "COLUMN"
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
-      - type: object
-        properties:
-          column:
-            $ref: "#/components/schemas/columnId"
-          
+        - $ref: "#/components/schemas/semantic-base"
+        - type: object
+          properties:
+            column:
+              $ref: "#/components/schemas/columnId"
     semantic-id:
       properties:
         type:
           type: string
           enum:
-              - "ID"
+            - "ID"
       allOf:
-      - $ref: "#/components/schemas/semantic-base"
-      - type: object
-        properties:
-          kind:
-            type: string
+        - $ref: "#/components/schemas/semantic-base"
+        - type: object
+          properties:
+            kind:
+              type: string
     semantic-secondaryId:
       allOf:
         - $ref: "#/components/schemas/semantic-base"
@@ -443,6 +437,7 @@ components:
           "GROUP": "#/components/schemas/semantic-group"
           "HIDDEN": "#/components/schemas/semantic-hidden"
           "ID": "#/components/schemas/semantic-id"
+          "SECONDARY_ID": "#/components/schemas/semantic-secondaryId"
           "SELECT": "#/components/schemas/semantic-select"
           "SOURCES": "#/components/schemas/semantic-sources"
       oneOf:
@@ -453,23 +448,20 @@ components:
         - $ref: "#/components/schemas/semantic-group"
         - $ref: "#/components/schemas/semantic-hidden"
         - $ref: "#/components/schemas/semantic-id"
+        - $ref: "#/components/schemas/semantic-secondaryId"
         - $ref: "#/components/schemas/semantic-select"
         - $ref: "#/components/schemas/semantic-sources"
-
-
     column-description:
       type: object
       properties:
         label:
           type: string
         description:
-          oneOf:
-            - type: 'null'
-            - type: string
+          nullable: true
+          type: string
         defaultLabel:
-          oneOf:
-            - type: 'null'
-            - type: string
+          nullable: true
+          type: string
         type:
           $ref: "#/components/schemas/column-type"
         semantics:
@@ -489,7 +481,6 @@ components:
       additionalProperties: true
       #TODO but in separate file
     error-info:
-      readOnly: true
       type: object
       properties:
         id:
@@ -504,7 +495,6 @@ components:
           additionalProperties: true
 
     entity-preview-config:
-      readOnly: true
       type: object
       properties:
         all:
@@ -553,11 +543,10 @@ components:
         - type: object
           properties:
             progress:
-              oneOf:
-                - type: number
-                  minimum: 0
-                  maximum: 1
-                - type: 'null'
+              nullable: true
+              type: number
+              minimum: 0
+              maximum: 1
             columnDescriptions:
               type: array
               items:
@@ -565,11 +554,9 @@ components:
             canExpand:
               type: boolean
             query:
-              $ref: "#/components/schemas/query" #TODO
+              $ref: "#/components/schemas/query"
             error:
-              oneOf:
-                - $ref: "#/components/schemas/error-info"
-                - type: 'null'
+              $ref: "#/components/schemas/error-info"
             availableSecondaryIds:
               type: array
               items:
@@ -602,7 +589,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/entity-priview-config"
+                $ref: "#/components/schemas/entity-preview-config"
 
   /me:
     get:
@@ -627,17 +614,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/fe-dataset-ids"
-                
-                  
+                $ref: "#/components/schemas/frontend-dataset-ids"
+
+
   /concepts/{concept}/resolve:
     post:
       parameters:
-        - in: path
-          name: concept
-          required: true
-          schema:
-            $ref: "#/components/schemas/conceptId"
+        - $ref: "#/components/parameters/concept"
       operationId: resolve-concepts
       summary: Resolve values to concept-ids
       requestBody:
@@ -693,12 +676,7 @@ paths:
 
   /queries/{query}:
     parameters:
-      - in: path
-        name: query
-        required: true
-        schema:
-          $ref: "#/components/schemas/executionId"
-
+      - $ref: "#/components/parameters/query"
     get:
       operationId: get-query-status
       summary: Get Status and metadata of Query
@@ -732,11 +710,7 @@ paths:
           description: Query was deleted.
   /queries/{query}/cancel:
     parameters:
-      - in: path
-        name: query
-        required: true
-        schema:
-          $ref: "#/components/schemas/executionId"
+      - $ref: "#/components/parameters/query"
     post:
       operationId: cancel-query
       responses:
@@ -744,11 +718,7 @@ paths:
           description: Query was cancelled.
   /queries/{query}/reexecute:
     parameters:
-      - in: path
-        name: query
-        required: true
-        schema:
-          $ref: "#/components/schemas/executionId"
+      - $ref: "#/components/parameters/query"
     post:
       operationId: reexecute-query
       responses:

From 8c37e5b4e31cdbc2be2aad492bc2fa5f29dc6a4c Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:55:11 +0100
Subject: [PATCH 42/86] Update openapi.yaml

Co-authored-by: MT <12283268+thoniTUB@users.noreply.github.com>
---
 openapi.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openapi.yaml b/openapi.yaml
index 230464c335..a8149f15d9 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -238,7 +238,7 @@ components:
         hideLogoutButton:
           type: boolean
         datasetAbilities:
-          description: per dataset abilities of the logged in User.
+          description: Per dataset abilities of the logged in User.
           type: object
           additionalProperties:
             $ref: "#/components/schemas/datasetAbility"

From 799fc9c1bff490ab2790e635d6dc4acce2d49225 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:58:16 +0100
Subject: [PATCH 43/86] cleanup and minor changes from code review

---
 openapi.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index a8149f15d9..f8e295f429 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -187,6 +187,7 @@ components:
           type: string
         decimalSeparator:
           type: string
+          pattern: "\.|,"
         decimalScale:
           type: string
 
@@ -758,8 +759,3 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
-
-
-
-
-

From 3a4cadc58cbe51ca26133442e3b977ea2f7885ae Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:46:02 +0100
Subject: [PATCH 44/86] use structured directories for dumps AND also dump
 exceptions for unreadables

---
 .../xodus/stores/SerializingStore.java        | 145 ++++++++++++------
 .../stores/SerializingStoreDumpTest.java      |   4 +-
 2 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
index 3ffd4cf54b..b8b52b77d4 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -16,7 +17,6 @@
 import com.bakdata.conquery.io.storage.Store;
 import com.bakdata.conquery.models.config.XodusStoreFactory;
 import com.bakdata.conquery.models.exceptions.ValidatorHelper;
-import com.bakdata.conquery.util.io.FileUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,6 +29,7 @@
 import lombok.NonNull;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Key-value-store from {@link KEY} type values to {@link VALUE} values. ACID consistent, stored on disk using {@link jetbrains.exodus.env.Store} via {@link XodusStore}.
@@ -42,8 +43,9 @@
 @ToString(of = "store")
 public class SerializingStore<KEY, VALUE> implements Store<KEY, VALUE> {
 
-	public static final String DUMP_FILE_EXTENTION = "json";
-	
+	public static final String DUMP_FILE_EXTENSION = "json";
+	public static final String EXCEPTION_FILE_EXTENSION = "exception";
+
 	/**
 	 * Used for serializing keys.
 	 */
@@ -121,16 +123,22 @@ public <CLASS_K extends Class<KEY>, CLASS_V extends Class<VALUE>> SerializingSto
 		removeUnreadablesFromUnderlyingStore = removeUnreadableFromStore;
 
 		unreadableValuesDumpDir = unreadableDataDumpDirectory;
-		if(unreadableValuesDumpDir != null) {
-			if(!unreadableValuesDumpDir.exists() && !unreadableValuesDumpDir.mkdirs()) {
-				throw new IllegalStateException("Could not create dump directory: " + unreadableValuesDumpDir);
-			}
-			else if(!unreadableValuesDumpDir.isDirectory()) {
+
+		if (shouldDumpUnreadables()) {
+			if(unreadableValuesDumpDir.exists() && !unreadableValuesDumpDir.isDirectory()){
 				throw new IllegalArgumentException(String.format("The provided path points to an existing file which is not a directory. Was: %s", unreadableValuesDumpDir.getAbsolutePath()));
 			}
+
+			if (!unreadableValuesDumpDir.mkdirs()) {
+				throw new IllegalStateException("Could not create dump directory: " + unreadableValuesDumpDir);
+			}
 		}
 	}
 
+	private boolean shouldDumpUnreadables() {
+		return unreadableValuesDumpDir != null;
+	}
+
 	@Override
 	public void add(KEY key, VALUE value) {
 		if (!valueType.isInstance(value)) {
@@ -145,19 +153,24 @@ public void add(KEY key, VALUE value) {
 
 	@Override
 	public VALUE get(KEY key) {
-		ByteIterable binValue = store.get(writeKey(key));
+		final ByteIterable binValue = store.get(writeKey(key));
+
 		try {
 			return readValue(binValue);			
 		} catch (Exception e) {
+
 			if(unreadableValuesDumpDir != null) {
-				dumpToFile(binValue, key.toString(), unreadableValuesDumpDir, store.getName(), objectMapper);
+				dumpToFile(binValue, key.toString(), e, unreadableValuesDumpDir, store.getName(), objectMapper);
 			}
+
 			if(removeUnreadablesFromUnderlyingStore) {
 				remove(key);
 				// Null seems to be an acceptable return value in this case
 				return null;
 			}
+
 			Throwables.throwIfUnchecked(e);
+
 			throw new RuntimeException(e);
 		}
 	}
@@ -169,18 +182,20 @@ public VALUE get(KEY key) {
 	 */
 	@Override
 	public IterationStatistic forEach(StoreEntryConsumer<KEY, VALUE> consumer) {
-		IterationStatistic result = new IterationStatistic();
-		ArrayList<ByteIterable> unreadables = new ArrayList<>();
+		final IterationStatistic result = new IterationStatistic();
+		final ArrayList<ByteIterable> unreadables = new ArrayList<>();
+
 		store.forEach((k, v) -> {
 			result.incrTotalProcessed();
 
 			// Try to read the key first
-			KEY key = getDeserializedAndDumpFailed(
+			final KEY key = getDeserializedAndDumpFailed(
 					k,
 					this::readKey,
 					() -> new String(k.getBytesUnsafe()),
 					v,
-					"Could not parse key [{}]");
+					"Could not parse key [{}]"
+			);
 			if (key == null) {
 				unreadables.add(k);
 				result.incrFailedKeys();
@@ -188,12 +203,14 @@ public IterationStatistic forEach(StoreEntryConsumer<KEY, VALUE> consumer) {
 			}
 
 			// Try to read the value
-			VALUE value = getDeserializedAndDumpFailed(
-				v, 
-				this::readValue,
-				key::toString,
-				v, 
-				"Could not parse value for key [{}]");
+			final VALUE value = getDeserializedAndDumpFailed(
+					v,
+					this::readValue,
+					key::toString,
+					v,
+					"Could not parse value for key [{}]"
+			);
+
 			if (value == null) {
 				unreadables.add(k);
 				result.incrFailedValues();
@@ -210,7 +227,7 @@ public IterationStatistic forEach(StoreEntryConsumer<KEY, VALUE> consumer) {
 
 		});
 		// Print some statistics
-		int total = result.getTotalProcessed();
+		final int total = result.getTotalProcessed();
 		log.debug(
 			String.format(
 				"While processing store %s:\n\tEntries processed:\t%d\n\tKey read failure:\t%d (%.2f%%)\n\tValue read failure:\t%d (%.2f%%)",
@@ -245,11 +262,12 @@ private <TYPE> TYPE getDeserializedAndDumpFailed(ByteIterable serial, Function<B
 			return deserializer.apply(serial);
 		}
 		catch (Exception e) {
-			if (unreadableValuesDumpDir != null) {
-				dumpToFile(onFailOrigValue, onFailKeyStringSupplier.get(), unreadableValuesDumpDir, store.getName(), objectMapper);
-			}
 			// With trace also print the stacktrace
-			log.warn(onFailWarnMsgFmt, onFailKeyStringSupplier.get(), (Throwable) (log.isTraceEnabled() ? e : null));
+			log.warn(onFailWarnMsgFmt, onFailKeyStringSupplier.get(), log.isTraceEnabled() ? e : null);
+
+			if (shouldDumpUnreadables()) {
+				dumpToFile(onFailOrigValue, onFailKeyStringSupplier.get(), e, unreadableValuesDumpDir, store.getName(), objectMapper);
+			}
 		}
 		return null;
 	}
@@ -306,10 +324,10 @@ private KEY readKey(ByteIterable key) {
 	 */
 	private ByteIterable write(Object obj, ObjectWriter writer) {
 		try {
-			byte[] bytes = writer.writeValueAsBytes(obj);
+			final byte[] bytes = writer.writeValueAsBytes(obj);
 			if (log.isTraceEnabled()) {
-				String json = JacksonUtil.toJsonDebug(bytes);
-				log.trace("Written Messagepack ({}): {}", valueType.getName(), json);
+				final String json = JacksonUtil.toJsonDebug(bytes);
+				log.trace("Written ({}): {}", valueType.getName(), json);
 			}
 			return new ArrayByteIterable(bytes);
 		}
@@ -338,39 +356,74 @@ private <T> T read(ObjectReader reader, ByteIterable obj) {
 	 *
 	 * @param obj               The object to dump.
 	 * @param keyOfDump         The key under which the unreadable value is accessible. It is used for the file name.
+	 * @param reason			The exception causing us to dump the file
 	 * @param unreadableDumpDir The director to dump to. The method assumes that the directory exists and is okay to write to.
 	 * @param storeName         The name of the store which is also used in the dump file name.
 	 */
-	private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfDump, @NonNull File unreadableDumpDir, @NonNull String storeName, ObjectMapper objectMapper) {
+	private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfDump, Exception reason, @NonNull File unreadableDumpDir, @NonNull String storeName, ObjectMapper objectMapper) {
 		// Create dump filehandle
-		File dumpfile = new File(unreadableDumpDir, makeDumpfileName(keyOfDump, storeName));
-		if (dumpfile.exists()) {
-			log.warn("Abort dumping of file {} because it already exists.", dumpfile);
+		final File dumpfile = makeDumpFileName(keyOfDump, unreadableDumpDir, storeName);
+		final File exceptionFileName = makeExceptionFileName(keyOfDump, unreadableDumpDir, storeName);
+
+		if (dumpfile.exists() || exceptionFileName.exists()) {
+			log.trace("Abort dumping of file {} because it already exists.", dumpfile);
 			return;
 		}
-		// Write dump
+
+		if(!dumpfile.getParentFile().exists() && !dumpfile.getParentFile().mkdirs()){
+			throw new IllegalStateException("Could not create `%s`.".formatted(dumpfile.getParentFile()));
+		}
+
+		// Write json
 		try {
 			log.info("Dumping value of key {} to {} (because it cannot be deserialized anymore).", keyOfDump, dumpfile.getCanonicalPath());
-			JsonNode dump = objectMapper.readerFor(JsonNode.class).readValue(obj.getBytesUnsafe(), 0, obj.getLength());
+
+			final JsonNode dump = objectMapper.readerFor(JsonNode.class).readValue(obj.getBytesUnsafe(), 0, obj.getLength());
 			Jackson.MAPPER.writer().writeValue(dumpfile, dump);
 		}
 		catch (IOException e) {
-			log.error("Unable to dump unreadable value of key `{}` to file `{}`",keyOfDump, dumpfile, e);
+			log.error("Failed to dump unreadable value of key `{}` to file `{}`", keyOfDump, dumpfile, e);
 		}
+
+		try(PrintStream out = new PrintStream(exceptionFileName)) {
+			reason.printStackTrace(out);
+		}
+		catch (IOException e) {
+			log.error("Failed to dump exception for `{}` to file `{}`.", keyOfDump, exceptionFileName, e);
+		}
+
 	}
 
 	/**
 	 * Generates a valid file name from the key of the dump object, the store and the current time.
 	 * However, it does not ensure that there is no file with such a name.
+	 *
+	 * Current implementation is `$unreadableDumpDir/$today/$store/$key.json`
+	 */
+	@NotNull
+	private static File makeDumpFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
+		return unreadableDumpDir.toPath()
+								.resolve(DateTimeFormatter.BASIC_ISO_DATE.format(LocalDateTime.now()))
+								.resolve(storeName)
+								.resolve(keyOfDump + "." + DUMP_FILE_EXTENSION)
+								.toFile();
+
+	}
+
+	/**
+	 * Generates a valid file name from the key of the dump object, the store and the current time.
+	 * However, it does not ensure that there is no file with such a name.
+	 *
+	 * Current implementation is `$unreadableDumpDir/$today/$store/$key.exception`
 	 */
-	private static String makeDumpfileName(String keyOfDump, String storeName) {
-		return FileUtil.SAVE_FILENAME_REPLACEMENT_MATCHER.matcher(
-			String.format("%s-%s-%s.%s",
-				DateTimeFormatter.BASIC_ISO_DATE.format(LocalDateTime.now()),
-				storeName,
-				keyOfDump,
-				DUMP_FILE_EXTENTION
-			)).replaceAll("_");
+	@NotNull
+	private static File makeExceptionFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
+		return unreadableDumpDir.toPath()
+								.resolve(DateTimeFormatter.BASIC_ISO_DATE.format(LocalDateTime.now()))
+								.resolve(storeName)
+								.resolve(keyOfDump + "." + EXCEPTION_FILE_EXTENSION)
+								.toFile();
+
 	}
 
 	@Override
@@ -409,9 +462,9 @@ public void close() {
 
 	@Data
 	public static class IterationStatistic {
-		private int totalProcessed = 0;
-		private int failedKeys = 0;
-		private int failedValues = 0;
+		private int totalProcessed;
+		private int failedKeys;
+		private int failedValues;
 		
 		public void incrTotalProcessed() {
 			totalProcessed++;
diff --git a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
index 4a5ec3304f..4d00dcc427 100644
--- a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
+++ b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
@@ -118,7 +118,7 @@ public void testCorruptValueDump() throws IOException {
 		}
 
 		// Test if the correct number of dumpfiles was generated
-		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENTION), "dump file");
+		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION), "dump file");
 		assertThat(tmpDir.listFiles()).areExactly(1, dumpFileCond);
 
 		// Test if the dump is correct
@@ -171,7 +171,7 @@ public void testCorruptKeyDump() throws IOException {
 		}
 
 		// Test if the correct number of dumpfiles was generated
-		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENTION), "dump file");
+		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION), "dump file");
 		assertThat(tmpDir.listFiles()).areExactly(1, dumpFileCond);
 
 		// Test if the dump is correct

From 334015b896eebf11edcb4d278c34b55a79f02ea0 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Jan 2023 08:50:49 +0100
Subject: [PATCH 45/86] rework SerializingStoreDumpTest to test for structure
 and also assert existence of exception files

---
 .../xodus/stores/SerializingStore.java        | 24 ++++---
 .../stores/SerializingStoreDumpTest.java      | 67 ++++++++++++-------
 2 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
index b8b52b77d4..9609f76b53 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
@@ -17,6 +17,7 @@
 import com.bakdata.conquery.io.storage.Store;
 import com.bakdata.conquery.models.config.XodusStoreFactory;
 import com.bakdata.conquery.models.exceptions.ValidatorHelper;
+import com.bakdata.conquery.util.io.FileUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -125,13 +126,12 @@ public <CLASS_K extends Class<KEY>, CLASS_V extends Class<VALUE>> SerializingSto
 		unreadableValuesDumpDir = unreadableDataDumpDirectory;
 
 		if (shouldDumpUnreadables()) {
-			if(unreadableValuesDumpDir.exists() && !unreadableValuesDumpDir.isDirectory()){
-				throw new IllegalArgumentException(String.format("The provided path points to an existing file which is not a directory. Was: %s", unreadableValuesDumpDir.getAbsolutePath()));
-			}
-
-			if (!unreadableValuesDumpDir.mkdirs()) {
+			if(!unreadableValuesDumpDir.exists() && !unreadableValuesDumpDir.mkdirs()) {
 				throw new IllegalStateException("Could not create dump directory: " + unreadableValuesDumpDir);
 			}
+			else if (!unreadableValuesDumpDir.isDirectory()) {
+				throw new IllegalArgumentException(String.format("The provided path points to an existing file which is not a directory. Was: %s", unreadableValuesDumpDir.getAbsolutePath()));
+			}
 		}
 	}
 
@@ -360,7 +360,7 @@ private <T> T read(ObjectReader reader, ByteIterable obj) {
 	 * @param unreadableDumpDir The director to dump to. The method assumes that the directory exists and is okay to write to.
 	 * @param storeName         The name of the store which is also used in the dump file name.
 	 */
-	private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfDump, Exception reason, @NonNull File unreadableDumpDir, @NonNull String storeName, ObjectMapper objectMapper) {
+	private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfDump, Exception reason, @NonNull File unreadableDumpDir, String storeName, ObjectMapper objectMapper) {
 		// Create dump filehandle
 		final File dumpfile = makeDumpFileName(keyOfDump, unreadableDumpDir, storeName);
 		final File exceptionFileName = makeExceptionFileName(keyOfDump, unreadableDumpDir, storeName);
@@ -401,15 +401,19 @@ private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfD
 	 * Current implementation is `$unreadableDumpDir/$today/$store/$key.json`
 	 */
 	@NotNull
-	private static File makeDumpFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
+	public static File makeDumpFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
 		return unreadableDumpDir.toPath()
 								.resolve(DateTimeFormatter.BASIC_ISO_DATE.format(LocalDateTime.now()))
 								.resolve(storeName)
-								.resolve(keyOfDump + "." + DUMP_FILE_EXTENSION)
+								.resolve(sanitiseFileName(keyOfDump) + "." + DUMP_FILE_EXTENSION)
 								.toFile();
 
 	}
 
+	private static String sanitiseFileName(@NotNull String name) {
+		return FileUtil.SAVE_FILENAME_REPLACEMENT_MATCHER.matcher(name).replaceAll("_");
+	}
+
 	/**
 	 * Generates a valid file name from the key of the dump object, the store and the current time.
 	 * However, it does not ensure that there is no file with such a name.
@@ -417,11 +421,11 @@ private static File makeDumpFileName(@NotNull String keyOfDump, @NotNull File un
 	 * Current implementation is `$unreadableDumpDir/$today/$store/$key.exception`
 	 */
 	@NotNull
-	private static File makeExceptionFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
+	public static File makeExceptionFileName(@NotNull String keyOfDump, @NotNull File unreadableDumpDir, @NotNull String storeName) {
 		return unreadableDumpDir.toPath()
 								.resolve(DateTimeFormatter.BASIC_ISO_DATE.format(LocalDateTime.now()))
 								.resolve(storeName)
-								.resolve(keyOfDump + "." + EXCEPTION_FILE_EXTENSION)
+								.resolve(sanitiseFileName(keyOfDump) + "." + EXCEPTION_FILE_EXTENSION)
 								.toFile();
 
 	}
diff --git a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
index 4d00dcc427..5a12873da6 100644
--- a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
+++ b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java
@@ -4,7 +4,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Objects;
 
 import javax.validation.Validator;
 
@@ -28,7 +27,6 @@
 import jetbrains.exodus.env.Environments;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +35,7 @@
 public class SerializingStoreDumpTest {
 
 	public static final StoreInfo<UserId, User> USER_STORE_ID = StoreMappings.AUTH_USER.storeInfo();
-	private final static MetaStorage STORAGE = new NonPersistentStoreFactory().createMetaStorage();
+	private static final MetaStorage STORAGE = new NonPersistentStoreFactory().createMetaStorage();
 	private File tmpDir;
 	private Environment env;
 	private XodusStoreFactory config;
@@ -85,10 +83,13 @@ private <KEY, VALUE> SerializingStore<KEY, VALUE> createSerializedStore(XodusSto
 	public void testCorruptValueDump() throws IOException {
 		// Set dump directory to this tests temp-dir
 		config.setUnreadableDataDumpDirectory(tmpDir);
+		final StoreInfo<UserId, User> info = USER_STORE_ID;
+		final UserId invalidId = new UserId("testU2");
+
 
 		{
 			// Open a store and insert a valid key-value pair (UserId & User)
-			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), USER_STORE_ID);
+			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), info);
 			store.add(user.getId(), user);
 		}
 
@@ -99,14 +100,14 @@ public void testCorruptValueDump() throws IOException {
 				config,
 				env,
 				Validators.newValidator(),
-				new StoreInfo<>(USER_STORE_ID.getName(), UserId.class, QueryDescription.class));
-			store.add(new UserId("testU2"), cQuery);
+				new StoreInfo<>(info.getName(), UserId.class, QueryDescription.class));
+			store.add(invalidId, cQuery);
 		}
 
 		{
 			// Reopen the store with the initial value and try to iterate over all entries
 			// (this triggers the dump or removal of invalid entries)
-			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), USER_STORE_ID);
+			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), info);
 			IterationStatistic expectedResult = new IterationStatistic();
 			expectedResult.setTotalProcessed(2);
 			expectedResult.setFailedKeys(0);
@@ -117,18 +118,22 @@ public void testCorruptValueDump() throws IOException {
 			assertThat(result).isEqualTo(expectedResult);
 		}
 
-		// Test if the correct number of dumpfiles was generated
-		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION), "dump file");
-		assertThat(tmpDir.listFiles()).areExactly(1, dumpFileCond);
+		final File[] dumpFiles = SerializingStore.makeDumpFileName(invalidId.toString(), tmpDir, info.getName()).getParentFile()
+												 .listFiles(file -> file.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION));
 
-		// Test if the dump is correct
-		File dumpFile = getDumpFile(dumpFileCond);
+		final File[] exceptionFiles = SerializingStore.makeDumpFileName(invalidId.toString(), tmpDir, info.getName()).getParentFile()
+													  .listFiles(file -> file.getName().endsWith(SerializingStore.EXCEPTION_FILE_EXTENSION));
 
-		assertThat((QueryDescription) Jackson.MAPPER.readerFor(QueryDescription.class).readValue(dumpFile)).isEqualTo(cQuery);
-	}
+		assertThat(dumpFiles)
+				.isNotNull()
+				.hasSize(1);
+
+		assertThat(exceptionFiles)
+				.isNotNull()
+				.hasSize(1);
 
-	private File getDumpFile(Condition<File> dumpFileCond) {
-		return Objects.requireNonNull(tmpDir.listFiles(dumpFileCond::matches))[0];
+
+		assertThat((QueryDescription) Jackson.MAPPER.readerFor(QueryDescription.class).readValue(dumpFiles[0])).isEqualTo(cQuery);
 	}
 
 	/**
@@ -138,10 +143,12 @@ private File getDumpFile(Condition<File> dumpFileCond) {
 	public void testCorruptKeyDump() throws IOException {
 		// Set dump directory to this tests temp-dir
 		config.setUnreadableDataDumpDirectory(tmpDir);
+		final String invalidId = "not a valid conquery Id";
+		final StoreInfo<UserId, User> info = USER_STORE_ID;
 
 		{
 			// Open a store and insert a valid key-value pair (UserId & User)
-			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), USER_STORE_ID);
+			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), info);
 			store.add(new UserId("testU1"), user);
 		}
 
@@ -152,14 +159,14 @@ public void testCorruptKeyDump() throws IOException {
 				config,
 				env,
 				Validators.newValidator(),
-				new StoreInfo<>(USER_STORE_ID.getName(), String.class, QueryDescription.class));
-			store.add("not a valid conquery Id", cQuery);
+				new StoreInfo<>(info.getName(), String.class, QueryDescription.class));
+			store.add(invalidId, cQuery);
 		}
 
 		{
 			// Reopen the store with the initial value and try to iterate over all entries
 			// (this triggers the dump or removal of invalid entries)
-			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), USER_STORE_ID);
+			SerializingStore<UserId, User> store = createSerializedStore(config, env, Validators.newValidator(), info);
 			IterationStatistic expectedResult = new IterationStatistic();
 			expectedResult.setTotalProcessed(2);
 			expectedResult.setFailedKeys(1);
@@ -171,13 +178,23 @@ public void testCorruptKeyDump() throws IOException {
 		}
 
 		// Test if the correct number of dumpfiles was generated
-		Condition<File> dumpFileCond = new Condition<>(f -> f.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION), "dump file");
-		assertThat(tmpDir.listFiles()).areExactly(1, dumpFileCond);
+		// The file name is bogus since the id wasn't read properly
+		final File[] dumpFiles = SerializingStore.makeDumpFileName(invalidId, tmpDir, info.getName()).getParentFile()
+												 .listFiles(file -> file.getName().endsWith(SerializingStore.DUMP_FILE_EXTENSION));
+
+		final File[] exceptionFiles = SerializingStore.makeDumpFileName(invalidId, tmpDir, info.getName()).getParentFile()
+												 .listFiles(file -> file.getName().endsWith(SerializingStore.EXCEPTION_FILE_EXTENSION));
+
+		assertThat(dumpFiles)
+				.isNotNull()
+				.hasSize(1);
+
+		assertThat(exceptionFiles)
+				.isNotNull()
+				.hasSize(1);
 
-		// Test if the dump is correct
-		File dumpFile = getDumpFile(dumpFileCond);
 
-		assertThat((QueryDescription) Jackson.MAPPER.readerFor(QueryDescription.class).readValue(dumpFile)).isEqualTo(cQuery);
+		assertThat((QueryDescription) Jackson.MAPPER.readerFor(QueryDescription.class).readValue(dumpFiles[0])).isEqualTo(cQuery);
 	}
 
 	/**

From 983bc23d251d3a4b5acffe52f3778d09ff78dd80 Mon Sep 17 00:00:00 2001
From: Fabian Blank <fabian.blank@bizfactory.tech>
Date: Wed, 18 Jan 2023 10:46:50 +0100
Subject: [PATCH 46/86] switch to Enum type

---
 frontend/src/js/dataset/actions.ts            |  3 ++-
 .../js/entity-history/LoadHistoryDropzone.tsx |  3 ++-
 frontend/src/js/entity-history/saveAndLoad.ts |  3 ++-
 .../js/external-forms/FormConfigLoader.tsx    |  5 ++--
 .../src/js/previous-queries/list/actions.ts   | 23 ++++++++++++-------
 .../list/useDeleteProjectItemFolder.tsx       |  3 ++-
 .../upload/UploadQueryResults.tsx             |  3 ++-
 .../src/js/snack-message/SnackMessage.tsx     | 18 +++++++++------
 frontend/src/js/snack-message/reducer.ts      |  8 +++++--
 9 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/frontend/src/js/dataset/actions.ts b/frontend/src/js/dataset/actions.ts
index 7f6a731cd6..bf95b1fb9e 100644
--- a/frontend/src/js/dataset/actions.ts
+++ b/frontend/src/js/dataset/actions.ts
@@ -12,6 +12,7 @@ import { useLoadTrees } from "../concept-trees/actions";
 import { useLoadDefaultHistoryParams } from "../entity-history/actions";
 import { useLoadQueries } from "../previous-queries/list/actions";
 import { setMessage } from "../snack-message/actions";
+import { SnackMessageTypeT } from "../snack-message/reducer";
 import { clearQuery, loadSavedQuery } from "../standard-query-editor/actions";
 import type { StandardQueryStateT } from "../standard-query-editor/queryReducer";
 
@@ -60,7 +61,7 @@ export const useLoadDatasets = () => {
       dispatch(
         setMessage({
           message: t("datasetSelector.error"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
       dispatch(loadDatasets.failure(e as Error));
diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index dbf01cdad0..97bb6c8149 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -6,6 +6,7 @@ import { useDispatch } from "react-redux";
 import type { SelectOptionT } from "../api/types";
 import { parseCSV } from "../file/csv";
 import { setMessage } from "../snack-message/actions";
+import { SnackMessageTypeT } from "../snack-message/reducer";
 import DropzoneWithFileInput, {
   DragItemFile,
 } from "../ui-components/DropzoneWithFileInput";
@@ -51,7 +52,7 @@ export const LoadHistoryDropzone = ({
       dispatch(
         setMessage({
           message: t("history.load.error"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
       return;
diff --git a/frontend/src/js/entity-history/saveAndLoad.ts b/frontend/src/js/entity-history/saveAndLoad.ts
index 8aa0f2f0e5..b5dd793d7f 100644
--- a/frontend/src/js/entity-history/saveAndLoad.ts
+++ b/frontend/src/js/entity-history/saveAndLoad.ts
@@ -5,6 +5,7 @@ import { useDispatch } from "react-redux";
 import { downloadBlob } from "../common/helpers/downloadBlob";
 import { toCSV } from "../file/csv";
 import { setMessage } from "../snack-message/actions";
+import { SnackMessageTypeT } from "../snack-message/reducer";
 
 import { EntityIdsStatus } from "./History";
 import { LoadingPayload } from "./LoadHistoryDropzone";
@@ -90,7 +91,7 @@ export const useLoadHistory = ({
         dispatch(
           setMessage({
             message: t("history.load.error"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
         return;
diff --git a/frontend/src/js/external-forms/FormConfigLoader.tsx b/frontend/src/js/external-forms/FormConfigLoader.tsx
index d211f60ba0..49ab744ac3 100644
--- a/frontend/src/js/external-forms/FormConfigLoader.tsx
+++ b/frontend/src/js/external-forms/FormConfigLoader.tsx
@@ -11,6 +11,7 @@ import { DNDType } from "../common/constants/dndTypes";
 import { Language, useActiveLang } from "../localization/useActiveLang";
 import type { FormConfigT } from "../previous-queries/list/reducer";
 import { setMessage } from "../snack-message/actions";
+import { SnackMessageTypeT } from "../snack-message/reducer";
 import Dropzone from "../ui-components/Dropzone";
 
 import { setExternalForm } from "./actions";
@@ -147,7 +148,7 @@ const FormConfigLoader: FC<Props> = ({
           message: t("formConfig.loadSuccess", {
             label: formConfigToLoadNext.label,
           }),
-          notificationType: "success",
+          notificationType: SnackMessageTypeT.SUCCESS,
         }),
       );
     },
@@ -175,7 +176,7 @@ const FormConfigLoader: FC<Props> = ({
       dispatch(
         setMessage({
           message: t("formConfig.loadError"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
     }
diff --git a/frontend/src/js/previous-queries/list/actions.ts b/frontend/src/js/previous-queries/list/actions.ts
index 215b03bc51..eb753e9bcf 100644
--- a/frontend/src/js/previous-queries/list/actions.ts
+++ b/frontend/src/js/previous-queries/list/actions.ts
@@ -21,6 +21,7 @@ import {
 } from "../../api/types";
 import { useDatasetId } from "../../dataset/selectors";
 import { setMessage } from "../../snack-message/actions";
+import { SnackMessageTypeT } from "../../snack-message/reducer";
 
 import type { FormConfigT, PreviousQueryT } from "./reducer";
 
@@ -58,7 +59,7 @@ export const useLoadQueries = () => {
         dispatch(
           setMessage({
             message: t("previousQueries.error"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
       }
@@ -96,7 +97,7 @@ export const useLoadQuery = () => {
         dispatch(
           setMessage({
             message: t("previousQuery.loadError"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
       }
@@ -139,7 +140,10 @@ export const useUpdateQuery = () => {
       dispatch(patchQuerySuccess({ id, data: attributes }));
     } catch (e) {
       dispatch(
-        setMessage({ message: errorMessage, notificationType: "error" }),
+        setMessage({
+          message: errorMessage,
+          notificationType: SnackMessageTypeT.ERROR,
+        }),
       );
     }
     setLoading(false);
@@ -168,7 +172,7 @@ export const useRemoveQuery = () => {
       dispatch(
         setMessage({
           message: t("previousQuery.deleteError"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
     }
@@ -214,7 +218,7 @@ export const useLoadFormConfigs = () => {
         dispatch(
           setMessage({
             message: t("formConfigs.error"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
       }
@@ -253,7 +257,7 @@ export const useLoadFormConfig = () => {
         dispatch(
           setMessage({
             message: t("formConfig.loadError"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
       }
@@ -291,7 +295,10 @@ export const useUpdateFormConfig = () => {
       dispatch(patchFormConfigSuccess({ id: configId, data: attributes }));
     } catch (e) {
       dispatch(
-        setMessage({ message: errorMessage, notificationType: "error" }),
+        setMessage({
+          message: errorMessage,
+          notificationType: SnackMessageTypeT.ERROR,
+        }),
       );
     }
     setLoading(false);
@@ -321,7 +328,7 @@ export const useRemoveFormConfig = () => {
       dispatch(
         setMessage({
           message: t("formConfig.deleteError"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
     }
diff --git a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
index cdfd0df920..71dcc7efb3 100644
--- a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
+++ b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
@@ -4,6 +4,7 @@ import { useSelector, useDispatch } from "react-redux";
 import type { StateT } from "../../app/reducers";
 import { useDatasetId } from "../../dataset/selectors";
 import { setMessage } from "../../snack-message/actions";
+import { SnackMessageTypeT } from "../../snack-message/reducer";
 
 import {
   removeFolder,
@@ -73,7 +74,7 @@ export const useDeleteProjectItemFolder = () => {
       dispatch(
         setMessage({
           message: t("previousQuery.retagError"),
-          notificationType: "error",
+          notificationType: SnackMessageTypeT.ERROR,
         }),
       );
       return Promise.reject();
diff --git a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
index 0a1fbae723..eb6897c250 100644
--- a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
+++ b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
@@ -12,6 +12,7 @@ import type {
 import type { StateT } from "../../app/reducers";
 import IconButton from "../../button/IconButton";
 import { setMessage } from "../../snack-message/actions";
+import { SnackMessageTypeT } from "../../snack-message/reducer";
 import WithTooltip from "../../tooltip/WithTooltip";
 import { useLoadQueries } from "../list/actions";
 
@@ -67,7 +68,7 @@ const UploadQueryResults = ({ className, datasetId }: PropsT) => {
         dispatch(
           setMessage({
             message: t("uploadQueryResultsModal.uploadFailed"),
-            notificationType: "error",
+            notificationType: SnackMessageTypeT.ERROR,
           }),
         );
       }
diff --git a/frontend/src/js/snack-message/SnackMessage.tsx b/frontend/src/js/snack-message/SnackMessage.tsx
index 531bc00456..e8c69ed95e 100644
--- a/frontend/src/js/snack-message/SnackMessage.tsx
+++ b/frontend/src/js/snack-message/SnackMessage.tsx
@@ -9,19 +9,18 @@ import FaIcon from "../icon/FaIcon";
 import { setMessage } from "./actions";
 import { SnackMessageStateT, SnackMessageTypeT } from "./reducer";
 
-const colorLookupTable = {
-  error: "rgba(0, 0, 0, 0.75)",
-  success: "rgba(12, 100, 39, 0.75)", // #0C6427
-  default: "rgba(0, 0, 0, 0.75)",
+const colorLookupTable: { [key in SnackMessageTypeT]: string } = {
+  [SnackMessageTypeT.ERROR]: "rgba(0, 0, 0, 0.75)",
+  [SnackMessageTypeT.SUCCESS]: "rgba(12, 100, 39, 0.75)", // #0C6427
+  [SnackMessageTypeT.DEFAULT]: "rgba(0, 0, 0, 0.75)",
 };
-
 const Root = styled("div")<{ notificationType: SnackMessageTypeT }>`
   position: fixed;
   z-index: 10;
   bottom: 20px;
   right: 20px;
   background-color: ${({ notificationType }) =>
-    colorLookupTable[notificationType ?? "default"]};
+    colorLookupTable[notificationType ?? SnackMessageTypeT.DEFAULT]};
   color: white;
   display: flex;
   flex-direction: row;
@@ -54,7 +53,12 @@ const SnackMessage: FC = memo(function SnackMessageComponent() {
   );
   const dispatch = useDispatch();
   const resetMessage = () =>
-    dispatch(setMessage({ message: null, notificationType: null }));
+    dispatch(
+      setMessage({
+        message: null,
+        notificationType: SnackMessageTypeT.DEFAULT,
+      }),
+    );
 
   useClickOutside(ref, () => {
     if (message) {
diff --git a/frontend/src/js/snack-message/reducer.ts b/frontend/src/js/snack-message/reducer.ts
index d3e0bc2ded..b89424f72b 100644
--- a/frontend/src/js/snack-message/reducer.ts
+++ b/frontend/src/js/snack-message/reducer.ts
@@ -4,7 +4,11 @@ import { Action } from "../app/actions";
 
 import { resetMessage, setMessage } from "./actions";
 
-export type SnackMessageTypeT = "success" | "error" | null;
+export enum SnackMessageTypeT {
+  ERROR = "error",
+  SUCCESS = "success",
+  DEFAULT = "default",
+}
 export interface SnackMessageStateT {
   message: string | null;
   notificationType: SnackMessageTypeT;
@@ -12,7 +16,7 @@ export interface SnackMessageStateT {
 
 const initialState: SnackMessageStateT = {
   message: null,
-  notificationType: null,
+  notificationType: SnackMessageTypeT.DEFAULT,
 };
 
 function reducer(

From 890241cd99b774f7e894a8db5077cdba5f30b2ef Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Jan 2023 11:39:11 +0100
Subject: [PATCH 47/86] adds todo for async dumping

---
 .../conquery/io/storage/xodus/stores/SerializingStore.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
index 9609f76b53..6cf3fcddbd 100644
--- a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
+++ b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java
@@ -374,6 +374,8 @@ private static void dumpToFile(@NonNull ByteIterable obj, @NonNull String keyOfD
 			throw new IllegalStateException("Could not create `%s`.".formatted(dumpfile.getParentFile()));
 		}
 
+		//TODO FK: dump in a separate thread so we are not blocking the reader thread.
+
 		// Write json
 		try {
 			log.info("Dumping value of key {} to {} (because it cannot be deserialized anymore).", keyOfDump, dumpfile.getCanonicalPath());

From cbaa8c06b1bb32b3ff174ee593df2454f5253174 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Jan 2023 12:08:30 +0100
Subject: [PATCH 48/86] Introduce mapping of searchConcept for EntityPreview

---
 .../models/datasets/PreviewConfig.java        | 36 +++++++++++++++++++
 .../resources/api/ConceptsProcessor.java      |  7 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java
index 597f3a8c03..7b2dd54959 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java
@@ -13,8 +13,10 @@
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.common.Range;
+import com.bakdata.conquery.models.datasets.concepts.Concept;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.identifiable.ids.specific.ColumnId;
+import com.bakdata.conquery.models.identifiable.ids.specific.ConceptId;
 import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId;
 import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId;
 import com.bakdata.conquery.models.identifiable.ids.specific.SelectId;
@@ -49,14 +51,37 @@ public class PreviewConfig {
 	@Valid
 	private List<InfoCardSelect> infoCardSelects = List.of();
 
+	/**
+	 * Columns that should not be displayed to users in entity preview.
+	 */
 	private Set<ColumnId> hidden = Collections.emptySet();
 
+	/**
+	 * SecondaryIds where the columns should be grouped together.
+	 */
 	private Set<SecondaryIdDescriptionId> grouping = Collections.emptySet();
 
+	/**
+	 * All Connectors that may be used by users in the EntityPreview.
+	 *
+	 * @implNote This is purely for the frontend, the backend can theoretically be queried for all Connectors.
+	 */
 	private Set<ConnectorId> allConnectors = Collections.emptySet();
 
+	/**
+	 * Connectors that shall be selected by default by the frontend.
+	 */
 	private Set<ConnectorId> defaultConnectors = Collections.emptySet();
 
+	/**
+	 * Link to a concept providing search capabilities for entities.
+	 *
+	 * This looks weird at first, but allows reuse of available components instead of introducing duplicate behaviour.
+	 *
+	 * The Frontend will use the concepts filters to render a search for entity preview.
+	 */
+	private ConceptId searchConcept;
+
 	public boolean isGroupingColumn(SecondaryIdDescription desc) {
 		return getGrouping().contains(desc.getId());
 	}
@@ -131,6 +156,17 @@ public List<Select> getSelects() {
 								   .map(id -> datasetRegistry.findRegistry(id.getDataset()).getOptional(id))
 								   .flatMap(Optional::stream)
 								   .collect(Collectors.toList());
+	}
+
+	@JsonIgnore
+	public Concept<?> getSearchConcept() {
+		if(searchConcept == null){
+			return null;
+		}
 
+		return datasetRegistry.findRegistry(searchConcept.getDataset())
+							  .getOptional(searchConcept)
+							  // Since this entire object is intentionally non-dependent (ie not using NsIdRef), this might be null. But in practice rarely should.
+							  .orElse(null);
 	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
index 188908a948..3c163197bc 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
@@ -21,6 +21,7 @@
 import com.bakdata.conquery.apiv1.frontend.FrontendList;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.apiv1.frontend.FrontendValue;
+import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.io.storage.NamespaceStorage;
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.auth.permissions.Ability;
@@ -157,6 +158,9 @@ public static class Labelled {
 		private final Collection<Labelled> all;
 		@JsonProperty("default")
 		private final Collection<Labelled> defaultConnectors;
+
+		@NsIdRef
+		private final Concept<?> searchConcept;
 	}
 
 
@@ -175,7 +179,8 @@ public FrontendPreviewConfig getEntityPreviewFrontendConfig(Dataset dataset) {
 				previewConfig.getDefaultConnectors()
 							 .stream()
 							 .map(id -> new FrontendPreviewConfig.Labelled(id.toString(), namespace.getCentralRegistry().resolve(id).getTable().getLabel()))
-							 .collect(Collectors.toSet())
+							 .collect(Collectors.toSet()),
+				previewConfig.getSearchConcept()
 		);
 	}
 

From 9805c1109240955b4671115f8e660f2ee2203b96 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Jan 2023 16:40:16 +0100
Subject: [PATCH 49/86] code review changes

---
 openapi.yaml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index f8e295f429..e45ba30924 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -80,10 +80,6 @@ components:
         - RUNNING
         - FAILED
         - DONE
-    frontend-dataset-ids:
-      type: array
-      items:
-        $ref: "#/components/schemas/frontend-dataset-id"
     frontend-dataset-id:
       type: object
       properties:
@@ -93,7 +89,7 @@ components:
           type: string
 
     frontend-value:
-      description: General purpose value container to describe labelled values to the frontend.
+      description: General purpose value container to describe labelled values to the frontend for drop downs and multi selects..
       type: object
       properties:
         value:
@@ -161,12 +157,6 @@ components:
         resolvable:
           description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
           type: boolean
-        print:
-          description: True, if the Column should be printed to output. This can be used to have resolvable but not printable fields in mapping.
-          type: boolean
-        fillAnon:
-          description: True, if the field will be used to fill with anonymized ids, when the user is not allowed seeing real ids.
-          type: boolean
 
     upload-config:
       description: Describes the format of ids for EXTERNAL and entity-preview id kinds. Also describes the output format for ids in the result files.
@@ -187,7 +177,7 @@ components:
           type: string
         decimalSeparator:
           type: string
-          pattern: "\.|,"
+          pattern: "[.,]"
         decimalScale:
           type: string
 
@@ -615,7 +605,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/frontend-dataset-ids"
+                type: array
+                items:
+                  $ref: "#/components/schemas/frontend-dataset-id"
 
 
   /concepts/{concept}/resolve:

From 9fa9ec5c5d22db087e12fce98ef6cacf0ae8793f Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 18 Jan 2023 17:09:04 +0100
Subject: [PATCH 50/86] initial implementation of FlagFilter for selecting
 multiple entries at once

---
 .../concepts/filters/specific/FlagFilter.java | 50 +++++++++++++++++++
 .../filter/event/FlagColumnsFilterNode.java   | 31 ++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
 create mode 100644 backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
new file mode 100644
index 0000000000..e6a83408c7
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
@@ -0,0 +1,50 @@
+package com.bakdata.conquery.models.datasets.concepts.filters.specific;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration;
+import com.bakdata.conquery.apiv1.frontend.FrontendFilterType;
+import com.bakdata.conquery.io.cps.CPSType;
+import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection;
+import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.datasets.concepts.filters.Filter;
+import com.bakdata.conquery.models.exceptions.ConceptConfigurationException;
+import com.bakdata.conquery.models.query.filter.event.FlagColumnsFilterNode;
+import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+@CPSType(base = Filter.class, id = "FLAGS")
+@RequiredArgsConstructor
+@ToString
+public class FlagFilter extends Filter<String[]> {
+
+	@NsIdRefCollection
+	private final Map<String, Column> flags;
+
+	@Override
+	protected void configureFrontend(FrontendFilterConfiguration.Top f) throws ConceptConfigurationException {
+		f.setType(FrontendFilterType.Fields.MULTI_SELECT);
+		f.setOptions(null); // TODO map flags to FEValues
+	}
+
+	@Override
+	public List<Column> getRequiredColumns() {
+		return new ArrayList<>(flags.values());
+	}
+
+	@Override
+	public FilterNode<?> createFilterNode(String[] strings) {
+		final Column[] columns = new Column[strings.length];
+		for (int index = 0; index < strings.length; index++) {
+			final String string = strings[index];
+			final Column column = flags.get(string);
+
+			columns[index] = column;
+		}
+
+		return new FlagColumnsFilterNode(columns);
+	}
+}
diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java
new file mode 100644
index 0000000000..65d99921fd
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java
@@ -0,0 +1,31 @@
+package com.bakdata.conquery.models.query.filter.event;
+
+import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.events.Bucket;
+import com.bakdata.conquery.models.query.QueryExecutionContext;
+import com.bakdata.conquery.models.query.entity.Entity;
+import com.bakdata.conquery.models.query.queryplan.filter.EventFilterNode;
+
+public class FlagColumnsFilterNode extends EventFilterNode<Column[]> {
+	public FlagColumnsFilterNode(Column[] columns) {
+		super(columns);
+	}
+
+
+	@Override
+	public void init(Entity entity, QueryExecutionContext context) {
+	}
+
+	@Override
+	public boolean checkEvent(Bucket bucket, int event) {
+		for (Column column : getFilterValue()) {
+			if (bucket.getBoolean(event, column)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+}

From 74747ba6f9ac065f22b322e5c83bb13cd8c7edfd Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Wed, 18 Jan 2023 17:27:06 +0100
Subject: [PATCH 51/86] remove hardcoded select labels for event_duration and
 event_date selects

---
 .../ResultHeadersC10n.java                    |  5 ----
 .../specific/EventDateUnionSelect.java        | 24 ------------------
 .../specific/EventDurationSumSelect.java      | 25 -------------------
 3 files changed, 54 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/internationalization/ResultHeadersC10n.java b/backend/src/main/java/com/bakdata/conquery/internationalization/ResultHeadersC10n.java
index 1059aceb74..b2e6709f60 100644
--- a/backend/src/main/java/com/bakdata/conquery/internationalization/ResultHeadersC10n.java
+++ b/backend/src/main/java/com/bakdata/conquery/internationalization/ResultHeadersC10n.java
@@ -21,11 +21,6 @@ public interface ResultHeadersC10n {
 	@De("Quelle")
 	String source();
 
-	@En("event_duration")
-	@De("Anzahl relevanter Tage")
-	String eventDuration();
-
-
 	@En("event_date")
 	@De("Indexdatum")
 	String eventDate();
diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDateUnionSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDateUnionSelect.java
index d0e885553e..ed68355897 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDateUnionSelect.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDateUnionSelect.java
@@ -1,22 +1,14 @@
 package com.bakdata.conquery.models.datasets.concepts.select.concept.specific;
 
-import java.util.Locale;
 import java.util.stream.Collectors;
 
-import c10n.C10N;
-import com.bakdata.conquery.internationalization.ResultHeadersC10n;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.datasets.concepts.Concept;
 import com.bakdata.conquery.models.datasets.concepts.Connector;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.datasets.concepts.select.concept.UniversalSelect;
-import com.bakdata.conquery.models.i18n.I18n;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.EventDateUnionAggregator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 
 /**
  * Collects the event dates that are corresponding to an enclosing {@link Connector} or {@link Concept} provided in a query.
@@ -25,22 +17,6 @@
 @CPSType(id = "EVENT_DATE_UNION", base = Select.class)
 public class EventDateUnionSelect extends UniversalSelect {
 
-	/**
-	 * Use cache to prevent byte[] allocation on every call to C10N.get(*I10n*.class, key).*element*()
-	 */
-	@JsonIgnore
-	private final static LoadingCache<Locale,String> labelCache = CacheBuilder.newBuilder().build(new CacheLoader<>() {
-		@Override
-		public String load(Locale key) {
-			return C10N.get(ResultHeadersC10n.class, key).dates();
-		}
-	});
-
-	@Override
-	public String getLabel() {
-		return labelCache.getUnchecked(I18n.LOCALE.get());
-	}
-
 	@Override
 	public Aggregator<?> createAggregator() {
 		return new EventDateUnionAggregator(getHolder().findConcept()
diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDurationSumSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDurationSumSelect.java
index 97d7254ca9..2875327aa3 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDurationSumSelect.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/EventDurationSumSelect.java
@@ -1,20 +1,11 @@
 package com.bakdata.conquery.models.datasets.concepts.select.concept.specific;
 
-import java.util.Locale;
-
-import c10n.C10N;
-import com.bakdata.conquery.internationalization.ResultHeadersC10n;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.datasets.concepts.select.concept.UniversalSelect;
-import com.bakdata.conquery.models.i18n.I18n;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.EventDurationSumAggregator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -23,22 +14,6 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class EventDurationSumSelect extends UniversalSelect {
 
-	/**
-	 * Use cache to prevent byte[] allocation on every call to C10N.get(*I10n*.class, key).*element*()
-	 */
-	@JsonIgnore
-	private final static LoadingCache<Locale,String> labelCache = CacheBuilder.newBuilder().build(new CacheLoader<>() {
-		@Override
-		public String load(Locale key) {
-			return C10N.get(ResultHeadersC10n.class, I18n.LOCALE.get()).eventDuration();
-		}
-	});
-
-	@Override
-	public String getLabel() {
-		return C10N.get(ResultHeadersC10n.class, I18n.LOCALE.get()).eventDuration();
-	}
-
 
 	@Override
 	public Aggregator<?> createAggregator() {

From eca92262a848c01db006dc282dcf0fad1bec2c7f Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Thu, 19 Jan 2023 09:47:36 +0100
Subject: [PATCH 52/86] adds english translations

---
 .../forms/export_form.frontend_conf.json      | 232 +++++++++++-------
 .../table_export_form.frontend_conf.json      | 163 ++++++------
 2 files changed, 224 insertions(+), 171 deletions(-)

diff --git a/backend/src/main/resources/com/bakdata/conquery/frontend/forms/export_form.frontend_conf.json b/backend/src/main/resources/com/bakdata/conquery/frontend/forms/export_form.frontend_conf.json
index e4900e0702..aa320c392b 100644
--- a/backend/src/main/resources/com/bakdata/conquery/frontend/forms/export_form.frontend_conf.json
+++ b/backend/src/main/resources/com/bakdata/conquery/frontend/forms/export_form.frontend_conf.json
@@ -4,14 +4,16 @@
         "de": "Datenexport"
     },
     "description": {
-        "de": "Mit diesem Formular werden Konzept- und Ausgabewerte für jeden Versicherten einer Anfrage einzeln auf einen Beobachtungszeitraum aggregiert. Zusätzlich zum gesamten Zeitraum kann dieser nochmal in Jahre oder Quartale unterteilt werden. Die Daten können dabei in einem absoluten Beobachtungszeitraum oder relativ zu einem mit der Anfrage erstellten Indexdatum analysiert werden. Die Ausgabe kann sowohl als Excel, als auch CSV heruntergeladen werden."
-    },
+		"de": "Mit diesem Formular werden Konzept- und Ausgabewerte für jeden Versicherten einer Anfrage einzeln auf einen Beobachtungszeitraum aggregiert. Zusätzlich zum gesamten Zeitraum kann dieser nochmal in Jahre oder Quartale unterteilt werden. Die Daten können dabei in einem absoluten Beobachtungszeitraum oder relativ zu einem mit der Anfrage erstellten Indexdatum analysiert werden. Die Ausgabe kann sowohl als Excel, als auch CSV heruntergeladen werden.",
+		"en": "With this form, concept and output values for each insured person of a query are aggregated individually to an observation period. In addition to the entire period, this can be subdivided again into years or quarters. The data can be analyzed in an absolute observation period or relative to an index date created with the query. The output can be downloaded as Excel as well as CSV."
+	},
     "type": "EXPORT_FORM",
     "fields": [
         {
             "label": {
-                "de": "Versichertengruppe"
-             },
+				"en": "Cohort",
+				"de": "Versichertengruppe"
+			},
             "style": {
                 "size": "h1"
              },
@@ -21,22 +23,26 @@
             "name": "queryGroup",
             "type": "RESULT_GROUP",
             "label": {
-                "de": "Versichertengruppe (Anfrage)"
-            },
+				"de": "Versichertengruppe (Anfrage)",
+				"en": "Cohort (Previous Query)"
+			},
             "dropzoneLabel": {
-                "de": "Füge eine Versichertengruppe aus einer bestehenden Anfrage hinzu"
-            },
+				"de": "Füge eine Versichertengruppe aus einer bestehenden Anfrage hinzu",
+				"en": "Add a cohort from a previous query"
+			},
             "validations": [
                 "NOT_EMPTY"
             ],
             "tooltip": {
-                "de": "Versichertengruppe (Anfrage) für die Daten ausgegeben werden soll."
-            }
+				"de": "Versichertengruppe (Anfrage) für die Daten ausgegeben werden soll.",
+				"en": "Cohort whose data is exported"
+			}
         },
         {
             "label": {
-                "de": "Zeitlicher Bezug"
-             },
+				"de": "Zeitlicher Bezug",
+				"en": "Time Reference"
+			},
             "style": {
                 "size": "h1"
              },
@@ -50,48 +56,55 @@
                 {
                     "name": "ABSOLUTE",
                     "title": {
-                        "de": "Absolut"
-                    },
+						"de": "Absolut",
+						"en": "Absolute"
+					},
                     "fields": [
                         {
                             "name": "dateRange",
                             "type": "DATE_RANGE",
                             "label": {
-                                "de": "Beobachtungszeitraum"
-                            },
+								"de": "Beobachtungszeitraum",
+								"en": "Observation Period"
+							},
                             "validations": [
                                 "NOT_EMPTY"
                             ]
                         }
                     ],
                     "tooltip": {
-                        "de": "Die Ausgaben beziehen sich auf einen festen absoluten Zeitraum."
-                    }
+						"de": "Die Ausgaben beziehen sich auf einen festen absoluten Zeitraum.",
+						"en": "The output relates to a fixed absolute period."
+					}
                 },
                 {
                     "name": "RELATIVE",
                     "title": {
-                        "de": "Relativ"
-                    },
+						"de": "Relativ",
+						"en": "Relative"
+					},
                     "fields": [
                         {
                             "name": "timeUnit",
                             "type": "SELECT",
                             "label": {
-                                "de": "Zeiteinheit des Vor- und Nachbeobachtungszeitraums"
-                            },
+								"de": "Zeiteinheit des Vor- und Nachbeobachtungszeitraums",
+								"en": "Time unit of feature and outcome periods"
+							},
                             "defaultValue": "QUARTERS",
                             "options": [
                                 {
                                     "label": {
-                                        "de": "Tage"
-                                    },
+										"de": "Tage",
+										"en": "Days"
+									},
                                     "value": "DAYS"
                                 },
                                 {
                                     "label": {
-                                        "de": "Quartale"
-                                    },
+										"de": "Quartale",
+										"en": "Quarters"
+									},
                                     "value": "QUARTERS"
                                 }
                             ],
@@ -99,8 +112,9 @@
                                 "NOT_EMPTY"
                             ],
                             "tooltip": {
-                                "de": "Die Zeiteinheit bezieht sich auf die folgenden Eingabefelder, welche den Zeitraum vor und nach dem Indexdatum bestimmen."
-                            }
+								"de": "Die Zeiteinheit bezieht sich auf die folgenden Eingabefelder, welche den Zeitraum vor und nach dem Indexdatum bestimmen.",
+								"en": "The time unit refers to the following input fields, which determine the period before and after the index date."
+							}
                         },
                         {
                             "name": "timeCountBefore",
@@ -108,19 +122,22 @@
                             "defaultValue": 4,
                             "min": 1,
                             "label": {
-                                "de": "Zeit davor"
-                            },
+								"de": "Zeit davor",
+								"en": "Units before"
+							},
                             "placeholder": {
-                                "de": "4"
-                            },
+								"de": "4",
+								"en": "4"
+							},
                             "pattern": "^(?!-)\\d*$",
                             "validations": [
                                 "NOT_EMPTY",
                                 "GREATER_THAN_ZERO"
                             ],
                             "tooltip": {
-                                "de": "Anzahl an Zeiteinheiten, die die Größe des Zeitraums vor dem Indexdatum bestimmten."
-                            }
+								"de": "Anzahl an Zeiteinheiten, die die Größe des Zeitraums vor dem Indexdatum bestimmten.",
+								"en": "Number of time units that determined the size of the period before the index date."
+							}
                         },
                         {
                             "name": "timeCountAfter",
@@ -128,44 +145,51 @@
                             "min": 1,
                             "defaultValue": 4,
                             "label": {
-                                "de": "Zeit danach"
-                            },
+								"de": "Zeit danach",
+								"en": "Units after"
+							},
                             "placeholder": {
-                                "de": "4"
-                            },
+								"de": "4",
+								"en": "4"
+							},
                             "pattern": "^(?!-)\\d*$",
                             "validations": [
                                 "NOT_EMPTY",
                                 "GREATER_THAN_ZERO"
                             ],
                             "tooltip": {
-                                "de": "Anzahl an Zeiteinheiten, die die Größe des Zeitraums nach dem Indexdatum bestimmten."
-                            }
+								"de": "Anzahl an Zeiteinheiten, die die Größe des Zeitraums nach dem Indexdatum bestimmten.",
+								"en": "Number of time units that determined the size of the period after the index date."
+							}
                         },
                         {
                             "name": "indexSelector",
                             "type": "SELECT",
                             "label": {
-                                "de": "Zeitstempel Indexdatum"
-                            },
+								"de": "Zeitstempel Indexdatum",
+								"en": "Index date sampler"
+							},
                             "defaultValue": "EARLIEST",
                             "options": [
                                 {
                                     "label": {
-                                        "de": "ERSTES"
-                                    },
+										"de": "ERSTES",
+										"en": "First"
+									},
                                     "value": "EARLIEST"
                                 },
                                 {
                                     "label": {
-                                        "de": "LETZTES"
-                                    },
+										"de": "LETZTES",
+										"en": "Last"
+									},
                                     "value": "LATEST"
                                 },
                                 {
                                     "label": {
-                                        "de": "ZUFÄLLIG"
-                                    },
+										"de": "ZUFÄLLIG",
+										"en": "Random"
+									},
                                     "value": "RANDOM"
                                 }
                             ],
@@ -173,33 +197,38 @@
                                 "NOT_EMPTY"
                             ],
                             "tooltip": {
-                                "de": "Wenn mehr als ein Datumswert pro Person vorliegt, kann hier ausgewählt werden welcher als Indexdatum gewertet werden soll."
-                            }
+								"de": "Wenn mehr als ein Datumswert pro Person vorliegt, kann hier ausgewählt werden welcher als Indexdatum gewertet werden soll.",
+								"en": "If there is more than one date value per person, you can select here which one should be evaluated as index date."
+							}
                         },
                         {
                             "name": "indexPlacement",
                             "type": "SELECT",
                             "label": {
-                                "de": "Zugehörigkeit Indexdatum"
-                            },
+								"de": "Zugehörigkeit Indexdatum",
+								"en": "Index period inclusion"
+							},
                             "defaultValue": "AFTER",
                             "options": [
                                 {
                                     "label": {
-                                        "de": "VORBEOBACHTUNGSZEITRAUM"
-                                    },
+										"de": "VORBEOBACHTUNGSZEITRAUM",
+										"en": "Feature period"
+									},
                                     "value": "BEFORE"
                                 },
                                 {
                                     "label": {
-                                        "de": "NEUTRAL"
-                                    },
+										"de": "NEUTRAL",
+										"en": "Neutral"
+									},
                                     "value": "NEUTRAL"
                                 },
                                 {
                                     "label": {
-                                        "de": "NACHBEOBACHTUNGSZEITRAUM"
-                                    },
+										"de": "NACHBEOBACHTUNGSZEITRAUM",
+										"en": "Outcome period"
+									},
                                     "value": "AFTER"
                                 }
                             ],
@@ -207,43 +236,48 @@
                                 "NOT_EMPTY"
                             ],
                             "tooltip": {
-                                "de": "Angabe für welchen Zeitraum das Quartal mit dem Indexdatum gewertet wird."
-                            }
+								"de": "Angabe für welchen Zeitraum das Quartal mit dem Indexdatum gewertet wird.",
+								"en": "Indication which period includes the index period"
+							}
                         }
                     ],
                     "tooltip": {
-                        "de": "Die Ausgaben beziehen sich auf einen Vor- und Nachbeobachtungszeitraum, abhängig von dem Indexdatum jeder Person in der Versichertengruppe."
+						"de": "Outputs are for a pre- and post-observation period, depending on the index period of each person in the cohort."
                     }
                 }
             ]
         },
         {
             "label": {
-                "de": "Datengrundlage und Konzepte"
-             },
+				"de": "Datengrundlage und Konzepte",
+				"en": "Attributes"
+			},
             "style": {
                 "size": "h1"
              },
             "type": "HEADLINE"
         },
-        {
-            "name": "features",
-            "type": "CONCEPT_LIST",
-            "label": {
-                "de": "Konzepte"
-            },
-            "isTwoDimensional": true,
-            "conceptDropzoneLabel": {
-                "de": "Füge ein Konzept oder eine Konzeptliste hinzu"
-            },
-            "validations": [
-                "NOT_EMPTY"
-            ]
-        },
+		{
+			"name": "features",
+			"type": "CONCEPT_LIST",
+			"label": {
+				"de": "Konzepte",
+				"en": "Concepts"
+			},
+			"isTwoDimensional": true,
+			"conceptDropzoneLabel": {
+				"de": "Füge ein Konzept oder eine Konzeptliste hinzu",
+				"en": "Add a concept or a concept list"
+			},
+			"validations": [
+				"NOT_EMPTY"
+			]
+		},
         {
             "label": {
-                "de": "Analyse und Ausgabe"
-             },
+				"de": "Analyse und Ausgabe",
+				"en": "Analysis and Output"
+			},
             "style": {
                 "size": "h1"
              },
@@ -253,50 +287,58 @@
             "name": "resolution",
             "type": "SELECT",
             "label": {
-                "de": "Stratifizierung Beobachtungszeitraum"
-            },
+				"de": "Stratifizierung Beobachtungszeitraum",
+				"en": "Temporal stratification"
+			},
             "defaultValue": "COMPLETE",
             "options": [
                 {
                     "label": {
-                        "de": "Gesamter Zeitraum"
-                    },
+						"de": "Gesamter Zeitraum",
+						"en": "Total"
+					},
                     "value": "COMPLETE"
                 },
                 {
                     "label": {
-                        "de": "Jahre"
-                    },
+						"de": "Jahre",
+						"en": "Years"
+					},
                     "value": "YEARS"
                 },
                 {
                     "label": {
-                        "de": "Quartale"
-                    },
+						"de": "Quartale",
+						"en": "Quarters"
+					},
                     "value": "QUARTERS"
                 },
                 {
                     "label": {
-                        "de": "Jahre und Quartale"
-                    },
+						"de": "Jahre und Quartale",
+						"en": "Years and Quarters"
+					},
                     "value": "YEARS_QUARTERS"
                 },
                 {
                     "label": {
-                        "de": "Gesamter Zeitraum und Jahre"
-                    },
+						"de": "Gesamter Zeitraum und Jahre",
+						"en": "Total and Years"
+					},
                     "value": "COMPLETE_YEARS"
                 },
                 {
                     "label": {
-                        "de": "Gesamter Zeitraum und Quartale"
-                    },
+						"de": "Gesamter Zeitraum und Quartale",
+						"en": "Total and Quarters"
+					},
                     "value": "COMPLETE_QUARTERS"
                 },
                 {
                     "label": {
-                        "de": "Gesamter Zeitraum, Jahre und Quartale"
-                    },
+						"de": "Gesamter Zeitraum, Jahre und Quartale",
+						"en": "Total, Years and Quarters"
+					},
                     "value": "COMPLETE_YEARS_QUARTERS"
                 }
             ],
diff --git a/backend/src/main/resources/com/bakdata/conquery/frontend/forms/table_export_form.frontend_conf.json b/backend/src/main/resources/com/bakdata/conquery/frontend/forms/table_export_form.frontend_conf.json
index 028e9804c4..9569be7550 100644
--- a/backend/src/main/resources/com/bakdata/conquery/frontend/forms/table_export_form.frontend_conf.json
+++ b/backend/src/main/resources/com/bakdata/conquery/frontend/forms/table_export_form.frontend_conf.json
@@ -1,78 +1,89 @@
 {
-  "title": {
-    "de": "Rohdatenexport"
-  },
-  "description": {
-      "de": "Mit diesem Formular werden zu den angegebenen Konzepten die dahinterliegenden, rohen Tabellen ausgegeben, welche mit den Konzepten verknüpft sind. Die Daten können dabei in einem absoluten Beobachtungszeitraum analysiert werden. Die Ausgabe kann sowohl als Excel, als auch CSV heruntergeladen werden."
-  },
-  "type": "FULL_EXPORT_FORM",
-  "fields": [
-    {
-        "label": {
-            "de": "Versichertengruppe"
-         },
-        "style": {
-            "size": "h1"
-         },
-        "type": "HEADLINE"
-    },
-    {
-      "name": "queryGroup",
-      "type": "RESULT_GROUP",
-      "label": {
-        "de": "Versichertengruppe (Anfrage)"
-      },
-      "dropzoneLabel": {
-        "de": "Füge eine Versichertengruppe aus einer bestehenden Anfrage hinzu."
-      },
-      "validations": [
-        "NOT_EMPTY"
-      ],
-      "tooltip": {
-          "de": "Versichertengruppe (Anfrage) für die Daten ausgegeben werden soll."
-      }
-    },
-    {
-        "label": {
-            "de": "Zeitlicher Bezug"
-         },
-        "style": {
-            "size": "h1"
-         },
-        "type": "HEADLINE"
-    },
-    {
-      "name": "dateRange",
-      "type": "DATE_RANGE",
-      "label": {
-        "de": "Beobachtungszeitraum"
-      },
-      "validations": [
-        "NOT_EMPTY"
-      ]
-    },
-    {
-        "label": {
-            "de": "Datengrundlage und Konzepte"
-         },
-        "style": {
-            "size": "h1"
-         },
-        "type": "HEADLINE"
-    },
-    {
-      "name": "tables",
-      "type": "CONCEPT_LIST",
-      "label": {
-        "de": "Konzepte"
-      },
-      "isTwoDimensional": false,
-      "conceptDropzoneLabel": {
-        "de": "Füge ein Konzept oder eine Konzeptliste hinzu"
-      },
-      "validations": [
-        "NOT_EMPTY"
-      ]
-    }
-  ]
+	"title": {
+		"de": "Rohdatenexport",
+		"en": "Table Export"
+	},
+	"description": {
+		"en": "This form is used to output the raw tables behind the specified concepts, which are linked to the concepts. The data can be analyzed in an absolute observation period.",
+		"de": "Mit diesem Formular werden zu den angegebenen Konzepten die dahinterliegenden, rohen Tabellen ausgegeben, welche mit den Konzepten verknüpft sind. Die Daten können dabei in einem absoluten Beobachtungszeitraum analysiert werden. Die Ausgabe kann sowohl als Excel, als auch CSV heruntergeladen werden."
+	},
+	"type": "FULL_EXPORT_FORM",
+	"fields": [
+		{
+			"label": {
+				"en": "Cohort",
+				"de": "Versichertengruppe"
+			},
+			"style": {
+				"size": "h1"
+			},
+			"type": "HEADLINE"
+		},
+		{
+			"name": "queryGroup",
+			"type": "RESULT_GROUP",
+			"label": {
+				"de": "Versichertengruppe (Anfrage)",
+				"en": "Cohort (Previous Query)"
+			},
+			"dropzoneLabel": {
+				"de": "Füge eine Versichertengruppe aus einer bestehenden Anfrage hinzu.",
+				"en": "Add a cohort from a previous query"
+			},
+			"validations": [
+				"NOT_EMPTY"
+			],
+			"tooltip": {
+				"de": "Versichertengruppe (Anfrage) für die Daten ausgegeben werden soll.",
+				"en": "Cohort whose data is exported"
+			}
+		},
+		{
+			"label": {
+				"de": "Zeitlicher Bezug",
+				"en": "Time Reference"
+			},
+			"style": {
+				"size": "h1"
+			},
+			"type": "HEADLINE"
+		},
+		{
+			"name": "dateRange",
+			"type": "DATE_RANGE",
+			"label": {
+				"de": "Beobachtungszeitraum",
+				"en": "Observation Period"
+			},
+			"validations": [
+				"NOT_EMPTY"
+			]
+		},
+		{
+			"label": {
+				"de": "Datengrundlage und Konzepte",
+				"en": "Attributes"
+			},
+			"style": {
+				"size": "h1"
+			},
+			"type": "HEADLINE"
+		},
+		{
+			"name": "tables",
+			"type": "CONCEPT_LIST",
+			"label": {
+				"de": "Konzepte",
+				"en": "Concepts"
+			},
+			"isTwoDimensional": false,
+			"conceptDropzoneLabel": {
+				"en": "Add a concept or a concept list",
+				"de": "Füge ein Konzept oder eine Konzeptliste hinzu"
+			},
+			"validations": [
+				"NOT_EMPTY"
+			]
+		}
+	]
 }

From 9ea354cd1ce17c16a5d46b75efb87f731d13c556 Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Thu, 19 Jan 2023 11:29:09 +0100
Subject: [PATCH 53/86] fix table headers in expected test results

---
 .../EVENT_DATE_AGGREGATOR/expected_no_restriction.csv           | 2 +-
 .../aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv   | 2 +-
 .../resources/tests/query/LOGICAL/AND_DURATION_SUM/expected.csv | 2 +-
 .../query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv   | 2 +-
 .../resources/tests/query/MERGE/AND_DURATION_SUM/expected.csv   | 2 +-
 .../tests/query/MERGE/AND_EVENT_DATE_EXCLUDED/expected.csv      | 2 +-
 .../tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv       | 2 +-
 .../tests/query/MULTI_CONCEPT_QUERY_SEPARATE_DATES/expected.csv | 2 +-
 .../query/MULTI_CONNECTOR_QUERY_SEPARATE_DATES/expected.csv     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_no_restriction.csv b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_no_restriction.csv
index fe0d99e1f6..debafd8bb4 100644
--- a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_no_restriction.csv
+++ b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_no_restriction.csv
@@ -1,4 +1,4 @@
-result,dates,concept dates,concept dates_1
+result,dates,concept event-date,concept event-date_1
 1,{2010-01-01/2010-03-31},{2010-01-01/2010-03-31},{2010-01-01/2010-03-31}
 10,{2010-01-01/2010-03-31},{2010-01-01/2010-03-31},{2010-01-01/2010-03-31}
 2,{2010-01-01/2010-03-31},{2010-01-01/2010-03-31},{2010-01-01/2010-03-31}
diff --git a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv
index e9a61f1a2c..6b9193b18b 100644
--- a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv
+++ b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv
@@ -1,4 +1,4 @@
-result,dates,concept dates,concept dates_1
+result,dates,concept event-date,concept event-date_1
 1,{2010-02-01/2010-02-28},{2010-02-01/2010-02-28},{2010-02-01/2010-02-28}
 10,{2010-02-01/2010-02-28},{2010-02-01/2010-02-28},{2010-02-01/2010-02-28}
 2,{2010-02-01/2010-02-28},{2010-02-01/2010-02-28},{2010-02-01/2010-02-28}
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/expected.csv b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/expected.csv
index 60fdf70316..04411ed17a 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/expected.csv
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/expected.csv
@@ -1,4 +1,4 @@
-result,dates,tree a event_duration,tree a and tree b
+result,dates,tree a event_duration_sum,tree a and tree b
 2,{2012-01-01/2012-01-01},1,1
 3,{},0,1
 4,{2012-01-02/2012-01-02},1,1
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv
index 6a6e33eef1..2475815052 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv
@@ -1,4 +1,4 @@
-result,secondary,dates,tree1 a event_duration,tree1 a and tree2 b
+result,secondary,dates,tree1 a event_duration_sum,tree1 a and tree2 b
 1,1,{},0,1
 1,2,{},0,1
 1,3,{},0,1
diff --git a/backend/src/test/resources/tests/query/MERGE/AND_DURATION_SUM/expected.csv b/backend/src/test/resources/tests/query/MERGE/AND_DURATION_SUM/expected.csv
index ee892af2f0..04a8d84c69 100644
--- a/backend/src/test/resources/tests/query/MERGE/AND_DURATION_SUM/expected.csv
+++ b/backend/src/test/resources/tests/query/MERGE/AND_DURATION_SUM/expected.csv
@@ -1,4 +1,4 @@
-result,dates,tree a event_duration,tree a and tree b
+result,dates,tree a event_duration_sum,tree a and tree b
 2,{2012-01-01/2012-01-01},1,1
 3,{2012-01-01/2012-01-02},1,1
 4,{2012-01-01/2012-01-02},2,1
diff --git a/backend/src/test/resources/tests/query/MERGE/AND_EVENT_DATE_EXCLUDED/expected.csv b/backend/src/test/resources/tests/query/MERGE/AND_EVENT_DATE_EXCLUDED/expected.csv
index ed35007684..07a672930b 100644
--- a/backend/src/test/resources/tests/query/MERGE/AND_EVENT_DATE_EXCLUDED/expected.csv
+++ b/backend/src/test/resources/tests/query/MERGE/AND_EVENT_DATE_EXCLUDED/expected.csv
@@ -1,4 +1,4 @@
-result,dates,tree a dates
+result,dates,tree a date_union
 2,{2012-01-01/2012-01-01},{2012-01-01/2012-01-01}
 3,{2012-01-02/2012-01-02},{2012-01-01/2012-01-01}
 4,{2012-01-02/2012-01-02},{2012-01-01/2012-01-02}
diff --git a/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv b/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv
index 26cbf1c4b4..6dcf5e2012 100644
--- a/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv
+++ b/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv
@@ -1,4 +1,4 @@
-result,dates,tree a dates
+result,dates,tree a date_union
 1,{},{2012-01-01/2012-01-01}
 2,{2012-01-01/2012-01-01},{2012-01-01/2012-01-01}
 3,{2012-01-02/2012-01-02},{2012-01-01/2012-01-01}
diff --git a/backend/src/test/resources/tests/query/MULTI_CONCEPT_QUERY_SEPARATE_DATES/expected.csv b/backend/src/test/resources/tests/query/MULTI_CONCEPT_QUERY_SEPARATE_DATES/expected.csv
index 534a284f93..1842b229e2 100644
--- a/backend/src/test/resources/tests/query/MULTI_CONCEPT_QUERY_SEPARATE_DATES/expected.csv
+++ b/backend/src/test/resources/tests/query/MULTI_CONCEPT_QUERY_SEPARATE_DATES/expected.csv
@@ -1,3 +1,3 @@
-result,dates,test_tree test_child1 dates,test_tree2 test_child1 dates
+result,dates,test_tree test_child1 event-date,test_tree2 test_child1 event-date
 1,{2012-01-01/2012-01-02},{2012-01-01/2012-01-01},{2012-01-02/2012-01-02}
 3,{2013-11-10/2013-11-10},{2013-11-10/2013-11-10},{2013-11-10/2013-11-10}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/MULTI_CONNECTOR_QUERY_SEPARATE_DATES/expected.csv b/backend/src/test/resources/tests/query/MULTI_CONNECTOR_QUERY_SEPARATE_DATES/expected.csv
index 3537349785..579ea16178 100644
--- a/backend/src/test/resources/tests/query/MULTI_CONNECTOR_QUERY_SEPARATE_DATES/expected.csv
+++ b/backend/src/test/resources/tests/query/MULTI_CONNECTOR_QUERY_SEPARATE_DATES/expected.csv
@@ -1,3 +1,3 @@
-result,dates,test_tree test_child1 tree_label dates
+result,dates,test_tree test_child1 tree_label event-dates
 1,{2012-01-01/2012-01-02},{2012-01-01/2012-01-01}
 3,{2013-11-10/2013-11-10},{2013-11-10/2013-11-10}
\ No newline at end of file

From 8c2b17d8e283b99901770b68b2a934f70a9c11f0 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:44:53 +0100
Subject: [PATCH 54/86] Implements tests for FlagsFilter. Adds validation and
 implements configureFrontend

---
 .../concepts/filters/specific/FlagFilter.java | 23 +++++++++-
 .../FLAGS_FILTER/FLAGS_FILTER.test.json       | 42 +++++++++++++++++++
 .../tests/filter/FLAGS_FILTER/content.csv     |  6 +++
 .../tests/filter/FLAGS_FILTER/expected.csv    |  5 +++
 4 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
 create mode 100644 backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
 create mode 100644 backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
index e6a83408c7..b0e5808a6b 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
@@ -6,18 +6,23 @@
 
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration;
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterType;
+import com.bakdata.conquery.apiv1.frontend.FrontendValue;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection;
 import com.bakdata.conquery.models.datasets.Column;
 import com.bakdata.conquery.models.datasets.concepts.filters.Filter;
+import com.bakdata.conquery.models.error.ConqueryError;
 import com.bakdata.conquery.models.exceptions.ConceptConfigurationException;
 import com.bakdata.conquery.models.query.filter.event.FlagColumnsFilterNode;
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.dropwizard.validation.ValidationMethod;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @CPSType(base = Filter.class, id = "FLAGS")
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@JsonCreator})
 @ToString
 public class FlagFilter extends Filter<String[]> {
 
@@ -27,7 +32,8 @@ public class FlagFilter extends Filter<String[]> {
 	@Override
 	protected void configureFrontend(FrontendFilterConfiguration.Top f) throws ConceptConfigurationException {
 		f.setType(FrontendFilterType.Fields.MULTI_SELECT);
-		f.setOptions(null); // TODO map flags to FEValues
+
+		f.setOptions(flags.keySet().stream().map(key -> new FrontendValue(key, key)).toList());
 	}
 
 	@Override
@@ -38,13 +44,26 @@ public List<Column> getRequiredColumns() {
 	@Override
 	public FilterNode<?> createFilterNode(String[] strings) {
 		final Column[] columns = new Column[strings.length];
+
 		for (int index = 0; index < strings.length; index++) {
 			final String string = strings[index];
 			final Column column = flags.get(string);
 
+			// Column is not defined with us.
+			if (column == null) {
+				//TODO message
+				throw new ConqueryError.ExecutionCreationPlanError();
+			}
+
 			columns[index] = column;
 		}
 
 		return new FlagColumnsFilterNode(columns);
 	}
+
+	@JsonIgnore
+	@ValidationMethod(message = "Columns must be unique.")
+	public boolean isAllColumnsOfSameTable() {
+		return flags.values().stream().distinct().count() == flags.size();
+	}
 }
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
new file mode 100644
index 0000000000..e06744e455
--- /dev/null
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
@@ -0,0 +1,42 @@
+{
+  "type": "FILTER_TEST",
+  "label": "FLAGS FILTER Test",
+  "expectedCsv": "tests/filter/FLAGS_FILTER/expected.csv",
+  "content": {
+    "tables": {
+      "csv": "tests/filter/FLAGS_FILTER/content.csv",
+      "primaryColumn": {
+        "name": "id",
+        "type": "STRING"
+      },
+      "columns": [
+        {
+          "name": "a",
+          "type": "BOOLEAN"
+        },
+        {
+          "name": "b",
+          "type": "BOOLEAN"
+        },
+        {
+          "name": "c",
+          "type": "BOOLEAN"
+        }
+      ]
+    }
+  },
+  "connector": {
+    "filters": {
+      "type": "FLAGS",
+      "flags" : {
+        "A" : "table.a",
+        "B" : "table.b",
+        "C" : "table.c"
+      }
+    }
+  },
+  "filterValue": {
+    "type": "MULTI_SELECT",
+    "value": ["B", "C"]
+  }
+}
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv b/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
new file mode 100644
index 0000000000..02740d18d6
--- /dev/null
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
@@ -0,0 +1,6 @@
+id,a,b,c
+1,J,N,N
+2,N,J,N
+3,N,N,J
+4,1,1,0
+5,false,false,true
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv b/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv
new file mode 100644
index 0000000000..1830dd4e83
--- /dev/null
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv
@@ -0,0 +1,5 @@
+result,dates
+2,{-∞/+∞}
+3,{-∞/+∞}
+4,{-∞/+∞}
+5,{-∞/+∞}

From 7950ee7bc565ce9fc74f7cca610679fcf9cab04c Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:48:59 +0100
Subject: [PATCH 55/86] moves FrontendPreviewConfig to package level

---
 .../resources/api/ConceptsProcessor.java      | 18 --------------
 .../resources/api/DatasetResource.java        |  2 +-
 .../resources/api/FrontendPreviewConfig.java  | 24 +++++++++++++++++++
 3 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java

diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
index 3c163197bc..811bfc396d 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
@@ -21,7 +21,6 @@
 import com.bakdata.conquery.apiv1.frontend.FrontendList;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.apiv1.frontend.FrontendValue;
-import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.io.storage.NamespaceStorage;
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.auth.permissions.Ability;
@@ -44,7 +43,6 @@
 import com.bakdata.conquery.util.search.Cursor;
 import com.bakdata.conquery.util.search.TrieSearch;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -147,22 +145,6 @@ public List<IdLabel<DatasetId>> getDatasets(Subject subject) {
 						 .collect(Collectors.toList());
 	}
 
-	@Data
-	public static class FrontendPreviewConfig {
-		@Data
-		public static class Labelled {
-			private final String name;
-			private final String label;
-		}
-
-		private final Collection<Labelled> all;
-		@JsonProperty("default")
-		private final Collection<Labelled> defaultConnectors;
-
-		@NsIdRef
-		private final Concept<?> searchConcept;
-	}
-
 
 	public FrontendPreviewConfig getEntityPreviewFrontendConfig(Dataset dataset) {
 		final Namespace namespace = namespaces.get(dataset.getId());
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
index ca8ba2a109..2936899488 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
@@ -35,7 +35,7 @@ public FrontendRoot getRoot() {
 	 */
 	@GET
 	@Path("entity-preview")
-	public ConceptsProcessor.FrontendPreviewConfig getEntityPreviewDefaultConnectors() {
+	public FrontendPreviewConfig getEntityPreviewDefaultConnectors() {
 		return processor.getEntityPreviewFrontendConfig(getDataset());
 	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java b/backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java
new file mode 100644
index 0000000000..4b6ee20d30
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java
@@ -0,0 +1,24 @@
+package com.bakdata.conquery.resources.api;
+
+import java.util.Collection;
+
+import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
+import com.bakdata.conquery.models.datasets.concepts.Concept;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class FrontendPreviewConfig {
+	@Data
+	public static class Labelled {
+		private final String name;
+		private final String label;
+	}
+
+	private final Collection<Labelled> all;
+	@JsonProperty("default")
+	private final Collection<Labelled> defaultConnectors;
+
+	@NsIdRef
+	private final Concept<?> searchConcept;
+}

From 1fabf06d922bc699ee4d27dfde481fe735bc8678 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:50:49 +0100
Subject: [PATCH 56/86] moves FrontendPreviewConfig to proper package

---
 .../api => apiv1/frontend}/FrontendPreviewConfig.java           | 2 +-
 .../com/bakdata/conquery/resources/api/ConceptsProcessor.java   | 1 +
 .../com/bakdata/conquery/resources/api/DatasetResource.java     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename backend/src/main/java/com/bakdata/conquery/{resources/api => apiv1/frontend}/FrontendPreviewConfig.java (92%)

diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendPreviewConfig.java
similarity index 92%
rename from backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java
rename to backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendPreviewConfig.java
index 4b6ee20d30..56cb3d1e0f 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/FrontendPreviewConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendPreviewConfig.java
@@ -1,4 +1,4 @@
-package com.bakdata.conquery.resources.api;
+package com.bakdata.conquery.apiv1.frontend;
 
 import java.util.Collection;
 
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
index 811bfc396d..6a5a2996c6 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java
@@ -19,6 +19,7 @@
 
 import com.bakdata.conquery.apiv1.IdLabel;
 import com.bakdata.conquery.apiv1.frontend.FrontendList;
+import com.bakdata.conquery.apiv1.frontend.FrontendPreviewConfig;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.apiv1.frontend.FrontendValue;
 import com.bakdata.conquery.io.storage.NamespaceStorage;
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
index 2936899488..10cac99017 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java
@@ -8,6 +8,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
+import com.bakdata.conquery.apiv1.frontend.FrontendPreviewConfig;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.io.jersey.ExtraMimeTypes;
 import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId;

From ead8483cd5a0ca528f8c3ceb3983cd9db075a14b Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:16:59 +0100
Subject: [PATCH 57/86] adds test for unknown labels and error for missing
 columns

---
 .../concepts/filters/specific/FlagFilter.java | 28 ++++++++++++++-----
 .../conquery/models/error/ConqueryError.java  | 24 ++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
index b0e5808a6b..11c01d49fa 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
@@ -1,8 +1,10 @@
 package com.bakdata.conquery.models.datasets.concepts.filters.specific;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration;
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterType;
@@ -12,6 +14,7 @@
 import com.bakdata.conquery.models.datasets.Column;
 import com.bakdata.conquery.models.datasets.concepts.filters.Filter;
 import com.bakdata.conquery.models.error.ConqueryError;
+import com.bakdata.conquery.models.events.MajorTypeId;
 import com.bakdata.conquery.models.exceptions.ConceptConfigurationException;
 import com.bakdata.conquery.models.query.filter.event.FlagColumnsFilterNode;
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
@@ -42,22 +45,27 @@ public List<Column> getRequiredColumns() {
 	}
 
 	@Override
-	public FilterNode<?> createFilterNode(String[] strings) {
-		final Column[] columns = new Column[strings.length];
+	public FilterNode<?> createFilterNode(String[] labels) {
+		final Column[] columns = new Column[labels.length];
 
-		for (int index = 0; index < strings.length; index++) {
-			final String string = strings[index];
-			final Column column = flags.get(string);
+		final Set<String> misssing = new HashSet<>(labels.length);
+
+		for (int index = 0; index < labels.length; index++) {
+			final String label = labels[index];
+			final Column column = flags.get(label);
 
 			// Column is not defined with us.
 			if (column == null) {
-				//TODO message
-				throw new ConqueryError.ExecutionCreationPlanError();
+				misssing.add(label);
 			}
 
 			columns[index] = column;
 		}
 
+		if(!misssing.isEmpty()){
+			throw new ConqueryError.ExecutionCreationPlanMissingFlagsError(misssing);
+		}
+
 		return new FlagColumnsFilterNode(columns);
 	}
 
@@ -66,4 +74,10 @@ public FilterNode<?> createFilterNode(String[] strings) {
 	public boolean isAllColumnsOfSameTable() {
 		return flags.values().stream().distinct().count() == flags.size();
 	}
+
+	@JsonIgnore
+	@ValidationMethod(message = "Columns must be BOOLEAN.")
+	public boolean isAllColumnsBoolean() {
+		return flags.values().stream().map(Column::getType).allMatch(MajorTypeId.BOOLEAN::equals);
+	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java b/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java
index 4313ab8db3..37a64bddbb 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,9 +20,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.Flat3Map;
 import org.apache.commons.text.StringSubstitutor;
@@ -257,6 +260,27 @@ public ExecutionCreationPlanError() {
 		}
 	}
 
+	@CPSType(base = ConqueryError.class, id = "CQ_EXECUTION_CREATION_CREATION_PLAN_FLAGS_MISSING")
+	@FieldNameConstants(level = AccessLevel.PRIVATE)
+	public static class ExecutionCreationPlanMissingFlagsError extends ContextError {
+
+		private final Void ALIGNMENT = null;
+		private static final String TEMPLATE = "Do not know labels ${" + Fields.ALIGNMENT + "}.";
+
+		/**
+		 * Constructor for deserialization.
+		 */
+		@JsonCreator
+		private ExecutionCreationPlanMissingFlagsError() {
+			super(TEMPLATE);
+		}
+
+		public ExecutionCreationPlanMissingFlagsError(Set<String> labels) {
+			this();
+			getContext().put(Fields.ALIGNMENT, String.join(", ", labels).trim());
+		}
+	}
+
 	@CPSType(base = ConqueryError.class, id = "CQ_EXECUTION_CREATION_CREATION_PLAN_DATECONTEXT_MISMATCH")
 	public static class ExecutionCreationPlanDateContextError extends ContextError {
 

From c8e6b267f16fa048a12b24d5e41cf93677cf027e Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 23 Jan 2023 11:03:19 +0100
Subject: [PATCH 58/86] Add a basic empty state

---
 frontend/src/js/entity-history/Timeline.tsx   |  5 ++
 .../timeline/TimelineEmptyPlaceholder.tsx     | 53 +++++++++++++++++++
 frontend/src/localization/de.json             |  5 ++
 frontend/src/localization/en.json             |  5 ++
 4 files changed, 68 insertions(+)
 create mode 100644 frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx

diff --git a/frontend/src/js/entity-history/Timeline.tsx b/frontend/src/js/entity-history/Timeline.tsx
index 646f96a6ef..cb1a904d14 100644
--- a/frontend/src/js/entity-history/Timeline.tsx
+++ b/frontend/src/js/entity-history/Timeline.tsx
@@ -14,6 +14,7 @@ import { useDatasetId } from "../dataset/selectors";
 import { ContentFilterValue } from "./ContentControl";
 import type { DetailLevel } from "./DetailControl";
 import type { EntityHistoryStateT, EntityEvent } from "./reducer";
+import { TimelineEmptyPlaceholder } from "./timeline/TimelineEmptyPlaceholder";
 import Year from "./timeline/Year";
 import {
   isConceptColumn,
@@ -72,6 +73,10 @@ const Timeline = ({
 
   if (!datasetId) return null;
 
+  if (eventsByQuarterWithGroups.length === 0) {
+    return <TimelineEmptyPlaceholder />;
+  }
+
   return (
     <Root className={className}>
       {eventsByQuarterWithGroups.map(({ year, quarterwiseData }) => (
diff --git a/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx b/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx
new file mode 100644
index 0000000000..a71ae848e9
--- /dev/null
+++ b/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx
@@ -0,0 +1,53 @@
+import styled from "@emotion/styled";
+import { useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+
+import { StateT } from "../../app/reducers";
+import FaIcon from "../../icon/FaIcon";
+import { EntityHistoryStateT } from "../reducer";
+
+const Root = styled("div")`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  width: 100%;
+  font-weight: 400;
+`;
+
+const Message = styled("p")`
+  font-size: ${({ theme }) => theme.font.lg};
+  margin: 10px 0 0;
+  font-weight: 400;
+`;
+
+const BigIcon = styled(FaIcon)`
+  font-size: 140px;
+  color: ${({ theme }) => theme.col.grayLight};
+`;
+
+const Description = styled("p")`
+  font-size: ${({ theme }) => theme.font.lg};
+  margin: 0;
+`;
+
+export const TimelineEmptyPlaceholder = () => {
+  const { t } = useTranslation();
+
+  const id = useSelector<StateT, EntityHistoryStateT["currentEntityId"]>(
+    (state) => state.entityHistory.currentEntityId,
+  );
+
+  return (
+    <Root>
+      <Message>{t("history.emptyTimeline.headline")}</Message>
+      <p>
+        {id
+          ? t("history.emptyTimeline.descriptionWithId")
+          : t("history.emptyTimeline.descriptionWithoutId")}
+      </p>
+      <BigIcon icon="list-ul" />
+    </Root>
+  );
+};
diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index daf29036f7..4bd3dace2a 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -452,6 +452,11 @@
     "queryNodeDetails": "Detail-Einstellungen bearbeiten"
   },
   "history": {
+    "emptyTimeline": {
+      "headline": "Leer!",
+      "descriptionWithoutId": "Wähle links eine ID aus der Liste",
+      "descriptionWithId": "Für diese ID konnten keine Daten gefunden werden."
+    },
     "backButtonWarning": "Achtung: Wenn Du zurück gehst, werden Änderungen an der Liste verworfen. Lade die Liste vorher herunter, um sie zu speichern.",
     "history": "Historie",
     "marked": "mit Status",
diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index f8845de435..8123f33b7e 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -453,6 +453,11 @@
     "queryNodeDetails": "Detail-Einstellungen bearbeiten"
   },
   "history": {
+    "emptyTimeline": {
+      "headline": "Empty!",
+      "descriptionWithoutId": "Select an ID from the list on the left side",
+      "descriptionWithId": "Couldn't find any data for this ID."
+    },
     "backButtonWarning": "Note: changes will be discarded. Please download the list before going back.",
     "history": "History",
     "marked": "with status",

From 04323bf7ce7b762185b723cc869c4f0e8e1d8968 Mon Sep 17 00:00:00 2001
From: Fabian Blank <fabian.blank@bizfactory.tech>
Date: Mon, 23 Jan 2023 11:37:43 +0100
Subject: [PATCH 59/86] implemented requested changes

---
 frontend/src/js/dataset/actions.ts            |  4 +--
 .../js/entity-history/LoadHistoryDropzone.tsx |  4 +--
 frontend/src/js/entity-history/saveAndLoad.ts |  4 +--
 .../js/external-forms/FormConfigLoader.tsx    |  6 ++--
 .../src/js/previous-queries/list/actions.ts   | 18 +++++------
 .../list/useDeleteProjectItemFolder.tsx       |  4 +--
 .../upload/UploadQueryResults.tsx             |  4 +--
 .../src/js/snack-message/SnackMessage.tsx     | 31 ++++++++-----------
 frontend/src/js/snack-message/actions.ts      |  4 +--
 frontend/src/js/snack-message/reducer.ts      |  8 ++---
 10 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/frontend/src/js/dataset/actions.ts b/frontend/src/js/dataset/actions.ts
index bf95b1fb9e..587a5b71e2 100644
--- a/frontend/src/js/dataset/actions.ts
+++ b/frontend/src/js/dataset/actions.ts
@@ -12,7 +12,7 @@ import { useLoadTrees } from "../concept-trees/actions";
 import { useLoadDefaultHistoryParams } from "../entity-history/actions";
 import { useLoadQueries } from "../previous-queries/list/actions";
 import { setMessage } from "../snack-message/actions";
-import { SnackMessageTypeT } from "../snack-message/reducer";
+import { SnackMessageType } from "../snack-message/reducer";
 import { clearQuery, loadSavedQuery } from "../standard-query-editor/actions";
 import type { StandardQueryStateT } from "../standard-query-editor/queryReducer";
 
@@ -61,7 +61,7 @@ export const useLoadDatasets = () => {
       dispatch(
         setMessage({
           message: t("datasetSelector.error"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
       dispatch(loadDatasets.failure(e as Error));
diff --git a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
index 97bb6c8149..454a192317 100644
--- a/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
+++ b/frontend/src/js/entity-history/LoadHistoryDropzone.tsx
@@ -6,7 +6,7 @@ import { useDispatch } from "react-redux";
 import type { SelectOptionT } from "../api/types";
 import { parseCSV } from "../file/csv";
 import { setMessage } from "../snack-message/actions";
-import { SnackMessageTypeT } from "../snack-message/reducer";
+import { SnackMessageType } from "../snack-message/reducer";
 import DropzoneWithFileInput, {
   DragItemFile,
 } from "../ui-components/DropzoneWithFileInput";
@@ -52,7 +52,7 @@ export const LoadHistoryDropzone = ({
       dispatch(
         setMessage({
           message: t("history.load.error"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
       return;
diff --git a/frontend/src/js/entity-history/saveAndLoad.ts b/frontend/src/js/entity-history/saveAndLoad.ts
index b5dd793d7f..5e98add4ef 100644
--- a/frontend/src/js/entity-history/saveAndLoad.ts
+++ b/frontend/src/js/entity-history/saveAndLoad.ts
@@ -5,7 +5,7 @@ import { useDispatch } from "react-redux";
 import { downloadBlob } from "../common/helpers/downloadBlob";
 import { toCSV } from "../file/csv";
 import { setMessage } from "../snack-message/actions";
-import { SnackMessageTypeT } from "../snack-message/reducer";
+import { SnackMessageType } from "../snack-message/reducer";
 
 import { EntityIdsStatus } from "./History";
 import { LoadingPayload } from "./LoadHistoryDropzone";
@@ -91,7 +91,7 @@ export const useLoadHistory = ({
         dispatch(
           setMessage({
             message: t("history.load.error"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
         return;
diff --git a/frontend/src/js/external-forms/FormConfigLoader.tsx b/frontend/src/js/external-forms/FormConfigLoader.tsx
index 49ab744ac3..73db78deff 100644
--- a/frontend/src/js/external-forms/FormConfigLoader.tsx
+++ b/frontend/src/js/external-forms/FormConfigLoader.tsx
@@ -11,7 +11,7 @@ import { DNDType } from "../common/constants/dndTypes";
 import { Language, useActiveLang } from "../localization/useActiveLang";
 import type { FormConfigT } from "../previous-queries/list/reducer";
 import { setMessage } from "../snack-message/actions";
-import { SnackMessageTypeT } from "../snack-message/reducer";
+import { SnackMessageType } from "../snack-message/reducer";
 import Dropzone from "../ui-components/Dropzone";
 
 import { setExternalForm } from "./actions";
@@ -148,7 +148,7 @@ const FormConfigLoader: FC<Props> = ({
           message: t("formConfig.loadSuccess", {
             label: formConfigToLoadNext.label,
           }),
-          notificationType: SnackMessageTypeT.SUCCESS,
+          type: SnackMessageType.SUCCESS,
         }),
       );
     },
@@ -176,7 +176,7 @@ const FormConfigLoader: FC<Props> = ({
       dispatch(
         setMessage({
           message: t("formConfig.loadError"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
     }
diff --git a/frontend/src/js/previous-queries/list/actions.ts b/frontend/src/js/previous-queries/list/actions.ts
index eb753e9bcf..3e4e5b1885 100644
--- a/frontend/src/js/previous-queries/list/actions.ts
+++ b/frontend/src/js/previous-queries/list/actions.ts
@@ -21,7 +21,7 @@ import {
 } from "../../api/types";
 import { useDatasetId } from "../../dataset/selectors";
 import { setMessage } from "../../snack-message/actions";
-import { SnackMessageTypeT } from "../../snack-message/reducer";
+import { SnackMessageType } from "../../snack-message/reducer";
 
 import type { FormConfigT, PreviousQueryT } from "./reducer";
 
@@ -59,7 +59,7 @@ export const useLoadQueries = () => {
         dispatch(
           setMessage({
             message: t("previousQueries.error"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
       }
@@ -97,7 +97,7 @@ export const useLoadQuery = () => {
         dispatch(
           setMessage({
             message: t("previousQuery.loadError"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
       }
@@ -142,7 +142,7 @@ export const useUpdateQuery = () => {
       dispatch(
         setMessage({
           message: errorMessage,
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
     }
@@ -172,7 +172,7 @@ export const useRemoveQuery = () => {
       dispatch(
         setMessage({
           message: t("previousQuery.deleteError"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
     }
@@ -218,7 +218,7 @@ export const useLoadFormConfigs = () => {
         dispatch(
           setMessage({
             message: t("formConfigs.error"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
       }
@@ -257,7 +257,7 @@ export const useLoadFormConfig = () => {
         dispatch(
           setMessage({
             message: t("formConfig.loadError"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
       }
@@ -297,7 +297,7 @@ export const useUpdateFormConfig = () => {
       dispatch(
         setMessage({
           message: errorMessage,
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
     }
@@ -328,7 +328,7 @@ export const useRemoveFormConfig = () => {
       dispatch(
         setMessage({
           message: t("formConfig.deleteError"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
     }
diff --git a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
index 71dcc7efb3..6d6a69b7f9 100644
--- a/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
+++ b/frontend/src/js/previous-queries/list/useDeleteProjectItemFolder.tsx
@@ -4,7 +4,7 @@ import { useSelector, useDispatch } from "react-redux";
 import type { StateT } from "../../app/reducers";
 import { useDatasetId } from "../../dataset/selectors";
 import { setMessage } from "../../snack-message/actions";
-import { SnackMessageTypeT } from "../../snack-message/reducer";
+import { SnackMessageType } from "../../snack-message/reducer";
 
 import {
   removeFolder,
@@ -74,7 +74,7 @@ export const useDeleteProjectItemFolder = () => {
       dispatch(
         setMessage({
           message: t("previousQuery.retagError"),
-          notificationType: SnackMessageTypeT.ERROR,
+          type: SnackMessageType.ERROR,
         }),
       );
       return Promise.reject();
diff --git a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
index eb6897c250..d0b408fbf3 100644
--- a/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
+++ b/frontend/src/js/previous-queries/upload/UploadQueryResults.tsx
@@ -12,7 +12,7 @@ import type {
 import type { StateT } from "../../app/reducers";
 import IconButton from "../../button/IconButton";
 import { setMessage } from "../../snack-message/actions";
-import { SnackMessageTypeT } from "../../snack-message/reducer";
+import { SnackMessageType } from "../../snack-message/reducer";
 import WithTooltip from "../../tooltip/WithTooltip";
 import { useLoadQueries } from "../list/actions";
 
@@ -68,7 +68,7 @@ const UploadQueryResults = ({ className, datasetId }: PropsT) => {
         dispatch(
           setMessage({
             message: t("uploadQueryResultsModal.uploadFailed"),
-            notificationType: SnackMessageTypeT.ERROR,
+            type: SnackMessageType.ERROR,
           }),
         );
       }
diff --git a/frontend/src/js/snack-message/SnackMessage.tsx b/frontend/src/js/snack-message/SnackMessage.tsx
index e8c69ed95e..aeee747402 100644
--- a/frontend/src/js/snack-message/SnackMessage.tsx
+++ b/frontend/src/js/snack-message/SnackMessage.tsx
@@ -6,21 +6,22 @@ import type { StateT } from "../app/reducers";
 import { useClickOutside } from "../common/helpers/useClickOutside";
 import FaIcon from "../icon/FaIcon";
 
-import { setMessage } from "./actions";
-import { SnackMessageStateT, SnackMessageTypeT } from "./reducer";
+import { resetMessage as resetMessageAction } from "./actions";
+import { SnackMessageStateT, SnackMessageType } from "./reducer";
 
-const colorLookupTable: { [key in SnackMessageTypeT]: string } = {
-  [SnackMessageTypeT.ERROR]: "rgba(0, 0, 0, 0.75)",
-  [SnackMessageTypeT.SUCCESS]: "rgba(12, 100, 39, 0.75)", // #0C6427
-  [SnackMessageTypeT.DEFAULT]: "rgba(0, 0, 0, 0.75)",
+const snackMessageTypeToColor: Record<SnackMessageType, string> = {
+  [SnackMessageType.ERROR]: "rgba(0, 0, 0, 0.75)",
+  [SnackMessageType.SUCCESS]: "rgba(12, 100, 39, 0.9)", // #0C6427
+  [SnackMessageType.DEFAULT]: "rgba(0, 0, 0, 0.75)",
 };
-const Root = styled("div")<{ notificationType: SnackMessageTypeT }>`
+
+const Root = styled("div")<{ type: SnackMessageType }>`
   position: fixed;
   z-index: 10;
   bottom: 20px;
   right: 20px;
-  background-color: ${({ notificationType }) =>
-    colorLookupTable[notificationType ?? SnackMessageTypeT.DEFAULT]};
+  background-color: ${({ type }) =>
+    snackMessageTypeToColor[type ?? SnackMessageType.DEFAULT]};
   color: white;
   display: flex;
   flex-direction: row;
@@ -48,17 +49,11 @@ const ClearZone = styled("div")`
 
 const SnackMessage: FC = memo(function SnackMessageComponent() {
   const ref = useRef(null);
-  const { message, notificationType } = useSelector<StateT, SnackMessageStateT>(
+  const { message, type } = useSelector<StateT, SnackMessageStateT>(
     (state) => state.snackMessage,
   );
   const dispatch = useDispatch();
-  const resetMessage = () =>
-    dispatch(
-      setMessage({
-        message: null,
-        notificationType: SnackMessageTypeT.DEFAULT,
-      }),
-    );
+  const resetMessage = () => dispatch(resetMessageAction());
 
   useClickOutside(ref, () => {
     if (message) {
@@ -69,7 +64,7 @@ const SnackMessage: FC = memo(function SnackMessageComponent() {
   return (
     <div ref={ref}>
       {message && (
-        <Root notificationType={notificationType}>
+        <Root type={type}>
           <Relative>
             <div dangerouslySetInnerHTML={{ __html: message }} />
             <ClearZone onClick={resetMessage}>
diff --git a/frontend/src/js/snack-message/actions.ts b/frontend/src/js/snack-message/actions.ts
index f93c95e191..942eb2d456 100644
--- a/frontend/src/js/snack-message/actions.ts
+++ b/frontend/src/js/snack-message/actions.ts
@@ -1,6 +1,6 @@
 import { ActionType, createAction } from "typesafe-actions";
 
-import { SnackMessageTypeT } from "./reducer";
+import { SnackMessageType } from "./reducer";
 
 export type SnackMessageActions = ActionType<
   typeof setMessage | typeof resetMessage
@@ -8,7 +8,7 @@ export type SnackMessageActions = ActionType<
 
 export const setMessage = createAction("snack-message/SET")<{
   message: string | null;
-  notificationType: SnackMessageTypeT;
+  type: SnackMessageType;
 }>();
 
 export const resetMessage = createAction("snack-message/RESET")();
diff --git a/frontend/src/js/snack-message/reducer.ts b/frontend/src/js/snack-message/reducer.ts
index b89424f72b..844253f6a6 100644
--- a/frontend/src/js/snack-message/reducer.ts
+++ b/frontend/src/js/snack-message/reducer.ts
@@ -4,19 +4,19 @@ import { Action } from "../app/actions";
 
 import { resetMessage, setMessage } from "./actions";
 
-export enum SnackMessageTypeT {
+export enum SnackMessageType {
   ERROR = "error",
   SUCCESS = "success",
   DEFAULT = "default",
 }
 export interface SnackMessageStateT {
   message: string | null;
-  notificationType: SnackMessageTypeT;
+  type: SnackMessageType;
 }
 
 const initialState: SnackMessageStateT = {
   message: null,
-  notificationType: SnackMessageTypeT.DEFAULT,
+  type: SnackMessageType.DEFAULT,
 };
 
 function reducer(
@@ -28,7 +28,7 @@ function reducer(
       return {
         ...state,
         message: action.payload.message,
-        notificationType: action.payload.notificationType,
+        type: action.payload.type,
       };
     case getType(resetMessage):
       return initialState;

From 34bc443baa8731d7c3aba9c214973703bd811af8 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 23 Jan 2023 11:51:10 +0100
Subject: [PATCH 60/86] adds documentation

---
 .../datasets/concepts/filters/specific/FlagFilter.java      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
index 11c01d49fa..2015af9833 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
@@ -24,6 +24,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
+/**
+ * Implements a MultiSelect type filter, where an event can meet multiple criteria (as opposed to {@link MultiSelectFilter} which is restricted to one value per event).
+ * This is achieved by using multiple {@link com.bakdata.conquery.models.types.ResultType.BooleanT} columns, each defining if one property is met or not.
+ *
+ * The selected flags are logically or-ed.
+ */
 @CPSType(base = Filter.class, id = "FLAGS")
 @RequiredArgsConstructor(onConstructor_ = {@JsonCreator})
 @ToString

From 4e24613dc59362e1a3fecc189b47d59655227aba Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 23 Jan 2023 12:10:49 +0100
Subject: [PATCH 61/86] fixes typo in misssing

---
 .../datasets/concepts/filters/specific/FlagFilter.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
index 2015af9833..324ecc22da 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java
@@ -54,7 +54,7 @@ public List<Column> getRequiredColumns() {
 	public FilterNode<?> createFilterNode(String[] labels) {
 		final Column[] columns = new Column[labels.length];
 
-		final Set<String> misssing = new HashSet<>(labels.length);
+		final Set<String> missing = new HashSet<>(labels.length);
 
 		for (int index = 0; index < labels.length; index++) {
 			final String label = labels[index];
@@ -62,14 +62,14 @@ public FilterNode<?> createFilterNode(String[] labels) {
 
 			// Column is not defined with us.
 			if (column == null) {
-				misssing.add(label);
+				missing.add(label);
 			}
 
 			columns[index] = column;
 		}
 
-		if(!misssing.isEmpty()){
-			throw new ConqueryError.ExecutionCreationPlanMissingFlagsError(misssing);
+		if(!missing.isEmpty()){
+			throw new ConqueryError.ExecutionCreationPlanMissingFlagsError(missing);
 		}
 
 		return new FlagColumnsFilterNode(columns);

From 41384f51655670af0c63a971b9f966a6e0f2d8b6 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 23 Jan 2023 16:05:07 +0100
Subject: [PATCH 62/86] fixes NPE in BooleanColumnValues

---
 .../preproc/parser/specific/BooleanColumnValues.java      | 8 ++++++--
 .../models/preproc/parser/specific/BooleanParser.java     | 5 +++++
 .../test/resources/tests/filter/FLAGS_FILTER/content.csv  | 2 ++
 .../test/resources/tests/filter/FLAGS_FILTER/expected.csv | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanColumnValues.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanColumnValues.java
index d1aedda423..745d9da523 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanColumnValues.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanColumnValues.java
@@ -1,6 +1,7 @@
 package com.bakdata.conquery.models.preproc.parser.specific;
 
 import java.util.BitSet;
+import java.util.Objects;
 
 import com.bakdata.conquery.models.preproc.parser.ColumnValues;
 
@@ -14,7 +15,7 @@ public BooleanColumnValues() {
 
 	@Override
 	public Boolean get(int event) {
-		if (event > values.length()){
+		if (event > values.length()) {
 			return false;
 		}
 
@@ -28,8 +29,11 @@ protected int size() {
 
 	@Override
 	protected void append(Boolean obj) {
+		// The coalesced false is masked by nullbits in the resulting store, it's just used to keep the store itself aligned
+		values.set(size, Objects.requireNonNullElse(obj, false));
+
 		// by counting events, we ensure dangling false values that are not counted towards length are respected in the output.
-		values.set(size++, obj);
+		size++;
 	}
 
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java
index e9f7963d28..d974ed2c72 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java
@@ -33,6 +33,11 @@ protected BooleanStore decideType() {
 
 	@Override
 	public void setValue(BooleanStore store, int event, Boolean value) {
+		if(value == null){
+			store.setNull(event);
+			return;
+		}
+
 		store.setBoolean(event, value);
 	}
 
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv b/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
index 02740d18d6..1ada2585f2 100644
--- a/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/content.csv
@@ -4,3 +4,5 @@ id,a,b,c
 3,N,N,J
 4,1,1,0
 5,false,false,true
+6,,,
+7,,,J
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv b/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv
index 1830dd4e83..190464565d 100644
--- a/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/expected.csv
@@ -3,3 +3,4 @@ result,dates
 3,{-∞/+∞}
 4,{-∞/+∞}
 5,{-∞/+∞}
+7,{-∞/+∞}

From 28583b8ab30d7089cb4909797f9200624489ce08 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 23 Jan 2023 17:07:38 +0100
Subject: [PATCH 63/86] Iterate on the empty state

---
 frontend/src/js/entity-history/Navigation.tsx | 41 +++++++++++++++----
 .../js/entity-history/NavigationHeader.tsx    | 10 -----
 .../timeline/TimelineEmptyPlaceholder.tsx     | 40 ++++++++++++++----
 frontend/src/localization/de.json             |  6 ++-
 frontend/src/localization/en.json             |  4 +-
 5 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/frontend/src/js/entity-history/Navigation.tsx b/frontend/src/js/entity-history/Navigation.tsx
index 333421a30f..6c26c3bf7c 100644
--- a/frontend/src/js/entity-history/Navigation.tsx
+++ b/frontend/src/js/entity-history/Navigation.tsx
@@ -2,10 +2,12 @@ import styled from "@emotion/styled";
 import { Dispatch, memo, SetStateAction, useCallback, useMemo } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 
 import { SelectOptionT } from "../api/types";
+import { StateT } from "../app/reducers";
 import IconButton from "../button/IconButton";
+import { ConfirmableTooltip } from "../tooltip/ConfirmableTooltip";
 import WithTooltip from "../tooltip/WithTooltip";
 
 import { EntityIdsList } from "./EntityIdsList";
@@ -18,7 +20,6 @@ import { saveHistory } from "./saveAndLoad";
 
 const Root = styled("div")`
   display: grid;
-  grid-template-rows: auto auto 1fr;
   gap: 10px;
   overflow: hidden;
   background-color: ${({ theme }) => theme.col.bg};
@@ -49,7 +50,7 @@ const BottomActions = styled("div")`
   display: flex;
 `;
 
-const BackButton = styled(IconButton)`
+const ContainedIconButton = styled(IconButton)`
   margin: 0 10px 0 20px;
   justify-content: center;
 `;
@@ -92,6 +93,10 @@ export const Navigation = memo(
       dispatch(closeHistory());
     }, [dispatch]);
 
+    const ids = useSelector<StateT, unknown[]>(
+      (state) => state.entityHistory.entityIds,
+    );
+
     const goToPrev = useCallback(() => {
       const prevIdx = Math.max(0, currentEntityIndex - 1);
 
@@ -122,19 +127,41 @@ export const Navigation = memo(
     const backButtonWarning =
       markedCount > 0 ? t("history.backButtonWarning") : "";
 
+    const showResetButton = ids.length > 0;
+
     return (
-      <Root className={className}>
+      <Root
+        className={className}
+        style={{
+          gridTemplateRows: showResetButton
+            ? "auto auto auto 1fr"
+            : "auto auto 1fr",
+        }}
+      >
         <WithTooltip text={backButtonWarning}>
-          <BackButton frame icon="chevron-left" onClick={onCloseHistory}>
+          <ContainedIconButton
+            frame
+            icon="chevron-left"
+            onClick={onCloseHistory}
+          >
             {t("common.back")}
-          </BackButton>
+          </ContainedIconButton>
         </WithTooltip>
+        {ids.length > 0 && (
+          <ConfirmableTooltip
+            onConfirm={onReset}
+            confirmationText={t("history.settings.resetConfirm")}
+          >
+            <ContainedIconButton frame icon="trash">
+              {t("history.settings.reset")}
+            </ContainedIconButton>
+          </ConfirmableTooltip>
+        )}
         <SxNavigationHeader
           markedCount={markedCount}
           idsCount={entityIds.length}
           entityStatusOptions={entityStatusOptions}
           setEntityStatusOptions={setEntityStatusOptions}
-          onReset={onReset}
         />
         <EntityIdNav>
           <TopActions>
diff --git a/frontend/src/js/entity-history/NavigationHeader.tsx b/frontend/src/js/entity-history/NavigationHeader.tsx
index e92c000e44..6ca59e94f8 100644
--- a/frontend/src/js/entity-history/NavigationHeader.tsx
+++ b/frontend/src/js/entity-history/NavigationHeader.tsx
@@ -72,7 +72,6 @@ interface Props {
   markedCount: number;
   entityStatusOptions: SelectOptionT[];
   setEntityStatusOptions: Dispatch<SetStateAction<SelectOptionT[]>>;
-  onReset: () => void;
 }
 export const NavigationHeader = memo(
   ({
@@ -81,7 +80,6 @@ export const NavigationHeader = memo(
     markedCount,
     setEntityStatusOptions,
     entityStatusOptions,
-    onReset,
   }: Props) => {
     const { t } = useTranslation();
     const label = useSelector<StateT, string>(
@@ -105,14 +103,6 @@ export const NavigationHeader = memo(
             <SpecialText>{t("history.history")}</SpecialText>
           </div>
           <Row>
-            <ConfirmableTooltip
-              onConfirm={onReset}
-              confirmationText={t("history.settings.reset")}
-            >
-              <WithTooltip text={t("history.settings.reset")}>
-                <IconButton icon="trash" />
-              </WithTooltip>
-            </ConfirmableTooltip>
             <WithTooltip text={t("history.settings.headline")}>
               <IconButton
                 icon="sliders"
diff --git a/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx b/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx
index a71ae848e9..5581c1ccf9 100644
--- a/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx
+++ b/frontend/src/js/entity-history/timeline/TimelineEmptyPlaceholder.tsx
@@ -14,19 +14,33 @@ const Root = styled("div")`
   padding: 20px;
   width: 100%;
   font-weight: 400;
+  color: ${({ theme }) => theme.col.gray};
 `;
 
 const Message = styled("p")`
+  color: ${({ theme }) => theme.col.black};
   font-size: ${({ theme }) => theme.font.lg};
   margin: 10px 0 0;
   font-weight: 400;
 `;
 
 const BigIcon = styled(FaIcon)`
-  font-size: 140px;
+  font-size: 120px;
   color: ${({ theme }) => theme.col.grayLight};
 `;
 
+const Headline = styled("h2")`
+  margin: 0;
+  font-size: ${({ theme }) => theme.font.huge};
+  line-height: 1.3;
+`;
+
+const Row = styled("p")`
+  display: flex;
+  gap: 30px;
+  align-items: center;
+`;
+
 const Description = styled("p")`
   font-size: ${({ theme }) => theme.font.lg};
   margin: 0;
@@ -35,19 +49,29 @@ const Description = styled("p")`
 export const TimelineEmptyPlaceholder = () => {
   const { t } = useTranslation();
 
+  const ids = useSelector<StateT, EntityHistoryStateT["entityIds"]>(
+    (state) => state.entityHistory.entityIds,
+  );
   const id = useSelector<StateT, EntityHistoryStateT["currentEntityId"]>(
     (state) => state.entityHistory.currentEntityId,
   );
 
   return (
     <Root>
-      <Message>{t("history.emptyTimeline.headline")}</Message>
-      <p>
-        {id
-          ? t("history.emptyTimeline.descriptionWithId")
-          : t("history.emptyTimeline.descriptionWithoutId")}
-      </p>
-      <BigIcon icon="list-ul" />
+      <Row>
+        <BigIcon icon="list-ul" />
+        <div>
+          <Headline>{t("history.emptyTimeline.headline")}</Headline>
+          <Description>{t("history.emptyTimeline.description")}</Description>
+          <Message>
+            {ids.length === 0
+              ? t("history.emptyTimeline.descriptionWithoutIds")
+              : id
+              ? t("history.emptyTimeline.descriptionWithId")
+              : t("history.emptyTimeline.descriptionWithoutId")}
+          </Message>
+        </div>
+      </Row>
     </Root>
   );
 };
diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index 4bd3dace2a..47a650e7a7 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -453,8 +453,10 @@
   },
   "history": {
     "emptyTimeline": {
-      "headline": "Leer!",
-      "descriptionWithoutId": "Wähle links eine ID aus der Liste",
+      "headline": "Historie",
+      "description": "Hier werden Informationen chronologisch dargestellt.",
+      "descriptionWithoutIds": "Importiere IDs in die leere Liste auf der linken Seite, um zu starten.",
+      "descriptionWithoutId": "Wähle eine ID aus der Liste auf der linken Seite.",
       "descriptionWithId": "Für diese ID konnten keine Daten gefunden werden."
     },
     "backButtonWarning": "Achtung: Wenn Du zurück gehst, werden Änderungen an der Liste verworfen. Lade die Liste vorher herunter, um sie zu speichern.",
diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index 8123f33b7e..ae33c66fb0 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -454,7 +454,9 @@
   },
   "history": {
     "emptyTimeline": {
-      "headline": "Empty!",
+      "headline": "History",
+      "description": "Exploring individual events chronologically.",
+      "descriptionWithoutIds": "To get started, import IDs into the empty list on the left side.",
       "descriptionWithoutId": "Select an ID from the list on the left side",
       "descriptionWithId": "Couldn't find any data for this ID."
     },

From e4cf1f198e4abdd3654db60fcad7bd645b06bf2a Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 23 Jan 2023 17:12:55 +0100
Subject: [PATCH 64/86] Remove unnecessary wrappers

---
 .../js/entity-history/NavigationHeader.tsx    | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/frontend/src/js/entity-history/NavigationHeader.tsx b/frontend/src/js/entity-history/NavigationHeader.tsx
index 6ca59e94f8..ea71702014 100644
--- a/frontend/src/js/entity-history/NavigationHeader.tsx
+++ b/frontend/src/js/entity-history/NavigationHeader.tsx
@@ -8,7 +8,6 @@ import type { StateT } from "../app/reducers";
 import IconButton from "../button/IconButton";
 import ProgressBar from "../common/components/ProgressBar";
 import { Heading3 } from "../headings/Headings";
-import { ConfirmableTooltip } from "../tooltip/ConfirmableTooltip";
 import WithTooltip from "../tooltip/WithTooltip";
 
 import { SettingsModal } from "./SettingsModal";
@@ -29,11 +28,6 @@ const BaseInfo = styled("div")`
   overflow: hidden;
 `;
 
-const Row = styled("div")`
-  display: flex;
-  align-items: center;
-`;
-
 const SxHeading3 = styled(Heading3)`
   flex-shrink: 0;
   margin: 0;
@@ -102,14 +96,12 @@ export const NavigationHeader = memo(
             <SxHeading3 title={label}>{label}</SxHeading3>
             <SpecialText>{t("history.history")}</SpecialText>
           </div>
-          <Row>
-            <WithTooltip text={t("history.settings.headline")}>
-              <IconButton
-                icon="sliders"
-                onClick={() => setSettingsModalOpen(true)}
-              />
-            </WithTooltip>
-          </Row>
+          <WithTooltip text={t("history.settings.headline")}>
+            <IconButton
+              icon="sliders"
+              onClick={() => setSettingsModalOpen(true)}
+            />
+          </WithTooltip>
         </BaseInfo>
         <StatsGrid>
           <Count>{idsCount}</Count>

From 4615155c4ba45eb384af847b868f7a79b2827347 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 23 Jan 2023 18:06:32 +0100
Subject: [PATCH 65/86] adds description to all components

---
 openapi.yaml | 221 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 148 insertions(+), 73 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index e45ba30924..e24a149591 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -7,8 +7,15 @@ info:
     #TODO find a fitting license
     name: TODO
     url: http://TODO/
+tags:
+  - name: dataset
+  - name: config
+  - name: query
+  - name: entity-preview
+  - name: concept
+  - name: frontend
+  - name: user
 components:
-
   securitySchemes:
     BasicAuth:
       type: http
@@ -74,6 +81,7 @@ components:
       type: string
       format: date
     query-state:
+      description: Potential states of a query.
       type: string
       enum:
         - NEW
@@ -87,45 +95,46 @@ components:
           $ref: "#/components/schemas/datasetId"
         label:
           type: string
-
-    frontend-value:
-      description: General purpose value container to describe labelled values to the frontend for drop downs and multi selects..
-      type: object
-      properties:
-        value:
-          type: string
-        label:
-          type: string
-        optionValue:
-          type: string
-      required:
-        - "value"
-    resolved-filter-result:
-      type: object
-      properties:
-        tableId:
-          $ref: "#/components/schemas/tableId"
-        filterId:
-          $ref: "#/components/schemas/filterId"
-        value:
-          type: array
-          items:
-            $ref: "#/components/schemas/frontend-value"
     resolved-concepts-result:
+      description: Response object for resolve endpoint.
       type: object
       properties:
         resolvedConcepts:
+          description: Ids of resolved concept elements.
           type: array
           uniqueItems: true
           items:
-            type: string
+            $ref: "#/components/schemas/conceptId"
         unknownCodes:
+          description: Values that could not be resolved.
           type: array
           uniqueItems: true
           items:
             type: string
         resolvedFilter:
-          $ref: "#/components/schemas/resolved-filter-result"
+          type: object
+          properties:
+            tableId:
+              $ref: "#/components/schemas/tableId"
+            filterId:
+              $ref: "#/components/schemas/filterId"
+            value:
+              description: List of resolved filter values.
+              type: array
+              items:
+                type: object
+                properties:
+                  value:
+                    description: Actual value - can be treated as the id of the value. To be used when querying the Filter.
+                    type: string
+                  label:
+                    description: Verbose description of the value.
+                    type: string
+                  optionValue:
+                    description: Less verbose description of the value.
+                    type: string
+                required:
+                  - "value"
     mail:
       type: string
       format: mail
@@ -147,7 +156,7 @@ components:
             type: string
         field:
           type: string
-          description: Name of column in csv
+          description: Name of column in result csv.
         pad:
           description: Pad-String when uploading data, to avoid problems with some tools truncating leading zeros or similar.
           type: string
@@ -185,8 +194,10 @@ components:
       type: object
       properties:
         version:
+          description: Revision of the backend.
           type: string
         manualUrl:
+          description: URL to this instances manual if available.
           type: string
           format: url
         contactEmail:
@@ -202,25 +213,6 @@ components:
           type: string
         code:
           type: number
-    concept-code-list:
-      type: object
-      properties:
-        concepts:
-          type: array
-          items:
-            type: string
-    id-label:
-      type: object
-      properties:
-        id:
-          $ref: "#/components/schemas/id"
-        label:
-          type: string
-    datasetAbility:
-      type: object
-      properties:
-        canUpload:
-          type: boolean
     me:
       type: object
       properties:
@@ -232,19 +224,32 @@ components:
           description: Per dataset abilities of the logged in User.
           type: object
           additionalProperties:
-            $ref: "#/components/schemas/datasetAbility"
+            type: object
+            properties:
+              canUpload:
+                type: boolean
         groups:
+          description: Groups the user is part of.
           type: array
           items:
-            $ref: "#/components/schemas/id-label"
+            type: object
+            properties:
+              id:
+                $ref: "#/components/schemas/id"
+              label:
+                type: string
     query-status:
+      description: Status of an executing or executed query.
       type: object
       properties:
         label:
+          description: Display label of the query.
           type: string
         isPristineLabel:
+          description: True if the user did not alter the queries label.
           type: boolean
         tags:
+          description: Tags of the query. To be treated like directories.
           type: array
           items:
             type: string
@@ -258,18 +263,23 @@ components:
         ownerName:
           type: string
         shared:
+          description: True if the query is shared with other users.
           type: boolean
         own:
+          description: True if the query is owned by the current user.
           type: boolean
         system:
+          description: True if the query is system generated.
           type: boolean
         id:
           $ref: "#/components/schemas/executionId"
         status:
           $ref: "#/components/schemas/query-state"
         numberOfResults:
+          description: Number of result-lines of the query.
           type: integer
         requiredTime:
+          description: Duration of the last execution.
           nullable: true
           type: integer
         startTime:
@@ -277,13 +287,16 @@ components:
         finishTime:
           $ref: "#/components/schemas/dateTime"
         queryType:
+          description: Specific subtype of the query.
           type: string # TODO use discriminator from Query
         secondaryId:
           $ref: "#/components/schemas/secondaryIdId"
         resultUrls:
+          description: Available result urls of the query.
           type: array
           items:
             type: string #TODO url?
+            format: url
 
     labeled:
       type: object
@@ -294,6 +307,7 @@ components:
           type: string
 
     secondaryId:
+      description: May be used in queries to execute queries grouped by an additional id.
       allOf:
         - $ref: "#/components/schemas/labeled"
         - type: object
@@ -301,6 +315,7 @@ components:
             description:
               type: string
     column-type:
+      description: Available types for input and output of conquery. Additionally list, which is a nested type of column-type.
       oneOf:
         - type: string
           enum:
@@ -314,8 +329,8 @@ components:
         - type: string
           pattern: "LIST\\[.*\\]"
 
-    #TODO descriptions for semantics
     semantic-event-date:
+      description: Values contain the primary date of a row.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
@@ -324,6 +339,7 @@ components:
           enum:
             - "EVENT_DATE"
     semantic-sources:
+      description: Values in the column contain references to the source connector.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
@@ -332,6 +348,7 @@ components:
           enum:
             - "SOURCES"
     semantic-categorical:
+      description: Values are an enumeration.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
@@ -340,6 +357,7 @@ components:
           enum:
             - "CATEGORICAL"
     semantic-group:
+      description: One of the columns to group by in entity-preview.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
@@ -348,6 +366,7 @@ components:
           enum:
             - "GROUP"
     semantic-hidden:
+      description: Values should not be displayed in entity-preview.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
       properties:
@@ -356,6 +375,7 @@ components:
           enum:
             - "HIDDEN"
     semantic-select:
+      description: Values are of the referenced select.
       properties:
         type:
           type: string
@@ -368,6 +388,7 @@ components:
             select:
               $ref: "#/components/schemas/selectId"
     semantic-concept-column:
+      description: Values contain the ids of the concept-element resolved to the event.
       properties:
         type:
           type: string
@@ -380,6 +401,7 @@ components:
             concept:
               $ref: "#/components/schemas/conceptId"
     semantic-column:
+      description: Values are of a specific column, without any aggregation.
       properties:
         type:
           type: string
@@ -392,6 +414,7 @@ components:
             column:
               $ref: "#/components/schemas/columnId"
     semantic-id:
+      description: Values are an entities id.
       properties:
         type:
           type: string
@@ -404,6 +427,7 @@ components:
             kind:
               type: string
     semantic-secondaryId:
+      description: Values are a secondaryId.
       allOf:
         - $ref: "#/components/schemas/semantic-base"
         - type: object
@@ -418,6 +442,7 @@ components:
       required:
         - "type"
     semantics:
+      description: Used to add additional information to a queries resulting column, such as sources or restrictions of the values.
       discriminator:
         propertyName: "type"
         mapping:
@@ -443,11 +468,14 @@ components:
         - $ref: "#/components/schemas/semantic-select"
         - $ref: "#/components/schemas/semantic-sources"
     column-description:
+      description: Metadata of a result column of a query.
       type: object
       properties:
         label:
+          description: label of the column in csv.
           type: string
         description:
+          description: If available any description of the data of the query. For example SecondaryId or an exported Column.
           nullable: true
           type: string
         defaultLabel:
@@ -456,6 +484,7 @@ components:
         type:
           $ref: "#/components/schemas/column-type"
         semantics:
+          description: Additional information and tags of the query.
           type: array
           uniqueItems: true
           items:
@@ -472,6 +501,7 @@ components:
       additionalProperties: true
       #TODO but in separate file
     error-info:
+      description: Basic format of an error.
       type: object
       properties:
         id:
@@ -486,9 +516,11 @@ components:
           additionalProperties: true
 
     entity-preview-config:
+      description: Frontend configuration for the entity-preview.
       type: object
       properties:
         all:
+          description: For frontend, list of sources to show the user. Usually a list of sources that have been tidied up.
           type: array
           items:
             properties:
@@ -497,6 +529,7 @@ components:
               label:
                 type: string
         default:
+          description: For frontend, list of sources to select by default.
           type: array
           items:
             properties:
@@ -504,51 +537,55 @@ components:
                 type: string
               label:
                 type: string
-    entity-history-execution-status-info:
-      type: object
-      properties:
-        label:
-          type: string
-        description:
-          type: string
-        typeInfo:
-          type: string
-        value:
-          type: string
-        semantics:
-          type: array
-          items:
-            $ref: "#/components/schemas/semantics"
     entity-history-execution-status:
+      description: Specific execution info for a entity-preview, containing additional information for the entity.
       allOf:
         - $ref: "#/components/schemas/full-execution-status"
         - type: object
           properties:
             infos:
+              description: Auxiliary information to the entity.
               type: array
               items:
-                $ref: "#/components/schemas/entity-history-execution-status-info"
+                type: object
+                properties:
+                  label:
+                    type: string
+                  description:
+                    type: string
+                  typeInfo:
+                    type: string
+                  value:
+                    type: string
+                  semantics:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/semantics"
     full-execution-status:
       allOf:
         - $ref: "#/components/schemas/query-status"
         - type: object
           properties:
             progress:
+              description: Progress of the query.
               nullable: true
               type: number
               minimum: 0
               maximum: 1
             columnDescriptions:
+              description: Metadata of the queries result by column.
               type: array
               items:
                 $ref: "#/components/schemas/column-description"
             canExpand:
+              description: Flag for the frontend, if the query can be rendered by it and therefore should allow expansion.
               type: boolean
             query:
               $ref: "#/components/schemas/query"
             error:
               $ref: "#/components/schemas/error-info"
             availableSecondaryIds:
+              description: List of all secondaryIds available inside this query, this is used by the frontend to display them to users when reusing queries.
               type: array
               items:
                 $ref: "#/components/schemas/secondaryIdId"
@@ -557,7 +594,9 @@ servers:
 paths:
   /frontend/config:
     get:
-      summary: An Endpoint describing configuration for the frontend.
+      description: An Endpoint describing configuration for the frontend.
+      tags:
+        - frontend
       operationId: get-frontend-config
       responses:
         "200":
@@ -572,8 +611,11 @@ paths:
     parameters:
       - $ref: "#/components/parameters/dataset"
     get:
+      tags:
+        - frontend
+        - entity-preview
       operationId: get-entity-preview-config
-      description: Gets entity-preview config and defaults for frontend.
+      description: Retrieve entity-preview config and defaults for frontend.
       responses:
         '200':
           description: The config.
@@ -584,6 +626,9 @@ paths:
 
   /me:
     get:
+      tags:
+        - frontend
+        - user
       operationId: get-me
       summary: Fetches description of the currently logged in user
       responses:
@@ -597,8 +642,10 @@ paths:
           $ref: "#/components/responses/unauthorized"
   /datasets:
     get:
+      tags:
+        - frontend
       operationId: list-datasets
-      description: Lists all datasets available to the User.
+      description: Fetch all datasets available to the User.
       responses:
         '200':
           description: The available datasets.
@@ -612,6 +659,8 @@ paths:
 
   /concepts/{concept}/resolve:
     post:
+      tags:
+        - concept
       parameters:
         - $ref: "#/components/parameters/concept"
       operationId: resolve-concepts
@@ -621,7 +670,12 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/concept-code-list"
+              type: object
+              properties:
+                concepts:
+                  type: array
+                  items:
+                    type: string
       responses:
         '400':
           description: When the requested Concept does not have children.
@@ -640,8 +694,11 @@ paths:
     parameters:
       - $ref: "#/components/parameters/dataset"
     get:
+      tags:
+        - query
+        - dataset
       operationId: list-queries
-      summary: Get Status and metadata of Queries
+      summary: Fetch Status and metadata of all queries visible to the user.
       responses:
         '200':
           description: The Status and Metadata.
@@ -652,6 +709,9 @@ paths:
                 items:
                   $ref: "#/components/schemas/query-status"
     post:
+      tags:
+        - query
+        - dataset
       operationId: post-query
       description: Submit a query for execution in the dataset.
       requestBody:
@@ -671,6 +731,8 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     get:
+      tags:
+        - query
       operationId: get-query-status
       summary: Get Status and metadata of Query
       responses:
@@ -681,6 +743,8 @@ paths:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
     patch:
+      tags:
+        - query
       description: update a query.
       operationId: patch-query
       requestBody:
@@ -690,12 +754,14 @@ paths:
               $ref: "#/components/schemas/query"
       responses:
         '200':
-          description: Desription of the updated execution
+          description: Description of the updated execution
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
     delete:
+      tags:
+        - query
       operationId: delete-query
       description: delete the query.
       responses:
@@ -705,6 +771,8 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     post:
+      tags:
+        - query
       operationId: cancel-query
       responses:
         '200':
@@ -713,6 +781,8 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     post:
+      tags:
+        - query
       operationId: reexecute-query
       responses:
         '200':
@@ -726,8 +796,10 @@ paths:
     parameters:
       - $ref: "#/components/parameters/dataset"
     post:
+      tags:
+        - entity-preview
       operationId: get-entity-preview
-      description: Fetch a history of a single entity
+      description: Submit a query for the history of a single entity
       requestBody:
         content:
           application/json:
@@ -735,12 +807,15 @@ paths:
               type: object
               properties:
                 idKind:
+                  description: The kind of the entity. Options are made available through `column-config#name`
                   type: string
                 entityId:
+                  description: The id of the entity.
                   type: string
                 time:
                   $ref: "#/components/schemas/date-range"
                 sources:
+                  description: List of connectorIds to export their backng tables.
                   type: array
                   items:
                     $ref: "#/components/schemas/connectorId"

From 8ef0fcda8011fdf78759f20bdfb9b622db98ae71 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 09:28:09 +0100
Subject: [PATCH 66/86] Unify endpoints to summary

---
 openapi.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index e24a149591..78b1419473 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -594,7 +594,7 @@ servers:
 paths:
   /frontend/config:
     get:
-      description: An Endpoint describing configuration for the frontend.
+      summary: An Endpoint describing configuration for the frontend.
       tags:
         - frontend
       operationId: get-frontend-config
@@ -615,7 +615,7 @@ paths:
         - frontend
         - entity-preview
       operationId: get-entity-preview-config
-      description: Retrieve entity-preview config and defaults for frontend.
+      summary: Retrieve config and defaults for entity-preview for the frontend.
       responses:
         '200':
           description: The config.
@@ -645,7 +645,7 @@ paths:
       tags:
         - frontend
       operationId: list-datasets
-      description: Fetch all datasets available to the User.
+      summary: Fetch all datasets available to the User.
       responses:
         '200':
           description: The available datasets.
@@ -713,7 +713,7 @@ paths:
         - query
         - dataset
       operationId: post-query
-      description: Submit a query for execution in the dataset.
+      summary: Submit a query for execution in the dataset.
       requestBody:
         content:
           application/json:
@@ -745,7 +745,7 @@ paths:
     patch:
       tags:
         - query
-      description: update a query.
+      summary: Update a query.
       operationId: patch-query
       requestBody:
         content:
@@ -760,6 +760,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
     delete:
+      summary: Delete a query.
       tags:
         - query
       operationId: delete-query
@@ -771,6 +772,7 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     post:
+      summary: Cancel a running query.
       tags:
         - query
       operationId: cancel-query
@@ -781,6 +783,7 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     post:
+      summary: Restart a query again. Useful for when it is empty after a restart, or the underlying data has changed.
       tags:
         - query
       operationId: reexecute-query
@@ -799,7 +802,7 @@ paths:
       tags:
         - entity-preview
       operationId: get-entity-preview
-      description: Submit a query for the history of a single entity
+      summary: Submit a query for the history of a single entity
       requestBody:
         content:
           application/json:

From 66d760201d730d7bb92b9ad1c975804ba99dca29 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 10:40:45 +0100
Subject: [PATCH 67/86] Update openapi.yaml

Co-authored-by: MT <12283268+thoniTUB@users.noreply.github.com>
---
 openapi.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openapi.yaml b/openapi.yaml
index 78b1419473..e61b0168c7 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -764,7 +764,7 @@ paths:
       tags:
         - query
       operationId: delete-query
-      description: delete the query.
+      description: Delete the query.
       responses:
         '200':
           description: Query was deleted.

From da323d29c2834ac7256aad5b3634f81a82026d26 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 11:04:20 +0100
Subject: [PATCH 68/86] Sort tags and minor cleanup

---
 openapi.yaml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index e61b0168c7..005cce290e 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -9,12 +9,12 @@ info:
     url: http://TODO/
 tags:
   - name: dataset
-  - name: config
+  - name: concept
   - name: query
+  - name: user
   - name: entity-preview
-  - name: concept
+  - name: config
   - name: frontend
-  - name: user
 components:
   securitySchemes:
     BasicAuth:
@@ -594,7 +594,7 @@ servers:
 paths:
   /frontend/config:
     get:
-      summary: An Endpoint describing configuration for the frontend.
+      summary: An Endpoint describing the configuration for the frontend.
       tags:
         - frontend
       operationId: get-frontend-config
@@ -760,11 +760,10 @@ paths:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
     delete:
-      summary: Delete a query.
+      summary: Delete the query.
       tags:
         - query
       operationId: delete-query
-      description: Delete the query.
       responses:
         '200':
           description: Query was deleted.
@@ -783,7 +782,7 @@ paths:
     parameters:
       - $ref: "#/components/parameters/query"
     post:
-      summary: Restart a query again. Useful for when it is empty after a restart, or the underlying data has changed.
+      summary: Restart a query. Useful for when it is empty after a restart, or the underlying data has changed.
       tags:
         - query
       operationId: reexecute-query
@@ -793,7 +792,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/query"
+                $ref: "#/components/schemas/full-execution-status"
 
   /datasets/{dataset}/queries/entity:
     parameters:
@@ -810,7 +809,7 @@ paths:
               type: object
               properties:
                 idKind:
-                  description: The kind of the entity. Options are made available through `column-config#name`
+                  description: The kind of the entity id. Options are made available through `column-config#name`
                   type: string
                 entityId:
                   description: The id of the entity.
@@ -818,14 +817,14 @@ paths:
                 time:
                   $ref: "#/components/schemas/date-range"
                 sources:
-                  description: List of connectorIds to export their backng tables.
+                  description: List of connectorIds to export their backing tables.
                   type: array
                   items:
                     $ref: "#/components/schemas/connectorId"
       responses:
         '200':
-          description: description of the history of the entity.
+          description: Description of the history of the entity.
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/full-execution-status"
+                $ref: "#/components/schemas/entity-history-execution-status"

From 9b9e71602f39cdb7ad2b4f8c61f3731ea181f2cb Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 11:31:55 +0100
Subject: [PATCH 69/86] adds unauthorized where applicable

---
 openapi.yaml | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 005cce290e..55ed462cd9 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -49,7 +49,7 @@ components:
         application/json:
           schema:
             $ref: "#/components/schemas/error"
-      description: The user is not logged in.
+      description: The user is not logged in or misses permissions to access the resource.
   schemas:
     id:
       description: Typed identifier of an object. Usually consists of a recursive structure separated by dots, starting with the dataset. The dataset can be omitted, when the url is already in a context with a bound dataset.
@@ -617,12 +617,14 @@ paths:
       operationId: get-entity-preview-config
       summary: Retrieve config and defaults for entity-preview for the frontend.
       responses:
-        '200':
+        "200":
           description: The config.
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/entity-preview-config"
+        "401":
+          $ref: "#/components/responses/unauthorized"
 
   /me:
     get:
@@ -647,7 +649,7 @@ paths:
       operationId: list-datasets
       summary: Fetch all datasets available to the User.
       responses:
-        '200':
+        "200":
           description: The available datasets.
           content:
             application/json:
@@ -655,8 +657,6 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/frontend-dataset-id"
-
-
   /concepts/{concept}/resolve:
     post:
       tags:
@@ -683,12 +683,14 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/error"
-        '200':
+        "200":
           description: Resolved Concepts
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/resolved-concepts-result"
+        "401":
+          $ref: "#/components/responses/unauthorized"
 
   /datasets/{dataset}/queries:
     parameters:
@@ -700,7 +702,7 @@ paths:
       operationId: list-queries
       summary: Fetch Status and metadata of all queries visible to the user.
       responses:
-        '200':
+        "200":
           description: The Status and Metadata.
           content:
             application/json:
@@ -708,6 +710,8 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/query-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"
     post:
       tags:
         - query
@@ -720,12 +724,14 @@ paths:
             schema:
               $ref: "#/components/schemas/query"
       responses:
-        '200':
+        "200":
           description: Status of the submitted query.
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"
 
   /queries/{query}:
     parameters:
@@ -736,12 +742,14 @@ paths:
       operationId: get-query-status
       summary: Get Status and metadata of Query
       responses:
-        '200':
+        "200":
           description: The Status and Metadata.
           content:
             application/json;charset=utf-8:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"
     patch:
       tags:
         - query
@@ -753,20 +761,24 @@ paths:
             schema:
               $ref: "#/components/schemas/query"
       responses:
-        '200':
+        "200":
           description: Description of the updated execution
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"
     delete:
       summary: Delete the query.
       tags:
         - query
       operationId: delete-query
       responses:
-        '200':
+        "200":
           description: Query was deleted.
+        "401":
+          $ref: "#/components/responses/unauthorized"
   /queries/{query}/cancel:
     parameters:
       - $ref: "#/components/parameters/query"
@@ -776,8 +788,10 @@ paths:
         - query
       operationId: cancel-query
       responses:
-        '200':
+        "200":
           description: Query was cancelled.
+        "401":
+          $ref: "#/components/responses/unauthorized"
   /queries/{query}/reexecute:
     parameters:
       - $ref: "#/components/parameters/query"
@@ -787,12 +801,14 @@ paths:
         - query
       operationId: reexecute-query
       responses:
-        '200':
+        "200":
           description: Description of restarted Query.
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/full-execution-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"
 
   /datasets/{dataset}/queries/entity:
     parameters:
@@ -822,9 +838,11 @@ paths:
                   items:
                     $ref: "#/components/schemas/connectorId"
       responses:
-        '200':
+        "200":
           description: Description of the history of the entity.
           content:
             application/json:
               schema:
                 $ref: "#/components/schemas/entity-history-execution-status"
+        "401":
+          $ref: "#/components/responses/unauthorized"

From 8a5c0ea4f77325eca261b865879fbda79a9da26b Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 15:52:30 +0100
Subject: [PATCH 70/86] Fixes a bug, where all booleans were  stored as null

---
 .../conquery/models/events/stores/primitive/BitSetStore.java    | 2 +-
 .../models/query/filter/event/FlagColumnsFilterNode.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/stores/primitive/BitSetStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/primitive/BitSetStore.java
index e0e9724456..6cfdf2e406 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/primitive/BitSetStore.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/primitive/BitSetStore.java
@@ -56,7 +56,7 @@ public BitSetStore createDescription() {
 
 	@Override
 	public void setBoolean(int event, boolean value) {
-		nullBits.set(event, true);
+		nullBits.set(event, false);
 		values.set(event, value);
 	}
 
diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java
index 65d99921fd..066df756a1 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/FlagColumnsFilterNode.java
@@ -19,7 +19,7 @@ public void init(Entity entity, QueryExecutionContext context) {
 	@Override
 	public boolean checkEvent(Bucket bucket, int event) {
 		for (Column column : getFilterValue()) {
-			if (bucket.getBoolean(event, column)) {
+			if (bucket.has(event, column) && bucket.getBoolean(event, column)) {
 				return true;
 			}
 		}

From 09921a88e693118c7a9b33aaa67db78acb5d555a Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:10:04 +0100
Subject: [PATCH 71/86] Implementaion and tests for select mirroring logic of
 FlagFilter

---
 .../select/connector/specific/FlagSelect.java | 58 ++++++++++++++++
 .../aggregators/specific/FlagsAggregator.java | 49 ++++++++++++++
 .../FLAGS_AGGREGATOR/FLAGS_FILTER.test.json   | 67 +++++++++++++++++++
 .../aggregator/FLAGS_AGGREGATOR/content.csv   |  8 +++
 .../aggregator/FLAGS_AGGREGATOR/expected.csv  |  8 +++
 .../FLAGS_FILTER/FLAGS_FILTER.test.json       | 13 ++--
 6 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/FlagSelect.java
 create mode 100644 backend/src/main/java/com/bakdata/conquery/models/query/queryplan/aggregators/specific/FlagsAggregator.java
 create mode 100644 backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json
 create mode 100644 backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
 create mode 100644 backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/expected.csv

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/FlagSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/FlagSelect.java
new file mode 100644
index 0000000000..60cf25c430
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/FlagSelect.java
@@ -0,0 +1,58 @@
+package com.bakdata.conquery.models.datasets.concepts.select.connector.specific;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.bakdata.conquery.io.cps.CPSType;
+import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection;
+import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.datasets.concepts.filters.specific.MultiSelectFilter;
+import com.bakdata.conquery.models.datasets.concepts.select.Select;
+import com.bakdata.conquery.models.events.MajorTypeId;
+import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
+import com.bakdata.conquery.models.query.queryplan.aggregators.specific.FlagsAggregator;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.dropwizard.validation.ValidationMethod;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+/**
+ * Implements a MultiSelect type filter, where an event can meet multiple criteria (as opposed to {@link MultiSelectFilter} which is restricted to one value per event).
+ * This is achieved by using multiple {@link com.bakdata.conquery.models.types.ResultType.BooleanT} columns, each defining if one property is met or not.
+ *
+ * The selected flags are logically or-ed.
+ */
+@CPSType(base = Select.class, id = "FLAGS")
+@RequiredArgsConstructor(onConstructor_ = {@JsonCreator})
+@ToString
+public class FlagSelect extends Select {
+
+	@NsIdRefCollection
+	private final Map<String, Column> flags;
+
+
+	@Override
+	public List<Column> getRequiredColumns() {
+		return new ArrayList<>(flags.values());
+	}
+
+	@Override
+	public Aggregator<?> createAggregator() {
+		return new FlagsAggregator(flags);
+	}
+
+
+	@JsonIgnore
+	@ValidationMethod(message = "Columns must be unique.")
+	public boolean isAllColumnsOfSameTable() {
+		return flags.values().stream().distinct().count() == flags.size();
+	}
+
+	@JsonIgnore
+	@ValidationMethod(message = "Columns must be BOOLEAN.")
+	public boolean isAllColumnsBoolean() {
+		return flags.values().stream().map(Column::getType).allMatch(MajorTypeId.BOOLEAN::equals);
+	}
+}
diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/aggregators/specific/FlagsAggregator.java b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/aggregators/specific/FlagsAggregator.java
new file mode 100644
index 0000000000..f29dd2bebe
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/aggregators/specific/FlagsAggregator.java
@@ -0,0 +1,49 @@
+package com.bakdata.conquery.models.query.queryplan.aggregators.specific;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.events.Bucket;
+import com.bakdata.conquery.models.query.QueryExecutionContext;
+import com.bakdata.conquery.models.query.entity.Entity;
+import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
+import com.bakdata.conquery.models.types.ResultType;
+import lombok.Data;
+
+@Data
+public class FlagsAggregator extends Aggregator<Set<String>> {
+
+	private final Map<String, Column> labels;
+
+	private Set<String> result;
+
+	@Override
+	public void init(Entity entity, QueryExecutionContext context) {
+		result = new HashSet<>(labels.size());
+	}
+
+	@Override
+	public void acceptEvent(Bucket bucket, int event) {
+		for (Map.Entry<String, Column> entry : labels.entrySet()) {
+
+			final Column column = entry.getValue();
+			final String label = entry.getKey();
+
+			if (bucket.has(event, column) && bucket.getBoolean(event, column)) {
+				result.add(label);
+			}
+		}
+	}
+
+	@Override
+	public Set<String> createAggregationResult() {
+		return result.isEmpty() ? null : result;
+	}
+
+	@Override
+	public ResultType getResultType() {
+		return new ResultType.ListT(ResultType.StringT.INSTANCE);
+	}
+}
diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json
new file mode 100644
index 0000000000..374137cbee
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json
@@ -0,0 +1,67 @@
+{
+  "type": "QUERY_TEST",
+  "label": "FLAGS_AGGREGATOR Test",
+  "expectedCsv": "tests/aggregator/FLAGS_AGGREGATOR/expected.csv",
+  "query": {
+    "type": "CONCEPT_QUERY",
+    "root": {
+      "ids": [
+        "concept"
+      ],
+      "type": "CONCEPT",
+      "tables": [
+        {
+          "id": "concept.connector",
+          "selects": [
+            "concept.connector.select"
+          ]
+        }
+      ]
+    }
+  },
+  "concepts": [
+    {
+      "name": "concept",
+      "type": "TREE",
+      "connectors": [
+        {
+          "name" : "connector",
+          "table" : "table",
+          "selects": {
+            "name" : "select",
+            "type": "FLAGS",
+            "flags": {
+              "A": "table.a",
+              "B": "table.b",
+              "C": "table.c"
+            }
+          }
+        }
+      ]
+    }
+  ],
+  "content": {
+    "tables": {
+      "name" : "table",
+      "csv": "tests/aggregator/FlAGS_AGGREGATOR/content.csv",
+      "primaryColumn": {
+        "name": "id",
+        "type": "STRING"
+      },
+      "columns": [
+        {
+          "name": "a",
+          "type": "BOOLEAN"
+        },
+        {
+          "name": "b",
+          "type": "BOOLEAN"
+        },
+        {
+          "name": "c",
+          "type": "BOOLEAN"
+        }
+      ]
+    }
+  }
+}
diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
new file mode 100644
index 0000000000..1ada2585f2
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
@@ -0,0 +1,8 @@
+id,a,b,c
+1,J,N,N
+2,N,J,N
+3,N,N,J
+4,1,1,0
+5,false,false,true
+6,,,
+7,,,J
diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/expected.csv b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/expected.csv
new file mode 100644
index 0000000000..10c6e12893
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/expected.csv
@@ -0,0 +1,8 @@
+result,dates,concept select
+1,{-∞/+∞},{A}
+2,{-∞/+∞},{B}
+3,{-∞/+∞},{C}
+4,{-∞/+∞},"{A,B}"
+5,{-∞/+∞},{C}
+6,{-∞/+∞},
+7,{-∞/+∞},{C}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
index e06744e455..5101dd2810 100644
--- a/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
@@ -28,15 +28,18 @@
   "connector": {
     "filters": {
       "type": "FLAGS",
-      "flags" : {
-        "A" : "table.a",
-        "B" : "table.b",
-        "C" : "table.c"
+      "flags": {
+        "A": "table.a",
+        "B": "table.b",
+        "C": "table.c"
       }
     }
   },
   "filterValue": {
     "type": "MULTI_SELECT",
-    "value": ["B", "C"]
+    "value": [
+      "B",
+      "C"
+    ]
   }
 }

From e05ddf93cf1ce6e5cdf2dd6f5bf08877b4345882 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:52:13 +0100
Subject: [PATCH 72/86] fixes name of test

---
 .../{FLAGS_FILTER.test.json => FLAGS_AGGREGATOR.test.json}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/{FLAGS_FILTER.test.json => FLAGS_AGGREGATOR.test.json} (100%)

diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
similarity index 100%
rename from backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_FILTER.test.json
rename to backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json

From fce748b42ab4db0a523bc5ed56bc4be2d56712cb Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 24 Jan 2023 17:30:18 +0100
Subject: [PATCH 73/86] reorder a line in csv to force a change in git

---
 .../resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
index 1ada2585f2..cb29726bb7 100644
--- a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/content.csv
@@ -4,5 +4,5 @@ id,a,b,c
 3,N,N,J
 4,1,1,0
 5,false,false,true
-6,,,
 7,,,J
+6,,,

From 91742c5e061abab778cf873e5158aaf033cba42c Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Wed, 25 Jan 2023 09:20:49 +0100
Subject: [PATCH 74/86] fix path

---
 .../FLAGS_AGGREGATOR.test.json                | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
index 374137cbee..49db5e0887 100644
--- a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
@@ -42,18 +42,18 @@
   ],
   "content": {
     "tables": {
-      "name" : "table",
-      "csv": "tests/aggregator/FlAGS_AGGREGATOR/content.csv",
-      "primaryColumn": {
-        "name": "id",
-        "type": "STRING"
-      },
-      "columns": [
-        {
-          "name": "a",
-          "type": "BOOLEAN"
-        },
-        {
+		"name": "table",
+		"csv": "tests/aggregator/FLAGS_AGGREGATOR/content.csv",
+		"primaryColumn": {
+			"name": "id",
+			"type": "STRING"
+		},
+		"columns": [
+			{
+				"name": "a",
+				"type": "BOOLEAN"
+			},
+			{
           "name": "b",
           "type": "BOOLEAN"
         },

From 4c5eec83db5b130f5fc19def6ac6b23b6c03f9b3 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 25 Jan 2023 10:48:21 +0100
Subject: [PATCH 75/86] removes secondaryId object as it is not used in API

---
 openapi.yaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/openapi.yaml b/openapi.yaml
index 55ed462cd9..59b480048b 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -305,15 +305,6 @@ components:
           type: string
         label:
           type: string
-
-    secondaryId:
-      description: May be used in queries to execute queries grouped by an additional id.
-      allOf:
-        - $ref: "#/components/schemas/labeled"
-        - type: object
-          properties:
-            description:
-              type: string
     column-type:
       description: Available types for input and output of conquery. Additionally list, which is a nested type of column-type.
       oneOf:

From ba0a5ec7b3403a146d8907cb22d4f7d77dc277fb Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Wed, 25 Jan 2023 11:54:45 +0100
Subject: [PATCH 76/86] fix id localization fall backs

---
 .../conquery/models/config/IdColumnConfig.java     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
index b5b4ca1870..288024d3c6 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
@@ -115,7 +115,19 @@ public List<ResultInfo> getIdResultInfos() {
 		return ids.stream()
 				  .filter(ColumnConfig::isPrint)
 				  .map(col -> new LocalizedDefaultResultInfo(
-						  locale -> col.getLabel().getOrDefault(locale.getLanguage(), col.getField()),
+						  locale -> {
+							  final Map<Locale, String> label = col.getLabel();
+							  // Get the label for the locale,
+							  // fall back to any label if there is exactly one defined,
+							  // then fall back to the field name.
+							  return label.getOrDefault(
+									  locale,
+									  // fall backs
+									  label.size() == 1 ?
+									  label.values().stream().findFirst().get() :
+									  col.getField()
+							  );
+						  },
 						  locale -> col.getField(),
 						  ResultType.StringT.getINSTANCE(),
 						  Set.of(new SemanticType.IdT(col.getName()))

From 7eb943d2fedebababb64c149d33c85514883232a Mon Sep 17 00:00:00 2001
From: Max Thonagel <12283268+thoniTUB@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:36:53 +0100
Subject: [PATCH 77/86] use only element collector

---
 .../com/bakdata/conquery/models/config/IdColumnConfig.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
index 288024d3c6..1457102826 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
@@ -21,6 +21,7 @@
 import com.bakdata.conquery.models.types.SemanticType;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Functions;
+import com.google.common.collect.MoreCollectors;
 import io.dropwizard.validation.ValidationMethod;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -124,7 +125,7 @@ public List<ResultInfo> getIdResultInfos() {
 									  locale,
 									  // fall backs
 									  label.size() == 1 ?
-									  label.values().stream().findFirst().get() :
+									  label.values().stream().collect(MoreCollectors.onlyElement()) :
 									  col.getField()
 							  );
 						  },

From ad64f2484b4957a477db862d7bd4cf11d1a7f9d1 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:54:52 +0100
Subject: [PATCH 78/86] also add COLUMN semantics to SECONDARY_ID flagged
 columns, to ensure the information is not lost.

---
 .../com/bakdata/conquery/apiv1/query/TableExportQuery.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
index aa190fe549..6b06680b72 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
@@ -210,6 +210,7 @@ private List<ResultInfo> createResultInfos(Map<SecondaryIdDescription, Integer>
 		infos[0] = ConqueryConstants.DATES_INFO_HISTORY;
 		infos[1] = ConqueryConstants.SOURCE_INFO;
 
+
 		for (Map.Entry<SecondaryIdDescription, Integer> e : secondaryIdPositions.entrySet()) {
 			final SecondaryIdDescription desc = e.getKey();
 			final Integer pos = e.getValue();
@@ -242,13 +243,15 @@ private List<ResultInfo> createResultInfos(Map<SecondaryIdDescription, Integer>
 
 		for (Map.Entry<Column, Integer> entry : positions.entrySet()) {
 
-			// 0 Position is date, already covered
 			final int position = entry.getValue();
 
 			final Column column = entry.getKey();
 
+			// 0 Position is date, already covered
 			// SecondaryIds and date columns are pulled to the front, thus already covered.
 			if (position == 0 || column.getSecondaryId() != null) {
+				infos[secondaryIdPositions.get(column.getSecondaryId())].getSemantics()
+																		.add(new SemanticType.ColumnT(column));
 				continue;
 			}
 

From 19af675897b40bcd29b370050954f77d68180a86 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Mon, 30 Jan 2023 16:37:25 +0100
Subject: [PATCH 79/86] skip pos 0

---
 .../com/bakdata/conquery/apiv1/query/TableExportQuery.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
index 6b06680b72..c933885d98 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
@@ -247,9 +247,12 @@ private List<ResultInfo> createResultInfos(Map<SecondaryIdDescription, Integer>
 
 			final Column column = entry.getKey();
 
-			// 0 Position is date, already covered
+			if(position == 0) {
+				continue;
+			}
+
 			// SecondaryIds and date columns are pulled to the front, thus already covered.
-			if (position == 0 || column.getSecondaryId() != null) {
+			if (column.getSecondaryId() != null) {
 				infos[secondaryIdPositions.get(column.getSecondaryId())].getSemantics()
 																		.add(new SemanticType.ColumnT(column));
 				continue;

From 91192f050bf19f38f0b3082f90d7ff15d4684daa Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 31 Jan 2023 11:22:27 +0100
Subject: [PATCH 80/86] force reformat to enforce a change

---
 .../apiv1/query/TableExportQuery.java         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
index aa190fe549..f258bdf456 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java
@@ -152,6 +152,23 @@ public void resolve(QueryResolveContext context) {
 		resultInfos = createResultInfos(secondaryIdPositions);
 	}
 
+	private Map<SecondaryIdDescription, Integer> calculateSecondaryIdPositions(AtomicInteger currentPosition) {
+		Map<SecondaryIdDescription, Integer> secondaryIdPositions = new HashMap<>();
+
+		// SecondaryIds are pulled to the front and grouped over all tables
+		tables.stream()
+			  .flatMap(con -> con.getTables().stream())
+			  .flatMap(table -> Arrays.stream(table.getConnector().getTable().getColumns()))
+			  .map(Column::getSecondaryId)
+			  .filter(Objects::nonNull)
+			  .distinct()
+			  .sorted(Comparator.comparing(SecondaryIdDescription::getLabel))
+			  // Using for each and not a collector allows us to guarantee sorted insertion.
+			  .forEach(secondaryId -> secondaryIdPositions.put(secondaryId, currentPosition.getAndIncrement()));
+
+		return secondaryIdPositions;
+	}
+
 	private static Map<Column, Integer> calculateColumnPositions(AtomicInteger currentPosition, List<CQConcept> tables, Map<SecondaryIdDescription, Integer> secondaryIdPositions) {
 		final Map<Column, Integer> positions = new HashMap<>();
 
@@ -184,23 +201,6 @@ private static Map<Column, Integer> calculateColumnPositions(AtomicInteger curre
 		return positions;
 	}
 
-	private Map<SecondaryIdDescription, Integer> calculateSecondaryIdPositions(AtomicInteger currentPosition) {
-		Map<SecondaryIdDescription, Integer> secondaryIdPositions = new HashMap<>();
-
-		// SecondaryIds are pulled to the front and grouped over all tables
-		tables.stream()
-			  .flatMap(con -> con.getTables().stream())
-			  .flatMap(table -> Arrays.stream(table.getConnector().getTable().getColumns()))
-			  .map(Column::getSecondaryId)
-			  .filter(Objects::nonNull)
-			  .distinct()
-			  .sorted(Comparator.comparing(SecondaryIdDescription::getLabel))
-			  // Using for each and not a collector allows us to guarantee sorted insertion.
-			  .forEach(secondaryId -> secondaryIdPositions.put(secondaryId, currentPosition.getAndIncrement()));
-
-		return secondaryIdPositions;
-	}
-
 	private List<ResultInfo> createResultInfos(Map<SecondaryIdDescription, Integer> secondaryIdPositions) {
 
 		final int size = positions.values().stream().mapToInt(i -> i).max().getAsInt() + 1;

From 7709e130504cd51c88cd3d1b4e020626381a48cf Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Tue, 31 Jan 2023 11:25:06 +0100
Subject: [PATCH 81/86] reformat with different origin

---
 .../conquery/apiv1/query/SecondaryIdQuery.java    | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java
index ce80e2bfe2..e4f2e31cd4 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java
@@ -85,7 +85,7 @@ public void resolve(final QueryResolveContext context) {
 		}
 		final QueryResolveContext resolvedContext = context.withDateAggregationMode(resolvedDateAggregationMode);
 
-		this.query = new ConceptQuery(root);
+		query = new ConceptQuery(root);
 		query.resolve(resolvedContext);
 
 		withSecondaryId = new HashSet<>();
@@ -143,16 +143,9 @@ private Column findSecondaryIdColumn(Table table) {
 
 	@Override
 	public List<ResultInfo> getResultInfos() {
-		List<ResultInfo> resultInfos = new ArrayList<>();
-
-		resultInfos.add(
-				new SimpleResultInfo(
-						secondaryId.getLabel(),
-						ResultType.StringT.INSTANCE,
-						secondaryId.getDescription(),
-						Set.of(new SemanticType.SecondaryIdT(getSecondaryId()))
-				)
-		);
+		final List<ResultInfo> resultInfos = new ArrayList<>();
+
+		resultInfos.add(new SimpleResultInfo(secondaryId.getLabel(), ResultType.StringT.INSTANCE, secondaryId.getDescription(), Set.of(new SemanticType.SecondaryIdT(getSecondaryId()))));
 
 		resultInfos.addAll(query.getResultInfos());
 

From bdd991f8cd790226f0e7953a0bf69eb394af75b5 Mon Sep 17 00:00:00 2001
From: awildturtok <1553491+awildturtok@users.noreply.github.com>
Date: Wed, 1 Feb 2023 09:44:33 +0100
Subject: [PATCH 82/86] Adds hidden flag to SecondaryIdDescription and filters
 SecondaryIds for display

---
 .../conquery/models/datasets/SecondaryIdDescription.java     | 5 +++++
 .../models/datasets/concepts/FrontEndConceptBuilder.java     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/SecondaryIdDescription.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/SecondaryIdDescription.java
index a93cb72322..adc8ae83ed 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/SecondaryIdDescription.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/SecondaryIdDescription.java
@@ -26,6 +26,11 @@ public class SecondaryIdDescription extends Labeled<SecondaryIdDescriptionId> im
 	@View.ApiManagerPersistence
 	private InternToExternMapper mapping;
 
+	/**
+	 * If true, SecondaryId will not be displayed to the user or listed in APIs.
+	 */
+	private boolean hidden = false;
+
 	@Override
 	public SecondaryIdDescriptionId createId() {
 		return new SecondaryIdDescriptionId(dataset.getId(), getName());
diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/FrontEndConceptBuilder.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/FrontEndConceptBuilder.java
index d405f16cbe..85cf6322b8 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/FrontEndConceptBuilder.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/FrontEndConceptBuilder.java
@@ -83,6 +83,7 @@ public static FrontendRoot createRoot(NamespaceStorage storage, Subject subject)
 		root.getSecondaryIds()
 			.addAll(
 					storage.getSecondaryIds().stream()
+						   .filter(sid -> !sid.isHidden())
 						   .map(sid -> new FrontendSecondaryId(sid.getId().toString(), sid.getLabel(), sid.getDescription()))
 						   .collect(Collectors.toSet())
 			);

From d48d89d42c8fdb7d66b5055930d1ff2a3603d7de Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Wed, 1 Feb 2023 12:57:52 +0100
Subject: [PATCH 83/86] Iterate on history timeline sort order; add open all

---
 .../src/js/entity-history/ContentControl.tsx  |  14 +-
 frontend/src/js/entity-history/History.tsx    |  21 ++-
 .../js/entity-history/InteractionControl.tsx  |  26 ++-
 .../js/entity-history/timeline/EventCard.tsx  | 151 ++++++++----------
 .../timeline/GroupedContent.tsx               |   6 +-
 frontend/src/localization/de.json             |   1 +
 frontend/src/localization/en.json             |   1 +
 7 files changed, 124 insertions(+), 96 deletions(-)

diff --git a/frontend/src/js/entity-history/ContentControl.tsx b/frontend/src/js/entity-history/ContentControl.tsx
index 91b5572cb6..b309127133 100644
--- a/frontend/src/js/entity-history/ContentControl.tsx
+++ b/frontend/src/js/entity-history/ContentControl.tsx
@@ -30,11 +30,6 @@ const ContentControl = ({ value, onChange }: Props) => {
 
   const options = useMemo(
     () => [
-      {
-        key: "groupId" as const,
-        icon: "fingerprint" as const,
-        tooltip: t("history.content.fingerprint"),
-      },
       {
         key: "money" as const,
         icon: "euro-sign" as const,
@@ -50,6 +45,11 @@ const ContentControl = ({ value, onChange }: Props) => {
         icon: "info" as const,
         tooltip: t("history.content.rest"),
       },
+      {
+        key: "groupId" as const,
+        icon: "fingerprint" as const,
+        tooltip: t("history.content.fingerprint"),
+      },
     ],
     [t],
   );
@@ -77,11 +77,11 @@ const ContentControl = ({ value, onChange }: Props) => {
 
 export const useContentControl = () => {
   const [contentFilter, setContentFilter] = useState<ContentFilterValue>({
-    groupId: true,
+    groupId: false,
     secondaryId: true,
     concept: true,
     money: true,
-    rest: true,
+    rest: false,
     dates: true,
   });
 
diff --git a/frontend/src/js/entity-history/History.tsx b/frontend/src/js/entity-history/History.tsx
index b35e418a4f..67327ab58e 100644
--- a/frontend/src/js/entity-history/History.tsx
+++ b/frontend/src/js/entity-history/History.tsx
@@ -155,7 +155,7 @@ export const History = () => {
     [setEntityIdsStatus, setEntityStatusOptions, updateHistorySession],
   );
 
-  const { getIsOpen, toggleOpenYear, toggleOpenQuarter, closeAll } =
+  const { getIsOpen, toggleOpenYear, toggleOpenQuarter, closeAll, openAll } =
     useOpenCloseInteraction();
 
   return (
@@ -204,7 +204,7 @@ export const History = () => {
                     setDetailLevel={setDetailLevel}
                   />
                 )}
-                <InteractionControl onCloseAll={closeAll} />
+                <InteractionControl onCloseAll={closeAll} onOpenAll={openAll} />
                 <ContentControl
                   value={contentFilter}
                   onChange={setContentFilter}
@@ -387,10 +387,27 @@ const useOpenCloseInteraction = () => {
     setIsOpen({});
   }, []);
 
+  const openAll = useCallback(() => {
+    const lastYearsToUse = 20;
+    const currYear = new Date().getFullYear();
+    const years = [...Array(lastYearsToUse).keys()].map((i) => currYear - i);
+
+    const newIsOpen: Record<string, boolean> = {};
+
+    for (const year of years) {
+      for (const quarter of [1, 2, 3, 4]) {
+        newIsOpen[toId(year, quarter)] = true;
+      }
+    }
+
+    setIsOpen(newIsOpen);
+  }, [toId]);
+
   return {
     getIsOpen,
     toggleOpenYear,
     toggleOpenQuarter,
     closeAll,
+    openAll,
   };
 };
diff --git a/frontend/src/js/entity-history/InteractionControl.tsx b/frontend/src/js/entity-history/InteractionControl.tsx
index 2c596b9804..98caf79cec 100644
--- a/frontend/src/js/entity-history/InteractionControl.tsx
+++ b/frontend/src/js/entity-history/InteractionControl.tsx
@@ -1,16 +1,34 @@
+import styled from "@emotion/styled";
 import { memo } from "react";
 import { useTranslation } from "react-i18next";
 
 import IconButton from "../button/IconButton";
 import WithTooltip from "../tooltip/WithTooltip";
 
-const InteractionControl = ({ onCloseAll }: { onCloseAll: () => void }) => {
+const Root = styled("div")`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+`;
+
+const InteractionControl = ({
+  onCloseAll,
+  onOpenAll,
+}: {
+  onCloseAll: () => void;
+  onOpenAll: () => void;
+}) => {
   const { t } = useTranslation();
 
   return (
-    <WithTooltip text={t("history.closeAll")}>
-      <IconButton onClick={onCloseAll} icon="home" />
-    </WithTooltip>
+    <Root>
+      <WithTooltip text={t("history.closeAll")}>
+        <IconButton onClick={onCloseAll} icon="home" />
+      </WithTooltip>
+      <WithTooltip text={t("history.openAll")}>
+        <IconButton onClick={onOpenAll} icon="chevron-right" />
+      </WithTooltip>
+    </Root>
   );
 };
 
diff --git a/frontend/src/js/entity-history/timeline/EventCard.tsx b/frontend/src/js/entity-history/timeline/EventCard.tsx
index ee8dfecabe..a5dd7517bf 100644
--- a/frontend/src/js/entity-history/timeline/EventCard.tsx
+++ b/frontend/src/js/entity-history/timeline/EventCard.tsx
@@ -35,30 +35,24 @@ const EventItemContent = styled("div")`
   margin-top: 5px;
   background-color: white;
   overflow: hidden;
-`;
-const MainContent = styled("div")`
-  display: grid;
-  grid-template-columns: 1.618fr 1fr;
-  gap: 6px;
-  padding: 15px 15px 12px 6px;
-  font-size: ${({ theme }) => theme.font.sm};
-`;
-const Col = styled("div")`
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
+  > div {
+    &:first-of-type {
+      padding-top: 14px;
+    }
+  }
 `;
 
 const ColBucket = styled("div")`
   color: black;
   padding: 1px 4px;
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  width: 100%;
+  grid-template-columns: 1fr 1fr 1fr;
   @media (min-width: 1800px) {
-    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-columns: 1fr 1fr 1fr 1fr;
   }
   @media (min-width: 2500px) {
-    grid-template-columns: 1fr 1fr 1fr 1fr;
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
   }
   gap: 3px 10px;
 `;
@@ -67,6 +61,8 @@ const Flex = styled("div")`
   display: flex;
   align-items: flex-start;
   gap: 5px;
+  padding: 12px 15px 10px 6px;
+  font-size: ${({ theme }) => theme.font.sm};
 `;
 
 const SxRawDataBadge = styled(RawDataBadge)`
@@ -138,71 +134,32 @@ const EventCard = ({
       <RowDates dates={row.dates} />
       <SxRawDataBadge event={row} />
       <EventItemContent>
-        <MainContent>
-          <Col>
-            {contentFilter.money && applicableMoney.length > 0 && (
-              <Flex>
-                <WithTooltip text={moneyTooltip}>
-                  <span>
-                    <SxFaIcon icon="euro-sign" active large />
-                  </span>
-                </WithTooltip>
-                <ColBucket>
-                  {applicableMoney.map((column) => (
-                    <div key={column.label}>
-                      <TinyLabel>{column.defaultLabel}</TinyLabel>
-                      <code>
-                        <NumberFormat
-                          thousandSeparator={currencyConfig.thousandSeparator}
-                          decimalSeparator={currencyConfig.decimalSeparator}
-                          decimalScale={currencyConfig.decimalScale}
-                          suffix={currencyConfig.prefix}
-                          displayType="text"
-                          value={parseInt(row[column.label]) / 100}
-                        />
-                      </code>
-                    </div>
-                  ))}
-                </ColBucket>
-              </Flex>
-            )}
-            {contentFilter.rest && applicableRest.length > 0 && (
-              <Flex>
-                <WithTooltip text={restTooltip}>
-                  <span>
-                    <SxFaIcon icon="info" active large />
-                  </span>
-                </WithTooltip>
-                <ColBucket>
-                  {applicableRest.map((column) => (
-                    <div key={column.label}>
-                      <TinyLabel>{column.defaultLabel}</TinyLabel>
-                      <span>{row[column.label]}</span>
-                    </div>
-                  ))}
-                </ColBucket>
-              </Flex>
-            )}
-          </Col>
-
-          {contentFilter.groupId && applicableGroupableIds.length > 0 && (
-            <Flex>
-              <WithTooltip text={groupableIdsTooltip}>
-                <span>
-                  <SxFaIcon icon="fingerprint" active large />
-                </span>
-              </WithTooltip>
-              <ColBucket style={{ gridTemplateColumns: "1fr" }}>
-                {applicableGroupableIds.map((column) => (
-                  <div key={column.label}>
-                    <TinyLabel>{column.defaultLabel}</TinyLabel>
-                    {row[column.label]}
-                  </div>
-                ))}
-              </ColBucket>
-            </Flex>
-          )}
-        </MainContent>
+        {contentFilter.money && applicableMoney.length > 0 && (
+          <Flex>
+            <WithTooltip text={moneyTooltip}>
+              <span>
+                <SxFaIcon icon="euro-sign" active large />
+              </span>
+            </WithTooltip>
+            <ColBucket>
+              {applicableMoney.map((column) => (
+                <div key={column.label}>
+                  <TinyLabel>{column.defaultLabel}</TinyLabel>
+                  <code>
+                    <NumberFormat
+                      thousandSeparator={currencyConfig.thousandSeparator}
+                      decimalSeparator={currencyConfig.decimalSeparator}
+                      decimalScale={currencyConfig.decimalScale}
+                      suffix={currencyConfig.prefix}
+                      displayType="text"
+                      value={parseInt(row[column.label]) / 100}
+                    />
+                  </code>
+                </div>
+              ))}
+            </ColBucket>
+          </Flex>
+        )}
         {groupedRowsKeysWithDifferentValues && groupedRows && (
           <GroupedContent
             datasetId={datasetId}
@@ -216,6 +173,40 @@ const EventCard = ({
             rootConceptIdsByColumn={rootConceptIdsByColumn}
           />
         )}
+        {contentFilter.rest && applicableRest.length > 0 && (
+          <Flex>
+            <WithTooltip text={restTooltip}>
+              <span>
+                <SxFaIcon icon="info" active large />
+              </span>
+            </WithTooltip>
+            <ColBucket>
+              {applicableRest.map((column) => (
+                <div key={column.label}>
+                  <TinyLabel>{column.defaultLabel}</TinyLabel>
+                  <span>{row[column.label]}</span>
+                </div>
+              ))}
+            </ColBucket>
+          </Flex>
+        )}
+        {contentFilter.groupId && applicableGroupableIds.length > 0 && (
+          <Flex>
+            <WithTooltip text={groupableIdsTooltip}>
+              <span>
+                <SxFaIcon icon="fingerprint" active large />
+              </span>
+            </WithTooltip>
+            <ColBucket>
+              {applicableGroupableIds.map((column) => (
+                <div key={column.label}>
+                  <TinyLabel>{column.defaultLabel}</TinyLabel>
+                  {row[column.label]}
+                </div>
+              ))}
+            </ColBucket>
+          </Flex>
+        )}
       </EventItemContent>
     </Card>
   );
diff --git a/frontend/src/js/entity-history/timeline/GroupedContent.tsx b/frontend/src/js/entity-history/timeline/GroupedContent.tsx
index 9e019ba92b..f48ea86c0f 100644
--- a/frontend/src/js/entity-history/timeline/GroupedContent.tsx
+++ b/frontend/src/js/entity-history/timeline/GroupedContent.tsx
@@ -1,6 +1,7 @@
 import { css, Theme } from "@emotion/react";
 import styled from "@emotion/styled";
 import { memo, useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import NumberFormat from "react-number-format";
 
 import {
@@ -29,8 +30,6 @@ const Grid = styled("div")`
 
 const ExtraArea = styled("div")`
   padding: 8px 15px 12px 49px;
-  background-color: ${({ theme }) => theme.col.bg};
-  border-top: 1px solid ${({ theme }) => theme.col.grayVeryLight};
   overflow-x: auto;
   -webkit-overflow-scrolling: touch;
 `;
@@ -73,6 +72,7 @@ const GroupedContent = ({
   rootConceptIdsByColumn,
   contentFilter,
 }: Props) => {
+  const { t } = useTranslation();
   const differencesKeys = useMemo(
     () =>
       groupedRowsKeysWithDifferentValues
@@ -107,7 +107,7 @@ const GroupedContent = ({
       >
         {differencesKeys.map((key) => (
           <TinyLabel key={key}>
-            {key === "dates" ? "Datumswerte" : columns[key].defaultLabel}
+            {key === "dates" ? t("history.dates") : columns[key].defaultLabel}
           </TinyLabel>
         ))}
         {groupedRows.map((groupedRow) =>
diff --git a/frontend/src/localization/de.json b/frontend/src/localization/de.json
index 47a650e7a7..fbad9f20c7 100644
--- a/frontend/src/localization/de.json
+++ b/frontend/src/localization/de.json
@@ -470,6 +470,7 @@
     "downloadEntityData": "Einzelhistorie herunterladen",
     "differencesTooltip": "Unterschiede aus den einzelnen Datenpunkten",
     "closeAll": "Alle schließen",
+    "openAll": "Alle aufklappen",
     "dates": "Datumswerte",
     "options": {
       "check": "auffällig",
diff --git a/frontend/src/localization/en.json b/frontend/src/localization/en.json
index ae33c66fb0..8cf24f66bd 100644
--- a/frontend/src/localization/en.json
+++ b/frontend/src/localization/en.json
@@ -471,6 +471,7 @@
     "downloadEntityData": "Download entity history",
     "differencesTooltip": "Differences from the individual events",
     "closeAll": "Close all",
+    "openAll": "Open all",
     "dates": "Dates",
     "options": {
       "check": "interesting",

From 5aa9f62c7b24ac4191cdd8be4bde1b52d8bdd0bb Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Wed, 1 Feb 2023 17:43:50 +0100
Subject: [PATCH 84/86] Fix no newline

---
 frontend/src/js/pane/TabNavigation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/js/pane/TabNavigation.tsx b/frontend/src/js/pane/TabNavigation.tsx
index c624aacbaa..7f1816980d 100644
--- a/frontend/src/js/pane/TabNavigation.tsx
+++ b/frontend/src/js/pane/TabNavigation.tsx
@@ -98,4 +98,4 @@ const TabNavigation: FC<PropsT> = ({
   );
 };
 
-export default TabNavigation;
\ No newline at end of file
+export default TabNavigation;

From 6a2e1e6a963a7a5b58c9f4e06712ac66c3804581 Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 6 Feb 2023 10:45:14 +0100
Subject: [PATCH 85/86] Update semantic types api

---
 frontend/src/js/api/types.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/js/api/types.ts b/frontend/src/js/api/types.ts
index 311659bd91..726f9bb287 100644
--- a/frontend/src/js/api/types.ts
+++ b/frontend/src/js/api/types.ts
@@ -327,6 +327,10 @@ export type ColumnDescriptionKind =
   | "DATE_RANGE"
   | "LIST[DATE_RANGE]";
 
+export interface ColumnDescriptionSemanticColumn {
+  type: "COLUMN";
+  column: string;
+}
 export interface ColumnDescriptionSemanticConceptColumn {
   type: "CONCEPT_COLUMN";
   concept: string;
@@ -367,6 +371,7 @@ export type ColumnDescriptionSemantic =
   | ColumnDescriptionSemanticSecondaryId
   | ColumnDescriptionSemanticSelect
   | ColumnDescriptionSemanticConceptColumn
+  | ColumnDescriptionSemanticColumn // Probably won't be used by us
   | ColumnDescriptionSemanticEventDate
   | ColumnDescriptionSemanticSources
   | ColumnDescriptionSemanticCategorical // Probably won't be used by us

From 2b65f13b8bcf79d77b2b3b1b57e9bdd7d909f13f Mon Sep 17 00:00:00 2001
From: Kai Rollmann <kai.rollmann@gmail.com>
Date: Mon, 6 Feb 2023 16:10:46 +0100
Subject: [PATCH 86/86] Fix trying to display dates and source within group ids
 accidentally

---
 frontend/src/js/entity-history/timeline/EventCard.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/js/entity-history/timeline/EventCard.tsx b/frontend/src/js/entity-history/timeline/EventCard.tsx
index a5dd7517bf..1a23cded77 100644
--- a/frontend/src/js/entity-history/timeline/EventCard.tsx
+++ b/frontend/src/js/entity-history/timeline/EventCard.tsx
@@ -113,8 +113,11 @@ const EventCard = ({
 }: Props) => {
   const { t } = useTranslation();
 
-  const applicableGroupableIds = columnBuckets.groupableIds.filter((column) =>
-    exists(row[column.label]),
+  const applicableGroupableIds = columnBuckets.groupableIds.filter(
+    (column) =>
+      exists(row[column.label]) &&
+      column.label !== "dates" && // Because they're already displayed somewhere else
+      column.label !== "source", // Because they're already displayed somewhere else
   );
   const groupableIdsTooltip = t("history.content.fingerprint");