API Remove silverstripe/campaign-admin integration support

silverstripe · Nov 20, 2024 · 29730b8 · 29730b8
1 parent 43758ab
commit 29730b8
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 163 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -48,14 +48,6 @@ SilverStripe\Core\Injector\Injector:
   SilverStripe\Forms\FileHandleField:
     class: SilverStripe\AssetAdmin\Forms\UploadField
 ---
-Name: assetadmincampaigns
-Only:
-  moduleexists: 'silverstripe/campaign-admin'
----
-SilverStripe\AssetAdmin\Forms\FileFormFactory:
-  extensions:
-    - 'SilverStripe\AssetAdmin\Extensions\CampaignAdminExtension'
----
 Name: assetadminmodals
 ---
 SilverStripe\Admin\ModalController:

diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/containers/AssetAdmin/AssetAdmin.js b/client/src/containers/AssetAdmin/AssetAdmin.js
@@ -742,7 +742,6 @@ class AssetAdmin extends Component {
       onClose: this.handleCloseFile,
       onSubmit: this.handleSubmitEditor,
       onUnpublish: this.handleUnpublish,
-      addToCampaignSchemaUrl: config.form.addToCampaignForm.schemaUrl
     };
 
     return <EditorComponent {...editorProps} />;

diff --git a/client/src/containers/AssetAdmin/tests/AssetAdmin-test.js b/client/src/containers/AssetAdmin/tests/AssetAdmin-test.js
@@ -142,9 +142,6 @@ function makeProps(obj = {}) {
         fileSearchForm: {
           schemaUrl: '',
         },
-        addToCampaignForm: {
-          schemaUrl: '',
-        }
       },
     },
     fileId: null,

diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -24,7 +24,6 @@
 use SilverStripe\Assets\Image;
 use SilverStripe\Assets\Storage\AssetNameGenerator;
 use SilverStripe\Assets\Upload;
-use SilverStripe\CampaignAdmin\AddToCampaignHandler;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
@@ -97,7 +96,6 @@ class AssetAdmin extends AssetAdminOpen implements PermissionProvider
         'folderCreateForm',
         'fileEditForm',
         'fileHistoryForm',
-        'addToCampaignForm',
         'fileInsertForm',
         'fileEditorLinkForm',
         'schema',
@@ -292,9 +290,6 @@ public function getClientConfig(): array
                 'fileSelectForm' => [
                     'schemaUrl' => $this->Link('schema/fileSelectForm')
                 ],
-                'addToCampaignForm' => [
-                    'schemaUrl' => $this->Link('schema/addToCampaignForm')
-                ],
                 'fileHistoryForm' => [
                     'schemaUrl' => $this->Link('schema/fileHistoryForm')
                 ],
@@ -1425,77 +1420,6 @@ public function generateThumbnails(File $file, $thumbnailLinks = false)
         return $links;
     }
 
-    /**
-     * Action handler for adding pages to a campaign
-     */
-    public function addtocampaign(array $data, Form $form): HTTPResponse
-    {
-        $id = $data['ID'];
-        $record = File::get()->byID($id);
-
-        $handler = AddToCampaignHandler::create($this, $record, 'addToCampaignForm');
-        $response = $handler->addToCampaign($record, $data);
-        $message = $response->getBody();
-        if (empty($message)) {
-            return $response;
-        }
-
-        // Send extra "message" data with schema response
-        $extraData = ['message' => $message];
-        $schemaId = Controller::join_links($this->Link('schema/addToCampaignForm'), $id);
-        return $this->getSchemaResponse($schemaId, $form, null, $extraData);
-    }
-
-    /**
-     * Url handler for add to campaign form
-     *
-     * @param HTTPRequest $request
-     * @return Form
-     */
-    public function addToCampaignForm($request)
-    {
-        // Get ID either from posted back value, or url parameter
-        $id = $request->param('ID') ?: $request->postVar('ID');
-        return $this->getAddToCampaignForm($id);
-    }
-
-    /**
-     * @param int $id
-     * @return Form|HTTPResponse
-     */
-    public function getAddToCampaignForm($id)
-    {
-        // Get record-specific fields
-        $record = File::get()->byID($id);
-
-        if (!$record) {
-            $this->jsonError(404, _t(
-                __CLASS__.'.ErrorNotFound',
-                "That {Type} couldn't be found",
-                ['Type' => File::singleton()->i18n_singular_name()]
-            ));
-            return null;
-        }
-        if (!$record->canView()) {
-            $this->jsonError(403, _t(
-                __CLASS__.'.ErrorItemPermissionDenied',
-                "You don't have the necessary permissions to modify {ObjectTitle}",
-                ['ObjectTitle' => $record->i18n_singular_name()]
-            ));
-            return null;
-        }
-
-        $handler = AddToCampaignHandler::create($this, $record, 'addToCampaignForm');
-        $form = $handler->Form($record);
-
-        $form->setValidationResponseCallback(function (ValidationResult $errors) use ($form, $id) {
-            $schemaId = Controller::join_links($this->Link('schema/addToCampaignForm'), $id);
-            return $this->getSchemaResponse($schemaId, $form, $errors);
-        });
-
-        return $form;
-    }
-
     /**
      * @return Upload
      */

diff --git a/code/Extensions/CampaignAdminExtension.php b/code/Extensions/CampaignAdminExtension.php
diff --git a/composer.json b/composer.json
@@ -13,7 +13,6 @@
         "silverstripe/frameworktest": "^2",
         "squizlabs/php_codesniffer": "^3.7",
         "silverstripe/cms": "^6",
-        "silverstripe/campaign-admin": "^3",
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"
     },

diff --git a/tests/php/Forms/FileFormBuilderTest.php b/tests/php/Forms/FileFormBuilderTest.php
@@ -3,7 +3,6 @@
 namespace SilverStripe\AssetAdmin\Tests\Forms;
 
 use SilverStripe\AssetAdmin\Controller\AssetAdmin;
-use SilverStripe\AssetAdmin\Extensions\CampaignAdminExtension;
 use SilverStripe\AssetAdmin\Forms\FileFormFactory;
 use SilverStripe\AssetAdmin\Forms\FolderFormFactory;
 use SilverStripe\AssetAdmin\Forms\ImageFormFactory;
@@ -52,9 +51,6 @@ protected function tearDown(): void
 
     public function testEditFileForm()
     {
-        // Ensure campaign-admin extension is not applied!
-        Config::modify()->remove(FileFormFactory::class, 'extensions');
-
         $this->logInWithPermission('ADMIN');
 
         $file = $this->objFromFixture(File::class, 'file1');
@@ -95,32 +91,14 @@ public function testEditFileForm()
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
-
-        // Add to campaign should not be there by default
-        $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
-
-        // Add extension for campaign-admin
-        Config::modify()->merge(
-            FileFormFactory::class,
-            'extensions',
-            [CampaignAdminExtension::class]
-        );
-
-        $builder = new FileFormFactory();
-        $form = $builder->getForm($controller, 'EditForm', ['Record' => $file, 'RequireLinkText' => false]);
-
-        // Add to campaign should now be available
-        $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
     }
 
     public function testEditFileFormWithPermissions()
     {
-        // Add extension for campaign-admin
-        FileFormFactory::add_extension(CampaignAdminExtension::class);
         // Add extension to simulate different permissions
         File::add_extension(FileExtension::class);
 
-        $this->logInWithPermission('CMS_ACCESS_CampaignAdmin');
+        $this->logInWithPermission('CMS_ACCESS_AssetAdmin');
 
         /** @var File $file */
         $file = $this->objFromFixture(File::class, 'file1');
@@ -135,7 +113,6 @@ public function testEditFileFormWithPermissions()
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
 
-        $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
 
         FileExtension::$canDelete = false;
@@ -144,7 +121,6 @@ public function testEditFileFormWithPermissions()
         $form = $builder->getForm($controller, 'EditForm', ['Record' => $file, 'RequireLinkText' => false]);
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
-        $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
 
         FileExtension::$canDelete = true;
@@ -153,7 +129,6 @@ public function testEditFileFormWithPermissions()
         $form = $builder->getForm($controller, 'EditForm', ['Record' => $file]);
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
-        $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
 
         FileExtension::$canDelete = false;
@@ -162,7 +137,6 @@ public function testEditFileFormWithPermissions()
         $form = $builder->getForm($controller, 'EditForm', ['Record' => $file]);
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
-        $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
         $this->assertNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
 
         FileExtension::$canDelete = true;
@@ -173,10 +147,8 @@ public function testEditFileFormWithPermissions()
         $form = $builder->getForm($controller, 'EditForm', ['Record' => $file, 'RequireLinkText' => false]);
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_delete'));
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_replacefile'));
-        $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_addtocampaign'));
         $this->assertNotNull($form->Actions()->fieldByName('PopoverActions.action_unpublish'));
 
-        FileFormFactory::remove_extension(CampaignAdminExtension::class);
         File::remove_extension(FileExtension::class);
     }
 

diff --git a/tests/php/Forms/FolderCreateFormFactoryTest.php b/tests/php/Forms/FolderCreateFormFactoryTest.php
@@ -13,9 +13,6 @@ class FolderCreateFormFactoryTest extends SapphireTest
 {
     public function testEditFileForm()
     {
-        // Ensure campaign-admin extension is not applied!
-        Config::modify()->remove(FileFormFactory::class, 'extensions');
-
         $this->logInWithPermission('ADMIN');
 
         $controller = new AssetAdmin();