FIX Defaul link type title and icon for disabled link types

silverstripe · Jan 19, 2024 · 8b31884 · 8b31884
1 parent 4bc4883
commit 8b31884
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/LinkPicker/LinkPickerMenu.js b/client/src/components/LinkPicker/LinkPickerMenu.js
@@ -21,11 +21,13 @@ const LinkPickerMenu = ({ types, onSelect }) => {
         {i18n._t('LinkField.ADD_LINK', 'Add Link')}
       </DropdownToggle>
       <DropdownMenu>
-        {types.map(({key, title, icon}) =>
+        {types.map(({key, title, icon, allowed}) => {
+          return allowed &&
             <DropdownItem key={key} onClick={() => onSelect(key)}>
               <span className={`link-picker__menu-icon ${icon}`}></span>
               {title}
             </DropdownItem>
+          }
         )}
       </DropdownMenu>
   </Dropdown>

diff --git a/client/src/components/LinkPicker/tests/LinkPicker-test.js b/client/src/components/LinkPicker/tests/LinkPicker-test.js
@@ -6,7 +6,7 @@ import LinkPicker from '../LinkPicker';
 
 function makeProps(obj = {}) {
   return {
-    types: { phone: { key: 'phone', title: 'Phone', icon: 'font-icon-phone' } },
+    types: { phone: { key: 'phone', title: 'Phone', icon: 'font-icon-phone', allowed: true } },
     canCreate: true,
     onModalSuccess: () => {},
     onModalClosed: () => {},

diff --git a/src/Form/Traits/AllowedLinkClassesTrait.php b/src/Form/Traits/AllowedLinkClassesTrait.php
@@ -86,7 +86,8 @@ public function getTypesProps(): string
     {
         $typesList = [];
         $typeDefinitions = $this->genarateAllowedTypes();
-        foreach ($typeDefinitions as $key => $class) {
+        $allTypes = LinkTypeService::create()->generateAllLinkTypes();
+        foreach ($allTypes as $key => $class) {
             $type = Injector::inst()->get($class);
             if (!$type->canCreate()) {
                 continue;
@@ -97,6 +98,7 @@ public function getTypesProps(): string
                 'handlerName' => $type->LinkTypeHandlerName(),
                 'priority' => $class::config()->get('menu_priority'),
                 'icon' => $class::config()->get('icon'),
+                'allowed' => array_key_exists($key, $typeDefinitions),
             ];
         }
         uasort($typesList, function ($a, $b) {

diff --git a/tests/php/Traits/AllowedLinkClassesTraitTest.php b/tests/php/Traits/AllowedLinkClassesTraitTest.php
@@ -156,7 +156,10 @@ public function sortedTypesDataProvider() : array
                 'expected' => [
                     'sitetree',
                     'testphone',
+                    'file',
+                    'external',
                     'email',
+                    'phone',
                 ],
                 'reorder' => true,
             ],