ENH More Actions button is hidden if Campaign is published

silverstripe · Nov 7, 2023 · 28532dd · 28532dd
1 parent c3142e4
commit 28532dd
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 11 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/containers/CampaignAdmin/CampaignAdminList.js b/client/src/containers/CampaignAdmin/CampaignAdminList.js
@@ -327,7 +327,7 @@ class CampaignAdminList extends Component {
   }
 
   renderPreview(itemLinks, itemId) {
-    const { PreviewComponent, previewState } = this.props;
+    const { PreviewComponent, previewState, record: { State } } = this.props;
     const { loading, error, errorCode } = this.state;
 
     let previewClasses = [
@@ -385,15 +385,24 @@ class CampaignAdminList extends Component {
       );
     }
 
-    return (
-      <PreviewComponent
-        itemLinks={itemLinks}
-        itemId={itemId}
-        onBack={this.handleCloseItem}
-        moreActions={this.getMoreActions()}
-        className={previewClasses}
-      />
-    );
+    return State === 'open'
+      ? (
+        <PreviewComponent
+          itemLinks={itemLinks}
+          itemId={itemId}
+          onBack={this.handleCloseItem}
+          moreActions={this.getMoreActions()}
+          className={previewClasses}
+        />
+      )
+      : (
+        <PreviewComponent
+          itemLinks={itemLinks}
+          itemId={itemId}
+          onBack={this.handleCloseItem}
+          className={previewClasses}
+        />
+      );
   }
 
   /**

diff --git a/client/src/containers/CampaignAdmin/tests/CampaignAdminList-test.js b/client/src/containers/CampaignAdmin/tests/CampaignAdminList-test.js
@@ -12,6 +12,7 @@ function makeProps(obj = {}) {
     itemListViewEndpoint: { url: '', method: 'POST' },
     record: {
       ID: 3,
+      State: 'open',
       placeholderGroups: [
         {
           baseClass: 'SilverStripe\\CMS\\Model\\SiteTree',

diff --git a/src/CampaignAdmin.php b/src/CampaignAdmin.php
@@ -497,6 +497,9 @@ public function removeCampaignItem(HTTPRequest $request)
             return (new HTTPResponse(null, 404));
         }
 
+        if ($campaign->State !== ChangeSet::STATE_OPEN) {
+            return (new HTTPResponse(null, 400));
+        }
 
         $campaign->removeObject($item->Object());
 

diff --git a/tests/behat/features/manage-campaigns.feature b/tests/behat/features/manage-campaigns.feature
@@ -76,6 +76,8 @@ Feature: Manage campaigns
     And I click on the ".grid-field__cell--drillable" element
     And I press the "Publish campaign" button
     And I confirm the dialog
+    And I should not see the "Publish campaign" button
+    And I should not see an "#tab-ActionMenus_MoreOptions" element
 
     When I go to "/admin/pages"
     Then the rendered HTML should not contain "badge status-addedtodraft"

diff --git a/tests/php/CampaignAdminTest.php b/tests/php/CampaignAdminTest.php
@@ -4,6 +4,7 @@
 
 use ReflectionClass;
 use SilverStripe\CampaignAdmin\CampaignAdmin;
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Dev\FunctionalTest;
@@ -13,6 +14,7 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Versioned\ChangeSet;
+use SilverStripe\Versioned\ChangeSetItem;
 
 class CampaignAdminTest extends FunctionalTest
 {
@@ -159,4 +161,38 @@ public function testReadCampaign(
         $response = $this->get("/admin/campaigns/set/$changeSetID/show", null, ['Accept' => 'application/json']);
         $this->assertEquals($expectedResponseCode, $response->getStatusCode());
     }
+
+    public function removeCampaignDataProvider()
+    {
+        return [
+            'open campaign' => [false, false, 204],
+            'published campaign' => [true, false,  400],
+            'incorrect campaign ID' => [true, true, 404],
+        ];
+    }
+
+    /**
+     * @dataProvider removeCampaignDataProvider
+     */
+    public function testRemoveCampaignItem(
+        bool $isPublished,
+        bool $isWrongID,
+        int $expectedResponseCode,
+    ) {
+        $item = new SiteTree();
+        $item->write();
+        $changeset = new ChangeSet();
+        $changeset->write();
+        $changeset->addObject($item);
+
+        if ($isPublished) {
+            $changeset->publish();
+        }
+
+        $changesetitemID = ChangeSetItem::get()->where(['"ChangeSetID" = ?' => $changeset->ID])->first()->ID;
+        $changesetID =  $isWrongID ? 12345 : $changeset->ID;
+
+        $response = $this->post("/admin/campaigns/removeCampaignItem/$changesetID/$changesetitemID", null);
+        $this->assertEquals($expectedResponseCode, $response->getStatusCode());
+    }
 }