API Use dynamic config for ModalController forms

silverstripe · Nov 25, 2024 · 21bf47a · 21bf47a
1 parent 6c48657
commit 21bf47a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 79 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -9,11 +9,12 @@ SilverStripe\Admin\LeftAndMain:
 Name: cmsmodals
 ---
 SilverStripe\Admin\ModalController:
-  extensions:
-    - SilverStripe\CMS\Forms\InternalLinkModalExtension
+  link_modal_form_factories:
+    editorInternalLink: SilverStripe\CMS\Forms\InternalLinkFormFactory
+    editorAnchorLink: SilverStripe\CMS\Forms\AnchorLinkFormFactory
 ---
 Name: cmshierarchy
 ---
 SilverStripe\ORM\Hierarchy\Hierarchy:
   node_threshold_total: 50
-  node_threshold_leaf: 250
+  node_threshold_leaf: 250
diff --git a/client/dist/js/TinyMCE_sslink-anchor.js b/client/dist/js/TinyMCE_sslink-anchor.js
diff --git a/client/dist/js/TinyMCE_sslink-internal.js b/client/dist/js/TinyMCE_sslink-internal.js
diff --git a/client/src/legacy/TinyMCE_sslink-anchor.js b/client/src/legacy/TinyMCE_sslink-anchor.js
@@ -44,7 +44,7 @@ const plugin = {
 };
 
 const modalId = 'insert-link__dialog-wrapper--anchor';
-const sectionConfigKey = 'SilverStripe\\CMS\\Controllers\\CMSPageEditController';
+const sectionConfigKey = 'SilverStripe\\Admin\\LeftAndMain';
 const formName = 'editorAnchorLink';
 const InsertLinkInternalModal = provideInjector(createInsertLinkModal(sectionConfigKey, formName));
 

diff --git a/client/src/legacy/TinyMCE_sslink-internal.js b/client/src/legacy/TinyMCE_sslink-internal.js
@@ -36,7 +36,7 @@ const plugin = {
 };
 
 const modalId = 'insert-link__dialog-wrapper--internal';
-const sectionConfigKey = 'SilverStripe\\CMS\\Controllers\\CMSPageEditController';
+const sectionConfigKey = 'SilverStripe\\Admin\\LeftAndMain';
 const formName = 'editorInternalLink';
 const InsertLinkInternalModal = provideInjector(createInsertLinkModal(sectionConfigKey, formName));
 

diff --git a/code/Controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php
@@ -4,7 +4,6 @@
 
 use Page;
 use SilverStripe\Admin\LeftAndMain;
-use SilverStripe\Admin\ModalController;
 use SilverStripe\CampaignAdmin\AddToCampaignHandler;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Controller;
@@ -37,18 +36,11 @@ class CMSPageEditController extends CMSMain
 
     public function getClientConfig(): array
     {
-        $modalController = ModalController::singleton();
         return ArrayLib::array_merge_recursive(parent::getClientConfig(), [
             'form' => [
                 'AddToCampaignForm' => [
                     'schemaUrl' => $this->Link('schema/AddToCampaignForm'),
                 ],
-                'editorInternalLink' => [
-                    'schemaUrl' => $modalController->Link('schema/editorInternalLink'),
-                ],
-                'editorAnchorLink' => [
-                    'schemaUrl' => $modalController->Link('schema/editorAnchorLink/:pageid'),
-                ],
             ],
         ]);
     }

diff --git a/code/Forms/AnchorLinkFormFactory.php b/code/Forms/AnchorLinkFormFactory.php
@@ -10,7 +10,7 @@ protected function getFormFields($controller, $name, $context)
 
         // Ensure current page is selected
         $pageIDField = $fields->dataFieldByName('PageID');
-        $pageIDField->setValue((int)$context['PageID']);
+        $pageIDField->setValue((int)$context['ItemID']);
 
         // Get anchor selector field
         $fields->insertAfter(
@@ -22,6 +22,6 @@ protected function getFormFields($controller, $name, $context)
 
     public function getRequiredContext()
     {
-        return array_merge(parent::getRequiredContext(), [ 'PageID' ]);
+        return array_merge(parent::getRequiredContext(), [ 'ItemID' ]);
     }
 }
diff --git a/code/Forms/InternalLinkModalExtension.php b/code/Forms/InternalLinkModalExtension.php