fix: show 'update to latest version' button for bundled apps

dhis2 · Feb 22, 2021 · 1692911 · 1692911
1 parent ac42639
commit 1692911
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/CoreApps/index.js b/src/components/CoreApps/index.js
@@ -66,6 +66,7 @@ const CoreApps = () => {
                 appHubId,
             }
         })
+    // TODO: Also compare app.version to latest AppHub version
     const appsWithUpdates = apps.filter(app => !app.version && app.appHubId)
 
     return (

diff --git a/src/components/CustomAppDetails/index.js b/src/components/CustomAppDetails/index.js
@@ -75,6 +75,9 @@ const ManageInstalledVersion = ({ installedApp, versions, reloadPage }) => {
         maxDhisVersion: max,
     }) => {
         if (min && max) {
+            if (min === max) {
+                return `${min}`
+            }
             return `${min}–${max}`
         } else if (min && !max) {
             return i18n.t('{{minDhisVersion}} and above', {
@@ -224,14 +227,17 @@ const CustomAppDetails = ({ match }) => {
 
     const { app, installedApps } = data
     const screenshots = app.images.filter(i => !i.logo).map(i => i.imageUrl)
-    const installedApp = installedApps.find(
+    let installedApp = installedApps.find(
         a =>
             a.name === app.name &&
             a.developer &&
             (app.developer.organisation ===
                 (a.developer.company || a.developer.name) ||
                 app.developer.name === a.developer.name)
     )
+    if (!installedApp && app.developer.organisation === 'DHIS2') {
+        installedApp = { version: null }
+    }
 
     return (
         <Card className={styles.appCard}>