Merge pull request #170 from nerds-and-company/feature/category-field…

…-layout Category field layout fixes
nerds-and-company · Nov 19, 2018 · ff08c27 · ff08c27
2 parents 467c9d5 + 74c5610
commit ff08c27
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
-### 4.0.18
+### 4.0.18 - 2018-11-19
 ### Added
 - Delete empty field and site groups on import with force
 ### Fixed
 - Fixed user field sources not being exported
+- Fixed category field layout not properly importing for existing categories
 - Fixed import of multiple sites in same sitegroup
 
 ### 4.0.17 - 2018-09-24

diff --git a/src/Behaviors/FieldLayoutBehavior.php b/src/Behaviors/FieldLayoutBehavior.php
@@ -38,10 +38,16 @@ public function getFieldLayoutDefinition(FieldLayout $fieldLayout): array
                 $tabDefinitions[$tab->name] = $this->getFieldLayoutFieldsDefinition($tab->getFields());
             }
 
-            return ['tabs' => $tabDefinitions];
+            return [
+                'type' => $fieldLayout->type,
+                'tabs' => $tabDefinitions
+            ];
         }
 
-        return ['fields' => $this->getFieldLayoutFieldsDefinition($fieldLayout->getFields())];
+        return [
+            'type' => $fieldLayout->type,
+            'fields' => $this->getFieldLayoutFieldsDefinition($fieldLayout->getFields()),
+        ];
     }
 
     /**
@@ -87,7 +93,12 @@ public function getFieldLayout(array $fieldLayoutDef): FieldLayout
         }
 
         $fieldLayout = Craft::$app->fields->assembleLayout($layoutFields, $requiredFields);
-        $fieldLayout->type = Entry::class;
+
+        if (array_key_exists('type', $fieldLayoutDef)) {
+            $fieldLayout->type = $fieldLayoutDef['type'];
+        } else {
+            $fieldLayout->type = Entry::class;
+        }
 
         return $fieldLayout;
     }

diff --git a/src/Converters/Models/Base.php b/src/Converters/Models/Base.php
@@ -109,7 +109,9 @@ public function setRecordAttributes(Model &$record, array $definition, array $de
 
         // Set field layout
         if (array_key_exists('fieldLayout', $definition)) {
-            $record->setFieldLayout($this->getFieldLayout($definition['fieldLayout']));
+            $fieldLayout = $this->getFieldLayout($definition['fieldLayout']);
+            $fieldLayout->id = $record->fieldLayoutId;
+            $record->setFieldLayout($fieldLayout);
         }
 
         // Set site settings

diff --git a/tests/unit/Converters/Base/VolumeTest.php b/tests/unit/Converters/Base/VolumeTest.php
@@ -5,6 +5,7 @@
 use Craft;
 use craft\base\Field as FieldModel;
 use craft\base\Volume as VolumeModel;
+use craft\elements\Asset;
 use craft\models\FieldLayout;
 use craft\volumes\Local;
 use Codeception\Test\Unit;
@@ -131,6 +132,7 @@ private function getMockVolume(int $volumeId)
         $mockField->required = true;
 
         $mockFieldLayout = $this->getMockBuilder(FieldLayout::class)->getMock();
+        $mockFieldLayout->type = Asset::class;
 
         $mockFieldLayout->expects($this->any())
                         ->method('getFields')
@@ -166,6 +168,7 @@ private function getMockVolumeDefinition(VolumeModel $mockVolume)
                 'sortOrder' => null,
             ],
             'fieldLayout' => [
+                'type' => Asset::class,
                 'fields' => $fieldDefs,
             ],
         ];

diff --git a/tests/unit/Converters/Elements/GlobalSetTest.php b/tests/unit/Converters/Elements/GlobalSetTest.php
@@ -150,6 +150,7 @@ private function getMockGlobalSetDefinition(GlobalSetElement $mockGlobalSet)
                 'uri' => null,
             ],
             'fieldLayout' => [
+                'type' => GlobalSetElement::class,
                 'fields' => $fieldDefs,
             ],
             'site' => $mockGlobalSet->getSite()->handle,
@@ -209,6 +210,7 @@ private function getMockGlobalSet(int $setId, string $siteHandle = 'default')
                 ->willReturn($mockField);
 
         $mockFieldLayout = $this->getMockBuilder(FieldLayout::class)->getMock();
+        $mockFieldLayout->type = GlobalSetElement::class;
 
         $mockFieldLayout->expects($this->any())
                         ->method('getFields')

diff --git a/tests/unit/Converters/Models/CategoryGroupTest.php b/tests/unit/Converters/Models/CategoryGroupTest.php
@@ -3,6 +3,7 @@
 namespace NerdsAndCompany\Schematic\Converters\Models;
 
 use Craft;
+use craft\elements\Category;
 use craft\models\CategoryGroup as CategoryGroupModel;
 use craft\models\CategoryGroup_SiteSettings;
 use craft\models\FieldLayout;
@@ -155,6 +156,7 @@ private function getMockCategoryGroupDefinition(CategoryGroupModel $mockCategory
                 'maxLevels' => 3,
             ],
             'fieldLayout' => [
+                'type' => Category::class,
                 'fields' => [],
             ],
             'siteSettings' => [
@@ -189,6 +191,7 @@ private function getMockCategoryGroup(int $groupId)
         ]);
 
         $mockFieldLayout = $this->getMockBuilder(FieldLayout::class)->getMock();
+        $mockFieldLayout->type = Category::class;
 
         $mockGroup->expects($this->any())
                   ->method('getFieldLayout')

diff --git a/tests/unit/Converters/Models/EntryTypeTest.php b/tests/unit/Converters/Models/EntryTypeTest.php
@@ -4,6 +4,7 @@
 
 use Craft;
 use craft\base\Field as FieldModel;
+use craft\elements\Entry;
 use craft\models\EntryType as EntryTypeModel;
 use craft\models\FieldLayout;
 use craft\models\FieldLayoutTab;
@@ -174,6 +175,7 @@ private function getMockFieldLayoutDefinition(FieldLayout $fieldLayout)
         }
 
         return [
+            'type' => Entry::class,
             'tabs' => $tabsDef,
         ];
     }
@@ -198,6 +200,8 @@ private function getMockEntryType(int $entryTypeId)
         $mockField = $this->getMockField($entryTypeId);
 
         $mockFieldLayout = $this->getMockBuilder(FieldLayout::class)->getMock();
+        $mockFieldLayout->type = Entry::class;
+
         $mockFieldLayoutTab = $this->getMockBuilder(FieldLayoutTab::class)->getMock();
         $mockFieldLayoutTab->name = 'Content';
 

diff --git a/tests/unit/Mappers/UserSettingsMapperTest.php b/tests/unit/Mappers/UserSettingsMapperTest.php
@@ -101,6 +101,7 @@ private function getUserSettingsDefinition()
                 'photoVolume' => 'volumeHandle',
             ],
             'fieldLayout' => [
+                'type' => User::class,
                 'tabs' => [
                     'Content' => [
                         'fieldHandle1' => true,
@@ -169,6 +170,7 @@ private function setMockServicesForImport($saveLayout = true, $deleteLayoutsByTy
     private function getMockFieldLayout()
     {
         $mockFieldLayout = $this->getMockBuilder(FieldLayout::class)->getMock();
+        $mockFieldLayout->type = User::class;
         $mockFieldLayoutTab = $this->getMockBuilder(FieldLayoutTab::class)->getMock();
         $mockFieldLayoutTab->name = 'Content';