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

ISAICP-6572: Advanced search 2021. #2597

Open
wants to merge 39 commits into
base: ISAICP-6415
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
93460a6
ISAICP-6578: Show total number of results on top.
saidatom Sep 27, 2021
4004852
ISAICP-6579: Facets summary Search view.
saidatom Sep 27, 2021
128d303
ISAICP-6584: Integrate Facets Form & Date Range Widget.
saidatom Sep 28, 2021
d24dbc1
EPIC-6572: Update code that was botched when merging the homepage.
saidatom Sep 30, 2021
5ad4dd1
EPIC-6572: Remove drupal/facets_form patch.
saidatom Sep 30, 2021
db65de6
EPIC-6572: Fix merge error.
saidatom Sep 30, 2021
4a40d1e
ISAICP-6579: Facets summary Search view.
saidatom Sep 27, 2021
37136d2
ISAICP-6584: Integrate Facets Form & Date Range Widget.
saidatom Sep 28, 2021
5a1ad5b
ISAICP-6688: Add theme rules and add facets to search page.
saidatom Sep 28, 2021
da6caf7
ISAICP-6688: WIP Fix behat tests.
saidatom Sep 29, 2021
8771dc6
ISAICP-6688: Update behat chips to facets summary tests.
saidatom Sep 29, 2021
cc2abd6
ISAICP-6688: Fix menu 'Sign in' url.
saidatom Sep 29, 2021
4cbfef3
ISAICP-6688: Update facets_form.
saidatom Sep 30, 2021
26377d0
ISAICP-6688: Revert file search.feature.
saidatom Sep 30, 2021
de1137c
ISAICP-6688: Fix search test.
saidatom Sep 30, 2021
9428aec
ISAICP-6688: Fix search test.
saidatom Oct 1, 2021
0e51112
Merge remote-tracking branch 'origin/develop' into EPIC-6572
claudiu-cristea Oct 3, 2021
0918e9d
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
pfrenssen Oct 7, 2021
bc878d2
Merge remote-tracking branch 'origin/EPIC-6572' into ISAICP-6688
pfrenssen Oct 8, 2021
61bfefb
Merge branch 'ISAICP-6415' into EPIC-6572
pfrenssen Oct 8, 2021
0c0b7d5
Merge branch 'ISAICP-6415' into EPIC-6572
pfrenssen Oct 8, 2021
a88626a
Merge remote-tracking branch 'origin/EPIC-6572' into ISAICP-6688
saidatom Oct 11, 2021
7cd64b7
ISAICP-6688: Fix remarks and change CAS returnto.
saidatom Oct 11, 2021
6e0aba3
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
saidatom Oct 11, 2021
ca443ed
Merge remote-tracking branch 'origin/EPIC-6572' into ISAICP-6688
saidatom Oct 11, 2021
e3ad27d
ISAICP-6688: Fix anonymous links.
saidatom Oct 12, 2021
9026fcd
ISAICP-6688: Fix CAS destination and asserts summary/summaries tests.
saidatom Oct 13, 2021
b561a25
ISAICP-6688: Remove getElementsMatchingElementAlias duplicated function.
saidatom Oct 13, 2021
dcc5523
Merge pull request #2599 from ec-europa/ISAICP-6688
claudiu-cristea Oct 13, 2021
225484c
Merge remote-tracking branch 'origin' into EPIC-6572
saidatom Oct 13, 2021
26e4b5e
Merge remote-tracking branch 'origin/develop' into EPIC-6572
idimopoulos Oct 20, 2021
ce7a972
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
claudiu-cristea Oct 21, 2021
5b2f866
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
pfrenssen Oct 21, 2021
da3760e
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
claudiu-cristea Oct 21, 2021
ad63aeb
Merge branch 'ISAICP-6415' into EPIC-6572
pfrenssen Oct 22, 2021
a837081
Merge remote-tracking branch 'origin/ISAICP-6415' into EPIC-6572
claudiu-cristea Oct 25, 2021
8432e9b
Merge branch 'timestamp_threshold' into EPIC-6572
idimopoulos Oct 26, 2021
45b466f
Merge remote-tracking branch 'origin/develop' into EPIC-6572
idimopoulos Oct 26, 2021
c352bdf
Merge branch 'ISAICP-6415' into EPIC-6572
idimopoulos Oct 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"drupal/entityqueue": "^1.2",
"drupal/error_page": "^1.0",
"drupal/facets": "1.6.0",
"drupal/facets_form": "dev-1.x",
"drupal/field_delimiter": "^1.1",
"drupal/field_formatter_range": "^1.1",
"drupal/field_group": "^3.1",
Expand Down Expand Up @@ -91,6 +92,7 @@
"drupal/video_embed_field": "^2",
"drupal/view_unpublished": "^1.0",
"drupal/views_autosubmit": "^1.2",
"drupal/views_block_area": "^1.0@beta",
"drupal/views_bulk_operations": "^4",
"drupal/views_data_export": "^1.0",
"drupal/views_multiple_permissions": "^1.0",
Expand Down Expand Up @@ -357,6 +359,9 @@
"drupal/views_autosubmit": {
"The views plugin options are missing schema @see https://www.drupal.org/i/3195213": "https://git.drupalcode.org/project/views_autosubmit/-/merge_requests/2.diff"
},
"drupal/views_block_area": {
"Views block area missing schema @see https://www.drupal.org/project/views_block_area/issues/3157188": "https://www.drupal.org/files/issues/2020-07-06/views_block_area-missing_schema-3157188-2.patch"
},
"openeuropa/oe_bootstrap_theme": {
"Preserve link attributes in navigation menus @see https://github.com/openeuropa/oe_bootstrap_theme/pull/38": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_bootstrap_theme/pull/38.diff"
},
Expand Down
139 changes: 126 additions & 13 deletions composer.lock

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

29 changes: 0 additions & 29 deletions config/sync/block.block.entity_bundle_facet.yml

This file was deleted.

32 changes: 32 additions & 0 deletions config/sync/block.block.facetform_viewsearch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
uuid: 29b2c3a6-e0e5-4b77-9d02-1d7b52ce0511
langcode: en
status: true
dependencies:
module:
- facets_form
- joinup_core
theme:
- ventuno
id: facetform_viewsearch
theme: ventuno
region: sidebar
weight: 0
provider: null
plugin: 'facets_form:search_api:views_page__search__page_1'
settings:
id: 'facets_form:search_api:views_page__search__page_1'
label: 'Facet form: View Search, display Page'
provider: facets_form
label_display: '0'
button:
label:
submit: Search
reset: 'Clear filters'
facets: { }
visibility:
request_route:
id: request_route
routes:
- view.search.page_1
negate: false
context_mapping: { }
37 changes: 37 additions & 0 deletions config/sync/block.block.facetformviewsearchdisplaypage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
uuid: 33e5f26c-41da-4f9b-85a8-144a7b0bfe07
langcode: en
status: true
dependencies:
config:
- facets.facet.creation_date
- facets.facet.group
- facets.facet.spatial_coverage
- facets.facet.topic
- facets.facet.type
module:
- facets_form
- system
theme:
- joinup_theme
id: facetformviewsearchdisplaypage
theme: joinup_theme
region: sidebar_left
weight: 0
provider: null
plugin: 'facets_form:search_api:views_page__search__page_1'
settings:
id: 'facets_form:search_api:views_page__search__page_1'
label: 'Facet form: View Search, display Page'
provider: facets_form
label_display: '0'
button:
label:
submit: Search
reset: 'Clear filters'
facets: { }
visibility:
request_path:
id: request_path
pages: "/search\r\n/search/*"
negate: false
context_mapping: { }
29 changes: 0 additions & 29 deletions config/sync/block.block.group_facet.yml

This file was deleted.

Loading