From 93460a62f1e81a60b17b2ee02ffeae8b8e049b18 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Mon, 27 Sep 2021 14:06:10 +0100
Subject: [PATCH 01/20] ISAICP-6578: Show total number of results on top.

---
 config/sync/views.view.search.yml             |  12 +-
 tests/features/joinup_search/search.feature   |  14 +-
 .../joinup_search/search.feature.orig         | 543 ++++++++++++++++++
 3 files changed, 564 insertions(+), 5 deletions(-)
 create mode 100644 tests/features/joinup_search/search.feature.orig

diff --git a/config/sync/views.view.search.yml b/config/sync/views.view.search.yml
index fdb879274d..bf982a70af 100644
--- a/config/sync/views.view.search.yml
+++ b/config/sync/views.view.search.yml
@@ -386,7 +386,17 @@ display:
             identifier: last-updated-date
           plugin_id: search_api
       title: ''
-      header: {  }
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          content: 'Search Results (@total)'
+          plugin_id: result
       footer: {  }
       empty:
         area_text_custom:
diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index 3ea65dd704..0a49fbd0c7 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -190,6 +190,7 @@ Feature: Global search
       | Luxembourg   (2) |
     When I select "Luxembourg" from the "spatial coverage" select facet
     Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
+    And I should see the text "Search Results (2)"
     # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
     And the "spatial coverage" select facet should contain the following options:
       | Any location     |
@@ -248,16 +249,19 @@ Feature: Global search
 
     # "Alpha" is used in all the rdf entities titles.
     When I enter "Alpha" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
+    Then I should see the text "Search Results (5)"
+    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
 
     # "Omega" is used in all the node entities titles. Since the content of
     # custom pages is added to their collection, we also match the collection.
     When I enter "omega" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
+    Then I should see the text "Search Results (6)"
+    And the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
 
     # "Beta" is used in all the rdf entities body fields.
     When I enter "beta" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
+    Then I should see the text "Search Results (4)"
+    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
 
     # "Epsilon" is used in all the node entities body fields.
     When I enter "epsilon" in the search bar and press enter
@@ -411,7 +415,8 @@ Feature: Global search
     When I enter "ubermensch" in the search bar and press enter
     Then I should see "No content found for your search."
     When I enter "zzolu-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
+    Then I should not see the text "Search Results"
+    And I should see "No content found for your search."
     When I enter "apache" in the search bar and press enter
     Then the page should show only the tiles "Apache-2.0"
     When I enter "HTML" in the search bar and press enter
@@ -566,6 +571,7 @@ Feature: Global search
     When I am on the homepage
     And I enter "Relativity" in the search bar and press enter
     Then the option "Relevance" should be selected
+    And I should see the text "Search Results (3)"
     And I should see the following tiles in the correct order:
       | Relativity news: Relativity theory |
       | Relativity is the word             |
diff --git a/tests/features/joinup_search/search.feature.orig b/tests/features/joinup_search/search.feature.orig
new file mode 100644
index 0000000000..c0cfe36d63
--- /dev/null
+++ b/tests/features/joinup_search/search.feature.orig
@@ -0,0 +1,543 @@
+@api @terms @group-b
+Feature: Global search
+  As a user of the site I can find content through the global search.
+
+  # Todo: This test runs with javascript enabled because in a non-javascript
+  # environment, the dropdown facet is simply a list of links. Remove the
+  # `@javascript` tag when the upstream issue in the Facets module is fixed.
+  # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-5739
+  # Ref. https://www.drupal.org/project/facets/issues/2937191
+  @javascript
+  Scenario: Anonymous user can find items
+    Given the following collection:
+      | title            | Molecular cooking collection |
+      | logo             | logo.png                     |
+      | moderation       | no                           |
+      | topic            | Demography                   |
+      | spatial coverage | Belgium                      |
+      | state            | validated                    |
+    And the following solutions:
+      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
+      | Spherification | Molecular cooking collection | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
+      | Foam           | Molecular cooking collection | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
+    And news content:
+      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
+      | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
+
+    Given I am logged in as a user with the "authenticated" role
+    # @todo The search page cache should be cleared when new content is added.
+    # @see https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-3428
+    And the cache has been cleared
+    When I visit the search page
+    # All content is visible.
+    Then I should see the "Molecular cooking collection" tile
+    And I should see the "El Celler de Can Roca" tile
+    And I should see the "Spherification" tile
+    And I should see the "Foam" tile
+    # Facets should be in place.
+    And the option with text "Any topic" from select facet "topic" is selected
+    And the "topic" select facet should contain the following options:
+      | Any topic                     |
+      | Demography   (2)              |
+      | Statistics and Analysis   (1) |
+    And the option with text "Any location" from select facet "spatial coverage" is selected
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location         |
+      | Belgium   (1)        |
+      | European Union   (1) |
+      | Luxembourg   (1)     |
+    # Check that only one search field is available. In an earlier version of
+    # Joinup there were two search fields, but this was confusing users.
+    And there should be exactly 1 "search field" on the page
+
+    # Test the topic facet.
+    When I select "Demography" from the "topic" select facet
+    Then the option with text "Demography   (2)" from select facet "topic" is selected
+    # The selected option moves to the last position by default.
+    And the "topic" select facet should contain the following options:
+      | Any topic                     |
+      | Statistics and Analysis   (1) |
+      | Demography   (2)              |
+    Then the option with text "Any location" from select facet "spatial coverage" is selected
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location         |
+      | Belgium   (1)        |
+      | European Union   (1) |
+    And I should see the "Molecular cooking collection" tile
+    And I should see the "Spherification" tile
+    But I should not see the "El Celler de Can Roca" tile
+    And I should not see the "Foam" tile
+
+    # Test the spatial coverage facet.
+    When I select "Belgium" from the "spatial coverage" select facet
+    Then the option with text "Belgium   (1)" from select facet "spatial coverage" is selected
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location         |
+      | Belgium   (1)        |
+      | European Union   (1) |
+    Then the option with text "Demography   (1)" from select facet "topic" is selected
+    And the "topic" select facet should contain the following options:
+      | Any topic        |
+      | Demography   (1) |
+    And I should see the "Molecular cooking collection" tile
+    But I should not see the "El Celler de Can Roca" tile
+    And I should not see the "Spherification" tile
+    And I should not see the "Foam" tile
+
+    # Reset the search by visiting again the search page.
+    Given I am on the search page
+    Then I should see the text "Content types" in the "Left sidebar" region
+
+    # Select link in the 'type' facet.
+    When I check the "News (1)" checkbox from the "Content types" facet
+    Then the "News" content checkbox item should be selected
+    And the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
+
+    When I check the "Solutions (2)" checkbox from the "Content types" facet
+    Then the "Solutions" content checkbox item should be selected
+    And the "News" content checkbox item should be selected
+    Then the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
+    And the "topic" select facet should contain the following options:
+      | Any topic                     |
+      | Demography   (1)              |
+      | Statistics and Analysis   (1) |
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location         |
+      | European Union   (1) |
+      | Luxembourg   (1)     |
+    And I should not see the "Molecular cooking collection" tile
+    And I should see the "El Celler de Can Roca" tile
+    But I should see the "Spherification" tile
+    And I should see the "Foam" tile
+
+    # Launch a text search.
+    When I open the search bar by clicking on the search icon
+    And I enter "Cooking" in the search bar and press enter
+    Then I should see the "Molecular cooking collection" tile
+    And I should see the "Foam" tile
+    But I should not see the "Spherification" tile
+    And I should not see the "El Celler de Can Roca" tile
+
+  @javascript
+  Scenario: Alphabetical order for the spatial coverage in the search page.
+    Given the following owner:
+      | name              | type    |
+      | Responsible owner | Company |
+    And the following contact:
+      | name  | Go-to contact     |
+      | email | go-to@example.com |
+    And the following collections:
+      | title            | description                                          | abstract                       | state     |
+      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
+      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
+    And event content:
+      | title             | short title       | body                                | spatial coverage | agenda         | location       | organisation        | scope         | keywords | collection       | state     |
+      | Event Omega       | Event short delta | The epsilon event content.          | Greece           | Event agenda.  | Some place     | European Commission | International | Alphabet | Collection alpha | validated |
+      | Alternative event | Alt event         | This event stays in the background. | Luxembourg       | To be planned. | Event location | Event organisation  |               |          | Collection alpha | validated |
+    And document content:
+      | title          | document type | short title          | body                                    | spatial coverage | keywords | collection       | state     |
+      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
+
+    When I visit the search page
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location     |
+      | Greece   (1)     |
+      | Luxembourg   (2) |
+    When I select "Luxembourg" from the "spatial coverage" select facet
+    Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
+    # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
+    And the "spatial coverage" select facet should contain the following options:
+      | Any location     |
+      | Greece   (1)     |
+      | Luxembourg   (2) |
+
+  Scenario: Content can be found with a full-text search.
+    Given the following owner:
+      | name              | type    |
+      | Responsible owner | Company |
+    And the following contact:
+      | name  | Go-to contact     |
+      | email | go-to@example.com |
+    And the following collections:
+      | title            | description                                          | abstract                       | state     |
+      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
+      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
+    And the following solutions:
+      | title          | description                                                | keywords | owner             | contact information | collection  | state     |
+      | Solution alpha | <p>This is the solution <strong>beta</strong> description. | Alphabet | Responsible owner | Go-to contact       | Col for Sol | validated |
+    And the following releases:
+      | title         | release number | release notes                               | keywords | is version of  | owner             | contact information | state     |
+      | Release Alpha | 1              | <p>Release notes for <em>beta</em> changes. | Alphabet | Solution alpha | Responsible owner | Go-to contact       | validated |
+    And the following distributions:
+      | title              | description                                    | parent        | access url |
+      | Distribution alpha | <p>A simple beta distribution description.</p> | Release Alpha | test.zip   |
+    And the following licences:
+      | title         | description                         |
+      | Licence Alpha | A beta description for the licence. |
+    And news content:
+      | title      | headline            | body                      | keywords | collection       | state     |
+      | News omega | News headline delta | The epsilon news content. | Alphabet | Collection alpha | validated |
+    And event content:
+      | title             | short title       | body                                | agenda         | location       | organisation        | scope         | keywords | collection       | solution       | state     |
+      | Event Omega       | Event short delta | The epsilon event content.          | Event agenda.  | Some place     | European Commission | International | Alphabet |                  | Solution alpha | validated |
+      | Alternative event | Alt event         | This event stays in the background. | To be planned. | Event location | Event organisation  |               |          | Collection alpha |                | validated |
+    And document content:
+      | title          | document type | short title          | body                                    | keywords | collection       | state     |
+      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Alphabet | Collection alpha | validated |
+    And discussion content:
+      | title            | body                                                              | solution       | state     |
+      | Discussion omega | <p>Does anybody has idea why this <em>epsilon</em> is everywhere? | Solution alpha | validated |
+    And custom_page content:
+      | title      | body                                     | collection       |
+      | Page omega | This is just an epsilon but should work. | Collection alpha |
+    And video content:
+      | title       | body          | field_video                                 | collection       |
+      | Video alpha | Slap like now | https://www.youtube.com/watch?v=JhGf8ZY0tN8 | Collection alpha |
+    And users:
+      | Username     | E-mail                      | First name | Family name | Organisation |
+      | jenlyle      | jenessa.carlyle@example.com | Jenessa    | Carlyle     | Clyffco      |
+      | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
+
+    When I visit the search page
+    Then the "Content types" checkbox facet should allow selecting the following values "Collections (2), Solution (1), News (1), Events (2), Document (1), Discussion (1), Release (1), Custom page (1), Licence (1), Video (1)"
+
+    # "Alpha" is used in all the rdf entities titles.
+    When I enter "Alpha" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
+
+    # "Omega" is used in all the node entities titles. Since the content of
+    # custom pages is added to their collection, we also match the collection.
+    When I enter "omega" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
+
+    # "Beta" is used in all the rdf entities body fields.
+    When I enter "beta" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
+
+    # "Epsilon" is used in all the node entities body fields.
+    When I enter "epsilon" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
+
+    # "Alphabet" is used in all the keywords fields.
+    When I enter "Alphabet" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha, News omega, Event Omega, Document omega"
+
+    # "Gamma" is used in the collection abstract.
+    When I enter "gamma" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha"
+
+    # "Delta" is used in headline and short titles.
+    When I enter "delta" in the search bar and press enter
+    Then the page should show the tiles "News omega, Event Omega, Document omega"
+
+    # Search for the event fields: agenda, location, address, organisation, scope.
+    When I enter "agenda" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+    When I enter "location" in the search bar and press enter
+    Then the page should show the tiles "Alternative event"
+    When I enter "place" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+    When I enter "organisation" in the search bar and press enter
+    Then the page should show the tiles "Alternative event"
+    When I enter "international" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+
+    # The owner and contact information names should be indexed inside the solutions/releases they are linked to.
+    When I enter "responsible" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha"
+    # Visit the homepage to be sure that the test fetches the correct updated page.
+    When I go to the homepage
+    And I enter "contact" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha"
+
+    # Users should be found by first name, family name and organisation.
+    When I enter "Jenessa" in the search bar and press enter
+    Then the page should show the tiles "Jenessa Carlyle"
+    When I enter "freeman" in the search bar and press enter
+    Then the page should show the tiles "Ulysses Freeman"
+    When I enter "clyffco" in the search bar and press enter
+    Then the page should show the tiles "Jenessa Carlyle"
+    When I enter "Omero+snc" in the search bar and press enter
+    Then the page should show the tiles "Ulysses Freeman"
+
+  Scenario: Advanced search
+    # An advanced search link is shown in the header, except on the home page
+    # and the search page.
+    Given I am on the homepage
+    Then I should not see the link "Advanced search"
+    Given I visit the collection overview
+    Then I should see the link "Advanced search"
+    When I click "Advanced search"
+    Then I should be on the advanced search page
+    But I should not see the link "Advanced search"
+
+  Scenario: Collections and solutions are shown first in search results with the same relevance.
+    Given collections:
+      | title                           | description                         | state     |
+      | Ornithology: the study of birds | Ornithology is a branch of zoology. | validated |
+      | Husky Flying Xylophone          | A strange instrument.               | validated |
+    And the following solution:
+      | title       | Bird outposts in the wild            |
+      | collection  | Ornithology: the study of birds      |
+      | description | Exotic wings and where to find them. |
+      | state       | validated                            |
+    And custom_page content:
+      | title           | body                                  | collection                      |
+      | Disturbed birds | Flocks of trained pigeons flying off. | Ornithology: the study of birds |
+    And news content:
+      | title                               | body                            | collection                      | state     |
+      | Chickens are small birds            | Birds domesticated in India.    | Ornithology: the study of birds | validated |
+      | Found a xylophone from 1600 in Asia | Oldest instrument of this type. | Husky Flying Xylophone          | validated |
+    And event content:
+      | title         | body                   | collection                      | state     |
+      | Bird spotting | Roosters crow at dawn. | Ornithology: the study of birds | validated |
+    And discussion content:
+      | title                             | body                    | collection                      | state     |
+      | Best place to find an exotic bird | Somewhere exotic maybe? | Ornithology: the study of birds | validated |
+    And user:
+      | Username    | Bird watcher |
+      | First name  | Bird         |
+      | Family name | Birdman      |
+
+    # The bird is the word... to search.
+    When I enter "Bird" in the search bar and press enter
+    Then I should see the following tiles in the correct order:
+      | Ornithology: the study of birds   |
+      | Bird outposts in the wild         |
+      | Disturbed birds                   |
+      | Chickens are small birds          |
+      | Bird spotting                     |
+      | Best place to find an exotic bird |
+      | Bird Birdman                      |
+
+  @clearStaticCache
+  Scenario: Solutions and/or releases are found by their distribution keyword.
+    Given the following licences:
+      | title      |
+      | Apache-2.0 |
+      | LGPL       |
+    And the following solution:
+      | title | Zzolution |
+      | state | validated |
+
+    When I enter "ZzoluDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Add distribution, child of solution.
+    Given the following distribution:
+      | title                    | ZzoluDistro                     |
+      | parent                   | Zzolution                       |
+      | description              | Übermensch foot size            |
+      | access url               | http://example.com/zzolu-distro |
+      | licence                  | Apache-2.0                      |
+      | format                   | HTML                            |
+      | representation technique | Datalog                         |
+
+    When I enter "zzoludistro" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "ubermensch" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "zzolu-distro" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "apache" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "Apache-2.0,Zzolution"
+    When I enter "HTML" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "Datalog" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+
+    Given I am logged in as a moderator
+    When I go to the edit form of the "ZzoluDistro" distribution
+    And I fill in "Title" with "DistroZzolu"
+    And I fill in "Description" with "Nietzsche's"
+    And I press the "Remove" button
+    And I set a remote URL "http://example.com/guzzle" to "Access URL"
+    And I select "LGPL" from "Licence"
+    And I select "CSV" from "Format"
+    And I select "Human Language" from "Representation technique"
+    And I press "Save"
+    Then I should see the heading "DistroZzolu"
+
+    # Repeat the previous searches to prove that the initial keywords were
+    # removed from the Search API index.
+    Given I am an anonymous user
+    When I enter "zzoludistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "ubermensch" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "zzolu-distro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "apache" in the search bar and press enter
+    Then the page should show only the tiles "Apache-2.0"
+    When I enter "HTML" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Datalog" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Search now with the new keywords.
+    When I enter "distrozzolu" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "nietzsche" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "guzzle" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "lGPL" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "LGPL,Zzolution"
+    When I enter "CSV" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "Human Language" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+
+    Given I delete the "DistroZzolu" asset distribution
+
+    # The parent solution has been re-indexed without distribution data.
+    When I enter "distrozzolu" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "nietzsche" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "guzzle" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "lGPL" in the search bar and press enter
+    Then the page should show only the tiles "LGPL"
+    When I enter "CSV" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Human Language" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Add a new distribution, child of a release.
+    Given the following release:
+      | title         | Releazz   |
+      | state         | validated |
+      | is version of | Zzolution |
+
+    When I enter "ReleazzDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    Given the following distribution:
+      | title                    | ReleazzDistro                     |
+      | parent                   | Releazz                           |
+      | description              | Dracula                           |
+      | access url               | http://example.com/releazz-distro |
+      | licence                  | Apache-2.0                        |
+      | format                   | HTML                              |
+      | representation technique | Datalog                           |
+
+    When I enter "releazzDistro" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "dracula" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "releazz-distro" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "apache" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "Apache-2.0,Releazz"
+    When I enter "HTML" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "Datalog" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+
+    Given I am logged in as a moderator
+    When I go to the edit form of the "ReleazzDistro" distribution
+    And I fill in "Title" with "DistroReleazz"
+    And I fill in "Description" with "Zorro"
+    And I press the "Remove" button
+    And I set a remote URL "http://example.com/mishmash" to "Access URL"
+    And I select "LGPL" from "Licence"
+    And I select "CSV" from "Format"
+    And I select "Human Language" from "Representation technique"
+    And I press "Save"
+
+    # Repeat the previous searches to prove that the initial keywords were
+    # removed from the Search API index.
+    Given I am an anonymous user
+    When I enter "releazzDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "dracula" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "releazz-distro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "apache" in the search bar and press enter
+    Then the page should show only the tiles "Apache-2.0"
+    When I enter "HTML" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Datalog" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Search now with the new keywords.
+    When I enter "dIstrOreleazz" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "zoRRo" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "mishMash" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "LGpl" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "LGPL,Releazz"
+    When I enter "CSV" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "Human Language" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+
+    Given I delete the "DistroReleazz" asset distribution
+
+    # The parent release has been re-indexed without distribution data.
+    When I enter "dIstrOreleazz" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "zoRRo" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "mishMash" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "lGPL" in the search bar and press enter
+    Then the page should show only the tiles "LGPL"
+    When I enter "CSV" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Human Language" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+  Scenario: Collections are found by their keywords.
+    Given the following collection:
+      | title    | Collection sample       |
+      | keywords | unique, key-definitions |
+      | state    | validated               |
+
+    When I enter "key-definitions" in the search bar and press enter
+    Then the page should show only the tiles "Collection sample"
+
+    When I enter "unique" in the search bar and press enter
+    Then the page should show only the tiles "Collection sample"
+
+  @javascript
+  Scenario: Users are able to select the sort order.
+    Given collections:
+      | title             | description       | state     |
+      | Custom collection | Some custom data. | validated |
+    And news content:
+      | title                              | body                                                              | collection        | state     | created    | changed    |
+      | Relativity is the word             | No one cares about the body.                                      | Custom collection | validated | 01/01/2019 | 03/08/2019 |
+      | Relativity news: Relativity theory | I do care about the relativity keyword in the body.               | Custom collection | validated | 02/01/2019 | 02/08/2019 |
+      | Absolutely nonesense               | Some news are not worth it but I will add relativity here anyway. | Custom collection | validated | 03/01/2019 | 01/08/2019 |
+
+    When I am on the homepage
+    And I enter "Relativity" in the search bar and press enter
+    Then the option "Relevance" should be selected
+    And I should see the following tiles in the correct order:
+      | Relativity news: Relativity theory |
+      | Relativity is the word             |
+      | Absolutely nonesense               |
+    And I should be on "/search?keys=Relativity&sort_by=relevance"
+
+    Given I select "Creation Date" from "Sort by"
+    Then I should see the following tiles in the correct order:
+      | Absolutely nonesense               |
+      | Relativity news: Relativity theory |
+      | Relativity is the word             |
+    And I should be on "/search?keys=Relativity&sort_by=creation-date"
+
+    Given I select "Last Updated Date" from "Sort by"
+    Then I should see the following tiles in the correct order:
+      | Relativity is the word             |
+      | Relativity news: Relativity theory |
+      | Absolutely nonesense               |
+    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"

From 40048521b20ba55d476d38d72b4ea52dc307a1c5 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Mon, 27 Sep 2021 14:18:26 +0100
Subject: [PATCH 02/20] ISAICP-6579: Facets summary Search view.

---
 composer.json                                 |   9 +-
 composer.lock                                 | 120 +++++++++++++++++-
 config/sync/core.extension.yml                |   2 +
 config/sync/facets.facet.topic.yml            |  28 ++--
 ...y.facets_summary.search_facets_summary.yml |  43 +++++++
 ...ntent_subscription.field_group_content.yml |   3 +
 config/sync/filter.format.essential_html.yml  | 117 +++++++++++++----
 config/sync/filter.format.simple_html.yml     |  94 +++++++-------
 config/sync/views.view.search.yml             |  11 ++
 tests/behat.yml.dist                          |   1 +
 .../joinup_search/group_search.feature        |   6 +-
 tests/features/joinup_search/search.feature   |  36 ++++++
 tests/src/Context/JoinupSearchContext.php     |  55 ++++++++
 .../joinup/scss/components/_listing.scss      |  11 ++
 .../facets-result-item--summary.html.twig     |  27 ++++
 .../facets-summary-item-list.html.twig        |  39 ++++++
 16 files changed, 512 insertions(+), 90 deletions(-)
 create mode 100644 config/sync/facets_summary.facets_summary.search_facets_summary.yml
 create mode 100644 web/themes/joinup/templates/search_api/facets-result-item--summary.html.twig
 create mode 100644 web/themes/joinup/templates/search_api/facets-summary-item-list.html.twig

diff --git a/composer.json b/composer.json
index 8701e77872..b7527f12a8 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,7 @@
         "drupal/entityqueue": "^1.2",
         "drupal/error_page": "^1.0",
         "drupal/facets": "1.6.0",
+        "drupal/facets_form": "1.x-dev@dev",
         "drupal/field_delimiter": "^1.1",
         "drupal/field_formatter_range": "^1.1",
         "drupal/field_group": "^3.1",
@@ -88,6 +89,7 @@
         "drupal/video_embed_field": "~1.6",
         "drupal/view_unpublished": "^1.0",
         "drupal/views_autosubmit": "^1.2",
+        "drupal/views_block_area": "^1.0@beta",
         "drupal/views_bulk_operations": "^2.6",
         "drupal/views_data_export": "^1.0",
         "drupal/views_multiple_permissions": "^1.0",
@@ -367,8 +369,8 @@
             "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"
             },
-            "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"
+            "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_webtools": {
                 "Allow to pass an optional referer. @see https://github.com/openeuropa/oe_webtools/pull/96": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_webtools/pull/96.diff",
@@ -376,6 +378,9 @@
                 "Add the possibility to display a marker on the map. @see https://github.com/openeuropa/oe_webtools/pull/111": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_webtools/pull/111.diff",
                 "Integrate with Webtools eTrans component @see https://github.com/openeuropa/oe_webtools/pull/146": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_webtools/pull/146.diff",
                 "Avoid CORS issues by requesting the Webtools Smartloader script over HTTPS @see https://github.com/openeuropa/oe_webtools/pull/149": "https://patch-diff.githubusercontent.com/raw/openeuropa/oe_webtools/pull/149.diff"
+            },
+            "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"
             }
         },
         "patches-ignore": {
diff --git a/composer.lock b/composer.lock
index fda1fadf83..cd2e0baebb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "02b2d4ee27172c0331df5b65738eb035",
+    "content-hash": "2ee78642e5c3bca4f5b5682ad9fe5132",
     "packages": [
         {
             "name": "SEMICeu/adms-ap_validator",
@@ -3894,7 +3894,8 @@
                 "patches_applied": {
                     "Facet Summary for Facet Items with a set dependency. @see https://www.drupal.org/node/2873480": "resources/patch/facet_summary_for_facet-2873480-18.patch",
                     "Configurable dropdown child prefix. @see https://www.drupal.org/project/facets/issues/3214662": "https://git.drupalcode.org/project/facets/-/merge_requests/20.diff",
-                    "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
+                    "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch",
+                    "https://www.drupal.org/project/facets/issues/3223956": "https://git.drupalcode.org/project/facets/-/merge_requests/25.diff"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3931,6 +3932,64 @@
                 "irc": "irc://irc.freenode.org/drupal-search-api"
             }
         },
+        {
+            "name": "drupal/facets_form",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/facets_form.git",
+                "reference": "85965678f7d051c929be267cd1fd15453d556559"
+            },
+            "require": {
+                "cweagans/composer-patches": "^1.7",
+                "drupal/core": "^8.9 || ^9.1",
+                "drupal/facets": "^1.6"
+            },
+            "require-dev": {
+                "drupal/search_api": "^1.13"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "1.x-dev",
+                    "datestamp": "1629847996",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
+                    }
+                },
+                "enable-patching": true,
+                "patches": {
+                    "drupal/facets": {
+                        "https://www.drupal.org/project/facets/issues/3223956": "https://git.drupalcode.org/project/facets/-/merge_requests/25.diff"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Claudiu Cristea",
+                    "homepage": "https://www.drupal.org/u/claudiucristea"
+                },
+                {
+                    "name": "Andras Szilagyi",
+                    "homepage": "https://www.drupal.org/u/andras_szilagyi"
+                }
+            ],
+            "description": "Place the facets of a given facets source in a form",
+            "homepage": "https://www.drupal.org/project/facets_form",
+            "support": {
+                "source": "https://git.drupalcode.org/project/facets_form",
+                "issues": "https://www.drupal.org/project/issues/facets_form"
+            },
+            "time": "2021-09-06T17:00:30+00:00"
+        },
         {
             "name": "drupal/field_delimiter",
             "version": "1.1.0",
@@ -7874,6 +7933,61 @@
                 "issues": "https://www.drupal.org/project/issues/views_autosubmit"
             }
         },
+        {
+            "name": "drupal/views_block_area",
+            "version": "1.0.0-beta3",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/views_block_area.git",
+                "reference": "8.x-1.0-beta3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/views_block_area-8.x-1.0-beta3.zip",
+                "reference": "8.x-1.0-beta3",
+                "shasum": "bfc4a4b2c85545ef53f91f5f6633f7465c655494"
+            },
+            "require": {
+                "drupal/core": "^8 || ^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.0-beta3",
+                    "datestamp": "1592206687",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Beta releases are not covered by Drupal security advisories."
+                    }
+                },
+                "patches_applied": {
+                    "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"
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Leon Kessler",
+                    "homepage": "https://www.drupal.org/user/595374"
+                },
+                {
+                    "name": "cafuego",
+                    "homepage": "https://www.drupal.org/user/218525"
+                },
+                {
+                    "name": "nils.destoop",
+                    "homepage": "https://www.drupal.org/user/361625"
+                }
+            ],
+            "description": "Exposes all blocks as a views area.",
+            "homepage": "https://www.drupal.org/project/views_block_area",
+            "support": {
+                "source": "https://git.drupalcode.org/project/views_block_area"
+            }
+        },
         {
             "name": "drupal/views_bulk_operations",
             "version": "2.6.0",
@@ -20268,12 +20382,14 @@
         "dkarv/mdl-chip-input": 20,
         "drupal/cas_attributes": 20,
         "drupal/config_ignore": 20,
+        "drupal/facets_form": 20,
         "drupal/menu_link_destination": 20,
         "drupal/og": 20,
         "drupal/page_manager": 10,
         "drupal/site_verify": 20,
         "drupal/subpathauto": 20,
         "drupal/swiftmailer": 20,
+        "drupal/views_block_area": 10,
         "ec-europa/joinup-tallinn-dashboard": 20,
         "ec-europa/material-design-lite": 20,
         "jacklmoore/autosize": 20,
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index 1f2ae2fec0..e5ff68d9a5 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -45,6 +45,7 @@ module:
   eu_sic: 0
   eupl: 0
   facets: 0
+  facets_summary: 0
   field: 0
   field_delimiter: 0
   field_formatter_range: 0
@@ -209,6 +210,7 @@ module:
   video_embed_wysiwyg: 0
   view_unpublished: 0
   views_autosubmit: 0
+  views_block_area: 0
   views_bulk_operations: 0
   views_data_export: 0
   views_multiple_permissions: 0
diff --git a/config/sync/facets.facet.topic.yml b/config/sync/facets.facet.topic.yml
index 1423892fe3..92400d080b 100644
--- a/config/sync/facets.facet.topic.yml
+++ b/config/sync/facets.facet.topic.yml
@@ -8,24 +8,24 @@ dependencies:
   module:
     - search_api
 id: topic
-name: Topic
+name: Topics
 url_alias: topic
-weight: 0
+weight: -3
 min_count: 1
 show_only_one_result: true
 field_identifier: topic
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: false
     default_option_label: 'Any topic'
-    child_prefix: ' '
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: false
 query_operator: or
 use_hierarchy: true
 expand_hierarchy: true
-enable_parent_when_child_gets_disabled: true
+enable_parent_when_child_gets_disabled: false
 hard_limit: 0
 exclude: false
 only_visible_when_facet_source_is_visible: true
@@ -35,36 +35,36 @@ processor_configs:
     weights:
       sort: -8
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
-      build: -1
+      build: 5
     settings: {  }
   count_limit:
     processor_id: count_limit
     weights:
-      build: 0
+      build: -10
     settings:
       minimum_items: 1
       maximum_items: null
   count_widget_order:
     processor_id: count_widget_order
     weights:
-      sort: -9
+      sort: -10
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
-      sort: -10
+      sort: -8
     settings:
       sort: ASC
   url_processor_handler:
     processor_id: url_processor_handler
     weights:
       pre_query: -10
-      build: -2
+      build: 5
     settings: {  }
 empty_behavior:
   behavior: none
diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
new file mode 100644
index 0000000000..e06737b2db
--- /dev/null
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -0,0 +1,43 @@
+uuid: 0a4c553f-2c75-4e3c-9d41-68bc0043edd9
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.published
+    - views.view.search
+  module:
+    - search_api
+id: search_facets_summary
+name: 'Search facets summary'
+facets:
+  group:
+    checked: true
+    label: Collection/Solution
+    separator: ', '
+    weight: 0
+    show_count: false
+  spatial_coverage:
+    checked: true
+    label: 'Geographic coverage'
+    separator: ', '
+    weight: 0
+    show_count: false
+  topic:
+    checked: true
+    label: Topic
+    separator: ', '
+    weight: 0
+    show_count: false
+  type:
+    checked: true
+    label: Type
+    separator: ', '
+    weight: 0
+    show_count: false
+facet_source_id: 'search_api:views_page__search__page_1'
+processor_configs:
+  hide_when_not_rendered:
+    processor_id: hide_when_not_rendered
+    weights:
+      build: '45'
+    settings: {  }
diff --git a/config/sync/field.field.message.group_content_subscription.field_group_content.yml b/config/sync/field.field.message.group_content_subscription.field_group_content.yml
index f724c9f74c..2f5813f9bd 100644
--- a/config/sync/field.field.message.group_content_subscription.field_group_content.yml
+++ b/config/sync/field.field.message.group_content_subscription.field_group_content.yml
@@ -272,4 +272,7 @@ settings:
   responsive_image_style:
     handler: 'default:responsive_image_style'
     handler_settings: {  }
+  facets_summary:
+    handler: 'default:facets_summary'
+    handler_settings: {  }
 field_type: dynamic_entity_reference
diff --git a/config/sync/filter.format.essential_html.yml b/config/sync/filter.format.essential_html.yml
index 99960e75ec..9bd332877e 100644
--- a/config/sync/filter.format.essential_html.yml
+++ b/config/sync/filter.format.essential_html.yml
@@ -1,67 +1,140 @@
-uuid: 5e41fc3f-ac9f-4211-89b9-b4052f4eda6e
+uuid: 66d0b8e4-98a3-45d1-8091-b96a313046cb
 langcode: en
 status: true
 dependencies:
+  config:
+    - image.style.wysiwyg_full_width
+    - image.style.wysiwyg_half_width
+    - image.style.wysiwyg_one_third_width
   module:
+    - collection
+    - editor
+    - embed_block
+    - image
     - joinup_video
+    - linkit
     - media
-_core:
-  default_config_hash: _EOmoFGHhTjV4rORLrzpQZv9C6rnPb8LVLDoNMqBz7Us
-name: 'Essential HTML'
-format: essential_html
-weight: 0
+    - video_embed_wysiwyg
+name: 'Simple HTML'
+format: simple_html
+weight: 3
 filters:
   filter_url:
     id: filter_url
     provider: filter
     status: true
-    weight: -49
+    weight: -50
     settings:
       filter_url_length: 72
   filter_html:
     id: filter_html
     provider: filter
     status: true
-    weight: -48
+    weight: -49
     settings:
-      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p>'
+      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p> <ul> <li> <ol> <blockquote> <q> <img src alt data-entity-type data-entity-uuid data-image-style>'
       filter_html_help: false
       filter_html_nofollow: true
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
     status: true
+    weight: -48
+    settings: {  }
+  collection_glossary:
+    id: collection_glossary
+    provider: collection
+    status: false
+    weight: -43
+    settings: {  }
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: -46
+    settings: {  }
+  embed_block:
+    id: embed_block
+    provider: embed_block
+    status: false
+    weight: -42
+    settings: {  }
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: true
+    weight: -47
+    settings: {  }
+  filter_html_escape:
+    id: filter_html_escape
+    provider: filter
+    status: false
+    weight: -44
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: false
+    weight: -39
+    settings: {  }
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: false
     weight: -41
     settings: {  }
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: false
+    weight: -40
+    settings: {  }
+  filter_image_style:
+    id: filter_image_style
+    provider: image
+    status: true
+    weight: -45
+    settings:
+      allowed_styles:
+        - wysiwyg_full_width
+        - wysiwyg_half_width
+        - wysiwyg_one_third_width
   joinup_video:
     id: joinup_video
     provider: joinup_video
     status: false
-    weight: 0
+    weight: -38
     settings:
       allowed_providers:
-        joinup_ec_video: 0
         internal_path: 0
-        google_docs: 0
-        prezi: 0
         slideshare: 0
-        vimeo: 0
-        youtube: 0
+        prezi: 0
+        joinup_ec_video: 0
+        google_docs: 0
         youtube_playlist: 0
+        youtube: 0
+        vimeo: 0
       autoplay: false
       responsive: true
-  collection_glossary:
-    id: collection_glossary
-    provider: collection
-    status: true
-    weight: 0
-    settings: {  }
+  linkit:
+    id: linkit
+    provider: linkit
+    status: false
+    weight: -37
+    settings:
+      title: true
   media_embed:
     id: media_embed
     provider: media
     status: false
-    weight: 100
+    weight: -35
     settings:
       default_view_mode: default
       allowed_media_types: {  }
       allowed_view_modes: {  }
+  video_embed_wysiwyg:
+    id: video_embed_wysiwyg
+    provider: video_embed_wysiwyg
+    status: false
+    weight: -36
+    settings: {  }
diff --git a/config/sync/filter.format.simple_html.yml b/config/sync/filter.format.simple_html.yml
index ee1ad0df4a..9bd332877e 100644
--- a/config/sync/filter.format.simple_html.yml
+++ b/config/sync/filter.format.simple_html.yml
@@ -41,66 +41,30 @@ filters:
     status: true
     weight: -48
     settings: {  }
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: -47
-    settings: {  }
-  filter_image_style:
-    id: filter_image_style
-    provider: image
-    status: true
-    weight: -45
-    settings:
-      allowed_styles:
-        - wysiwyg_full_width
-        - wysiwyg_half_width
-        - wysiwyg_one_third_width
-  joinup_video:
-    id: joinup_video
-    provider: joinup_video
-    status: false
-    weight: -38
-    settings:
-      allowed_providers:
-        internal_path: 0
-        slideshare: 0
-        prezi: 0
-        joinup_ec_video: 0
-        google_docs: 0
-        youtube_playlist: 0
-        youtube: 0
-        vimeo: 0
-      autoplay: false
-      responsive: true
-  media_embed:
-    id: media_embed
-    provider: media
+  collection_glossary:
+    id: collection_glossary
+    provider: collection
     status: false
-    weight: -35
-    settings:
-      default_view_mode: default
-      allowed_media_types: {  }
-      allowed_view_modes: {  }
+    weight: -43
+    settings: {  }
   editor_file_reference:
     id: editor_file_reference
     provider: editor
     status: true
     weight: -46
     settings: {  }
-  collection_glossary:
-    id: collection_glossary
-    provider: collection
-    status: false
-    weight: -43
-    settings: {  }
   embed_block:
     id: embed_block
     provider: embed_block
     status: false
     weight: -42
     settings: {  }
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: true
+    weight: -47
+    settings: {  }
   filter_html_escape:
     id: filter_html_escape
     provider: filter
@@ -125,6 +89,33 @@ filters:
     status: false
     weight: -40
     settings: {  }
+  filter_image_style:
+    id: filter_image_style
+    provider: image
+    status: true
+    weight: -45
+    settings:
+      allowed_styles:
+        - wysiwyg_full_width
+        - wysiwyg_half_width
+        - wysiwyg_one_third_width
+  joinup_video:
+    id: joinup_video
+    provider: joinup_video
+    status: false
+    weight: -38
+    settings:
+      allowed_providers:
+        internal_path: 0
+        slideshare: 0
+        prezi: 0
+        joinup_ec_video: 0
+        google_docs: 0
+        youtube_playlist: 0
+        youtube: 0
+        vimeo: 0
+      autoplay: false
+      responsive: true
   linkit:
     id: linkit
     provider: linkit
@@ -132,6 +123,15 @@ filters:
     weight: -37
     settings:
       title: true
+  media_embed:
+    id: media_embed
+    provider: media
+    status: false
+    weight: -35
+    settings:
+      default_view_mode: default
+      allowed_media_types: {  }
+      allowed_view_modes: {  }
   video_embed_wysiwyg:
     id: video_embed_wysiwyg
     provider: video_embed_wysiwyg
diff --git a/config/sync/views.view.search.yml b/config/sync/views.view.search.yml
index bf982a70af..9581a4d890 100644
--- a/config/sync/views.view.search.yml
+++ b/config/sync/views.view.search.yml
@@ -8,6 +8,7 @@ dependencies:
     - joinup_material_design
     - search_api
     - views_autosubmit
+    - views_block_area
 _core:
   default_config_hash: IZ_1De9xX5-8975-JeHxZJ0f_58o9R3nM9pxnxboN_k
 id: search
@@ -397,6 +398,16 @@ display:
           empty: false
           content: 'Search Results (@total)'
           plugin_id: result
+        views_block_area:
+          id: views_block_area
+          table: views
+          field: views_block_area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          block_id: 'facets_summary_block:search_facets_summary'
+          plugin_id: views_block_area
       footer: {  }
       empty:
         area_text_custom:
diff --git a/tests/behat.yml.dist b/tests/behat.yml.dist
index 2e72aebd8c..659b6a86fd 100644
--- a/tests/behat.yml.dist
+++ b/tests/behat.yml.dist
@@ -128,6 +128,7 @@ default:
         Pager: 'nav.pager'
         Plus button menu: 'div.add-content-menu'
         Primary menu: '.region-primary-menu'
+        Search bar: 'div.search-bar'
         SevenHeader: '.region-header'
         Statistics: '#block-statistics, #block-ventuno-statistics'
         Table of contents: '#block-table-of-contents'
diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index 56f1c83f87..bc7f25116c 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -221,7 +221,7 @@ Feature: Search inside groups
     When I enter "ground" in the search bar and press enter
     Then the option with text "Chalet construction   (2)" from select facet "collection/solution" is selected
     And the page should show the tiles "Ground plan, Natural materials"
-    And the page should show the following chip:
+    And the page should show the following chip in the "Search bar":
       | Chalet construction |
     When I press the remove button on the chip "Chalet construction"
     And I submit the search by pressing enter
@@ -242,7 +242,7 @@ Feature: Search inside groups
     And I should see 6 tiles
 
     When I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
+    Then the page should show the following chip in the "Search bar":
       | Inclined foundations |
 
     # The filter chip should remain active when doing another search.
@@ -250,5 +250,5 @@ Feature: Search inside groups
     Then the option with text "Inclined foundations   (2)" from select facet "collection/solution" is selected
     And I should see 2 tiles
     When I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
+    Then the page should show the following chip in the "Search bar":
       | Inclined foundations |
diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index 0a49fbd0c7..a0dae0dfe4 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -591,3 +591,39 @@ Feature: Global search
       | Relativity news: Relativity theory |
       | Absolutely nonesense               |
     And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
+
+  @javascript
+  Scenario: Anonymous user can find facets summary
+    Given the following collection:
+      | title            | Radio cooking collection     |
+      | logo             | logo.png                     |
+      | moderation       | no                           |
+      | topic            | Demography                   |
+      | spatial coverage | Belgium                      |
+      | state            | validated                    |
+    And the following solutions:
+      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
+      | Spheres        | Radio cooking collection     | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
+      | Movistar       | Radio cooking collection     | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
+    And news content:
+      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
+      | El Cabo da Roca       | The best in town | Radio cooking collection     | Statistics and Analysis | Luxembourg       | validated |
+      | Funny news 1          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 2          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 3          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 4          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+
+    Given I am logged in as a user with the "authenticated" role
+    When I visit the search page
+    And I check the "Solutions (2)" checkbox from the "Content types" facet
+    Then I check the "News (5)" checkbox from the "Content types" facet
+    And I should see the following facet summary "Solutions, News"
+
+    Then I check the "Solutions (2)" checkbox from the "Content types" facet
+    And I should see the following facet summary "News"
+
+    # Check if facet summary was remove correctly.
+    Then I check the "Collection (1)" checkbox from the "Content types" facet
+    And I should see the following facet summary "Collection, News"
+    Then I should remove the following facet summary "News"
+    And the page should show only the tiles "Radio cooking collection"
diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index 960755b98b..4b7c131423 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -630,4 +630,59 @@ protected function getSearchBarElement(): NodeElement {
     return reset($elements);
   }
 
+  /**
+   * Asserts that certain facet summary items are shown on the page.
+   *
+   * @param string $labels
+   *   A comma-separated list of facet item labels.
+   *
+   * @throws \Exception
+   *   Thrown when a wanted facet item is not shown in the page.
+   *
+   * @When I should see the following facet summary :labels
+   */
+  public function assertFacetSummary(string $labels): void {
+    $labels = $this->explodeCommaSeparatedStepArgument($labels);
+    $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block-facets-summary-blocksearch-facets-summary ')]//li[contains(concat(' ', normalize-space(@class), ' '), ' facet-summary-item--facet ')]";
+    $elements = $this->getSession()->getPage()->findAll('xpath', $xpath);
+    $present = $present_labels = [];
+
+    /** @var \Behat\Mink\Element\NodeElement $element */
+    foreach ($elements as $element) {
+      $present[] = $element->getText();
+    }
+
+    // Add label close in front of label.
+    foreach ($labels as $label) {
+      $present_labels[] = $label . ' close';
+    }
+
+    $present = array_map('trim', $present);
+    $present_labels = array_map('trim', $present_labels);
+    Assert::assertEquals($present_labels, $present);
+  }
+
+  /**
+   * Remove facet summary item that are on the page.
+   *
+   * @param string $label
+   *   A facet summary item label.
+   *
+   * @throws \Exception
+   *   Thrown when a wanted facet item is not shown in the page.
+   *
+   * @When I should remove the following facet summary :label
+   */
+  public function removeFacetSummary(string $label): void {
+
+    $xpath = '//div[contains(concat(" ", normalize-space(@class), " "), " block-facets-summary-blocksearch-facets-summary ")]//span[text()="' . $label . '"]';
+    $element = $this->getSession()->getPage()->find('xpath', $xpath);
+
+    if (empty($element)) {
+      throw new \Exception("The $label facet summary item was not found in the page.");
+    }
+
+    $element->click();
+  }
+
 }
diff --git a/web/themes/joinup/scss/components/_listing.scss b/web/themes/joinup/scss/components/_listing.scss
index 33d7fcb2a4..76a50ff5f7 100644
--- a/web/themes/joinup/scss/components/_listing.scss
+++ b/web/themes/joinup/scss/components/_listing.scss
@@ -209,6 +209,17 @@
   }
 }
 
+.listing__facets {
+  display: flex;
+  padding-left: 0;
+
+  li {
+    list-style: none;
+    padding-left: 0;
+    margin-left: 1rem;
+  }
+}
+
 // Modifiers
 // --------------------------------------------------
 .listing__image--default {
diff --git a/web/themes/joinup/templates/search_api/facets-result-item--summary.html.twig b/web/themes/joinup/templates/search_api/facets-result-item--summary.html.twig
new file mode 100644
index 0000000000..bb3606da68
--- /dev/null
+++ b/web/themes/joinup/templates/search_api/facets-result-item--summary.html.twig
@@ -0,0 +1,27 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a facet result item.
+ *
+ * Available variables:
+ * - value: The item value.
+ * - raw_value: The raw item value.
+ * - show_count: If this facet provides count.
+ * - count: The amount of results.
+ * - is_active: The item is active.
+ * - facet: The facet for this result item.
+ *   - id: the machine name for the facet.
+ *   - label: The facet label.
+ *
+ * @ingroup themeable
+ */
+#}
+<span class="mdl-chip mdl-chip--deletable">
+  <span class="mdl-chip__text facet-item__value">{{ value }}</span>
+  {% if is_active %}
+    <button type="button" class="facet-item__status js-facet-deactivate mdl-chip__action" aria-label="{{ 'Close'|t }}"><i class="material-icons">close</i></button>
+  {% endif %}
+  {% if show_count %}
+    <span class="facet-item__count">({{ count }})</span>
+  {% endif %}
+</span>
diff --git a/web/themes/joinup/templates/search_api/facets-summary-item-list.html.twig b/web/themes/joinup/templates/search_api/facets-summary-item-list.html.twig
new file mode 100644
index 0000000000..d44745bac3
--- /dev/null
+++ b/web/themes/joinup/templates/search_api/facets-summary-item-list.html.twig
@@ -0,0 +1,39 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a facets summary item list.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ *   - attributes: HTML attributes to be applied to each list item.
+ *   - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ *   string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ *   - list_style: The custom list style.
+ *
+ * @see facets_summary_preprocess_facets_summary_item_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{%- set attributes = attributes.addClass('listing__facets') %}
+{% if items or empty %}
+  {%- if title is not empty -%}
+    <h3>{{ title }}</h3>
+  {%- endif -%}
+
+  {%- if items -%}
+    <{{ list_type }}{{ attributes }}>
+      {%- for item in items -%}
+        <li{{ item.attributes }} >{{ item.value }}</li>
+      {%- endfor -%}
+    </{{ list_type }}>
+  {%- else -%}
+    {{- empty -}}
+  {%- endif -%}
+{%- endif %}

From 128d3034e7c32cfdb3be8098887a4cfc97ee9d18 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Tue, 28 Sep 2021 10:35:41 +0100
Subject: [PATCH 03/20] ISAICP-6584: Integrate Facets Form & Date Range Widget.

---
 composer.json                                 |   3 +
 .../sync/block.block.entity_bundle_facet.yml  |  29 -
 ...k.block.facetformviewsearchdisplaypage.yml |  37 ++
 config/sync/block.block.group_facet.yml       |  29 -
 .../block.block.spatial_coverage_facet.yml    |  29 -
 config/sync/block.block.three_dots_menu.yml   |   2 +
 config/sync/block.block.topic_facet.yml       |  29 -
 config/sync/core.extension.yml                |   2 +
 config/sync/facets.facet.creation_date.yml    |  63 ++
 config/sync/facets.facet.group.yml            |  11 +-
 config/sync/facets.facet.spatial_coverage.yml |  23 +-
 config/sync/facets.facet.type.yml             |  29 +-
 ...y.facets_summary.search_facets_summary.yml |   6 -
 config/sync/filter.format.essential_html.yml  | 122 +---
 .../joinup_search/group_search.feature        |  17 +-
 tests/features/joinup_search/search.feature   | 168 +++---
 .../joinup_search/search.feature.orig         | 543 ------------------
 tests/src/Traits/TraversingTrait.php          |  19 +-
 .../search_api_arbitrary_facet.module         |   8 +-
 .../facet_source/SearchApiFieldDeriver.php    |   1 +
 20 files changed, 284 insertions(+), 886 deletions(-)
 delete mode 100644 config/sync/block.block.entity_bundle_facet.yml
 create mode 100644 config/sync/block.block.facetformviewsearchdisplaypage.yml
 delete mode 100644 config/sync/block.block.group_facet.yml
 delete mode 100644 config/sync/block.block.spatial_coverage_facet.yml
 delete mode 100644 config/sync/block.block.topic_facet.yml
 create mode 100644 config/sync/facets.facet.creation_date.yml
 delete mode 100644 tests/features/joinup_search/search.feature.orig

diff --git a/composer.json b/composer.json
index b7527f12a8..25fccc6b17 100644
--- a/composer.json
+++ b/composer.json
@@ -301,6 +301,9 @@
                 "Configurable dropdown child prefix. @see https://www.drupal.org/project/facets/issues/3214662": "https://git.drupalcode.org/project/facets/-/merge_requests/20.diff",
                 "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
             },
+            "drupal/facets_form": {
+                "Implement calculate dependencies. @see https://www.drupal.org/project/facets_form/issues/3230468": "https://git.drupalcode.org/project/facets_form/-/merge_requests/15.diff"
+            },
             "drupal/honeypot": {
                 "Behat integration. @see https://www.drupal.org/project/honeypot/issues/3059040": "https://www.drupal.org/files/issues/2020-09-09/3059040-31.patch",
                 "Provide ways to clean up old honeypot_time_restriction values @see https://www.drupal.org/project/honeypot/issues/2997609": "https://git.drupalcode.org/project/honeypot/-/merge_requests/2.diff"
diff --git a/config/sync/block.block.entity_bundle_facet.yml b/config/sync/block.block.entity_bundle_facet.yml
deleted file mode 100644
index e143fead9f..0000000000
--- a/config/sync/block.block.entity_bundle_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 5d10248b-fb61-4515-b58a-97d58639df37
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.type
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: entity_bundle_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -18
-provider: null
-plugin: 'facet_block:type'
-settings:
-  id: 'facet_block:type'
-  label: 'Content types'
-  provider: facets
-  label_display: '1'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.facetformviewsearchdisplaypage.yml b/config/sync/block.block.facetformviewsearchdisplaypage.yml
new file mode 100644
index 0000000000..c09b923e35
--- /dev/null
+++ b/config/sync/block.block.facetformviewsearchdisplaypage.yml
@@ -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: {  }
diff --git a/config/sync/block.block.group_facet.yml b/config/sync/block.block.group_facet.yml
deleted file mode 100644
index d383dd0cc3..0000000000
--- a/config/sync/block.block.group_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: cf94fd0f-8d17-4fbf-9f2f-388da1a3db5b
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.group
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: group_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -17
-provider: null
-plugin: 'facet_block:group'
-settings:
-  id: 'facet_block:group'
-  label: 'Search page - Group facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.spatial_coverage_facet.yml b/config/sync/block.block.spatial_coverage_facet.yml
deleted file mode 100644
index 9c056bba23..0000000000
--- a/config/sync/block.block.spatial_coverage_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 1da70601-9a66-4756-9564-d4b2f3e5e81d
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.spatial_coverage
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: spatial_coverage_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -15
-provider: null
-plugin: 'facet_block:spatial_coverage'
-settings:
-  id: 'facet_block:spatial_coverage'
-  label: 'Search page - Geographical coverage facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.three_dots_menu.yml b/config/sync/block.block.three_dots_menu.yml
index 0392828e5f..07ccb91c0d 100644
--- a/config/sync/block.block.three_dots_menu.yml
+++ b/config/sync/block.block.three_dots_menu.yml
@@ -2,6 +2,8 @@ uuid: 998c6074-0e67-43ac-b241-615239dee76a
 langcode: en
 status: true
 dependencies:
+  module:
+    - joinup_core
   theme:
     - joinup_theme
 id: three_dots_menu
diff --git a/config/sync/block.block.topic_facet.yml b/config/sync/block.block.topic_facet.yml
deleted file mode 100644
index 8d28878d23..0000000000
--- a/config/sync/block.block.topic_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 976857e9-05a8-4454-8ec8-8974fd527045
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.topic
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: topic_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -16
-provider: null
-plugin: 'facet_block:topic'
-settings:
-  id: 'facet_block:topic'
-  label: 'Search page - Topic facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index e5ff68d9a5..759a10ade7 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -45,6 +45,8 @@ module:
   eu_sic: 0
   eupl: 0
   facets: 0
+  facets_form: 0
+  facets_form_date_range: 0
   facets_summary: 0
   field: 0
   field_delimiter: 0
diff --git a/config/sync/facets.facet.creation_date.yml b/config/sync/facets.facet.creation_date.yml
new file mode 100644
index 0000000000..18d2af5bea
--- /dev/null
+++ b/config/sync/facets.facet.creation_date.yml
@@ -0,0 +1,63 @@
+uuid: d23291d8-c77d-4c38-a3ae-d6c6d900d0c3
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.published
+    - views.view.search
+  module:
+    - search_api
+id: creation_date
+name: 'Creation Date'
+url_alias: creation_date
+weight: 0
+min_count: 1
+show_only_one_result: true
+field_identifier: rdf_created
+facet_source_id: 'search_api:views_page__search__page_1'
+widget:
+  type: facets_form_date_range
+  config:
+    date_type: date
+    label:
+      from: 'Date from'
+      to: 'Date to'
+    date_format:
+      type: date_only
+      custom: ''
+    show_numbers: false
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: -10
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: true
diff --git a/config/sync/facets.facet.group.yml b/config/sync/facets.facet.group.yml
index 92794194b4..5ddc191e5e 100644
--- a/config/sync/facets.facet.group.yml
+++ b/config/sync/facets.facet.group.yml
@@ -16,11 +16,12 @@ show_only_one_result: true
 field_identifier: entity_groups
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: true
     default_option_label: 'Any Collection or Solution'
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: true
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -34,7 +35,7 @@ processor_configs:
     weights:
       sort: -2
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
@@ -52,7 +53,7 @@ processor_configs:
     weights:
       sort: -1
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
diff --git a/config/sync/facets.facet.spatial_coverage.yml b/config/sync/facets.facet.spatial_coverage.yml
index 054557114b..7f1e943a2d 100644
--- a/config/sync/facets.facet.spatial_coverage.yml
+++ b/config/sync/facets.facet.spatial_coverage.yml
@@ -10,17 +10,18 @@ dependencies:
 id: spatial_coverage
 name: 'Geographic coverage'
 url_alias: spatial_coverage
-weight: 0
+weight: -1
 min_count: 1
 show_only_one_result: true
 field_identifier: spatial_coverage
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: true
     default_option_label: 'Any location'
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: true
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -34,36 +35,36 @@ processor_configs:
     weights:
       sort: -8
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
-      build: 0
+      build: -10
     settings: {  }
   count_limit:
     processor_id: count_limit
     weights:
-      build: -2
+      build: 5
     settings:
       minimum_items: 1
       maximum_items: null
   count_widget_order:
     processor_id: count_widget_order
     weights:
-      sort: -9
+      sort: -10
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
-      sort: -10
+      sort: -8
     settings:
       sort: ASC
   url_processor_handler:
     processor_id: url_processor_handler
     weights:
       pre_query: -10
-      build: -1
+      build: 5
     settings: {  }
 empty_behavior:
   behavior: none
diff --git a/config/sync/facets.facet.type.yml b/config/sync/facets.facet.type.yml
index b3f228235f..763987f5d6 100644
--- a/config/sync/facets.facet.type.yml
+++ b/config/sync/facets.facet.type.yml
@@ -8,25 +8,20 @@ dependencies:
   module:
     - search_api
 id: type
-name: Type
+name: 'Content types'
 url_alias: type
-weight: 0
+weight: -2
 min_count: 1
 show_only_one_result: false
 field_identifier: entity_bundle
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: checkbox
+  type: facets_form_dropdown
   config:
+    default_option_label: Choose
+    child_items_prefix: '-'
+    disabled_on_empty: false
     show_numbers: true
-    soft_limit: 0
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    arbitrary_facet_plugin: _none
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -38,7 +33,7 @@ processor_configs:
   aggregated_entity_bundle_label:
     processor_id: aggregated_entity_bundle_label
     weights:
-      build: -10
+      build: 5
     settings:
       plural_count_label:
         enabled: true
@@ -46,10 +41,16 @@ processor_configs:
   count_limit:
     processor_id: count_limit
     weights:
-      build: 0
+      build: -10
     settings:
       minimum_items: 1
       maximum_items: null
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
   joinup_search_content_type_fixed_order:
     processor_id: joinup_search_content_type_fixed_order
     weights:
@@ -64,4 +65,4 @@ processor_configs:
     settings: {  }
 empty_behavior:
   behavior: none
-show_title: false
+show_title: true
diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
index e06737b2db..0675885066 100644
--- a/config/sync/facets_summary.facets_summary.search_facets_summary.yml
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -10,12 +10,6 @@ dependencies:
 id: search_facets_summary
 name: 'Search facets summary'
 facets:
-  group:
-    checked: true
-    label: Collection/Solution
-    separator: ', '
-    weight: 0
-    show_count: false
   spatial_coverage:
     checked: true
     label: 'Geographic coverage'
diff --git a/config/sync/filter.format.essential_html.yml b/config/sync/filter.format.essential_html.yml
index 9bd332877e..efb030f24e 100644
--- a/config/sync/filter.format.essential_html.yml
+++ b/config/sync/filter.format.essential_html.yml
@@ -1,140 +1,58 @@
-uuid: 66d0b8e4-98a3-45d1-8091-b96a313046cb
+uuid: 5e41fc3f-ac9f-4211-89b9-b4052f4eda6e
 langcode: en
 status: true
 dependencies:
-  config:
-    - image.style.wysiwyg_full_width
-    - image.style.wysiwyg_half_width
-    - image.style.wysiwyg_one_third_width
   module:
-    - collection
-    - editor
-    - embed_block
-    - image
     - joinup_video
-    - linkit
     - media
-    - video_embed_wysiwyg
-name: 'Simple HTML'
-format: simple_html
-weight: 3
+_core:
+  default_config_hash: _EOmoFGHhTjV4rORLrzpQZv9C6rnPb8LVLDoNMqBz7Us
+name: 'Essential HTML'
+format: essential_html
+weight: 0
 filters:
   filter_url:
     id: filter_url
     provider: filter
     status: true
-    weight: -50
+    weight: -49
     settings:
       filter_url_length: 72
   filter_html:
     id: filter_html
     provider: filter
     status: true
-    weight: -49
+    weight: -48
     settings:
-      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p> <ul> <li> <ol> <blockquote> <q> <img src alt data-entity-type data-entity-uuid data-image-style>'
+      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p>'
       filter_html_help: false
       filter_html_nofollow: true
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
     status: true
-    weight: -48
-    settings: {  }
-  collection_glossary:
-    id: collection_glossary
-    provider: collection
-    status: false
-    weight: -43
-    settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: -46
-    settings: {  }
-  embed_block:
-    id: embed_block
-    provider: embed_block
-    status: false
-    weight: -42
-    settings: {  }
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: -47
-    settings: {  }
-  filter_html_escape:
-    id: filter_html_escape
-    provider: filter
-    status: false
-    weight: -44
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: false
-    weight: -39
-    settings: {  }
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: false
     weight: -41
     settings: {  }
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: false
-    weight: -40
-    settings: {  }
-  filter_image_style:
-    id: filter_image_style
-    provider: image
-    status: true
-    weight: -45
-    settings:
-      allowed_styles:
-        - wysiwyg_full_width
-        - wysiwyg_half_width
-        - wysiwyg_one_third_width
   joinup_video:
     id: joinup_video
     provider: joinup_video
     status: false
-    weight: -38
+    weight: 0
     settings:
       allowed_providers:
-        internal_path: 0
-        slideshare: 0
-        prezi: 0
         joinup_ec_video: 0
+        internal_path: 0
         google_docs: 0
-        youtube_playlist: 0
-        youtube: 0
+        prezi: 0
+        slideshare: 0
         vimeo: 0
+        youtube: 0
+        youtube_playlist: 0
       autoplay: false
       responsive: true
-  linkit:
-    id: linkit
-    provider: linkit
-    status: false
-    weight: -37
-    settings:
-      title: true
-  media_embed:
-    id: media_embed
-    provider: media
-    status: false
-    weight: -35
-    settings:
-      default_view_mode: default
-      allowed_media_types: {  }
-      allowed_view_modes: {  }
-  video_embed_wysiwyg:
-    id: video_embed_wysiwyg
-    provider: video_embed_wysiwyg
-    status: false
-    weight: -36
+  collection_glossary:
+    id: collection_glossary
+    provider: collection
+    status: true
+    weight: 0
     settings: {  }
diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index bc7f25116c..250ae1b81b 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -71,7 +71,7 @@ Feature: Search inside groups
     # as a chip in the search field the search results should be filtered and
     # only show the content of the collection.
     When I submit the search by pressing enter
-    Then the option with text "Chalet construction   (6)" from select facet "collection/solution" is selected
+    Then the option with text "Chalet construction (6)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Room sizes, Ground plan, Opening of the winter season, Natural materials, Resources, Inclined foundations"
 
     # Check that other types of pages in the collection also show the collection
@@ -117,7 +117,7 @@ Feature: Search inside groups
     # as a chip in the search field the search results should be filtered and
     # only show the content of the solution.
     When I submit the search by pressing enter
-    Then the option with text "Inclined foundations   (6)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
     Then the page should show the tiles "Pre-alpha, Presenting DrillMaster X88, Rock types, Still frozen, Geography, Terrace?"
 
     # Do a search with a keyword. The chip for the solution should be present
@@ -127,7 +127,7 @@ Feature: Search inside groups
     Then the page should show the following chip:
       | Inclined foundations |
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Pre-alpha, Presenting DrillMaster X88"
 
     # Do a search with a keyword after removing the chip for the solution. The
@@ -136,7 +136,6 @@ Feature: Search inside groups
     When I open the search bar by clicking on the search icon
     And I press the remove button on the chip "Inclined foundations"
     And I enter "ground" in the search bar and press enter
-    Then the option with text "Any Collection or Solution" from select facet "collection/solution" is selected
     Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
     # Do a search with a keyword and removing the chip for the solution after
@@ -219,7 +218,7 @@ Feature: Search inside groups
     Then the page should show the following chip:
       | Chalet construction |
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Chalet construction   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Chalet construction (2)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Ground plan, Natural materials"
     And the page should show the following chip in the "Search bar":
       | Chalet construction |
@@ -231,14 +230,14 @@ Feature: Search inside groups
   @javascript
   Scenario: Group filter chips appear in search bar after selecting them in facets
     When I visit the search page
-    Then the option with text "Any Collection or Solution" from select facet "collection/solution" is selected
     And I should see 12 tiles
 
     When I open the search bar by clicking on the search icon
     Then the page should not contain any chips
 
-    When I select "Inclined foundations" from the "collection/solution" select facet
-    Then the option with text "Inclined foundations   (6)" from select facet "collection/solution" is selected
+    When I select "Inclined foundations" from the "collection/solution" select facet form
+    And I click Search in facets form
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
     And I should see 6 tiles
 
     When I open the search bar by clicking on the search icon
@@ -247,7 +246,7 @@ Feature: Search inside groups
 
     # The filter chip should remain active when doing another search.
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
     And I should see 2 tiles
     When I open the search bar by clicking on the search icon
     Then the page should show the following chip in the "Search bar":
diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index a0dae0dfe4..d83540bd65 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -38,32 +38,29 @@ Feature: Global search
     And I should see the "El Celler de Can Roca" tile
     And I should see the "Spherification" tile
     And I should see the "Foam" tile
-    # Facets should be in place.
-    And the option with text "Any topic" from select facet "topic" is selected
     # Terms are sorted alphabetically
-    And the "topic" select facet should contain the following options:
+    And the "topic" select facet form should contain the following options:
       | Any topic               |
       # Parent term.
       | Info                    |
       # Child term.
-      | Statistics and Analysis |
+      | - Statistics and Analysis |
       # Parent term.
       | Social and Political    |
       # Child terms.
-      | Demography              |
-      | E-inclusion             |
+      | - Demography              |
+      | - E-inclusion             |
     # Since the topics are indented by a whitespace, and the whitespaces are trimmed in the step above, we are testing
     # the full response in order to ensure that the results are indented properly. The &nbsp; character below is the
     # printable space character.
-    # @todo and WARNING. The following   character is supported by the old 3.4 selenium server. Change this in the
+    # @todo and WARNING. The following   character is supported by the old 3.4 selenium server. Change this in the
     # new infrastructure with the &nbsp; encoded character.
-    And the response should contain "<option value=\"/search?f%5B0%5D=topic%3Ahttp%3A//joinup.eu/ontology/topic/category%23info\"> Info</option>"
-    And the response should contain "<option value=\"/search?f%5B0%5D=topic%3Ahttp%3A//joinup.eu/ontology/topic%23statistics-and-analysis\">  Statistics and Analysis</option>"
-    And the response should contain "<option value=\"/search?f%5B0%5D=topic%3Ahttp%3A//joinup.eu/ontology/topic/category%23social-and-political\"> Social and Political</option>"
-    And the response should contain "<option value=\"/search?f%5B0%5D=topic%3Ahttp%3A//joinup.eu/ontology/topic%23demography\">  Demography</option>"
-    And the response should contain "<option value=\"/search?f%5B0%5D=topic%3Ahttp%3A//joinup.eu/ontology/topic%23e-inclusion\">  E-inclusion</option>"
-    And the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#info\">Info</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#statistics-and-analysis\">- Statistics and Analysis</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#social-and-political\">Social and Political</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#demography\">- Demography</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#e-inclusion\">- E-inclusion</option></select>"
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | Belgium (1)        |
       | European Union (1) |
@@ -72,15 +69,16 @@ Feature: Global search
     # Joinup there were two search fields, but this was confusing users.
     And there should be exactly 1 "search field" on the page
 
-    When I select "Social and Political" from the "topic" select facet
-    Then the option with text "Social and Political" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic               |
-      | Info                    |
-      | Statistics and Analysis |
-      | Social and Political    |
-      | Demography              |
-      | E-inclusion             |
+    When I select "Social and Political" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "Social and Political" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
     # The tiles appear because the parent term is selected even though they do not have a direct reference there.
     And I should see the "Dummy news 1" tile
     And I should see the "Dummy news 2" tile
@@ -88,19 +86,20 @@ Feature: Global search
     And I should see the "Dummy news 4" tile
 
     # Test the topic facet. The space prefixing "Demography" is due to the hierarchy.
-    When I select " Demography" from the "topic" select facet
-    Then the option with text "Demography" from select facet "topic" is selected
+    When I select " Demography" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "- Demography" from select facet form "topic" is selected
     # The selected option moves to the last position by default.
-    And the "topic" select facet should contain the following options:
-      | Any topic               |
-      | Info                    |
-      | Statistics and Analysis |
-      | Social and Political    |
-      | Demography              |
-      | E-inclusion             |
-
-    Then the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
+
+    #Then the option with text "Any location" from select facet form "spatial coverage" is selected
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | Belgium (1)        |
       | European Union (1) |
@@ -110,17 +109,18 @@ Feature: Global search
     And I should not see the "Foam" tile
 
     # Test the spatial coverage facet.
-    When I select "Belgium" from the "spatial coverage" select facet
-    Then the option with text "Belgium (1)" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
+    When I select "Belgium" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Belgium (1)" from select facet form "spatial coverage" is selected
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | Belgium (1)        |
       | European Union (1) |
-    Then the option with text "Demography" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
+    Then the option with text "- Demography" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
       | Any topic            |
       | Social and Political |
-      | Demography           |
+      | - Demography         |
     And I should see the "Molecular cooking collection" tile
     But I should not see the "El Celler de Can Roca" tile
     And I should not see the "Spherification" tile
@@ -131,22 +131,29 @@ Feature: Global search
     Then I should see the text "Content types" in the "Left sidebar" region
 
     # Select link in the 'type' facet.
-    When I check the "News (5)" checkbox from the "Content types" facet
-    Then the "News" content checkbox item should be selected
-    And the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (5)"
-
-    When I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then the "Solutions" content checkbox item should be selected
-    And the "News" content checkbox item should be selected
-    Then the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (5)"
-    And the "topic" select facet should contain the following options:
-      | Any topic               |
-      | Info                    |
-      | Statistics and Analysis |
-      | Social and Political    |
-      | Demography              |
-      | E-inclusion             |
-    And the "spatial coverage" select facet should contain the following options:
+    When I check the "News (5)" checkbox from the "Content types" facet form
+    And I click Search in facets form
+    Then the option with text "News (5)" from select facet form "Content types" is selected
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+
+    When I check the "Solutions (2)" checkbox from the "Content types" facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News, Solutions"
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | European Union (1) |
       | Luxembourg (5)     |
@@ -184,18 +191,19 @@ Feature: Global search
       | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
 
     When I visit the search page
-    And the "spatial coverage" select facet should contain the following options:
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-    When I select "Luxembourg" from the "spatial coverage" select facet
-    Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
+      | Greece (1)       |
+      | Luxembourg (2)   |
+    When I select "Luxembourg" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Luxembourg (2)" from select facet form "spatial coverage" is selected
     And I should see the text "Search Results (2)"
     # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
-    And the "spatial coverage" select facet should contain the following options:
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
+      | Greece (1)       |
+      | Luxembourg (2)   |
 
   Scenario: Content can be found with a full-text search.
     Given the following owner:
@@ -245,7 +253,17 @@ Feature: Global search
       | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
 
     When I visit the search page
-    Then the "Content types" checkbox facet should allow selecting the following values "Collections (2), Solution (1), News (1), Events (2), Document (1), Discussion (1), Release (1), Custom page (1), Licence (1), Video (1)"
+    And the "Content types" select facet form should contain the following options:
+      | Collections (2)	|
+      | Custom page (1)	|
+      | Discussion (1)	|
+      | Document (1)		|
+      | Events (2)		  |
+      | Licence (1)		  |
+      | News (1)			  |
+      | Release (1)		  |
+      | Solution (1)		|
+      | Video (1)			  |
 
     # "Alpha" is used in all the rdf entities titles.
     When I enter "Alpha" in the search bar and press enter
@@ -615,15 +633,21 @@ Feature: Global search
 
     Given I am logged in as a user with the "authenticated" role
     When I visit the search page
-    And I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then I check the "News (5)" checkbox from the "Content types" facet
-    And I should see the following facet summary "Solutions, News"
-
-    Then I check the "Solutions (2)" checkbox from the "Content types" facet
+    And I select "Solutions (2)" from the "Content types" select facet form
+    And I select "News (5)" option in the "Content types" select facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News, Solutions"
+
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I click Search in facets form
     And I should see the following facet summary "News"
 
     # Check if facet summary was remove correctly.
-    Then I check the "Collection (1)" checkbox from the "Content types" facet
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I select "Collection (1)" option in the "Content types" select facet form
+    And I click Search in facets form
     And I should see the following facet summary "Collection, News"
     Then I should remove the following facet summary "News"
     And the page should show only the tiles "Radio cooking collection"
diff --git a/tests/features/joinup_search/search.feature.orig b/tests/features/joinup_search/search.feature.orig
deleted file mode 100644
index c0cfe36d63..0000000000
--- a/tests/features/joinup_search/search.feature.orig
+++ /dev/null
@@ -1,543 +0,0 @@
-@api @terms @group-b
-Feature: Global search
-  As a user of the site I can find content through the global search.
-
-  # Todo: This test runs with javascript enabled because in a non-javascript
-  # environment, the dropdown facet is simply a list of links. Remove the
-  # `@javascript` tag when the upstream issue in the Facets module is fixed.
-  # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-5739
-  # Ref. https://www.drupal.org/project/facets/issues/2937191
-  @javascript
-  Scenario: Anonymous user can find items
-    Given the following collection:
-      | title            | Molecular cooking collection |
-      | logo             | logo.png                     |
-      | moderation       | no                           |
-      | topic            | Demography                   |
-      | spatial coverage | Belgium                      |
-      | state            | validated                    |
-    And the following solutions:
-      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
-      | Spherification | Molecular cooking collection | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
-      | Foam           | Molecular cooking collection | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
-    And news content:
-      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
-      | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
-
-    Given I am logged in as a user with the "authenticated" role
-    # @todo The search page cache should be cleared when new content is added.
-    # @see https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-3428
-    And the cache has been cleared
-    When I visit the search page
-    # All content is visible.
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    And I should see the "Spherification" tile
-    And I should see the "Foam" tile
-    # Facets should be in place.
-    And the option with text "Any topic" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (2)              |
-      | Statistics and Analysis   (1) |
-    And the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
-    # Check that only one search field is available. In an earlier version of
-    # Joinup there were two search fields, but this was confusing users.
-    And there should be exactly 1 "search field" on the page
-
-    # Test the topic facet.
-    When I select "Demography" from the "topic" select facet
-    Then the option with text "Demography   (2)" from select facet "topic" is selected
-    # The selected option moves to the last position by default.
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Statistics and Analysis   (1) |
-      | Demography   (2)              |
-    Then the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-    And I should see the "Molecular cooking collection" tile
-    And I should see the "Spherification" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Foam" tile
-
-    # Test the spatial coverage facet.
-    When I select "Belgium" from the "spatial coverage" select facet
-    Then the option with text "Belgium   (1)" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-    Then the option with text "Demography   (1)" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic        |
-      | Demography   (1) |
-    And I should see the "Molecular cooking collection" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Spherification" tile
-    And I should not see the "Foam" tile
-
-    # Reset the search by visiting again the search page.
-    Given I am on the search page
-    Then I should see the text "Content types" in the "Left sidebar" region
-
-    # Select link in the 'type' facet.
-    When I check the "News (1)" checkbox from the "Content types" facet
-    Then the "News" content checkbox item should be selected
-    And the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-
-    When I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then the "Solutions" content checkbox item should be selected
-    And the "News" content checkbox item should be selected
-    Then the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (1)              |
-      | Statistics and Analysis   (1) |
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
-    And I should not see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    But I should see the "Spherification" tile
-    And I should see the "Foam" tile
-
-    # Launch a text search.
-    When I open the search bar by clicking on the search icon
-    And I enter "Cooking" in the search bar and press enter
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "Foam" tile
-    But I should not see the "Spherification" tile
-    And I should not see the "El Celler de Can Roca" tile
-
-  @javascript
-  Scenario: Alphabetical order for the spatial coverage in the search page.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And event content:
-      | title             | short title       | body                                | spatial coverage | agenda         | location       | organisation        | scope         | keywords | collection       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Greece           | Event agenda.  | Some place     | European Commission | International | Alphabet | Collection alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | Luxembourg       | To be planned. | Event location | Event organisation  |               |          | Collection alpha | validated |
-    And document content:
-      | title          | document type | short title          | body                                    | spatial coverage | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
-
-    When I visit the search page
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-    When I select "Luxembourg" from the "spatial coverage" select facet
-    Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
-    # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-
-  Scenario: Content can be found with a full-text search.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And the following solutions:
-      | title          | description                                                | keywords | owner             | contact information | collection  | state     |
-      | Solution alpha | <p>This is the solution <strong>beta</strong> description. | Alphabet | Responsible owner | Go-to contact       | Col for Sol | validated |
-    And the following releases:
-      | title         | release number | release notes                               | keywords | is version of  | owner             | contact information | state     |
-      | Release Alpha | 1              | <p>Release notes for <em>beta</em> changes. | Alphabet | Solution alpha | Responsible owner | Go-to contact       | validated |
-    And the following distributions:
-      | title              | description                                    | parent        | access url |
-      | Distribution alpha | <p>A simple beta distribution description.</p> | Release Alpha | test.zip   |
-    And the following licences:
-      | title         | description                         |
-      | Licence Alpha | A beta description for the licence. |
-    And news content:
-      | title      | headline            | body                      | keywords | collection       | state     |
-      | News omega | News headline delta | The epsilon news content. | Alphabet | Collection alpha | validated |
-    And event content:
-      | title             | short title       | body                                | agenda         | location       | organisation        | scope         | keywords | collection       | solution       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Event agenda.  | Some place     | European Commission | International | Alphabet |                  | Solution alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | To be planned. | Event location | Event organisation  |               |          | Collection alpha |                | validated |
-    And document content:
-      | title          | document type | short title          | body                                    | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Alphabet | Collection alpha | validated |
-    And discussion content:
-      | title            | body                                                              | solution       | state     |
-      | Discussion omega | <p>Does anybody has idea why this <em>epsilon</em> is everywhere? | Solution alpha | validated |
-    And custom_page content:
-      | title      | body                                     | collection       |
-      | Page omega | This is just an epsilon but should work. | Collection alpha |
-    And video content:
-      | title       | body          | field_video                                 | collection       |
-      | Video alpha | Slap like now | https://www.youtube.com/watch?v=JhGf8ZY0tN8 | Collection alpha |
-    And users:
-      | Username     | E-mail                      | First name | Family name | Organisation |
-      | jenlyle      | jenessa.carlyle@example.com | Jenessa    | Carlyle     | Clyffco      |
-      | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
-
-    When I visit the search page
-    Then the "Content types" checkbox facet should allow selecting the following values "Collections (2), Solution (1), News (1), Events (2), Document (1), Discussion (1), Release (1), Custom page (1), Licence (1), Video (1)"
-
-    # "Alpha" is used in all the rdf entities titles.
-    When I enter "Alpha" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
-
-    # "Omega" is used in all the node entities titles. Since the content of
-    # custom pages is added to their collection, we also match the collection.
-    When I enter "omega" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Beta" is used in all the rdf entities body fields.
-    When I enter "beta" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
-
-    # "Epsilon" is used in all the node entities body fields.
-    When I enter "epsilon" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Alphabet" is used in all the keywords fields.
-    When I enter "Alphabet" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha, News omega, Event Omega, Document omega"
-
-    # "Gamma" is used in the collection abstract.
-    When I enter "gamma" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha"
-
-    # "Delta" is used in headline and short titles.
-    When I enter "delta" in the search bar and press enter
-    Then the page should show the tiles "News omega, Event Omega, Document omega"
-
-    # Search for the event fields: agenda, location, address, organisation, scope.
-    When I enter "agenda" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "location" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "place" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "organisation" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "international" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-
-    # The owner and contact information names should be indexed inside the solutions/releases they are linked to.
-    When I enter "responsible" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-    # Visit the homepage to be sure that the test fetches the correct updated page.
-    When I go to the homepage
-    And I enter "contact" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-
-    # Users should be found by first name, family name and organisation.
-    When I enter "Jenessa" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "freeman" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-    When I enter "clyffco" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "Omero+snc" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-
-  Scenario: Advanced search
-    # An advanced search link is shown in the header, except on the home page
-    # and the search page.
-    Given I am on the homepage
-    Then I should not see the link "Advanced search"
-    Given I visit the collection overview
-    Then I should see the link "Advanced search"
-    When I click "Advanced search"
-    Then I should be on the advanced search page
-    But I should not see the link "Advanced search"
-
-  Scenario: Collections and solutions are shown first in search results with the same relevance.
-    Given collections:
-      | title                           | description                         | state     |
-      | Ornithology: the study of birds | Ornithology is a branch of zoology. | validated |
-      | Husky Flying Xylophone          | A strange instrument.               | validated |
-    And the following solution:
-      | title       | Bird outposts in the wild            |
-      | collection  | Ornithology: the study of birds      |
-      | description | Exotic wings and where to find them. |
-      | state       | validated                            |
-    And custom_page content:
-      | title           | body                                  | collection                      |
-      | Disturbed birds | Flocks of trained pigeons flying off. | Ornithology: the study of birds |
-    And news content:
-      | title                               | body                            | collection                      | state     |
-      | Chickens are small birds            | Birds domesticated in India.    | Ornithology: the study of birds | validated |
-      | Found a xylophone from 1600 in Asia | Oldest instrument of this type. | Husky Flying Xylophone          | validated |
-    And event content:
-      | title         | body                   | collection                      | state     |
-      | Bird spotting | Roosters crow at dawn. | Ornithology: the study of birds | validated |
-    And discussion content:
-      | title                             | body                    | collection                      | state     |
-      | Best place to find an exotic bird | Somewhere exotic maybe? | Ornithology: the study of birds | validated |
-    And user:
-      | Username    | Bird watcher |
-      | First name  | Bird         |
-      | Family name | Birdman      |
-
-    # The bird is the word... to search.
-    When I enter "Bird" in the search bar and press enter
-    Then I should see the following tiles in the correct order:
-      | Ornithology: the study of birds   |
-      | Bird outposts in the wild         |
-      | Disturbed birds                   |
-      | Chickens are small birds          |
-      | Bird spotting                     |
-      | Best place to find an exotic bird |
-      | Bird Birdman                      |
-
-  @clearStaticCache
-  Scenario: Solutions and/or releases are found by their distribution keyword.
-    Given the following licences:
-      | title      |
-      | Apache-2.0 |
-      | LGPL       |
-    And the following solution:
-      | title | Zzolution |
-      | state | validated |
-
-    When I enter "ZzoluDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add distribution, child of solution.
-    Given the following distribution:
-      | title                    | ZzoluDistro                     |
-      | parent                   | Zzolution                       |
-      | description              | Übermensch foot size            |
-      | access url               | http://example.com/zzolu-distro |
-      | licence                  | Apache-2.0                      |
-      | format                   | HTML                            |
-      | representation technique | Datalog                         |
-
-    When I enter "zzoludistro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "ubermensch" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Zzolution"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ZzoluDistro" distribution
-    And I fill in "Title" with "DistroZzolu"
-    And I fill in "Description" with "Nietzsche's"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/guzzle" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-    Then I should see the heading "DistroZzolu"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "zzoludistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "ubermensch" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "nietzsche" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "guzzle" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "lGPL" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Zzolution"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I delete the "DistroZzolu" asset distribution
-
-    # The parent solution has been re-indexed without distribution data.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "nietzsche" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "guzzle" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add a new distribution, child of a release.
-    Given the following release:
-      | title         | Releazz   |
-      | state         | validated |
-      | is version of | Zzolution |
-
-    When I enter "ReleazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    Given the following distribution:
-      | title                    | ReleazzDistro                     |
-      | parent                   | Releazz                           |
-      | description              | Dracula                           |
-      | access url               | http://example.com/releazz-distro |
-      | licence                  | Apache-2.0                        |
-      | format                   | HTML                              |
-      | representation technique | Datalog                           |
-
-    When I enter "releazzDistro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "dracula" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "releazz-distro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Releazz"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ReleazzDistro" distribution
-    And I fill in "Title" with "DistroReleazz"
-    And I fill in "Description" with "Zorro"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/mishmash" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "releazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "dracula" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "releazz-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "zoRRo" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "mishMash" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "LGpl" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Releazz"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I delete the "DistroReleazz" asset distribution
-
-    # The parent release has been re-indexed without distribution data.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zoRRo" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "mishMash" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-  Scenario: Collections are found by their keywords.
-    Given the following collection:
-      | title    | Collection sample       |
-      | keywords | unique, key-definitions |
-      | state    | validated               |
-
-    When I enter "key-definitions" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
-
-    When I enter "unique" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
-
-  @javascript
-  Scenario: Users are able to select the sort order.
-    Given collections:
-      | title             | description       | state     |
-      | Custom collection | Some custom data. | validated |
-    And news content:
-      | title                              | body                                                              | collection        | state     | created    | changed    |
-      | Relativity is the word             | No one cares about the body.                                      | Custom collection | validated | 01/01/2019 | 03/08/2019 |
-      | Relativity news: Relativity theory | I do care about the relativity keyword in the body.               | Custom collection | validated | 02/01/2019 | 02/08/2019 |
-      | Absolutely nonesense               | Some news are not worth it but I will add relativity here anyway. | Custom collection | validated | 03/01/2019 | 01/08/2019 |
-
-    When I am on the homepage
-    And I enter "Relativity" in the search bar and press enter
-    Then the option "Relevance" should be selected
-    And I should see the following tiles in the correct order:
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=relevance"
-
-    Given I select "Creation Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Absolutely nonesense               |
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-    And I should be on "/search?keys=Relativity&sort_by=creation-date"
-
-    Given I select "Last Updated Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Relativity is the word             |
-      | Relativity news: Relativity theory |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
diff --git a/tests/src/Traits/TraversingTrait.php b/tests/src/Traits/TraversingTrait.php
index 69ca17ba98..5063b32a50 100644
--- a/tests/src/Traits/TraversingTrait.php
+++ b/tests/src/Traits/TraversingTrait.php
@@ -329,6 +329,8 @@ protected function getListingByHeading(string $type, string $heading): NodeEleme
    *   This can be useful in cases where the data drupal facet id is placed in
    *   more than one html tag e.g. the dropdown has the id placed in both the
    *   <li> tag of links as well as the <select> element.
+   * @param bool $facet_form
+   *   (optional) Check if is a facet form element.
    *
    * @return \Behat\Mink\Element\NodeElement
    *   The facet node element.
@@ -336,12 +338,17 @@ protected function getListingByHeading(string $type, string $heading): NodeEleme
    * @throws \Exception
    *   Thrown when the facet is not found in the designated area.
    */
-  protected function findFacetByAlias(string $alias, ?NodeElement $region = NULL, string $html_tag = '*'): NodeElement {
+  protected function findFacetByAlias(string $alias, ?NodeElement $region = NULL, string $html_tag = '*', bool $facet_form = FALSE): NodeElement {
     if ($region === NULL) {
       $region = $this->getSession()->getPage();
     }
     $facet_id = self::getFacetIdFromAlias($alias);
-    $element = $region->find('xpath', "//{$html_tag}[@data-drupal-facet-id='{$facet_id}']");
+    if ($facet_form) {
+      $element = $region->find('xpath', "//{$html_tag}[@data-drupal-selector='{$facet_id}']");
+    }
+    else {
+      $element = $region->find('xpath', "//{$html_tag}[@data-drupal-facet-id='{$facet_id}']");
+    }
 
     if (!$element) {
       throw new \Exception("The facet '$alias' was not found in the page.");
@@ -368,18 +375,18 @@ protected static function getFacetIdFromAlias(string $alias): string {
     $mappings = [
       'collection type' => 'collection_type',
       'collection topic' => 'collection_topic',
-      'collection/solution' => 'group',
-      'topic' => 'topic',
+      'collection/solution' => 'edit-group',
+      'topic' => 'edit-topic',
       'solution topic' => 'solution_topic',
       'solution spatial coverage' => 'solution_spatial_coverage',
-      'spatial coverage' => 'spatial_coverage',
+      'spatial coverage' => 'edit-spatial-coverage',
       'My solutions content' => 'solution_my_content',
       'My collections content' => 'collection_my_content',
       'My content' => 'content_my_content',
       'Event date' => 'event_date',
       'EIF recommendations' => 'category',
       'Collection event date' => 'collection_event_type',
-      'Content types' => 'type',
+      'Content types' => 'edit-type',
       'eif principle' => 'principle',
       'eif interoperability layer' => 'interoperability_layer',
       'eif conceptual model' => 'conceptual_model',
diff --git a/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module b/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
index 174d19b926..1ea2873b26 100644
--- a/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
+++ b/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
@@ -207,10 +207,14 @@ function search_api_arbitrary_facet_search_api_solr_search_results_alter(ResultS
  * Implements hook_field_widget_info_alter().
  */
 function search_api_arbitrary_facet_widget_plugin_info_alter(array &$info) {
+  // Set providers to exclude from Arbitrary Facet Widget.
+  $providers = ['facets_form', 'facets_form_date_range'];
   foreach ($info as &$widget_info) {
     // Decorate all widgets with the arbitrary facet decorator.
-    $widget_info['decorated_class'] = $widget_info['class'];
-    $widget_info['class'] = '\Drupal\search_api_arbitrary_facet\ArbitraryFacetWidgetDecorator';
+    if (!in_array($widget_info['provider'], $providers)) {
+      $widget_info['decorated_class'] = $widget_info['class'];
+      $widget_info['class'] = '\Drupal\search_api_arbitrary_facet\ArbitraryFacetWidgetDecorator';
+    }
   }
 }
 
diff --git a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
index 7ca906c154..c25123da20 100644
--- a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
+++ b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
@@ -73,6 +73,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         }
       }
 
+      $plugin_derivatives = [];
       $fs = FieldStorageConfig::loadMultiple($ids);
       /** @var \Drupal\field\Entity\FieldStorageConfig $field_config */
       foreach ($fs as $id => $field_config) {

From d24dbc18281d0e3ce3ffca19c5fc9db9b481cb20 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 12:35:57 +0100
Subject: [PATCH 04/20] EPIC-6572: Update code that was botched when merging
 the homepage.

---
 .../sync/block.block.ventuno_group_facet.yml  |  29 ---
 tests/features/homepage.feature               |  20 +-
 tests/features/solution/homepage.feature      |   4 +-
 tests/src/Context/JoinupSearchContext.php     | 185 ++++++++++++++++++
 .../joinup/scss/components/_listing.scss      |  11 ++
 5 files changed, 208 insertions(+), 41 deletions(-)
 delete mode 100644 config/sync/block.block.ventuno_group_facet.yml

diff --git a/config/sync/block.block.ventuno_group_facet.yml b/config/sync/block.block.ventuno_group_facet.yml
deleted file mode 100644
index 5a3497168b..0000000000
--- a/config/sync/block.block.ventuno_group_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: ad14eb15-5005-494e-a0f3-673b83a9af32
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.group
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - ventuno
-id: ventuno_group_facet
-theme: ventuno
-region: sidebar
-weight: -21
-provider: null
-plugin: 'facet_block:group'
-settings:
-  id: 'facet_block:group'
-  label: 'Search page - Group facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/tests/features/homepage.feature b/tests/features/homepage.feature
index a489c49ee2..89866e4575 100644
--- a/tests/features/homepage.feature
+++ b/tests/features/homepage.feature
@@ -48,7 +48,7 @@ Feature: Homepage
     #   page instead.
     When I click "Finance in EU"
     Then I should be on the advanced search page
-    And the option with text "Finance in EU" from select facet "topic" is selected
+    And the option with text "Finance in EU" from select facet form "topic" is selected
 
     # There is a "More news" link that for the moment leads to the search page
     # pre-filtered on news articles. In the future this will become a dedicated
@@ -56,7 +56,7 @@ Feature: Homepage
     Given I am on the homepage
     When I click "More news"
     Then I should be on the advanced search page
-    And the "News" content checkbox item should be selected
+    And I should see the following facet summary "News"
     And the page should show the tiles "Current biodiversity crisis, Environmental stewardship, Spatial reconstruction, Earlier transformations"
 
   @terms
@@ -108,7 +108,7 @@ Feature: Homepage
     And I should see the link "More solutions"
     When I click "More solutions"
     Then I should be on the advanced search page
-    And the "Solution" content checkbox item should be selected
+    And I should see the following facet summary "Solution"
 
   Scenario: An event can be highlighted on the homepage
     Given event content:
@@ -152,7 +152,7 @@ Feature: Homepage
     Given I am on the homepage
     When I click "More events"
     Then I should be on the advanced search page
-    And the "Event" content checkbox item should be selected
+    And I should see the following facet summary "Event"
     And I should see the "Florentine steak festival" tile
 
   @version
@@ -203,7 +203,7 @@ Feature: Homepage
     And I should see the link "E-justice" in the "Discover topics block"
     When I click "E-justice"
     Then I should be on the advanced search page
-    And the option with text "E-justice" from select facet "topic" is selected
+    And the option with text "E-justice" from select facet form "topic" is selected
 
     # See more topics modal.
     When I am on the homepage
@@ -231,7 +231,7 @@ Feature: Homepage
       | Social and Political |
     When I click "E-health Dpt." in the "Modal content"
     Then I should be on the advanced search page
-    And the option with text "E-health Dpt." from select facet "topic" is selected
+    And the option with text "E-health Dpt." from select facet form "topic" is selected
     And the page should show the tiles "Internet medicine"
 
     Examples:
@@ -354,19 +354,19 @@ Feature: Homepage
 
     When I click "See more solutions"
     Then I should be on the advanced search page
-    And the "Solutions" content checkbox item should be selected
+    And I should see the following facet summary "Solutions"
 
     When I am on the homepage
     And I click "See more collections"
     Then I should be on the advanced search page
-    And the "Collections" content checkbox item should be selected
+    And I should see the following facet summary "Collections"
 
     When I am on the homepage
     And I click "See more news"
     Then I should be on the advanced search page
-    And the "News" content checkbox item should be selected
+    And I should see the following facet summary "News"
 
     When I am on the homepage
     And I click "See more events"
     Then I should be on the advanced search page
-    And the "Events" content checkbox item should be selected
+    And I should see the following facet summary "Events"
diff --git a/tests/features/solution/homepage.feature b/tests/features/solution/homepage.feature
index b585279ab8..0f36fb957d 100644
--- a/tests/features/solution/homepage.feature
+++ b/tests/features/solution/homepage.feature
@@ -176,5 +176,5 @@ Feature: Solution homepage
     And I should not see the link "Supplier exchange"
     When I click "HR"
     Then the url should match "/search"
-    Then the option with text "HR" from select facet "topic" is selected
-    Then the "Solution" content checkbox item should be selected
+    Then the option with text "- HR" from select facet form "topic" is selected
+    Then I should see the following facet summary "HR, Solution"
diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index 4b7c131423..a5a18d7962 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -273,6 +273,42 @@ public function iSelectAnOptionFromFacet(string $select, string $facet): void {
     $facet->selectOption($select);
   }
 
+  /**
+   * Clicks a facet item in an inline facet form.
+   *
+   * @param string $select
+   *   The option to select.
+   * @param string $facet
+   *   The facet alias.
+   *
+   * @throws \Exception
+   *   Thrown when the facet or the link inside the facet is not found.
+   *
+   * @When I select :option from the :facet select facet form
+   */
+  public function iSelectAnOptionFromFacetForm(string $select, string $facet): void {
+    $facet = $this->findFacetByAlias($facet, NULL, 'select', TRUE);
+    $facet->selectOption($select);
+  }
+
+  /**
+   * Clicks in more facet items in an inline facet form.
+   *
+   * @param string $select
+   *   The option to select.
+   * @param string $facet
+   *   The facet alias.
+   *
+   * @throws \Exception
+   *   Thrown when the facet or the link inside the facet is not found.
+   *
+   * @When I select :option option in the :facet select facet form
+   */
+  public function iSelectOtherOptionFromFacetForm(string $select, string $facet): void {
+    $facet = $this->findFacetByAlias($facet, NULL, 'select', TRUE);
+    $facet->selectOption($select, TRUE);
+  }
+
   /**
    * Asserts a selected option in the .
    *
@@ -311,6 +347,40 @@ public function assertSelectFacetOptionSelected(string $option, string $select):
     }
   }
 
+  /**
+   * Asserts a selected option in the select facets form.
+   *
+   * @param string $option
+   *   Text value of the option to find.
+   * @param string $select
+   *   Title of the select field.
+   *
+   * @throws \Exception
+   *    Throws an exception when the select is not found in page.
+   *
+   * @Then the option with text :option from select facet form :select is selected
+   */
+  public function assertSelectFacetFormOptionSelected(string $option, string $select): void {
+    $element = $this->findFacetByAlias($select, NULL, 'select', TRUE);
+    if (!$element) {
+      throw new \Exception(sprintf('The select "%s" was not found in the page %s', $select, $this->getSession()->getCurrentUrl()));
+    }
+    if ($this->browserSupportsJavaScript()) {
+      $this->assertSelectedOption($element, $option);
+    }
+    else {
+      $selected_option = $element->find('css', 'a.is-active');
+      if ($selected_option instanceof NodeElement) {
+        $text = $selected_option->getText();
+        // Selected facet options are prefixed with '(-) '. Strip this.
+        $text = preg_replace('/^\(-\) /', '', $text);
+        // Ignore duplicate whitespace.
+        $option = preg_replace('/\s{2,}/', ' ', $option);
+        Assert::assertSame($option, $text, sprintf('The option "%s" is selected in the "%s" facet, but the option "%s" was expected.', $text, $select, $option));
+      }
+    }
+  }
+
   /**
    * Asserts the list of available options in a select facet.
    *
@@ -347,6 +417,25 @@ public function assertSelectOptionsAsList($select, TableNode $table) {
     $this->assertSelectAvailableOptions($element, $table);
   }
 
+  /**
+   * Asserts the list of available options in a facet form select box.
+   *
+   * @param string $select
+   *   The name of the field element.
+   * @param \Behat\Gherkin\Node\TableNode $table
+   *   The available list of options.
+   *
+   * @throws \Exception
+   *    Throws an exception when the select is not found or options are not
+   *    identical.
+   *
+   * @Then the :select select facet form should contain the following options:
+   */
+  public function assertSelectFacetFormOptionsAsList($select, TableNode $table) {
+    $element = $this->findFacetByAlias($select, NULL, 'select', TRUE);
+    $this->assertSelectAvailableOptions($element, $table);
+  }
+
   /**
    * Checks a checkbox link in a facet.
    *
@@ -374,6 +463,47 @@ public function checkCheckboxFacet(string $option, string $facet_type): void {
     throw new \Exception("The option '{$option}' was not found in the '{$facet_type}' facet.");
   }
 
+  /**
+   * Checks a checkbox in a facet form.
+   *
+   * @param string $option
+   *   The label of the checkbox.
+   * @param string $facet_type
+   *   The label of the facet.
+   *
+   * @throws \Exception
+   *   Thrown when the checkbox is not found.
+   *
+   * @Given I check the :option checkbox from the :facet_type facet form
+   */
+  public function checkCheckboxFacetForm(string $option, string $facet_type): void {
+    $facet = $this->findFacetByAlias($facet_type, NULL, '*', TRUE);
+    /** @var \Behat\Mink\Element\NodeElement[] $node_elements */
+    $node_elements = $facet->findAll('xpath', '//option');
+    foreach ($node_elements as $node_element) {
+      if ($node_element->getText() === $option) {
+        $node_element->click();
+        return;
+      }
+    }
+
+    throw new \Exception("The option '{$option}' was not found in the '{$facet_type}' facet.");
+  }
+
+  /**
+   * Facets form action buttons.
+   *
+   * @param string $name
+   *   The label of the input.
+   *
+   * @Given I click :name in facets form
+   */
+  public function iClickActionsInFacetsForm(string $name) {
+    $region = $this->getSession()->getPage();
+    $element = $region->find('xpath', "//input[@value='{$name}']");
+    $element->click();
+  }
+
   /**
    * Opens the dropdown for the given facet element.
    *
@@ -685,4 +815,59 @@ public function removeFacetSummary(string $label): void {
     $element->click();
   }
 
+  /**
+   * Asserts that certain facet summary items are shown on the page.
+   *
+   * @param string $labels
+   *   A comma-separated list of facet item labels.
+   *
+   * @throws \Exception
+   *   Thrown when a wanted facet item is not shown in the page.
+   *
+   * @When I should see the following facet summary :labels
+   */
+  public function assertFacetSummary(string $labels): void {
+    $labels = $this->explodeCommaSeparatedStepArgument($labels);
+    $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block-facets-summary-blocksearch-facets-summary ')]//li[contains(concat(' ', normalize-space(@class), ' '), ' facet-summary-item--facet ')]";
+    $elements = $this->getSession()->getPage()->findAll('xpath', $xpath);
+    $present = $present_labels = [];
+
+    /** @var \Behat\Mink\Element\NodeElement $element */
+    foreach ($elements as $element) {
+      $present[] = $element->getText();
+    }
+
+    // Add label close in front of label.
+    foreach ($labels as $label) {
+      $present_labels[] = $label . ' close';
+    }
+
+    $present = array_map('trim', $present);
+    $present_labels = array_map('trim', $present_labels);
+    Assert::assertEquals($present_labels, $present);
+  }
+
+  /**
+   * Remove facet summary item that are on the page.
+   *
+   * @param string $label
+   *   A facet summary item label.
+   *
+   * @throws \Exception
+   *   Thrown when a wanted facet item is not shown in the page.
+   *
+   * @When I should remove the following facet summary :label
+   */
+  public function removeFacetSummary(string $label): void {
+
+    $xpath = '//div[contains(concat(" ", normalize-space(@class), " "), " block-facets-summary-blocksearch-facets-summary ")]//span[text()="' . $label . '"]';
+    $element = $this->getSession()->getPage()->find('xpath', $xpath);
+
+    if (empty($element)) {
+      throw new \Exception("The $label facet summary item was not found in the page.");
+    }
+
+    $element->click();
+  }
+
 }
diff --git a/web/themes/joinup/scss/components/_listing.scss b/web/themes/joinup/scss/components/_listing.scss
index 76a50ff5f7..70cf937bf0 100644
--- a/web/themes/joinup/scss/components/_listing.scss
+++ b/web/themes/joinup/scss/components/_listing.scss
@@ -220,6 +220,17 @@
   }
 }
 
+.listing__facets {
+  display: flex;
+  padding-left: 0;
+
+  li {
+    list-style: none;
+    padding-left: 0;
+    margin-left: 1rem;
+  }
+}
+
 // Modifiers
 // --------------------------------------------------
 .listing__image--default {

From 5ad4dd1a31103622e72c3b8c65255113dff94488 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 12:39:25 +0100
Subject: [PATCH 05/20] EPIC-6572: Remove drupal/facets_form patch.

---
 composer.json | 5 +----
 composer.lock | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 25fccc6b17..553e20e6e3 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "drupal/entityqueue": "^1.2",
         "drupal/error_page": "^1.0",
         "drupal/facets": "1.6.0",
-        "drupal/facets_form": "1.x-dev@dev",
+        "drupal/facets_form": "dev-1.x",
         "drupal/field_delimiter": "^1.1",
         "drupal/field_formatter_range": "^1.1",
         "drupal/field_group": "^3.1",
@@ -301,9 +301,6 @@
                 "Configurable dropdown child prefix. @see https://www.drupal.org/project/facets/issues/3214662": "https://git.drupalcode.org/project/facets/-/merge_requests/20.diff",
                 "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
             },
-            "drupal/facets_form": {
-                "Implement calculate dependencies. @see https://www.drupal.org/project/facets_form/issues/3230468": "https://git.drupalcode.org/project/facets_form/-/merge_requests/15.diff"
-            },
             "drupal/honeypot": {
                 "Behat integration. @see https://www.drupal.org/project/honeypot/issues/3059040": "https://www.drupal.org/files/issues/2020-09-09/3059040-31.patch",
                 "Provide ways to clean up old honeypot_time_restriction values @see https://www.drupal.org/project/honeypot/issues/2997609": "https://git.drupalcode.org/project/honeypot/-/merge_requests/2.diff"
diff --git a/composer.lock b/composer.lock
index cd2e0baebb..162148dbac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2ee78642e5c3bca4f5b5682ad9fe5132",
+    "content-hash": "edac0f0611125534002ce69a61071ae6",
     "packages": [
         {
             "name": "SEMICeu/adms-ap_validator",
@@ -6143,7 +6143,7 @@
                     "datestamp": "1600173534",
                     "security-coverage": {
                         "status": "not-covered",
-                        "message": "Alpha releases are not covered by Drupal security advisories."
+                        "message": "Project has not opted into security advisory coverage!"
                     }
                 },
                 "patches_applied": {
@@ -9020,7 +9020,7 @@
                 "reference": "master"
             },
             "type": "drupal-theme-library",
-            "time": "2018-10-31T20:10:45+00:00"
+            "time": "2021-05-17T17:56:07+00:00"
         },
         {
             "name": "kub-at/php-simple-html-dom-parser",
@@ -11320,7 +11320,7 @@
                 "reference": "master"
             },
             "type": "library",
-            "time": "2020-08-03T19:59:39+00:00"
+            "time": "2021-05-20T17:05:25+00:00"
         },
         {
             "name": "stack/builder",

From db65de6700ad3b6a186b77ac93fc2fd43cd2da13 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 12:55:30 +0100
Subject: [PATCH 06/20] EPIC-6572: Fix merge error.

---
 tests/src/Context/JoinupSearchContext.php | 55 -----------------------
 1 file changed, 55 deletions(-)

diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index a5a18d7962..f3d7e2d764 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -815,59 +815,4 @@ public function removeFacetSummary(string $label): void {
     $element->click();
   }
 
-  /**
-   * Asserts that certain facet summary items are shown on the page.
-   *
-   * @param string $labels
-   *   A comma-separated list of facet item labels.
-   *
-   * @throws \Exception
-   *   Thrown when a wanted facet item is not shown in the page.
-   *
-   * @When I should see the following facet summary :labels
-   */
-  public function assertFacetSummary(string $labels): void {
-    $labels = $this->explodeCommaSeparatedStepArgument($labels);
-    $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block-facets-summary-blocksearch-facets-summary ')]//li[contains(concat(' ', normalize-space(@class), ' '), ' facet-summary-item--facet ')]";
-    $elements = $this->getSession()->getPage()->findAll('xpath', $xpath);
-    $present = $present_labels = [];
-
-    /** @var \Behat\Mink\Element\NodeElement $element */
-    foreach ($elements as $element) {
-      $present[] = $element->getText();
-    }
-
-    // Add label close in front of label.
-    foreach ($labels as $label) {
-      $present_labels[] = $label . ' close';
-    }
-
-    $present = array_map('trim', $present);
-    $present_labels = array_map('trim', $present_labels);
-    Assert::assertEquals($present_labels, $present);
-  }
-
-  /**
-   * Remove facet summary item that are on the page.
-   *
-   * @param string $label
-   *   A facet summary item label.
-   *
-   * @throws \Exception
-   *   Thrown when a wanted facet item is not shown in the page.
-   *
-   * @When I should remove the following facet summary :label
-   */
-  public function removeFacetSummary(string $label): void {
-
-    $xpath = '//div[contains(concat(" ", normalize-space(@class), " "), " block-facets-summary-blocksearch-facets-summary ")]//span[text()="' . $label . '"]';
-    $element = $this->getSession()->getPage()->find('xpath', $xpath);
-
-    if (empty($element)) {
-      throw new \Exception("The $label facet summary item was not found in the page.");
-    }
-
-    $element->click();
-  }
-
 }

From 4a40d1ec8e578d3d0ec25816275458538bb0872d Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Mon, 27 Sep 2021 14:18:26 +0100
Subject: [PATCH 07/20] ISAICP-6579: Facets summary Search view.

---
 ...y.facets_summary.search_facets_summary.yml |   6 +
 tests/features/joinup_search/search.feature   | 871 +++++-------------
 .../joinup/scss/components/_listing.scss      |  11 -
 3 files changed, 240 insertions(+), 648 deletions(-)

diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
index 0675885066..e06737b2db 100644
--- a/config/sync/facets_summary.facets_summary.search_facets_summary.yml
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -10,6 +10,12 @@ dependencies:
 id: search_facets_summary
 name: 'Search facets summary'
 facets:
+  group:
+    checked: true
+    label: Collection/Solution
+    separator: ', '
+    weight: 0
+    show_count: false
   spatial_coverage:
     checked: true
     label: 'Geographic coverage'
diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index d83540bd65..49f4a39056 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -1,653 +1,250 @@
-@api @terms @group-b
-Feature: Global search
-  As a user of the site I can find content through the global search.
-
-  # Todo: This test runs with javascript enabled because in a non-javascript
-  # environment, the dropdown facet is simply a list of links. Remove the
-  # `@javascript` tag when the upstream issue in the Facets module is fixed.
-  # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-5739
-  # Ref. https://www.drupal.org/project/facets/issues/2937191
-  @javascript
-  Scenario: Anonymous user can find items
-    Given the following collection:
-      | title            | Molecular cooking collection |
-      | logo             | logo.png                     |
-      | moderation       | no                           |
-      | topic            | Demography                   |
-      | spatial coverage | Belgium                      |
-      | state            | validated                    |
-    And the following solutions:
-      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
-      | Spherification | Molecular cooking collection | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
-      | Foam           | Molecular cooking collection | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
-    And news content:
-      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
-      | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
-      | Dummy news 1          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
-      | Dummy news 2          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
-      | Dummy news 3          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
-      | Dummy news 4          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
-
-    Given I am logged in as a user with the "authenticated" role
-    # @todo The search page cache should be cleared when new content is added.
-    # @see https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-3428
-    And the cache has been cleared
-    When I visit the search page
-    # All content is visible.
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    And I should see the "Spherification" tile
-    And I should see the "Foam" tile
-    # Terms are sorted alphabetically
-    And the "topic" select facet form should contain the following options:
-      | Any topic               |
-      # Parent term.
-      | Info                    |
-      # Child term.
-      | - Statistics and Analysis |
-      # Parent term.
-      | Social and Political    |
-      # Child terms.
-      | - Demography              |
-      | - E-inclusion             |
-    # Since the topics are indented by a whitespace, and the whitespaces are trimmed in the step above, we are testing
-    # the full response in order to ensure that the results are indented properly. The &nbsp; character below is the
-    # printable space character.
-    # @todo and WARNING. The following   character is supported by the old 3.4 selenium server. Change this in the
-    # new infrastructure with the &nbsp; encoded character.
-    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#info\">Info</option>"
-    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#statistics-and-analysis\">- Statistics and Analysis</option>"
-    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#social-and-political\">Social and Political</option>"
-    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#demography\">- Demography</option>"
-    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#e-inclusion\">- E-inclusion</option></select>"
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location       |
-      | Belgium (1)        |
-      | European Union (1) |
-      | Luxembourg (5)     |
-    # Check that only one search field is available. In an earlier version of
-    # Joinup there were two search fields, but this was confusing users.
-    And there should be exactly 1 "search field" on the page
-
-    When I select "Social and Political" from the "topic" select facet form
-    And I click Search in facets form
-    Then the option with text "Social and Political" from select facet form "topic" is selected
-    And the "topic" select facet form should contain the following options:
-      | Any topic                 |
-      | Info                      |
-      | - Statistics and Analysis |
-      | Social and Political      |
-      | - Demography              |
-      | - E-inclusion             |
-    # The tiles appear because the parent term is selected even though they do not have a direct reference there.
-    And I should see the "Dummy news 1" tile
-    And I should see the "Dummy news 2" tile
-    And I should see the "Dummy news 3" tile
-    And I should see the "Dummy news 4" tile
-
-    # Test the topic facet. The space prefixing "Demography" is due to the hierarchy.
-    When I select " Demography" from the "topic" select facet form
-    And I click Search in facets form
-    Then the option with text "- Demography" from select facet form "topic" is selected
-    # The selected option moves to the last position by default.
-    And the "topic" select facet form should contain the following options:
-      | Any topic                 |
-      | Info                      |
-      | - Statistics and Analysis |
-      | Social and Political      |
-      | - Demography              |
-      | - E-inclusion             |
-
-    #Then the option with text "Any location" from select facet form "spatial coverage" is selected
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location       |
-      | Belgium (1)        |
-      | European Union (1) |
-    And I should see the "Molecular cooking collection" tile
-    And I should see the "Spherification" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Foam" tile
-
-    # Test the spatial coverage facet.
-    When I select "Belgium" from the "spatial coverage" select facet form
-    And I click Search in facets form
-    Then the option with text "Belgium (1)" from select facet form "spatial coverage" is selected
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location       |
-      | Belgium (1)        |
-      | European Union (1) |
-    Then the option with text "- Demography" from select facet form "topic" is selected
-    And the "topic" select facet form should contain the following options:
-      | Any topic            |
-      | Social and Political |
-      | - Demography         |
-    And I should see the "Molecular cooking collection" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Spherification" tile
-    And I should not see the "Foam" tile
-
-    # Reset the search by visiting again the search page.
-    Given I am on the search page
-    Then I should see the text "Content types" in the "Left sidebar" region
-
-    # Select link in the 'type' facet.
-    When I check the "News (5)" checkbox from the "Content types" facet form
-    And I click Search in facets form
-    Then the option with text "News (5)" from select facet form "Content types" is selected
-    And the "Content types" select facet form should contain the following options:
-      | Collection (1)  |
-      | News (5)        |
-      | Solutions (2)   |
-
-    When I check the "Solutions (2)" checkbox from the "Content types" facet form
-    And I click Search in facets form
-    And I should see the following facet summary "News, Solutions"
-    And the "Content types" select facet form should contain the following options:
-      | Collection (1)  |
-      | News (5)        |
-      | Solutions (2)   |
-    And the "topic" select facet form should contain the following options:
-      | Any topic                 |
-      | Info                      |
-      | - Statistics and Analysis |
-      | Social and Political      |
-      | - Demography              |
-      | - E-inclusion             |
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location       |
-      | European Union (1) |
-      | Luxembourg (5)     |
-    And I should not see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    But I should see the "Spherification" tile
-    And I should see the "Foam" tile
-
-    # Launch a text search.
-    When I open the search bar by clicking on the search icon
-    And I enter "Cooking" in the search bar and press enter
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "Foam" tile
-    But I should not see the "Spherification" tile
-    And I should not see the "El Celler de Can Roca" tile
-
-  @javascript
-  Scenario: Alphabetical order for the spatial coverage in the search page.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And event content:
-      | title             | short title       | body                                | spatial coverage | agenda         | location       | organisation        | scope         | keywords | collection       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Greece           | Event agenda.  | Some place     | European Commission | International | Alphabet | Collection alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | Luxembourg       | To be planned. | Event location | Event organisation  |               |          | Collection alpha | validated |
+@api @terms
+Feature: Search inside groups
+  In order to quickly find content inside the group I am currently perusing
+  As a user of Joinup
+  I want to be able to launch a search limited to my current collection or solution
+
+  Background:
+    Given collection:
+      | title            | Chalet construction |
+      | logo             | logo.png            |
+      | moderation       | no                  |
+      | topic            | Demography          |
+      | spatial coverage | Switzerland         |
+      | state            | validated           |
+    And solution:
+      | title       | Inclined foundations                                  |
+      | description | Ways to construct foundations on hills and mountains. |
+      | banner      | banner.jpg                                            |
+      | logo        | logo.png                                              |
+      | collection  | Chalet construction                                   |
+      | state       | validated                                             |
+    And discussion content:
+      | title      | body                           | state     | collection          | solution             |
+      | Room sizes | What are the ideal dimensions? | validated | Chalet construction |                      |
+      | Terrace?   | Want a decent sized terrace    | validated |                     | Inclined foundations |
     And document content:
-      | title          | document type | short title          | body                                    | spatial coverage | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
-
-    When I visit the search page
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location     |
-      | Greece (1)       |
-      | Luxembourg (2)   |
-    When I select "Luxembourg" from the "spatial coverage" select facet form
-    And I click Search in facets form
-    Then the option with text "Luxembourg (2)" from select facet form "spatial coverage" is selected
-    And I should see the text "Search Results (2)"
-    # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
-    And the "spatial coverage" select facet form should contain the following options:
-      | Any location     |
-      | Greece (1)       |
-      | Luxembourg (2)   |
-
-  Scenario: Content can be found with a full-text search.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And the following solutions:
-      | title          | description                                                | keywords | owner             | contact information | collection  | state     |
-      | Solution alpha | <p>This is the solution <strong>beta</strong> description. | Alphabet | Responsible owner | Go-to contact       | Col for Sol | validated |
-    And the following releases:
-      | title         | release number | release notes                               | keywords | is version of  | owner             | contact information | state     |
-      | Release Alpha | 1              | <p>Release notes for <em>beta</em> changes. | Alphabet | Solution alpha | Responsible owner | Go-to contact       | validated |
-    And the following distributions:
-      | title              | description                                    | parent        | access url |
-      | Distribution alpha | <p>A simple beta distribution description.</p> | Release Alpha | test.zip   |
-    And the following licences:
-      | title         | description                         |
-      | Licence Alpha | A beta description for the licence. |
-    And news content:
-      | title      | headline            | body                      | keywords | collection       | state     |
-      | News omega | News headline delta | The epsilon news content. | Alphabet | Collection alpha | validated |
+      | title       | body               | state     | collection          | solution             |
+      | Ground plan | A classic design   | validated | Chalet construction |                      |
+      | Rock types  | Ranked by hardness | validated |                     | Inclined foundations |
     And event content:
-      | title             | short title       | body                                | agenda         | location       | organisation        | scope         | keywords | collection       | solution       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Event agenda.  | Some place     | European Commission | International | Alphabet |                  | Solution alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | To be planned. | Event location | Event organisation  |               |          | Collection alpha |                | validated |
-    And document content:
-      | title          | document type | short title          | body                                    | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Alphabet | Collection alpha | validated |
-    And discussion content:
-      | title            | body                                                              | solution       | state     |
-      | Discussion omega | <p>Does anybody has idea why this <em>epsilon</em> is everywhere? | Solution alpha | validated |
-    And custom_page content:
-      | title      | body                                     | collection       |
-      | Page omega | This is just an epsilon but should work. | Collection alpha |
-    And video content:
-      | title       | body          | field_video                                 | collection       |
-      | Video alpha | Slap like now | https://www.youtube.com/watch?v=JhGf8ZY0tN8 | Collection alpha |
-    And users:
-      | Username     | E-mail                      | First name | Family name | Organisation |
-      | jenlyle      | jenessa.carlyle@example.com | Jenessa    | Carlyle     | Clyffco      |
-      | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
-
-    When I visit the search page
-    And the "Content types" select facet form should contain the following options:
-      | Collections (2)	|
-      | Custom page (1)	|
-      | Discussion (1)	|
-      | Document (1)		|
-      | Events (2)		  |
-      | Licence (1)		  |
-      | News (1)			  |
-      | Release (1)		  |
-      | Solution (1)		|
-      | Video (1)			  |
-
-    # "Alpha" is used in all the rdf entities titles.
-    When I enter "Alpha" in the search bar and press enter
-    Then I should see the text "Search Results (5)"
-    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
-
-    # "Omega" is used in all the node entities titles. Since the content of
-    # custom pages is added to their collection, we also match the collection.
-    When I enter "omega" in the search bar and press enter
-    Then I should see the text "Search Results (6)"
-    And the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Beta" is used in all the rdf entities body fields.
-    When I enter "beta" in the search bar and press enter
-    Then I should see the text "Search Results (4)"
-    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
-
-    # "Epsilon" is used in all the node entities body fields.
-    When I enter "epsilon" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Alphabet" is used in all the keywords fields.
-    When I enter "Alphabet" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha, News omega, Event Omega, Document omega"
-
-    # "Gamma" is used in the collection abstract.
-    When I enter "gamma" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha"
-
-    # "Delta" is used in headline and short titles.
-    When I enter "delta" in the search bar and press enter
-    Then the page should show the tiles "News omega, Event Omega, Document omega"
-
-    # Search for the event fields: agenda, location, address, organisation, scope.
-    When I enter "agenda" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "location" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "place" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "organisation" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "international" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-
-    # The owner and contact information names should be indexed inside the solutions/releases they are linked to.
-    When I enter "responsible" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-    # Visit the homepage to be sure that the test fetches the correct updated page.
-    When I go to the homepage
-    And I enter "contact" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-
-    # Users should be found by first name, family name and organisation.
-    When I enter "Jenessa" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "freeman" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-    When I enter "clyffco" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "Omero+snc" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-
-  Scenario: Advanced search
-    # An advanced search link is shown in the header, except on the search page.
-    Given I am on the homepage
-    Then I should see the link "advanced search"
-    Given I visit the collection overview
-    Then I should see the link "Advanced search"
-    When I click "Advanced search"
-    Then I should be on the advanced search page
-    But I should not see the link "Advanced search"
-
-  Scenario: Collections and solutions are shown first in search results with the same relevance.
-    Given collections:
-      | title                           | description                         | state     |
-      | Ornithology: the study of birds | Ornithology is a branch of zoology. | validated |
-      | Husky Flying Xylophone          | A strange instrument.               | validated |
-    And the following solution:
-      | title       | Bird outposts in the wild            |
-      | collection  | Ornithology: the study of birds      |
-      | description | Exotic wings and where to find them. |
-      | state       | validated                            |
-    And custom_page content:
-      | title           | body                                  | collection                      |
-      | Disturbed birds | Flocks of trained pigeons flying off. | Ornithology: the study of birds |
+      | title                        | body                              | state     | collection          | solution             |
+      | Opening of the winter season | Ski resorts will open in December | validated | Chalet construction |                      |
+      | Presenting DrillMaster X88   | Our most finely ground drill bit  | validated |                     | Inclined foundations |
     And news content:
-      | title                               | body                            | collection                      | state     |
-      | Chickens are small birds            | Birds domesticated in India.    | Ornithology: the study of birds | validated |
-      | Found a xylophone from 1600 in Asia | Oldest instrument of this type. | Husky Flying Xylophone          | validated |
-    And event content:
-      | title         | body                   | collection                      | state     |
-      | Bird spotting | Roosters crow at dawn. | Ornithology: the study of birds | validated |
-    And discussion content:
-      | title                             | body                    | collection                      | state     |
-      | Best place to find an exotic bird | Somewhere exotic maybe? | Ornithology: the study of birds | validated |
-    And user:
-      | Username    | Bird watcher |
-      | First name  | Bird         |
-      | Family name | Birdman      |
-
-    # The bird is the word... to search.
-    When I enter "Bird" in the search bar and press enter
-    Then I should see the following tiles in the correct order:
-      | Ornithology: the study of birds   |
-      | Bird outposts in the wild         |
-      | Disturbed birds                   |
-      | Chickens are small birds          |
-      | Bird spotting                     |
-      | Best place to find an exotic bird |
-      | Bird Birdman                      |
-
-  @clearStaticCache
-  Scenario: Solutions and/or releases are found by their distribution keyword.
-    Given the following licences:
-      | title      |
-      | Apache-2.0 |
-      | LGPL       |
-    And the following solution:
-      | title | Zzolution |
-      | state | validated |
-
-    When I enter "ZzoluDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add distribution, child of solution.
-    Given the following distribution:
-      | title                    | ZzoluDistro                     |
-      | parent                   | Zzolution                       |
-      | description              | Übermensch foot size            |
-      | access url               | http://example.com/zzolu-distro |
-      | licence                  | Apache-2.0                      |
-      | format                   | HTML                            |
-      | representation technique | Datalog                         |
-
-    When I enter "zzoludistro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "ubermensch" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Zzolution"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ZzoluDistro" distribution
-    And I fill in "Title" with "DistroZzolu"
-    And I fill in "Description" with "Nietzsche's"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/guzzle" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-    Then I should see the heading "DistroZzolu"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "zzoludistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "ubermensch" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then I should not see the text "Search Results"
-    And I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "nietzsche" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "guzzle" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "lGPL" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Zzolution"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I delete the "DistroZzolu" asset distribution
-
-    # The parent solution has been re-indexed without distribution data.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "nietzsche" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "guzzle" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add a new distribution, child of a release.
-    Given the following release:
-      | title         | Releazz   |
-      | state         | validated |
-      | is version of | Zzolution |
-
-    When I enter "ReleazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    Given the following distribution:
-      | title                    | ReleazzDistro                     |
-      | parent                   | Releazz                           |
-      | description              | Dracula                           |
-      | access url               | http://example.com/releazz-distro |
-      | licence                  | Apache-2.0                        |
-      | format                   | HTML                              |
-      | representation technique | Datalog                           |
-
-    When I enter "releazzDistro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "dracula" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "releazz-distro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Releazz"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ReleazzDistro" distribution
-    And I fill in "Title" with "DistroReleazz"
-    And I fill in "Description" with "Zorro"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/mishmash" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "releazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "dracula" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "releazz-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "zoRRo" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "mishMash" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "LGpl" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Releazz"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I delete the "DistroReleazz" asset distribution
-
-    # The parent release has been re-indexed without distribution data.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zoRRo" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "mishMash" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-  Scenario: Collections are found by their keywords.
-    Given the following collection:
-      | title    | Collection sample       |
-      | keywords | unique, key-definitions |
-      | state    | validated               |
-
-    When I enter "key-definitions" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
-
-    When I enter "unique" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
+      | title             | body            | collection          | solution             | topic                   | spatial coverage | state     |
+      | Natural materials | Ground feel     | Chalet construction |                      | Statistics and Analysis | Switzerland      | validated |
+      | Still frozen      | Maybe next week |                     | Inclined foundations |                         | Austria          | validated |
+    And custom_page content:
+      | title     | body                             | collection          | solution             |
+      | Resources | Here are some interesting links. | Chalet construction |                      |
+      | Geography | A collection of height maps.     |                     | Inclined foundations |
+    And releases:
+      | title     | release number | release notes              | is version of        | state     |
+      | Pre-alpha | 0.0-alpha0     | Only works on flat ground. | Inclined foundations | validated |
+    And distributions:
+      | title       | description          | parent    | access url |
+      | Zip archive | It has files inside. | Pre-alpha | test.zip   |
 
   @javascript
-  Scenario: Users are able to select the sort order.
-    Given collections:
-      | title             | description       | state     |
-      | Custom collection | Some custom data. | validated |
-    And news content:
-      | title                              | body                                                              | collection        | state     | created    | changed    |
-      | Relativity is the word             | No one cares about the body.                                      | Custom collection | validated | 01/01/2019 | 03/08/2019 |
-      | Relativity news: Relativity theory | I do care about the relativity keyword in the body.               | Custom collection | validated | 02/01/2019 | 02/08/2019 |
-      | Absolutely nonesense               | Some news are not worth it but I will add relativity here anyway. | Custom collection | validated | 03/01/2019 | 01/08/2019 |
-
+  Scenario: Group filters are shown as chips
+    # Pages that do not belong to a collection or solution do not have chips in
+    # the search field.
     When I am on the homepage
-    And I enter "Relativity" in the search bar and press enter
-    Then the option "Relevance" should be selected
-    And I should see the text "Search Results (3)"
-    And I should see the following tiles in the correct order:
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=relevance"
+    Then the page should not contain any chips
+    When I visit the collection overview
+    Then the page should not contain any chips
+    When I visit the solution overview
+    Then the page should not contain any chips
+    When I visit the contact form
+    Then the page should not contain any chips
+
+    # Check that the name of the collection is shown as a chip in the search
+    # field on the collection homepage. The chips are initially hidden but will
+    # appear after clicking on the search icon to open the search bar.
+    When I go to the homepage of the "Chalet construction" collection
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+
+    # Do a search without entering any keywords. Because the collection is shown
+    # as a chip in the search field the search results should be filtered and
+    # only show the content of the collection.
+    When I submit the search by pressing enter
+    Then the option with text "Chalet construction (6)" from select facet form "collection/solution" is selected
+    And the page should show the tiles "Room sizes, Ground plan, Opening of the winter season, Natural materials, Resources, Inclined foundations"
+
+    # Check that other types of pages in the collection also show the collection
+    # as a chip.
+    When I go to the "Room sizes" discussion
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+    # It should be possible to remove the chip by clicking the delete button.
+    When I press the remove button on the chip "Chalet construction"
+    Then the page should not contain any chips
+
+    When I go to the "Ground plan" document
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+    # It should be possible to remove the chip by typing a backspace in the
+    # search field.
+    When I press backspace in the search bar
+    Then the page should not contain any chips
+
+    When I go to the "Opening of the winter season" event
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+    When I go to the "Natural materials" news
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+    When I go to the "Resources" custom page
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+
+    # Check that the name of the solution is shown as a chip in the search field
+    # on the solution homepage.
+    When I go to the homepage of the "Inclined foundations" solution
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+
+    # Do a search without entering any keywords. Because the solution is shown
+    # as a chip in the search field the search results should be filtered and
+    # only show the content of the solution.
+    When I submit the search by pressing enter
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
+    Then the page should show the tiles "Pre-alpha, Presenting DrillMaster X88, Rock types, Still frozen, Geography, Terrace?"
+
+    # Do a search with a keyword. The chip for the solution should be present
+    # so the results are filtered by keyword and solution.
+    Given I am on the homepage of the "Inclined foundations" solution
+    When I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    When I enter "ground" in the search bar and press enter
+    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
+    And the page should show the tiles "Pre-alpha, Presenting DrillMaster X88"
+
+    # Do a search with a keyword after removing the chip for the solution. The
+    # results should only be filtered by keyword, not by solution.
+    Given I am on the homepage of the "Inclined foundations" solution
+    When I open the search bar by clicking on the search icon
+    And I press the remove button on the chip "Inclined foundations"
+    And I enter "ground" in the search bar and press enter
+    Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
-    Given I select "Creation Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Absolutely nonesense               |
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-    And I should be on "/search?keys=Relativity&sort_by=creation-date"
+    # Do a search with a keyword and removing the chip for the solution after
+    # the keywords have been typed in. This should have the same result.
+    Given I am on the homepage of the "Inclined foundations" solution
+    When I open the search bar by clicking on the search icon
+    And I enter "ground" in the search bar
+    And I press the remove button on the chip "Inclined foundations"
+    And I submit the search by pressing enter
+    Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
+
+    # Check that other types of pages in the solution also show the collection
+    # as a chip.
+    When I go to the "Terrace?" discussion
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    # It should be possible to remove the chip by clicking the delete button.
+    When I press the remove button on the chip "Inclined foundations"
+    Then the page should not contain any chips
+
+    When I go to the "Rock types" document
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    # It should be possible to remove the chip by typing a backspace in the
+    # search field.
+    When I press backspace in the search bar
+    Then the page should not contain any chips
+
+    When I go to the "Presenting DrillMaster X88" event
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    When I go to the "Still frozen" news
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    When I go to the "Geography" custom page
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    When I go to the "Pre-alpha" release
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
+    When I go to the "Zip archive" distribution
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Inclined foundations |
 
-    Given I select "Last Updated Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Relativity is the word             |
-      | Relativity news: Relativity theory |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
+  @clearStaticCache
+  Scenario: Group search caching
+    # Initially the cache is cold.
+    When I go to the homepage of the "Chalet construction" collection
+    Then the page should show the following chip:
+      | Chalet construction |
+    And the page should not be cached
+    # A subsequent request should be served from cache.
+    When I reload the page
+    Then the page should show the following chip:
+      | Chalet construction |
+    And the page should be cached
+    # Check that changing the name of the collection correctly invalidates the
+    # cache.
+    When I change the name of the "Chalet construction" collection to "Chalet destruction"
+    And I go to the homepage of the "Chalet destruction" collection
+    Then the page should show the following chip:
+      | Chalet destruction |
+    And the page should not be cached
+    When I reload the page
+    Then the page should show the following chip:
+      | Chalet destruction |
+    And the page should be cached
 
   @javascript
-  Scenario: Anonymous user can find facets summary
-    Given the following collection:
-      | title            | Radio cooking collection     |
-      | logo             | logo.png                     |
-      | moderation       | no                           |
-      | topic            | Demography                   |
-      | spatial coverage | Belgium                      |
-      | state            | validated                    |
-    And the following solutions:
-      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
-      | Spheres        | Radio cooking collection     | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
-      | Movistar       | Radio cooking collection     | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
-    And news content:
-      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
-      | El Cabo da Roca       | The best in town | Radio cooking collection     | Statistics and Analysis | Luxembourg       | validated |
-      | Funny news 1          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
-      | Funny news 2          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
-      | Funny news 3          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
-      | Funny news 4          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+  Scenario: Group filters remain active in the search bar when viewing search results
+    When I go to the homepage of the "Chalet construction" collection
+    And I open the search bar by clicking on the search icon
+    Then the page should show the following chip:
+      | Chalet construction |
+    When I enter "ground" in the search bar and press enter
+    Then the option with text "Chalet construction (2)" from select facet form "collection/solution" is selected
+    And the page should show the tiles "Ground plan, Natural materials"
+    And I should see the following facet summary "Chalet construction"
+    When I should remove the following facet summary "Chalet construction"
+    Then the page should not contain any summary
+    And the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
-    Given I am logged in as a user with the "authenticated" role
+  @javascript
+  Scenario: Group facet summary appear in search after selecting them in facets
     When I visit the search page
-    And I select "Solutions (2)" from the "Content types" select facet form
-    And I select "News (5)" option in the "Content types" select facet form
-    And I click Search in facets form
-    And I should see the following facet summary "News, Solutions"
+    And I should see 12 tiles
 
-    Then I click "Clear filters"
-    And I select "News (5)" from the "Content types" select facet form
+    When I open the search bar by clicking on the search icon
+    Then the page should not contain any chips
+
+    When I select "Inclined foundations" from the "collection/solution" select facet form
     And I click Search in facets form
-    And I should see the following facet summary "News"
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
+    And I should see 6 tiles
 
-    # Check if facet summary was remove correctly.
-    Then I click "Clear filters"
-    And I select "News (5)" from the "Content types" select facet form
-    And I select "Collection (1)" option in the "Content types" select facet form
+    When I open the search bar by clicking on the search icon
+    And I should see the following facet summary "Inclined foundations"
+
+    # The filter facets summary shouldn't remain active when doing another search.
+    When I enter "ground" in the search bar and press enter
+    Then I select "Inclined foundations" from the "collection/solution" select facet form
     And I click Search in facets form
-    And I should see the following facet summary "Collection, News"
-    Then I should remove the following facet summary "News"
-    And the page should show only the tiles "Radio cooking collection"
+    And I should see 2 tiles
+    When I open the search bar by clicking on the search icon
+    And I should see the following facet summary "Inclined foundations"
diff --git a/web/themes/joinup/scss/components/_listing.scss b/web/themes/joinup/scss/components/_listing.scss
index 70cf937bf0..76a50ff5f7 100644
--- a/web/themes/joinup/scss/components/_listing.scss
+++ b/web/themes/joinup/scss/components/_listing.scss
@@ -220,17 +220,6 @@
   }
 }
 
-.listing__facets {
-  display: flex;
-  padding-left: 0;
-
-  li {
-    list-style: none;
-    padding-left: 0;
-    margin-left: 1rem;
-  }
-}
-
 // Modifiers
 // --------------------------------------------------
 .listing__image--default {

From 37136d25d3d51e8d64ee088acc8bcbcb964676bf Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Tue, 28 Sep 2021 10:35:41 +0100
Subject: [PATCH 08/20] ISAICP-6584: Integrate Facets Form & Date Range Widget.

---
 composer.json                                 |  3 ++
 composer.lock                                 |  2 +-
 ...lock.block.ventuno_entity_bundle_facet.yml | 29 -------------------
 ...y.facets_summary.search_facets_summary.yml |  6 ----
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 config/sync/block.block.ventuno_entity_bundle_facet.yml

diff --git a/composer.json b/composer.json
index 553e20e6e3..5e0653de4f 100644
--- a/composer.json
+++ b/composer.json
@@ -301,6 +301,9 @@
                 "Configurable dropdown child prefix. @see https://www.drupal.org/project/facets/issues/3214662": "https://git.drupalcode.org/project/facets/-/merge_requests/20.diff",
                 "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
             },
+            "drupal/facets_form": {
+                "Implement calculate dependencies. @see https://www.drupal.org/project/facets_form/issues/3230468": "https://git.drupalcode.org/project/facets_form/-/merge_requests/15.diff"
+            },
             "drupal/honeypot": {
                 "Behat integration. @see https://www.drupal.org/project/honeypot/issues/3059040": "https://www.drupal.org/files/issues/2020-09-09/3059040-31.patch",
                 "Provide ways to clean up old honeypot_time_restriction values @see https://www.drupal.org/project/honeypot/issues/2997609": "https://git.drupalcode.org/project/honeypot/-/merge_requests/2.diff"
diff --git a/composer.lock b/composer.lock
index 162148dbac..9d94185930 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "edac0f0611125534002ce69a61071ae6",
+    "content-hash": "89f2015aae77149b6750f18fbcff520e",
     "packages": [
         {
             "name": "SEMICeu/adms-ap_validator",
diff --git a/config/sync/block.block.ventuno_entity_bundle_facet.yml b/config/sync/block.block.ventuno_entity_bundle_facet.yml
deleted file mode 100644
index a77e44c53c..0000000000
--- a/config/sync/block.block.ventuno_entity_bundle_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: c655a719-0864-4dcf-bc0a-5e624e4484e8
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.type
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - ventuno
-id: ventuno_entity_bundle_facet
-theme: ventuno
-region: sidebar
-weight: -22
-provider: null
-plugin: 'facet_block:type'
-settings:
-  id: 'facet_block:type'
-  label: 'Content types'
-  provider: facets
-  label_display: '1'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
index e06737b2db..0675885066 100644
--- a/config/sync/facets_summary.facets_summary.search_facets_summary.yml
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -10,12 +10,6 @@ dependencies:
 id: search_facets_summary
 name: 'Search facets summary'
 facets:
-  group:
-    checked: true
-    label: Collection/Solution
-    separator: ', '
-    weight: 0
-    show_count: false
   spatial_coverage:
     checked: true
     label: 'Geographic coverage'

From 5a1ad5b823f915b70646c7717185b1a062ed7b84 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Tue, 28 Sep 2021 16:58:38 +0100
Subject: [PATCH 09/20] ISAICP-6688: Add theme rules and add facets to search
 page.

---
 .../sync/block.block.facetform_viewsearch.yml | 32 +++++++++++++++++
 ...k.block.ventuno_spatial_coverage_facet.yml | 29 ---------------
 .../sync/block.block.ventuno_topic_facet.yml  | 29 ---------------
 config/sync/theme_rule.rule.search.yml        | 18 ++++++++++
 config/sync/tour.tour.joinup_homepage.yml     | 10 +++---
 .../ventuno/templates/layout/page.html.twig   | 35 +++++++++++++++----
 6 files changed, 84 insertions(+), 69 deletions(-)
 create mode 100644 config/sync/block.block.facetform_viewsearch.yml
 delete mode 100644 config/sync/block.block.ventuno_spatial_coverage_facet.yml
 delete mode 100644 config/sync/block.block.ventuno_topic_facet.yml
 create mode 100644 config/sync/theme_rule.rule.search.yml

diff --git a/config/sync/block.block.facetform_viewsearch.yml b/config/sync/block.block.facetform_viewsearch.yml
new file mode 100644
index 0000000000..0dbe7f99c1
--- /dev/null
+++ b/config/sync/block.block.facetform_viewsearch.yml
@@ -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: {  }
diff --git a/config/sync/block.block.ventuno_spatial_coverage_facet.yml b/config/sync/block.block.ventuno_spatial_coverage_facet.yml
deleted file mode 100644
index 074741b38c..0000000000
--- a/config/sync/block.block.ventuno_spatial_coverage_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 02e4583d-5f4b-4d31-abb0-4357444f493f
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.spatial_coverage
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - ventuno
-id: ventuno_spatial_coverage_facet
-theme: ventuno
-region: sidebar
-weight: -19
-provider: null
-plugin: 'facet_block:spatial_coverage'
-settings:
-  id: 'facet_block:spatial_coverage'
-  label: 'Search page - Geographical coverage facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.ventuno_topic_facet.yml b/config/sync/block.block.ventuno_topic_facet.yml
deleted file mode 100644
index 7250cab83a..0000000000
--- a/config/sync/block.block.ventuno_topic_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: ed460e0f-8b15-4e00-aff6-a63cfda3de1c
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.topic
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - ventuno
-id: ventuno_topic_facet
-theme: ventuno
-region: sidebar
-weight: -20
-provider: null
-plugin: 'facet_block:topic'
-settings:
-  id: 'facet_block:topic'
-  label: 'Search page - Topic facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/theme_rule.rule.search.yml b/config/sync/theme_rule.rule.search.yml
new file mode 100644
index 0000000000..8212a6da6f
--- /dev/null
+++ b/config/sync/theme_rule.rule.search.yml
@@ -0,0 +1,18 @@
+uuid: d829d7dc-4cc7-4988-9f6b-1db7ef4901ce
+langcode: en
+status: true
+dependencies:
+  module:
+    - joinup_core
+  theme:
+    - ventuno
+id: search
+label: Search
+theme: ventuno
+weight: 0
+conditions:
+  request_route:
+    id: request_route
+    routes:
+      - view.search.page_1
+    negate: false
diff --git a/config/sync/tour.tour.joinup_homepage.yml b/config/sync/tour.tour.joinup_homepage.yml
index fd9f127c80..39d734a29a 100644
--- a/config/sync/tour.tour.joinup_homepage.yml
+++ b/config/sync/tour.tour.joinup_homepage.yml
@@ -24,7 +24,7 @@ tips:
     weight: 2
     location: left
     attributes:
-      data-class: 'search-bar'
+      data-class: search-bar
   discover_topics:
     id: discover_topics
     plugin: text
@@ -32,7 +32,7 @@ tips:
     weight: 3
     location: right
     attributes:
-      data-class: 'view-discover-topics'
+      data-class: view-discover-topics
   spotlight:
     id: spotlight
     plugin: text
@@ -40,7 +40,7 @@ tips:
     weight: 4
     location: left
     attributes:
-      data-class: 'block-views-blockin-the-spotlight-block'
+      data-class: block-views-blockin-the-spotlight-block
   news:
     id: news
     plugin: text
@@ -48,7 +48,7 @@ tips:
     weight: 5
     location: left
     attributes:
-      data-class: 'block-views-blocklatest-news-block'
+      data-class: block-views-blocklatest-news-block
   explore:
     id: explore
     plugin: text
@@ -64,7 +64,7 @@ tips:
     weight: 7
     location: left
     attributes:
-      data-class: 'about-what'
+      data-class: about-what
   contact:
     id: contact
     plugin: text
diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig
index 8ec27ee2c6..0562b72b01 100644
--- a/web/themes/ventuno/templates/layout/page.html.twig
+++ b/web/themes/ventuno/templates/layout/page.html.twig
@@ -43,7 +43,28 @@
 <div class="layout-container">
   <div class="section-header">
     <header role="banner" class="region-header">
-      {{ page.header }}
+      {% include directory ~ '/templates/navigation/navbar.html.twig' with {
+        breakpoint: logged_in ? "" : "sm",
+        brand: {
+          src: base_path ~ directory ~ "/src/images/logo.svg",
+          alt: "Joinup logo"|t,
+          motto: "Interoperability solutions"|t,
+          link: front_page,
+        },
+        collapse_id: "navbar",
+        list_id: "list",
+        buttons: [
+          {
+            id: logged_in ? "account" : "navbar-toggler",
+            icon: {
+            name: logged_in ? "person-circle" : "justify",
+          },
+            label: logged_in ? user_name : "",
+            type: "links",
+            links: logged_in ? profile_links : anonymous_links,
+          },
+        ],
+      } %}
     </header>
 
     {% if page.header_bottom %}
@@ -53,13 +74,15 @@
     {% endif %}
   </div>
 
-  <div class="region-featured mb-5 py-5">
-    <div class="container">
-      <div class="row">
-        {{ page.featured }}
+  {% if page.featured %}
+    <div class="region-featured mb-5 py-5">
+      <div class="container">
+        <div class="row">
+          {{ page.featured }}
+        </div>
       </div>
     </div>
-  </div>
+  {% endif %}
 
   {{ page.content_top }}
 

From da6caf755715e662f0c927c52fbb39dc80b1f91d Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Wed, 29 Sep 2021 09:28:37 +0100
Subject: [PATCH 10/20] ISAICP-6688: WIP Fix behat tests.

---
 .../collection/collection_overview.feature    |  4 +--
 tests/features/featured_entities.feature      |  4 +--
 .../joinup_core/page_destination.feature      |  6 ++---
 tests/features/machine_translation.feature    |  4 +++
 .../facets-result-item--summary.html.twig     | 27 +++++++++++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig

diff --git a/tests/features/collection/collection_overview.feature b/tests/features/collection/collection_overview.feature
index 218eea9d15..37f3af8baa 100644
--- a/tests/features/collection/collection_overview.feature
+++ b/tests/features/collection/collection_overview.feature
@@ -3,8 +3,8 @@ Feature: Collections Overview
 
   Scenario: Check visibility of "Collections" menu link.
     Given I am an anonymous user
-    # The homepage no longer has a link to the collections overview. Let's try another page.
-    When I am on the search page
+    # The homepage and search no longer has a link to the collections overview. Let's try another page.
+    When I visit "/keep-up-to-date"
     Then I should see the link "Collections"
     When I click "Collections"
     Then I should see the heading "Collections"
diff --git a/tests/features/featured_entities.feature b/tests/features/featured_entities.feature
index 533ae5ffe1..fa5001388d 100644
--- a/tests/features/featured_entities.feature
+++ b/tests/features/featured_entities.feature
@@ -91,9 +91,9 @@ Feature: Featuring content site-wide
 
   Scenario Outline: Moderators can feature and unfeature collections and solutions site-wide.
     When I am an anonymous user
-    # The homepage no longer shows links to the collection and solution overview
+    # The homepage and search no longer shows links to the collection and solution overview
     # pages. Let's do this from another page.
-    And I am on the search page
+    And I am on "/keep-up-to-date"
     And I click "<header link>"
     Then I should see the following tiles in the correct order:
       | <featured>   |
diff --git a/tests/features/joinup_core/page_destination.feature b/tests/features/joinup_core/page_destination.feature
index 15b5cddb6a..68fdbe3149 100644
--- a/tests/features/joinup_core/page_destination.feature
+++ b/tests/features/joinup_core/page_destination.feature
@@ -24,8 +24,7 @@ Feature:
 
   Scenario: A user logging in from another page should return to that page after login.
     When I am on "/search?keys=how+to+redirect"
-    And I open the account menu
-    And I click "Sign in"
+    And I click "Sign in" in the "Navigation bar"
     And I fill in "E-mail address" with "mr.redirect@example.com"
     And I fill in "Password" with "Mr Redirect"
     And I press "Log in"
@@ -34,8 +33,7 @@ Feature:
 
   Scenario: Only the destination parameter should be carried over if one exists outside the user pages.
     When I am on "/search?keys=how+to+redirect&destination=/contact"
-    And I open the account menu
-    And I click "Sign in"
+    And I click "Sign in" in the "Navigation bar"
     And I fill in "E-mail address" with "mr.redirect@example.com"
     And I fill in "Password" with "Mr Redirect"
     And I press "Log in"
diff --git a/tests/features/machine_translation.feature b/tests/features/machine_translation.feature
index 7f649cc4df..5158483bc9 100644
--- a/tests/features/machine_translation.feature
+++ b/tests/features/machine_translation.feature
@@ -85,8 +85,12 @@ Feature: Machine translation
     # Pages that primarily list content should not be translatable.
     When I go to the homepage
     Then I should not see any Webtools eTrans elements
+    # The search no longer has a link to the collections, solutions and
+    # keep up to date. Let's try another page.
     When I visit the search page
     Then I should not see any Webtools eTrans elements
+    When I visit "/keep-up-to-date"
+    Then I should not see any Webtools eTrans elements
     When I click "Collections" in the "Header menu" region
     Then I should not see any Webtools eTrans elements
     When I click "Solutions" in the "Header menu" region
diff --git a/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig b/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig
new file mode 100644
index 0000000000..bb3606da68
--- /dev/null
+++ b/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig
@@ -0,0 +1,27 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a facet result item.
+ *
+ * Available variables:
+ * - value: The item value.
+ * - raw_value: The raw item value.
+ * - show_count: If this facet provides count.
+ * - count: The amount of results.
+ * - is_active: The item is active.
+ * - facet: The facet for this result item.
+ *   - id: the machine name for the facet.
+ *   - label: The facet label.
+ *
+ * @ingroup themeable
+ */
+#}
+<span class="mdl-chip mdl-chip--deletable">
+  <span class="mdl-chip__text facet-item__value">{{ value }}</span>
+  {% if is_active %}
+    <button type="button" class="facet-item__status js-facet-deactivate mdl-chip__action" aria-label="{{ 'Close'|t }}"><i class="material-icons">close</i></button>
+  {% endif %}
+  {% if show_count %}
+    <span class="facet-item__count">({{ count }})</span>
+  {% endif %}
+</span>

From 8771dc6855878ac2c91889f57066216a7d33931a Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Wed, 29 Sep 2021 17:10:08 +0100
Subject: [PATCH 11/20] ISAICP-6688: Update behat chips to facets summary
 tests.

---
 ...y.facets_summary.search_facets_summary.yml |  6 +++++
 .../joinup_search/group_search.feature        |  8 +++----
 tests/src/Context/JoinupContext.php           |  2 +-
 tests/src/Context/JoinupSearchContext.php     | 22 +++++++++++++++++++
 tests/src/Traits/TraversingTrait.php          |  2 +-
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
index 0675885066..c4dcc371c2 100644
--- a/config/sync/facets_summary.facets_summary.search_facets_summary.yml
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -28,6 +28,12 @@ facets:
     separator: ', '
     weight: 0
     show_count: false
+  group:
+    checked: true
+    label: Collection/Solution
+    separator: ', '
+    weight: 0
+    show_count: false
 facet_source_id: 'search_api:views_page__search__page_1'
 processor_configs:
   hide_when_not_rendered:
diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index 250ae1b81b..9704aa8283 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -220,11 +220,9 @@ Feature: Search inside groups
     When I enter "ground" in the search bar and press enter
     Then the option with text "Chalet construction (2)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Ground plan, Natural materials"
-    And the page should show the following chip in the "Search bar":
-      | Chalet construction |
-    When I press the remove button on the chip "Chalet construction"
-    And I submit the search by pressing enter
-    Then the page should not contain any chips
+    And I should see the following facet summary "Chalet construction"
+    When I should remove the following facet summary "Chalet construction"
+    Then the page should not contain any summary
     And the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
   @javascript
diff --git a/tests/src/Context/JoinupContext.php b/tests/src/Context/JoinupContext.php
index 2647b8fdb3..ec622ee8c3 100644
--- a/tests/src/Context/JoinupContext.php
+++ b/tests/src/Context/JoinupContext.php
@@ -2770,7 +2770,7 @@ protected function getSelectorsMatchingElementAlias(string $alias): array {
           // The site-wide search field in the top right corner.
           ['css', 'input#search-bar__input'],
           // The search field on the search result pages.
-          ['css', '#block-exposed-form-search-page input.form-text'],
+          ['css', '.form-item-keys input[type=text]'],
         ],
       ],
     ];
diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index f3d7e2d764..b7527ed788 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -815,4 +815,26 @@ public function removeFacetSummary(string $label): void {
     $element->click();
   }
 
+  /**
+   * Asserts that the expected number of summaries are shown.
+   *
+   * @param string|null $number
+   *   The expected number of summaries. This is a string rather than an integer
+   *   because step definitions are represented in text.
+   *
+   * @throws \Exception
+   *    Thrown when the region is not found.
+   *
+   * @Then the page should contain :number summary(s)
+   * @Then the page should not contain any summary
+   * @Then the :region region should contain :number summary(s)
+   * @Then the :region region should not contain any summary
+   */
+  public function assertFacetsSummaryCount(?string $number = NULL): void {
+    $number = (int) $number;
+    $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block-facets-summary-blocksearch-facets-summary ')]//li[contains(concat(' ', normalize-space(@class), ' '), ' facet-summary-item--facet ')]";
+    $elements = $this->getSession()->getPage()->findAll('xpath', $xpath);
+    Assert::assertCount($number, $elements);
+  }
+
 }
diff --git a/tests/src/Traits/TraversingTrait.php b/tests/src/Traits/TraversingTrait.php
index 5063b32a50..bd0d6c1932 100644
--- a/tests/src/Traits/TraversingTrait.php
+++ b/tests/src/Traits/TraversingTrait.php
@@ -569,7 +569,7 @@ protected function getSelectorsMatchingElementAlias(string $alias): array {
           // The site-wide search field in the top right corner.
           ['css', 'input#search-bar__input'],
           // The search field on the search result pages.
-          ['css', '#block-exposed-form-search-page input.form-text'],
+          ['css', '.form-item-keys input[type=text]'],
         ],
       ],
     ];

From cc2abd676feacddca808e04261e53afde886531a Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Wed, 29 Sep 2021 23:01:24 +0100
Subject: [PATCH 12/20] ISAICP-6688: Fix menu 'Sign in' url.

---
 tests/features/joinup_search/group_search.feature | 13 ++++++-------
 web/themes/ventuno/ventuno.theme                  | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index 9704aa8283..49f4a39056 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -226,7 +226,7 @@ Feature: Search inside groups
     And the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
   @javascript
-  Scenario: Group filter chips appear in search bar after selecting them in facets
+  Scenario: Group facet summary appear in search after selecting them in facets
     When I visit the search page
     And I should see 12 tiles
 
@@ -239,13 +239,12 @@ Feature: Search inside groups
     And I should see 6 tiles
 
     When I open the search bar by clicking on the search icon
-    Then the page should show the following chip in the "Search bar":
-      | Inclined foundations |
+    And I should see the following facet summary "Inclined foundations"
 
-    # The filter chip should remain active when doing another search.
+    # The filter facets summary shouldn't remain active when doing another search.
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
+    Then I select "Inclined foundations" from the "collection/solution" select facet form
+    And I click Search in facets form
     And I should see 2 tiles
     When I open the search bar by clicking on the search icon
-    Then the page should show the following chip in the "Search bar":
-      | Inclined foundations |
+    And I should see the following facet summary "Inclined foundations"
diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
index 041b226190..f3f8b0a810 100644
--- a/web/themes/ventuno/ventuno.theme
+++ b/web/themes/ventuno/ventuno.theme
@@ -102,9 +102,22 @@ function ventuno_preprocess_page(&$variables) {
   }
 
   // Generate a link to EU Login.
+  // Get return url from current page.
+  $destination = \Drupal::request()->query->get('destination');
+  if ($destination) {
+    $destination = '/' . ltrim($destination, '/');
+    $returnto = Url::fromUserInput($destination)->setAbsolute()->toString();
+  }
+  else {
+    $returnto = Url::fromRoute('<current>', [], ['query' => \Drupal::request()->query->all()])->toString();
+  }
   $anonymous_links[] = [
     'label' => t('Sign in'),
-    'link' => Url::fromRoute('cas.login'),
+    'link' => Url::fromRoute('cas.login', [], [
+      'query' => [
+        'returnto' => $returnto,
+      ],
+    ]),
   ];
   $variables['anonymous_links'] = $anonymous_links;
 }

From 4cbfef3d1d5754bca68f889723aae8af061fa311 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 14:25:59 +0100
Subject: [PATCH 13/20] ISAICP-6688: Update facets_form.

---
 composer.json                                      | 3 ---
 composer.lock                                      | 2 +-
 web/themes/ventuno/templates/layout/page.html.twig | 9 +++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 5e0653de4f..553e20e6e3 100644
--- a/composer.json
+++ b/composer.json
@@ -301,9 +301,6 @@
                 "Configurable dropdown child prefix. @see https://www.drupal.org/project/facets/issues/3214662": "https://git.drupalcode.org/project/facets/-/merge_requests/20.diff",
                 "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
             },
-            "drupal/facets_form": {
-                "Implement calculate dependencies. @see https://www.drupal.org/project/facets_form/issues/3230468": "https://git.drupalcode.org/project/facets_form/-/merge_requests/15.diff"
-            },
             "drupal/honeypot": {
                 "Behat integration. @see https://www.drupal.org/project/honeypot/issues/3059040": "https://www.drupal.org/files/issues/2020-09-09/3059040-31.patch",
                 "Provide ways to clean up old honeypot_time_restriction values @see https://www.drupal.org/project/honeypot/issues/2997609": "https://git.drupalcode.org/project/honeypot/-/merge_requests/2.diff"
diff --git a/composer.lock b/composer.lock
index 9d94185930..162148dbac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "89f2015aae77149b6750f18fbcff520e",
+    "content-hash": "edac0f0611125534002ce69a61071ae6",
     "packages": [
         {
             "name": "SEMICeu/adms-ap_validator",
diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig
index 0562b72b01..dacd5e26be 100644
--- a/web/themes/ventuno/templates/layout/page.html.twig
+++ b/web/themes/ventuno/templates/layout/page.html.twig
@@ -89,15 +89,16 @@
   <main role="main">
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
-    <div class="container layout-content">
-      {{ page.content }}
-    </div>{# /.layout-content #}
-
     {% if page.sidebar %}
       <aside class="layout-sidebar" role="complementary">
         {{ page.sidebar }}
       </aside>
     {% endif %}
+
+    <div class="container layout-content">
+      {{ page.content }}
+    </div>{# /.layout-content #}
+
   </main>
 
   {{ page.content_bottom }}

From 26377d0dec12b39660df0e59af81ea21171488ea Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 16:02:53 +0100
Subject: [PATCH 14/20] ISAICP-6688: Revert file search.feature.

---
 tests/features/joinup_search/search.feature | 873 ++++++++++++++------
 1 file changed, 639 insertions(+), 234 deletions(-)

diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index 49f4a39056..b89254d564 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -1,250 +1,655 @@
-@api @terms
-Feature: Search inside groups
-  In order to quickly find content inside the group I am currently perusing
-  As a user of Joinup
-  I want to be able to launch a search limited to my current collection or solution
-
-  Background:
-    Given collection:
-      | title            | Chalet construction |
-      | logo             | logo.png            |
-      | moderation       | no                  |
-      | topic            | Demography          |
-      | spatial coverage | Switzerland         |
-      | state            | validated           |
-    And solution:
-      | title       | Inclined foundations                                  |
-      | description | Ways to construct foundations on hills and mountains. |
-      | banner      | banner.jpg                                            |
-      | logo        | logo.png                                              |
-      | collection  | Chalet construction                                   |
-      | state       | validated                                             |
-    And discussion content:
-      | title      | body                           | state     | collection          | solution             |
-      | Room sizes | What are the ideal dimensions? | validated | Chalet construction |                      |
-      | Terrace?   | Want a decent sized terrace    | validated |                     | Inclined foundations |
-    And document content:
-      | title       | body               | state     | collection          | solution             |
-      | Ground plan | A classic design   | validated | Chalet construction |                      |
-      | Rock types  | Ranked by hardness | validated |                     | Inclined foundations |
+@api @terms @group-b
+Feature: Global search
+  As a user of the site I can find content through the global search.
+
+  # Todo: This test runs with javascript enabled because in a non-javascript
+  # environment, the dropdown facet is simply a list of links. Remove the
+  # `@javascript` tag when the upstream issue in the Facets module is fixed.
+  # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-5739
+  # Ref. https://www.drupal.org/project/facets/issues/2937191
+  @javascript
+  Scenario: Anonymous user can find items
+    Given the following collection:
+      | title            | Molecular cooking collection |
+      | logo             | logo.png                     |
+      | moderation       | no                           |
+      | topic            | Demography                   |
+      | spatial coverage | Belgium                      |
+      | state            | validated                    |
+    And the following solutions:
+      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
+      | Spherification | Molecular cooking collection | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
+      | Foam           | Molecular cooking collection | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
+    And news content:
+      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
+      | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
+      | Dummy news 1          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 2          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 3          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 4          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+
+    Given I am logged in as a user with the "authenticated" role
+    # @todo The search page cache should be cleared when new content is added.
+    # @see https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-3428
+    And the cache has been cleared
+    When I visit the search page
+    # All content is visible.
+    Then I should see the "Molecular cooking collection" tile
+    And I should see the "El Celler de Can Roca" tile
+    And I should see the "Spherification" tile
+    And I should see the "Foam" tile
+    # Terms are sorted alphabetically
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      # Parent term.
+      | Info                    |
+      # Child term.
+      | - Statistics and Analysis |
+      # Parent term.
+      | Social and Political    |
+      # Child terms.
+      | - Demography              |
+      | - E-inclusion             |
+    # Since the topics are indented by a whitespace, and the whitespaces are trimmed in the step above, we are testing
+    # the full response in order to ensure that the results are indented properly. The &nbsp; character below is the
+    # printable space character.
+    # @todo and WARNING. The following   character is supported by the old 3.4 selenium server. Change this in the
+    # new infrastructure with the &nbsp; encoded character.
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#info\">Info</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#statistics-and-analysis\">- Statistics and Analysis</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic/category#social-and-political\">Social and Political</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#demography\">- Demography</option>"
+    And the response should contain "<option value=\"http://joinup.eu/ontology/topic#e-inclusion\">- E-inclusion</option></select>"
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
+      | Luxembourg (5)     |
+    # Check that only one search field is available. In an earlier version of
+    # Joinup there were two search fields, but this was confusing users.
+    And there should be exactly 1 "search field" on the page
+
+    When I select "Social and Political" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "Social and Political" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
+    # The tiles appear because the parent term is selected even though they do not have a direct reference there.
+    And I should see the "Dummy news 1" tile
+    And I should see the "Dummy news 2" tile
+    And I should see the "Dummy news 3" tile
+    And I should see the "Dummy news 4" tile
+
+    # Test the topic facet. The space prefixing "Demography" is due to the hierarchy.
+    When I select " Demography" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "- Demography" from select facet form "topic" is selected
+    # The selected option moves to the last position by default.
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
+
+    #Then the option with text "Any location" from select facet form "spatial coverage" is selected
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
+    And I should see the "Molecular cooking collection" tile
+    And I should see the "Spherification" tile
+    But I should not see the "El Celler de Can Roca" tile
+    And I should not see the "Foam" tile
+
+    # Test the spatial coverage facet.
+    When I select "Belgium" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Belgium (1)" from select facet form "spatial coverage" is selected
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
+    Then the option with text "- Demography" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
+      | Any topic            |
+      | Social and Political |
+      | - Demography         |
+    And I should see the "Molecular cooking collection" tile
+    But I should not see the "El Celler de Can Roca" tile
+    And I should not see the "Spherification" tile
+    And I should not see the "Foam" tile
+
+    # Reset the search by visiting again the search page.
+    Given I am on the search page
+    Then I should see the text "Content types" in the "Left sidebar" region
+
+    # Select link in the 'type' facet.
+    When I select "News (5)" from the "Content type" select facet form
+    And I click Search in facets form
+    Then the option with text "News (5)" from select facet form "Content types" is selected
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+
+    When I select "Solutions (2)" from the "Content type" select facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News, Solutions"
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+    And the "topic" select facet form should contain the following options:
+      | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
+      | Social and Political      |
+      | - Demography              |
+      | - E-inclusion             |
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | European Union (1) |
+      | Luxembourg (5)     |
+    And I should not see the "Molecular cooking collection" tile
+    And I should see the "El Celler de Can Roca" tile
+    But I should see the "Spherification" tile
+    And I should see the "Foam" tile
+
+    # Launch a text search.
+    When I open the search bar by clicking on the search icon
+    And I enter "Cooking" in the search bar and press enter
+    Then I should see the "Molecular cooking collection" tile
+    And I should see the "Foam" tile
+    But I should not see the "Spherification" tile
+    And I should not see the "El Celler de Can Roca" tile
+
+  @javascript
+  Scenario: Alphabetical order for the spatial coverage in the search page.
+    Given the following owner:
+      | name              | type    |
+      | Responsible owner | Company |
+    And the following contact:
+      | name  | Go-to contact     |
+      | email | go-to@example.com |
+    And the following collections:
+      | title            | description                                          | abstract                       | state     |
+      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
+      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
     And event content:
-      | title                        | body                              | state     | collection          | solution             |
-      | Opening of the winter season | Ski resorts will open in December | validated | Chalet construction |                      |
-      | Presenting DrillMaster X88   | Our most finely ground drill bit  | validated |                     | Inclined foundations |
+      | title             | short title       | body                                | spatial coverage | agenda         | location       | organisation        | scope         | keywords | collection       | state     |
+      | Event Omega       | Event short delta | The epsilon event content.          | Greece           | Event agenda.  | Some place     | European Commission | International | Alphabet | Collection alpha | validated |
+      | Alternative event | Alt event         | This event stays in the background. | Luxembourg       | To be planned. | Event location | Event organisation  |               |          | Collection alpha | validated |
+    And document content:
+      | title          | document type | short title          | body                                    | spatial coverage | keywords | collection       | state     |
+      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
+
+    When I visit the search page
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location     |
+      | Greece (1)       |
+      | Luxembourg (2)   |
+    When I select "Luxembourg" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Luxembourg (2)" from select facet form "spatial coverage" is selected
+    And I should see the text "Search Results (2)"
+    # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location     |
+      | Greece (1)       |
+      | Luxembourg (2)   |
+
+  Scenario: Content can be found with a full-text search.
+    Given the following owner:
+      | name              | type    |
+      | Responsible owner | Company |
+    And the following contact:
+      | name  | Go-to contact     |
+      | email | go-to@example.com |
+    And the following collections:
+      | title            | description                                          | abstract                       | state     |
+      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
+      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
+    And the following solutions:
+      | title          | description                                                | keywords | owner             | contact information | collection  | state     |
+      | Solution alpha | <p>This is the solution <strong>beta</strong> description. | Alphabet | Responsible owner | Go-to contact       | Col for Sol | validated |
+    And the following releases:
+      | title         | release number | release notes                               | keywords | is version of  | owner             | contact information | state     |
+      | Release Alpha | 1              | <p>Release notes for <em>beta</em> changes. | Alphabet | Solution alpha | Responsible owner | Go-to contact       | validated |
+    And the following distributions:
+      | title              | description                                    | parent        | access url |
+      | Distribution alpha | <p>A simple beta distribution description.</p> | Release Alpha | test.zip   |
+    And the following licences:
+      | title         | description                         |
+      | Licence Alpha | A beta description for the licence. |
     And news content:
-      | title             | body            | collection          | solution             | topic                   | spatial coverage | state     |
-      | Natural materials | Ground feel     | Chalet construction |                      | Statistics and Analysis | Switzerland      | validated |
-      | Still frozen      | Maybe next week |                     | Inclined foundations |                         | Austria          | validated |
+      | title      | headline            | body                      | keywords | collection       | state     |
+      | News omega | News headline delta | The epsilon news content. | Alphabet | Collection alpha | validated |
+    And event content:
+      | title             | short title       | body                                | agenda         | location       | organisation        | scope         | keywords | collection       | solution       | state     |
+      | Event Omega       | Event short delta | The epsilon event content.          | Event agenda.  | Some place     | European Commission | International | Alphabet |                  | Solution alpha | validated |
+      | Alternative event | Alt event         | This event stays in the background. | To be planned. | Event location | Event organisation  |               |          | Collection alpha |                | validated |
+    And document content:
+      | title          | document type | short title          | body                                    | keywords | collection       | state     |
+      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Alphabet | Collection alpha | validated |
+    And discussion content:
+      | title            | body                                                              | solution       | state     |
+      | Discussion omega | <p>Does anybody has idea why this <em>epsilon</em> is everywhere? | Solution alpha | validated |
     And custom_page content:
-      | title     | body                             | collection          | solution             |
-      | Resources | Here are some interesting links. | Chalet construction |                      |
-      | Geography | A collection of height maps.     |                     | Inclined foundations |
-    And releases:
-      | title     | release number | release notes              | is version of        | state     |
-      | Pre-alpha | 0.0-alpha0     | Only works on flat ground. | Inclined foundations | validated |
-    And distributions:
-      | title       | description          | parent    | access url |
-      | Zip archive | It has files inside. | Pre-alpha | test.zip   |
+      | title      | body                                     | collection       |
+      | Page omega | This is just an epsilon but should work. | Collection alpha |
+    And video content:
+      | title       | body          | field_video                                 | collection       |
+      | Video alpha | Slap like now | https://www.youtube.com/watch?v=JhGf8ZY0tN8 | Collection alpha |
+    And users:
+      | Username     | E-mail                      | First name | Family name | Organisation |
+      | jenlyle      | jenessa.carlyle@example.com | Jenessa    | Carlyle     | Clyffco      |
+      | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
 
-  @javascript
-  Scenario: Group filters are shown as chips
-    # Pages that do not belong to a collection or solution do not have chips in
-    # the search field.
-    When I am on the homepage
-    Then the page should not contain any chips
-    When I visit the collection overview
-    Then the page should not contain any chips
-    When I visit the solution overview
-    Then the page should not contain any chips
-    When I visit the contact form
-    Then the page should not contain any chips
-
-    # Check that the name of the collection is shown as a chip in the search
-    # field on the collection homepage. The chips are initially hidden but will
-    # appear after clicking on the search icon to open the search bar.
-    When I go to the homepage of the "Chalet construction" collection
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-
-    # Do a search without entering any keywords. Because the collection is shown
-    # as a chip in the search field the search results should be filtered and
-    # only show the content of the collection.
-    When I submit the search by pressing enter
-    Then the option with text "Chalet construction (6)" from select facet form "collection/solution" is selected
-    And the page should show the tiles "Room sizes, Ground plan, Opening of the winter season, Natural materials, Resources, Inclined foundations"
-
-    # Check that other types of pages in the collection also show the collection
-    # as a chip.
-    When I go to the "Room sizes" discussion
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-    # It should be possible to remove the chip by clicking the delete button.
-    When I press the remove button on the chip "Chalet construction"
-    Then the page should not contain any chips
-
-    When I go to the "Ground plan" document
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-    # It should be possible to remove the chip by typing a backspace in the
-    # search field.
-    When I press backspace in the search bar
-    Then the page should not contain any chips
-
-    When I go to the "Opening of the winter season" event
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-    When I go to the "Natural materials" news
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-    When I go to the "Resources" custom page
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-
-    # Check that the name of the solution is shown as a chip in the search field
-    # on the solution homepage.
-    When I go to the homepage of the "Inclined foundations" solution
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-
-    # Do a search without entering any keywords. Because the solution is shown
-    # as a chip in the search field the search results should be filtered and
-    # only show the content of the solution.
-    When I submit the search by pressing enter
-    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
-    Then the page should show the tiles "Pre-alpha, Presenting DrillMaster X88, Rock types, Still frozen, Geography, Terrace?"
-
-    # Do a search with a keyword. The chip for the solution should be present
-    # so the results are filtered by keyword and solution.
-    Given I am on the homepage of the "Inclined foundations" solution
-    When I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
-    And the page should show the tiles "Pre-alpha, Presenting DrillMaster X88"
-
-    # Do a search with a keyword after removing the chip for the solution. The
-    # results should only be filtered by keyword, not by solution.
-    Given I am on the homepage of the "Inclined foundations" solution
-    When I open the search bar by clicking on the search icon
-    And I press the remove button on the chip "Inclined foundations"
-    And I enter "ground" in the search bar and press enter
-    Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
+    When I visit the search page
+    And the "Content types" select facet form should contain the following options:
+      | Collections (2)	|
+      | Custom page (1)	|
+      | Discussion (1)	|
+      | Document (1)		|
+      | Events (2)		  |
+      | Licence (1)		  |
+      | News (1)			  |
+      | Release (1)		  |
+      | Solution (1)		|
+      | Video (1)			  |
 
-    # Do a search with a keyword and removing the chip for the solution after
-    # the keywords have been typed in. This should have the same result.
-    Given I am on the homepage of the "Inclined foundations" solution
-    When I open the search bar by clicking on the search icon
-    And I enter "ground" in the search bar
-    And I press the remove button on the chip "Inclined foundations"
-    And I submit the search by pressing enter
-    Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
-
-    # Check that other types of pages in the solution also show the collection
-    # as a chip.
-    When I go to the "Terrace?" discussion
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    # It should be possible to remove the chip by clicking the delete button.
-    When I press the remove button on the chip "Inclined foundations"
-    Then the page should not contain any chips
-
-    When I go to the "Rock types" document
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    # It should be possible to remove the chip by typing a backspace in the
-    # search field.
-    When I press backspace in the search bar
-    Then the page should not contain any chips
-
-    When I go to the "Presenting DrillMaster X88" event
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    When I go to the "Still frozen" news
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    When I go to the "Geography" custom page
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    When I go to the "Pre-alpha" release
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
-    When I go to the "Zip archive" distribution
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Inclined foundations |
+    # "Alpha" is used in all the rdf entities titles.
+    When I enter "Alpha" in the search bar and press enter
+    Then I should see the text "Search Results (5)"
+    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
+
+    # "Omega" is used in all the node entities titles. Since the content of
+    # custom pages is added to their collection, we also match the collection.
+    When I enter "omega" in the search bar and press enter
+    Then I should see the text "Search Results (6)"
+    And the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
+
+    # "Beta" is used in all the rdf entities body fields.
+    When I enter "beta" in the search bar and press enter
+    Then I should see the text "Search Results (4)"
+    And the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
+
+    # "Epsilon" is used in all the node entities body fields.
+    When I enter "epsilon" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
+
+    # "Alphabet" is used in all the keywords fields.
+    When I enter "Alphabet" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha, News omega, Event Omega, Document omega"
+
+    # "Gamma" is used in the collection abstract.
+    When I enter "gamma" in the search bar and press enter
+    Then the page should show the tiles "Collection alpha"
+
+    # "Delta" is used in headline and short titles.
+    When I enter "delta" in the search bar and press enter
+    Then the page should show the tiles "News omega, Event Omega, Document omega"
+
+    # Search for the event fields: agenda, location, address, organisation, scope.
+    When I enter "agenda" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+    When I enter "location" in the search bar and press enter
+    Then the page should show the tiles "Alternative event"
+    When I enter "place" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+    When I enter "organisation" in the search bar and press enter
+    Then the page should show the tiles "Alternative event"
+    When I enter "international" in the search bar and press enter
+    Then the page should show the tiles "Event Omega"
+
+    # The owner and contact information names should be indexed inside the solutions/releases they are linked to.
+    When I enter "responsible" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha"
+    # Visit the homepage to be sure that the test fetches the correct updated page.
+    When I go to the homepage
+    And I enter "contact" in the search bar and press enter
+    Then the page should show the tiles "Solution alpha, Release Alpha"
+
+    # Users should be found by first name, family name and organisation.
+    # @todo Enable when this ticket is implemented ISAICP-6575.
+    # When I enter "Jenessa" in the search bar and press enter
+    # Then the page should show the tiles "Jenessa Carlyle"
+    # When I enter "freeman" in the search bar and press enter
+    # Then the page should show the tiles "Ulysses Freeman"
+    # When I enter "clyffco" in the search bar and press enter
+    # Then the page should show the tiles "Jenessa Carlyle"
+    # When I enter "Omero+snc" in the search bar and press enter
+    # Then the page should show the tiles "Ulysses Freeman"
+
+  Scenario: Advanced search
+    # An advanced search link is shown in the header, except on the search page.
+    Given I am on the homepage
+    Then I should see the link "advanced search"
+    Given I visit the collection overview
+    Then I should see the link "Advanced search"
+    When I click "Advanced search"
+    Then I should be on the advanced search page
+    But I should not see the link "Advanced search"
+
+  Scenario: Collections and solutions are shown first in search results with the same relevance.
+    Given collections:
+      | title                           | description                         | state     |
+      | Ornithology: the study of birds | Ornithology is a branch of zoology. | validated |
+      | Husky Flying Xylophone          | A strange instrument.               | validated |
+    And the following solution:
+      | title       | Bird outposts in the wild            |
+      | collection  | Ornithology: the study of birds      |
+      | description | Exotic wings and where to find them. |
+      | state       | validated                            |
+    And custom_page content:
+      | title           | body                                  | collection                      |
+      | Disturbed birds | Flocks of trained pigeons flying off. | Ornithology: the study of birds |
+    And news content:
+      | title                               | body                            | collection                      | state     |
+      | Chickens are small birds            | Birds domesticated in India.    | Ornithology: the study of birds | validated |
+      | Found a xylophone from 1600 in Asia | Oldest instrument of this type. | Husky Flying Xylophone          | validated |
+    And event content:
+      | title         | body                   | collection                      | state     |
+      | Bird spotting | Roosters crow at dawn. | Ornithology: the study of birds | validated |
+    And discussion content:
+      | title                             | body                    | collection                      | state     |
+      | Best place to find an exotic bird | Somewhere exotic maybe? | Ornithology: the study of birds | validated |
+    And user:
+      | Username    | Bird watcher |
+      | First name  | Bird         |
+      | Family name | Birdman      |
+
+    # The bird is the word... to search.
+    When I enter "Bird" in the search bar and press enter
+    Then I should see the following tiles in the correct order:
+      | Ornithology: the study of birds   |
+      | Bird outposts in the wild         |
+      | Disturbed birds                   |
+      | Chickens are small birds          |
+      | Bird spotting                     |
+      | Best place to find an exotic bird |
+      # @todo Enable when this ticket is implemented ISAICP-6575.
+      # | Bird Birdman                      |
 
   @clearStaticCache
-  Scenario: Group search caching
-    # Initially the cache is cold.
-    When I go to the homepage of the "Chalet construction" collection
-    Then the page should show the following chip:
-      | Chalet construction |
-    And the page should not be cached
-    # A subsequent request should be served from cache.
-    When I reload the page
-    Then the page should show the following chip:
-      | Chalet construction |
-    And the page should be cached
-    # Check that changing the name of the collection correctly invalidates the
-    # cache.
-    When I change the name of the "Chalet construction" collection to "Chalet destruction"
-    And I go to the homepage of the "Chalet destruction" collection
-    Then the page should show the following chip:
-      | Chalet destruction |
-    And the page should not be cached
-    When I reload the page
-    Then the page should show the following chip:
-      | Chalet destruction |
-    And the page should be cached
+  Scenario: Solutions and/or releases are found by their distribution keyword.
+    Given the following licences:
+      | title      |
+      | Apache-2.0 |
+      | LGPL       |
+    And the following solution:
+      | title | Zzolution |
+      | state | validated |
 
-  @javascript
-  Scenario: Group filters remain active in the search bar when viewing search results
-    When I go to the homepage of the "Chalet construction" collection
-    And I open the search bar by clicking on the search icon
-    Then the page should show the following chip:
-      | Chalet construction |
-    When I enter "ground" in the search bar and press enter
-    Then the option with text "Chalet construction (2)" from select facet form "collection/solution" is selected
-    And the page should show the tiles "Ground plan, Natural materials"
-    And I should see the following facet summary "Chalet construction"
-    When I should remove the following facet summary "Chalet construction"
-    Then the page should not contain any summary
-    And the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
+    When I enter "ZzoluDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Add distribution, child of solution.
+    Given the following distribution:
+      | title                    | ZzoluDistro                     |
+      | parent                   | Zzolution                       |
+      | description              | Übermensch foot size            |
+      | access url               | http://example.com/zzolu-distro |
+      | licence                  | Apache-2.0                      |
+      | format                   | HTML                            |
+      | representation technique | Datalog                         |
+
+    When I enter "zzoludistro" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "ubermensch" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "zzolu-distro" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "apache" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "Apache-2.0,Zzolution"
+    When I enter "HTML" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "Datalog" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+
+    Given I am logged in as a moderator
+    When I go to the edit form of the "ZzoluDistro" distribution
+    And I fill in "Title" with "DistroZzolu"
+    And I fill in "Description" with "Nietzsche's"
+    And I press the "Remove" button
+    And I set a remote URL "http://example.com/guzzle" to "Access URL"
+    And I select "LGPL" from "Licence"
+    And I select "CSV" from "Format"
+    And I select "Human Language" from "Representation technique"
+    And I press "Save"
+    Then I should see the heading "DistroZzolu"
+
+    # Repeat the previous searches to prove that the initial keywords were
+    # removed from the Search API index.
+    Given I am an anonymous user
+    When I enter "zzoludistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "ubermensch" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "zzolu-distro" in the search bar and press enter
+    Then I should not see the text "Search Results"
+    And I should see "No content found for your search."
+    When I enter "apache" in the search bar and press enter
+    Then the page should show only the tiles "Apache-2.0"
+    When I enter "HTML" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Datalog" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Search now with the new keywords.
+    When I enter "distrozzolu" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "nietzsche" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "guzzle" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "lGPL" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "LGPL,Zzolution"
+    When I enter "CSV" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+    When I enter "Human Language" in the search bar and press enter
+    Then the page should show only the tiles "Zzolution"
+
+    Given I delete the "DistroZzolu" asset distribution
+
+    # The parent solution has been re-indexed without distribution data.
+    When I enter "distrozzolu" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "nietzsche" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "guzzle" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "lGPL" in the search bar and press enter
+    Then the page should show only the tiles "LGPL"
+    When I enter "CSV" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Human Language" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Add a new distribution, child of a release.
+    Given the following release:
+      | title         | Releazz   |
+      | state         | validated |
+      | is version of | Zzolution |
+
+    When I enter "ReleazzDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    Given the following distribution:
+      | title                    | ReleazzDistro                     |
+      | parent                   | Releazz                           |
+      | description              | Dracula                           |
+      | access url               | http://example.com/releazz-distro |
+      | licence                  | Apache-2.0                        |
+      | format                   | HTML                              |
+      | representation technique | Datalog                           |
+
+    When I enter "releazzDistro" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "dracula" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "releazz-distro" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "apache" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "Apache-2.0,Releazz"
+    When I enter "HTML" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "Datalog" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+
+    Given I am logged in as a moderator
+    When I go to the edit form of the "ReleazzDistro" distribution
+    And I fill in "Title" with "DistroReleazz"
+    And I fill in "Description" with "Zorro"
+    And I press the "Remove" button
+    And I set a remote URL "http://example.com/mishmash" to "Access URL"
+    And I select "LGPL" from "Licence"
+    And I select "CSV" from "Format"
+    And I select "Human Language" from "Representation technique"
+    And I press "Save"
+
+    # Repeat the previous searches to prove that the initial keywords were
+    # removed from the Search API index.
+    Given I am an anonymous user
+    When I enter "releazzDistro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "dracula" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "releazz-distro" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "apache" in the search bar and press enter
+    Then the page should show only the tiles "Apache-2.0"
+    When I enter "HTML" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Datalog" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+    # Search now with the new keywords.
+    When I enter "dIstrOreleazz" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "zoRRo" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "mishMash" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "LGpl" in the search bar and press enter
+    # Also the licence itself is retrieved.
+    Then the page should show only the tiles "LGPL,Releazz"
+    When I enter "CSV" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+    When I enter "Human Language" in the search bar and press enter
+    Then the page should show only the tiles "Releazz"
+
+    Given I delete the "DistroReleazz" asset distribution
+
+    # The parent release has been re-indexed without distribution data.
+    When I enter "dIstrOreleazz" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "zoRRo" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "mishMash" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "lGPL" in the search bar and press enter
+    Then the page should show only the tiles "LGPL"
+    When I enter "CSV" in the search bar and press enter
+    Then I should see "No content found for your search."
+    When I enter "Human Language" in the search bar and press enter
+    Then I should see "No content found for your search."
+
+  Scenario: Collections are found by their keywords.
+    Given the following collection:
+      | title    | Collection sample       |
+      | keywords | unique, key-definitions |
+      | state    | validated               |
+
+    When I enter "key-definitions" in the search bar and press enter
+    Then the page should show only the tiles "Collection sample"
+
+    When I enter "unique" in the search bar and press enter
+    Then the page should show only the tiles "Collection sample"
 
   @javascript
-  Scenario: Group facet summary appear in search after selecting them in facets
-    When I visit the search page
-    And I should see 12 tiles
+  Scenario: Users are able to select the sort order.
+    Given collections:
+      | title             | description       | state     |
+      | Custom collection | Some custom data. | validated |
+    And news content:
+      | title                              | body                                                              | collection        | state     | created    | changed    |
+      | Relativity is the word             | No one cares about the body.                                      | Custom collection | validated | 01/01/2019 | 03/08/2019 |
+      | Relativity news: Relativity theory | I do care about the relativity keyword in the body.               | Custom collection | validated | 02/01/2019 | 02/08/2019 |
+      | Absolutely nonesense               | Some news are not worth it but I will add relativity here anyway. | Custom collection | validated | 03/01/2019 | 01/08/2019 |
 
-    When I open the search bar by clicking on the search icon
-    Then the page should not contain any chips
+    When I am on the homepage
+    And I enter "Relativity" in the search bar and press enter
+    Then the option "Relevance" should be selected
+    And I should see the text "Search Results (3)"
+    And I should see the following tiles in the correct order:
+      | Relativity news: Relativity theory |
+      | Relativity is the word             |
+      | Absolutely nonesense               |
+    And I should be on "/search?keys=Relativity&sort_by=relevance"
+
+    Given I select "Creation Date" from "Sort by"
+    Then I should see the following tiles in the correct order:
+      | Absolutely nonesense               |
+      | Relativity news: Relativity theory |
+      | Relativity is the word             |
+    And I should be on "/search?keys=Relativity&sort_by=creation-date"
+
+    Given I select "Last Updated Date" from "Sort by"
+    Then I should see the following tiles in the correct order:
+      | Relativity is the word             |
+      | Relativity news: Relativity theory |
+      | Absolutely nonesense               |
+    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
+
+  @javascript
+  Scenario: Anonymous user can find facets summary
+    Given the following collection:
+      | title            | Radio cooking collection     |
+      | logo             | logo.png                     |
+      | moderation       | no                           |
+      | topic            | Demography                   |
+      | spatial coverage | Belgium                      |
+      | state            | validated                    |
+    And the following solutions:
+      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
+      | Spheres        | Radio cooking collection     | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
+      | Movistar       | Radio cooking collection     | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
+    And news content:
+      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
+      | El Cabo da Roca       | The best in town | Radio cooking collection     | Statistics and Analysis | Luxembourg       | validated |
+      | Funny news 1          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 2          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 3          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
+      | Funny news 4          | Dummy body       | Radio cooking collection     | E-inclusion             | Luxembourg       | validated |
 
-    When I select "Inclined foundations" from the "collection/solution" select facet form
+    Given I am logged in as a user with the "authenticated" role
+    When I visit the search page
+    And I select "Solutions (2)" from the "Content types" select facet form
+    And I select "News (5)" option in the "Content types" select facet form
     And I click Search in facets form
-    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
-    And I should see 6 tiles
+    And I should see the following facet summary "News, Solutions"
 
-    When I open the search bar by clicking on the search icon
-    And I should see the following facet summary "Inclined foundations"
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News"
 
-    # The filter facets summary shouldn't remain active when doing another search.
-    When I enter "ground" in the search bar and press enter
-    Then I select "Inclined foundations" from the "collection/solution" select facet form
+    # Check if facet summary was remove correctly.
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I select "Collection (1)" option in the "Content types" select facet form
     And I click Search in facets form
-    And I should see 2 tiles
-    When I open the search bar by clicking on the search icon
-    And I should see the following facet summary "Inclined foundations"
+    And I should see the following facet summary "Collection, News"
+    Then I should remove the following facet summary "News"
+    And the page should show only the tiles "Radio cooking collection"

From de1137ce747f40e5414b3c2f4010710c3f9b1185 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Thu, 30 Sep 2021 22:58:48 +0100
Subject: [PATCH 15/20] ISAICP-6688: Fix search test.

---
 tests/features/joinup_search/search.feature | 41 +++++++++------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index b89254d564..784c6b92ab 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -126,12 +126,9 @@ Feature: Global search
     And I should not see the "Spherification" tile
     And I should not see the "Foam" tile
 
-    # Reset the search by visiting again the search page.
-    Given I am on the search page
-    Then I should see the text "Content types" in the "Left sidebar" region
-
     # Select link in the 'type' facet.
-    When I select "News (5)" from the "Content type" select facet form
+    Given I am on the search page
+    When I select "News (5)" from the "Content types" select facet form
     And I click Search in facets form
     Then the option with text "News (5)" from select facet form "Content types" is selected
     And the "Content types" select facet form should contain the following options:
@@ -139,20 +136,17 @@ Feature: Global search
       | News (5)        |
       | Solutions (2)   |
 
-    When I select "Solutions (2)" from the "Content type" select facet form
+    When I select "Solutions (2)" from the "Content types" select facet form
     And I click Search in facets form
-    And I should see the following facet summary "News, Solutions"
+    And I should see the following facet summary "Solutions"
     And the "Content types" select facet form should contain the following options:
       | Collection (1)  |
       | News (5)        |
       | Solutions (2)   |
     And the "topic" select facet form should contain the following options:
       | Any topic                 |
-      | Info                      |
-      | - Statistics and Analysis |
       | Social and Political      |
       | - Demography              |
-      | - E-inclusion             |
     And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | European Union (1) |
@@ -598,19 +592,20 @@ Feature: Global search
       | Absolutely nonesense               |
     And I should be on "/search?keys=Relativity&sort_by=relevance"
 
-    Given I select "Creation Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Absolutely nonesense               |
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-    And I should be on "/search?keys=Relativity&sort_by=creation-date"
-
-    Given I select "Last Updated Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Relativity is the word             |
-      | Relativity news: Relativity theory |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
+    # @todo Enable when this ticket is implemented ISAICP-6575.
+    # When I select "Creation Date" from "Sort by"
+    # And I should see the following tiles in the correct order:
+    #   | Absolutely nonesense               |
+    #   | Relativity news: Relativity theory |
+    #   | Relativity is the word             |
+    # And I should be on "/search?keys=Relativity&sort_by=creation-date"
+    #
+    # When I select "Last Updated Date" from "Sort by"
+    # And I should see the following tiles in the correct order:
+    #   | Relativity is the word             |
+    #   | Relativity news: Relativity theory |
+    #   | Absolutely nonesense               |
+    # And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
 
   @javascript
   Scenario: Anonymous user can find facets summary

From 9428aec6e14287fe747a2889ecd1164302424e8b Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Fri, 1 Oct 2021 12:02:27 +0100
Subject: [PATCH 16/20] ISAICP-6688: Fix search test.

---
 tests/features/joinup_search/search.feature | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index 784c6b92ab..036dfd04c3 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -136,17 +136,20 @@ Feature: Global search
       | News (5)        |
       | Solutions (2)   |
 
-    When I select "Solutions (2)" from the "Content types" select facet form
+    When I select "Solutions (2)" option in the "Content types" select facet form
     And I click Search in facets form
-    And I should see the following facet summary "Solutions"
+    And I should see the following facet summary "News, Solutions"
     And the "Content types" select facet form should contain the following options:
       | Collection (1)  |
       | News (5)        |
       | Solutions (2)   |
     And the "topic" select facet form should contain the following options:
       | Any topic                 |
+      | Info                      |
+      | - Statistics and Analysis |
       | Social and Political      |
       | - Demography              |
+      | - E-inclusion             |
     And the "spatial coverage" select facet form should contain the following options:
       | Any location       |
       | European Union (1) |

From 7cd64b7cb3fdce5f2087efeb419e20bb5c322f6e Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Mon, 11 Oct 2021 09:04:58 +0100
Subject: [PATCH 17/20] ISAICP-6688: Fix remarks and change CAS returnto.

---
 .../joinup_search/group_search.feature        |  2 +-
 tests/src/Context/JoinupContext.php           | 43 -------------------
 tests/src/Context/JoinupSearchContext.php     |  7 ++-
 tests/src/Traits/TraversingTrait.php          |  5 ++-
 web/themes/ventuno/ventuno.theme              | 35 ++++++---------
 5 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index 49f4a39056..3e15d81704 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -222,7 +222,7 @@ Feature: Search inside groups
     And the page should show the tiles "Ground plan, Natural materials"
     And I should see the following facet summary "Chalet construction"
     When I should remove the following facet summary "Chalet construction"
-    Then the page should not contain any summary
+    Then the page should not contain any facet summary
     And the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
   @javascript
diff --git a/tests/src/Context/JoinupContext.php b/tests/src/Context/JoinupContext.php
index ec622ee8c3..daf513c44a 100644
--- a/tests/src/Context/JoinupContext.php
+++ b/tests/src/Context/JoinupContext.php
@@ -2741,49 +2741,6 @@ public function assertElementCount(string $count, string $element_name): void {
     Assert::assertEquals((int) $count, count($this->getElementsMatchingElementAlias($element_name)));
   }
 
-  /**
-   * Returns selectors used to find elements with a human readable identifier.
-   *
-   * @param string $alias
-   *   A human readable element identifier.
-   *
-   * @return array[]
-   *   An indexed array of selectors intended to be used with Mink's `find()`
-   *   methods. Each value is a tuple containing two strings:
-   *   - 0: the selector, e.g. 'css' or 'xpath'.
-   *   - 1: the locator.
-   *
-   * @throws \InvalidArgumentException
-   *   Thrown when the element name is not defined.
-   */
-  protected function getSelectorsMatchingElementAlias(string $alias): array {
-    $elements = [
-      // The various search input fields.
-      [
-        'names' => [
-          'search bar',
-          'search bars',
-          'search field',
-          'search fields',
-        ],
-        'selectors' => [
-          // The site-wide search field in the top right corner.
-          ['css', 'input#search-bar__input'],
-          // The search field on the search result pages.
-          ['css', '.form-item-keys input[type=text]'],
-        ],
-      ],
-    ];
-
-    foreach ($elements as $element) {
-      if (in_array($alias, $element['names'])) {
-        return $element['selectors'];
-      }
-    }
-
-    throw new \InvalidArgumentException("No selectors are defined for the element named '$alias'.");
-  }
-
   /**
    * Returns elements that match the given human readable identifier.
    *
diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index b7527ed788..f8f0df127a 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -825,10 +825,9 @@ public function removeFacetSummary(string $label): void {
    * @throws \Exception
    *    Thrown when the region is not found.
    *
-   * @Then the page should contain :number summary(s)
-   * @Then the page should not contain any summary
-   * @Then the :region region should contain :number summary(s)
-   * @Then the :region region should not contain any summary
+   * @Then the page should contain one facet summary
+   * @Then the page should contain :number facets summaries
+   * @Then the page should not contain any facet summary
    */
   public function assertFacetsSummaryCount(?string $number = NULL): void {
     $number = (int) $number;
diff --git a/tests/src/Traits/TraversingTrait.php b/tests/src/Traits/TraversingTrait.php
index bd0d6c1932..8ec24f302e 100644
--- a/tests/src/Traits/TraversingTrait.php
+++ b/tests/src/Traits/TraversingTrait.php
@@ -569,7 +569,10 @@ protected function getSelectorsMatchingElementAlias(string $alias): array {
           // The site-wide search field in the top right corner.
           ['css', 'input#search-bar__input'],
           // The search field on the search result pages.
-          ['css', '.form-item-keys input[type=text]'],
+          [
+            'css',
+            'div[data-drupal-selector="views-exposed-form-search-page-1"] input[data-drupal-selector="edit-keys"]',
+          ],
         ],
       ],
     ];
diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
index 1bbf91e1ea..25fd213644 100644
--- a/web/themes/ventuno/ventuno.theme
+++ b/web/themes/ventuno/ventuno.theme
@@ -84,7 +84,20 @@ function ventuno_preprocess_page(&$variables) {
   ];
 
   // Generate a link to EU Login.
-  $cas_login_link = Url::fromRoute('cas.login');
+  // Get return URL from current page.
+  $destination = \Drupal::request()->query->get('destination');
+  if ($destination) {
+    $destination = '/' . ltrim($destination, '/');
+    $returnto = Url::fromUserInput($destination)->setAbsolute()->toString();
+  }
+  else {
+    $returnto = Url::fromRoute('<current>', [], ['query' => \Drupal::request()->query->all()])->toString();
+  }
+  $cas_login_link = Url::fromRoute('cas.login', [], [
+    'query' => [
+      'destination' => $returnto,
+    ],
+  ]);
   $anonymous_links[] = [
     'label' => t('Sign in'),
     'link' => $cas_login_link,
@@ -133,26 +146,6 @@ function ventuno_preprocess_page(&$variables) {
     // that corrective action is required.
     \Drupal::logger('ventuno')->warning('"About us" link could not be rendered because the Joinup collection is not defined or doesn\'t have an About page.');
   }
-
-  // Generate a link to EU Login.
-  // Get return url from current page.
-  $destination = \Drupal::request()->query->get('destination');
-  if ($destination) {
-    $destination = '/' . ltrim($destination, '/');
-    $returnto = Url::fromUserInput($destination)->setAbsolute()->toString();
-  }
-  else {
-    $returnto = Url::fromRoute('<current>', [], ['query' => \Drupal::request()->query->all()])->toString();
-  }
-  $anonymous_links[] = [
-    'label' => t('Sign in'),
-    'link' => Url::fromRoute('cas.login', [], [
-      'query' => [
-        'returnto' => $returnto,
-      ],
-    ]),
-  ];
-  $variables['anonymous_links'] = $anonymous_links;
 }
 
 /**

From e3ad27d2ddcb1d8d1c8a591238b83abed37fef0d Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Tue, 12 Oct 2021 15:25:31 +0100
Subject: [PATCH 18/20] ISAICP-6688: Fix anonymous links.

---
 web/themes/ventuno/ventuno.theme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
index 25fd213644..4ba6ac1882 100644
--- a/web/themes/ventuno/ventuno.theme
+++ b/web/themes/ventuno/ventuno.theme
@@ -146,6 +146,8 @@ function ventuno_preprocess_page(&$variables) {
     // that corrective action is required.
     \Drupal::logger('ventuno')->warning('"About us" link could not be rendered because the Joinup collection is not defined or doesn\'t have an About page.');
   }
+
+  $variables['anonymous_links'] = $anonymous_links;
 }
 
 /**

From 9026fcdb5a61a6add770e31ac98bdeeed6bb858f Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Wed, 13 Oct 2021 08:51:55 +0100
Subject: [PATCH 19/20] ISAICP-6688: Fix CAS destination and asserts
 summary/summaries tests.

---
 tests/src/Context/JoinupSearchContext.php      |  5 ++---
 .../ventuno/templates/layout/page.html.twig    | 18 +++++++++++++-----
 web/themes/ventuno/ventuno.theme               | 12 +-----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index f8f0df127a..ba20b9113c 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -825,12 +825,11 @@ public function removeFacetSummary(string $label): void {
    * @throws \Exception
    *    Thrown when the region is not found.
    *
-   * @Then the page should contain one facet summary
-   * @Then the page should contain :number facets summaries
+   * @Then the page should contain :number facet(s) summary/summaries
    * @Then the page should not contain any facet summary
    */
   public function assertFacetsSummaryCount(?string $number = NULL): void {
-    $number = (int) $number;
+    $number = $number === 'one' ? 1 : (int) $number;
     $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block-facets-summary-blocksearch-facets-summary ')]//li[contains(concat(' ', normalize-space(@class), ' '), ' facet-summary-item--facet ')]";
     $elements = $this->getSession()->getPage()->findAll('xpath', $xpath);
     Assert::assertCount($number, $elements);
diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig
index dacd5e26be..5fe1a2cc89 100644
--- a/web/themes/ventuno/templates/layout/page.html.twig
+++ b/web/themes/ventuno/templates/layout/page.html.twig
@@ -42,25 +42,33 @@
 #}
 <div class="layout-container">
   <div class="section-header">
+    {# Temporary EC header, until this pattern is included in oe_bootstrap. #}
+    <div class="ec__header bcl-header">
+      <nav class="w-100 shadow-sm navbar">
+        <div class="container">
+          <a class="navbar-brand" href="https://ec.europa.eu/info/index_en">
+            <img src="https://cdn1.fpfis.tech.ec.europa.eu/ecl/v3.0.2/ec/images/logo/logo-ec--en.svg" alt="European Commission logo"/>
+          </a>
+        </div>
+      </nav>
+    </div>
     <header role="banner" class="region-header">
       {% include directory ~ '/templates/navigation/navbar.html.twig' with {
         breakpoint: logged_in ? "" : "sm",
         brand: {
           src: base_path ~ directory ~ "/src/images/logo.svg",
           alt: "Joinup logo"|t,
-          motto: "Interoperability solutions"|t,
           link: front_page,
         },
-        collapse_id: "navbar",
-        list_id: "list",
-        buttons: [
+        collapse_id: "main-navbar",
+        list_id: "main-navbar-list",
+        items: [
           {
             id: logged_in ? "account" : "navbar-toggler",
             icon: {
             name: logged_in ? "person-circle" : "justify",
           },
             label: logged_in ? user_name : "",
-            type: "links",
             links: logged_in ? profile_links : anonymous_links,
           },
         ],
diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
index 4ba6ac1882..7a34b90e46 100644
--- a/web/themes/ventuno/ventuno.theme
+++ b/web/themes/ventuno/ventuno.theme
@@ -85,18 +85,8 @@ function ventuno_preprocess_page(&$variables) {
 
   // Generate a link to EU Login.
   // Get return URL from current page.
-  $destination = \Drupal::request()->query->get('destination');
-  if ($destination) {
-    $destination = '/' . ltrim($destination, '/');
-    $returnto = Url::fromUserInput($destination)->setAbsolute()->toString();
-  }
-  else {
-    $returnto = Url::fromRoute('<current>', [], ['query' => \Drupal::request()->query->all()])->toString();
-  }
   $cas_login_link = Url::fromRoute('cas.login', [], [
-    'query' => [
-      'destination' => $returnto,
-    ],
+    'query' => \Drupal::destination()->getAsArray(),
   ]);
   $anonymous_links[] = [
     'label' => t('Sign in'),

From b561a25b989477cd445ca4793c65f25f5340fec6 Mon Sep 17 00:00:00 2001
From: Alexandre Dias <alex.jm.dias@gmail.com>
Date: Wed, 13 Oct 2021 15:49:50 +0100
Subject: [PATCH 20/20] ISAICP-6688: Remove getElementsMatchingElementAlias
 duplicated function.

---
 tests/src/Context/JoinupContext.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/tests/src/Context/JoinupContext.php b/tests/src/Context/JoinupContext.php
index daf513c44a..adb11e906f 100644
--- a/tests/src/Context/JoinupContext.php
+++ b/tests/src/Context/JoinupContext.php
@@ -2741,29 +2741,6 @@ public function assertElementCount(string $count, string $element_name): void {
     Assert::assertEquals((int) $count, count($this->getElementsMatchingElementAlias($element_name)));
   }
 
-  /**
-   * Returns elements that match the given human readable identifier.
-   *
-   * @param string $alias
-   *   A human readable element identifier.
-   *
-   * @return \Behat\Mink\Element\NodeElement[]
-   *   The elements matching the identifier.
-   *
-   * @throws \InvalidArgumentException
-   *   Thrown when the element name is not defined.
-   */
-  protected function getElementsMatchingElementAlias(string $alias): array {
-    $elements = [];
-
-    foreach ($this->getSelectorsMatchingElementAlias($alias) as $selector_tuple) {
-      [$selector, $locator] = $selector_tuple;
-      $elements = array_merge($elements, $this->getSession()->getPage()->findAll($selector, $locator));
-    }
-
-    return $elements;
-  }
-
   /**
    * Asserts that a paragraph containing the given text is present in the page.
    *