From cba577cb2be3e7a73ee199eaa90096229822db27 Mon Sep 17 00:00:00 2001
From: sergeybodin <sergey@bodin.ru>
Date: Fri, 16 Jun 2023 15:45:36 +0300
Subject: [PATCH] major

---
 .../Objects/FieldsGroupTransformer.php        |  1 -
 .../Publications/PublicationTransformer.php   |  6 +--
 .../seeders/Objects/FieldsTableSeeder.php     | 40 +++++++------------
 .../Objects/ObjectTypeFieldsTableSeeder.php   | 15 +++----
 .../Objects/ObjectTypesTableSeeder.php        | 11 ++---
 5 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/app/Transformers/Objects/FieldsGroupTransformer.php b/app/Transformers/Objects/FieldsGroupTransformer.php
index 00cf3d1..19253e2 100644
--- a/app/Transformers/Objects/FieldsGroupTransformer.php
+++ b/app/Transformers/Objects/FieldsGroupTransformer.php
@@ -8,7 +8,6 @@ use League\Fractal\TransformerAbstract;
 
 class FieldsGroupTransformer extends TransformerAbstract {
     protected array $defaultIncludes = [
-
     ];
 
     protected array $availableIncludes = [
diff --git a/app/Transformers/Publications/PublicationTransformer.php b/app/Transformers/Publications/PublicationTransformer.php
index a051564..16c0819 100644
--- a/app/Transformers/Publications/PublicationTransformer.php
+++ b/app/Transformers/Publications/PublicationTransformer.php
@@ -16,14 +16,14 @@ use League\Fractal\TransformerAbstract;
 
 class PublicationTransformer extends TransformerAbstract {
     protected array $defaultIncludes = [
-
+        'poster'
     ];
 
     protected array $availableIncludes = [
         'page', 'poster', 'author', 'sections', 'sidebars', 'permissions'
     ];
 
-    public function transform(Page $model): array {
+    public function transform(Publication $model): array {
         return [
             'id' => $model->uuid,
             'slug' => $model->slug,
@@ -42,7 +42,7 @@ class PublicationTransformer extends TransformerAbstract {
     }
 
     public function includePoster(Publication $model): ?Item {
-        return $model->poster ? $this->item($model->poster, new AssetTransformer()) : null;
+            return $model->poster ? $this->item($model->poster, new AssetTransformer()) : null;
     }
 
     public function includeAuthor(Publication $model): ?Item {
diff --git a/database/seeders/Objects/FieldsTableSeeder.php b/database/seeders/Objects/FieldsTableSeeder.php
index 648b038..5d9ea3b 100644
--- a/database/seeders/Objects/FieldsTableSeeder.php
+++ b/database/seeders/Objects/FieldsTableSeeder.php
@@ -32,16 +32,6 @@ class FieldsTableSeeder extends Seeder {
             'required' => true
         ],
 
-        'text' => [
-            'title' => 'Содержимое текстового блока',
-            'type' => FieldType::TEXT
-        ],
-        'text-required' => [
-            'title' => 'Содержимое текстового блока',
-            'type' => FieldType::TEXT,
-            'required' => true
-        ],
-
         'html' => [
             'title' => 'Содержимое текстового блока',
             'type' => FieldType::HTML
@@ -52,21 +42,21 @@ class FieldsTableSeeder extends Seeder {
             'required' => true
         ],
 
-        'list-type' => [
-            'title' => 'Вид списка',
-            'type' => FieldType::RELATION,
-            'required' => true,
-            'params' => [
-                'related' => DictionaryItem::class, 'transformer' => DictionaryItemTransformer::class,
-                'options' => ['show' => true, 'whereHas' => ['dictionary' => ['name' => 'list-types']]]
-            ]
-        ],
-        'list-items' => [
-            'title' => 'Элементы списка',
-            'type' => FieldType::TEXT,
-            'multiple' => true,
-            'required' => true
-        ],
+//        'list-type' => [
+//            'title' => 'Вид списка',
+//            'type' => FieldType::RELATION,
+//            'required' => true,
+//            'params' => [
+//                'related' => DictionaryItem::class, 'transformer' => DictionaryItemTransformer::class,
+//                'options' => ['show' => true, 'whereHas' => ['dictionary' => ['name' => 'list-types']]]
+//            ]
+//        ],
+//        'list-items' => [
+//            'title' => 'Элементы списка',
+//            'type' => FieldType::TEXT,
+//            'multiple' => true,
+//            'required' => true
+//        ],
 
         'images' => [
             'title' => 'Изображения',
diff --git a/database/seeders/Objects/ObjectTypeFieldsTableSeeder.php b/database/seeders/Objects/ObjectTypeFieldsTableSeeder.php
index 27832d7..39df52d 100644
--- a/database/seeders/Objects/ObjectTypeFieldsTableSeeder.php
+++ b/database/seeders/Objects/ObjectTypeFieldsTableSeeder.php
@@ -20,21 +20,16 @@ class ObjectTypeFieldsTableSeeder extends Seeder {
                 'fields' => ['header-required']
             ]
         ],
-        'page-section-text' => [
-            'common' => [
-                'fields' => ['text-required']
-            ]
-        ],
         'page-section-html' => [
             'common' => [
                 'fields' => ['html-required']
             ]
         ],
-        'page-section-list' => [
-            'common' => [
-                'fields' => ['list-type', 'list-items']
-            ]
-        ],
+//        'page-section-list' => [
+//            'common' => [
+//                'fields' => ['list-type', 'list-items']
+//            ]
+//        ],
         'page-section-images' => [
             'common' => [
                 'fields' => ['images-required']
diff --git a/database/seeders/Objects/ObjectTypesTableSeeder.php b/database/seeders/Objects/ObjectTypesTableSeeder.php
index 3e6110b..96086de 100644
--- a/database/seeders/Objects/ObjectTypesTableSeeder.php
+++ b/database/seeders/Objects/ObjectTypesTableSeeder.php
@@ -16,15 +16,12 @@ class ObjectTypesTableSeeder extends Seeder {
                 'page-section-header' => [
                     'title' => 'Заголовок'
                 ],
-                'page-section-text' => [
+                'page-section-html' => [
                     'title' => 'Текстовый блок'
                 ],
-                'page-section-html' => [
-                    'title' => 'Текстовый блок с разметкой'
-                ],
-                'page-section-list' => [
-                    'title' => 'Список'
-                ],
+//                'page-section-list' => [
+//                    'title' => 'Список'
+//                ],
                 'page-section-images' => [
                     'title' => 'Изображения'
                 ],