Merge changes from develop.

dpc-sdp · Feb 22, 2024 · bc69f8a · bc69f8a
2 parents 50f1615 + fb3bdf6
commit bc69f8a
Show file tree

Hide file tree

Showing 25 changed files with 69 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
     }
   },
   "require": {
+    "dpc-sdp/tide_api": "dev-reference",
     "dpc-sdp/tide_core": "dev-reference",
     "dpc-sdp/tide_landing_page": "dev-reference",
     "drupal/data_pipelines": "1.0.0-alpha22",

diff --git a/config/optional/core.entity_form_display.node.tide_search_listing.default.yml b/config/optional/core.entity_form_display.node.tide_search_listing.default.yml
@@ -35,6 +35,7 @@ dependencies:
     - path
     - select2
     - text
+    - tide_content_collection
 third_party_settings:
   field_group:
     group_search_listing_header:

diff --git a/config/optional/core.entity_form_display.paragraph.listing_custom_filter.default.yml b/config/optional/core.entity_form_display.paragraph.listing_custom_filter.default.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.field.paragraph.listing_custom_filter.field_listing_custom_filter_conf
     - paragraphs.paragraphs_type.listing_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_custom_filter.default
 targetEntityType: paragraph
 bundle: listing_custom_filter

diff --git a/config/optional/core.entity_form_display.paragraph.listing_user_custom_filter.default.yml b/config/optional/core.entity_form_display.paragraph.listing_user_custom_filter.default.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.field.paragraph.listing_user_custom_filter.field_user_filter_configuration
     - paragraphs.paragraphs_type.listing_user_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_user_custom_filter.default
 targetEntityType: paragraph
 bundle: listing_user_custom_filter

diff --git a/...g/optional/core.entity_form_display.paragraph.search_listing_header_component.default.yml b/...g/optional/core.entity_form_display.paragraph.search_listing_header_component.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - paragraphs.paragraphs_type.search_listing_header_component
   module:
     - select2
+    - tide_content_collection
 id: paragraph.search_listing_header_component.default
 targetEntityType: paragraph
 bundle: search_listing_header_component

diff --git a/config/optional/core.entity_view_display.node.tide_search_listing.default.yml b/config/optional/core.entity_view_display.node.tide_search_listing.default.yml
@@ -30,6 +30,7 @@ dependencies:
     - entity_reference_revisions
     - metatag
     - text
+    - tide_content_collection
     - user
 id: node.tide_search_listing.default
 targetEntityType: node

diff --git a/config/optional/core.entity_view_display.paragraph.listing_custom_filter.default.yml b/config/optional/core.entity_view_display.paragraph.listing_custom_filter.default.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.field.paragraph.listing_custom_filter.field_listing_custom_filter_conf
     - paragraphs.paragraphs_type.listing_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_custom_filter.default
 targetEntityType: paragraph
 bundle: listing_custom_filter

diff --git a/config/optional/core.entity_view_display.paragraph.listing_user_custom_filter.default.yml b/config/optional/core.entity_view_display.paragraph.listing_user_custom_filter.default.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.field.paragraph.listing_user_custom_filter.field_user_filter_configuration
     - paragraphs.paragraphs_type.listing_user_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_user_custom_filter.default
 targetEntityType: paragraph
 bundle: listing_user_custom_filter

diff --git a/...g/optional/core.entity_view_display.paragraph.search_listing_header_component.default.yml b/...g/optional/core.entity_view_display.paragraph.search_listing_header_component.default.yml
@@ -5,6 +5,8 @@ dependencies:
     - field.field.paragraph.search_listing_header_component.field_component
     - field.field.paragraph.search_listing_header_component.field_header_configuration
     - paragraphs.paragraphs_type.search_listing_header_component
+  module:
+    - tide_content_collection
 id: paragraph.search_listing_header_component.default
 targetEntityType: paragraph
 bundle: search_listing_header_component

diff --git a/config/optional/field.field.node.tide_search_listing.field_custom_sort_configuration.yml b/config/optional/field.field.node.tide_search_listing.field_custom_sort_configuration.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.node.field_custom_sort_configuration
     - node.type.tide_search_listing
+  module:
+    - tide_content_collection
 id: node.tide_search_listing.field_custom_sort_configuration
 field_name: field_custom_sort_configuration
 entity_type: node

diff --git a/config/optional/field.field.node.tide_search_listing.field_listing_query_config.yml b/config/optional/field.field.node.tide_search_listing.field_listing_query_config.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.node.field_listing_query_config
     - node.type.tide_search_listing
+  module:
+    - tide_content_collection
 id: node.tide_search_listing.field_listing_query_config
 field_name: field_listing_query_config
 entity_type: node

diff --git a/config/optional/field.field.node.tide_search_listing.field_listing_results_config.yml b/config/optional/field.field.node.tide_search_listing.field_listing_results_config.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.node.field_listing_results_config
     - node.type.tide_search_listing
+  module:
+    - tide_content_collection
 id: node.tide_search_listing.field_listing_results_config
 field_name: field_listing_results_config
 entity_type: node

diff --git a/config/optional/field.field.node.tide_search_listing.field_search_configuration.yml b/config/optional/field.field.node.tide_search_listing.field_search_configuration.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.node.field_search_configuration
     - node.type.tide_search_listing
+  module:
+    - tide_content_collection
 id: node.tide_search_listing.field_search_configuration
 field_name: field_search_configuration
 entity_type: node

diff --git a/...optional/field.field.paragraph.listing_custom_filter.field_listing_custom_filter_conf.yml b/...optional/field.field.paragraph.listing_custom_filter.field_listing_custom_filter_conf.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_listing_custom_filter_conf
     - paragraphs.paragraphs_type.listing_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_custom_filter.field_listing_custom_filter_conf
 field_name: field_listing_custom_filter_conf
 entity_type: paragraph

diff --git a/...onal/field.field.paragraph.listing_user_custom_filter.field_user_filter_configuration.yml b/...onal/field.field.paragraph.listing_user_custom_filter.field_user_filter_configuration.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_user_filter_configuration
     - paragraphs.paragraphs_type.listing_user_custom_filter
+  module:
+    - tide_content_collection
 id: paragraph.listing_user_custom_filter.field_user_filter_configuration
 field_name: field_user_filter_configuration
 entity_type: paragraph

diff --git a/...onal/field.field.paragraph.search_listing_header_component.field_header_configuration.yml b/...onal/field.field.paragraph.search_listing_header_component.field_header_configuration.yml
@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_header_configuration
     - paragraphs.paragraphs_type.search_listing_header_component
+  module:
+    - tide_content_collection
 id: paragraph.search_listing_header_component.field_header_configuration
 field_name: field_header_configuration
 entity_type: paragraph

diff --git a/config/optional/field.storage.node.field_custom_sort_configuration.yml b/config/optional/field.storage.node.field_custom_sort_configuration.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - node
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/config/optional/field.storage.node.field_listing_query_config.yml b/config/optional/field.storage.node.field_listing_query_config.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - node
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/config/optional/field.storage.node.field_listing_results_config.yml b/config/optional/field.storage.node.field_listing_results_config.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - node
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/config/optional/field.storage.node.field_search_configuration.yml b/config/optional/field.storage.node.field_search_configuration.yml
@@ -3,6 +3,7 @@ status: true
 dependencies:
   module:
     - node
+    - tide_content_collection
 id: node.field_search_configuration
 field_name: field_search_configuration
 entity_type: node

diff --git a/config/optional/field.storage.paragraph.field_header_configuration.yml b/config/optional/field.storage.paragraph.field_header_configuration.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - paragraphs
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/config/optional/field.storage.paragraph.field_listing_custom_filter_conf.yml b/config/optional/field.storage.paragraph.field_listing_custom_filter_conf.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - paragraphs
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/config/optional/field.storage.paragraph.field_user_filter_configuration.yml b/config/optional/field.storage.paragraph.field_user_filter_configuration.yml
@@ -4,6 +4,7 @@ dependencies:
   module:
     - field_permissions
     - paragraphs
+    - tide_content_collection
 third_party_settings:
   field_permissions:
     permission_type: public

diff --git a/tide_search.info.yml b/tide_search.info.yml
@@ -6,6 +6,8 @@ core_version_requirement: ^9 || ^10
 dependencies:
   - search_api:search_api
   - elasticsearch_connector:elasticsearch_connector
+  - dpc-sdp:tide_api
+  - tide_api:tide_content_collection
   - dpc-sdp:tide_core
   - dpc-sdp:tide_landing_page
   - paragraphs

diff --git a/tide_search.install b/tide_search.install
@@ -24,3 +24,35 @@ function tide_search_update_10001() {
     $module_installer->install(['tide_data_pipeline']);
   }
 }
+
+/**
+ * Add secondary campaign to search listing.
+ */
+function tide_search_update_10002() {
+  \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
+  $config_location = [\Drupal::service('extension.list.module')->getPath('tide_search') . '/config/optional'];
+
+  $config = 'field.field.node.tide_search_listing.field_landing_page_c_secondary';
+  $type = 'field_config';
+  $config_read = _tide_read_config($config, $config_location);
+  $storage = \Drupal::entityTypeManager()->getStorage($type);
+  $id = substr($config, strrpos($config, '.') + 1);
+  if ($storage->load($id) == NULL) {
+    $config_entity = $storage->createFromStorageRecord($config_read);
+    $config_entity->save();
+  }
+
+  $form_configs = [
+    'core.entity_view_display.node.tide_search_listing.default',
+    'core.entity_form_display.node.tide_search_listing.default',
+    'core.entity_view_display.node.tide_search_listing.teaser',
+  ];
+  foreach ($form_configs as $form_config) {
+    $config = \Drupal::configFactory()->getEditable($form_config);
+    $config_read = _tide_read_config($form_config, $config_location, FALSE);
+    $config->set('dependencies', $config_read['dependencies']);
+    $config->set('content', $config_read['content']);
+    $config->set('hidden', $config_read['hidden']);
+    $config->save();
+  }
+}