Merge pull request #740 from dhis2/alpha

chore: merge alpha to master (cli plugin builds)
dhis2 · Nov 30, 2022 · ac0350a · ac0350a
2 parents c47df66 + 0ec89e4
commit ac0350a
Show file tree

Hide file tree

Showing 37 changed files with 2,008 additions and 244 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,6 +7,7 @@ module.exports = {
     },
     rules: {
         'import/extensions': 'off',
+        'react/no-unknown-property': ['error', { ignore: ['jsx'] }],
     },
     overrides: [
         {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [10.2.0-alpha.3](https://github.com/dhis2/app-platform/compare/v10.2.0-alpha.2...v10.2.0-alpha.3) (2022-11-30)
+
+
+### Bug Fixes
+
+* **deps:** bump platform deps and unpin ([bd2582f](https://github.com/dhis2/app-platform/commit/bd2582f3faa17e46142210c530584e79d4b5998a))
+* **pwa:** only count clients in scope ([#760](https://github.com/dhis2/app-platform/issues/760)) ([41113c0](https://github.com/dhis2/app-platform/commit/41113c04f50f6677844f3248d65fcfdbc67a2b58))
+
 ## [10.1.6](https://github.com/dhis2/app-platform/compare/v10.1.5...v10.1.6) (2022-11-24)
 
 

diff --git a/adapter/package.json b/adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-adapter",
-    "version": "10.1.6",
+    "version": "10.2.0-alpha.3",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -21,11 +21,11 @@
         "build"
     ],
     "dependencies": {
-        "@dhis2/pwa": "10.1.6",
+        "@dhis2/pwa": "10.2.0-alpha.3",
         "moment": "^2.24.0"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "10.1.6",
+        "@dhis2/cli-app-scripts": "10.2.0-alpha.3",
         "@testing-library/react": "^12.0.0",
         "enzyme": "^3.11.0",
         "enzyme-adapter-react-16": "^1.15.5",

diff --git a/adapter/src/components/AppWrapper.js b/adapter/src/components/AppWrapper.js
@@ -8,7 +8,7 @@ import { ErrorBoundary } from './ErrorBoundary.js'
 import { LoadingMask } from './LoadingMask.js'
 import { styles } from './styles/AppWrapper.style.js'
 
-export const AppWrapper = ({ children }) => {
+export const AppWrapper = ({ children, plugin }) => {
     const { loading: localeLoading } = useCurrentUserLocale()
     const { loading: latestUserLoading } = useVerifyLatestUser()
 
@@ -19,7 +19,7 @@ export const AppWrapper = ({ children }) => {
     return (
         <div className="app-shell-adapter">
             <style jsx>{styles}</style>
-            <ConnectedHeaderBar />
+            {!plugin && <ConnectedHeaderBar />}
             <div className="app-shell-app">
                 <ErrorBoundary onRetry={() => window.location.reload()}>
                     {children}
@@ -32,4 +32,5 @@ export const AppWrapper = ({ children }) => {
 
 AppWrapper.propTypes = {
     children: PropTypes.node,
+    plugin: PropTypes.bool,
 }
diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
@@ -33,6 +33,8 @@ export const ServerVersionProvider = ({
                 setState({ loading: false, systemInfo })
             })
             .catch((e) => {
+                // Todo: If this is a network error, the app cannot load -- handle that gracefully here
+                // if (e === 'Network error') { ... }
                 setState({ loading: false, error: e })
             })
 

diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -13,6 +13,7 @@ const AppAdapter = ({
     url,
     apiVersion,
     pwaEnabled,
+    plugin,
     children,
 }) => (
     <ErrorBoundary fullscreen onRetry={checkForSWUpdateAndReload}>
@@ -25,7 +26,7 @@ const AppAdapter = ({
                     apiVersion={apiVersion}
                     pwaEnabled={pwaEnabled}
                 >
-                    <AppWrapper>{children}</AppWrapper>
+                    <AppWrapper plugin={plugin}>{children}</AppWrapper>
                 </ServerVersionProvider>
             </PWALoadingBoundary>
         </OfflineInterfaceProvider>
@@ -37,6 +38,7 @@ AppAdapter.propTypes = {
     appVersion: PropTypes.string.isRequired,
     apiVersion: PropTypes.number,
     children: PropTypes.element,
+    plugin: PropTypes.bool,
     pwaEnabled: PropTypes.bool,
     url: PropTypes.string,
 }

diff --git a/adapter/src/utils/api.js b/adapter/src/utils/api.js
@@ -14,7 +14,7 @@ const request = (url, options) => {
         })
             .then((response) => {
                 if (response.status !== 200) {
-                    reject('Request failed', response.statusText)
+                    reject('Request failed ' + response.statusText)
                     return
                 }
                 try {