diff --git a/composer.json b/composer.json index 10685f2..51d0216 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, "require": { "dpc-sdp/tide_api": "^4.0.0", - "dpc-sdp/tide_core": "^4.0.0", + "dpc-sdp/tide_core": "dev-feature/SDPAP-8421-adds-Content-Category-to-tide_core as 4.0.1", "dpc-sdp/tide_landing_page": "^4.0.0", "drupal/elasticsearch_connector": "^7.0", "drupal/search_api": "^1.11", 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 index 676214f..98023a1 100644 --- 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 @@ -28,6 +28,7 @@ dependencies: - field.field.node.tide_search_listing.field_topic - node.type.tide_search_listing - workflows.workflow.editorial + - field.field.node.tide_search_listing.field_content_category module: - content_moderation - field_group @@ -37,6 +38,7 @@ dependencies: - select2 - text - tide_content_collection + - term_reference_tree third_party_settings: field_group: group_search_listing_header: @@ -388,6 +390,17 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_content_category: + type: term_reference_tree + weight: 11 + region: content + settings: + start_minimized: true + leaves_only: true + select_parents: false + cascading_selection: 0 + max_depth: 0 + third_party_settings: { } moderation_state: type: moderation_state_default weight: 20 diff --git a/config/optional/field.field.node.tide_search_listing.field_content_category.yml b/config/optional/field.field.node.tide_search_listing.field_content_category.yml new file mode 100644 index 0000000..7676c30 --- /dev/null +++ b/config/optional/field.field.node.tide_search_listing.field_content_category.yml @@ -0,0 +1,28 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_content_category + - node.type.tide_search_listing + - taxonomy.vocabulary.content_category +id: node.tide_search_listing.field_content_category +field_name: field_content_category +entity_type: node +bundle: tide_search_listing +label: 'Content category' +description: 'Select the most relevant option from the list of content categories. This mandatory field will help with search and filtering on the website.' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + content_category: content_category + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/dev-tools.sh b/dev-tools.sh index d7573df..d2e0735 100755 --- a/dev-tools.sh +++ b/dev-tools.sh @@ -34,5 +34,6 @@ # # Uncomment and set the Dev-Tools's commit value and commit this change. # export GH_COMMIT=COMMIT_SHA +export GH_COMMIT=2e9d1f5e7d89cbc2b9b5fc1312de9c687df291c9 bash <(curl -L https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install?"$(date +%s)") "$@" diff --git a/tide_search.install b/tide_search.install index 906dada..cae52d0 100644 --- a/tide_search.install +++ b/tide_search.install @@ -15,6 +15,15 @@ function tide_search_install() { $tideSearchOperation->removeTideAlertFromDatasource(); } +/** + * Implements hook_update_dependencies(). + */ +function tide_search_update_dependencies() { + $dependencies = []; + $dependencies['tide_search'][10004] = ['tide_core' => 10005]; + return $dependencies; +} + /** * Install module tide_data_pipeline. */ @@ -90,3 +99,21 @@ function tide_search_update_10003() { $config->save(); } } + +/** + * Imports field_content_category field for existing sites. + */ +function tide_search_update_10004() { + \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers'); + $config_location = [\Drupal::service('extension.list.module')->getPath('tide_search') . '/config/optional']; + $config_read = _tide_read_config('field.field.node.tide_search_listing.field_content_category', $config_location, TRUE); + $storage = \Drupal::entityTypeManager()->getStorage('field_config'); + $id = $storage->getIDFromConfigName('field.field.node.tide_search_listing.field_content_category', $storage->getEntityType()->getConfigPrefix()); + if ($storage->load($id) == NULL) { + $config_entity = $storage->createFromStorageRecord($config_read); + $config_entity->save(); + } + \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/updates'); + _tide_core_field_content_category_default_value('tide_search_listing', 'Search listing'); + _tide_core_content_category_form_display('tide_search_listing'); +}