Issue #3506472 by scambler: Record type filter cleared whenever saving mapping fields

modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php

@@ -182,21 +182,4 @@ abstract class SalesforceMappingFormBase extends EntityForm {
     return $sfobject_options;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    $entity = parent::buildEntity($form, $form_state);
-    $record_types = $form_state->getValue('pull_record_type_filter');
-    if (!empty($record_types)) {
-      $record_types = array_filter($record_types);
-      if (!empty($record_types)) {
-        $record_types = array_values($record_types);
-      }
-    }
-    $entity->set('pull_record_type_filter', $record_types ?? []);
-    return $entity;
-  }
-
-
 }

modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php

@@ -605,4 +605,20 @@ abstract class SalesforceMappingFormCrudBase extends SalesforceMappingFormBase {
     return $options;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEntity(array $form, FormStateInterface $form_state) {
+    $entity = parent::buildEntity($form, $form_state);
+    $record_types = $form_state->getValue('pull_record_type_filter');
+    if (!empty($record_types)) {
+      $record_types = array_filter($record_types);
+      if (!empty($record_types)) {
+        $record_types = array_values($record_types);
+      }
+    }
+    $entity->set('pull_record_type_filter', $record_types ?? []);
+    return $entity;
+  }
+
 }