Merge pull request #14 from DRuiter/fix/pinned-highlighted

fix/pinned-highlighted

src/GridFieldActions/ArticlesGridFieldAddExistingAutocompleter.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace TheWebmen\Articles\GridFieldActions;
+
+use SilverStripe\ORM\DB;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
+use TheWebmen\Articles\Pages\ArticlePage;
+
+class ArticlesGridFieldAddExistingAutocompleter extends GridFieldAddExistingAutocompleter
+{
+    public function handleAction(GridField $gridField, $actionName, $arguments, $data)
+    {
+        if ($fieldToUpdate = $this->getFieldToUpdate($gridField)) {
+            $IDToUpdate = $data['relationID'];
+
+            // Safety check for possible injection
+            if (!is_numeric($IDToUpdate)) {
+                return parent::handleAction($gridField, $actionName, $arguments, $data);
+            }
+
+            $item = ArticlePage::get_by_id($IDToUpdate);
+
+            if (!$item) {
+                return parent::handleAction($gridField, $actionName, $arguments, $data);
+            }
+
+            DB::query("UPDATE TheWebmen_ArticlePage SET $fieldToUpdate = 1 WHERE ID = $IDToUpdate");
+
+            if ($item->isPublished()) {
+                DB::query("UPDATE TheWebmen_ArticlePage_Live SET $fieldToUpdate = 1 WHERE ID = $IDToUpdate");
+            }
+        }
+
+        parent::handleAction($gridField, $actionName, $arguments, $data);
+    }
+
+    private function getFieldToUpdate(GridField $gridField): ?string
+    {
+        switch ($gridField->getList()->getJoinTable()) {
+            case 'TheWebmen_ArticlesPage_PinnedArticles':
+                return 'Pinned';
+
+            case 'TheWebmen_ArticlesPage_HighlightedArticles':
+                return 'Highlighted';
+
+            default:
+                return null;
+        }
+    }
+}

src/GridFieldActions/ArticlesGridFieldDeleteAction.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace TheWebmen\Articles\GridFieldActions;
+
+use SilverStripe\ORM\DB;
+use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldDeleteAction;
+
+class ArticlesGridFieldDeleteAction extends GridFieldDeleteAction
+{
+    public function __construct(bool $removeRelation = true)
+    {
+        parent::__construct($removeRelation);
+    }
+
+    public function handleAction(GridField $gridField, $actionName, $arguments, $data)
+    {
+        if ($fieldToUpdate = $this->getFieldToUpdate($gridField)) {
+            $IDToUpdate = $arguments['RecordID'];
+
+            // Safety check for possible injection
+            if (!is_numeric($IDToUpdate)) {
+                return parent::handleAction($gridField, $actionName, $arguments, $data);
+            }
+
+            /** @var ArticlePage $item */
+            $item = $gridField->getList()->byID($IDToUpdate);
+
+            DB::query("UPDATE TheWebmen_ArticlePage SET $fieldToUpdate = 0 WHERE ID = $IDToUpdate");
+
+            if ($item->isPublished()) {
+                DB::query("UPDATE TheWebmen_ArticlePage_Live SET $fieldToUpdate = 0 WHERE ID = $IDToUpdate");
+            }
+        }
+
+        parent::handleAction($gridField, $actionName, $arguments, $data);
+    }
+
+    private function getFieldToUpdate(GridField $gridField): ?string
+    {
+        switch ($gridField->getList()->getJoinTable()) {
+            case 'TheWebmen_ArticlesPage_PinnedArticles':
+                return 'Pinned';
+
+            case 'TheWebmen_ArticlesPage_HighlightedArticles':
+                return 'Highlighted';
+
+            default:
+                return null;
+        }
+    }
+}

src/Pages/ArticlesPage.php

@@ -10,16 +10,20 @@
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
 use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
 use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor;
+use SilverStripe\Forms\GridField\GridFieldDeleteAction;
 use SilverStripe\Forms\GridField\GridFieldEditButton;
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Lumberjack\Forms\GridFieldConfig_Lumberjack;
 use SilverStripe\Lumberjack\Forms\GridFieldSiteTreeAddNewButton;
 use SilverStripe\ORM\DataList;
+use SilverStripe\ORM\DB;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\ManyManyList;
 use SilverStripe\Versioned\GridFieldArchiveAction;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 use TheWebmen\Articles\Controllers\ArticlesPageController;
+use TheWebmen\Articles\GridFieldActions\ArticlesGridFieldAddExistingAutocompleter;
+use TheWebmen\Articles\GridFieldActions\ArticlesGridFieldDeleteAction;
 use TheWebmen\Articles\Models\Author;
 use TheWebmen\Articles\Models\Tag;
 
@@ -199,8 +203,16 @@ private function getGridConfig(string $sortColumn): GridFieldConfig_RelationEdit
         $gridfieldConfig->removeComponentsByType(GridFieldArchiveAction::class);
         $gridfieldConfig->removeComponentsByType(GridFieldEditButton::class);
 
+        // Custom delete action that properly reflects the pinned/highlighted property to the removed relation
+        $gridfieldConfig->removeComponentsByType(GridFieldDeleteAction::class);
+        $gridfieldConfig->addComponent(new ArticlesGridFieldDeleteAction());
+
+        // Custom add action that properly reflects the pinned/highlighted property to the added relation
+        $gridfieldConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+        $gridfieldConfig->addComponent(new ArticlesGridFieldAddExistingAutocompleter());
+
         /** @var GridFieldAddExistingAutocompleter $autocompleter */
-        $autocompleter = $gridfieldConfig->getComponentByType(GridFieldAddExistingAutocompleter::class);
+        $autocompleter = $gridfieldConfig->getComponentByType(ArticlesGridFieldAddExistingAutocompleter::class);
         $autocompleter
             ->setSearchList(
                 ArticlePage::get()->filter(
@@ -265,42 +277,63 @@ public function getControllerName(): string
 
     protected function onAfterWrite()
     {
-        $articlePages = ArticlePage::get()->filter('ParentID', $this->ID);
-
-        $articlePages->each(
-            function (ArticlePage $articlePage) {
-                $pinned = $articlePage->Pinned;
-                $highlighted = $articlePage->Highlighted;
-
-                if (!$highlighted && in_array($articlePage->ID, $this->HighlightedArticles()->column('ID'))) {
-                    $articlePage->Highlighted = true;
-                }
-
-                if ($highlighted && !in_array($articlePage->ID, $this->HighlightedArticles()->column('ID'))) {
-                    $articlePage->Highlighted = false;
-                }
-
-                if (!$pinned && in_array($articlePage->ID, $this->PinnedArticles()->column('ID'))) {
-                    $articlePage->Pinned = true;
-                }
-
-                if ($pinned && !in_array($articlePage->ID, $this->PinnedArticles()->column('ID'))) {
-                    $articlePage->Pinned = false;
-                }
-
-                try {
-                    $isModifiedOnDraft = $articlePage->isModifiedOnDraft();
-                    $articlePage->write();
-
-                    if (!$isModifiedOnDraft) {
-                        $articlePage->publishRecursive();
-                    }
-                } catch (\Exception $exception) {
-                    Injector::inst()->get('LoggingService')->exception($exception);
-                }
-            }
+        $parentID = $this->ID;
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage SET Highlighted = 1 WHERE ID IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_HighlightedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree WHERE ParentID = $parentID)
+        ");
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage SET Highlighted = 0 WHERE ID NOT IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_HighlightedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree WHERE ParentID = $parentID)"
+        );
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage SET Pinned = 1 WHERE ID IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_PinnedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree WHERE ParentID = $parentID)
+        ");
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage SET Pinned = 0 WHERE ID NOT IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_PinnedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree WHERE ParentID = $parentID)"
         );
 
         parent::onAfterWrite();
     }
+
+    public function onAfterPublish()
+    {
+        $parentID = $this->ID;
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage_Live SET Highlighted = 1 WHERE ID IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_HighlightedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree_Live WHERE ParentID = $parentID)
+        ");
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage_Live SET Highlighted = 0 WHERE ID NOT IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_HighlightedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree_Live WHERE ParentID = $parentID)"
+        );
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage_Live SET Pinned = 1 WHERE ID IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_PinnedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree_Live WHERE ParentID = $parentID)
+        ");
+
+        DB::query("
+            UPDATE TheWebmen_ArticlePage_Live SET Pinned = 0 WHERE ID NOT IN (
+                SELECT TheWebmen_ArticlePageID FROM TheWebmen_ArticlesPage_PinnedArticles WHERE TheWebmen_ArticlesPageID = $parentID
+            ) AND ID IN (SELECT ID FROM SiteTree_Live WHERE ParentID = $parentID)"
+        );
+
+        parent::onAfterPublish();
+    }
 }