Merge pull request #52 from wedevelopnl/fix/correct-default-sort

Bring back the default sort to make sure that the page works correct.
wedevelopnl · Feb 12, 2025 · db0ac40 · db0ac40
2 parents 16a9b20 + 5ad3222
commit db0ac40
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 4 deletions.
diff --git a/src/Pages/ArticlePage.php b/src/Pages/ArticlePage.php
@@ -18,28 +18,42 @@
 use SilverStripe\Versioned\GridFieldArchiveAction;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 use WeDevelop\Articles\Controllers\ArticlePageController;
-use WeDevelop\Articles\Controllers\ArticlesPageController;
 use WeDevelop\Articles\Models\Author;
 use WeDevelop\Articles\Models\Tag;
 
 class ArticlePage extends \Page
 {
+    /** @config */
     private static string $table_name = 'WeDevelop_ArticlePage';
 
+    /** @config */
     private static string $singular_name = 'Article page';
 
+    /** @config */
     private static string $description = 'A page that represents an article';
 
+    /** @config */
     private static string $plural_name = 'Articles page';
 
+    /** @config */
     private static string $icon_class = 'font-icon-p-article';
 
+    /** @config */
     private static bool $show_in_sitetree = false;
 
+    /** @config */
     private static bool $can_be_root = false;
 
+    /**
+     * @config
+     * @var array<class-string>
+     */
     private static array $allowed_children = [];
 
+    /**
+     * @config
+     * @var array<string, string>
+     */
     private static array $db = [
         'Subtitle' => 'Varchar(255)',
         'PublicationDate' => 'Datetime',
@@ -50,28 +64,45 @@ class ArticlePage extends \Page
         'Highlighted' => 'Boolean',
     ];
 
+    /**
+     * @config
+     * @var array<string, class-string>
+     */
     private static array $has_one = [
         'Thumbnail' => Image::class,
         'Type' => ArticleTypePage::class,
         'Author' => Author::class,
     ];
 
+    /**
+     * @config
+     * @var array<string, class-string>
+     */
     private static array $many_many = [
         'RelatedArticles' => ArticlePage::class,
     ];
 
+    /**
+     * @config
+     * @var array<string>
+     */
     private static array $owns = [
         'Thumbnail',
     ];
 
+    /**
+     * @config
+     * @var array<string, class-string|string>
+     */
     private static array $belongs_many_many = [
         'Tags' => Tag::class,
         'Themes' => ArticleThemePage::class,
         'HighlightedArticles' => ArticlesPage::class . '.HighlightedArticles',
         'PinnedArticles' => ArticlesPage::class . '.PinnedArticles',
     ];
 
-//    private static string $default_sort = 'PublicationDate DESC';
+    /** @config */
+    private static string $default_sort = 'PublicationDate DESC';
 
     public function getCMSFields(): FieldList
     {

diff --git a/src/Pages/ArticlesPage.php b/src/Pages/ArticlesPage.php
@@ -2,8 +2,6 @@
 
 namespace WeDevelop\Articles\Pages;
 
-use SilverStripe\Forms\TextField;
-use WeDevelop\SiteTreeButtons\GridFieldAddNewSiteTreeItemButton;
 use SilverStripe\Control\Controller;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
@@ -26,6 +24,7 @@
 use WeDevelop\Articles\GridFieldActions\ArticlesGridFieldDeleteAction;
 use WeDevelop\Articles\Models\Author;
 use WeDevelop\Articles\Models\Tag;
+use WeDevelop\SiteTreeButtons\GridFieldAddNewSiteTreeItemButton;
 
 /**
  * Class ArticlesPage
@@ -39,40 +38,72 @@
  */
 class ArticlesPage extends \Page
 {
+    /** @config */
     private static string $table_name = 'WeDevelop_ArticlesPage';
 
+    /** @config */
     private static string $singular_name = 'Articles overview page';
 
+    /** @config */
     private static string $plural_name = 'Articles overview pages';
 
+    /** @config */
     private static string $icon_class = 'font-icon-p-article';
 
+    /**
+     * @config
+     * @var array<class-string>
+     */
     private static array $allowed_children = [
         ArticlePage::class,
         ArticleThemePage::class,
         ArticleTypePage::class,
     ];
 
+    /**
+     * @config
+     * @var class-string
+     */
     private static string $default_child = ArticlePage::class;
 
+    /**
+     * @config
+     * @var array<string, string>
+     */
     private static array $db = [
         'PageLength' => 'Int',
     ];
 
+    /**
+     * @config
+     * @var array<string, mixed>
+     */
     private static array $defaults = [
         'PageLength' => 10,
     ];
 
+    /**
+     * @config
+     * @var array<string, class-string>
+     */
     private static array $has_many = [
         'Tags' => Tag::class,
         'Authors' => Author::class,
     ];
 
+    /**
+     * @config
+     * @var array<string, class-string>
+     */
     private static array $many_many = [
         'HighlightedArticles' => ArticlePage::class,
         'PinnedArticles' => ArticlePage::class,
     ];
 
+    /**
+     * @config
+     * @var array<string, array<string, string>>
+     */
     private static array $many_many_extraFields = [
         'HighlightedArticles' => [
             'HighlightedSort' => 'Int',