Taxonomy toggle fixes (#3860)

ethyca · Jul 25, 2023 · 34d4e0d · 34d4e0d
1 parent 538a31b
commit 34d4e0d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/clients/admin-ui/src/features/data-subjects/data-subject.slice.ts b/clients/admin-ui/src/features/data-subjects/data-subject.slice.ts
@@ -69,6 +69,11 @@ export const selectDataSubjects: (state: RootState) => DataSubject[] =
     (RootState, { data }) => data ?? emptyDataSubjects
   );
 
+export const selectEnabledDataSubjects = createSelector(
+  selectDataSubjects,
+  (dataSubjects) => dataSubjects.filter((ds) => ds.active) ?? emptyDataSubjects
+);
+
 export const selectDataSubjectsMap = createSelector(
   selectDataSubjects,
   (dataSubjects) =>

diff --git a/clients/admin-ui/src/features/data-use/data-use.slice.ts b/clients/admin-ui/src/features/data-use/data-use.slice.ts
@@ -83,6 +83,11 @@ export const selectDataUseOptions = createSelector(selectDataUses, (dataUses) =>
   }))
 );
 
+export const selectEnabledDataUses = createSelector(
+  selectDataUses,
+  (dataUses) => dataUses.filter((du) => du.active)
+);
+
 export const selectEnabledDataUseOptions = createSelector(
   selectDataUses,
   (dataUses) =>

diff --git a/clients/admin-ui/src/features/datamap/datamap-drawer/DatamapDrawer.tsx b/clients/admin-ui/src/features/datamap/datamap-drawer/DatamapDrawer.tsx
@@ -28,6 +28,7 @@ const DatamapDrawer = ({
   const isOpen = useMemo(() => Boolean(selectedSystemId), [selectedSystemId]);
   const { isLoading, ...dataProps } = usePrivacyDeclarationData({
     includeDatasets: false,
+    includeDisabled: false,
   });
 
   const { data: system } = useGetSystemByFidesKeyQuery(selectedSystemId!, {

diff --git a/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationStep.tsx b/clients/admin-ui/src/features/system/privacy-declarations/PrivacyDeclarationStep.tsx
@@ -13,6 +13,7 @@ interface Props {
 const PrivacyDeclarationStep = ({ system }: Props) => {
   const { isLoading, ...dataProps } = usePrivacyDeclarationData({
     includeDatasets: true,
+    includeDisabled: false,
   });
 
   const allEnabledDataCategories = dataProps.allDataCategories.filter(

diff --git a/clients/admin-ui/src/features/system/privacy-declarations/hooks.ts b/clients/admin-ui/src/features/system/privacy-declarations/hooks.ts
@@ -1,10 +1,12 @@
 import { useAppSelector } from "~/app/hooks";
 import {
   selectDataSubjects,
+  selectEnabledDataSubjects,
   useGetAllDataSubjectsQuery,
 } from "~/features/data-subjects/data-subject.slice";
 import {
   selectDataUses,
+  selectEnabledDataUses,
   useGetAllDataUsesQuery,
 } from "~/features/data-use/data-use.slice";
 import {
@@ -13,6 +15,7 @@ import {
 } from "~/features/dataset";
 import {
   selectDataCategories,
+  selectEnabledDataCategories,
   useGetAllDataCategoriesQuery,
 } from "~/features/taxonomy";
 
@@ -23,8 +26,10 @@ import {
  */
 export const usePrivacyDeclarationData = ({
   includeDatasets,
+  includeDisabled,
 }: {
   includeDatasets?: boolean;
+  includeDisabled?: boolean;
 }) => {
   // Query subscriptions:
   const { isLoading: isLoadingDataCategories } = useGetAllDataCategoriesQuery();
@@ -40,8 +45,11 @@ export const usePrivacyDeclarationData = ({
   );
 
   const allDataCategories = useAppSelector(selectDataCategories);
+  const enabledDataCategories = useAppSelector(selectEnabledDataCategories);
   const allDataSubjects = useAppSelector(selectDataSubjects);
+  const enabledDataSubjects = useAppSelector(selectEnabledDataSubjects);
   const allDataUses = useAppSelector(selectDataUses);
+  const enabledDataUses = useAppSelector(selectEnabledDataUses);
   const allDatasets = useAppSelector(selectAllFilteredDatasets);
 
   const isLoading =
@@ -51,9 +59,11 @@ export const usePrivacyDeclarationData = ({
     isLoadingDatasets;
 
   return {
-    allDataCategories,
-    allDataSubjects,
-    allDataUses,
+    allDataCategories: includeDisabled
+      ? allDataCategories
+      : enabledDataCategories,
+    allDataSubjects: includeDisabled ? allDataSubjects : enabledDataSubjects,
+    allDataUses: includeDisabled ? allDataUses : enabledDataUses,
     allDatasets: includeDatasets ? allDatasets : undefined,
     isLoading,
   };

diff --git a/clients/admin-ui/src/features/taxonomy/taxonomy.slice.ts b/clients/admin-ui/src/features/taxonomy/taxonomy.slice.ts
@@ -79,6 +79,12 @@ export const selectDataCategories: (state: RootState) => DataCategory[] =
     ({ data }) => data ?? emptyDataCategories
   );
 
+export const selectEnabledDataCategories: (state: RootState) => DataCategory[] =
+  createSelector(
+    taxonomyApi.endpoints.getAllDataCategories.select(),
+    ({ data }) => data?.filter((dc) => dc.active) ?? emptyDataCategories
+  );
+
 export const selectDataCategoriesMap: (
   state: RootState
 ) => Map<string, DataCategory> = createSelector(