Update for changed publication type schema

Update CreatesNewPublicationPageTest.php Update CreatesNewPublicationType.php Update test-publication-schema.json Update MakePublicationCommandTest.php Update MakePublicationTypeCommandTest.php Update PublicationListPageTest.php Update PublicationPageTest.php Update PublicationPageUnitTest.php
hydephp · Dec 5, 2022 · 00f8d49 · 00f8d49
1 parent 7b414b0
commit 00f8d49
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 36 deletions.
diff --git a/packages/framework/src/Framework/Actions/CreatesNewPublicationType.php b/packages/framework/src/Framework/Actions/CreatesNewPublicationType.php
@@ -39,12 +39,14 @@ protected function handleCreate(): void
         $type = new PublicationType(
             $this->name,
             $this->canonicalField,
-            $this->sortField,
-            $this->sortDirection,
-            $this->pageSize,
-            $this->prevNextLinks,
             "{$this->dirName}_detail",
             "{$this->dirName}_list",
+            [
+                $this->sortField,
+                $this->sortDirection,
+                $this->pageSize,
+                $this->prevNextLinks,
+            ],
             $this->fields->toArray()
         );
 

diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPublicationPageTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPublicationPageTest.php
@@ -58,21 +58,15 @@ protected function makePublicationType(): PublicationType
         return new PublicationType(
             'test',
             'title',
-            'sort',
-            'asc',
-            10,
-            true,
-            'detail',
-            'list',
-            [
+            fields: [
                 [
                     'type' => 'string',
                     'name' => 'title',
                     'min'  => 0,
                     'max'  => 128,
                 ],
             ],
-            'test-publication',
+            directory: 'test-publication',
         );
     }
 }
diff --git a/packages/framework/tests/Feature/Commands/MakePublicationCommandTest.php b/packages/framework/tests/Feature/Commands/MakePublicationCommandTest.php
@@ -137,12 +137,14 @@ protected function makeSchemaFile(): void
             json_encode([
                 'name'           => 'Test Publication',
                 'canonicalField' => 'title',
-                'sortField'      => '__createdAt',
-                'sortDirection'  => 'ASC',
-                'pageSize'       => 10,
-                'prevNextLinks'  => true,
                 'detailTemplate' => 'test-publication_detail',
                 'listTemplate'   => 'test-publication_list',
+                'paginationSettings' => [
+                    'pageSize'       => 10,
+                    'prevNextLinks'  => true,
+                    'sortField'      => '__createdAt',
+                    'sortDirection'  => 'ASC',
+                ],
                 'fields'         => [
                     [
                         'name' => 'title',

diff --git a/packages/framework/tests/Feature/Commands/MakePublicationTypeCommandTest.php b/packages/framework/tests/Feature/Commands/MakePublicationTypeCommandTest.php
@@ -73,12 +73,14 @@ public function test_command_creates_publication_type()
             {
                 "name": "Test Publication",
                 "canonicalField": "publication-title",
-                "sortField": "__createdAt",
-                "sortDirection": "ASC",
-                "pageSize": 10,
-                "prevNextLinks": true,
                 "detailTemplate": "test-publication_detail",
                 "listTemplate": "test-publication_list",
+                "paginationSettings": {
+                    "sortField": "__createdAt",
+                    "sortDirection": "ASC",
+                    "pageSize": 10,
+                    "prevNextLinks": true
+                },
                 "fields": [
                     {
                         "type": "string",

diff --git a/packages/framework/tests/Feature/PublicationListPageTest.php b/packages/framework/tests/Feature/PublicationListPageTest.php
@@ -68,12 +68,14 @@ protected function getTestData(): array
         return [
             'name'           => 'test',
             'canonicalField' => 'canonical',
-            'sortField'      => 'sort',
-            'sortDirection'  => 'asc',
-            'pageSize'       => 10,
-            'prevNextLinks'  => true,
             'detailTemplate' => 'detail',
             'listTemplate'   => 'list',
+            'paginationSettings' => [
+                'sortField'      => 'sort',
+                'sortDirection'  => 'asc',
+                'pageSize'       => 10,
+                'prevNextLinks'  => true,
+            ],
             'fields'         => [
                 'foo' => 'bar',
             ],

diff --git a/packages/framework/tests/Feature/PublicationPageTest.php b/packages/framework/tests/Feature/PublicationPageTest.php
@@ -117,12 +117,14 @@ protected function createRealPublicationFiles(): void
         file_put_contents(Hyde::path('test-publication/schema.json'), '{
   "name": "test",
   "canonicalField": "slug",
-  "sortField": "__createdAt",
-  "sortDirection": "DESC",
-  "pageSize": 0,
-  "prevNextLinks": true,
   "detailTemplate": "test_detail",
   "listTemplate": "test_list",
+  "paginationSettings": {
+      "sortField": "__createdAt",
+      "sortDirection": "DESC",
+      "pageSize": 0,
+      "prevNextLinks": true
+  },
   "fields": [
     {
       "name": "slug",

diff --git a/packages/framework/tests/Unit/Pages/PublicationPageUnitTest.php b/packages/framework/tests/Unit/Pages/PublicationPageUnitTest.php
@@ -242,12 +242,9 @@ protected function pubType(): PublicationType
         return new PublicationType(
             'name',
             'canonicalField',
-            'sortField',
-            'sortDirection',
-            1,
-            true,
             'detailTemplate',
             'listTemplate',
+            ['sortField', 'sortDirection', 1, true],
             [],
             'directory'
         );

diff --git a/tests/fixtures/test-publication-schema.json b/tests/fixtures/test-publication-schema.json
@@ -1,12 +1,14 @@
 {
     "name": "Test Publication",
     "canonicalField": "title",
-    "sortField": "__createdAt",
-    "sortDirection": "DESC",
-    "pageSize": 25,
-    "prevNextLinks": true,
     "detailTemplate": "test-publication_detail",
     "listTemplate": "test-publication_list",
+    "paginationSettings": {
+        "sortField": "__createdAt",
+        "sortDirection": "DESC",
+        "pageSize": 25,
+        "prevNextLinks": true
+    },
     "fields": [
         {
             "name": "title",