Remove redundant "Content Access" and "Entity access by field" search…

… api processors
goalgorilla · Nov 7, 2024 · f22fe99 · f22fe99
1 parent dc8a3f3
commit f22fe99
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 171 deletions.
diff --git a/...les/custom/entity_access_by_field/src/Plugin/search_api/processor/EntityAccessByField.php b/...les/custom/entity_access_by_field/src/Plugin/search_api/processor/EntityAccessByField.php
diff --git a/modules/social_features/social_node/social_node.install b/modules/social_features/social_node/social_node.install
@@ -45,3 +45,34 @@ function social_node_install(): void {
 function social_node_update_last_removed() : int {
   return 11901;
 }
+
+/**
+ * Add new processors to search api indexes with node types.
+ */
+function social_node_update_11902(): void {
+  try {
+    if (\Drupal::moduleHandler()->moduleExists('social_search')) {
+      /** @var \Drupal\search_api\IndexInterface[] $indexes */
+      $indexes = \Drupal::entityTypeManager()
+        ->getStorage('search_api_index')
+        ->loadMultiple();
+
+      foreach ($indexes as $index) {
+        if (in_array('node', $index->getEntityTypes())) {
+          // Remove deprecated processors.
+          $index->removeProcessor('content_access');
+          $index->removeProcessor('entity_access_by_field');
+
+          $needs_reindex[] = $index->id();
+        }
+      }
+
+      if (!empty($needs_reindex)) {
+        social_search_resave_search_indexes($needs_reindex);
+      }
+    }
+  }
+  catch (InvalidPluginDefinitionException|PluginNotFoundException|EntityStorageException $e) {
+    \Drupal::logger('social_node')->info($e->getMessage());
+  }
+}
diff --git a/modules/social_features/social_node/social_node.module b/modules/social_features/social_node/social_node.module
@@ -5,7 +5,9 @@
  * The social node module alterations.
  */
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\node\NodeInterface;
+use Drupal\search_api\SearchApiException;
 use Drupal\social_node\Entity\Node;
 use Drupal\social_node\SocialNodeForm;
 use Drupal\social_node\NodeViewBuilder;
@@ -65,3 +67,20 @@ function social_node_node_access_records_alter(array &$grants, NodeInterface $no
     }
   }
 }
+
+/**
+ * Implements hook_ENTITY_TYPE_presave() for "search_api_index".
+ */
+function social_node_search_api_index_presave(EntityInterface $index): void {
+  /** @var \Drupal\search_api\IndexInterface $index */
+  try {
+    if (!$index->getProcessor('content_access')) {
+      return;
+    }
+
+    $index->removeProcessor('content_access');
+    \Drupal::messenger()
+      ->addWarning(t('"Content Access" processor is not allowed for using (replaced by query alters).'));
+  }
+  catch (SearchApiException $e) {}
+}
diff --git a/modules/social_features/social_search/config/install/search_api.index.social_all.yml b/modules/social_features/social_search/config/install/search_api.index.social_all.yml
@@ -123,13 +123,6 @@ field_settings:
       module:
         - profile
         - user
-  node_grants:
-    label: 'Node access information'
-    property_path: search_api_node_grants
-    type: string
-    indexed_locked: true
-    type_locked: true
-    hidden: true
   rendered_item:
     label: 'Rendered HTML output'
     property_path: rendered_item
@@ -237,9 +230,6 @@ datasource_settings:
       default: true
       selected: {  }
 processor_settings:
-  entity_access_by_field:
-    weights:
-      preprocess_query: -30
   ignorecase:
     all_fields: true
     fields:
@@ -257,9 +247,6 @@ processor_settings:
     weights:
       preprocess_index: -20
       preprocess_query: -20
-  content_access:
-    weights:
-      preprocess_query: -30
   language_with_fallback: {  }
   stopwords:
     all_fields: false

diff --git a/modules/social_features/social_search/config/install/search_api.index.social_content.yml b/modules/social_features/social_search/config/install/search_api.index.social_content.yml
@@ -43,13 +43,6 @@ field_settings:
     label: 'Language (with fallback)'
     property_path: language_with_fallback
     type: string
-  node_grants:
-    label: 'Node access information'
-    property_path: search_api_node_grants
-    type: string
-    indexed_locked: true
-    type_locked: true
-    hidden: true
   rendered_item:
     label: 'Rendered HTML output'
     property_path: rendered_item
@@ -111,9 +104,6 @@ datasource_settings:
       default: true
       selected: {  }
 processor_settings:
-  entity_access_by_field:
-    weights:
-      preprocess_query: -30
   ignorecase:
     plugin_id: ignorecase
     all_fields: true
@@ -125,11 +115,6 @@ processor_settings:
     weights:
       preprocess_index: -10
       preprocess_query: -10
-  content_access:
-    plugin_id: content_access
-    weights:
-      preprocess_index: -10
-      preprocess_query: -10
   language_with_fallback: {  }
   stopwords:
     plugin_id: stopwords

diff --git a/modules/social_features/social_search/social_search.module b/modules/social_features/social_search/social_search.module
@@ -199,7 +199,7 @@ function social_search_views_data_alter(array &$data) {
  *
  * Make the label/title translatable.
  */
-function social_block_view_search_hero_block_alter(array &$build, BlockPluginInterface $block) {
+function social_search_block_view_search_hero_block_alter(array &$build, BlockPluginInterface $block) {
   $build['#configuration']['label'] = t('Search');
 }