From 51b4a8a5fc87e3a578629915c950e9c4cacde9d2 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <bkhanfir@exoplatform.com>
Date: Thu, 6 Feb 2025 15:53:49 +0100
Subject: [PATCH] feat: Configure Builtin Sites to be displayed in Sidebar By
 default - MEED-8323 - Meeds-io/MIPs#175 (#159) (#160)

This change will add an explicit definition of 'displayed' attribute in Default portal definitions in prder to import it in Sidebar by default. The default value of this flag has been changed to false in order to avoid errors while mapping DTO from database or when using the API to create a new Site.

In addition, this change will prepare the default sites layout to use the new Site Layout Definition.
---
 .../digital-workplace/portal/dw/portal.xml    |  3 +-
 .../portal/intranet/portal.xml                | 43 +----------
 .../conf/sites/portal/contribute/portal.xml   | 77 -------------------
 .../conf/sites/portal/mycraft/portal.xml      | 77 -------------------
 4 files changed, 4 insertions(+), 196 deletions(-)
 delete mode 100644 digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/contribute/portal.xml
 delete mode 100644 digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/portal.xml

diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/portal.xml
index 9538363a..bf581110 100644
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/portal.xml
+++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/portal.xml
@@ -4,6 +4,7 @@
         xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_10 http://www.gatein.org/xml/ns/gatein_objects_1_10"
         xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_10">
   <portal-name>dw</portal-name>
+  <displayed>true</displayed>
   <display-order>40</display-order>
   <locale>en</locale>
   <access-permissions>member:/platform/users;member:/platform/externals</access-permissions>
@@ -13,6 +14,6 @@
     <entry key="icon">fa-dot-circle</entry>
   </properties>
   <portal-layout>
-    <page-body> </page-body>
+    <page-body />
   </portal-layout>
 </portal-config>
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml
index 0bac5c12..2956aeb3 100644
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml
+++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml
@@ -23,6 +23,7 @@
   <portal-name>intranet</portal-name>
   <label>Intranet</label>
   <description>Develop your communication with a modern intranet</description>
+  <displayed>true</displayed>
   <display-order>1</display-order>
   <locale>en</locale>
   <access-permissions>member:/platform/users</access-permissions>
@@ -32,46 +33,6 @@
     <entry key="icon">fa-home</entry>
   </properties>
   <portal-layout>
-    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
-      <access-permissions>*:/platform/users</access-permissions>
-      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <access-permissions>Everyone</access-permissions>
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarLogo</portlet-ref>
-          </portlet>
-          <title>Company Logo</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-        <portlet-application>
-          <portlet>
-            <application-ref>layout-management</application-ref>
-            <portlet-ref>SiteNavigation</portlet-ref>
-          </portlet>
-          <title>site navigation</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-      </portlet-application>
-      </container>
-      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarMenu</portlet-ref>
-          </portlet>
-          <title>Top Bar Menu </title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-      </container>
-    </container>
-    <page-body> </page-body>
+    <page-body />
   </portal-layout>
 </portal-config>
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/contribute/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/contribute/portal.xml
deleted file mode 100644
index a32ebf0b..00000000
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/contribute/portal.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2023 eXo Platform SAS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
--->
-<portal-config
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_11 http://www.exoplatform.org/xml/ns/gatein_objects_1_11"
-  xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_11">
-  <portal-name>contribute</portal-name>
-  <label>#{portal.contribute.name}</label>
-  <description>#{portal.contribute.description}</description>
-  <display-order>10</display-order>
-  <locale>en</locale>
-  <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
-  <edit-permission>*:/platform/administrators</edit-permission>
-  <properties>
-    <entry key="removable">false</entry>
-    <entry key="icon">fa-rocket</entry>
-  </properties>
-  <portal-layout>
-    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
-      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
-      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <access-permissions>Everyone</access-permissions>
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarLogo</portlet-ref>
-          </portlet>
-          <title>Company Logo</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-        <portlet-application>
-          <portlet>
-            <application-ref>layout-management</application-ref>
-            <portlet-ref>SiteNavigation</portlet-ref>
-          </portlet>
-          <title>site navigation</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarMenu</portlet-ref>
-          </portlet>
-          <title>Top Bar Menu </title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-      </container>
-    </container>
-    <page-body />
-  </portal-layout>
-</portal-config>
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/portal.xml
deleted file mode 100644
index 5bf875fc..00000000
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/portal.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2023 eXo Platform SAS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
--->
-<portal-config
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_11 http://www.exoplatform.org/xml/ns/gatein_objects_1_11"
-  xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_11">
-  <portal-name>mycraft</portal-name>
-  <label>#{portal.mycraft.name}</label>
-  <description>#{portal.mycraft.description}</description>
-  <display-order>20</display-order>
-  <locale>en</locale>
-  <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
-  <edit-permission>manager:/platform/administrators</edit-permission>
-  <properties>
-    <entry key="removable">false</entry>
-    <entry key="icon">fa-briefcase</entry>
-  </properties>
-  <portal-layout>
-    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
-      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
-      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <access-permissions>Everyone</access-permissions>
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarLogo</portlet-ref>
-          </portlet>
-          <title>Company Logo</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-        <portlet-application>
-          <portlet>
-            <application-ref>layout-management</application-ref>
-            <portlet-ref>SiteNavigation</portlet-ref>
-          </portlet>
-          <title>site navigation</title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarMenu</portlet-ref>
-          </portlet>
-          <title>Top Bar Menu </title>
-          <access-permissions>Everyone</access-permissions>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-      </container>
-    </container>
-    <page-body />
-  </portal-layout>
-</portal-config>