composer.json

@@ -16,7 +16,13 @@
   },
   "license": "GPL-2.0+",
   "require-dev": {
-    "drupal/search_api": "~1.21"
+    "drupal/search_api": "^1.25||1.x-dev",
+    "drupal/jquery_ui_slider": "~1.1",
+    "drupal/jquery_ui_touch_punch": "~1.0"
+  },
+  "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"

config/schema/facets.facet.schema.yml

@@ -14,6 +14,12 @@ facets.facet.*:
     min_count:
       type: integer
       label: 'Minimum count'
+    missing:
+      type: boolean
+      label: 'Missing'
+    missing_label:
+      type: label
+      label: 'Missing label'
     url_alias:
       type: label
       label: 'Name of facet as used in the URL'

config/schema/facets.processor.schema.yml

@@ -93,6 +93,20 @@ plugin.plugin_configuration.facets_processor.boolean_item:
       type: label
       label: 'Off value'
 
+plugin.plugin_configuration.facets_processor.combine_processor:
+  type: sequence
+  label: 'Combine facets processor'
+  sequence:
+    type: mapping
+    label: Mapping for a processor
+    mapping:
+      combine:
+        type: boolean
+        label: 'Combine this facet'
+      mode:
+        type: string
+        label: 'Combination mode'
+
 plugin.plugin_configuration.facets_processor.dependent_processor:
   type: sequence
   label: 'Dependent facet processor'
@@ -113,6 +127,14 @@ plugin.plugin_configuration.facets_processor.dependent_processor:
         type: boolean
         label: 'Should the condition be negated'
 
+plugin.plugin_configuration.facets_processor.show_siblings_processor:
+  type: mapping
+  label: 'Show siblings processor'
+  mapping:
+    show_parent_siblings:
+      type: boolean
+      label: 'Show parents'
+
 plugin.plugin_configuration.facets_processor.date_item:
   type: mapping
   label: 'Date item processor'
@@ -126,6 +148,9 @@ plugin.plugin_configuration.facets_processor.date_item:
     date_format:
       type: string
       label: 'Date format'
+    hierarchy:
+      type: boolean
+      label: 'Hierarchy'
 
 plugin.plugin_configuration.facets_processor.granularity_item:
   type: mapping
@@ -149,3 +174,11 @@ plugin.plugin_configuration.facets_processor.granularity_item:
     include_edges:
       type: boolean
       label: 'Include first lower and last upper bound'
+
+plugin.plugin_configuration.facets_processor.replace:
+  type: mapping
+  label: 'Settings for facet replacement processor'
+  mapping:
+    replacements:
+      type: text
+      label: 'Replacement values'

facets.info.yml

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

facets.install

@@ -8,6 +8,7 @@
 use Drupal\facets\Entity\Facet;
 use Drupal\facets\Entity\FacetSource;
 use Drupal\block\Entity\Block;
+use Drupal\facets\Plugin\facets\facet_source\SearchApiDisplay;
 
 /**
  * Implements hook_update_dependencies().
@@ -176,6 +177,7 @@ function facets_update_8005() {
 function facets_update_8006() {
   $query = \Drupal::entityQuery('block')
     ->condition('plugin', 'facet_block', 'STARTS_WITH')
+    ->accessCheck()
     ->execute();
 
   foreach ($query as $block_id) {
@@ -191,10 +193,7 @@ function facets_update_8006() {
  * Resave facets for consistent configuration export.
  */
 function facets_update_8007() {
-  $facets = Facet::loadMultiple();
-  foreach ($facets as $facet) {
-    $facet->save();
-  }
+  // Moved to facets_update_8009().
 }
 
 /**
@@ -209,3 +208,55 @@ function facets_update_8008() {
     $facet->save(TRUE);
   }
 }
+
+/**
+ * Resave facets for consistent configuration export.
+ */
+function facets_update_8009() {
+  // Moved to facets_update_8011().
+}
+
+/**
+ * Enable facet block caching for the views with "Search API tag or time" cache.
+ */
+function facets_update_8010() {
+  // Moved to facets_update_8012().
+}
+
+/**
+ * Resave facets for consistent configuration export.
+ */
+function facets_update_8011() {
+  $facets = Facet::loadMultiple();
+  foreach ($facets as $facet) {
+    $facet->save();
+  }
+}
+
+/**
+ * Update facet block caching for the views with "Search API tag or time" cache.
+ */
+function facets_update_8012() {
+  $facet_storage = \Drupal::entityTypeManager()->getStorage('facets_facet');
+  $processed_views = [];
+  /** @var \Drupal\facets\FacetInterface $facet */
+  foreach ($facet_storage->loadMultiple() as $facet) {
+    if (
+      ($source = $facet->getFacetSource())
+      && $source instanceof SearchApiDisplay
+      && ($view_executable = $source->getViewsDisplay())
+      && !in_array($view_executable->id(), $processed_views)
+      && ($cache_plugin = $view_executable->getDisplay()->getPlugin('cache'))
+      && in_array(
+        $cache_plugin->getPluginId(),
+        ['search_api_tag', 'search_api_time']
+      )
+    ) {
+      $view_executable->save();
+      $processed_views[] = $view_executable->id();
+    }
+  }
+  return !empty($processed_views)
+    ? sprintf('Facet caching was updated for the following views: %s.', implode(', ', $processed_views))
+    : 'There are no views with search API cache plugins and facets in the same time, so nothing has been updated.';
+}

facets.libraries.yml

@@ -5,7 +5,7 @@ drupal.facets.index-active-formatters:
   dependencies:
     - core/jquery
     - core/drupal
-    - core/jquery.once
+    - core/once
 
 drupal.facets.edit-facet:
   version: VERSION
@@ -28,7 +28,7 @@ widget:
   dependencies:
     - core/jquery
     - core/drupal
-    - core/jquery.once
+    - core/once
 
 drupal.facets.link-widget:
   version: VERSION
@@ -69,7 +69,7 @@ soft-limit:
     js/soft-limit.js: {}
   dependencies:
     - core/jquery
-    - core/jquery.once
+    - core/once
     - core/drupal
     - core/drupalSettings
 

facets.module

@@ -10,10 +10,12 @@ use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
 use Drupal\facets\Entity\Facet;
 use Drupal\facets\Entity\FacetSource;
 use Drupal\facets\FacetInterface;
+use Drupal\facets\FacetSource\SearchApiFacetSourceInterface;
 use Drupal\views\Entity\View;
 use Drupal\Core\Entity\EntityInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -202,8 +204,18 @@ function facets_entity_predelete(EntityInterface $entity) {
  * @see https://www.drupal.org/node/1842756
  */
 function facets_preprocess_facets_item_list(array &$variables) {
-  if ($variables['facet'] !== NULL && $variables['facet']->get('show_title') === TRUE) {
-    $variables['title'] = $variables['facet']->label();
+  /** @var FacetInterface $facet */
+  $facet = $variables['facet'];
+  if ($facet !== NULL) {
+    if ($facet->get('show_title') === TRUE) {
+      $variables['title'] = $facet->label();
+    }
+    if (Settings::get('facets_debug_cacheable_metadata', FALSE) && $facet->getFacetSource() instanceof SearchApiFacetSourceInterface) {
+      $variables['cache_hash'] = substr(base_convert(hash('sha256', uniqid(time())), 16, 36), 0, 6);
+      $variables['cache_contexts'] = implode(', ', $facet->getCacheContexts());
+      $variables['cache_tags'] = implode(', ', $facet->getCacheTags());
+      $variables['cache_max_age'] = $facet->getCacheMaxAge() . ' seconds';
+    }
   }
   template_preprocess_item_list($variables);
 }

js/base-widget.js

@@ -3,7 +3,7 @@
  * Provides base widget behaviours.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, once) {
 
   'use strict';
 
@@ -20,8 +20,7 @@
    *   filter is executed.
    *
    * This is an example how to trigger "facets_filter" event for your widget:
-   *   $('.my-custom-widget.js-facets-widget')
-   *     .once('my-custom-widget-on-change')
+   *   $(once('my-custom-widget-on-change', '.my-custom-widget.js-facets-widget'))
    *     .on('change', function () {
    *       // In this example $(this).val() will provide needed URL.
    *       $(this).trigger('facets_filter', [ $(this).val() ]);
@@ -34,8 +33,7 @@
    * event before initial filter request is finished.
    *
    * This is an example how to handle "facets_filtering":
-   *   $('.my-custom-widget.js-facets-widget')
-   *     .once('my-custom-widget-on-facets-filtering')
+   *   $(once('my-custom-widget-on-facets-filtering', '.my-custom-widget.js-facets-widget'))
    *     .on('facets_filtering.my_widget_module', function () {
    *       // Let's say, that widget can be simply disabled (fe. select).
    *       $(this).prop('disabled', true);
@@ -47,8 +45,7 @@
    */
   Drupal.behaviors.facetsFilter = {
     attach: function (context) {
-      $('.js-facets-widget', context)
-        .once('js-facet-filter')
+      $(once('js-facet-filter', '.js-facets-widget', context))
         .on('facets_filter.facets', function (event, url) {
           $('.js-facets-widget').trigger('facets_filtering');
 
@@ -57,4 +54,4 @@
     }
   };
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);

js/checkbox-widget.js

@@ -3,7 +3,7 @@
  * Transforms links into checkboxes.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, once) {
 
   'use strict';
 
@@ -14,13 +14,25 @@
     }
   };
 
+  window.onbeforeunload = function(e) {
+    if (Drupal.facets) {
+      var $checkboxWidgets = $('.js-facets-checkbox-links');
+      if ($checkboxWidgets.length > 0) {
+        $checkboxWidgets.each(function (index, widget) {
+          var $widget = $(widget);
+          var $widgetLinks = $widget.find('.facet-item > a');
+          $widgetLinks.each(Drupal.facets.updateCheckbox);
+        });
+      }
+    }
+  };
+
   /**
    * Turns all facet links into checkboxes.
    */
   Drupal.facets.makeCheckboxes = function (context) {
     // Find all checkbox facet links and give them a checkbox.
-    var $checkboxWidgets = $('.js-facets-checkbox-links', context)
-      .once('facets-checkbox-transform');
+    var $checkboxWidgets = $(once('facets-checkbox-transform', '.js-facets-checkbox-links', context));
 
     if ($checkboxWidgets.length > 0) {
       $checkboxWidgets.each(function (index, widget) {
@@ -79,6 +91,18 @@
 
   };
 
+  /**
+   * Update checkbox active state.
+   */
+  Drupal.facets.updateCheckbox = function () {
+    var $link = $(this);
+    var active = $link.hasClass('is-active');
+
+    if (!active) {
+      $link.parent().find('input.facets-checkbox').prop('checked', false);
+    }
+  };
+
   /**
    * Disable all facet checkboxes in the facet and apply a 'disabled' class.
    *
@@ -101,4 +125,4 @@
     e.preventDefault();
   };
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);

js/dropdown-widget.js

@@ -3,7 +3,7 @@
  * Transforms links into a dropdown list.
  */
 
-(function ($) {
+(function ($, once) {
 
   'use strict';
 
@@ -24,7 +24,7 @@
    */
   Drupal.facets.makeDropdown = function (context, settings) {
     // Find all dropdown facet links and turn them into an option.
-    $('.js-facets-dropdown-links').once('facets-dropdown-transform').each(function () {
+    $(once('facets-dropdown-transform', '.js-facets-dropdown-links')).each(function () {
       var $ul = $(this);
       var $links = $ul.find('.facet-item a');
       var $dropdown = $('<select></select>');
@@ -101,4 +101,4 @@
     });
   };
 
-})(jQuery);
+})(jQuery, once);

js/facets-views-ajax.js

@@ -4,7 +4,7 @@
  */
 
 
-(function ($, Drupal) {
+(function ($, Drupal, once) {
   'use strict';
 
   /**
@@ -39,7 +39,7 @@
 
         // Update view on summary block click.
         if (updateFacetsSummaryBlock() && (facetId === 'facets_summary_ajax')) {
-          $('[data-drupal-facets-summary-id=' + facetSettings.facets_summary_id + ']').children('ul').children('li').once().click(function (e) {
+          $(once(facetId, '[data-drupal-facets-summary-id=' + facetSettings.facets_summary_id + '] ul li')).click(function (e) {
             e.preventDefault();
             var facetLink = $(this).find('a');
             updateFacetsView(facetLink.attr('href'), current_dom_id, view_path);
@@ -216,4 +216,4 @@
     return href.split('?')[0] + '?' + $.param(params);
   };
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);

js/link-widget.js

@@ -3,7 +3,7 @@
  * Facets views Link widgets handling.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, once) {
   'use strict';
 
   /**
@@ -11,8 +11,7 @@
    */
   Drupal.behaviors.facetsLinkWidget = {
     attach: function (context) {
-      var $linkFacets = $('.js-facets-links', context)
-        .once('js-facets-link-on-click');
+      var $linkFacets = $(once('js-facets-link-on-click', '.js-facets-links', context));
 
       // We are using list wrapper element for Facet JS API.
       if ($linkFacets.length > 0) {
@@ -43,4 +42,4 @@
     }
   };
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);

js/soft-limit.js

@@ -3,7 +3,7 @@
  * Provides the soft limit functionality.
  */
 
-(function ($) {
+(function ($, once) {
 
   'use strict';
 
@@ -43,31 +43,31 @@
 
     // Hide facets over the limit.
     facetsList.each(function () {
-      $(this).children('li:gt(' + zero_based_limit + ')').once('applysoftlimit').hide();
+      $(once('applysoftlimit', $(this).children('li:gt(' + zero_based_limit + ')'))).hide();
     });
 
     // Add "Show more" / "Show less" links.
-    facetsList.once().filter(function () {
+    $(once('applysoftlimit', facetsList.filter(function () {
       return $(this).find('li').length > limit;
-    }).each(function () {
+    }))).each(function () {
       var facet = $(this);
       var showLessLabel = settings.facets.softLimitSettings[facet_id].showLessLabel;
       var showMoreLabel = settings.facets.softLimitSettings[facet_id].showMoreLabel;
       $('<a href="#" class="facets-soft-limit-link"></a>')
-        .text(showMoreLabel).attr("aria-expanded", "false")
+        .text(showMoreLabel)
         .on('click', function () {
           if (facet.find('li:hidden').length > 0) {
             facet.find('li:gt(' + zero_based_limit + ')').slideDown();
-            facet.find('li:lt(' + (zero_based_limit + 2) + ') input').focus();
-            $(this).addClass('open').text(showLessLabel).attr("aria-expanded", "true");
+            facet.find('li:lt(' + (zero_based_limit + 2) + ') a, li:lt(' + (zero_based_limit + 2) + ') input').focus();
+            $(this).addClass('open').text(showLessLabel);
           }
           else {
             facet.find('li:gt(' + zero_based_limit + ')').slideUp();
-            $(this).removeClass('open').text(showMoreLabel).attr("aria-expanded", "false");
+            $(this).removeClass('open').text(showMoreLabel);
           }
           return false;
         }).insertAfter($(this));
     });
   };
 
-})(jQuery);
+})(jQuery, once);

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: ^8.8 || ^9
+core_version_requirement: ^9.2 || ^10.0
 package: Search
 dependencies:
   - facets:facets
+  - jquery_ui_slider:jquery_ui_slider
+  - jquery_ui_touch_punch:jquery_ui_touch_punch
 test_dependencies:
   - search_api:search_api
   - facets:facets

modules/facets_range_widget/facets_range_widget.install

@@ -16,7 +16,7 @@ function facets_range_widget_requirements() {
   // If library is not found, look in the current profile libraries path.
   if (!$library_exists) {
     $profile = \Drupal::installProfile();
-    $profile_path = drupal_get_path('profile', $profile);
+    $profile_path = Drupal::service('extension.list.profile')->getPath($profile);
     $profile_path .= $library_path;
     $library_exists = file_exists($profile_path);
   }

modules/facets_range_widget/facets_range_widget.libraries.yml

@@ -11,7 +11,7 @@ jquery.ui.slider.pips:
     component:
       /libraries/jquery-ui-slider-pips/dist/jquery-ui-slider-pips.min.css: { minified: true }
   dependencies:
-    - core/jquery.ui.slider
+    - jquery_ui_slider/slider
 
 slider:
   version: VERSION
@@ -25,4 +25,4 @@ slider:
     - core/drupalSettings
     - core/jquery.once
     - facets_range_widget/jquery.ui.slider.pips
-    - core/jquery.ui.touch-punch
+    - jquery_ui_touch_punch/touch-punch

modules/facets_range_widget/tests/src/Unit/Plugin/processor/RangeSliderProcessorTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\facets_range_widget\Unit\Plugin\processor;
 
+use Drupal\Tests\facets\Unit\Drupal10CompatibilityUnitTestCase;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Routing\UrlGeneratorInterface;
@@ -12,7 +13,6 @@ use Drupal\facets\Plugin\facets\url_processor\QueryString;
 use Drupal\facets\Result\Result;
 use Drupal\facets\Utility\FacetsUrlGenerator;
 use Drupal\facets_range_widget\Plugin\facets\processor\RangeSliderProcessor;
-use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 
 /**
@@ -21,7 +21,7 @@ use Prophecy\Argument;
  * @group facets
  * @coversDefaultClass \Drupal\facets_range_widget\Plugin\facets\processor\RangeSliderProcessor
  */
-class RangeSliderProcessorTest extends UnitTestCase {
+class RangeSliderProcessorTest extends Drupal10CompatibilityUnitTestCase {
 
   /**
    * The processor we're testing.

modules/facets_range_widget/tests/src/Unit/Plugin/processor/SliderProcessorTest.php

@@ -2,13 +2,13 @@
 
 namespace Drupal\Tests\facets_range_widget\Unit\Plugin\processor;
 
+use Drupal\Tests\facets\Unit\Drupal10CompatibilityUnitTestCase;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\facets\Entity\Facet;
 use Drupal\facets\Plugin\facets\widget\ArrayWidget;
 use Drupal\facets\Result\Result;
 use Drupal\facets\Widget\WidgetPluginManager;
 use Drupal\facets_range_widget\Plugin\facets\processor\SliderProcessor;
-use Drupal\Tests\UnitTestCase;
 
 /**
  * Unit test for processor.
@@ -16,7 +16,7 @@ use Drupal\Tests\UnitTestCase;
  * @group facets
  * @coversDefaultClass \Drupal\facets_range_widget\Plugin\facets\processor\SliderProcessor
  */
-class SliderProcessorTest extends UnitTestCase {
+class SliderProcessorTest extends Drupal10CompatibilityUnitTestCase {
 
   /**
    * The processor we're testing.

modules/facets_range_widget/tests/src/Unit/Plugin/widget/RangeSliderWidgetTest.php

@@ -23,7 +23,7 @@ class RangeSliderWidgetTest extends SliderWidgetTest {
    * {@inheritdoc}
    */
   public function testGetQueryType() {
-    $result = $this->widget->getQueryType($this->queryTypes);
+    $result = $this->widget->getQueryType();
     $this->assertEquals('range', $result);
   }
 

modules/facets_range_widget/tests/src/Unit/Plugin/widget/SliderWidgetTest.php

@@ -30,7 +30,7 @@ class SliderWidgetTest extends WidgetTestBase {
    * {@inheritdoc}
    */
   public function testGetQueryType() {
-    $result = $this->widget->getQueryType($this->queryTypes);
+    $result = $this->widget->getQueryType();
     $this->assertEquals(NULL, $result);
   }