Skip to content

Commit

Permalink
Json encode twig variables
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaGallinari authored and lruozzi9 committed Aug 8, 2024
1 parent ff570af commit 7e35912
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 46 deletions.
2 changes: 1 addition & 1 deletion templates/query/common/aggs/attributes.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"label": {
"terms": {
"field": "attributes.name.{{localeCode}}"
"field": {{ ('attributes.name.' ~ localeCode)|json_encode|raw }}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions templates/query/common/aggs/options.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"aggs": {
"label": {
"terms": {
"field": "product-options.values.name.{{localeCode}}"
"field": {{ ('product-options.values.name.' ~ localeCode)|json_encode|raw }}
}
}
}
Expand All @@ -43,7 +43,7 @@
},
"label": {
"terms": {
"field": "product-options.name.{{localeCode}}"
"field": {{ ('product-options.name.' ~ localeCode)|json_encode|raw }}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions templates/query/common/aggs/translated-attributes.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"aggs": {
"values": {
"terms": {
"field": "translated-attributes.values.{{ localeCode }}.values"
"field": {{ ('translated-attributes.values.' ~ localeCode ~ '.values')|json_encode|raw }}
}
},
"label": {
"terms": {
"field": "translated-attributes.name.{{localeCode}}"
"field": {{ ('translated-attributes.name.' ~ localeCode)|json_encode|raw }}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions templates/query/common/search/attribute.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"filter": [
{
"term": {
"attributes.code": "{{ filter.code }}"
"attributes.code": {{ filter.code|json_encode|raw }}
}
},
{
"term": {
"attributes.values.values": "{{ filter.value }}"
"attributes.values.values": {{ filter.value|json_encode|raw }}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/query/common/search/option.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"term": {
"variants.options.value.code": "{{ filter.value }}"
"variants.options.value.code": {{ filter.value|json_encode|raw }}
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions templates/query/common/search/translated-attribute.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"filter": [
{
"term": {
"translated-attributes.code": "{{ filter.code }}"
"translated-attributes.code": {{ filter.code|json_encode|raw }}
}
},
{
"term": {
"translated-attributes.values.{{ localeCode }}.values": "{{ filter.value }}"
{{ ('translated-attributes.values.' ~ localeCode ~ '.values')|json_encode|raw }}: {{ filter.value|json_encode|raw }}
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/query/common/sort/createdAt.json.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"created-at": {
"order": "{{ order }}"
"order": {{ order|json_encode|raw }}
}
}
4 changes: 2 additions & 2 deletions templates/query/common/sort/default.json.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"{{ field }}": {
"order": "{{ order }}"
{{ field|json_encode|raw }}: {
"order": {{ order|json_encode|raw }}
}
}
4 changes: 2 additions & 2 deletions templates/query/common/sort/name.json.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name-as-keyword.{{ localeCode }}": {
"order": "{{ order }}",
{{ ('name-as-keyword.' ~ localeCode)|json_encode|raw }}: {
"order": {{ order|json_encode|raw }},
"nested": {
"path": "name-as-keyword"
}
Expand Down
4 changes: 2 additions & 2 deletions templates/query/common/sort/position.json.twig
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"taxons.position": {
"order": "{{ order }}",
"order": {{ order|json_encode|raw }},
"nested": {
"path": "taxons",
"filter": {
"term": {
"taxons.sylius-id": "{{ taxon.id }}"
"taxons.sylius-id": {{ taxon.id|json_encode|raw }}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion templates/query/common/sort/price.json.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"default-variant.price.price": {
"order": "{{ order }}"
"order": {{ order|json_encode|raw }}
}
}
4 changes: 2 additions & 2 deletions templates/query/completion-suggesters/query.json.twig
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"suggest": {
"prefix": "{{ searchTerm }}",
"prefix": {{ searchTerm|json_encode|raw }},
"completion": {
"field": "suggest",
"size": {{ size }},
"size": {{ size|json_encode|raw }},
"skip_duplicates": true,
"fuzzy": {
"fuzziness": 1,
Expand Down
47 changes: 24 additions & 23 deletions templates/query/search/query.json.twig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set searchTerm = searchTerm|json_encode %}
{
"bool": {
"filter": [
Expand All @@ -15,15 +16,15 @@
"should": [
{
"term": {
"code": "{{ searchTerm }}"
"code": {{ searchTerm|raw }}
}
},
{
"nested": {
"path": "variants",
"query": {
"term": {
"variants.code": "{{ searchTerm }}"
"variants.code": {{ searchTerm|raw }}
}
}
}
Expand All @@ -33,8 +34,8 @@
"path": "name",
"query": {
"match": {
"name.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('name.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 10,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -49,8 +50,8 @@
"path": "variants",
"query": {
"match": {
"variants.name.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('variants.name.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 9,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -65,8 +66,8 @@
"path": "description",
"query": {
"match": {
"description.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('description.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 8,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -81,8 +82,8 @@
"path": "short-description",
"query": {
"match": {
"short-description.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('short-description.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 7,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -97,8 +98,8 @@
"path": "slug",
"query": {
"match": {
"slug.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('slug.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 6,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -113,8 +114,8 @@
"path": "meta-description",
"query": {
"match": {
"meta-description.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('meta-description.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 5,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -129,8 +130,8 @@
"path": "meta-keywords",
"query": {
"match": {
"meta-keywords.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('meta-keywords.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 4,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -145,8 +146,8 @@
"path": "taxons",
"query": {
"match": {
"taxons.name.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('taxons.name.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 3,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -161,8 +162,8 @@
"path": "translated-attributes",
"query": {
"match": {
"translated-attributes.values.{{ localeCode }}.text-value": {
"query": "{{ searchTerm }}",
{{ ('translated-attributes.values.' ~ localeCode ~ '.text-value')|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 3,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -178,7 +179,7 @@
"query": {
"match": {
"attributes.values.text-value": {
"query": "{{ searchTerm }}",
"query": {{ searchTerm|raw }},
"boost": 3,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand All @@ -193,8 +194,8 @@
"path": "product-options",
"query": {
"match": {
"product-options.values.name.{{ localeCode }}": {
"query": "{{ searchTerm }}",
{{ ('product-options.values.name.' ~ localeCode)|json_encode|raw }}: {
"query": {{ searchTerm|raw }},
"boost": 3,
"fuzziness": "AUTO",
"fuzzy_transpositions": true,
Expand Down
2 changes: 1 addition & 1 deletion templates/query/taxon/query.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"filter": [
{
"terms": {
"taxons.sylius-id": [{{ taxonIdsToSearch|join(', ') }}]
"taxons.sylius-id": {{ taxonIdsToSearch|json_encode|raw }}
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions templates/query/term-suggesters/query.json.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"suggest": {
"text": "{{ searchTerm }}",
"text": {{ searchTerm|json_encode|raw }},
"term": {
"field": "name.{{ localeCode }}",
"field": {{ ('name.' ~ localeCode)|json_encode|raw }},
"suggest_mode" : "missing"
}
}
Expand Down

0 comments on commit 7e35912

Please sign in to comment.