fix(DHIS2-19851): ensure that stable versions - not development - are shown as latest version

kabaros · kabaros · commit d0081a92619f · 2025-07-25T12:58:45.000+01:00
diff --git a/client/src/pages/AppView/AppView.js b/client/src/pages/AppView/AppView.js
@@ -211,7 +211,8 @@ const AppView = ({ match }) => {
     const logoSrc = app.images.find((img) => img.logo)?.imageUrl
     const screenshots = app.images.filter((img) => !img.logo)
     const versions = app.versions.sort((a, b) => b.created - a.created)
-    const latestVersion = versions[0]
+    const stableVersions = versions.filter((v) => v.channel === 'stable')
+    const latestVersion = stableVersions?.[0] ?? versions[0]
 
     const selectTab = (tabName) => () => {
         history.push('?tab=' + tabName)
@@ -263,7 +264,10 @@ const AppView = ({ match }) => {
                             latestVersion={latestVersion}
                             sourceUrl={app.sourceUrl}
                         />
-                        <LatestUpdates changelog={changelog?.data} />
+                        <LatestUpdates
+                            versions={versions}
+                            changelog={changelog?.data}
+                        />
                     </>
                 )}
 
diff --git a/client/src/pages/AppView/LatestUpdates.js b/client/src/pages/AppView/LatestUpdates.js
@@ -1,19 +1,32 @@
+import PropTypes from 'prop-types'
 import ReactMarkdown from 'react-markdown'
 import { useHistory } from 'react-router-dom'
 import styles from './LatestUpdates.module.css'
 
-export const LatestUpdates = ({ changelog }) => {
+export const LatestUpdates = ({ versions, changelog }) => {
     const history = useHistory()
     if (!changelog) {
         return null
     }
+
+    const versionsToShow = changelog.filter(
+        ({ version }) =>
+            !!versions.find(
+                (v) => v.version === version && v.channel === 'stable'
+            )
+    )
+
+    if (versionsToShow?.length === 0) {
+        return null
+    }
+
     return (
         <div className={styles.latestUpdatesWrapper}>
             <div className={styles.latestUpdates}>
                 <h2 className={styles.latestUpdatesHeader}>Latest updates:</h2>
 
                 <ol className={styles.versionList}>
-                    {changelog?.slice(0, 3).map((version, i) => {
+                    {versionsToShow?.slice(0, 3).map((version, i) => {
                         return (
                             <li key={version.version}>
                                 <h3
@@ -44,3 +57,8 @@ export const LatestUpdates = ({ changelog }) => {
         </div>
     )
 }
+
+LatestUpdates.propTypes = {
+    changelog: PropTypes.object,
+    versions: PropTypes.array,
+}
diff --git a/server/src/models/v1/out/App.js b/server/src/models/v1/out/App.js
@@ -40,7 +40,7 @@ const def = Joi.object().keys({
     hasPlugin: Joi.boolean().allow(null, false),
 
     // only indicating if there is a changelog or not here
-    // to avoid addding a masssive changelog to the payload
+    // to avoid adding a massive changelog to the payload
     hasChangelog: Joi.boolean().allow(null, false),
 
     pluginType: Joi.string().allow(null),
