From 77e1b9d2ab4b62bb38e4e2c0f44984a8365efce2 Mon Sep 17 00:00:00 2001
From: Prokyonn <daniel.mathis@sector8.eu>
Date: Tue, 30 Jul 2024 15:59:51 +0200
Subject: [PATCH] Fix LinkProvider alias and enhance articles list view (#5)

---
 UPGRADE.md                                    | 10 ++
 config/lists/articles.xml                     | 93 +++++++++++++++++++
 .../Symfony/HttpKernel/SuluArticleBundle.php  |  2 +-
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 0465c7e5..088b5292 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -2,6 +2,16 @@
 
 ## 3.x
 
+### Article user settings updated
+
+Due to the refactoring of the new content bundle storage, the user settings for articles must be erased to avoid conflicts.
+
+Execute the following SQL query to delete the user settings:
+```mysql
+DELETE FROM `se_user_settings`
+       WHERE `se_user_settings`.`settingsKey` LIKE '%article%'
+```
+
 ### Elasticsearch Bundle need to be required
 
 The SuluArticleBundle defines not longer its dependency to `handcraftedinthealps/elasticsearch-bundle` because
diff --git a/config/lists/articles.xml b/config/lists/articles.xml
index a2c26773..1595233f 100644
--- a/config/lists/articles.xml
+++ b/config/lists/articles.xml
@@ -2,6 +2,27 @@
 <list xmlns="http://schemas.sulu.io/list-builder/list">
     <key>articles</key>
 
+    <joins name="creator">
+        <join>
+            <entity-name>%sulu.model.user.class%</entity-name>
+            <field-name>Sulu\Article\Domain\Model\ArticleInterface.creator</field-name>
+        </join>
+        <join>
+            <entity-name>%sulu.model.contact.class%</entity-name>
+            <field-name>%sulu.model.user.class%.contact</field-name>
+        </join>
+    </joins>
+    <joins name="changer">
+        <join>
+            <entity-name>%sulu.model.user.class%</entity-name>
+            <field-name>Sulu\Article\Domain\Model\ArticleInterface.changer</field-name>
+        </join>
+        <join>
+            <entity-name>%sulu.model.contact.class%</entity-name>
+            <field-name>%sulu.model.user.class%.contact</field-name>
+        </join>
+    </joins>
+
     <joins name="dimensionContent">
         <join>
             <entity-name>dimensionContent</entity-name>
@@ -29,6 +50,13 @@
         </join>
     </joins>
 
+    <joins name="author">
+        <join>
+            <entity-name>authorEntity</entity-name>
+            <field-name>dimensionContent.author</field-name>
+        </join>
+    </joins>
+
     <properties>
         <!-- TODO should be uuid not id -->
         <property name="id" translation="sulu_admin.uuid">
@@ -54,6 +82,71 @@
             <transformer type="title"/>
         </case-property>
 
+        <concatenation-property name="author" visibility="yes" translation="sulu_admin.author" glue=" " sortable="false">
+            <field>
+                <field-name>firstName</field-name>
+                <entity-name>authorEntity</entity-name>
+
+                <joins ref="author"/>
+            </field>
+            <field>
+                <field-name>lastName</field-name>
+                <entity-name>authorEntity</entity-name>
+
+                <joins ref="author"/>
+            </field>
+        </concatenation-property>
+
+        <property name="authored" type="date" visibility="no" translation="sulu_admin.authored"
+        >
+            <transformer type="datetime"/>
+            <filter type="date"/>
+        </property>
+
+        <property name="created" translation="sulu_admin.created">
+            <field-name>created</field-name>
+            <entity-name>Sulu\Article\Domain\Model\ArticleInterface</entity-name>
+            <transformer type="datetime"/>
+        </property>
+
+        <property name="changed" translation="sulu_admin.changed">
+            <field-name>changed</field-name>
+            <entity-name>Sulu\Article\Domain\Model\ArticleInterface</entity-name>
+            <transformer type="datetime"/>
+        </property>
+
+        <concatenation-property name="creator" visibility="always" glue=" "
+                                translation="sulu_automation.list.creator" sortable="false">
+            <field>
+                <field-name>firstName</field-name>
+                <entity-name>%sulu.model.contact.class%</entity-name>
+
+                <joins ref="creator"/>
+            </field>
+            <field>
+                <field-name>lastName</field-name>
+                <entity-name>%sulu.model.contact.class%</entity-name>
+
+                <joins ref="creator"/>
+            </field>
+        </concatenation-property>
+
+        <concatenation-property name="changer" glue=" " translation="sulu_automation.list.changer"
+                                sortable="false">
+            <field>
+                <field-name>firstName</field-name>
+                <entity-name>%sulu.model.contact.class%</entity-name>
+
+                <joins ref="changer"/>
+            </field>
+            <field>
+                <field-name>lastName</field-name>
+                <entity-name>%sulu.model.contact.class%</entity-name>
+
+                <joins ref="changer"/>
+            </field>
+        </concatenation-property>
+
         <property name="locale" translation="sulu_admin.locale" visibility="never">
             <field-name>locale</field-name>
             <entity-name>dimensionContent</entity-name>
diff --git a/src/Infrastructure/Symfony/HttpKernel/SuluArticleBundle.php b/src/Infrastructure/Symfony/HttpKernel/SuluArticleBundle.php
index a4534d71..0716eab4 100644
--- a/src/Infrastructure/Symfony/HttpKernel/SuluArticleBundle.php
+++ b/src/Infrastructure/Symfony/HttpKernel/SuluArticleBundle.php
@@ -231,7 +231,7 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
                 new Reference('sulu_page.structure.factory'),
                 new Reference('doctrine.orm.entity_manager'),
             ])
-            ->tag('sulu.link.provider', ['alias' => ArticleInterface::RESOURCE_KEY]);
+            ->tag('sulu.link.provider', ['alias' => 'article']);
 
         // Smart Content services
         $services->set('sulu_article.article_data_provider_repository')