Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1484 from ec-europa/ISAICP-4901
Browse files Browse the repository at this point in the history
ISAICP-4901: New Advanced Search epic
  • Loading branch information
pfrenssen authored Feb 25, 2020
2 parents 91d06ad + a7b5a9e commit 4f81842
Show file tree
Hide file tree
Showing 82 changed files with 2,187 additions and 543 deletions.
14 changes: 14 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"composer/installers": "^1.7",
"continuousphp/aws-sdk-phing": "~0.5",
"cweagans/composer-patches": "^1.6.4",
"dkarv/mdl-chip-input": "dev-master",
"drupal/allowed_formats": "^1.2",
"drupal/antibot": "^1.3",
"drupal/cached_computed_field": "^1.0-beta5",
Expand Down Expand Up @@ -361,6 +362,19 @@
}
}
},
{
"type": "package",
"package": {
"name": "dkarv/mdl-chip-input",
"version": "dev-master",
"type": "drupal-theme-library",
"source": {
"url": "[email protected]:dkarv/mdl-chip-input.git",
"type": "git",
"reference": "master"
}
}
},
{
"type": "package",
"package": {
Expand Down
88 changes: 46 additions & 42 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions config/sync/block.block.entity_bundle_facet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ dependencies:
- joinup_core
theme:
- joinup_theme
_core:
default_config_hash: 1E3EXKXXTxO26-0FqSGyJmwhR5-3oi4_fatysrd3JfE
id: entity_bundle_facet
theme: joinup_theme
region: filters
region: sidebar_left
weight: -12
provider: null
plugin: 'facet_block:type'
settings:
id: 'facet_block:type'
label: 'Collection content - Content type'
label: 'Content types'
provider: facets
label_display: '0'
block_id: entity_bundle_facet
label_display: '1'
visibility:
request_route:
id: request_route
Expand Down
6 changes: 2 additions & 4 deletions config/sync/block.block.exposed_form_search_page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ dependencies:
- views
theme:
- joinup_theme
_core:
default_config_hash: EhoRQx5awXD5borWP_3kfWUeGlBMOx441rQAxuDWKT4
id: exposed_form_search_page
theme: joinup_theme
region: featured
weight: -14
region: header
weight: -17
provider: null
plugin: 'views_exposed_filter_block:search-page_1'
settings:
Expand Down
26 changes: 26 additions & 0 deletions config/sync/block.block.global_search.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
uuid: 413ab78b-eaa2-4f75-872d-5b433bc03f8d
langcode: en
status: true
dependencies:
module:
- joinup_core
- joinup_search
theme:
- joinup_theme
id: global_search
theme: joinup_theme
region: header
weight: -19
provider: null
plugin: joinup_search_global_search
settings:
id: joinup_search_global_search
label: 'Global search'
provider: joinup_search
label_display: '0'
visibility:
request_route:
id: request_route
routes: view.search.page_1
negate: true
context_mapping: { }
7 changes: 2 additions & 5 deletions config/sync/block.block.group_facet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ dependencies:
- joinup_core
theme:
- joinup_theme
_core:
default_config_hash: Q-yF1_SXvQ4zJe7jAbEOjlIknalAqWN6dK4hw2rrFWw
id: group_facet
theme: joinup_theme
region: filters
weight: -15
region: sidebar_left
weight: -11
provider: null
plugin: 'facet_block:group'
settings:
id: 'facet_block:group'
label: 'Search page - Group facet'
provider: facets
label_display: '0'
block_id: group_facet
visibility:
request_route:
id: request_route
Expand Down
4 changes: 1 addition & 3 deletions config/sync/block.block.joinup_theme_local_tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ status: true
dependencies:
theme:
- joinup_theme
_core:
default_config_hash: oSSnm-ulGYQXZ_MTRcLJBHUJ4z-8YpaSECm4yCDziW0
id: joinup_theme_local_tasks
theme: joinup_theme
region: featured
weight: -12
weight: -13
provider: null
plugin: local_tasks_block
settings:
Expand Down
7 changes: 2 additions & 5 deletions config/sync/block.block.policy_domain_facet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ dependencies:
- joinup_core
theme:
- joinup_theme
_core:
default_config_hash: IuqJvNOyi2TlD7hte9DuSYO-nuFTTKb4rcTQt7dcWDk
id: policy_domain_facet
theme: joinup_theme
region: filters
weight: -14
region: sidebar_left
weight: -10
provider: null
plugin: 'facet_block:policy_domain'
settings:
id: 'facet_block:policy_domain'
label: 'Search page - Policy domain facet'
provider: facets
label_display: '0'
block_id: policy_domain_facet
visibility:
request_route:
id: request_route
Expand Down
7 changes: 2 additions & 5 deletions config/sync/block.block.spatial_coverage_facet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ dependencies:
- joinup_core
theme:
- joinup_theme
_core:
default_config_hash: M2RmoCsVaifOmwYCo5ajei1bXNHAGtfB1WvylYub-ZM
id: spatial_coverage_facet
theme: joinup_theme
region: filters
weight: -13
region: sidebar_left
weight: -9
provider: null
plugin: 'facet_block:spatial_coverage'
settings:
id: 'facet_block:spatial_coverage'
label: 'Search page - Geographical coverage facet'
provider: facets
label_display: '0'
block_id: spatial_coverage_facet
visibility:
request_route:
id: request_route
Expand Down
Loading

0 comments on commit 4f81842

Please sign in to comment.