NEW Allowed link types

client/src/boot/index.js

@@ -1,9 +1,7 @@
 /* global document */
 /* eslint-disable */
 import registerComponents from './registerComponents';
-import registerQueries from './registerQueries';
 
 document.addEventListener('DOMContentLoaded', () => {
   registerComponents();
-  registerQueries();
 });

client/src/components/LinkField/LinkField.js

@@ -183,7 +183,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export default compose(
-  injectGraphql('readLinkTypes'),
   fieldHolder,
   connect(null, mapDispatchToProps)
 )(LinkField);

client/src/entwine/LinkField.js

@@ -50,6 +50,7 @@ jQuery.entwine('ss', ($) => {
         value,
         onChange: this.handleChange.bind(this),
         isMulti: this.data('is-multi') ?? false,
+        types: this.data('types') ?? [],
       };
     },
 

src/Controllers/LinkFieldController.php

@@ -8,7 +8,6 @@
 use SilverStripe\Forms\DefaultFormFactory;
 use SilverStripe\Forms\Form;
 use SilverStripe\LinkField\Models\Link;
-use SilverStripe\LinkField\Type\Registry;
 use SilverStripe\Security\SecurityToken;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\FormAction;
@@ -19,6 +18,7 @@
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\HiddenField;
+use SilverStripe\LinkField\Form\LinkField;
 use SilverStripe\ORM\DataList;
 
 class LinkFieldController extends LeftAndMain
@@ -74,7 +74,7 @@ public function linkForm(): Form
             }
         } else {
             $typeKey = $this->typeKeyFromRequest();
-            $link = Registry::create()->byKey($typeKey);
+            $link = LinkField::byKey($typeKey);
             if (!$link) {
                 $this->jsonError(404, _t('LinkField.INVALID_TYPEKEY', 'Invalid typeKey'));
             }
@@ -174,7 +174,7 @@ public function save(array $data, Form $form): HTTPResponse
             // Creating a new Link
             $operation = 'create';
             $typeKey = $this->typeKeyFromRequest();
-            $className = Registry::create()->list()[$typeKey] ?? '';
+            $className = LinkField::byKey($typeKey) ?? '';
             if (!$className) {
                 $this->jsonError(404, _t('LinkField.INVALID_TYPEKEY', 'Invalid typeKey'));
             }
@@ -239,7 +239,7 @@ private function createLinkForm(Link $link, string $operation): Form
         $form = $formFactory->getForm($this, $name, ['Record' => $link]);
 
         // Set where the form is submitted to
-        $typeKey = Registry::create()->keyByClassName($link->ClassName);
+        $typeKey = LinkField::keyByClassName($link->ClassName);
         $form->setFormAction($this->Link("linkForm/$id?typeKey=$typeKey"));
 
         // Add save action button

src/Form/LinkField.php

@@ -7,12 +7,15 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\LinkField\Models\Link;
+use SilverStripe\LinkField\Traits\AllowedLinkClassesTrait;
 
 /**
  * Allows CMS users to edit a Link object.
  */
 class LinkField extends FormField
 {
+    use AllowedLinkClassesTrait;
+
     protected $schemaComponent = 'LinkField';
 
     protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_CUSTOM;

src/Form/MultiLinkField.php

@@ -4,6 +4,7 @@
 
 use LogicException;
 use SilverStripe\Forms\FormField;
+use SilverStripe\LinkField\Traits\AllowedLinkClassesTrait;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Relation;
@@ -16,6 +17,8 @@
  */
 class MultiLinkField extends FormField
 {
+    use AllowedLinkClassesTrait;
+
     protected $schemaComponent = 'LinkField';
 
     protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_CUSTOM;

src/Models/EmailLink.php

@@ -14,6 +14,8 @@ class EmailLink extends Link
 {
     private static string $table_name = 'LinkField_EmailLink';
 
+    private static $short_code = 'email';
+
     private static array $db = [
         'Email' => 'Varchar(255)',
     ];

src/Models/ExternalLink.php

@@ -13,6 +13,8 @@ class ExternalLink extends Link
 {
     private static string $table_name = 'LinkField_ExternalLink';
 
+    private static $short_code = 'external';
+
     private static array $db = [
         'ExternalUrl' => 'Varchar',
     ];

src/Models/FileLink.php

@@ -15,6 +15,8 @@ class FileLink extends Link
 {
     private static string $table_name = 'LinkField_FileLink';
 
+    private static $short_code = 'file';
+
     private static array $has_one = [
         'File' => File::class,
     ];

src/Models/Link.php

@@ -11,7 +11,7 @@
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\RequiredFields;
-use SilverStripe\LinkField\Type\Registry;
+use SilverStripe\LinkField\Form\LinkField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 
@@ -26,6 +26,8 @@ class Link extends DataObject
 {
     private static $table_name = 'LinkField_Link';
 
+    private static $short_code = 'link';
+
     private static array $db = [
         'Title' => 'Varchar',
         'OpenInNew' => 'Boolean',
@@ -188,7 +190,7 @@ function setData($data): Link
             );
         }
 
-        $type = Registry::singleton()->byKey($typeKey);
+        $type = LinkField::byKey($typeKey);
 
         if (!$type) {
             throw new InvalidArgumentException(
@@ -225,7 +227,7 @@ function setData($data): Link
 
     public function jsonSerialize(): mixed
     {
-        $typeKey = Registry::singleton()->keyByClassName(static::class);
+        $typeKey = LinkField::keyByClassName(static::class);
 
         if (!$typeKey) {
             return [];

src/Models/PhoneLink.php

@@ -11,6 +11,8 @@ class PhoneLink extends Link
 {
     private static string $table_name = 'LinkField_PhoneLink';
 
+    private static $short_code = 'phone';
+
     private static array $db = [
         'Phone' => 'Varchar(255)',
     ];

src/Models/SiteTreeLink.php

@@ -21,6 +21,8 @@ class SiteTreeLink extends Link
 {
     private static string $table_name = 'LinkField_SiteTreeLink';
 
+    private static $short_code = 'cms';
+
     private static array $db = [
         'Anchor' => 'Varchar',
         'QueryString' => 'Varchar',