A bunch of changes

_graphql/queries.yml

@@ -1,6 +1,6 @@
 'readLinkDescription(dataStr: String!)':
   type: '[LinkDescription]'
-  resolver: ['SilverStripe\Link\GraphQL\LinkDescriptionResolver', 'resolve']
+  resolver: ['SilverStripe\LinkField\GraphQL\LinkDescriptionResolver', 'resolve']
 'readLinkTypes(keys: [ID])':
   type: '[LinkType]'
   resolver: ['SilverStripe\LinkField\GraphQL\LinkTypeResolver', 'resolve']

client/src/components/AbstractLinkField/linkFieldHOC.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { compose } from 'redux';
-import { withApollo } from '@apollo/client';
+import { withApollo } from '@apollo/client/react/hoc';
 import { injectGraphql } from 'lib/Injector';
 import fieldHolder from 'components/FieldHolder/FieldHolder';
 
@@ -16,6 +16,7 @@ const stringifyData = (Component) => (({ data, value, ...props }) => {
   return <Component dataStr={JSON.stringify(dataValue)} {...props} data={dataValue} />;
 });
 
+
 /**
  * Wires a Link field into GraphQL normalise the initial data to a proper objects
  */

src/Form/JsonField.php

@@ -8,7 +8,6 @@
 use SilverStripe\LinkField\JsonData;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
-use SilverStripe\Link\JsonData;
 
 /**
  * Field designed to edit complex data passed as a JSON string. Other FormFields can be built on top of this one.

src/Form/MultiLinkField.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link\Form;
+namespace SilverStripe\LinkField\Form;
 
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Link\Models\Link;
+use SilverStripe\LinkField\Models\Link;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\SS_List;

src/Models/EmailLink.php

@@ -18,7 +18,7 @@ class EmailLink extends Link
         'Email' => 'Varchar(255)',
     ];
 
-    public function generateLinkDescription(array $data): string
+    public function generateLinkDescription(array $data): array
     {
         $description = isset($data['Email']) ? $data['Email'] : '';
         $title = empty($data['Title']) ? $description : $data['Title'];

src/Models/Link.php

@@ -209,6 +209,9 @@ public function jsonSerialize(): mixed
         }
 
         $data = $this->toMap();
+
+        $data['OpenInNew'] = boolval($data['OpenInNew']);
+
         $data['typeKey'] = $typeKey;
         // Some of our models (SiteTreeLink in particular) have defined getTitle() methods. We *don't* want to override
         // the 'Title' field (which represent the literal 'Title' Database field) - if we did that, then it would also

src/Models/PhoneLink.php

@@ -15,9 +15,15 @@ class PhoneLink extends Link
         'Phone' => 'Varchar(255)',
     ];
 
-    public function generateLinkDescription(array $data): string
+    public function generateLinkDescription(array $data): array
     {
-        return isset($data['Phone']) ? $data['Phone'] : '';
+        if (isset($data)) {
+            return [
+                'title' => $data['Phone']
+            ];
+        }
+
+        return [];
     }
 
     public function getURL(): string

tests/php/Form/MultiLinkFieldTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace SilverStripe\Link\Tests\Form;
+namespace SilverStripe\LinkField\Tests\Form;
 
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Link\Models\Link;
-use SilverStripe\Link\Models\ExternalLink;
-use SilverStripe\Link\Form\MultiLinkField;
-use SilverStripe\Link\Tests\LinkOwner;
+use SilverStripe\LinkField\Models\Link;
+use SilverStripe\LinkField\Models\ExternalLink;
+use SilverStripe\LinkField\Form\MultiLinkField;
+use SilverStripe\LinkField\Tests\LinkOwner;
 
 class MultiLinkFieldTest extends SapphireTest
 {

tests/php/GraphQL/LinkDescriptionResolverTest.php

@@ -3,7 +3,7 @@
 namespace SilverStripe\Link\Tests\Form;
 
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Link\GraphQL\LinkDescriptionResolver;
+use SilverStripe\LinkField\GraphQL\LinkDescriptionResolver;
 
 class LinkDescriptionResolverTest extends SapphireTest
 {

tests/php/LinkModelTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace SilverStripe\Link\Tests;
+namespace SilverStripe\LinkField\Tests;
 
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Link\Models\Link;
-use SilverStripe\Link\Models\ExternalLink;
+use SilverStripe\LinkField\Models\Link;
+use SilverStripe\LinkField\Models\ExternalLink;
 
 class LinkModelTest extends SapphireTest
 {

tests/php/LinkModelTest.yml

@@ -1,4 +1,4 @@
-SilverStripe\Link\Models\ExternalLink:
+SilverStripe\LinkField\Models\ExternalLink:
   link-1:
     Title: Link1
     ExternalUrl: 'https://silverstripe.org/'
@@ -7,8 +7,8 @@ SilverStripe\Link\Models\ExternalLink:
     ExternalUrl: 'https://google.com/'
     # Owner: =>SilverStripe\Link\Tests\LinkOwner.link-owner-1
 
-SilverStripe\Link\Tests\LinkOwner:
+SilverStripe\LinkField\Tests\LinkOwner:
   link-owner-1:
     Title: A Link owner
     Links:
-      - =>SilverStripe\Link\Models\ExternalLink.link-2
+      - =>SilverStripe\LinkField\Models\ExternalLink.link-2

tests/php/LinkOwner.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace SilverStripe\Link\Tests;
+namespace SilverStripe\LinkField\Tests;
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Link\Models\Link;
+use SilverStripe\LinkField\Models\Link;
 
 class LinkOwner extends DataObject
 {