Merge branch 'develop' into feat/caldav-intergration

.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 }}

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>

agenda-connectors-webapp/src/main/webapp/WEB-INF/gatein-resources.xml

@@ -1,33 +1,26 @@
 <?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>
-    <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>
+  <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>
+</gatein-resources>

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);
+
+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);