From d374454c3a5fc68ec444d6ed5d0d0eaeb0e2e044 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Mon, 13 Nov 2023 17:26:31 +0100
Subject: [PATCH] feat: Reorder Overview Page Widgets - MEED-2860 -
 Meeds-io/MIPs#104 (#1278)

This change will reorder Overview widget by reversing rows order.
---
 .../META-INF/exo-conf/configuration.xml       |  3 +-
 .../conf/sites/portal-configuration.xml       |  2 +-
 .../conf/sites/portal/global/pages.xml        | 36 +++++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml
index 91ea5ef39..3d6c79c89 100644
--- a/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml
+++ b/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml
@@ -26,8 +26,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <properties-param>
         <name>MeedsPortalConfigProperties</name>
         <property name="exo.social.groups.portalConfig.metadata.importmode" value="${exo.social.groups.portalConfig.metadata.importmode:OVERWRITE}" />
-        <property name="exo.social.portalConfig.profilePage.importmode" value="${exo.social.portalConfig.profilePage.importmode:MERGE}" />
         <property name="exo.social.portalConfig.metadata.importmode" value="${exo.social.portalConfig.metadata.importmode:OVERWRITE}" />
+        <property name="io.meeds.portalConfig.metadata.importmode" value="${io.meeds.portalConfig.metadata.importmode:OVERWRITE}" />
+        <property name="io.meeds.groups.portalConfig.metadata.importmode" value="${io.meeds.groups.portalConfig.metadata.importmode:OVERWRITE}" />
         <property name="io.meeds.useWebuiResources" value="false" />
         <property name="exo.feature.PostToNetwork.enabled" value="${exo.feature.PostToNetwork.enabled:true}" />
         <property name="exo.feature.SNVFullPageAccess.enabled" value="${exo.feature.SNVFullPageAccess.enabled:false}" />
diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml
index 0a79c4d64..46c611cf5 100644
--- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml
+++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml
@@ -89,7 +89,7 @@
               <boolean>${io.meeds.groups.portalConfig.metadata.override:true}</boolean>
             </field>
             <field name="importMode">
-              <string>${io.meeds.groups.portalConfig.metadata.importmode:overwrite}</string>
+              <string>${io.meeds.groups.portalConfig.metadata.importmode:merge}</string>
             </field>
           </object>
         </object-param>
diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml
index aeb3bf134..38589e5a3 100644
--- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml
+++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml
@@ -645,85 +645,85 @@
             </portlet-application>
           </container>
           <container
-            id="contributionsContainer"
+            id="TopChallengersContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>myContributions</portlet-ref>
+                <portlet-ref>topChallengers</portlet-ref>
               </portlet>
-              <title>My Contributions</title>
+              <title>Top Challengers</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
           <container
-            id="ReputationContainer"
+            id="ChanllengesOverviewContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>myReputation</portlet-ref>
+                <portlet-ref>challengesOverview</portlet-ref>
               </portlet>
-              <title>My Reputation</title>
+              <title>Challenges Overview</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
           <container
-            id="RewardsContainer"
+            id="ProgramsOverviewContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>myRewards</portlet-ref>
+                <portlet-ref>programsOverview</portlet-ref>
               </portlet>
-              <title>My Rewards</title>
+              <title>Programs Overview</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
           <container
-            id="TopChallengersContainer"
+            id="contributionsContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>topChallengers</portlet-ref>
+                <portlet-ref>myContributions</portlet-ref>
               </portlet>
-              <title>Top Challengers</title>
+              <title>My Contributions</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
           <container
-            id="ChanllengesOverviewContainer"
+            id="ReputationContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>challengesOverview</portlet-ref>
+                <portlet-ref>myReputation</portlet-ref>
               </portlet>
-              <title>Challenges Overview</title>
+              <title>My Reputation</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
           <container
-            id="ProgramsOverviewContainer"
+            id="RewardsContainer"
             template="system:/groovy/portal/webui/container/UIVColContainer.gtmpl"
             cssClass="col col-sm-12 col-md-6 col-lg-4">
             <portlet-application>
               <portlet>
                 <application-ref>gamification-portlets</application-ref>
-                <portlet-ref>programsOverview</portlet-ref>
+                <portlet-ref>myRewards</portlet-ref>
               </portlet>
-              <title>Programs Overview</title>
+              <title>My Rewards</title>
               <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
               <show-info-bar>false</show-info-bar>
             </portlet-application>