From d6209494bc7f40a718d0964fc3a5d6fa74981ad9 Mon Sep 17 00:00:00 2001 From: Rithvik Reddy Koripelli Date: Sat, 28 Jan 2023 21:28:38 +0530 Subject: [PATCH 1/3] fix: use correct update strategy for metadata import [DHIS-12479] --- src/components/Inputs/ImportStrategy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Inputs/ImportStrategy.js b/src/components/Inputs/ImportStrategy.js index f13954210..8234808ae 100644 --- a/src/components/Inputs/ImportStrategy.js +++ b/src/components/Inputs/ImportStrategy.js @@ -16,7 +16,7 @@ const importStrategyOptions = [ prefix: i18n.t('Append'), }, { - value: 'UPDATES', + value: 'UPDATE', label: i18n.t('Only update existing values, ignore new values'), prefix: i18n.t('Update'), }, From 413fe4d96d73d44ffb9812b557b692eacdebb51f Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 8 Feb 2023 14:20:50 +0000 Subject: [PATCH 2/3] chore(release): cut 1.5.19 [skip ci] ## [1.5.19](https://github.com/dhis2/import-export-app/compare/v1.5.18...v1.5.19) (2023-02-08) ### Bug Fixes * use correct update strategy for metadata import [DHIS-12479] ([d620949](https://github.com/dhis2/import-export-app/commit/d6209494bc7f40a718d0964fc3a5d6fa74981ad9)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02fee38bd..c60c0e756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.5.19](https://github.com/dhis2/import-export-app/compare/v1.5.18...v1.5.19) (2023-02-08) + + +### Bug Fixes + +* use correct update strategy for metadata import [DHIS-12479] ([d620949](https://github.com/dhis2/import-export-app/commit/d6209494bc7f40a718d0964fc3a5d6fa74981ad9)) + ## [1.5.18](https://github.com/dhis2/import-export-app/compare/v1.5.17...v1.5.18) (2023-01-10) diff --git a/package.json b/package.json index 39766d588..4c44d394e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "import-export-app", - "version": "1.5.18", + "version": "1.5.19", "description": "", "license": "BSD-3-Clause", "private": true, From 3df4b2a81cf82faf1e5f3bf152bb4869316acd5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 14:21:48 +0000 Subject: [PATCH 3/3] chore(deps): bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6cd014376..98248378b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10790,9 +10790,9 @@ json-stringify-safe@~5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0"