feat: app override initial support

d2.config.js

@@ -1,6 +1,7 @@
 const config = {
     type: 'app',
-    title: 'DHIS 2 Application Management',
+    name: 'app-management',
+    title: 'App Management',
     coreApp: true,
 
     entryPoints: {

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: 2020-08-24T15:35:44.108Z\n"
-"PO-Revision-Date: 2020-08-24T15:35:44.108Z\n"
+"POT-Creation-Date: 2020-08-26T16:41:08.474Z\n"
+"PO-Revision-Date: 2020-08-26T16:41:08.474Z\n"
 
 msgid "App installed successfully"
 msgstr ""
@@ -55,3 +55,12 @@ msgstr ""
 
 msgid "Install"
 msgstr ""
+
+msgid "CORE APP"
+msgstr ""
+
+msgid "A new version of App Management is available on the App Hub"
+msgstr ""
+
+msgid "Update App Management App"
+msgstr ""

package.json

@@ -27,6 +27,7 @@
     "devDependencies": {
         "@dhis2/cli-app-scripts": "^5.0.0",
         "@dhis2/cli-style": "^7.0.0",
+        "babel-plugin-minify-replace": "^0.5.0",
         "node-sass": "^4.14.1"
     },
     "dependencies": {

src/.babelrc.js

@@ -0,0 +1,21 @@
+const pkg = require('../package.json')
+const version = pkg.version
+
+module.exports = {
+    plugins: [
+        [
+            'minify-replace',
+            {
+                replacements: [
+                    {
+                        identifierName: '__VERSION__',
+                        replacement: {
+                            type: 'stringLiteral',
+                            value: version,
+                        },
+                    },
+                ],
+            },
+        ],
+    ],
+}

src/AppWrapper.js

@@ -11,14 +11,9 @@ import './locales'
 
 import 'material-design-icons-iconfont/dist/material-design-icons.css'
 import './scss/style.scss'
-import { useConfig } from '@dhis2/app-runtime'
 
 const AppWrapper = () => {
-    const { baseUrl } = useConfig()
     const { d2 } = useD2({
-        d2Config: {
-            baseUrl: baseUrl + '/api',
-        },
         onInitialized: d2 => {
             installedAppHub.setState(d2.system.installedApps)
         },

src/actions.js

@@ -198,6 +198,4 @@ function installAppVersion(uid, d2) {
     })
 }
 
-console.log(actions)
-
 export default actions

src/components/App.component.js

@@ -12,6 +12,7 @@ import FontIcon from 'material-ui/FontIcon'
 
 import AppList from './AppList.component'
 import AppHub from './AppHub.component'
+import { SelfUpdateNoticeBox } from './SelfUpdateNoticeBox.component'
 import AppTheme from '../theme'
 
 import actions from '../actions'
@@ -328,6 +329,7 @@ class App extends React.Component {
 
         return (
             <div className="app">
+                <SelfUpdateNoticeBox appHub={this.state.appHub} />
                 <Sidebar
                     sections={sections}
                     currentSection={this.state.section}

src/components/AppList.component.js

@@ -125,8 +125,6 @@ class AppList extends React.Component {
     }
 
     renderInstalledApps() {
-        const d2 = this.props.d2
-        const baseUrl = d2.Api.getApi().baseUrl
         const label = this.props.appTypeFilter.toLocaleLowerCase()
         const appList = this.props.installedApps.filter(
             app =>
@@ -144,7 +142,6 @@ class AppList extends React.Component {
                         <CardText>
                             <List style={styles.container}>
                                 {appList.map(app => {
-                                    console.log(app)
                                     const uninstall = actions.uninstallApp.bind(
                                         null,
                                         app.key
@@ -175,9 +172,7 @@ class AppList extends React.Component {
                                             <Avatar
                                                 style={styles.appIcon}
                                                 src={[
-                                                    baseUrl,
-                                                    'apps',
-                                                    app.key,
+                                                    app.baseUrl,
                                                     app.icons['48'],
                                                 ].join('/')}
                                             />
@@ -194,11 +189,23 @@ class AppList extends React.Component {
                                                 }
                                             />
                                         )
+
+                                    const secondaryText = (
+                                        <div>
+                                            {app.isBundledApp && (
+                                                <strong>
+                                                    {i18n.t('CORE APP')}{' '}
+                                                </strong>
+                                            )}
+                                            v{app.version}
+                                        </div>
+                                    )
+
                                     return (
                                         <ListItem
                                             key={app.folderName}
                                             primaryText={app.name}
-                                            secondaryText={`v${app.version}`}
+                                            secondaryText={secondaryText}
                                             style={styles.app}
                                             onClick={open}
                                             leftAvatar={avatar}
@@ -271,7 +278,6 @@ AppList.propTypes = {
         'TRACKER_DASHBOARD_WIDGET',
         'RESOURCE',
     ]).isRequired,
-    d2: PropTypes.object.isRequired,
     installedApps: PropTypes.array.isRequired,
     showUpload: PropTypes.bool.isRequired,
     uploadProgress: PropTypes.func.isRequired,

src/components/SelfUpdateNoticeBox.component.js

@@ -0,0 +1,71 @@
+/* global __VERSION__ */
+
+import React from 'react'
+import PropTypes from 'prop-types'
+import { NoticeBox, Button } from '@dhis2/ui'
+import i18n from '@dhis2/d2-i18n'
+
+import actions from '../actions'
+
+const currentVersion = __VERSION__
+const appManagementAppOrg = 'DHIS2'
+const appManagementAppName = 'App Management'
+
+const parseVersion = versionString => versionString.split('.').map(Number)
+const needsUpdate = (current, candidate) => {
+    const currentVersion = parseVersion(current)
+    const candidateVersion = parseVersion(candidate)
+
+    return currentVersion.some((v, i) => v < candidateVersion[i])
+}
+
+const getTargetVersion = (current, versions) => {
+    if (!versions) return null
+
+    let targetVersion
+    versions.forEach(candidate => {
+        if (needsUpdate(targetVersion?.version || current, candidate.version)) {
+            targetVersion = candidate
+        }
+    })
+
+    return targetVersion
+}
+
+export const SelfUpdateNoticeBox = ({ appHub }) => {
+    if (!appHub.apps) return null
+
+    const appManagementApp = appHub.apps.find(
+        app =>
+            app.developer.organisation === appManagementAppOrg &&
+            app.name === appManagementAppName
+    )
+
+    const targetVersion = getTargetVersion(
+        currentVersion,
+        appManagementApp?.versions
+    )
+    if (!appManagementApp || !targetVersion) {
+        return null
+    }
+
+    const upgradeSelf = async () => {
+        await actions.installAppVersion([targetVersion.id]).toPromise()
+        setTimeout(() => location.reload(), 500)
+    }
+    return (
+        <NoticeBox
+            title={i18n.t(
+                'A new version of App Management is available on the App Hub'
+            )}
+        >
+            <Button onClick={upgradeSelf}>
+                {i18n.t('Update App Management App')}
+            </Button>
+        </NoticeBox>
+    )
+}
+
+SelfUpdateNoticeBox.propTypes = {
+    appHub: PropTypes.object.isRequired,
+}

yarn.lock

@@ -2932,6 +2932,11 @@ babel-plugin-macros@2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
+babel-plugin-minify-replace@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
+  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
+
 babel-plugin-named-asset-import@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz#c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"