feat: show apps with available updates

dhis2 · Feb 22, 2021 · 4db7dfb · 4db7dfb
1 parent ec461c8
commit 4db7dfb
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 36 deletions.
diff --git a/i18n/en.pot b/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: 2021-02-22T14:32:42.096Z\n"
-"PO-Revision-Date: 2021-02-22T14:32:42.096Z\n"
+"POT-Creation-Date: 2021-02-22T16:33:52.400Z\n"
+"PO-Revision-Date: 2021-02-22T16:33:52.400Z\n"
 
 msgid "No apps found"
 msgstr ""
@@ -151,9 +151,6 @@ msgstr ""
 msgid "Custom apps"
 msgstr ""
 
-msgid "Discover more apps"
-msgstr ""
-
 msgid "Manual install"
 msgstr ""
 

diff --git a/src/components/AppList/index.js b/src/components/AppList/index.js
@@ -26,8 +26,8 @@ const AppCards = ({ apps }) => {
                 <button
                     key={app.short_name}
                     className={styles.appCard}
-                    disabled={!app.appHubId}
-                    onClick={createClickHandler(app.appHubId)}
+                    disabled={!app.appHub?.id}
+                    onClick={createClickHandler(app.appHub?.id)}
                 >
                     <AppIcon app={app} />
                     <div>

diff --git a/src/components/CoreApps/index.js b/src/components/CoreApps/index.js
@@ -1,6 +1,7 @@
 import { useDataQuery } from '@dhis2/app-runtime'
 import i18n from '@dhis2/d2-i18n'
 import React from 'react'
+import getLatestVersion from '../../get-latest-version'
 import AppList from '../AppList'
 
 const coreAppNames = [
@@ -56,18 +57,19 @@ const CoreApps = () => {
                 icons: {},
             }
         })
-        .map(app => {
-            const appHubId = data?.appHub.find(
+        .map(app => ({
+            ...app,
+            appHub: data?.appHub.find(
                 ({ name, developer }) =>
                     name === app.name && developer.organisation === 'DHIS2'
-            )?.id
-            return {
-                ...app,
-                appHubId,
-            }
-        })
-    // TODO: Also compare app.version to latest AppHub version
-    const appsWithUpdates = apps.filter(app => !app.version && app.appHubId)
+            ),
+        }))
+    const appsWithUpdates = apps.filter(
+        app =>
+            (!app.version && app.appHub?.id) ||
+            (app.appHub &&
+                app.version !== getLatestVersion(app.appHub.versions))
+    )
 
     return (
         <AppList

diff --git a/src/components/CustomAppDetails/index.js b/src/components/CustomAppDetails/index.js
@@ -11,28 +11,12 @@ import {
 } from '@dhis2/ui'
 import moment from 'moment'
 import React, { useState } from 'react'
-import semver from 'semver'
 import { useApi } from '../../api'
+import getLatestVersion from '../../get-latest-version'
 import { channelToDisplayName } from './channel-to-display-name'
 import styles from './CustomAppDetails.module.css'
 import Versions from './Versions'
 
-const getLatestVersion = versions =>
-    versions.reduce((latestVersion, version) => {
-        const parsedLatestVersion = semver.coerce(latestVersion.version)
-        const parsedVersion = semver.coerce(version.version)
-        if (parsedVersion) {
-            if (!parsedLatestVersion) {
-                return version
-            }
-            return semver.gt(parsedVersion, parsedLatestVersion)
-                ? version
-                : latestVersion
-        } else {
-            return latestVersion
-        }
-    }, versions[0])
-
 const ManageInstalledVersion = ({ installedApp, versions, reloadPage }) => {
     const { installVersion, uninstallApp } = useApi()
     const successAlert = useAlert(({ message }) => message, { success: true })

diff --git a/src/components/CustomApps/index.js b/src/components/CustomApps/index.js
@@ -1,6 +1,7 @@
 import { useDataQuery } from '@dhis2/app-runtime'
 import i18n from '@dhis2/d2-i18n'
 import React from 'react'
+import getLatestVersion from '../../get-latest-version'
 import AppList from '../AppList'
 
 const query = {
@@ -22,21 +23,26 @@ const CustomApps = () => {
         .filter(app => !app.bundled)
         .map(app => ({
             ...app,
-            appHubId: data.appHub.find(
+            appHub: data.appHub.find(
                 ({ name, developer }) =>
                     name === app.name &&
                     app.developer &&
                     (developer.organisation ===
                         (app.developer.company || app.developer.name) ||
                         developer.name === app.developer.name)
-            )?.id,
+            ),
         }))
+    const appsWithUpdates = apps?.filter(
+        app =>
+            app.appHub && getLatestVersion(app.appHub.versions) !== app.version
+    )
 
     return (
         <AppList
             error={error}
             loading={loading}
             apps={apps}
+            appsWithUpdates={appsWithUpdates}
             errorLabel={i18n.t(
                 'Something went wrong whilst loading your custom apps'
             )}

diff --git a/src/get-latest-version.js b/src/get-latest-version.js
@@ -0,0 +1,17 @@
+import semver from 'semver'
+
+export default versions =>
+    versions.reduce((latestVersion, version) => {
+        const parsedLatestVersion = semver.coerce(latestVersion.version)
+        const parsedVersion = semver.coerce(version.version)
+        if (parsedVersion) {
+            if (!parsedLatestVersion) {
+                return version
+            }
+            return semver.gt(parsedVersion, parsedLatestVersion)
+                ? version
+                : latestVersion
+        } else {
+            return latestVersion
+        }
+    }, versions[0])