.gitlab-ci.yml

@@ -50,6 +50,9 @@ include:
 ################
 variables:
   _PHPUNIT_CONCURRENT: '1'
+  OPT_IN_TEST_PREVIOUS_MINOR: '1'
+  OPT_IN_TEST_NEXT_MINOR: '1'
+  OPT_IN_TEST_NEXT_MAJOR: '1'
 
 
 ###################################################################################

composer.json

@@ -12,19 +12,19 @@
   "support": {
     "issues": "https://www.drupal.org/project/issues/facets",
     "irc": "irc://irc.freenode.org/drupal-search-api",
-    "source": "git://git.drupal.org/project/facets.git"
+    "source": "https://git.drupalcode.org/project/facets"
   },
   "license": "GPL-2.0+",
   "require-dev": {
-    "drupal/search_api": "^1.28||1.x-dev",
-    "drupal/jquery_ui_slider": "~2.0",
-    "drupal/jquery_ui_touch_punch": "~1.1"
+    "drupal/search_api": "1.x-dev",
+    "drupal/jquery_ui_slider": "^2.1",
+    "drupal/jquery_ui_touch_punch": "^1.1"
   },
   "suggest": {
     "drupal/jquery_ui_slider": "Required for the 'Facets Range Widget' module to work",
     "drupal/jquery_ui_touch_punch": "Required for the 'Facets Range Widget' module to work"
   },
   "conflict": {
-    "drupal/search_api": "<1.14"
+    "drupal/search_api": "<1.30"
   }
 }

config/schema/facets.facet.schema.yml

@@ -52,7 +52,7 @@ facets.facet.*:
           type: string
           label: 'Plugin id'
         config:
-          type: facets.facet.[%parent.type]
+          type: plugin.plugin_configuration.facets_hierarchy.[%parent.type]
           label: 'Configuration'
     expand_hierarchy:
       type: boolean

config/schema/facets.processor.schema.yml

 plugin.plugin_configuration.facets_processor.*:
-  type: config_object
+  type: mapping
+
+plugin.plugin_configuration.facets_hierarchy.*:
+  type: mapping
 
 plugin.plugin_configuration.facets_processor.count_widget_widget_order:
   type: mapping

facets.info.yml

 name: 'Facets'
 type: module
 description: 'Faceted search interfaces that can be used on Search API searchers.'
-core_version_requirement: ^9.3 || ^10.0
+core_version_requirement: ^10 || ^11
 package: Search
 configure: entity.facets_facet.collection
 test_dependencies:

js/dropdown-widget.js

@@ -3,7 +3,7 @@
  * Transforms links into a dropdown list.
  */
 
-(function ($, once) {
+(function ($, Drupal, once) {
 
   'use strict';
 
@@ -101,4 +101,4 @@
     });
   };
 
-})(jQuery, once);
+})(jQuery, Drupal, once);

js/facets-views-ajax.js

@@ -65,6 +65,10 @@
 
   // Helper function to update views output & Ajax facets.
   var updateFacetsView = function (href, current_dom_id, view_path) {
+    // Update url.
+    window.historyInitiated = true;
+    window.history.pushState(null, document.title, href);
+    
     // Refresh view.
     var views_parameters = Drupal.Views.parseQueryString(href);
     var views_arguments = Drupal.Views.parseViewArgs(href, 'search');
@@ -82,10 +86,6 @@
 
     Drupal.ajax(views_ajax_settings).execute();
 
-    // Update url.
-    window.historyInitiated = true;
-    window.history.pushState(null, document.title, href);
-
     // ToDo: Update views+facets with ajax on history back.
     // For now we will reload the full page.
     window.addEventListener("popstate", function (e) {

modules/facets_range_widget/facets_range_widget.info.yml

 name: 'Facets Range Widget'
 type: module
 description: 'Provides a range widget and solid slider.'
-core_version_requirement: ^9.2 || ^10.0
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - facets:facets

modules/facets_rest/config/schema/facets.views.styles.schema.yml

+views.style.facets_serializer:
+  type: views.style.serializer
+  label: 'Facets serializer'
+  mapping:
+    show_facets:
+      type:  boolean
+      label: 'Show facets'

modules/facets_rest/facets_rest.info.yml

 name: 'Rest Facets'
 type: module
 description: 'Adds facets to rest views based on a Search API index.'
-core_version_requirement: ^9.2 || ^10.0
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - facets:facets

modules/facets_rest/tests/rest_view/rest_view.info.yml

@@ -3,7 +3,6 @@ type: module
 description: 'Provides a Search API + rest dependency to execute tests.'
 package: 'Testing'
 hidden: true
-core_version_requirement: ^9.2 || ^10.0
 dependencies:
   - drupal:rest
   - drupal:views

modules/facets_searchbox_widget/facets_searchbox_widget.info.yml

 name: 'Facets Searchbox Widget'
 type: module
 description: 'Provides a input to search and filter facet items.'
-core_version_requirement: ^9.2 || ^10.0
+core_version_requirement: ^10 || ^11
 package: Search
 dependencies:
   - facets:facets

modules/facets_searchbox_widget/js/searchbox.js

@@ -39,7 +39,7 @@
       function search(filter, display, $targetList, $context) {
         let value = $(this).find('.facet-item__value').html();
 
-        if (value.toUpperCase().indexOf(filter) === 0) {
+        if (value.toUpperCase().indexOf(filter) !== -1) {
           if (!$(this).hasClass('hide-if-no-result')) {
             $(this).css('display', display);
           }

modules/facets_searchbox_widget/tests/src/Unit/Plugin/widget/SearchboxCheckboxWidgetTest.php

@@ -17,8 +17,6 @@ class SearchboxCheckboxWidgetTest extends CheckboxWidgetTest {
    */
   protected function setUp(): void {
     parent::setUp();
-
-    $this->widget = new CheckboxWidget(['show_numbers' => TRUE], 'checkbox_widget', []);
   }
 
   /**

modules/facets_searchbox_widget/tests/src/Unit/Plugin/widget/SearchboxLinksWidgetTest.php

@@ -3,18 +3,20 @@
 namespace Drupal\facets_searchbox_widget\tests\Unit\Plugin\widget;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\facets\Entity\Facet;
-use Drupal\facets\Plugin\facets\widget\LinksWidget;
-use Drupal\facets\Result\Result;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\facets\Entity\Facet;
 use Drupal\facets\FacetSource\FacetSourcePluginManager;
+use Drupal\facets\Plugin\facets\widget\LinksWidget;
+use Drupal\facets\Result\Result;
 use Drupal\facets\UrlProcessor\UrlProcessorInterface;
+use Drupal\facets\UrlProcessor\UrlProcessorPluginManager;
+use Drupal\facets\Utility\FacetsUrlGenerator;
+use Drupal\Tests\Core\Routing\TestRouterInterface;
 use Drupal\Tests\facets\Unit\Plugin\widget\LinksWidgetTest;
+use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\ParameterBag;
-use Drupal\Tests\Core\Routing\TestRouterInterface;
 
 /**
  * Unit test for widget.
@@ -28,8 +30,6 @@ class SearchboxLinksWidgetTest extends LinksWidgetTest {
    */
   protected function setUp(): void {
     parent::setUp();
-
-    $this->widget = new LinksWidget([], 'links_widget', []);
   }
 
   /**
@@ -212,6 +212,9 @@ class SearchboxLinksWidgetTest extends LinksWidgetTest {
     $this->createContainer();
     $container = \Drupal::getContainer();
     $container->set('request_stack', $request_stack);
+    $urlProcessor = $this->createMock(UrlProcessorPluginManager::class);
+    $entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
+    $container->set('facets.utility.url_generator', new FacetsUrlGenerator($urlProcessor, $entityTypeManager));
     \Drupal::setContainer($container);
 
     // Enable the show reset link.

modules/facets_summary/config/schema/facets_summary.processor.schema.yml

 plugin.plugin_configuration.facets_summary_processor.show_summary:
-  type: config_object
+  type: mapping
 
 plugin.plugin_configuration.facets_summary_processor.show_count:
-  type: config_object
+  type: mapping
 
 plugin.plugin_configuration.facets_summary_processor.hide_when_not_rendered:
-  type: config_object
+  type: mapping
 
 plugin.plugin_configuration.facets_summary_processor.show_text_when_empty:
   type: mapping

modules/facets_summary/facets_summary.info.yml

 name: 'Facets summary (Experimental)'
 type: module
 description: 'Exposes a Facets block summary showing the current search.'
-core_version_requirement: ^9.2 || ^10.0
+core_version_requirement: ^10 || ^11
 package: Search
 configure: entity.facets_facet.collection
 dependencies:

modules/facets_summary/src/FacetsSummaryManager/DefaultFacetsSummaryManager.php

@@ -11,6 +11,7 @@ use Drupal\facets_summary\Processor\BuildProcessorInterface;
 use Drupal\facets_summary\Processor\ProcessorInterface;
 use Drupal\facets_summary\Processor\ProcessorPluginManager;
 use Drupal\facets_summary\FacetsSummaryInterface;
+use Drupal\Component\Utility\Xss;
 
 /**
  * The facet summary manager.
@@ -118,6 +119,11 @@ class DefaultFacetsSummaryManager {
       ],
     ];
 
+    // Order results by the $facets_config.
+    usort($facets, function ($a, $b) use ($facets_config) {
+      return $facets_config[$a->id()]['weight'] <=> $facets_config[$b->id()]['weight'];
+    });
+
     $results = [];
     foreach ($facets as $facet) {
       $show_count = $facets_config[$facet->id()]['show_count'];
@@ -134,6 +140,14 @@ class DefaultFacetsSummaryManager {
       $build = $processor->build($facets_summary, $build, $facets);
     }
 
+    if (isset($build["#items"])) {
+      foreach ($build["#items"] as &$item) {
+        if (isset($item["#title"]) and is_string($item["#title"])) {
+          $item["#title"] = Xss::filter($item["#title"]);
+        }
+      }
+    }
+
     return $build;
   }
 

modules/facets_summary/src/Form/FacetsSummaryForm.php

@@ -141,6 +141,7 @@ class FacetsSummaryForm extends EntityForm {
             'label' => $facet->getName(),
             'separator' => ', ',
             'show_count' => FALSE,
+            'weight' => 0,
           ];
         }
         $facets[$facet->id()]['name'] = $facet->getName();
@@ -174,6 +175,7 @@ class FacetsSummaryForm extends EntityForm {
             '#title' => $this->t('Weight for @title', ['@title' => $facet['name']]),
             '#title_display' => 'invisible',
             '#attributes' => ['class' => ['facets-order-weight']],
+            '#default_value' => $facet['weight'],
           ],
           '#attributes' => ['class' => ['draggable']],
         ];

modules/facets_summary/src/Processor/ProcessorPluginManager.php

@@ -26,6 +26,7 @@ class ProcessorPluginManager extends DefaultPluginManager {
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, TranslationInterface $translation) {
     parent::__construct('Plugin/facets_summary/processor', $namespaces, $module_handler, ProcessorInterface::class, SummaryProcessor::class);
+    $this->alterInfo('facets_summary_processor_info');
     $this->setCacheBackend($cache_backend, 'facets_summary_processors');
     $this->setStringTranslation($translation);
   }