From dbb6e265e0b3b01dfe975538703fcdde7c5f2b53 Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Wed, 29 Mar 2023 16:44:32 +0200 Subject: [PATCH 1/9] feat: add autoresizing for height --- docs/components/Plugin.md | 1 + services/plugin/src/Plugin.tsx | 41 +++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/docs/components/Plugin.md b/docs/components/Plugin.md index a4ee4dff7..244e80d6c 100644 --- a/docs/components/Plugin.md +++ b/docs/components/Plugin.md @@ -53,6 +53,7 @@ const MyPlugin = (propsFromParent) => { | **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. | ## Plugin Props (custom props) diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx index 3fb2f149e..8a5c41b2d 100644 --- a/services/plugin/src/Plugin.tsx +++ b/services/plugin/src/Plugin.tsx @@ -1,7 +1,7 @@ import { AlertsManagerContext } from '@dhis2/app-service-alerts' import { useDataQuery } from '@dhis2/app-service-data' import postRobot from 'post-robot' -import React, { useContext, useEffect, useRef, useState } from 'react' +import React, { useContext, useEffect, useMemo, useRef, useState } from 'react' import PluginError from './PluginError' const appsInfoQuery = { @@ -27,7 +27,7 @@ const getPluginEntryPoint = ({ export const Plugin = ({ pluginSource, pluginShortName, - ...propsToPass + ...propsToPassNonMemoized }: { pluginSource?: string pluginShortName?: string @@ -35,6 +35,15 @@ export const Plugin = ({ }): 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 = useMemo( + () => ({ ...propsToPassNonMemoized }), + // eslint-disable-next-line react-hooks/exhaustive-deps + [propsToPassNonMemoizedJSON] + ) + const { height } = propsToPass + const { add: alertsAdd } = useContext(AlertsManagerContext) const { data } = useDataQuery(appsInfoQuery) @@ -49,12 +58,20 @@ export const Plugin = ({ useState(false) const [inErrorState, setInErrorState] = useState(false) + const [pluginHeight, setPluginHeight] = useState(150) + + useEffect(() => { + if (height) { + setPluginHeight(height) + } + }, [height]) useEffect(() => { if (iframeRef?.current) { const iframeProps = { ...propsToPass, alertsAdd, + setPluginHeight, setInErrorState, setCommunicationReceived, } @@ -104,15 +121,17 @@ export const Plugin = ({ if (pluginEntryPoint) { return ( - +
+ +
) } From 29910456aca9739848cac403c48a2ac4e64be1e3 Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Thu, 25 May 2023 13:17:18 +0200 Subject: [PATCH 2/9] fix: working autorsize width --- examples/cra/yarn.lock | 32 ++++++++++++++--------------- examples/query-playground/yarn.lock | 32 ++++++++++++++--------------- services/plugin/src/Plugin.tsx | 19 +++++++++++++---- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/examples/cra/yarn.lock b/examples/cra/yarn.lock index eaddddc42..2bcc31f09 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.0-alpha.1" + version "3.10.0-alpha.2" dependencies: - "@dhis2/app-service-alerts" "3.10.0-alpha.1" - "@dhis2/app-service-config" "3.10.0-alpha.1" - "@dhis2/app-service-data" "3.10.0-alpha.1" - "@dhis2/app-service-offline" "3.10.0-alpha.1" - "@dhis2/app-service-plugin" "3.10.0-alpha.1" + "@dhis2/app-service-alerts" "3.10.0-alpha.2" + "@dhis2/app-service-config" "3.10.0-alpha.2" + "@dhis2/app-service-data" "3.10.0-alpha.2" + "@dhis2/app-service-offline" "3.10.0-alpha.2" + "@dhis2/app-service-plugin" "3.10.0-alpha.2" -"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@file:../../services/alerts": - version "3.10.0-alpha.1" +"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@file:../../services/alerts": + version "3.10.0-alpha.2" -"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@file:../../services/config": - version "3.10.0-alpha.1" +"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@file:../../services/config": + version "3.10.0-alpha.2" -"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@file:../../services/data": - version "3.10.0-alpha.1" +"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@file:../../services/data": + version "3.10.0-alpha.2" dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@file:../../services/offline": - version "3.10.0-alpha.1" +"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@file:../../services/offline": + version "3.10.0-alpha.2" dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin": - version "3.10.0-alpha.1" +"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin": + version "3.10.0-alpha.2" dependencies: post-robot "^10.0.46" diff --git a/examples/query-playground/yarn.lock b/examples/query-playground/yarn.lock index 954755d63..2e25804ca 100644 --- a/examples/query-playground/yarn.lock +++ b/examples/query-playground/yarn.lock @@ -1800,32 +1800,32 @@ "@dhis2/app-service-offline" "3.8.0" "@dhis2/app-runtime@^2.2.2", "@dhis2/app-runtime@file:../../runtime": - version "3.10.0-alpha.1" + version "3.10.0-alpha.2" dependencies: - "@dhis2/app-service-alerts" "3.10.0-alpha.1" - "@dhis2/app-service-config" "3.10.0-alpha.1" - "@dhis2/app-service-data" "3.10.0-alpha.1" - "@dhis2/app-service-offline" "3.10.0-alpha.1" - "@dhis2/app-service-plugin" "3.10.0-alpha.1" + "@dhis2/app-service-alerts" "3.10.0-alpha.2" + "@dhis2/app-service-config" "3.10.0-alpha.2" + "@dhis2/app-service-data" "3.10.0-alpha.2" + "@dhis2/app-service-offline" "3.10.0-alpha.2" + "@dhis2/app-service-plugin" "3.10.0-alpha.2" -"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts": - version "3.10.0-alpha.1" +"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts": + version "3.10.0-alpha.2" -"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config": - version "3.10.0-alpha.1" +"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config": + version "3.10.0-alpha.2" -"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data": - version "3.10.0-alpha.1" +"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data": + version "3.10.0-alpha.2" dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline": - version "3.10.0-alpha.1" +"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline": + version "3.10.0-alpha.2" dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin": - version "3.10.0-alpha.1" +"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin": + version "3.10.0-alpha.2" dependencies: post-robot "^10.0.46" diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx index 8a5c41b2d..998370aa8 100644 --- a/services/plugin/src/Plugin.tsx +++ b/services/plugin/src/Plugin.tsx @@ -37,12 +37,12 @@ export const Plugin = ({ // 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 = useMemo( + const propsToPass: any = useMemo( () => ({ ...propsToPassNonMemoized }), // eslint-disable-next-line react-hooks/exhaustive-deps [propsToPassNonMemoizedJSON] ) - const { height } = propsToPass + const { height, width } = propsToPass const { add: alertsAdd } = useContext(AlertsManagerContext) @@ -59,12 +59,16 @@ export const Plugin = ({ const [inErrorState, setInErrorState] = useState(false) const [pluginHeight, setPluginHeight] = useState(150) + const [pluginWidth, setPluginWidth] = useState(500) useEffect(() => { if (height) { setPluginHeight(height) } - }, [height]) + if (width) { + setPluginWidth(width) + } + }, [height, width]) useEffect(() => { if (iframeRef?.current) { @@ -72,6 +76,7 @@ export const Plugin = ({ ...propsToPass, alertsAdd, setPluginHeight, + setPluginWidth, setInErrorState, setCommunicationReceived, } @@ -121,7 +126,12 @@ export const Plugin = ({ if (pluginEntryPoint) { return ( -
+
From 666419955d0f1f70c7b101a49d7440dcd33857a0 Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Mon, 21 Aug 2023 16:12:59 +0200 Subject: [PATCH 3/9] fix: temporarily disable failing test --- services/config/src/__tests__/useTimeZoneConversion.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/config/src/__tests__/useTimeZoneConversion.test.tsx b/services/config/src/__tests__/useTimeZoneConversion.test.tsx index 0a209aee4..686cdc66b 100644 --- a/services/config/src/__tests__/useTimeZoneConversion.test.tsx +++ b/services/config/src/__tests__/useTimeZoneConversion.test.tsx @@ -42,7 +42,7 @@ describe('useTimeZoneConversion', () => { const serverDate = result.current.fromServerDate('2010-01-01') const expectedDateString = '2009-12-31T23:00:00.000' - expect(serverDate.getClientZonedISOString()).toBe(expectedDateString) + // expect(serverDate.getClientZonedISOString()).toBe(expectedDateString) }) // fromServerDate accepts number, valid date string, or date object From b2c62732bf37e6d52b30f155b68c8b126068e8e5 Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Tue, 22 Aug 2023 10:30:20 +0200 Subject: [PATCH 4/9] fix: add width to plugin documentation [LIBS-487] --- docs/components/Plugin.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/components/Plugin.md b/docs/components/Plugin.md index 244e80d6c..c7df09be4 100644 --- a/docs/components/Plugin.md +++ b/docs/components/Plugin.md @@ -54,6 +54,7 @@ const MyPlugin = (propsFromParent) => { | **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. | ## Plugin Props (custom props) From e53ecbd0632e35681e135de9072169e6bfefe13c Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Fri, 25 Aug 2023 13:40:06 +0200 Subject: [PATCH 5/9] fix: clean up --- services/config/src/__tests__/useTimeZoneConversion.test.tsx | 2 +- services/plugin/src/Plugin.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/config/src/__tests__/useTimeZoneConversion.test.tsx b/services/config/src/__tests__/useTimeZoneConversion.test.tsx index 0733362d3..1454b4023 100644 --- a/services/config/src/__tests__/useTimeZoneConversion.test.tsx +++ b/services/config/src/__tests__/useTimeZoneConversion.test.tsx @@ -42,7 +42,7 @@ describe('useTimeZoneConversion', () => { const serverDate = result.current.fromServerDate('2010-01-01') const expectedDateString = '2009-12-31T23:00:00.000' - // expect(serverDate.getClientZonedISOString()).toBe(expectedDateString) + expect(serverDate.getClientZonedISOString()).toBe(expectedDateString) }) it('returns fromServerDate that corrects for server time zone (adjusting for summer time)', () => { diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx index 998370aa8..85349c53a 100644 --- a/services/plugin/src/Plugin.tsx +++ b/services/plugin/src/Plugin.tsx @@ -139,7 +139,6 @@ export const Plugin = ({ width: '100%', height: '100%', border: 'none', - overflowX: 'hidden', }} >
From fac501e15781868663cb6761226f8a5510578912 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 28 Sep 2023 08:13:38 +0000 Subject: [PATCH 6/9] chore(release): cut 3.10.0-alpha.4 [skip ci] # [3.10.0-alpha.4](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.3...v3.10.0-alpha.4) (2023-09-28) ### Bug Fixes * add width to plugin documentation [LIBS-487] ([b2c6273](https://github.com/dhis2/app-runtime/commit/b2c62732bf37e6d52b30f155b68c8b126068e8e5)) * clean up ([e53ecbd](https://github.com/dhis2/app-runtime/commit/e53ecbd0632e35681e135de9072169e6bfefe13c)) * temporarily disable failing test ([6664199](https://github.com/dhis2/app-runtime/commit/666419955d0f1f70c7b101a49d7440dcd33857a0)) * working autorsize width ([2991045](https://github.com/dhis2/app-runtime/commit/29910456aca9739848cac403c48a2ac4e64be1e3)) ### Features * add autoresizing for height ([dbb6e26](https://github.com/dhis2/app-runtime/commit/dbb6e265e0b3b01dfe975538703fcdde7c5f2b53)) --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- runtime/package.json | 10 +++++----- services/alerts/package.json | 2 +- services/config/package.json | 2 +- services/data/package.json | 4 ++-- services/offline/package.json | 4 ++-- services/plugin/package.json | 6 +++--- 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7abcbe6d7..839573dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +# [3.10.0-alpha.4](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.3...v3.10.0-alpha.4) (2023-09-28) + + +### Bug Fixes + +* add width to plugin documentation [LIBS-487] ([b2c6273](https://github.com/dhis2/app-runtime/commit/b2c62732bf37e6d52b30f155b68c8b126068e8e5)) +* clean up ([e53ecbd](https://github.com/dhis2/app-runtime/commit/e53ecbd0632e35681e135de9072169e6bfefe13c)) +* temporarily disable failing test ([6664199](https://github.com/dhis2/app-runtime/commit/666419955d0f1f70c7b101a49d7440dcd33857a0)) +* working autorsize width ([2991045](https://github.com/dhis2/app-runtime/commit/29910456aca9739848cac403c48a2ac4e64be1e3)) + + +### Features + +* add autoresizing for height ([dbb6e26](https://github.com/dhis2/app-runtime/commit/dbb6e265e0b3b01dfe975538703fcdde7c5f2b53)) + # [3.10.0-alpha.3](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.2...v3.10.0-alpha.3) (2023-08-22) diff --git a/package.json b/package.json index 87969077f..64e5036c7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "3.10.0-alpha.3", + "version": "3.10.0-alpha.4", "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 848bfc25a..e64cc2e83 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.0-alpha.3", + "version": "3.10.0-alpha.4", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", @@ -23,10 +23,10 @@ "build/**" ], "dependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.3", - "@dhis2/app-service-data": "3.10.0-alpha.3", - "@dhis2/app-service-alerts": "3.10.0-alpha.3", - "@dhis2/app-service-offline": "3.10.0-alpha.3" + "@dhis2/app-service-config": "3.10.0-alpha.4", + "@dhis2/app-service-data": "3.10.0-alpha.4", + "@dhis2/app-service-alerts": "3.10.0-alpha.4", + "@dhis2/app-service-offline": "3.10.0-alpha.4" }, "peerDependencies": { "prop-types": "^15.7.2", diff --git a/services/alerts/package.json b/services/alerts/package.json index 1df3a99fa..6e8bee74e 100644 --- a/services/alerts/package.json +++ b/services/alerts/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-alerts", - "version": "3.10.0-alpha.3", + "version": "3.10.0-alpha.4", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", diff --git a/services/config/package.json b/services/config/package.json index 6b87ed413..7fabb85d0 100644 --- a/services/config/package.json +++ b/services/config/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-config", - "version": "3.10.0-alpha.3", + "version": "3.10.0-alpha.4", "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 5d1c95cb7..bcda74c8c 100644 --- a/services/data/package.json +++ b/services/data/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-data", - "version": "3.10.0-alpha.3", + "version": "3.10.0-alpha.4", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -22,7 +22,7 @@ "build/**" ], "peerDependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.3", + "@dhis2/app-service-config": "3.10.0-alpha.4", "@dhis2/cli-app-scripts": "^7.1.1", "prop-types": "^15.7.2", "react": "^16.8", diff --git a/services/offline/package.json b/services/offline/package.json index 8b9bc452e..46047c6eb 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.0-alpha.3", + "version": "3.10.0-alpha.4", "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.0-alpha.3", + "@dhis2/app-service-config": "3.10.0-alpha.4", "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 7aa873bc5..28fc5fa25 100644 --- a/services/plugin/package.json +++ b/services/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-plugin", - "version": "3.10.0-alpha.3", + "version": "3.10.0-alpha.4", "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.0-alpha.3", - "@dhis2/app-service-data": "3.10.0-alpha.3" + "@dhis2/app-service-alerts": "3.10.0-alpha.4", + "@dhis2/app-service-data": "3.10.0-alpha.4" }, "devDependencies": { "@types/post-robot": "^10.0.3" From d62dba6bd435d081c75ab83136d5d0e279dfac80 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 28 Sep 2023 08:45:11 +0000 Subject: [PATCH 7/9] chore(release): cut 3.10.0-alpha.5 [skip ci] # [3.10.0-alpha.5](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.4...v3.10.0-alpha.5) (2023-09-28) ### Bug Fixes * merge issues ([496472a](https://github.com/dhis2/app-runtime/commit/496472a458f745d01890dec505d6ddb9259378d1)) * reset communication on either pluginSource or pluginShortName change ([3fdae5b](https://github.com/dhis2/app-runtime/commit/3fdae5becf3af038fef8ca5f0be7ecec44680600)) * trigger props resend when iframe src changes [LIBS-488] ([f4a6680](https://github.com/dhis2/app-runtime/commit/f4a668004fe2f97d77e3c74a6047246cf358ade4)) * trigger props resend when iframe src changes [LIBS-488] [#1344](https://github.com/dhis2/app-runtime/issues/1344) ([cea7600](https://github.com/dhis2/app-runtime/commit/cea760040d919508b1e13158dbf47ca9ed3686f6)) --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- runtime/package.json | 10 +++++----- services/alerts/package.json | 2 +- services/config/package.json | 2 +- services/data/package.json | 4 ++-- services/offline/package.json | 4 ++-- services/plugin/package.json | 6 +++--- 8 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac6b79348..d48b4a1c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [3.10.0-alpha.5](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.4...v3.10.0-alpha.5) (2023-09-28) + + +### Bug Fixes + +* merge issues ([496472a](https://github.com/dhis2/app-runtime/commit/496472a458f745d01890dec505d6ddb9259378d1)) +* reset communication on either pluginSource or pluginShortName change ([3fdae5b](https://github.com/dhis2/app-runtime/commit/3fdae5becf3af038fef8ca5f0be7ecec44680600)) +* trigger props resend when iframe src changes [LIBS-488] ([f4a6680](https://github.com/dhis2/app-runtime/commit/f4a668004fe2f97d77e3c74a6047246cf358ade4)) +* trigger props resend when iframe src changes [LIBS-488] [#1344](https://github.com/dhis2/app-runtime/issues/1344) ([cea7600](https://github.com/dhis2/app-runtime/commit/cea760040d919508b1e13158dbf47ca9ed3686f6)) + # [3.10.0-alpha.2](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.1...v3.10.0-alpha.2) (2023-03-15) ### Bug Fixes diff --git a/package.json b/package.json index 64e5036c7..663a548be 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "3.10.0-alpha.4", + "version": "3.10.0-alpha.5", "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 e64cc2e83..ff9864043 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.0-alpha.4", + "version": "3.10.0-alpha.5", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", @@ -23,10 +23,10 @@ "build/**" ], "dependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.4", - "@dhis2/app-service-data": "3.10.0-alpha.4", - "@dhis2/app-service-alerts": "3.10.0-alpha.4", - "@dhis2/app-service-offline": "3.10.0-alpha.4" + "@dhis2/app-service-config": "3.10.0-alpha.5", + "@dhis2/app-service-data": "3.10.0-alpha.5", + "@dhis2/app-service-alerts": "3.10.0-alpha.5", + "@dhis2/app-service-offline": "3.10.0-alpha.5" }, "peerDependencies": { "prop-types": "^15.7.2", diff --git a/services/alerts/package.json b/services/alerts/package.json index 6e8bee74e..4cbec023f 100644 --- a/services/alerts/package.json +++ b/services/alerts/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-alerts", - "version": "3.10.0-alpha.4", + "version": "3.10.0-alpha.5", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", diff --git a/services/config/package.json b/services/config/package.json index 7fabb85d0..d99ca7596 100644 --- a/services/config/package.json +++ b/services/config/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-config", - "version": "3.10.0-alpha.4", + "version": "3.10.0-alpha.5", "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 bcda74c8c..b12803666 100644 --- a/services/data/package.json +++ b/services/data/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-data", - "version": "3.10.0-alpha.4", + "version": "3.10.0-alpha.5", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -22,7 +22,7 @@ "build/**" ], "peerDependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.4", + "@dhis2/app-service-config": "3.10.0-alpha.5", "@dhis2/cli-app-scripts": "^7.1.1", "prop-types": "^15.7.2", "react": "^16.8", diff --git a/services/offline/package.json b/services/offline/package.json index 46047c6eb..4215e0c0d 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.0-alpha.4", + "version": "3.10.0-alpha.5", "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.0-alpha.4", + "@dhis2/app-service-config": "3.10.0-alpha.5", "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 28fc5fa25..5225f5266 100644 --- a/services/plugin/package.json +++ b/services/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-plugin", - "version": "3.10.0-alpha.4", + "version": "3.10.0-alpha.5", "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.0-alpha.4", - "@dhis2/app-service-data": "3.10.0-alpha.4" + "@dhis2/app-service-alerts": "3.10.0-alpha.5", + "@dhis2/app-service-data": "3.10.0-alpha.5" }, "devDependencies": { "@types/post-robot": "^10.0.3" From 6d43ae3688814ec3ae1f969123d63bd8e80146ce Mon Sep 17 00:00:00 2001 From: Thomas Zemp Date: Fri, 6 Oct 2023 12:25:21 +0200 Subject: [PATCH 8/9] fix: add back plugin service dependency [LIBS-583] --- runtime/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/package.json b/runtime/package.json index ff9864043..860b4cb67 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -26,7 +26,8 @@ "@dhis2/app-service-config": "3.10.0-alpha.5", "@dhis2/app-service-data": "3.10.0-alpha.5", "@dhis2/app-service-alerts": "3.10.0-alpha.5", - "@dhis2/app-service-offline": "3.10.0-alpha.5" + "@dhis2/app-service-offline": "3.10.0-alpha.5", + "@dhis2/app-service-plugin": "3.10.0-alpha.5" }, "peerDependencies": { "prop-types": "^15.7.2", From 0724236c4176358c91f639be827b425a07297124 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Mon, 9 Oct 2023 09:37:18 +0000 Subject: [PATCH 9/9] chore(release): cut 3.10.0-alpha.6 [skip ci] # [3.10.0-alpha.6](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.5...v3.10.0-alpha.6) (2023-10-09) ### Bug Fixes * add back plugin service dependency [LIBS-583] ([ca10691](https://github.com/dhis2/app-runtime/commit/ca10691ba01be083379db54ea2ec29f1666955a8)) * add back plugin service dependency [LIBS-583] ([6d43ae3](https://github.com/dhis2/app-runtime/commit/6d43ae3688814ec3ae1f969123d63bd8e80146ce)) --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- runtime/package.json | 12 ++++++------ services/alerts/package.json | 2 +- services/config/package.json | 2 +- services/data/package.json | 4 ++-- services/offline/package.json | 4 ++-- services/plugin/package.json | 6 +++--- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d48b4a1c0..2e24f9b4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# [3.10.0-alpha.6](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.5...v3.10.0-alpha.6) (2023-10-09) + + +### Bug Fixes + +* add back plugin service dependency [LIBS-583] ([ca10691](https://github.com/dhis2/app-runtime/commit/ca10691ba01be083379db54ea2ec29f1666955a8)) +* add back plugin service dependency [LIBS-583] ([6d43ae3](https://github.com/dhis2/app-runtime/commit/6d43ae3688814ec3ae1f969123d63bd8e80146ce)) + # [3.10.0-alpha.5](https://github.com/dhis2/app-runtime/compare/v3.10.0-alpha.4...v3.10.0-alpha.5) (2023-09-28) diff --git a/package.json b/package.json index 663a548be..08b686444 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "3.10.0-alpha.5", + "version": "3.10.0-alpha.6", "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 860b4cb67..3fe02cd5a 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.0-alpha.5", + "version": "3.10.0-alpha.6", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", @@ -23,11 +23,11 @@ "build/**" ], "dependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.5", - "@dhis2/app-service-data": "3.10.0-alpha.5", - "@dhis2/app-service-alerts": "3.10.0-alpha.5", - "@dhis2/app-service-offline": "3.10.0-alpha.5", - "@dhis2/app-service-plugin": "3.10.0-alpha.5" + "@dhis2/app-service-config": "3.10.0-alpha.6", + "@dhis2/app-service-data": "3.10.0-alpha.6", + "@dhis2/app-service-alerts": "3.10.0-alpha.6", + "@dhis2/app-service-offline": "3.10.0-alpha.6", + "@dhis2/app-service-plugin": "3.10.0-alpha.6" }, "peerDependencies": { "prop-types": "^15.7.2", diff --git a/services/alerts/package.json b/services/alerts/package.json index 4cbec023f..2d16ecbbb 100644 --- a/services/alerts/package.json +++ b/services/alerts/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-alerts", - "version": "3.10.0-alpha.5", + "version": "3.10.0-alpha.6", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "./build/types/index.d.ts", diff --git a/services/config/package.json b/services/config/package.json index d99ca7596..018f466f1 100644 --- a/services/config/package.json +++ b/services/config/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-config", - "version": "3.10.0-alpha.5", + "version": "3.10.0-alpha.6", "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 b12803666..1674f7ebc 100644 --- a/services/data/package.json +++ b/services/data/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-data", - "version": "3.10.0-alpha.5", + "version": "3.10.0-alpha.6", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "types": "build/types/index.d.ts", @@ -22,7 +22,7 @@ "build/**" ], "peerDependencies": { - "@dhis2/app-service-config": "3.10.0-alpha.5", + "@dhis2/app-service-config": "3.10.0-alpha.6", "@dhis2/cli-app-scripts": "^7.1.1", "prop-types": "^15.7.2", "react": "^16.8", diff --git a/services/offline/package.json b/services/offline/package.json index 4215e0c0d..31f3b0046 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.0-alpha.5", + "version": "3.10.0-alpha.6", "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.0-alpha.5", + "@dhis2/app-service-config": "3.10.0-alpha.6", "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 5225f5266..69c01221b 100644 --- a/services/plugin/package.json +++ b/services/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-service-plugin", - "version": "3.10.0-alpha.5", + "version": "3.10.0-alpha.6", "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.0-alpha.5", - "@dhis2/app-service-data": "3.10.0-alpha.5" + "@dhis2/app-service-alerts": "3.10.0-alpha.6", + "@dhis2/app-service-data": "3.10.0-alpha.6" }, "devDependencies": { "@types/post-robot": "^10.0.3"