Merge pull request silverstripe#85 from creative-commoners/pulls/4/su…

…pport-validation

ENH Improved validation

README.md

@@ -164,6 +164,10 @@ class MyCustomLink extends Link
 }
 ```
 
+## Custom link validation
+
+Custom links can have validation set using standard [model validation](https://docs.silverstripe.org/en/5/developer_guides/forms/validation/#model-validation).
+
 ## Migrating from Shae Dawson's Linkable module
 
 https://github.com/sheadawson/silverstripe-linkable

client/src/containers/LinkModalContainer.js

@@ -1,12 +1,14 @@
 /* eslint-disable */
-import React from 'react';
+import React, { useState } from 'react';
 import { loadComponent } from 'lib/Injector';
 import PropTypes from 'prop-types';
 
 /**
  * Contains the LinkModal and determines which modal component to render based on the link type.
  */
 const LinkModalContainer = ({ types, typeKey, linkID = 0, isOpen, onSuccess, onClosed }) => {
+  const [LinkModal, setLinkModal] = useState(null);
+
   if (!typeKey) {
     return false;
   }
@@ -15,7 +17,13 @@ const LinkModalContainer = ({ types, typeKey, linkID = 0, isOpen, onSuccess, onC
   const handlerName = type && type.hasOwnProperty('handlerName')
     ? type.handlerName
     : 'FormBuilderModal';
-  const LinkModal = loadComponent(`LinkModal.${handlerName}`);
+
+  // Use state to store the component so that it's only loaded once
+  // Not doing this will cause the component to being reloaded on every render
+  // which will causes bugs with validation
+  if (!LinkModal) {
+    setLinkModal(() => loadComponent(`LinkModal.${handlerName}`));
+  }
 
   return <LinkModal
     typeTitle={type.title || ''}

lang/en.yml

@@ -16,14 +16,15 @@ en:
     SINGULARNAME: 'Email Link'
     db_Email: Email
   SilverStripe\LinkField\Models\ExternalLink:
-    EXTERNAL_URL_FIELD: 'External url'
+    EXTERNAL_URL_FIELD: 'External URL'
+    EXTERNAL_URL_FIELD_DESCRIPTION: 'The URL must start with either http:// or https://'
     LINKLABEL: 'Link to external URL'
     PLURALNAME: 'External Links'
     PLURALS:
       one: 'An External Link'
       other: '{count} External Links'
     SINGULARNAME: 'External Link'
-    db_ExternalUrl: 'External url'
+    db_ExternalUrl: 'External URL'
   SilverStripe\LinkField\Models\FileLink:
     CANNOT_VIEW_FILE: 'Cannot view file'
     FILE_DOES_NOT_EXIST: 'File does not exist'

src/Models/EmailLink.php

@@ -4,6 +4,8 @@
 
 use SilverStripe\Forms\EmailField;
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\RequiredFields;
 
 /**
  * A link to an Email address.
@@ -55,4 +57,11 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Link to email address');
     }
+
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['Email']));
+        return $validator;
+    }
 }

src/Models/ExternalLink.php

@@ -3,6 +3,9 @@
 namespace SilverStripe\LinkField\Models;
 
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\UrlField;
 
 /**
  * A link to an external URL.
@@ -27,8 +30,13 @@ class ExternalLink extends Link
     public function getCMSFields(): FieldList
     {
         $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $linkField = $fields->dataFieldByName('ExternalUrl');
-            $linkField->setTitle(_t(__CLASS__ . '.EXTERNAL_URL_FIELD', 'External url'));
+            $field = UrlField::create('ExternalUrl');
+            $field->setTitle(_t(__CLASS__ . '.EXTERNAL_URL_FIELD', 'External URL'));
+            $field->setDescription(_t(
+                __CLASS__ . '.EXTERNAL_URL_FIELD_DESCRIPTION',
+                'The URL must start with either http:// or https://'
+            ));
+            $fields->replaceField('ExternalUrl', $field);
         });
         return parent::getCMSFields();
     }
@@ -51,4 +59,11 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Link to external URL');
     }
+
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['ExternalUrl']));
+        return $validator;
+    }
 }

src/Models/FileLink.php

@@ -4,6 +4,8 @@
 
 use SilverStripe\Assets\File;
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\RequiredFields;
 
 /**
  * A link to a File in the CMS
@@ -71,4 +73,11 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Link to a file');
     }
+
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['File']));
+        return $validator;
+    }
 }

src/Models/PhoneLink.php

@@ -3,6 +3,9 @@
 namespace SilverStripe\LinkField\Models;
 
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\RequiredFields;
+use SilverStripe\LinkField\Form\PhoneField;
 
 /**
  * A link to a phone number
@@ -25,8 +28,8 @@ class PhoneLink extends Link
     public function getCMSFields(): FieldList
     {
         $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $linkField = $fields->dataFieldByName('Phone');
-            $linkField->setTitle(_t(__CLASS__ . '.PHONE_FIELD', 'Phone'));
+            $field = $fields->dataFieldByName('Phone');
+            $field->setTitle(_t(__CLASS__ . '.PHONE_FIELD', 'Phone'));
             $fields->removeByName('OpenInNew');
         });
         return parent::getCMSFields();
@@ -50,4 +53,11 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Phone number');
     }
+
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['Phone']));
+        return $validator;
+    }
 }

src/Models/SiteTreeLink.php

@@ -8,6 +8,8 @@
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TreeDropdownField;
+use SilverStripe\Forms\CompositeValidator;
+use SilverStripe\Forms\RequiredFields;
 
 /**
  * A link to a Page in the CMS
@@ -147,4 +149,11 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Page on this site');
     }
+
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['PageID']));
+        return $validator;
+    }
 }