NEW LinkFieldController to handle FormSchema

_config.php

@@ -5,5 +5,4 @@
 
 // Avoid creating global variables
 call_user_func(function () {
-
 });

_config/config.yml

@@ -4,7 +4,7 @@ Name: linkfield
 
 SilverStripe\Admin\LeftAndMain:
   extensions:
-    - SilverStripe\LinkField\Extensions\LeftAndMain
+    - SilverStripe\LinkField\Extensions\LeftAndMainExtension
 
 SilverStripe\Admin\ModalController:
   extensions:

client/src/components/LinkField/LinkField.js

@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { inject, injectGraphql, loadComponent } from 'lib/Injector';
 import fieldHolder from 'components/FieldHolder/FieldHolder';
 
-const LinkField = ({ id, loading, Loading, data, LinkPicker, onChange, types, linkDescription, ...props }) => {
+const LinkField = ({ id, loading, Loading, data, LinkPicker, onChange, types, linkDescription, submitForm, ...props }) => {
   if (loading) {
     return <Loading />;
   }
@@ -15,21 +15,19 @@ const LinkField = ({ id, loading, Loading, data, LinkPicker, onChange, types, li
     if (typeof onChange !== 'function') {
       return;
     }
-
-    onChange(event, { id, value: {} });
+    onChange(event, {});
   };
 
   const { typeKey } = data;
   const type = types[typeKey];
   const modalType = newTypeKey ? types[newTypeKey] : type;
 
   let title = data ? data.Title : '';
-
   if (!title) {
     title = data ? data.TitleRelField : '';
   }
 
-  const linkProps = {
+  const pickerProps = {
     title,
     link: type ? { type, title, description: linkDescription } : undefined,
     onEdit: () => { setEditing(true); },
@@ -42,18 +40,22 @@ const LinkField = ({ id, loading, Loading, data, LinkPicker, onChange, types, li
   };
 
   const onModalSubmit = (modalData, action, submitFn) => {
-    const { SecurityID, action_insert: actionInsert, ...value } = modalData;
+    const { SecurityID, action_submit: actionSubmit, ...data } = modalData;
 
     if (typeof onChange === 'function') {
-      onChange(event, { id, value });
+      onChange(null, data);
     }
 
     setEditing(false);
     setNewTypeKey('');
 
-    return Promise.resolve();
+    // TODO toast here to say success (or somewhere else?)
+
+    return submitFn();
   };
 
+  console.log(['modalProps data is', data])
+
   const modalProps = {
     type: modalType,
     editing,
@@ -67,8 +69,10 @@ const LinkField = ({ id, loading, Loading, data, LinkPicker, onChange, types, li
   const handlerName = modalType ? modalType.handlerName : 'FormBuilderModal';
   const LinkModal = loadComponent(`LinkModal.${handlerName}`);
 
+  console.log(['pickerProps is', pickerProps]);
+
   return <Fragment>
-      <LinkPicker {...linkProps} />
+      <LinkPicker {...pickerProps} />
       <LinkModal {...modalProps} />
     </Fragment>;
 };
@@ -81,6 +85,7 @@ const stringifyData = (Component) => (({ data, value, ...props }) => {
   return <Component dataStr={JSON.stringify(dataValue)} {...props} data={dataValue} />;
 });
 
+
 export default compose(
   inject(['LinkPicker', 'Loading']),
   injectGraphql('readLinkTypes'),

client/src/components/LinkModal/LinkModal.js

@@ -17,7 +17,10 @@ const buildSchemaUrl = (key, data) => {
   const parsedQs = qs.parse(parsedURL.query);
   parsedQs.key = key;
   if (data) {
-    parsedQs.data = JSON.stringify(data);
+    for (const prop of ['href', 'path', 'pathname']) {
+      const id = typeof data.ID !== 'undefined' ? data.ID : '0';
+      parsedURL[prop] += `/${id}`;
+    }
   }
   return url.format({ ...parsedURL, search: qs.stringify(parsedQs)});
 }

client/src/entwine/JsonField.js

@@ -33,9 +33,10 @@ jQuery.entwine('ss', ($) => {
       Root.render(<ReactField {...props}  noHolder/>);
     },
 
-    handleChange(event, {id, value}) {
+    handleChange(event, data) {
+      console.log(['JsonField data is', data])
       const fieldID = $(this).data('field-id');
-      $('#' + fieldID).val(JSON.stringify(value)).trigger('change');
+      $('#' + fieldID).val(JSON.stringify(data)).trigger('change');
       this.refresh();
     },