Port helper to the publication type class

hydephp · Dec 18, 2022 · 4a0afa4 · 4a0afa4
1 parent 525638c
commit 4a0afa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/packages/framework/src/Framework/Actions/CreatesNewPublicationPage.php b/packages/framework/src/Framework/Actions/CreatesNewPublicationPage.php
@@ -31,7 +31,7 @@ public function __construct(
         protected ?OutputStyle $output = null,
     ) {
         $canonicalFieldName = $this->pubType->canonicalField;
-        $canonicalFieldDefinition = $this->getCanonicalFieldDefinition($canonicalFieldName);
+        $canonicalFieldDefinition = $this->pubType->getCanonicalFieldDefinition();
         $canonicalValue = $this->getCanonicalValue($canonicalFieldDefinition, $canonicalFieldName);
         $canonicalStr = Str::of($canonicalValue)->substr(0, 64);
 
@@ -75,24 +75,6 @@ protected function handleCreate(): void
         $this->save($output);
     }
 
-    protected function handleMissingCanonicalField(string $canonicalFieldName): PublicationFieldType
-    {
-        if (str_starts_with($canonicalFieldName, '__')) {
-            return new PublicationFieldType('text', $canonicalFieldName, '0', '0');
-        }
-
-        return throw new RuntimeException(
-            "Could not find field value for '$canonicalFieldName' which is required for this type as it's the canonical field"
-        );
-    }
-
-    /** @deprecated This should be handled in the pubType */
-    protected function getCanonicalFieldDefinition(string $canonicalFieldName): PublicationFieldType
-    {
-        return $this->pubType->getFields()->filter(fn(PublicationFieldType $field): bool => $field->name === $canonicalFieldName)->first()
-            ?? $this->handleMissingCanonicalField($canonicalFieldName);
-    }
-
     protected function getCanonicalValue(PublicationFieldType $canonicalFieldDefinition, string $canonicalFieldName): string
     {
         if ($canonicalFieldDefinition->type === PublicationFieldTypes::Array) {

diff --git a/packages/framework/src/Framework/Features/Publications/Models/PublicationType.php b/packages/framework/src/Framework/Features/Publications/Models/PublicationType.php
@@ -117,6 +117,11 @@ public function getFieldRules(bool $reload = false): Collection
             }), false);
     }
 
+    public function getCanonicalFieldDefinition(): PublicationFieldType
+    {
+        return $this->getFields()->filter(fn(PublicationFieldType $field): bool => $field->name === $this->canonicalField)->first();
+    }
+
     public function save(?string $path = null): void
     {
         $path ??= $this->getSchemaFile();