Skip to content

Commit

Permalink
fix: Unable to completly reload administration portal - EXO-76369
Browse files Browse the repository at this point in the history
Before this fix, it is not possible to reload the portal pages and navigation of the administration portal.
When using merge on administration portal, only pages on exo side are reload

This commit split the configuration with a second option to separate admin part of meeds and admin part of exo.
To reload administration portal,you need to use io.meeds.administration.portalConfig.metadata.importmode=overwrite
  • Loading branch information
rdenarie committed Jan 9, 2025
1 parent e88af3b commit 4557228
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 283 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,17 @@
<string>war:/conf/digital-workplace</string>
</field>
<field name="override">
<boolean>${io.meeds.administration.portalConfig.metadata.override:true}</boolean>
</field>
<boolean>${exo.administration.portalConfig.metadata.override:true}</boolean>
</field>
<!--
we create here a different property from io.meeds.administration.portalConfig.metadata.importmode
If you need to reload exo part of administration configuration, you need to reload all the administration configuration.
Else, the PageImporter will REMOVE meeds administration pages.
So, to reload administration portal (meeds part or exo part), use
io.meeds.administration.portalConfig.metadata.importmode=overwrite
-->
<field name="importMode">
<string>${io.meeds.administration.portalConfig.metadata.importmode:insert}</string>
<string>${exo.administration.portalConfig.metadata.importmode:insert}</string>
</field>
</object>
</object-param>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
* 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/>.
*
-->
<node-navigation
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6">
<priority>3</priority>

<page-nodes>
<node>
<name>home</name>
<label>#{portal.administration.home}</label>
<icon>fas fa-cog</icon>
<node>
<name>organisation</name>
<label>#{portal.administration.organisation}</label>
<icon>fas fa-building</icon>
<node>
<name>roles</name>
<label>#{portal.administration.roles}</label>
<icon>fas fa-diagnoses</icon>
<page-reference>portal::administration::membershipsManagement</page-reference>
</node>
</node>
<node>
<name>applications</name>
<label>#{portal.administration.applications}</label>
<icon>fas fa-boxes</icon>
<node>
<name>agendaAdminSettings</name>
<label>#{portal.administration.agenda}</label>
<icon>fas fa-calendar-plus</icon>
<page-reference>portal::administration::agendaAdminSettings</page-reference>
</node>
<node>
<name>visio</name>
<label>#{portal.administration.visio}</label>
<icon>fas fa-video</icon>
<page-reference>portal::administration::webconferencing</page-reference>
</node>
<node>
<name>translation</name>
<label>#{portal.administration.translation}</label>
<icon>fas fa-language</icon>
<page-reference>portal::administration::automatic-translation</page-reference>
</node>
<node>
<name>documents-settings</name>
<label>#{portal.administration.documents-settings}</label>
<icon>fas fa-folder-open</icon>
<node>
<name>cloud-storage</name>
<label>#{portal.administration.cloud-storage}</label>
<icon>fas fa-cloud-download-alt</icon>
<page-reference>portal::administration::cloudStorage</page-reference>
</node>
<node>
<name>documents-editors</name>
<label>#{portal.administration.documents-editors}</label>
<icon>fas fa-edit</icon>
<page-reference>portal::administration::editors</page-reference>
</node>
<node>
<name>documents-trash-administration</name>
<label>#{portal.administration.documents-trash}</label>
<icon>fa fa-trash</icon>
<page-reference>portal::administration::documentsTrashAdministration</page-reference>
</node>
</node>
</node>
<node>
<name>security</name>
<label>#{portal.administration.security}</label>
<icon>fas fa-shield-alt</icon>
<node>
<name>quarantine</name>
<label>#{portal.administration.quarantine}</label>
<icon>fas fa-dungeon</icon>
<page-reference>portal::administration::dlp-quarantine</page-reference>
</node>
<node>
<name>transfert-rules</name>
<label>#{portal.administration.transfert-rules}</label>
<icon>fas fa-exchange-alt</icon>
<page-reference>portal::administration::transferRules</page-reference>
</node>
<node>
<name>multifactor-authentication</name>
<label>#{portal.administration.multifactor-authentication}</label>
<icon>fab fa-keycdn</icon>
<page-reference>portal::administration::multifactor-authentication</page-reference>
</node>
</node>
</node>
</page-nodes>
</node-navigation>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->
<page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_8 http://www.exoplatform.org/xml/ns/gatein_objects_1_8"
xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_8">
xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_8">
<page>
<name>membershipsManagement</name>
<title>Memberships Management</title>
Expand Down
Loading

0 comments on commit 4557228

Please sign in to comment.