Merge pull request #910 from UN-OCHA/release-versions/v1.7.2

release versions/v1.7.2

Author: berliner

.docksal/docksal.yml

@@ -53,4 +53,9 @@ services:
     volumes:
       - ${PROJECT_ROOT}/.docksal/etc/solr/solr811:/opt/solr/server/solr/configsets/solr811
     environment:
-      SOLR_CORE: ${SOLR_CORE:-ghi}
+      SOLR_CORE: ${SOLR_CORE:-ghi}
+
+  memcached:
+    extends:
+      file: ${HOME}/.docksal/stacks/services.yml
+      service: memcached

config/core.entity_form_display.node.article.default.yml

@@ -60,7 +60,6 @@ third_party_settings:
       children:
         - field_remote_article
         - field_image
-        - field_chapter
         - field_summary
         - field_tags
       label: 'Remote article'

config/imagemagick.settings.yml

@@ -6,7 +6,6 @@ path_to_binaries: ''
 prepend: ''
 log_warnings: true
 debug: false
-locale: en_US.UTF-8
 image_formats:
   PNG:
     mime_type: image/png
@@ -59,3 +58,4 @@ advanced:
   colorspace: '0'
   profile: ''
   coalesce: false
+locale: en_US.UTF-8

html/modules/custom/ghi_blocks/src/Plugin/Block/GHIBlockBase.php

@@ -745,7 +745,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form['label']['#access'] = FALSE;
     $form['label']['#required'] = FALSE;
     $form['label_display']['#access'] = FALSE;
-    $form['context_mapping']['#access'] = FALSE;
+    $form['context_mapping']['#access'] = $form_state->get('current_subform') == self::CONTEXTS_FORM_KEY && !$this->isConfigurationPreview();
 
     $settings_form = &$form['container'];
 

html/modules/custom/ghi_content/ghi_content.module

@@ -189,7 +189,7 @@ function ghi_content_form_ghi_subpages_admin_views_form_alter(array &$form, Form
 /**
  * Implements hook_form_FORM_ID_alter().
  *
- * Used to disable fields that automatically populated.
+ * Used to disable fields that are automatically populated.
  */
 function ghi_content_form_node_article_edit_form_alter(array &$form, FormStateInterface $form_state) {
   /** @var \Drupal\ghi_content\ContentManager\ArticleManager $article_manager */
@@ -201,7 +201,7 @@ function ghi_content_form_node_article_edit_form_alter(array &$form, FormStateIn
 /**
  * Implements hook_form_FORM_ID_alter().
  *
- * Used to disable fields that automatically populated.
+ * Used to disable fields that are automatically populated.
  */
 function ghi_content_form_node_document_edit_form_alter(array &$form, FormStateInterface $form_state) {
   /** @var \Drupal\ghi_content\ContentManager\DocumentManager $article_manager */

html/modules/custom/ghi_content/src/ContentManager/ArticleManager.php

@@ -216,6 +216,7 @@ public function updateNodeFromRemote(NodeInterface $node, $dry_run = FALSE, $res
 
     if (!$dry_run) {
       $this->importManager->layoutManagerDiscardChanges($node, NULL);
+      $node->setSyncing(TRUE);
     }
   }
 

html/modules/custom/ghi_content/src/ContentManager/BaseContentManager.php

@@ -633,12 +633,12 @@ public function nodeEditFormAlter(array &$form, FormStateInterface $form_state)
       $this->messenger->addWarning($this->t('Some of the fields in this form are disabled because their content is automatically synced from the remote source.'));
     }
 
-    $migration_id = $this->getMigration($node)->id();
-    $loaded_migration = Migration::load($migration_id);
-    $destination = $loaded_migration->get('destination');
+    $migration = $this->getMigration($node);
+    $loaded_migration = $migration ? Migration::load($migration->id()) : NULL;
+    $destination = $loaded_migration?->get('destination') ?? NULL;
     $disabled_field_text = $this->t('This field is disabled because it is automatically populated from the remote source.');
 
-    $field_keys = array_merge($destination['overwrite_properties'], ['field_image']);
+    $field_keys = array_merge($destination ? $destination['overwrite_properties'] : [], ['field_image']);
     foreach ($field_keys as $field_key) {
       if (empty($form[$field_key])) {
         continue;

html/modules/custom/ghi_content/src/Controller/ContentBaseListController.php

@@ -73,10 +73,13 @@ protected function runMigration($redirect, array $tags = NULL) {
       $this->messenger()->addWarning($this->t('The import is currently running. Please try again later.'));
       return new RedirectResponse($redirect);
     }
+    $options = [
+      'update' => 0,
+    ];
     if ($tags !== NULL) {
       $options['configuration'] = ['source_tags' => $tags];
     }
-    $executable = new MigrateBatchExecutable($migration, new MigrateMessage());
+    $executable = new MigrateBatchExecutable($migration, new MigrateMessage(), $options);
     $executable->batchImport();
     batch_process($redirect);
     $batch = batch_get();

html/modules/custom/ghi_content/src/EventSubscriber/PostRowSaveEventSubscriber.php

@@ -78,7 +78,7 @@ public function onMigratePostRowSave(MigratePostRowSaveEvent $event) {
     if (!in_array($event->getMigration()->id(), $migration_ids)) {
       return;
     }
-    if (!$event->getRow()->needsUpdate()) {
+    if (!$event->getRow()->changed()) {
       return;
     }
     $ids = $event->getDestinationIdValues();

html/modules/custom/ghi_content/src/Plugin/Block/Paragraph.php

@@ -429,6 +429,7 @@ public function getArticle() {
     }
     /** @var \Drupal\ghi_content\RemoteSource\RemoteSourceManager $remote_source_manager */
     $remote_source_manager = \Drupal::service('plugin.manager.remote_source');
+    /** @var \Drupal\ghi_content\RemoteSource\RemoteSourceInterface $remote_source */
     $remote_source = $remote_source_manager->createInstance($remote_source_key);
     $article_id = $conf['article_select']['article']['article_id'] ?? NULL;
     if (!$remote_source || !$article_id) {

html/modules/custom/ghi_content/src/RemoteSource/RemoteSourceBaseHpcContentModule.php

@@ -230,7 +230,7 @@ public function query($payload) {
     ];
 
     // See if we have a cached version already for this request.
-    $cache_key = $this->getCacheKey(['url' => $this->getRemoteEndpointUrl()] + $post_args);
+    $cache_key = $this->getCacheKey(['url' => $this->getRemoteEndpointUrl()] + ['body' => $post_args['body']]);
     if (!$this->disableCache && $response = $this->cache($cache_key)) {
       // If we have a cached version, use that.
       return $response;

html/modules/custom/ghi_enforce_alias_pattern/src/EnforceAliasPatternManager.php

@@ -3,6 +3,7 @@
 namespace Drupal\ghi_enforce_alias_pattern;
 
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -15,6 +16,7 @@
 class EnforceAliasPatternManager {
 
   use StringTranslationTrait;
+  use DependencySerializationTrait;
 
   /**
    * The pathauto generator service.

html/modules/custom/ghi_plans/src/Helpers/PlanEntityHelper.php

@@ -90,7 +90,7 @@ public static function getPlanEntityObjects($plan_data) {
    */
   public static function getPlanEntity($entity_id, $version_argument = 'current') {
     /** @var \Drupal\hpc_api\Query\EndpointQuery $query */
-    $query = \Drupal::service('hpc_api.endpoint_query');
+    $query = clone \Drupal::service('hpc_api.endpoint_query');
     $query->setArguments([
       'endpoint' => 'planEntity/' . $entity_id,
       'api_version' => 'v2',

html/modules/custom/ghi_plans/src/Plugin/EndpointQuery/PlanProjectFundingQuery.php

@@ -14,8 +14,12 @@
  *   id = "plan_project_funding_query",
  *   label = @Translation("Plan funding summary query"),
  *   endpoint = {
- *     "public" = "fts/project/plan?planid={plan_id}&groupBy=project",
- *     "version" = "v1"
+ *     "public" = "fts/project/plan",
+ *     "version" = "v1",
+ *     "query" = {
+ *       "planid" = "{plan_id}",
+ *       "groupBy" = "project"
+ *     }
  *   }
  * )
  */

html/modules/custom/ghi_subpages/src/LayoutBuilder/LogframeRebuildForm.php

@@ -196,9 +196,8 @@ protected function successfulAjaxSubmit(array $form, FormStateInterface $form_st
       $response->addCommand(new RedirectCommand($entity_url->toString()));
     }
     else {
-      /** @var \Drupal\layout_builder_ipe\Controller\EntityEditController $entity_edit_controller */
-      $entity_edit_controller = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class);
-      $response = $entity_edit_controller->edit($form_state->get('section_storage'));
+      $callable = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class . '::edit');
+      $response = $callable($form_state->get('section_storage'));
       $response->addCommand(new CloseDialogCommand('#layout-builder-modal'));
     }
     return $response;

html/modules/custom/ghi_templates/src/LayoutBuilder/ImportPageConfigForm.php

@@ -314,9 +314,8 @@ protected function successfulAjaxSubmit(array $form, FormStateInterface $form_st
       $response->addCommand(new RedirectCommand($entity_url->toString()));
     }
     else {
-      /** @var \Drupal\layout_builder_ipe\Controller\EntityEditController $entity_edit_controller */
-      $entity_edit_controller = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class);
-      $response = $entity_edit_controller->edit($form_state->get('section_storage'));
+      $callable = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class . '::edit');
+      $response = $callable($form_state->get('section_storage'));
       $response->addCommand(new CloseDialogCommand('#layout-builder-modal'));
     }
     return $response;

html/modules/custom/hpc_api/src/Query/EndpointQueryBase.php

@@ -72,17 +72,19 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
     $endpoint_query_args = $plugin_definition['endpoint']['query'] ?? [];
 
     $this->isAutenticatedEndpoint = $endpoint_authenticated && $this->user->isAuthenticated() && $this->getHidAccessToken();
+    $endpoint_url = $this->isAutenticatedEndpoint ? $endpoint_authenticated : $endpoint_public;
+    $auth_method = EndpointQuery::AUTH_METHOD_BASIC;
     if ($endpoint_api_key) {
-      $this->endpointQuery->setAuthMethod(EndpointQuery::AUTH_METHOD_API_KEY);
-      $this->endpointQuery->setEndpoint($endpoint_api_key);
-    }
-    else {
-      $this->endpointQuery->setAuthMethod(EndpointQuery::AUTH_METHOD_BASIC);
-      $this->endpointQuery->setEndpoint($this->isAutenticatedEndpoint ? $endpoint_authenticated : $endpoint_public);
+      $auth_method = EndpointQuery::AUTH_METHOD_API_KEY;
+      $endpoint_url = $endpoint_api_key;
     }
 
-    $this->endpointQuery->setEndpointVersion($endpoint_version);
-    $this->endpointQuery->setEndpointArguments($endpoint_query_args);
+    $this->endpointQuery->setArguments([
+      'api_version' => $endpoint_version,
+      'endpoint' => $endpoint_url,
+      'query_args' => $endpoint_query_args,
+      'auth_method' => $auth_method,
+    ]);
   }
 
   /**

html/sites/default/settings.docksal.php

@@ -80,6 +80,12 @@
 $config['system.performance']['css']['preprocess'] = FALSE;
 $config['system.performance']['js']['preprocess'] = FALSE;
 
+// Memcache.
+$settings['memcache']['servers'] = ['memcached:11211' => 'default'];
+$settings['memcache']['bins'] = ['default' => 'default'];
+$settings['memcache']['key_prefix'] = '';
+$settings['cache']['default'] = 'cache.backend.memcache';
+
 // Reverse proxy configuration (Docksal vhost-proxy)
 if (PHP_SAPI !== 'cli') {
   $settings['reverse_proxy'] = TRUE;