From ae296e75d9a16b7e252e61aa0322fa61494d7688 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Thu, 23 Feb 2023 21:43:30 +0000 Subject: [PATCH 1/2] include feature flag check in helper (#2675) --- CHANGELOG.md | 10 +++++++--- clients/admin-ui/src/features/dataset/helpers.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff4f6cc762..91d268f769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,16 @@ The types of changes are: ## [Unreleased](https://github.com/ethyca/fides/compare/2.7.0...main) +### Fixed + +* Fix error with the classify dataset feature flag not writing the dataset to the server [#2675](https://github.com/ethyca/fides/pull/2675) + ## [2.7.0](https://github.com/ethyca/fides/compare/2.6.6...2.7.0) * Fides API * Access and erasure support for Braintree [#2223](https://github.com/ethyca/fides/pull/2223) * Added route to send a test message [#2585](https://github.com/ethyca/fides/pull/2585) - + * Admin UI * Custom Metadata [#2536](https://github.com/ethyca/fides/pull/2536) * Create Custom Lists @@ -133,7 +137,7 @@ The types of changes are: * Patch Google Analytics Consent Connector to delete by client_id [#2355](https://github.com/ethyca/fides/pull/2355) * Add a "skip_param_values option" to optionally skip when we are missing param values in the body [#2384](https://github.com/ethyca/fides/pull/2384) * Adds a new Universal Analytics Connector that works with the UA Tracking Id - + ### Changed * Unified Fides Resources @@ -154,7 +158,7 @@ The types of changes are: ### Developer Experience -* `nox -s test_env` has been replaced with `nox -s "fides_env(dev)"` +* `nox -s test_env` has been replaced with `nox -s "fides_env(dev)"` * New command `nox -s "fides_env(test)"` creates a complete test environment with seed data (similar to `fides_env(dev)`) but with the production fides image so the built UI can be accessed at `localhost:8080` [#2399](https://github.com/ethyca/fides/pull/2399) * Change from code climate to codecov for coverage reporting [#2402](https://github.com/ethyca/fides/pull/2402) diff --git a/clients/admin-ui/src/features/dataset/helpers.ts b/clients/admin-ui/src/features/dataset/helpers.ts index 87ed21f558..a7b0096091 100644 --- a/clients/admin-ui/src/features/dataset/helpers.ts +++ b/clients/admin-ui/src/features/dataset/helpers.ts @@ -98,7 +98,7 @@ export const getUpdatedDatasetFromClassifyDataset = ( draftCollection.name ); - if (classifyCollection?.name !== activeCollection) { + if (activeCollection && classifyCollection?.name !== activeCollection) { return; } From c86b56184344892ea70371a65ad18467a8e70ce1 Mon Sep 17 00:00:00 2001 From: SteveDMurphy Date: Thu, 2 Mar 2023 16:46:22 +0000 Subject: [PATCH 2/2] ready changelog for 2.7.1 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91d268f769..5e698ea1b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,9 @@ The types of changes are: * `Fixed` for any bug fixes. * `Security` in case of vulnerabilities. -## [Unreleased](https://github.com/ethyca/fides/compare/2.7.0...main) +## [Unreleased](https://github.com/ethyca/fides/compare/2.7.1...main) + +## [2.7.1](https://github.com/ethyca/fides/compare/2.7.0...2.7.1) ### Fixed