Merge pull request #1319 from UN-OCHA/release-versions/v1.13.14

release versions/v1.13.14

Author: berliner

.docksal/commands/post-deploy .docksal/commands/deploy

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 #: exec_target = cli
 
-## Run the typical commands for the post-deployment
+## Run the typical commands for the deployment
 ##
-## Usage: fin post-deploy
+## Usage: fin deploy
 
 # Environment variables passed from fin:
 #
@@ -19,7 +19,7 @@ usage="$(basename "$0") [-h] [-i]
 
 where:
     -h  show this help text
-    -i  import a local backup before executing the post-deploy steps"
+    -i  import a local backup before executing the deploy steps"
 
 IMPORT_BACKUP=false
 

composer.lock

@@ -3,12 +3,10 @@ _core:
 module:
   admin_denied: 0
   admin_toolbar: 0
-  admin_toolbar_links_access_filter: 0
   admin_toolbar_tools: 0
   auto_entitylabel: 0
   autologout: 0
   bert: 0
-  better_permissions_page: 0
   big_pipe: 0
   big_pipe_sessionless: 0
   block: 0
@@ -40,6 +38,7 @@ module:
   file_mdm_font: 0
   filter: 0
   flat_taxonomy: 0
+  fpa: 0
   geofield: 0
   geofield_map: 0
   ghi_base_objects: 0

config/core.extension.yml

@@ -0,0 +1,20 @@
+uuid: ed463ad2-3733-4efb-bb4e-7cdef509dd3c
+langcode: en
+status: true
+dependencies:
+  module:
+    - fpa
+id: core_requirements_fpa
+label: 'Module fpa'
+description: 'Requirements of the fpa module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: fpa
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_fpa.yml

@@ -87,7 +87,6 @@ permissions:
   - 'administer ghi global config'
   - 'administer ghi table config'
   - 'administer menu'
-  - 'administer nodes'
   - 'administer orphaned content'
   - 'administer page templates'
   - 'administer pages'
@@ -99,6 +98,7 @@ permissions:
   - 'administer url aliases'
   - 'administer users'
   - 'assign all roles'
+  - 'bypass node access'
   - 'configure all homepage node layout overrides'
   - 'configure any layout'
   - 'configure editable article node layout overrides'
@@ -283,6 +283,7 @@ permissions:
   - 'use text format html_text'
   - 'use text format wysiwyg_text'
   - 'view all media revisions'
+  - 'view all revisions'
   - 'view any unpublished article content'
   - 'view any unpublished content'
   - 'view any unpublished custom_subpage content'

config/user.role.administrator.yml

@@ -38,7 +38,6 @@ permissions:
   - 'access contextual links'
   - 'access remote content'
   - 'access toolbar'
-  - 'administer nodes'
   - 'configure editable article node layout overrides'
   - 'configure editable custom_subpage node layout overrides'
   - 'configure editable document node layout overrides'

config/user.role.editor.yml

@@ -58,10 +58,10 @@ permissions:
   - 'access toolbar'
   - 'access user profiles'
   - 'administer menu'
-  - 'administer nodes'
   - 'administer orphaned content'
   - 'administer page templates'
   - 'administer users'
+  - 'bypass node access'
   - 'configure all homepage node layout overrides'
   - 'configure editable article node layout overrides'
   - 'configure editable custom_subpage node layout overrides'
@@ -209,6 +209,7 @@ permissions:
   - 'use layout builder ipe on editable section node layout overrides'
   - 'use page templates'
   - 'use text format html_text'
+  - 'view all revisions'
   - 'view any unpublished article content'
   - 'view any unpublished content'
   - 'view any unpublished custom_subpage content'

config/user.role.global_editor.yml

@@ -42,7 +42,6 @@ permissions:
   - 'access user profiles'
   - 'administer base object entities'
   - 'administer ghi global config'
-  - 'administer nodes'
   - 'configure all homepage node layout overrides'
   - 'configure editable homepage node layout overrides'
   - 'create homepage content'

config/user.role.rpm_administrator.yml

@@ -364,7 +364,7 @@ display:
       access:
         type: perm
         options:
-          perm: 'administer nodes'
+          perm: 'access content overview'
       cache:
         type: tag
       empty:
@@ -5337,7 +5337,7 @@ display:
         weight: -10
         menu_name: admin
     cache_metadata:
-      max-age: -1
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'

config/views.view.content.yml

@@ -517,3 +517,92 @@ function ghi_blocks_deploy_90010_update_funding_coverage_default_label_page_temp
     ]);
   }
 }
+
+/**
+ * Fix broken configuration for headline figure elements on nodes.
+ */
+function ghi_blocks_deploy_9010_fix_broken_block_config(&$sandbox) {
+  set_time_limit(30);
+  if (!isset($sandbox['nodes'])) {
+    $result = \Drupal::database()->select('node__layout_builder__layout')
+      ->fields('node__layout_builder__layout', ['entity_id'])
+      ->condition('layout_builder__layout_section', '%processing";s:0%', 'LIKE')
+      ->orderBy('entity_id')
+      ->execute();
+    $sandbox['nodes'] = array_map(function ($row) {
+      return $row->entity_id;
+    }, $result->fetchAll());
+    $sandbox['total'] = count($sandbox['nodes']);
+    $sandbox['updated'] = 0;
+  }
+  for ($i = 0; $i < 25; $i++) {
+    if (empty($sandbox['nodes'])) {
+      continue;
+    }
+    $node_id = array_shift($sandbox['nodes']);
+    /** @var \Drupal\node\NodeInterface $node */
+    $node = \Drupal::entityTypeManager()->getStorage('node')->load($node_id);
+    if (!$node) {
+      continue;
+    }
+
+    $changed = FALSE;
+    if (!$node->hasField(OverridesSectionStorage::FIELD_NAME)) {
+      continue;
+    }
+    $sections = $node->get(OverridesSectionStorage::FIELD_NAME)->getValue();
+    if (empty($sections)) {
+      continue;
+    }
+    /** @var \Drupal\layout_builder\Section $section */
+    $section = &$sections[0]['section'];
+    $components = $section->getComponents();
+    if (empty($components)) {
+      continue;
+    }
+    foreach ($components as $component) {
+      if ($component->getPluginId() != 'plan_headline_figures') {
+        continue;
+      }
+      $configuration = $component->get('configuration');
+      if (empty($configuration['hpc']['key_figures']['items'])) {
+        return $changed;
+      }
+
+      $items = &$configuration['hpc']['key_figures']['items'];
+      $original_count = count($items);
+      $items = array_filter($items, function ($item) {
+        if ($item['item_type'] != 'attachment_data') {
+          return TRUE;
+        }
+        return !empty($item['config']['data_point']['processing']);
+      });
+      if (count($items) != $original_count) {
+        $changed = TRUE;
+        $component->setConfiguration($configuration);
+      }
+    }
+
+    if ($changed) {
+      $node->get(OverridesSectionStorage::FIELD_NAME)->setValue($sections);
+      $node->setNewRevision(FALSE);
+      $node->setSyncing(TRUE);
+      $node->save();
+      $sandbox['updated']++;
+    }
+  }
+
+  $sandbox['#finished'] = 1 / (count($sandbox['nodes']) + 1);
+  if ($sandbox['#finished'] === 1) {
+    return t('Updated configurations in @count_changed / @count_total nodes', [
+      '@count_changed' => $sandbox['updated'],
+      '@count_total' => $sandbox['total'],
+    ]);
+  }
+  else {
+    return t('Processed @count_processed / @count_total nodes', [
+      '@count_processed' => $sandbox['total'] - count($sandbox['nodes']),
+      '@count_total' => $sandbox['total'],
+    ]);
+  }
+}

html/modules/custom/ghi_blocks/ghi_blocks.deploy.php

@@ -227,7 +227,7 @@ private function buildCircleMap() {
         'tooltip' => implode(' ', [
           $plan_entity->getShortName(),
           $plan_entity->getYear(),
-          $plan_entity->getPlanTypeShortLabel(FALSE),
+          $plan->getTypeShortName(TRUE),
         ]),
         'tooltip_values' => [
           'in_need' => [