ENG-1684 - Show approved status in D&D (#6794)

Author: vcruces

CHANGELOG.md

@@ -19,7 +19,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - https://github.com/ethyca/fides/labels/high-risk: to indicate that a change is a "high-risk" change that could potentially lead to unanticipated regressions or degradations
 - https://github.com/ethyca/fides/labels/db-migration: to indicate that a given change includes a DB migration
 
-## [Unreleased](https://github.com/ethyca/fides/compare/2.72.2..main)
+## [Unreleased](https://github.com/ethyca/fides/compare/2.72.3..main)
 
 ### Added
 - Added support for new experience config to delete cookie based on host domain [#6706](https://github.com/ethyca/fides/pull/6706)
@@ -34,6 +34,11 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - Fixed an issue where the FidesJS would sometimes incorrectly display "GPC Overridden" on initial load. [#6728](https://github.com/ethyca/fides/pull/6728)
 - Allow external provider consent migration to get saved to BE [#6747](https://github.com/ethyca/fides/pull/6747)
 
+## [2.72.3](https://github.com/ethyca/fides/compare/2.72.2...2.72.3)
+
+### Fixed
+- Support fields in "Approved" status in D&D [#6794](https://github.com/ethyca/fides/pull/6794)
+
 ## [2.72.2](https://github.com/ethyca/fides/compare/2.72.1...2.72.2)
 
 ### Changed

clients/admin-ui/src/features/data-discovery-and-detection/hooks/useDiscoveryResultsFilterTabs.tsx

@@ -15,10 +15,12 @@ const TAB_MAP: Record<DiscoveryResultFilterTabs, FilterTab> = {
     filters: [
       DiffStatus.CLASSIFICATION_ADDITION,
       DiffStatus.CLASSIFICATION_UPDATE,
+      DiffStatus.APPROVED,
     ],
     childFilters: [
       DiffStatus.CLASSIFICATION_ADDITION,
       DiffStatus.CLASSIFICATION_UPDATE,
+      DiffStatus.APPROVED,
     ],
   },
   [DiscoveryResultFilterTabs.IN_PROGRESS]: {

clients/admin-ui/src/features/data-discovery-and-detection/tables/cells/DetectionItemActionsCell.tsx

@@ -108,7 +108,8 @@ const DetectionItemActionsCell = ({
   const hasClassificationChanges =
     childDiffStatus &&
     (childDiffStatus[DiffStatus.CLASSIFICATION_ADDITION] ||
-      childDiffStatus[DiffStatus.CLASSIFICATION_UPDATE]);
+      childDiffStatus[DiffStatus.CLASSIFICATION_UPDATE] ||
+      childDiffStatus[DiffStatus.APPROVED]);
 
   const showStartMonitoringAction =
     (isSchemaType && diffStatus === undefined) ||

clients/admin-ui/src/features/data-discovery-and-detection/tables/cells/DiscoveryItemActionsCell.tsx

@@ -54,12 +54,14 @@ const DiscoveryItemActionsCell = ({ resource }: DiscoveryItemActionsProps) => {
 
   const itemHasClassificationChanges =
     diffStatus === DiffStatus.CLASSIFICATION_ADDITION ||
-    diffStatus === DiffStatus.CLASSIFICATION_UPDATE;
+    diffStatus === DiffStatus.CLASSIFICATION_UPDATE ||
+    diffStatus === DiffStatus.APPROVED;
 
   const childItemsHaveClassificationChanges =
     childDiffStatus &&
     (childDiffStatus[DiffStatus.CLASSIFICATION_ADDITION] ||
-      childDiffStatus[DiffStatus.CLASSIFICATION_UPDATE]);
+      childDiffStatus[DiffStatus.CLASSIFICATION_UPDATE] ||
+      childDiffStatus[DiffStatus.APPROVED]);
 
   const showPromoteAction =
     (itemHasClassificationChanges || childItemsHaveClassificationChanges) &&

clients/admin-ui/src/features/data-discovery-and-detection/utils/findResourceChangeType.ts

@@ -18,7 +18,8 @@ const findResourceChangeType = (resource: StagedResourceAPIResponse) => {
 
   if (
     resource.diff_status === DiffStatus.CLASSIFICATION_ADDITION ||
-    resource.diff_status === DiffStatus.CLASSIFICATION_UPDATE
+    resource.diff_status === DiffStatus.CLASSIFICATION_UPDATE ||
+    resource.diff_status === DiffStatus.APPROVED
   ) {
     return ResourceChangeType.CLASSIFICATION;
   }
@@ -35,7 +36,8 @@ const findResourceChangeType = (resource: StagedResourceAPIResponse) => {
 
   if (
     resource.child_diff_statuses[DiffStatus.CLASSIFICATION_ADDITION] ||
-    resource.child_diff_statuses[DiffStatus.CLASSIFICATION_UPDATE]
+    resource.child_diff_statuses[DiffStatus.CLASSIFICATION_UPDATE] ||
+    resource.child_diff_statuses[DiffStatus.APPROVED]
   ) {
     return ResourceChangeType.CLASSIFICATION;
   }