Merge branch 'develop' into feature/SD-358-wysiwyg-table-col

.github/workflows/build.yml

@@ -5,34 +5,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  set_status_in_progress:
-    name: set_status_in_progress
-    if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-    secrets: inherit
-    with:
-      context: 'tide_build'
-      description: 'Tide Build running...'
-      state: 'pending'
-      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
   tide_build:
     name: tide_build
     secrets: inherit
     uses: dpc-sdp/github-actions/.github/workflows/[email protected]
     with:
       module_build: true
       runner: biggy-tide
-  export_config:
-    name: export_config
-    secrets: inherit
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-  set_status:
-    name: set_status
-    needs: [tide_build]
-    if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-    secrets: inherit
-    with:
-      context: 'tide_build'
-      description: 'Tide Build'
-      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}

.github/workflows/pull-request-reviewer-reminder.yml

@@ -0,0 +1,21 @@
+name: 'Close stale issues and PRs'
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  contents: write # only for delete-branch option
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          exempt-pr-labels: "DO NOT MERGE"
+          stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          days-before-stale: 28
+          days-before-close: 14

modules/tide_api/src/Plugin/jsonapi/FieldEnhancer/YamlEnhancer.php

@@ -23,14 +23,12 @@ class YamlEnhancer extends ResourceFieldEnhancerBase {
    */
   protected function doUndoTransform($data, Context $context) {
     $data = Yaml::decode($data);
-    $markup_text = $data['markup']['#markup'];
-    $processed_text = $data['processed_text']['#text'];
 
-    if (!empty($processed_text)) {
-      $data['processed_text']['#text'] = $this->processText($processed_text);
+    if (!empty($data['markup']['#markup'])) {
+      $data['processed_text']['#text'] = $this->processText($data['markup']['#markup']);
     }
-    if (!empty($markup_text)) {
-      $data['markup']['#markup'] = $this->processText($markup_text);
+    if (!empty($data['markup']['#markup'])) {
+      $data['markup']['#markup'] = $this->processText($data['markup']['#markup']);
     }
 
     return $data;

modules/tide_landing_page/tide_landing_page.install

@@ -34,7 +34,8 @@ function tide_landing_page_install() {
  */
 function tide_landing_page_update_dependencies() {
   $dependencies = [];
-  $dependencies['tide_landing_page'][10102] = ['tide_core' => 10005];
+  $dependencies['tide_landing_page'][10101] = ['tide_core' => 10005];
+  $dependencies['tide_landing_page'][10106] = ['tide_core' => 10009];
 
   return $dependencies;
 }

modules/tide_publication/config/install/core.entity_view_display.node.publication_page.default.yml

@@ -2,6 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.publication.field_content_category
     - field.field.node.publication_page.field_landing_page_component
     - field.field.node.publication_page.field_landing_page_contact
     - field.field.node.publication_page.field_landing_page_hero_image
@@ -22,6 +23,7 @@ dependencies:
     - entity_reference_revisions
     - options
     - user
+    - term_reference_tree
 id: node.publication_page.default
 targetEntityType: node
 bundle: publication_page
@@ -39,6 +41,17 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_content_category:
+    type: term_reference_tree
+    weight: 5
+    region: content
+    settings:
+      start_minimized: true
+      leaves_only: true
+      select_parents: false
+      cascading_selection: 0
+      max_depth: 0
+    third_party_settings: { }
   field_landing_page_component:
     weight: 1
     label: above

modules/tide_publication/config/install/field.field.node.publication_page.field_content_category.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_content_category
+    - node.type.publication_page
+    - taxonomy.vocabulary.content_category
+id: node.publication_page.field_content_category
+field_name: field_content_category
+entity_type: node
+bundle: publication_page
+label: 'Content category'
+description: 'Select the most relevant option from the <a href="https://www.vic.gov.au/content-categories">list of content categories</a>. 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

modules/tide_publication/tests/behat/features/fields.feature

@@ -179,3 +179,5 @@ Feature: Fields for Publication content type
     And I see field "Show content rating?"
     And I should see an "input#edit-field-show-content-rating-value" element
     And I should not see an "input#edit-field-show-content-rating-value.required" element
+
+    And I should see text matching "Content category"

modules/tide_publication/tide_publication.install

@@ -130,3 +130,20 @@ function tide_publication_update_10004() {
   $tide_update_helper = \Drupal::service('tide_core.entity_update_helper');
   $tide_update_helper->configMergeDeep('tide_landing_page', TideEntityUpdateHelper::INSTALL_DIR, $form_configs);
 }
+
+/**
+ * Imports publication_page.field_content_category for existing sites.
+ */
+function tide_publication_update_10005() {
+  \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
+  $config_location = [\Drupal::service('extension.list.module')->getPath('tide_publication') . '/config/install'];
+  $config_read = _tide_read_config('field.field.node.publication_page.field_content_category', $config_location, TRUE);
+  $storage = \Drupal::entityTypeManager()->getStorage('field_config');
+  $id = $storage->getIDFromConfigName('field.field.node.publication_page.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_content_category_form_display('publication_page');
+}

modules/tide_site/src/AliasManager.php

@@ -26,7 +26,7 @@ class AliasManager extends CoreAliasManager {
   /**
    * {@inheritdoc}
    */
-  public function __construct(AliasRepositoryInterface $repository, AliasWhitelistInterface $whitelist, LanguageManagerInterface $language_manager, CacheBackendInterface $cache, protected ?TimeInterface $time = NULL, AliasStorageHelper $alias_helper) {
+  public function __construct(AliasRepositoryInterface $repository, AliasWhitelistInterface $whitelist, LanguageManagerInterface $language_manager, CacheBackendInterface $cache, protected ?TimeInterface $time, AliasStorageHelper $alias_helper) {
     parent::__construct($repository, $whitelist, $language_manager, $cache, $time);
     $this->aliasHelper = $alias_helper;
   }

modules/tide_site/tide_site.install

@@ -25,7 +25,7 @@ function tide_site_install() {
  */
 function tide_site_update_10001() {
   \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
-  $config_location = [\Drupal::service('extension.list.module')->getPath('tide_site') . '/config/install'];
+  $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
 
   $configs = [
     'field.storage.taxonomy_term.field_additional_comment' => 'field_storage_config',