feat: support 3rd party dashboard plugins (DHIS2-17283)

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-03-19T12:31:03.302Z\n"
-"PO-Revision-Date: 2024-03-19T12:31:03.302Z\n"
+"POT-Creation-Date: 2024-09-05T09:50:00.214Z\n"
+"PO-Revision-Date: 2024-09-05T09:50:00.215Z\n"
 
 msgid "Untitled dashboard"
 msgstr "Untitled dashboard"
@@ -26,12 +26,33 @@ msgstr "Show fewer dashboards"
 msgid "Show more dashboards"
 msgstr "Show more dashboards"
 
+msgid "There was a problem loading this dashboard item"
+msgstr "There was a problem loading this dashboard item"
+
+msgid "Open in {{appName}}"
+msgstr "Open in {{appName}}"
+
+msgid "View fullscreen"
+msgstr "View fullscreen"
+
 msgid "Remove this item"
 msgstr "Remove this item"
 
 msgid "This item has been shortened to fit on one page"
 msgstr "This item has been shortened to fit on one page"
 
+msgid "The plugin for rendering this item is not available"
+msgstr "The plugin for rendering this item is not available"
+
+msgid "Install the {{pluginName}} plugin from the App Hub"
+msgstr "Install the {{pluginName}} plugin from the App Hub"
+
+msgid "There was an error loading data for this item"
+msgstr "There was an error loading data for this item"
+
+msgid "Open this item in {{appName}}"
+msgstr "Open this item in {{appName}}"
+
 msgid "Remove"
 msgstr "Remove"
 
@@ -77,9 +98,6 @@ msgstr "Only Period and Organisation unit filters can be applied to this item"
 msgid "Some filters not applied"
 msgstr "Some filters not applied"
 
-msgid "There was a problem loading this dashboard item"
-msgstr "There was a problem loading this dashboard item"
-
 msgid "Hide details and interpretations"
 msgstr "Hide details and interpretations"
 
@@ -89,9 +107,6 @@ msgstr "Show details and interpretations"
 msgid "Open in {{appName}} app"
 msgstr "Open in {{appName}} app"
 
-msgid "View fullscreen"
-msgstr "View fullscreen"
-
 msgid "This map can't be displayed as a chart"
 msgstr "This map can't be displayed as a chart"
 
@@ -116,39 +131,45 @@ msgstr "View as Map"
 msgid "There was a problem loading interpretations for this item"
 msgstr "There was a problem loading interpretations for this item"
 
-msgid "The plugin for rendering this item is not available"
-msgstr "The plugin for rendering this item is not available"
-
-msgid "Install the {{appName}} app from the App Hub"
-msgstr "Install the {{appName}} app from the App Hub"
-
 msgid "No data to display"
 msgstr "No data to display"
 
 msgid ""
-"Install Line Listing app version ${minLLVersion.join(\n"
-"                                '.'\n"
-"                            )} or higher in order to display this item."
+"Install Data Visualizer app ${minDVVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
 msgstr ""
-"Install Line Listing app version ${minLLVersion.join(\n"
-"                                '.'\n"
-"                            )} or higher in order to display this item."
+"Install Data Visualizer app ${minDVVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
 
 msgid "Show without filters"
 msgstr "Show without filters"
 
+msgid ""
+"Install Line Listing app ${minLLVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
+msgstr ""
+"Install Line Listing app ${minLLVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
+
 msgid "Maps with Earth Engine layers cannot be displayed when offline"
 msgstr "Maps with Earth Engine layers cannot be displayed when offline"
 
+msgid ""
+"Install Maps app ${minMapsVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
+msgstr ""
+"Install Maps app ${minMapsVersion.join(\n"
+"                            '.'\n"
+"                        )} or higher in order to display this item."
+
 msgid "Unable to load the plugin for this item"
 msgstr "Unable to load the plugin for this item"
 
-msgid "There was an error loading data for this item"
-msgstr "There was an error loading data for this item"
-
-msgid "Open this item in {{appName}}"
-msgstr "Open this item in {{appName}}"
-
 msgid "Not available offline"
 msgstr "Not available offline"
 

package.json

@@ -6,15 +6,11 @@
     "license": "BSD-3-Clause",
     "dependencies": {
         "@dhis2/analytics": "^26.8.2",
-        "@dhis2/app-runtime": "^3.10.2",
+        "@dhis2/app-runtime": "^3.10.6",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
-        "@dhis2/d2-i18n": "^1.1.3",
-        "@dhis2/ui": "^9.2.0",
-        "@krakenjs/post-robot": "^11.0.0",
         "classnames": "^2.3.2",
         "d2": "^31.10.0",
         "d2-utilizr": "^0.2.16",
-        "i18next": "^20.3.5",
         "lodash": "^4.17.21",
         "moment": "^2.30.1",
         "react": "^16.14.0",
@@ -46,8 +42,8 @@
         "@badeball/cypress-cucumber-preprocessor": "^20.1.0",
         "@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
         "@cypress/webpack-preprocessor": "^6.0.2",
-        "@dhis2/cli-app-scripts": "^10.3.10",
-        "@dhis2/cli-style": "^10.5.1",
+        "@dhis2/cli-app-scripts": "^11.7.1",
+        "@dhis2/cli-style": "^10.7.3",
         "@dhis2/cypress-commands": "^10.0.6",
         "@dhis2/cypress-plugins": "^10.0.6",
         "@semantic-release/changelog": "^6",
@@ -70,8 +66,5 @@
         "moduleNameMapper": {
             "^.+\\.(css|sass|scss)$": "identity-obj-proxy"
         }
-    },
-    "resolutions": {
-        "@dhis2/ui": "^9.2.0"
     }
 }

src/AppWrapper.js

@@ -43,10 +43,16 @@ const query = {
 }
 
 const providerDataTransformation = ({ rootOrgUnits, apps, currentUser }) => {
+    const dataVisualizerApp =
+        apps.find((app) => app.key === 'data-visualizer') || {}
     const lineListingApp = apps.find((app) => app.key === 'line-listing') || {}
+    const mapsApp = apps.find((app) => app.key === 'maps') || {}
+
     return {
-        rootOrgUnits: rootOrgUnits.organisationUnits,
+        dataVisualizerAppVersion: dataVisualizerApp.version || '0.0.0',
         lineListingAppVersion: lineListingApp.version || '0.0.0',
+        mapsAppVersion: mapsApp.version || '0.0.0',
+        rootOrgUnits: rootOrgUnits.organisationUnits,
         currentUser,
         apps,
     }

src/components/DropdownButton/DropdownButton.js

@@ -25,7 +25,7 @@ const DropdownButton = ({
                 </Button>
             </OfflineTooltip>
             {open && (
-                <Layer onClick={onClick} transparent>
+                <Layer onBackdropClick={onClick} transparent>
                     <Popper placement="bottom-start" reference={anchorRef}>
                         {component}
                     </Popper>