From 42be3416b1718a3fd6792bab0c4e204e30e3eb6a Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Sat, 28 Oct 2023 08:44:59 +0100 Subject: [PATCH] feat: Move sites definition into common extension - MEED-2811 - Meeds-io/MIPs#100 This change will move sites pages definition into sites.war extension to centralize the configuration of sites which will improve the maintainability and evolutivity. --- .../webapp/WEB-INF/conf/configuration.xml | 2 - .../wallet/analytics/portal-configuration.xml | 64 ------ .../analytics/portal/global/navigation.xml | 38 ---- .../wallet/analytics/portal/global/pages.xml | 185 ------------------ .../conf/wallet/portal-configuration.xml | 81 -------- .../group/platform/rewarding/navigation.xml | 40 ---- .../portal/group/platform/rewarding/pages.xml | 59 ------ .../portal/portal/global/navigation.xml | 34 ---- .../wallet/portal/portal/global/pages.xml | 46 ----- 9 files changed, 549 deletions(-) delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal-configuration.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/navigation.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/pages.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/navigation.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/pages.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/navigation.xml delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/pages.xml diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml index 92f0c5778..f755d8fb0 100644 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml @@ -24,8 +24,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. war:/conf/wallet/cache-configuration.xml war:/conf/wallet/bundle-configuration.xml war:/conf/wallet/organization-configuration.xml - war:/conf/wallet/portal-configuration.xml - war:/conf/wallet/analytics/portal-configuration.xml war:/conf/wallet/dynamic-container-configuration.xml war:/conf/wallet/application-registry-configuration.xml war:/conf/wallet/user-page-configuration.xml diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal-configuration.xml deleted file mode 100644 index b791799ae..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal-configuration.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - org.exoplatform.portal.config.UserPortalConfigService - - new.portal.config.user.listener - initListener - org.exoplatform.portal.config.NewPortalConfigListener - This listener creates Wallet Analytics Page - - - override - true - - - portal.configuration - description - - - portal - - - ${io.meeds.wallet.analytics.portalConfig.metadata.override:true} - - - ${io.meeds.wallet.analytics.portalConfig.metadata.importmode:insert} - - - - - global - - - - - war:/conf/wallet/analytics/ - - - - - - - - \ No newline at end of file diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/navigation.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/navigation.xml deleted file mode 100644 index e1477286b..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/navigation.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 3 - - - - analytics - - SYSTEM - portal::global::analytics - - analyticsWallet - - DISPLAYED - portal::global::analytics-wallet - - - - diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/pages.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/pages.xml deleted file mode 100644 index 1443b7f57..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/analytics/portal/global/pages.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - analytics-wallet - Analytics Wallet - *:/platform/analytics;*:/platform/administrators - manager:/platform/analytics - - Everyone - - Everyone - - - analytics - AnalyticsDashboardBreadcrumb - - Breadcrumb Analytics - Everyone - false - - - - Everyone - - - analytics - AnalyticsPortlet - - - settings - - { - "filters": [ - { - "field": "module", - "type": "EQUAL", - "valueString": "wallet" - }, - { - "field": "subModule", - "type": "EQUAL", - "valueString": "blockchain" - } - ], - "aggregations": [ - { - "field": "timestamp", - "type": "DATE", - "interval": "day", - "useBounds": false, - "sortDirection": "asc" - }, - { - "field": "timestamp", - "type": "COUNT", - "useBounds": false, - "sortDirection": "desc" - } - ], - "yAxisAggregation": { - "field": "timestamp", - "type": "COUNT", - "useBounds": false, - "sortDirection": "desc" - }, - "xAxisAggregations": [ - { - "field": "timestamp", - "type": "DATE", - "interval": "day", - "useBounds": false, - "sortDirection": "asc" - } - ], - "multipleCharts": false, - "chartType": "bar", - "title": "Blockchain Calls" - } - - - - - Blockchain Calls - Everyone - false - - - - analytics - AnalyticsPortlet - - - settings - - { - "filters": [ - { - "field": "module", - "type": "EQUAL", - "valueString": "wallet" - }, - { - "field": "subModule", - "type": "EQUAL", - "valueString": "blockchain" - } - ], - "aggregations": [ - { - "field": "operation", - "type": "TERMS", - "useBounds": false, - "sortDirection": "desc" - }, - { - "field": "operation", - "type": "COUNT", - "useBounds": false, - "sortDirection": "desc" - } - ], - "yAxisAggregation": { - "field": "operation", - "type": "COUNT", - "useBounds": false, - "sortDirection": "desc" - }, - "xAxisAggregations": [ - { - "field": "operation", - "type": "TERMS", - "useBounds": false, - "sortDirection": "desc" - } - ], - "multipleCharts": false, - "chartType": "pie", - "colors": [ - "#F97575", - "#9EE4F5", - "#98cc81", - "#4273c8", - "#cea6ac", - "#bc99e7", - "#9ee4f5", - "#774ea9", - "#ffa500", - "#bed67e", - "#0E100F", - "#ffaacc" - ], - "title": "Blockchain Calls By Operation" - } - - - - - Blockchain Calls By Operation - Everyone - false - - - - - diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml deleted file mode 100644 index 64765a98b..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - org.exoplatform.portal.config.UserPortalConfigService - - new.portal.config.user.listener - initListener - org.exoplatform.portal.config.NewPortalConfigListener - This listener creates Wallet Administration Page - - - portal.configuration - description - - - portal - - - - - global - - - - - war:/conf/wallet/portal - - - ${exo.wallet.portalConfig.metadata.override:true} - - - ${exo.wallet.portalConfig.metadata.importmode:merge} - - - - - group.configuration - description - - - group - - - ${exo.wallet.portalConfig.metadata.override:true} - - - ${exo.wallet.portalConfig.metadata.importmode:merge} - - - - - /platform/rewarding - - - - - war:/conf/wallet/portal - - - - - - - \ No newline at end of file diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/navigation.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/navigation.xml deleted file mode 100644 index 533bbd196..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/navigation.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 3 - - - rewardAdministration - - - walletAdministration - - group::/platform/rewarding::walletAdministration - - - rewardAdministration - - group::/platform/rewarding::rewardAdministration - - - - diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/pages.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/pages.xml deleted file mode 100644 index 902ea5700..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/group/platform/rewarding/pages.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - walletAdministration - Wallet adminsitration - *:/platform/rewarding - manager:/platform/rewarding - - *:/platform/users - - - wallet - WalletAdmin - - Wallet adminsitration - *:/platform/rewarding - false - - - - - rewardAdministration - Reward administration - *:/platform/rewarding - manager:/platform/rewarding - - *:/platform/users - - - wallet - RewardAdmin - - Reward administration - *:/platform/rewarding - false - - - - diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/navigation.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/navigation.xml deleted file mode 100644 index 3d5220f94..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/navigation.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - 3 - - - - wallet - - SYSTEM - portal::global::wallet - - - diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/pages.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/pages.xml deleted file mode 100644 index 636cb1043..000000000 --- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal/portal/global/pages.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - wallet - Wallet - *:/platform/users;*:/platform/externals - *:/platform/administrators - - - top-wallet-container - *:/platform/users;*:/platform/externals - addonContainer - - - wallet-container - *:/platform/users;*:/platform/externals - addonContainer - - - bottom-wallet-container - *:/platform/users;*:/platform/externals - addonContainer - - - -