feat: use app_hub_id field

dhis2 · Feb 24, 2021 · 43d6ddf · 43d6ddf
1 parent 17f508e
commit 43d6ddf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/components/CoreApps/index.js b/src/components/CoreApps/index.js
@@ -60,16 +60,16 @@ const CoreApps = () => {
         })
         .map(app => ({
             ...app,
-            appHub: data?.appHub.find(
-                ({ name, developer }) =>
-                    name === app.name && developer.organisation === 'DHIS2'
-            ),
+            appHub: data?.appHub.find(({ id, name, developer }) => {
+                if (app.app_hub_id) {
+                    return id === app.app_hub_id
+                }
+                return name === app.name && developer.organisation === 'DHIS2'
+            }),
         }))
     const appsWithUpdates = apps.filter(
         app =>
-            (!app.version && app.appHub?.id) ||
-            (app.appHub &&
-                app.version !== getLatestVersion(app.appHub.versions))
+            app.appHub && app.version !== getLatestVersion(app.appHub.versions)
     )
 
     return (

diff --git a/src/components/CustomApps/index.js b/src/components/CustomApps/index.js
@@ -23,14 +23,18 @@ const CustomApps = () => {
         .filter(app => !app.bundled)
         .map(app => ({
             ...app,
-            appHub: data.appHub.find(
-                ({ name, developer }) =>
+            appHub: data.appHub.find(({ id, name, developer }) => {
+                if (app.app_hub_id) {
+                    return id === app.app_hub_id
+                }
+                return (
                     name === app.name &&
                     app.developer &&
                     (developer.organisation ===
                         (app.developer.company || app.developer.name) ||
                         developer.name === app.developer.name)
-            ),
+                )
+            }),
         }))
     const appsWithUpdates = apps?.filter(
         app =>