From d6af6e064f4c9b6aecb4502ef85a18ef451315c7 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Thu, 31 Oct 2024 12:34:16 +0100
Subject: [PATCH] feat: Review Announcement Space Template Home Page -
 MEED-7726 - Meeds-io/meeds#2546 (#2554)

This change will update Home Page of Announcement Space Template.
---
 .../group_template/announcement/pages.xml     | 21 ++------
 .../sites/portal-upgrade-configuration.xml    | 50 +++++++++++++++++++
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/pages.xml
index 3b36ca13e..53eb25150 100644
--- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/pages.xml
+++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/pages.xml
@@ -29,17 +29,6 @@
     <access-permissions>member:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl"><!-- To be deleted once WebUI is cleaned from Meeds package -->
-      <section-columns>
-        <column col-span="12">
-          <portlet-application>
-            <portlet>
-              <application-ref>social</application-ref>
-              <portlet-ref>SpaceBannerPortlet</portlet-ref>
-            </portlet>
-            <title>Space Banner</title>
-          </portlet-application>
-        </column>
-      </section-columns>
       <section-columns
         sticky-beahvior="true"
         mobile-columns-style="true">
@@ -62,17 +51,17 @@
         <column col-span="4">
           <portlet-application>
             <portlet>
-              <application-ref>content</application-ref>
-              <portlet-ref>NewsListView</portlet-ref>
+              <application-ref>social</application-ref>
+              <portlet-ref>SpaceWidgetDescription</portlet-ref>
             </portlet>
-            <title>News List</title>
+            <title>Space Description</title>
           </portlet-application>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>
-              <portlet-ref>SpaceWidgetDescription</portlet-ref>
+              <portlet-ref>Links</portlet-ref>
             </portlet>
-            <title>Space Description</title>
+            <title>Links</title>
           </portlet-application>
           <container id="space-home-widgets-announcement-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
             <name>space-home-widgets-announcement-container</name>
diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml
index e85c7f2a6..0ed6f2142 100644
--- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml
+++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml
@@ -2013,5 +2013,55 @@
         </object-param>
       </init-params>
     </component-plugin>
+    <component-plugin profiles="layout">
+      <name>AnnouncementSpaceTemplateLayoutUpgrade</name>
+      <set-method>addUpgradePlugin</set-method>
+      <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
+      <init-params>
+        <value-param>
+          <name>product.group.id</name>
+          <value>org.exoplatform.social</value>
+        </value-param>
+        <value-param>
+          <name>plugin.execution.order</name>
+          <value>130</value>
+        </value-param>
+        <value-param>
+          <name>plugin.upgrade.execute.once</name>
+          <value>true</value>
+        </value-param>
+        <value-param>
+          <name>enabled</name>
+          <value>true</value>
+        </value-param>
+        <object-param>
+          <name>AnnouncementSpaceTemplate.upgrade</name>
+          <object type="io.meeds.social.upgrade.model.LayoutUpgrade">
+            <field name="updatePageLayout">
+              <boolean>true</boolean>
+            </field>
+            <field name="configPath">
+              <string>war:/conf/sites/</string>
+            </field>
+            <field name="portalType">
+              <string>group_template</string>
+            </field>
+            <field name="portalName">
+              <string>announcement</string>
+            </field>
+            <field name="importMode">
+              <string>merge</string>
+            </field>
+            <field name="pageNames">
+              <collection type="java.util.ArrayList" item-type="java.lang.String">
+                <value>
+                  <string>home</string>
+                </value>
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
   </external-component-plugins>
 </configuration>
\ No newline at end of file