Make ordering in {% setcontent %} more robust

src/Configuration/Parser/ContentTypesParser.php

@@ -159,6 +159,15 @@ protected function parseContentType($key, array $contentType): ?ContentType
 
         $contentType['sort'] = $this->determineSort($contentType);
 
+        // Make sure title_format is set
+        if (isset($contentType['title_format'])) {
+            $contentType['title_format'] = (array) $contentType['title_format'];
+        } elseif (isset($contentType['fields']['slug']['uses'])) {
+            $contentType['title_format'] = (array) $contentType['fields']['slug']['uses'];
+        } else {
+            $contentType['title_format'] = (array) key($contentType['fields']);
+        }
+
         // Make sure taxonomy is an array.
         if (isset($contentType['taxonomy'])) {
             $contentType['taxonomy'] = (array) $contentType['taxonomy'];

src/Storage/Directive/OrderDirective.php

@@ -13,15 +13,6 @@
  */
 class OrderDirective
 {
-    private $coreFields = [
-        'id',
-        'createdAt',
-        'modifiedAt',
-        'publishedAt',
-        'depublishedAt',
-        'status',
-    ];
-
     public function __invoke(QueryInterface $query, string $order): void
     {
         if ($order === '') {
@@ -36,14 +27,17 @@ public function __invoke(QueryInterface $query, string $order): void
         foreach ($separatedOrders as $order) {
             [ $order, $direction ] = $this->createSortBy($order);
 
-            if (in_array($order, $this->coreFields, true)) {
+            if (in_array($order, $query->getCoreFields(), true)) {
                 $query->getQueryBuilder()->addOrderBy('content.' . $order, $direction);
             } elseif ($order === 'author') {
                 $query
                     ->getQueryBuilder()
                     ->leftJoin('content.author', 'user')
                     ->addOrderBy('user.username', $direction);
             } else {
+                if (! $this->isActualField($query, $order)) {
+                    dump("A query with ordering on a Field (`${order}`) that's not defined, will yield unexpected results. Update your `{% setcontent %}`-statement");
+                }
                 $fieldsAlias = 'fields_order_' .  $query->getIndex();
                 $fieldAlias = 'order_' . $query->getIndex();
                 $translationsAlias = 'translations_order_' . $query->getIndex();
@@ -94,4 +88,11 @@ protected function isMultiOrderQuery(string $order): bool
     {
         return mb_strpos($order, ',') !== false;
     }
+
+    protected function isActualField(QueryInterface $query, string $name): bool
+    {
+        $contentType = $query->getConfig()->get('contenttypes/' . $query->getContentType());
+
+        return in_array($name, $contentType->get('fields')->keys()->all(), true);
+    }
 }

src/Storage/QueryInterface.php

@@ -4,6 +4,7 @@
 
 namespace Bolt\Storage;
 
+use Bolt\Configuration\Config;
 use Doctrine\ORM\QueryBuilder;
 
 /**
@@ -44,4 +45,8 @@ public function getParameter(string $key);
      * Sets the value of a parameter by key name.
      */
     public function setParameter(string $key, $value): void;
+
+    public function getCoreFields(): array;
+
+    public function getConfig(): Config;
 }

src/Storage/SelectQuery.php

@@ -4,6 +4,7 @@
 
 namespace Bolt\Storage;
 
+use Bolt\Configuration\Config;
 use Bolt\Doctrine\JsonHelper;
 use Doctrine\ORM\Query\Expr\Base;
 use Doctrine\ORM\Query\ParameterTypeInferer;
@@ -67,13 +68,17 @@ class SelectQuery implements QueryInterface
     /** @var array */
     private $fieldJoins = [];
 
+    /** @var Config */
+    private $config;
+
     /**
      * Constructor.
      */
-    public function __construct(?QueryBuilder $qb = null, QueryParameterParser $parser)
+    public function __construct(?QueryBuilder $qb = null, QueryParameterParser $parser, Config $config)
     {
         $this->qb = $qb;
         $this->parser = $parser;
+        $this->config = $config;
     }
 
     /**
@@ -381,4 +386,14 @@ public function getAndIncrementIndex()
 
         return $this->getIndex();
     }
+
+    public function getCoreFields(): array
+    {
+        return $this->coreFields;
+    }
+
+    public function getConfig(): Config
+    {
+        return $this->config;
+    }
 }

templates/content/listing.html.twig

@@ -41,8 +41,11 @@
       :csrftoken="{{ csrf_token('batch')|json_encode }}"
     ></listing-select-box>
 
+    {% set titleField = contentType.title_format|first %}
+    {% set titleLabel = contentType.fields[titleField].label %}
+
     {% set filterOptions = {
-        'id': "Id", 'title': 'Title', 'author': 'Author', 'status': 'Status', 'createdAt': 'Created date',
+        'id': "Id", (titleField): titleLabel, 'author': 'Author', 'status': 'Status', 'createdAt': 'Created date',
         'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'
     } %}
 

tests/php/Configuration/Parser/ContentTypesParserTest.php

@@ -15,7 +15,7 @@ class ContentTypesParserTest extends ParserTestBase
 {
     public const NUMBER_OF_CONTENT_TYPES_IN_MINIMAL_FILE = 2;
 
-    public const AMOUNT_OF_ATTRIBUTES_IN_CONTENT_TYPE = 22;
+    public const AMOUNT_OF_ATTRIBUTES_IN_CONTENT_TYPE = 23;
 
     public const AMOUNT_OF_ATTRIBUTES_IN_FIELD = 22;