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.

Sign up for GitHub

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

Jump to bottom

Filter query type based on FilterDefinition objects - Work in Progess #149

Open
wants to merge 69 commits into
base: 1.x
Choose a base branch
from
Open

Filter query type based on FilterDefinition objects - Work in Progess #149

wants to merge 69 commits into from
+712 −16

Commits on Nov 28, 2019

  1. PoC for FilterService integration with GraphQL

    @das-peter
    das-peter committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    add0e0d View commit details
    Browse the repository at this point in the history

  2. Added support for filterDefinition to prime settings and facets.

    @das-peter
    das-peter committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    64494cb View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. Added support for passing in facet filters. Refactored filter type co… 

    …nfiguration into dedicated method which is called conditionally.
    @das-peter
    das-peter committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    d251576 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Merge remote-tracking branch 'remotes/upstream/master' into filter-qu… 

    …ery-type
    @das-peter
    das-peter committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    c3e3af1 View commit details
    Browse the repository at this point in the history

  2. Re-added permission check and service SQL conditions - at least in ca… 

    …se the filter is running using the DB backend.

We still need a workaround for elastic and / or search back-ends.
    @das-peter
    das-peter committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    4eb7a07 View commit details
    Browse the repository at this point in the history

  3. Fix typo and added doc for return value of method.

    @das-peter
    das-peter committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    b6367c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. prefix type names with classnames because every type in the schema mu… 

    …st be represented by a single instance
    @juckerf
    juckerf committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ccea8bc View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge remote-tracking branch 'das-peter/filter-query-type' into cando… 

    …-customizations

# Conflicts:
#	src/GraphQL/Query/QueryType.php
    @mugge6
    mugge6 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d818da3 View commit details
    Browse the repository at this point in the history

  2. Fix issue with schema violation

    @mugge6
    mugge6 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    7154229 View commit details
    Browse the repository at this point in the history

  3. Fix other schema violations

    @mugge6
    mugge6 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    2830ae5 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Merge remote-tracking branch 'remotes/upstream/master' into filter-qu… 

    …ery-type

# Conflicts:
#	src/GraphQL/Query/QueryType.php
    @das-peter
    das-peter committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    cd7d926 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Merge branch 'master' into cando-customizations

    @mugge6
    mugge6 committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    2d3378b View commit details
    Browse the repository at this point in the history

  2. Add thumbnail resolutions to the srcset node

    @mugge6
    mugge6 committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    0b71368 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Refactoring and add resolutions to all assets

    @mugge6
    mugge6 committed May 1, 2020
    Configuration menu
    Copy the full SHA
    4baca4c View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Fix image extension

    @mugge6
    mugge6 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    1f89238 View commit details
    Browse the repository at this point in the history

  2. Create thumbnail from asset otherwise medias are not loaded

    @mugge6
    mugge6 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    95af8cb View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Refactoring for PR

    @mugge6
    mugge6 committed May 7, 2020
    Configuration menu
    Copy the full SHA
    c4e2d0b View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. merge pimcore/master

    @juckerf
    juckerf committed May 13, 2020
    Configuration menu
    Copy the full SHA
    9728c30 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge branch 'master' into cando-customizations

    @mugge6
    mugge6 committed May 26, 2020
    Configuration menu
    Copy the full SHA
    bdaf0d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Merge branch 'master' into filter-query-type

    @weisswurstkanone
    weisswurstkanone committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    71b94f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. merge upstream master

    @juckerf
    juckerf committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    d0d7117 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2020

  1. Merge branch 'filter-query-type' into cando-customizations 

    # Conflicts:
#	src/GraphQL/Query/QueryType.php
    @mugge6
    mugge6 committed Sep 15, 2020
    Configuration menu
    Copy the full SHA
    d8dc9a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. Fix buf, if asset is null

    @mugge6
    mugge6 committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    f6a7c93 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'filter-query-type' of github.com:das-peter/data-hub int… 

    …o filter-query-type
    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    a952916 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from CandoImage/filter-query-type 

    Filter query type
    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    09cc296 View commit details
    Browse the repository at this point in the history

  4. translate labels with prefix

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    b2ef27c View commit details
    Browse the repository at this point in the history

  5. formatting

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    575f73f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'filter-query-type' into cando-customizations

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    c45bf1d View commit details
    Browse the repository at this point in the history

  7. extend filter definition arguments to allow to fetch definition via r… 

    …elation of any object
    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    45633d8 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'filter-query-type' into cando-customizations

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    2bc5f53 View commit details
    Browse the repository at this point in the history

  9. check derived filter definition for type

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    637eb2b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'filter-query-type' into cando-customizations

    @juckerf
    juckerf committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    4dd8f95 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. fallbackFilterDefinition should be used even if there is no id set

    @mugge6
    mugge6 committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    84472b2 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. cherry-pick filter-fallback bugfix from cando-customizations

    @juckerf
    juckerf committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    d5fbbf6 View commit details
    Browse the repository at this point in the history

  2. fix order handling for filters (compatible with index ProductLists)

    @juckerf
    juckerf committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    a18681f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'filter-query-type' into cando-customizations

    @juckerf
    juckerf committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    831ed58 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2020

  1. Merge pull request #1 from CandoImage/filter-query-type 

    Filter query type
    @das-peter
    das-peter committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    fcf2197 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/upstream/master' into filter-qu… 

    …ery-type
    @das-peter
    das-peter committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    ceca7db View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Changed API for filters: 

    added support for object arrays instead of string arrays only
changed structure for request filters directly without "facet" hierarchy
to get different filter types separately
added filterType for each supported filter
    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    60ed9d4 View commit details
    Browse the repository at this point in the history

  2. added HijackAbstractFilterService.php to read protected property "fil… 

    …terTypes" needed to create dynamically Filter Object based on configurated filter types in ecommerce-config.yml

changed QueryType.php to create dynamically Filter Object Types based on configuration
    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    2ec26ed View commit details
    Browse the repository at this point in the history

  3. missing update from last commit to get only string instead of object … 

    …in return array
    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    824a6cd View commit details
    Browse the repository at this point in the history

  4. again missing update to add filterType in Resolver QueryType.php

    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    b0c6ea2 View commit details
    Browse the repository at this point in the history

  5. changed name of CustomScalarType in Query\QueryType.php to get a prop… 

    …er description in the generated documentation

skip filter fields in Resolver\QueryType.php which are not in the GraphQL Request to prevent empty arrays in the response
    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    1c72dae View commit details
    Browse the repository at this point in the history

  6. fixed resolve filters only if requested from GraphQL Query

    @zoidbergx
    zoidbergx committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    048fc75 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

  1. prefix type names with classnames because every type in the schema mu… 

    …st be represented by a single instance
    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    47de9ab View commit details
    Browse the repository at this point in the history

  2. translate labels with prefix 

    # Conflicts:
#	src/GraphQL/Resolver/QueryType.php
    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    0aa2d44 View commit details
    Browse the repository at this point in the history

  3. formatting

    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    a76458f View commit details
    Browse the repository at this point in the history

  4. extend filter definition arguments to allow to fetch definition via r… 

    …elation of any object
    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    3e20abe View commit details
    Browse the repository at this point in the history

  5. check derived filter definition for type

    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    43a10a0 View commit details
    Browse the repository at this point in the history

  6. fallbackFilterDefinition should be used even if there is no id set

    @mugge6 @das-peter
    mugge6 authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    b19c490 View commit details
    Browse the repository at this point in the history

  7. cherry-pick filter-fallback bugfix from cando-customizations

    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    f0e890d View commit details
    Browse the repository at this point in the history

  8. fix order handling for filters (compatible with index ProductLists)

    @juckerf @das-peter
    juckerf authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    dacf2e5 View commit details
    Browse the repository at this point in the history

  9. Changed API for filters: 

    added support for object arrays instead of string arrays only
changed structure for request filters directly without "facet" hierarchy
to get different filter types separately
added filterType for each supported filter
    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    3889071 View commit details
    Browse the repository at this point in the history

  10. added HijackAbstractFilterService.php to read protected property "fil… 

    …terTypes" needed to create dynamically Filter Object based on configurated filter types in ecommerce-config.yml

changed QueryType.php to create dynamically Filter Object Types based on configuration
    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    d533c12 View commit details
    Browse the repository at this point in the history

  11. missing update from last commit to get only string instead of object … 

    …in return array
    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    587b42f View commit details
    Browse the repository at this point in the history

  12. again missing update to add filterType in Resolver QueryType.php

    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    fb75bc6 View commit details
    Browse the repository at this point in the history

  13. changed name of CustomScalarType in Query\QueryType.php to get a prop… 

    …er description in the generated documentation

skip filter fields in Resolver\QueryType.php which are not in the GraphQL Request to prevent empty arrays in the response
    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    7279ef8 View commit details
    Browse the repository at this point in the history

  14. fixed resolve filters only if requested from GraphQL Query

    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    4596cde View commit details
    Browse the repository at this point in the history

  15. Remove unrelated changes to make review easier.

    @das-peter
    das-peter committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    34e4ab3 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. added support for fragment filters

    @zoidbergx
    zoidbergx committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    c0d0181 View commit details
    Browse the repository at this point in the history

  2. added support for fragment and check the fragment type instead of the… 

    … fragment name which could be anything
    @zoidbergx
    zoidbergx committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    9e37fe8 View commit details
    Browse the repository at this point in the history

  3. added support for fragment filters

    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    d0f45b8 View commit details
    Browse the repository at this point in the history

  4. added support for fragment and check the fragment type instead of the… 

    … fragment name which could be anything
    @zoidbergx @das-peter
    zoidbergx authored and das-peter committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    05c1859 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. added compatibility to support multiple facets calls to separate diff… 

    …erent FilterTypes
    @zoidbergx
    zoidbergx committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    7f5fc2d View commit details
    Browse the repository at this point in the history

  2. missing copy paste code

    @zoidbergx
    zoidbergx committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    d4ee4c3 View commit details
    Browse the repository at this point in the history

  3. fix check for possible fragment names

    @zoidbergx
    zoidbergx committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    2e03035 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. removed translation in "resolveFacet" because the attributes are tran… 

    …slated while stored in elastic and the relation object are translated separate with an event
    @zoidbergx
    zoidbergx committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    dc56f7d View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. changed getting ResultList based on language

    @zoidbergx
    zoidbergx committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    f60950c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. Merge remote-tracking branch 'remotes/CandoImage/cando-customizations… 

    …' into filter-query-type

# Conflicts:
#	src/GraphQL/Query/QueryType.php
#	src/GraphQL/Resolver/AssetType.php
#	src/GraphQL/Resolver/QueryType.php
    @das-peter
    das-peter committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    ab80455 View commit details
    Browse the repository at this point in the history