Merge remote-tracking branch 'salesforce-3349963/3349963-pushpull-revisions' into 5.1.x

modules/salesforce_address/salesforce_address.info.yml

 name: Salesforce Address
 type: module
 description: A custom Address Field Widget for Salesforce compatibility.
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 package: Salesforce
 dependencies:
   - address:address

modules/salesforce_example/salesforce_example.info.yml

 name: Salesforce Example
 type: module
 description: Salesforce Examples
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 package: Salesforce
 dependencies:
   - salesforce:salesforce_push

modules/salesforce_jwt/salesforce_jwt.info.yml

 name: Salesforce JWT Auth Provider
 type: module
 description: Provides key-based Salesforce authentication.
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 package: Salesforce
 configure: salesforce.auth_config
 dependencies:

modules/salesforce_logger/salesforce_logger.info.yml

 name: Salesforce Logger
 type: module
 description: Consolidated logging for Salesforce Log events.
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 package: Salesforce
 configure: salesforce_logger.settings
 dependencies:

modules/salesforce_mapping/salesforce_mapping.info.yml

@@ -2,7 +2,7 @@ name: Salesforce Mapping
 type: module
 description: Map Drupal entities to Salesforce objects.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 dependencies:
   - salesforce:salesforce
   - dynamic_entity_reference:dynamic_entity_reference

modules/salesforce_mapping/src/Entity/MappedObject.php

@@ -23,6 +23,7 @@ use Drupal\salesforce_mapping\Event\SalesforcePushParamsEvent;
 use Drupal\salesforce_mapping\MappingConstants;
 use Drupal\salesforce_mapping\Plugin\Field\FieldType\SalesforceLinkItemList;
 use Drupal\salesforce_mapping\PushParams;
+use Drupal\user\Entity\User;
 
 /**
  * Defines a Salesforce Mapped Object entity class.
@@ -40,6 +41,9 @@ use Drupal\salesforce_mapping\PushParams;
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "views_data" = "Drupal\views\EntityViewsData",
  *     "access" = "Drupal\salesforce_mapping\MappedObjectAccessControlHandler",
+ *     "route_provider" = {
+ *       "revision" = "Drupal\Core\Entity\Routing\RevisionHtmlRouteProvider"
+ *     },
  *   },
  *   base_table = "salesforce_mapped_object",
  *   revision_table = "salesforce_mapped_object_revision",
@@ -105,24 +109,6 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
     parent::__construct($values, 'salesforce_mapped_object');
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function preSaveRevision(EntityStorageInterface $storage, \stdClass $record) {
-    // Revision uid, timestamp, and message are required for D9.
-    if ($this->isNewRevision()) {
-      if (empty($this->getRevisionUserId())) {
-        $this->setRevisionUserId(1);
-      }
-      if (empty($this->getRevisionCreationTime())) {
-        $this->setRevisionCreationTime(time());
-      }
-      if (empty($this->getRevisionLogMessage())) {
-        $this->setRevisionLogMessage('New revision');
-      }
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -131,6 +117,11 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
     if ($this->isNew()) {
       $this->created = $this->getRequestTime();
     }
+    if ($this->isNewRevision()) {
+      $this
+        ->setRevisionCreationTime($this->getRequestTime())
+        ->setRevisionUserId($this->getCurrentUserId());
+    }
     return parent::save();
   }
 
@@ -474,6 +465,7 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
     $this
       ->set('last_sync_action', 'push_delete')
       ->set('last_sync_status', TRUE)
+      ->set('revision_log_message', '')
       ->save();
     return $this;
   }
@@ -600,19 +592,60 @@ class MappedObject extends RevisionableContentEntityBase implements MappedObject
     $drupal_entity->setSyncing(TRUE);
     $drupal_entity->save();
 
+    $this->setNewRevision(TRUE);
+
     // Update mapping object.
     $this->setNewRevision(TRUE);
     $this
       ->set('drupal_entity', $drupal_entity)
       ->set('entity_updated', $this->getRequestTime())
-      ->set('last_sync_action', 'pull')
+      ->set('last_sync_action', $this->isNew() ? 'pull_create' : 'pull_update')
       ->set('last_sync_status', TRUE)
       ->set('force_pull', 0)
+      ->set('revision_log_message', '')
       ->save();
 
     return $this;
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public function getRevisionLogMessage() {
+    return parent::getRevisionLogMessage() ?: $this->last_sync_action->value;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getRevisionUserId() {
+    return parent::getRevisionUserId() ?: 1;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getRevisionUser() {
+    return parent::getRevisionuser() ?: User::load(1);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getRevisionCreationTime() {
+    return parent::getRevisionCreationTime() ?: $this->entity_updated->value;
+  }
+
+  /**
+   * Testable func to return current user id.
+   *
+   * @return int
+   *   The current user id.
+   */
+  protected function getCurrentUserId() {
+    return \Drupal::currentUser()->id();
+  }
+
   /**
    * Testable func to return the request time server variable.
    *

modules/salesforce_mapping_ui/salesforce_mapping_ui.info.yml

@@ -2,7 +2,7 @@ name: Salesforce Mapping UI
 type: module
 description: User interface for managing Salesforce mappings.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 configure: entity.salesforce_mapping.list
 dependencies:
   - salesforce:salesforce_mapping

modules/salesforce_mapping_ui/salesforce_mapping_ui.module

@@ -58,6 +58,7 @@ function salesforce_mapping_ui_entity_type_alter(array &$entity_types) {
   $entity_types['salesforce_mapped_object']->setLinkTemplate('edit-form', '/admin/content/salesforce/{salesforce_mapped_object}/edit');
   $entity_types['salesforce_mapped_object']->setLinkTemplate('delete-form', '/admin/content/salesforce/{salesforce_mapped_object}/delete');
   $entity_types['salesforce_mapped_object']->setLinkTemplate('canonical', '/admin/content/salesforce/{salesforce_mapped_object}');
+  $entity_types['salesforce_mapped_object']->setLinkTemplate('version-history', '/admin/content/salesforce/{salesforce_mapped_object}/revisions');
 }
 
 /**

modules/salesforce_oauth/salesforce_oauth.info.yml

 name: Salesforce OAuth user-agent Provider
 type: module
 description: Provides user-agent-based Salesforce OAuth authentication.
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 package: Salesforce
 configure: salesforce.auth_config
 dependencies:

modules/salesforce_pull/salesforce_pull.info.yml

@@ -2,6 +2,6 @@ name: Salesforce Pull
 type: module
 description: Imports objects from Salesforce based on mappings defined in Salesforce Mapping.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 dependencies:
   - salesforce:salesforce_mapping

modules/salesforce_pull/src/Plugin/QueueWorker/PullBase.php

@@ -224,9 +224,18 @@ abstract class PullBase extends QueueWorkerBase implements ContainerFactoryPlugi
     }
     catch (\Exception $e) {
       $this->eventDispatcher->dispatch(new SalesforceErrorEvent($e, 'Failed to update entity %label from Salesforce object %sfobjectid.', [
-        '%label' => $entity->label(),
+        '%label' => (isset($entity)) ? $entity->label() : "Unknown",
         '%sfobjectid' => (string) $sf_object->id(),
       ]), SalesforceEvents::WARNING);
+
+      $mapped_object->setNewRevision(TRUE);
+      // Update mapped object.
+      $mapped_object
+        ->set('last_sync_action', 'pull_update')
+        ->set('last_sync_status', FALSE)
+        ->set('revision_log_message', $e->getMessage())
+        ->save();
+
       // Throwing a new exception keeps current item in cron queue.
       throw $e;
     }

modules/salesforce_push/salesforce_push.info.yml

@@ -2,6 +2,6 @@ name: Salesforce Push
 type: module
 description: Push data to Salesforce when updates are made to Drupal entities.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 dependencies:
   - salesforce:salesforce_mapping

modules/salesforce_push/salesforce_push.module

@@ -188,6 +188,7 @@ function salesforce_push_entity_crud_mapping(EntityInterface $entity, $op, Sales
 
     if (!$mapped_object->isNew()) {
       // Only update existing mapped objects.
+      $mapped_object->setNewRevision(TRUE);
       $mapped_object
         ->set('last_sync_action', $op)
         ->set('last_sync_status', FALSE)

modules/salesforce_soap/salesforce_soap.info.yml

@@ -2,6 +2,6 @@ name: Salesforce Soap
 type: module
 description: Exposes a SoapClient service for communicating with the Salesforce SOAP API.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 dependencies:
   - salesforce:salesforce

modules/salesforce_webform/salesforce_webform.info.yml

@@ -2,7 +2,7 @@ name: Salesforce Webform
 type: module
 description: Adds support for webforms fields in Salesforce Mapping.
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 
 dependencies:
   - salesforce:salesforce_mapping

salesforce.info.yml

@@ -2,5 +2,5 @@ name: Salesforce Integration
 type: module
 description: Modules to integrate Drupal and Salesforce
 package: Salesforce
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 configure: salesforce.admin_config_salesforce

tests/modules/salesforce_test_rest_client/salesforce_test_rest_client.info.yml

@@ -2,6 +2,6 @@ name: 'Salesforce Test Rest Client'
 type: module
 description: 'Provides a dummy Rest Client for functional tests.'
 package: Testing
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.1
 dependencies:
   - salesforce:salesforce