Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/mapped select #2478

Merged
merged 68 commits into from
Jun 14, 2022
Merged

Feature/mapped select #2478

merged 68 commits into from
Jun 14, 2022

Conversation

thoniTUB
Copy link
Collaborator

@thoniTUB thoniTUB commented May 9, 2022

No description provided.

@thoniTUB thoniTUB marked this pull request as ready for review May 10, 2022 17:02
@thoniTUB thoniTUB requested a review from awildturtok as a code owner May 10, 2022 17:02
thoniTUB and others added 4 commits May 11, 2022 10:51
# Conflicts:
#	backend/src/main/java/com/bakdata/conquery/apiv1/FilterSearch.java
#	backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java
#	backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java
#	backend/src/test/java/com/bakdata/conquery/integration/tests/FilterAutocompleteTest.java
#	backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java
#	docs/Concept JSONs.md
Copy link
Collaborator

@awildturtok awildturtok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kommt erst relativ weit unten, aber den Ansatz die Mappings in den Selects zu definieren finde ich sehr ungeschickt, das ist auch schon bei den Templates sehr umständlich.

@thoniTUB thoniTUB requested a review from awildturtok May 17, 2022 14:13
github-actions bot and others added 25 commits May 25, 2022 12:48
…o feature/referenced-mappings

# Conflicts:
#	autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java
#	backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FENode.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/IdRefPathParamConverterProvider.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/MetaIdRefParamConverter.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/NamespacedIdRefParamConverter.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/IdDeserializer.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/IdKeyDeserializer.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MetaIdRef.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MetaIdReferenceDeserializer.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/NsIdReferenceDeserializer.java
#	backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/NsIdReferenceKeyDeserializer.java
#	backend/src/main/java/com/bakdata/conquery/io/jersey/IdParamConverter.java
#	backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java
#	backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/Select.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/IdentifiableImpl.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/AId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/IIdInterner.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/IdUtil.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/NamespacedId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/NamespacedIdentifiable.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/BucketId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/CBlockId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ColumnId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConceptElementId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConceptId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConceptSelectId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConceptTreeChildId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConnectorId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ConnectorSelectId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DatasetId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DictionaryId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/FilterId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/FormConfigId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/GroupId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ImportColumnId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ImportId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ManagedExecutionId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/PermissionOwnerId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/RoleId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/SecondaryIdDescriptionId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/SelectId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/StructureNodeId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/TableId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/TableImportDescriptorId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/UserId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/ValidityDateId.java
#	backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/WorkerId.java
#	backend/src/main/java/com/bakdata/conquery/tasks/PermissionCleanupTask.java
#	backend/src/test/java/com/bakdata/conquery/integration/json/ConqueryTestSpec.java
#	backend/src/test/java/com/bakdata/conquery/models/identifiable/ids/IdTests.java
#	docs/Concept JSONs.md
#	docs/Config JSON.md
…o feature/referenced-mappings

# Conflicts:
#	docs/Concept JSONs.md
…-mappings

# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/com/bakdata/conquery/apiv1/ApiV1.java
#	backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FENode.java
#	backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FERoot.java
#	backend/src/main/java/com/bakdata/conquery/models/config/CsvResultRenderer.java
#	backend/src/main/java/com/bakdata/conquery/models/externalservice/ResultType.java
#	docs/Concept JSONs.md
@thoniTUB
Copy link
Collaborator Author

@Kadrian this is the base for #2501 . we splat up the review in smaller incremental chunks and collapse them now

@thoniTUB thoniTUB merged commit c4fbcad into develop Jun 14, 2022
@delete-merged-branch delete-merged-branch bot deleted the feature/mapped-select branch June 14, 2022 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants