diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml index a93ae0cdb..df52fb2ab 100644 --- a/.github/workflows/dhis2-verify-lib.yml +++ b/.github/workflows/dhis2-verify-lib.yml @@ -53,7 +53,7 @@ jobs: - name: Build run: yarn build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: lib-build path: | @@ -77,7 +77,7 @@ jobs: path: '**/node_modules' key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: lib-build @@ -104,7 +104,7 @@ jobs: path: '**/node_modules' key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: lib-build @@ -123,7 +123,7 @@ jobs: with: node-version: 14.x - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: lib-build diff --git a/CHANGELOG.md b/CHANGELOG.md index fecbb7bcb..1d5a48d61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## [3.11.2](https://github.com/dhis2/app-runtime/compare/v3.11.1...v3.11.2) (2024-10-14) + + +### Bug Fixes + +* expand FetchErrorDetails type ([#1389](https://github.com/dhis2/app-runtime/issues/1389)) ([ff0ad60](https://github.com/dhis2/app-runtime/commit/ff0ad6077aecdb7627ec985a61c159159be6b8ea)) + +## [3.11.1](https://github.com/dhis2/app-runtime/compare/v3.11.0...v3.11.1) (2024-10-09) + + +### Bug Fixes + +* handle alert returned async by parentAlertsAdd [LIBS-695] ([#1388](https://github.com/dhis2/app-runtime/issues/1388)) ([9c989b2](https://github.com/dhis2/app-runtime/commit/9c989b2f9c408b7d5988dd0ec8756e86ddf2632f)) + +# [3.11.0](https://github.com/dhis2/app-runtime/compare/v3.10.6...v3.11.0) (2024-09-10) + + +### Features + +* fixed dimensions efficiency ([#1386](https://github.com/dhis2/app-runtime/issues/1386)) ([2b07a14](https://github.com/dhis2/app-runtime/commit/2b07a14ea7e781c1948cfa651a4ad5759a811c79)) + ## [3.10.6](https://github.com/dhis2/app-runtime/compare/v3.10.5...v3.10.6) (2024-07-26) diff --git a/docs/components/Plugin.md b/docs/components/Plugin.md index 99fabfafd..94107bbca 100644 --- a/docs/components/Plugin.md +++ b/docs/components/Plugin.md @@ -51,14 +51,14 @@ const MyPlugin = (propsFromParent) => { ## Plugin Props (reserved props) -| Name | Type | Required | Description | -| :--------------------: | :------------: | :---------------------------------------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **pluginShortName** | _string_ | _required_ if `pluginSource` is not provided | The shortName of the app/plugin you wish to load (matching the result from api/apps). Used to look up the plugin entry point. If this is not provided, `pluginSource` must be provided. `pluginSource` will take precedence if provided. | -| **pluginSource** | _string_ (url) | _required_ if `pluginShortName` is not provided | The URL of the plugin. If this is not provided, `pluginShortName` must be provided. | -| **onError** | _Function_ | _optional_ | Callback function to be called when an error in the plugin triggers an error boundary. You can use this to pass an error back up to the app and create a custom handling/UX if errors occur in the plugin. In general, it is recommended that you use the plugin's built-in error boundaries | -| **showAlertsInPlugin** | _boolean_ | _optional_ | If `true`, any alerts within the plugin (defined with the `useAlert` hook) will be rendered within the iframe. By default, this is `false`. It is recommended, in general, that you do not override this and allow alerts to be hoisted up to the app level | -| **height** | _number_ | _optional_ | If a height is provided, the iframe will be fixed to the specified height. If no height is provided, the iframe will automatically resize based on its contents. | -| **width** | _number_ | _optional_ | If a width is provided, the iframe will be fixed to the specified width. If no width is provided, the iframe will automatically resize based on its contents. | +| Name | Type | Required | Description | +| :--------------------: | :------------: | :---------------------------------------------: | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **pluginShortName** | _string_ | _required_ if `pluginSource` is not provided | The shortName of the app/plugin you wish to load (matching the result from api/apps). Used to look up the plugin entry point. If this is not provided, `pluginSource` must be provided. `pluginSource` will take precedence if provided. | +| **pluginSource** | _string_ (url) | _required_ if `pluginShortName` is not provided | The URL of the plugin. If this is not provided, `pluginShortName` must be provided. | +| **onError** | _Function_ | _optional_ | Callback function to be called when an error in the plugin triggers an error boundary. You can use this to pass an error back up to the app and create a custom handling/UX if errors occur in the plugin. In general, it is recommended that you use the plugin's built-in error boundaries | +| **showAlertsInPlugin** | _boolean_ | _optional_ | If `true`, any alerts within the plugin (defined with the `useAlert` hook) will be rendered within the iframe. By default, this is `false`. It is recommended, in general, that you do not override this and allow alerts to be hoisted up to the app level | +| **height** | _string_ | _optional_ | If a height is provided, the iframe will be fixed to the specified height. If no height is provided, the iframe will automatically resize its height based on its contents. The value of `height` will not be passed to the plugin, as it is in an internal implementation detail. If you do need to also pass the height to the plugin, you can pass another variable (e.g. `pluginHeight`). | +| **width** | _string_ | _optional_ | If a width is provided, the iframe will be fixed to the specified width. If no width is provided, the iframe will automatically resize its width based on its contents. The value of `width` will not be passed to the plugin, as it is in an internal implementation detail. If you do need to also pass the width to the plugin, you can pass another variable (e.g. `pluginWidth`). | ## Plugin Props (custom props) diff --git a/examples/cra/yarn.lock b/examples/cra/yarn.lock index 23319d556..82ada383f 100644 --- a/examples/cra/yarn.lock +++ b/examples/cra/yarn.lock @@ -1054,32 +1054,32 @@ integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== "@dhis2/app-runtime@file:../../runtime": - version "3.10.4" + version "3.10.6" dependencies: - "@dhis2/app-service-alerts" "3.10.4" - "@dhis2/app-service-config" "3.10.4" - "@dhis2/app-service-data" "3.10.4" - "@dhis2/app-service-offline" "3.10.4" - "@dhis2/app-service-plugin" "3.10.4" + "@dhis2/app-service-alerts" "3.10.6" + "@dhis2/app-service-config" "3.10.6" + "@dhis2/app-service-data" "3.10.6" + "@dhis2/app-service-offline" "3.10.6" + "@dhis2/app-service-plugin" "3.10.6" -"@dhis2/app-service-alerts@3.10.4", "@dhis2/app-service-alerts@file:../../services/alerts": - version "3.10.4" +"@dhis2/app-service-alerts@3.10.6", "@dhis2/app-service-alerts@file:../../services/alerts": + version "3.10.6" -"@dhis2/app-service-config@3.10.4", "@dhis2/app-service-config@file:../../services/config": - version "3.10.4" +"@dhis2/app-service-config@3.10.6", "@dhis2/app-service-config@file:../../services/config": + version "3.10.6" -"@dhis2/app-service-data@3.10.4", "@dhis2/app-service-data@file:../../services/data": - version "3.10.4" +"@dhis2/app-service-data@3.10.6", "@dhis2/app-service-data@file:../../services/data": + version "3.10.6" dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.10.4", "@dhis2/app-service-offline@file:../../services/offline": - version "3.10.4" +"@dhis2/app-service-offline@3.10.6", "@dhis2/app-service-offline@file:../../services/offline": + version "3.10.6" dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.4", "@dhis2/app-service-plugin@file:../../services/plugin": - version "3.10.4" +"@dhis2/app-service-plugin@3.10.6", "@dhis2/app-service-plugin@file:../../services/plugin": + version "3.10.6" dependencies: post-robot "^10.0.46" diff --git a/examples/query-playground/yarn.lock b/examples/query-playground/yarn.lock index 65d4505b4..72fc6e168 100644 --- a/examples/query-playground/yarn.lock +++ b/examples/query-playground/yarn.lock @@ -1812,32 +1812,32 @@ moment "^2.24.0" "@dhis2/app-runtime@*", "@dhis2/app-runtime@^2.8.0", "@dhis2/app-runtime@file:../../runtime": - version "3.10.4" + version "3.10.6" dependencies: - "@dhis2/app-service-alerts" "3.10.4" - "@dhis2/app-service-config" "3.10.4" - "@dhis2/app-service-data" "3.10.4" - "@dhis2/app-service-offline" "3.10.4" - "@dhis2/app-service-plugin" "3.10.4" + "@dhis2/app-service-alerts" "3.10.6" + "@dhis2/app-service-config" "3.10.6" + "@dhis2/app-service-data" "3.10.6" + "@dhis2/app-service-offline" "3.10.6" + "@dhis2/app-service-plugin" "3.10.6" -"@dhis2/app-service-alerts@3.10.4", "@dhis2/app-service-alerts@file:../../services/alerts": - version "3.10.4" +"@dhis2/app-service-alerts@3.10.6", "@dhis2/app-service-alerts@file:../../services/alerts": + version "3.10.6" -"@dhis2/app-service-config@3.10.4", "@dhis2/app-service-config@file:../../services/config": - version "3.10.4" +"@dhis2/app-service-config@3.10.6", "@dhis2/app-service-config@file:../../services/config": + version "3.10.6" -"@dhis2/app-service-data@3.10.4", "@dhis2/app-service-data@file:../../services/data": - version "3.10.4" +"@dhis2/app-service-data@3.10.6", "@dhis2/app-service-data@file:../../services/data": + version "3.10.6" dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.10.4", "@dhis2/app-service-offline@file:../../services/offline": - version "3.10.4" +"@dhis2/app-service-offline@3.10.6", "@dhis2/app-service-offline@file:../../services/offline": + version "3.10.6" dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.4", "@dhis2/app-service-plugin@file:../../services/plugin": - version "3.10.4" +"@dhis2/app-service-plugin@3.10.6", "@dhis2/app-service-plugin@file:../../services/plugin": + version "3.10.6" dependencies: post-robot "^10.0.46" diff --git a/package.json b/package.json index db3844d07..e5d040966 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "3.10.6", + "version": "3.11.2", "description": "A singular runtime dependency for applications on the DHIS2 platform", "repository": "https://github.com/dhis2/app-runtime.git", "author": "Austin McGee ", diff --git a/runtime/package.json b/runtime/package.json index ac0d5a91c..2614ee8e0 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -1,7 +1,7 @@ { "name": "@dhis2/app-runtime", "description": "A singular runtime dependency for applications on the DHIS2 platform", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", @@ -29,11 +29,11 @@ "build/**" ], "dependencies": { - "@dhis2/app-service-config": "3.10.6", - "@dhis2/app-service-data": "3.10.6", - "@dhis2/app-service-alerts": "3.10.6", - "@dhis2/app-service-offline": "3.10.6", - "@dhis2/app-service-plugin": "3.10.6" + "@dhis2/app-service-config": "3.11.2", + "@dhis2/app-service-data": "3.11.2", + "@dhis2/app-service-alerts": "3.11.2", + "@dhis2/app-service-offline": "3.11.2", + "@dhis2/app-service-plugin": "3.11.2" }, "peerDependencies": { "prop-types": "^15.7.2", diff --git a/services/alerts/package.json b/services/alerts/package.json index 1f29bf407..6e946ac34 100644 --- a/services/alerts/package.json +++ b/services/alerts/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-alerts", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", diff --git a/services/alerts/src/useAlert.ts b/services/alerts/src/useAlert.ts index adc84e211..8b8053d25 100644 --- a/services/alerts/src/useAlert.ts +++ b/services/alerts/src/useAlert.ts @@ -19,13 +19,18 @@ export const useAlert = ( typeof options === 'function' ? options(props) : options if (plugin && parentAlertsAdd && !showAlertsInPlugin) { - alertRef.current = parentAlertsAdd( + // Functions passed through post-robot are asynchronous + parentAlertsAdd( { message: resolvedMessage, options: resolvedOptions, }, alertRef - ) + // Conditional chaining gives backwards compatibility + // with cli-app-scripts < 12 + )?.then((newAlert: Alert) => { + alertRef.current = newAlert + }) } else { alertRef.current = add( { diff --git a/services/config/package.json b/services/config/package.json index f7b182e61..a8d6623c4 100644 --- a/services/config/package.json +++ b/services/config/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-config", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", diff --git a/services/data/package.json b/services/data/package.json index b652386af..ee2bace1f 100644 --- a/services/data/package.json +++ b/services/data/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-data", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -35,7 +35,7 @@ "react-query": "^3.13.11" }, "peerDependencies": { - "@dhis2/app-service-config": "3.10.6", + "@dhis2/app-service-config": "3.11.2", "prop-types": "^15.7.2", "react": "^16.8", "react-dom": "^16.8" diff --git a/services/data/src/engine/types/FetchError.ts b/services/data/src/engine/types/FetchError.ts index c824979e0..71b195c49 100644 --- a/services/data/src/engine/types/FetchError.ts +++ b/services/data/src/engine/types/FetchError.ts @@ -1,5 +1,12 @@ export type FetchErrorTypeName = 'network' | 'unknown' | 'access' | 'aborted' -export type FetchErrorDetails = { message?: string } +export type FetchErrorDetails = { + httpStatus?: string + httpStatusCode?: number + status?: string + message?: string + errorCode?: string + [x: string]: any +} export interface FetchErrorPayload { type: FetchErrorTypeName diff --git a/services/offline/package.json b/services/offline/package.json index 9c6feefc2..4845a4ef4 100644 --- a/services/offline/package.json +++ b/services/offline/package.json @@ -1,7 +1,7 @@ { "name": "@dhis2/app-service-offline", "description": "A runtime service for online/offline detection and offline caching", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -33,7 +33,7 @@ "coverage": "yarn test --coverage" }, "peerDependencies": { - "@dhis2/app-service-config": "3.10.6", + "@dhis2/app-service-config": "3.11.2", "prop-types": "^15.7.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/services/plugin/package.json b/services/plugin/package.json index 77486962c..39d9fb7eb 100644 --- a/services/plugin/package.json +++ b/services/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-plugin", - "version": "3.10.6", + "version": "3.11.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -28,8 +28,8 @@ "prop-types": "^15.7.2", "react": "^16.8.6", "react-dom": "^16.8.6", - "@dhis2/app-service-alerts": "3.10.6", - "@dhis2/app-service-data": "3.10.6" + "@dhis2/app-service-alerts": "3.11.2", + "@dhis2/app-service-data": "3.11.2" }, "devDependencies": { "@types/post-robot": "^10.0.3" diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx index 3bf9ecc1d..4b3f0471d 100644 --- a/services/plugin/src/Plugin.tsx +++ b/services/plugin/src/Plugin.tsx @@ -27,23 +27,18 @@ const getPluginEntryPoint = ({ export const Plugin = ({ pluginSource, pluginShortName, + height, + width, ...propsToPassNonMemoized }: { pluginSource?: string pluginShortName?: string + height?: string | number + width?: string | number propsToPass: any }): JSX.Element => { const iframeRef = useRef(null) - // we do not know what is being sent in passed props, so for stable reference, memoize using JSON representation - const propsToPassNonMemoizedJSON = JSON.stringify(propsToPassNonMemoized) - const propsToPass: any = useMemo( - () => ({ ...propsToPassNonMemoized }), - // eslint-disable-next-line react-hooks/exhaustive-deps - [propsToPassNonMemoizedJSON] - ) - const { height, width } = propsToPass - const { add: alertsAdd } = useContext(AlertsManagerContext) const { data } = useDataQuery(appsInfoQuery) @@ -60,26 +55,18 @@ export const Plugin = ({ useState(false) const [inErrorState, setInErrorState] = useState(false) - const [pluginHeight, setPluginHeight] = useState(150) - const [pluginWidth, setPluginWidth] = useState(500) - - useEffect(() => { - if (height) { - setPluginHeight(height) - } - if (width) { - setPluginWidth(width) - } - }, [height, width]) + const [resizedHeight, setPluginHeight] = useState(150) + const [resizedWidth, setPluginWidth] = useState(500) // since we do not know what props are passed, the dependency array has to be keys of whatever is standard prop + // we exclude height/width from memoization to avoid updates for these properties const memoizedPropsToPass = useMemo( - () => propsToPass, + () => propsToPassNonMemoized, /* eslint-disable react-hooks/exhaustive-deps */ [ - ...Object.keys(propsToPass) + ...Object.keys(propsToPassNonMemoized) .sort() - .map((k) => (propsToPass as any)[k]), + .map((k) => (propsToPassNonMemoized as any)[k]), ] /* eslint-enable react-hooks/exhaustive-deps */ ) @@ -100,8 +87,8 @@ export const Plugin = ({ const iframeProps = { ...memoizedPropsToPass, alertsAdd, - setPluginHeight, - setPluginWidth, + setPluginHeight: !height ? setPluginHeight : null, + setPluginWidth: !width ? setPluginWidth : null, setInErrorState, setCommunicationReceived, } @@ -156,9 +143,9 @@ export const Plugin = ({