FIX Remove deprecated restore batch action

creative-commoners · May 9, 2024 · 26d3dd6 · 26d3dd6
1 parent faeb1af
commit 26d3dd6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 140 deletions.
diff --git a/code/BatchActions/CMSBatchAction_Restore.php b/code/BatchActions/CMSBatchAction_Restore.php
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -11,7 +11,6 @@
 use SilverStripe\Admin\Navigator\SilverStripeNavigator;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;
-use SilverStripe\CMS\BatchActions\CMSBatchAction_Restore;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish;
 use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search;
 use SilverStripe\CMS\Model\CurrentPageIdentifier;
@@ -188,7 +187,6 @@ protected function init()
 
         Requirements::add_i18n_javascript('silverstripe/cms: client/lang', false);
 
-        CMSBatchActionHandler::register('restore', CMSBatchAction_Restore::class);
         CMSBatchActionHandler::register('archive', CMSBatchAction_Archive::class);
         CMSBatchActionHandler::register('unpublish', CMSBatchAction_Unpublish::class);
         CMSBatchActionHandler::register('publish', CMSBatchAction_Publish::class);

diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php
@@ -4,7 +4,6 @@
 
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;
-use SilverStripe\CMS\BatchActions\CMSBatchAction_Restore;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Core\Config\Config;
@@ -105,77 +104,4 @@ public function testBatchDeleteApplicable()
         $this->assertContains($this->idFromFixture(SiteTree::class, 'unpublished'), $applicable);
         $this->assertContains($this->idFromFixture(SiteTree::class, 'modified'), $applicable);
     }
-
-    /**
-     * Test restore batch actions
-     */
-    public function testBatchRestoreApplicable()
-    {
-        $this->logInWithPermission('ADMIN');
-        $pages = Versioned::get_including_deleted(SiteTree::class);
-        $ids = $pages->column('ID');
-        $action = new CMSBatchAction_Restore();
-
-        // Test applicable pages
-        $applicable = $action->applicablePages($ids);
-        $this->assertNotContains($this->idFromFixture(SiteTree::class, 'published'), $applicable);
-        $this->assertContains($this->idFromFixture(SiteTree::class, 'archived'), $applicable);
-        $this->assertContains($this->idFromFixture(SiteTree::class, 'archivedx'), $applicable);
-        $this->assertContains($this->idFromFixture(SiteTree::class, 'archivedy'), $applicable);
-        $this->assertNotContains($this->idFromFixture(SiteTree::class, 'unpublished'), $applicable);
-        $this->assertNotContains($this->idFromFixture(SiteTree::class, 'modified'), $applicable);
-    }
-
-    public function testBatchRestore()
-    {
-        $this->logInWithPermission('ADMIN');
-        $pages = Versioned::get_including_deleted(SiteTree::class);
-        $action = new CMSBatchAction_Restore();
-        $archivedID = $this->idFromFixture(SiteTree::class, 'archived');
-        $archivedxID = $this->idFromFixture(SiteTree::class, 'archivedx');
-        $archivedyID = $this->idFromFixture(SiteTree::class, 'archivedy');
-
-        // Just restore one child
-        $list = $pages->filter('ID', $archivedxID);
-        $this->assertEquals(1, $list->count());
-        $this->assertEquals($archivedID, $list->first()->ParentID);
-
-        // Run restore
-        $result = json_decode($action->run($list)->getBody(), true);
-        $this->assertEquals(
-            [
-                $archivedxID => $archivedxID,
-            ],
-            $result['success']
-        );
-        $archivedx = SiteTree::get()->byID($archivedxID);
-        $this->assertNotNull($archivedx);
-        $this->assertEquals(0, $archivedx->ParentID); // Restore to root because parent is unrestored
-
-        // Restore both remaining pages
-        $list = $pages
-            ->filter('ID', [$archivedID, $archivedyID])
-            ->sort('Title');
-        $this->assertEquals(2, $list->count());
-        $this->assertEquals($archivedID, $list->first()->ParentID); // archivedy
-        $this->assertEquals(0, $list->last()->ParentID); // archived (parent)
-
-        // Run restore
-        $result = json_decode($action->run($list)->getBody(), true);
-        $this->assertEquals(
-            [
-                // Order of archived is opposite to order items are passed in, as
-                // these are sorted by level first
-                $archivedID => $archivedID,
-                $archivedyID => $archivedyID,
-            ],
-            $result['success']
-        );
-        $archived = SiteTree::get()->byID($archivedID);
-        $archivedy = SiteTree::get()->byID($archivedyID);
-        $this->assertNotNull($archived);
-        $this->assertNotNull($archivedy);
-        $this->assertEquals($archivedID, $archivedy->ParentID); // Not restored to root, but to the parent
-        $this->assertEquals(0, $archived->ParentID); // Root stays root
-    }
 }
diff --git a/tests/php/Forms/SiteTreeURLSegmentFieldTest.php b/tests/php/Forms/SiteTreeURLSegmentFieldTest.php
@@ -4,7 +4,6 @@
 
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;
-use SilverStripe\CMS\BatchActions\CMSBatchAction_Restore;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish;
 use SilverStripe\CMS\Forms\SiteTreeURLSegmentField;
 use SilverStripe\CMS\Model\SiteTree;