Merge branch 'alpha' into libs-598-replace-cra-with-vite

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [11.2.0](https://github.com/dhis2/app-platform/compare/v11.1.1...v11.2.0) (2024-04-25)
+
+
+### Features
+
+* enable login app type ([#845](https://github.com/dhis2/app-platform/issues/845)) ([2586e38](https://github.com/dhis2/app-platform/commit/2586e38327700eef210906dea7d0bd951dc9c24b))
+
 ## [11.1.1](https://github.com/dhis2/app-platform/compare/v11.1.0...v11.1.1) (2024-04-09)
 
 
@@ -24,6 +31,27 @@
 
 * **deps:** Updated major version of UI
 
+# [10.6.0-alpha.3](https://github.com/dhis2/app-platform/compare/v10.6.0-alpha.2...v10.6.0-alpha.3) (2024-03-21)
+
+
+### Features
+
+* enable publishing login_app apps ([93093ca](https://github.com/dhis2/app-platform/commit/93093ca9ce286801e0c0a9bb421ae847be0fd8e6))
+
+# [10.6.0-alpha.2](https://github.com/dhis2/app-platform/compare/v10.6.0-alpha.1...v10.6.0-alpha.2) (2024-03-20)
+
+
+### Features
+
+* add redirect to safe login mode for login apps ([#835](https://github.com/dhis2/app-platform/issues/835)) ([ba26ada](https://github.com/dhis2/app-platform/commit/ba26adaab450eaeda19c3b29410275ac563d370b))
+
+# [10.6.0-alpha.1](https://github.com/dhis2/app-platform/compare/v10.5.0...v10.6.0-alpha.1) (2024-03-05)
+
+
+### Features
+
+* updates for login_app type [LIBS-405]  ([#831](https://github.com/dhis2/app-platform/issues/831)) ([0cc2fbd](https://github.com/dhis2/app-platform/commit/0cc2fbd5b633b9b8953ba29d8450f93b0037d458))
+
 # [10.5.0](https://github.com/dhis2/app-platform/compare/v10.4.1...v10.5.0) (2024-02-19)
 
 

adapter/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: 2023-02-08T14:36:41.461Z\n"
-"PO-Revision-Date: 2023-02-08T14:36:41.461Z\n"
+"POT-Creation-Date: 2024-03-14T15:31:40.141Z\n"
+"PO-Revision-Date: 2024-03-14T15:31:40.141Z\n"
 
 msgid "Save your data"
 msgstr "Save your data"
@@ -45,6 +45,9 @@ msgstr "Try again"
 msgid "Something went wrong"
 msgstr "Something went wrong"
 
+msgid "Redirect to safe login mode"
+msgstr "Redirect to safe login mode"
+
 msgid "Hide technical details"
 msgstr "Hide technical details"
 

adapter/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-adapter",
-    "version": "11.1.1",
+    "version": "11.2.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -21,11 +21,11 @@
         "build"
     ],
     "dependencies": {
-        "@dhis2/pwa": "11.1.1",
+        "@dhis2/pwa": "11.2.0",
         "moment": "^2.24.0"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "11.1.1",
+        "@dhis2/cli-app-scripts": "11.2.0",
         "@testing-library/react": "^12.0.0",
         "@testing-library/react-hooks": "^8.0.1",
         "enzyme": "^3.11.0",

adapter/src/components/ErrorBoundary.js

@@ -61,8 +61,16 @@ export class ErrorBoundary extends Component {
         })
     }
 
+    handleSafeLoginRedirect = () => {
+        window.location.href =
+            this.props.baseURL +
+            (this.props.baseURL.endsWith('/') ? '' : '/') +
+            'dhis-web-commons/security/login.action'
+    }
+
     render() {
-        const { children, fullscreen, onRetry } = this.props
+        const { children, fullscreen, onRetry, loginApp, baseURL } = this.props
+
         if (this.state.error) {
             if (this.props.plugin) {
                 return (
@@ -88,6 +96,15 @@ export class ErrorBoundary extends Component {
                         <h1 className="message">
                             {i18n.t('Something went wrong')}
                         </h1>
+                        {loginApp && baseURL && (
+                            <div className="retry">
+                                <UIButton
+                                    onClick={this.handleSafeLoginRedirect}
+                                >
+                                    {i18n.t('Redirect to safe login mode')}
+                                </UIButton>
+                            </div>
+                        )}
                         {onRetry && (
                             <div className="retry">
                                 <UIButton onClick={onRetry}>
@@ -141,7 +158,9 @@ export class ErrorBoundary extends Component {
 
 ErrorBoundary.propTypes = {
     children: PropTypes.node.isRequired,
+    baseURL: PropTypes.string,
     fullscreen: PropTypes.bool,
+    loginApp: PropTypes.bool,
     plugin: PropTypes.bool,
     onPluginError: PropTypes.func,
     onRetry: PropTypes.func,

adapter/src/components/LoginAppWrapper.js

@@ -0,0 +1,37 @@
+import PropTypes from 'prop-types'
+import React from 'react'
+import { useSystemDefaultLocale } from '../utils/useLocale.js'
+import { Alerts } from './Alerts.js'
+import { ErrorBoundary } from './ErrorBoundary.js'
+import { LoadingMask } from './LoadingMask.js'
+import { styles } from './styles/AppWrapper.style.js'
+
+export const LoginAppWrapper = ({ url, children }) => {
+    const { loading: localeLoading } = useSystemDefaultLocale()
+    // cannot check current user for a loginApp (no api/me)
+
+    if (localeLoading) {
+        return <LoadingMask />
+    }
+
+    return (
+        <div className="app-shell-adapter">
+            <style jsx>{styles}</style>
+            <div className="app-shell-app">
+                <ErrorBoundary
+                    onRetry={() => window.location.reload()}
+                    loginApp={true}
+                    baseURL={url}
+                >
+                    {children}
+                </ErrorBoundary>
+            </div>
+            <Alerts />
+        </div>
+    )
+}
+
+LoginAppWrapper.propTypes = {
+    children: PropTypes.node,
+    url: PropTypes.string,
+}

adapter/src/components/ServerVersionProvider.js

@@ -17,6 +17,7 @@ export const ServerVersionProvider = ({
     plugin,
     parentAlertsAdd,
     showAlertsInPlugin,
+    loginApp,
     children,
 }) => {
     const offlineInterface = useOfflineInterface()
@@ -103,6 +104,27 @@ export const ServerVersionProvider = ({
                 ? state
                 : { loading: true, error: undefined, systemInfo: undefined }
         )
+
+        // version is available from api/loginConfig
+        if (loginApp) {
+            const requestLogin = get(`${baseUrl}/api/loginConfig`)
+            requestLogin
+                .then((loginConfig) => {
+                    setSystemInfoState({
+                        loading: false,
+                        error: undefined,
+                        systemInfo: { version: loginConfig.apiVersion },
+                    })
+                })
+                .catch((e) => {
+                    setSystemInfoState({
+                        loading: false,
+                        error: e,
+                        systemInfo: undefined,
+                    })
+                })
+            return
+        }
         const request = get(`${baseUrl}/api/system/info`)
         request
             .then((systemInfo) => {
@@ -125,7 +147,7 @@ export const ServerVersionProvider = ({
         return () => {
             request.abort()
         }
-    }, [appName, baseUrl])
+    }, [appName, baseUrl, loginApp])
 
     useEffect(() => {
         if (pwaEnabled) {
@@ -137,7 +159,11 @@ export const ServerVersionProvider = ({
 
     // This needs to come before 'loading' case to show modal at correct times
     if (systemInfoState.error || baseUrlState.error) {
-        return <LoginModal appName={appName} baseUrl={baseUrl} />
+        return !loginApp ? (
+            <LoginModal appName={appName} baseUrl={baseUrl} />
+        ) : (
+            <p>Specify DHIS2_BASE_URL environment variable</p>
+        )
     }
 
     if (
@@ -162,7 +188,7 @@ export const ServerVersionProvider = ({
                 systemInfo,
                 pwaEnabled,
             }}
-            offlineInterface={offlineInterface}
+            offlineInterface={loginApp ? null : offlineInterface}
             plugin={plugin}
             parentAlertsAdd={parentAlertsAdd}
             showAlertsInPlugin={showAlertsInPlugin}
@@ -177,6 +203,7 @@ ServerVersionProvider.propTypes = {
     appVersion: PropTypes.string.isRequired,
     apiVersion: PropTypes.number,
     children: PropTypes.element,
+    loginApp: PropTypes.bool,
     parentAlertsAdd: PropTypes.func,
     plugin: PropTypes.bool,
     pwaEnabled: PropTypes.bool,

adapter/src/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { AppWrapper } from './components/AppWrapper.js'
 import { ErrorBoundary } from './components/ErrorBoundary.js'
+import { LoginAppWrapper } from './components/LoginAppWrapper.js'
 import { OfflineInterfaceProvider } from './components/OfflineInterfaceContext.js'
 import { PWALoadingBoundary } from './components/PWALoadingBoundary.js'
 import { ServerVersionProvider } from './components/ServerVersionProvider.js'
@@ -19,38 +20,66 @@ const AppAdapter = ({
     showAlertsInPlugin,
     onPluginError,
     clearPluginError,
+    loginApp,
     children,
-}) => (
-    <ErrorBoundary
-        plugin={plugin}
-        fullscreen
-        onRetry={checkForSWUpdateAndReload}
-    >
-        <OfflineInterfaceProvider>
-            <PWALoadingBoundary>
+}) => {
+    if (loginApp) {
+        return (
+            <ErrorBoundary
+                fullscreen
+                onRetry={() => {
+                    window.location.reload()
+                }}
+                plugin={false}
+                loginApp={true}
+                baseURL={url}
+            >
                 <ServerVersionProvider
                     appName={appName}
                     appVersion={appVersion}
                     url={url}
                     apiVersion={apiVersion}
                     pwaEnabled={pwaEnabled}
-                    plugin={plugin}
-                    parentAlertsAdd={parentAlertsAdd}
-                    showAlertsInPlugin={showAlertsInPlugin}
+                    loginApp={loginApp}
+                    plugin={false}
                 >
-                    <AppWrapper
+                    <LoginAppWrapper url={url}>{children}</LoginAppWrapper>
+                </ServerVersionProvider>
+            </ErrorBoundary>
+        )
+    }
+    return (
+        <ErrorBoundary
+            plugin={plugin}
+            fullscreen
+            onRetry={checkForSWUpdateAndReload}
+        >
+            <OfflineInterfaceProvider>
+                <PWALoadingBoundary>
+                    <ServerVersionProvider
+                        appName={appName}
+                        appVersion={appVersion}
+                        url={url}
+                        apiVersion={apiVersion}
+                        pwaEnabled={pwaEnabled}
                         plugin={plugin}
-                        onPluginError={onPluginError}
-                        clearPluginError={clearPluginError}
-                        direction={direction}
+                        parentAlertsAdd={parentAlertsAdd}
+                        showAlertsInPlugin={showAlertsInPlugin}
                     >
-                        {children}
-                    </AppWrapper>
-                </ServerVersionProvider>
-            </PWALoadingBoundary>
-        </OfflineInterfaceProvider>
-    </ErrorBoundary>
-)
+                        <AppWrapper
+                            plugin={plugin}
+                            onPluginError={onPluginError}
+                            clearPluginError={clearPluginError}
+                            direction={direction}
+                        >
+                            {children}
+                        </AppWrapper>
+                    </ServerVersionProvider>
+                </PWALoadingBoundary>
+            </OfflineInterfaceProvider>
+        </ErrorBoundary>
+    )
+}
 
 AppAdapter.propTypes = {
     appName: PropTypes.string.isRequired,
@@ -59,6 +88,7 @@ AppAdapter.propTypes = {
     children: PropTypes.element,
     clearPluginError: PropTypes.func,
     direction: PropTypes.oneOf(['ltr', 'rtl', 'auto']),
+    loginApp: PropTypes.bool,
     parentAlertsAdd: PropTypes.func,
     plugin: PropTypes.bool,
     pwaEnabled: PropTypes.bool,

adapter/src/utils/useLocale.js

@@ -1,6 +1,6 @@
 import { useDataQuery } from '@dhis2/app-runtime'
 import i18n from '@dhis2/d2-i18n'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 import {
     setI18nLocale,
     parseLocale,
@@ -56,3 +56,31 @@ export const useCurrentUserLocale = (configDirection) => {
 
     return { loading: loading || !locale, locale, direction }
 }
+
+const loginConfigQuery = {
+    loginConfig: {
+        resource: 'loginConfig',
+    },
+}
+
+export const useSystemDefaultLocale = () => {
+    // system language from loginConfiqQuery
+    const { loading, data, error } = useDataQuery(loginConfigQuery)
+    // set userSettings to use system locale by default
+    const localeInformation = useMemo(
+        () => ({
+            userSettings: {
+                keyUiLocale:
+                    data &&
+                    (data?.loginConfig?.uiLocale || window.navigator.language),
+            },
+            configDirection: 'auto',
+        }),
+        [data]
+    )
+    const locale = useLocale(localeInformation)
+    if (error) {
+        console.error(error)
+    }
+    return { loading: loading || !locale, locale }
+}