From 98cce0bd7d060da0a2834fc458108fbcd74a1a4f Mon Sep 17 00:00:00 2001
From: Houssem Ben Ali <hbenali.tn@gmail.com>
Date: Mon, 6 Nov 2023 14:43:18 +0100
Subject: [PATCH 1/3] SWF: Add PR CI Github workflow

---
 .github/workflows/buildci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/workflows/buildci.yml

diff --git a/.github/workflows/buildci.yml b/.github/workflows/buildci.yml
new file mode 100644
index 00000000..1c31433d
--- /dev/null
+++ b/.github/workflows/buildci.yml
@@ -0,0 +1,12 @@
+name: CI PR Build
+on:
+  pull_request:
+jobs:
+  build-ci:
+    name: CI Build
+    uses: exoplatform/swf-scripts/.github/workflows/cibuild.yml@master
+    with:
+      maven_profiles: 'exo-release,coverage'
+    secrets:
+      NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+      NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
\ No newline at end of file

From 2f53d99d71ad8d6c8120b964a90b0da7bbff2a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?=
 <romain.denarie@exoplatform.com>
Date: Mon, 6 Nov 2023 15:17:16 +0100
Subject: [PATCH 2/3] fix: Move agenda connectors extension in a group js -
 EXO-67332

Before this fix, agenda connectors are loaded with a dynamic container, present in all pages.
As this container is not in the new administration site, the connectors are not loaded
This commit creates a load-group for all aganda connectors. Addons defining new agenda connectors will have to put their js in this group
---
 .../dynamic-container-configuration.xml       | 68 -------------------
 .../webapp/WEB-INF/conf/configuration.xml     |  3 -
 .../main/webapp/WEB-INF/gatein-resources.xml  | 54 +++++++--------
 .../src/main/webapp/WEB-INF/portlet.xml       | 21 ------
 .../main/webapp/html/agendaConnectors.html    |  7 --
 .../webapp/vue-app/agenda-connectors/main.js  | 22 +++---
 6 files changed, 37 insertions(+), 138 deletions(-)
 delete mode 100644 agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/agenda-connectors/dynamic-container-configuration.xml
 delete mode 100644 agenda-connectors-webapp/src/main/webapp/WEB-INF/portlet.xml
 delete mode 100644 agenda-connectors-webapp/src/main/webapp/html/agendaConnectors.html

diff --git a/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/agenda-connectors/dynamic-container-configuration.xml b/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/agenda-connectors/dynamic-container-configuration.xml
deleted file mode 100644
index 31a2104e..00000000
--- a/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/agenda-connectors/dynamic-container-configuration.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2022 eXo Platform SAS.
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    This software 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
-    Lesser General Public License for more details.
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
-  <external-component-plugins>
-    <target-component>org.exoplatform.commons.addons.AddOnService</target-component>
-    <component-plugin>
-      <name>addPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.commons.addons.AddOnPluginImpl</type>
-      <description></description>
-      <init-params>
-        <value-param>
-          <name>priority</name>
-          <value>5</value>
-        </value-param>
-        <value-param>
-          <name>containerName</name>
-          <value>bottom-all-container</value>
-        </value-param>
-        <object-param>
-          <name>agenda-connectors-portlet</name>
-          <description></description>
-          <object type="org.exoplatform.commons.addons.PortletModel">
-            <field name="contentId">
-              <string>agenda-connectors/AgendaConnectors</string>
-            </field>
-            <field name="permissions">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <string>*:/platform/users</string>
-                </value>
-                <value>
-                  <string>*:/platform/externals</string>
-                </value>
-              </collection>
-            </field>
-            <field name="title">
-              <string>>Agenda Connectors Portlet</string>
-            </field>
-            <field name="showInfoBar">
-              <boolean>false</boolean>
-            </field>
-            <field name="showApplicationState">
-              <boolean>false</boolean>
-            </field>
-            <field name="showApplicationMode">
-              <boolean>false</boolean>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>
\ No newline at end of file
diff --git a/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
index 68aa3d9c..97651086 100644
--- a/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/agenda-connectors-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd"
   xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
-
   <import>war:/conf/agenda-connectors/agenda-connectors.xml</import>
-  <import>war:/conf/agenda-connectors/dynamic-container-configuration.xml</import>
-
 </configuration>
diff --git a/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
index 81ba3f77..bedfc64e 100644
--- a/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_4 http://www.exoplatform.org/xml/ns/gatein_resources_1_4" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_4">
-  <portlet-skin>
-    <application-name>Agenda Connectors</application-name>
-    <portlet-name>AgendaConnectors</portlet-name>
+  <portal-skin>
     <skin-name>Enterprise</skin-name>
     <css-path>/skin/css/agenda-connectors.css</css-path>
-  </portlet-skin>
-  <portlet>
-    <name>AgendaConnectors</name>
-    <module>
-       <script>
-         <path>/js/agendaConnectors.bundle.js</path>
-        </script>
-        <depends>
-          <module>extensionRegistry</module>
-        </depends>
-        <depends>
-          <module>eXoVueI18n</module>
-        </depends>
-        <depends>
-          <module>vue</module>
-        </depends>
-        <depends>
-          <module>vuetify</module>
-        </depends>
-        <depends>
-          <module>commonVueComponents</module>
-        </depends>
-    </module>
-  </portlet>
+    <css-priority>10</css-priority>
+  </portal-skin>
+  <module>
+    <name>AgendaConnectorsExtensions</name>
+    <load-group>AgendaConnectorsGRP</load-group>
+     <script>
+       <path>/js/agendaConnectors.bundle.js</path>
+     </script>
+     <depends>
+      <module>extensionRegistry</module>
+     </depends>
+     <depends>
+      <module>eXoVueI18n</module>
+     </depends>
+     <depends>
+      <module>vue</module>
+     </depends>
+     <depends>
+      <module>vuetify</module>
+     </depends>
+     <depends>
+      <module>commonVueComponents</module>
+     </depends>
+  </module>
 
-</gatein-resources>
\ No newline at end of file
+</gatein-resources>
diff --git a/agenda-connectors-webapp/src/main/webapp/WEB-INF/portlet.xml b/agenda-connectors-webapp/src/main/webapp/WEB-INF/portlet.xml
deleted file mode 100644
index ac9d9801..00000000
--- a/agenda-connectors-webapp/src/main/webapp/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
-  <portlet>
-    <portlet-name>AgendaConnectors</portlet-name>
-    <display-name>Agenda Connectors Portlet</display-name>
-    <portlet-class>org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet</portlet-class>
-    <init-param>
-      <name>portlet-view-dispatched-file-path</name>
-      <value>/html/agendaConnectors.html</value>
-    </init-param>
-    <expiration-cache>-1</expiration-cache>
-    <cache-scope>PUBLIC</cache-scope>
-    <supports>
-      <mime-type>text/html</mime-type>
-    </supports>
-    <portlet-info>
-      <title>Agenda Connectors</title>
-      <keywords>Agenda Connectors</keywords>
-    </portlet-info>
-  </portlet>
-</portlet-app>
\ No newline at end of file
diff --git a/agenda-connectors-webapp/src/main/webapp/html/agendaConnectors.html b/agenda-connectors-webapp/src/main/webapp/html/agendaConnectors.html
deleted file mode 100644
index 3d3912f2..00000000
--- a/agenda-connectors-webapp/src/main/webapp/html/agendaConnectors.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="VuetifyApp">
-  <div id="AgendaConnectorsApplication">
-    <script type="text/javascript">
-      require(['PORTLET/agenda-connectors/AgendaConnectors'], app => app.init());
-    </script>
-  </div>
-</div>
\ No newline at end of file
diff --git a/agenda-connectors-webapp/src/main/webapp/vue-app/agenda-connectors/main.js b/agenda-connectors-webapp/src/main/webapp/vue-app/agenda-connectors/main.js
index d2e10247..da7ae8f1 100644
--- a/agenda-connectors-webapp/src/main/webapp/vue-app/agenda-connectors/main.js
+++ b/agenda-connectors-webapp/src/main/webapp/vue-app/agenda-connectors/main.js
@@ -41,16 +41,6 @@ const vuetify = new Vuetify(eXo.env.portal.vuetifyPreset);
 
 const appId = 'AgendaConnectorsApplication';
 
-export function init() {
-  exoi18n.loadLanguageAsync(lang, url).then(i18n => {
-    // init Vue app when locale resources are ready
-    Vue.createApp({
-      template: `<agenda-connectors id="${appId}" />`,
-      vuetify,
-      i18n
-    }, `#${appId}`, 'Agenda Connectors Settings');
-  });
-}
 // get overridden components if exists
 if (extensionRegistry) {
   const components = extensionRegistry.loadComponents('AgendaConnectors');
@@ -60,4 +50,14 @@ if (extensionRegistry) {
     });
   }
 }
-Vue.use(Vuetify);
\ No newline at end of file
+
+exoi18n.loadLanguageAsync(lang, url).then(i18n => {
+  // init Vue app when locale resources are ready
+  Vue.createApp({
+    template: `<agenda-connectors id="${appId}" />`,
+    vuetify,
+    i18n
+  }, `#${appId}`, 'Agenda Connectors Settings');
+});
+
+Vue.use(Vuetify);

From 4b4e2999594ccb0ada34697051106f41d23b613d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?=
 <romain.denarie@exoplatform.com>
Date: Wed, 8 Nov 2023 11:50:00 +0100
Subject: [PATCH 3/3] fix: Access to edit page layout is not working.

Before this fix, a lot of page were not working due to missing css Core-min.js in eXo Skin
In fact, this css was not load because as we didnt add skin-module in gatein-resources for the agenda-connector css, it automatically take 'Core', and erase the eXkin one.
This commit completly remove the css definition as the less file is empty.
---
 .../src/main/webapp/WEB-INF/gatein-resources.xml             | 5 -----
 .../src/main/webapp/skin/less/agenda-connectors.less         | 2 --
 2 files changed, 7 deletions(-)
 delete mode 100644 agenda-connectors-webapp/src/main/webapp/skin/less/agenda-connectors.less

diff --git a/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
index bedfc64e..56137681 100644
--- a/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_4 http://www.exoplatform.org/xml/ns/gatein_resources_1_4" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_4">
-  <portal-skin>
-    <skin-name>Enterprise</skin-name>
-    <css-path>/skin/css/agenda-connectors.css</css-path>
-    <css-priority>10</css-priority>
-  </portal-skin>
   <module>
     <name>AgendaConnectorsExtensions</name>
     <load-group>AgendaConnectorsGRP</load-group>
diff --git a/agenda-connectors-webapp/src/main/webapp/skin/less/agenda-connectors.less b/agenda-connectors-webapp/src/main/webapp/skin/less/agenda-connectors.less
deleted file mode 100644
index da846af8..00000000
--- a/agenda-connectors-webapp/src/main/webapp/skin/less/agenda-connectors.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "variables.less";
-@import "mixins.less";
\ No newline at end of file