Issue #2498291 by Jo Fitzgerald, neclimdul, quietone, KarenS, mikeryan,...

Issue #2498291 by Jo Fitzgerald, neclimdul, quietone, KarenS, mikeryan, mitrpaka, phenaproxima: Fields hidden in some view modes abort migration (D6)

core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php

@@ -28,7 +28,10 @@ protected function initializeIterator() {
       $field_name = $field_row['field_name'];
 
       foreach ($this->getViewModes() as $view_mode) {
-        if (isset($field_row['display_settings'][$view_mode]) && empty($field_row['display_settings'][$view_mode]['exclude'])) {
+        // Append to the return value if the row has display settings for this
+        // view mode and the view mode is neither hidden nor excluded.
+        // @see \Drupal\node\Plugin\migrate\source\d6\ViewMode::initializeIterator()
+        if (isset($field_row['display_settings'][$view_mode]) && $field_row['display_settings'][$view_mode]['format'] != 'hidden' && empty($field_row['display_settings'][$view_mode]['exclude'])) {
           $index = $view_mode . "." . $bundle . "." . $field_name;
           $rows[$index]['entity_type'] = 'node';
           $rows[$index]['view_mode'] = $view_mode;

core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php

@@ -20,6 +20,19 @@ protected function setUp() {
     $this->migrateFields();
   }
 
+  /**
+   * Asserts that a particular component is NOT included in a display.
+   *
+   * @param string $display_id
+   *   The display ID.
+   * @param string $component_id
+   *   The component ID.
+   */
+  protected function assertComponentNotExists($display_id, $component_id) {
+    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
+    $this->assertNull($component);
+  }
+
   /**
    * Test that migrated entity display settings can be loaded using D8 API's.
    */
@@ -177,6 +190,9 @@ public function testEntityDisplaySettings() {
     $this->assertIdentical($expected, $component);
     // Test that our Id map has the correct data.
     $this->assertIdentical(['node', 'story', 'teaser', 'field_test'], $this->getMigration('d6_field_formatter_settings')->getIdMap()->lookupDestinationID(['story', 'teaser', 'node', 'field_test']));
+
+    // Test hidden field.
+    $this->assertComponentNotExists('node.test_planet.teaser', 'field_test_text_single_checkbox');
   }
 
 }

core/modules/migrate_drupal/tests/fixtures/drupal6.php

@@ -3018,7 +3018,7 @@
   'label' => 'Text Single Checkbox Field',
   'widget_type' => 'text_textfield',
   'widget_settings' => 'a:4:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:1:"0";s:14:"_error_element";s:63:"default_value_widget][field_test_text_single_checkbox][0][value";}}s:17:"default_value_php";N;s:4:"rows";i:5;s:4:"size";s:3:"255";}',
-  'display_settings' => 'a:7:{s:6:"weight";s:2:"17";s:6:"parent";s:0:"";i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
+  'display_settings' => 'a:7:{s:6:"weight";s:2:"32";s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:6:"hidden";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
   'description' => 'An example text field using a single on/off checkbox.',
   'widget_module' => 'text',
   'widget_active' => '1',

core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php

@@ -21,7 +21,10 @@ protected function initializeIterator() {
     while ($field_row = $result->fetchAssoc()) {
       $field_row['display_settings'] = unserialize($field_row['display_settings']);
       foreach ($this->getViewModes() as $view_mode) {
-        if (isset($field_row['display_settings'][$view_mode]) && empty($field_row['display_settings'][$view_mode]['exclude'])) {
+        // Append to the return value if the row has display settings for this
+        // view mode and the view mode is neither hidden nor excluded.
+        // @see \Drupal\field\Plugin\migrate\source\d6\FieldInstancePerViewMode::initializeIterator()
+        if (isset($field_row['display_settings'][$view_mode]) && $field_row['display_settings'][$view_mode]['format'] != 'hidden' && empty($field_row['display_settings'][$view_mode]['exclude'])) {
           if (!isset($rows[$view_mode])) {
             $rows[$view_mode]['entity_type'] = 'node';
             $rows[$view_mode]['view_mode'] = $view_mode;