Merge pull request #1642 from acquia/ACMS-1972

ACMS-1972: Fixing new search index field on field settings and storage page.
acquia · Oct 5, 2023 · d573d0f · d573d0f
2 parents f3d42da + db200ae
commit d573d0f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/modules/acquia_cms_common/tests/src/ExistingSite/ContentTypeListTestBase.php b/modules/acquia_cms_common/tests/src/ExistingSite/ContentTypeListTestBase.php
@@ -22,8 +22,7 @@
  */
 abstract class ContentTypeListTestBase extends ExistingSiteBase {
 
-  use AssertLinksTrait;
-  use SetBackendAvailabilityTrait;
+  use AssertLinksTrait, SetBackendAvailabilityTrait;
 
   /**
    * The machine name of the content type under test.
@@ -143,7 +142,7 @@ protected function setUp(): void {
       'field_' . $this->nodeType . '_type' => $types[2],
       'created' => $time++,
     ]);
-
+    \Drupal::getContainer()->get('search_api.post_request_indexing')->destruct();
     // Update additional field value.
     $this->updateNodeFieldValues();
   }
@@ -162,20 +161,20 @@ abstract protected function getView();
    * @param string $langcode
    *   Langcode to visit tranlated page.
    */
-  abstract protected function visitListPage($langcode = NULL) : void;
+  abstract protected function visitListPage($langcode = NULL): void;
 
   /**
    * Update specific field value for nodes.
    */
-  protected function updateNodeFieldValues() : void {}
+  protected function updateNodeFieldValues(): void {}
 
   /**
    * Data provider for testing the listing page with different permissions.
    *
    * @return array[]
    *   Sets of arguments to pass to the test method.
    */
-  public function permissionProvider() : array {
+  public function permissionProvider(): array {
     return [
       'anonymous user' => [NULL],
       // Search API is really stupid about node access, and does not properly
@@ -214,7 +213,6 @@ public function testListPage(array $permissions = NULL) {
     $module_handler = $this->container->get('module_handler');
     if ($module_handler->moduleExists('acquia_cms_search') && $module_handler->moduleExists('acquia_cms_site_studio')) {
       $assert_session = $this->assertSession();
-
       // Assert that all categories facets are available.
       $assert_session->linkExists('Music (2)');
       $assert_session->linkExists('Art (2)');
@@ -336,7 +334,7 @@ public function testFallback(array $permissions = NULL) {
   /**
    * {@inheritdoc}
    */
-  protected function getLinks() : array {
+  protected function getLinks(): array {
     $links = $this->getSession()
       ->getPage()
       ->findAll('css', 'article a.card-link');
@@ -350,7 +348,7 @@ protected function getLinks() : array {
   /**
    * {@inheritdoc}
    */
-  protected function getExpectedLinks() : array {
+  protected function getExpectedLinks(): array {
     $ids = $this->getQuery()->accessCheck(FALSE)->execute();
 
     /** @var \Drupal\node\NodeInterface[] $content */
@@ -371,7 +369,7 @@ protected function getExpectedLinks() : array {
    *   An entity query object to find all published content of the type under
    *   test.
    */
-  protected function getQuery() : QueryInterface {
+  protected function getQuery(): QueryInterface {
     return $this->container->get('entity_type.manager')
       ->getStorage('node')
       ->getQuery()

diff --git a/modules/acquia_cms_search/acquia_cms_search.module b/modules/acquia_cms_search/acquia_cms_search.module
@@ -175,7 +175,6 @@ function _acquia_cms_search_add_category_facet(array $modules) {
  * Implements hook_form_FORM_ID_alter().
  */
 function acquia_cms_search_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state) {
-
   /** @var \Drupal\field_ui\Form\FieldConfigEditForm $field_config_form */
   $field_config_form = $form_state->getFormObject();
 
@@ -224,8 +223,7 @@ function _acquia_cms_search_add_field_to_index_form_builder(string $entity_type,
 
   if ($form_state->getValue('add_to_search_index')) {
     $field_storage->setThirdPartySetting('acquia_cms_common', 'search_index', 'content')
-      ->setThirdPartySetting('acquia_cms_common', 'search_label', $fieldConfig->getLabel())
-      ->save();
+      ->setThirdPartySetting('acquia_cms_common', 'search_label', $fieldConfig->getLabel());
 
     // Index entity_reference field.
     if ($search_facade->isAllowedTypeReferenceField($field_storage)) {
@@ -242,7 +240,6 @@ function _acquia_cms_search_add_field_to_index_form_builder(string $entity_type,
     // Remove third party setting from fields.storage.config.
     $field_storage
       ->unsetThirdPartySetting('acquia_cms_common', 'search_index')
-      ->unsetThirdPartySetting('acquia_cms_common', 'search_label')
-      ->save();
+      ->unsetThirdPartySetting('acquia_cms_common', 'search_label');
   }
 }
diff --git a/modules/acquia_cms_search/tests/src/FunctionalJavascript/AcquiaFacetSearchTest.php b/modules/acquia_cms_search/tests/src/FunctionalJavascript/AcquiaFacetSearchTest.php
@@ -145,6 +145,7 @@ protected function createSampleContent(string $node_type) {
       ]);
     }
     $this->drupalPlaceBlock('facet_block:search_category', ['region' => 'content']);
+    \Drupal::getContainer()->get('search_api.post_request_indexing')->destruct();
   }
 
   /**

diff --git a/tests/src/ExistingSiteJavascript/SearchTest.php b/tests/src/ExistingSiteJavascript/SearchTest.php
@@ -62,6 +62,7 @@ protected function setUp(): void {
         'title' => 'Test unpublished ' . $node_type_label,
         'moderation_state' => 'draft',
       ]);
+      \Drupal::getContainer()->get('search_api.post_request_indexing')->destruct();
       $this->assertFalse($unpublished_node->isPublished());
     }
   }