MNT Remove old code (#118)

README.md

@@ -46,10 +46,6 @@ use SilverStripe\LinkField\Form\LinkField;
 
 class Page extends SiteTree
 {
-    private static array $db = [
-        'DbLink' => DBLink::class
-    ];
-
     private static array $has_one = [
         'HasOneLink' => Link::class,
     ];
@@ -63,8 +59,8 @@ class Page extends SiteTree
             [
                 LinkField::create('HasOneLink'),
                 LinkField::create('DbLink'),
-            ]
-        )
+            ],
+        );
 
         return $fields;
     }

client/src/bundles/bundle.js

@@ -6,4 +6,4 @@
 // require('expose-loader?InsertMediaModal!containers/InsertMediaModal/InsertMediaModal');
 
 import 'boot';
-import 'entwine/JsonField';
+import 'entwine/LinkField';

client/src/entwine/JsonField.js → client/src/entwine/LinkField.js

@@ -6,7 +6,7 @@ import ReactDOM from 'react-dom/client';
 import { loadComponent } from 'lib/Injector';
 
 jQuery.entwine('ss', ($) => {
-  $('.js-injector-boot .entwine-jsonfield').entwine({
+  $('.js-injector-boot .entwine-linkfield').entwine({
 
     Component: null,
     Root: null,

src/Form/LinkField.php

@@ -2,10 +2,47 @@
 
 namespace SilverStripe\LinkField\Form;
 
+use SilverStripe\Forms\FormField;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\DataObjectInterface;
+use SilverStripe\LinkField\Models\Link;
+
 /**
  * Allows CMS users to edit a Link object.
  */
-class LinkField extends JsonField
+class LinkField extends FormField
 {
     protected $schemaComponent = 'LinkField';
+
+    protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_CUSTOM;
+    protected $inputType = 'hidden';
+
+    public function setValue($value, $data = null)
+    {
+        if (is_a($value, Link::class)) {
+            $id = $value->ID;
+        } else {
+            $id = $value;
+        }
+        return parent::setValue($id, $data);
+    }
+
+    /**
+     * @param DataObject|DataObjectInterface $record - A DataObject such as a Page
+     * @return $this
+     */
+    public function saveInto(DataObjectInterface $record)
+    {
+        // Check required relation details are available
+        $fieldname = $this->getName();
+        if (!$fieldname) {
+            return $this;
+        }
+
+        $linkID = $this->dataValue();
+        $dbColumn = $fieldname . 'ID';
+        $record->$dbColumn = $linkID;
+
+        return $this;
+    }
 }

src/Models/Link.php

@@ -10,7 +10,6 @@
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\RequiredFields;
-use SilverStripe\LinkField\JsonData;
 use SilverStripe\LinkField\Type\Registry;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
@@ -22,7 +21,7 @@
  * @property string $Title
  * @property bool $OpenInNew
  */
-class Link extends DataObject implements JsonData
+class Link extends DataObject
 {
     private static $table_name = 'LinkField_Link';
 
@@ -124,7 +123,7 @@ public function onBeforeWrite(): void
         parent::onBeforeWrite();
     }
 
-    function setData($data): JsonData
+    function setData($data): Link
     {
         if (is_string($data)) {
             $data = json_decode($data, true);
@@ -136,7 +135,7 @@ function setData($data): JsonData
                     json_last_error_msg()
                 ));
             }
-        } elseif ($data instanceof JsonData) {
+        } elseif ($data instanceof Link) {
             $data = $data->jsonSerialize();
         }
 
@@ -193,7 +192,7 @@ public function jsonSerialize(): mixed
         return $data;
     }
 
-    public function loadLinkData(array $data): JsonData
+    public function loadLinkData(array $data): Link
     {
         $link = new static();
 

templates/SilverStripe/LinkField/Form/JsonField.ss → templates/SilverStripe/LinkField/Form/LinkField.ss

@@ -1,2 +1,2 @@
 <input $AttributesHTML />
-<div data-field-id="$ID" data-schema-component="$SchemaComponent" class="entwine-jsonfield"></div>
+<div data-field-id="$ID" data-schema-component="$SchemaComponent" class="entwine-linkfield"></div>