Fixed entity mapping for wordpress importer form (#521)

Author: pookmish

modules/stanford_wordpress_migrate/src/Form/ImporterStep2EntitySelectForm.php

@@ -132,16 +132,17 @@ protected function getAllowedBundles($entity_type): array {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state): void {
+    $cached_values = $form_state->getTemporaryValue(['wizard']);
+
     /** @var \Drupal\stanford_wordpress_migrate\WordPressMigrationInterface $migration */
-    $migration = $form_state->getTemporaryValue([
-      'wizard',
-      'wordpress_migration',
-    ]);
-    $media = array_filter($form_state->getValue('mapping'), fn($mapping) => $mapping['source'] && $mapping['destination']);
-    $chosen_sources = array_map(fn($a) => $a['source'], $media);
-    $chosen_destinations = array_map(fn($a) => $a['destination'], $media);
+    $migration = $cached_values['wordpress_migration'];
+    $entity_type = $cached_values['entity_type'];
+
+    $mappings = array_filter($form_state->getValue('mapping'), fn($mapping) => $mapping['source'] && $mapping['destination']);
+    $chosen_sources = array_map(fn($a) => $a['source'], $mappings);
+    $chosen_destinations = array_map(fn($a) => $a['destination'], $mappings);
 
-    $field_mapping = $migration->getConfigurationValue('media', []);
+    $field_mapping = $migration->getConfigurationValue($entity_type, []);
 
     // Remove any previously configured values that are no longer desired.
     foreach ($field_mapping as $source => $destinations) {
@@ -157,16 +158,16 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
         }
       }
     }
-    $migration->setConfigurationValue('media', array_filter($field_mapping));
+    $migration->setConfigurationValue($entity_type, array_filter($field_mapping));
 
-    foreach ($media as $mapping) {
+    foreach ($mappings as $mapping) {
       $field_mapping = $migration->getConfigurationValue([
-        'media',
+        $entity_type,
         $mapping['source'],
         $mapping['destination'],
       ], []);
       $migration->setConfigurationValue([
-        'media',
+        $entity_type,
         $mapping['source'],
         $mapping['destination'],
       ], $field_mapping);

modules/stanford_wordpress_migrate/tests/src/Unit/Form/ImporterStep2EntitySelectFormTest.php

@@ -323,8 +323,11 @@ public function testSubmitFormRemovesOldMappings(): void {
     $form_state = $this->createMock(FormStateInterface::class);
     $form_state->expects($this->once())
       ->method('getTemporaryValue')
-      ->with(['wizard', 'wordpress_migration'])
-      ->willReturn($migration);
+      ->with(['wizard'])
+      ->willReturn([
+        'wordpress_migration' => $migration,
+        'entity_type' => 'media',
+      ]);
 
     $form_state->expects($this->once())
       ->method('getValue')
@@ -356,8 +359,11 @@ public function testSubmitFormNoMappings(): void {
     $form_state = $this->createMock(FormStateInterface::class);
     $form_state->expects($this->once())
       ->method('getTemporaryValue')
-      ->with(['wizard', 'wordpress_migration'])
-      ->willReturn($migration);
+      ->with(['wizard'])
+      ->willReturn([
+        'wordpress_migration' => $migration,
+        'entity_type' => 'media',
+      ]);
 
     $form_state->expects($this->once())
       ->method('getValue')
@@ -391,8 +397,11 @@ public function testSubmitFormAddsNewMappings(): void {
     $form_state = $this->createMock(FormStateInterface::class);
     $form_state->expects($this->once())
       ->method('getTemporaryValue')
-      ->with(['wizard', 'wordpress_migration'])
-      ->willReturn($migration);
+      ->with(['wizard'])
+      ->willReturn([
+        'wordpress_migration' => $migration,
+        'entity_type' => 'media',
+      ]);
 
     $form_state->expects($this->once())
       ->method('getValue')