Issue #2919376 by AaronBauman: Restore field-level dependencies to mappings to...

Issue #2919376 by AaronBauman: Restore field-level dependencies to mappings to indicate dependencies and fix or delete mappings on config update

modules/salesforce_mapping/src/Entity/SalesforceMapping.php

@@ -6,7 +6,6 @@ use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\DefaultLazyPluginCollection;
-use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
 use Drupal\salesforce\Exception;
 use Drupal\salesforce\SelectQuery;
 use Drupal\salesforce_mapping\MappingConstants;
@@ -386,7 +385,6 @@ class SalesforceMapping extends ConfigEntityBase implements SalesforceMappingInt
     return $changed;
   }
 
-
   /**
    * {@inheritdoc}
    */

modules/salesforce_mapping/src/Plugin/SalesforceMappingField/PropertiesExtended.php

@@ -105,7 +105,10 @@ class PropertiesExtended extends SalesforceMappingFieldPluginBase {
    */
   public function getPluginDefinition() {
     $definition = parent::getPluginDefinition();
-    list($field_name, $referenced_field_name) = explode('.', $this->config('drupal_field_value'), 2);
+    $field_name = $this->config('drupal_field_value');
+    if (strpos($field_name, '.')) {
+      list($field_name, $dummy) = explode('.', $field_name, 2);
+    }
     // Add reference field.
     if ($field = FieldConfig::loadByName($this->mapping->getDrupalEntityType(), $this->mapping->getDrupalBundle(), $field_name)) {
       $definition['config_dependencies']['config'][] = $field->getConfigDependencyName();

modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedIDs.php

@@ -135,9 +135,6 @@ class RelatedIDs extends SalesforceMappingFieldPluginBase {
     return $options;
   }
 
-  /**
-   * {@inheritdoc}
-   */
   /**
    * {@inheritdoc}
    */

modules/salesforce_mapping/src/Plugin/SalesforceMappingField/RelatedProperties.php

@@ -97,7 +97,10 @@ class RelatedProperties extends SalesforceMappingFieldPluginBase {
    */
   public function getPluginDefinition() {
     $definition = parent::getPluginDefinition();
-    list($field_name, $referenced_field_name) = explode(':', $this->config('drupal_field_value'), 2);
+    $field_name = $this->config('drupal_field_value');
+    if (strpos($field_name, ':')) {
+      list($field_name, $dummy) = explode(':', $field_name, 2);
+    }
     // Add reference field.
     if ($field = FieldConfig::loadByName($this->mapping->getDrupalEntityType(), $this->mapping->getDrupalBundle(), $field_name)) {
       $definition['config_dependencies']['config'][] = $field->getConfigDependencyName();

modules/salesforce_mapping/src/SalesforceMappingFieldPluginBase.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\salesforce_mapping;
 
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityInterface;
@@ -11,11 +10,8 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\field\Entity\FieldConfig;
 use Drupal\salesforce\Event\SalesforceEvents;
 use Drupal\salesforce\Event\SalesforceWarningEvent;
 use Drupal\salesforce\Exception as SalesforceException;

modules/salesforce_mapping/src/SalesforceMappingFieldPluginInterface.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\salesforce_mapping;
 
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
+use Drupal\Component\Plugin\ConfigurableInterface;
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -13,7 +13,7 @@ use Drupal\salesforce_mapping\Entity\SalesforceMappingInterface;
 /**
  * Defines an interface for salesforce mapping plugins.
  */
-interface SalesforceMappingFieldPluginInterface extends PluginFormInterface, ConfigurablePluginInterface, ContainerFactoryPluginInterface {
+interface SalesforceMappingFieldPluginInterface extends PluginFormInterface, DependentPluginInterface, ConfigurableInterface, ContainerFactoryPluginInterface {
 
   /**
    * Returns label of the mapping field plugin.
@@ -152,4 +152,5 @@ interface SalesforceMappingFieldPluginInterface extends PluginFormInterface, Con
    *   TRUE if the field should be removed, otherwise false.
    */
   public function checkFieldMappingDependency(array $dependencies);
+
 }

modules/salesforce_mapping_ui/src/Form/SalesforceMappingFieldsForm.php

@@ -209,7 +209,7 @@ class SalesforceMappingFieldsForm extends SalesforceMappingFormBase {
     }
 
     $row['config'] = $field_plugin->buildConfigurationForm($form, $form_state);
-    $row['config']['id'] = ['#type' => 'value', 'value' => $i];
+    $row['config']['id'] = ['#type' => 'value', '#value' => $i];
     // @TODO implement "lock/unlock" logic here:
     // @TODO convert these to AJAX operations
     $operations = [