Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Classify data category dropdown #1110

Merged
merged 17 commits into from
Oct 3, 2022
Merged

Classify data category dropdown #1110

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0332ad4
Refactor DataCategoryInput so it can be reused
allisonking Sep 21, 2022
883649e
Initial ClassifiedDataCategoryInput
allisonking Sep 21, 2022
48b5e45
Handle change from classified select
allisonking Sep 22, 2022
d1e5406
Add remove logic
allisonking Sep 22, 2022
36f532a
Add playground
allisonking Sep 22, 2022
1af79c2
Rename ClassifiedDataCategoryInput --> ClassifiedDataCategoryDropdown
allisonking Sep 22, 2022
70dbedc
Update changelog
allisonking Sep 22, 2022
ef99caa
Render fides_key instead of name
allisonking Sep 22, 2022
9d6ac6f
Merge branch 'main' into aking-1077-classify-data-category-dropdown
allisonking Sep 26, 2022
c911795
Pull DataCategoryInput into its own file
allisonking Sep 26, 2022
e8b0747
Wrap cypress component testing in redux provider wrapper so that comp…
allisonking Sep 26, 2022
2d56db7
Update tests for DataCategoryInput to handle classified version
allisonking Sep 26, 2022
e3a7eea
Enable rendering ClassifiedDataCategoryDropdown when plus is available
allisonking Sep 26, 2022
4cabdca
Allow categories without confidences to show up in select box
allisonking Sep 27, 2022
f6ab5ff
Merge branch 'main' into aking-1077-classify-data-category-dropdown
ssangervasi Sep 30, 2022
f44d93f
Fixed confidence precision in category dropdown
ssangervasi Oct 1, 2022
d81c659
sq merg
ssangervasi Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions clients/ctl/admin-ui/src/features/dataset/DataCategoryInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { Box, FormLabel, Grid, Stack } from "@fidesui/react";

import { DataCategory } from "~/types/api";

import { useFeatures } from "../common/features.slice";
import QuestionTooltip from "../common/QuestionTooltip";
import TaxonomyEntityTag from "../taxonomy/TaxonomyEntityTag";
import ClassifiedDataCategoryDropdown from "./ClassifiedDataCategoryDropdown";
import DataCategoryDropdown from "./DataCategoryDropdown";

export interface Props {
Expand All @@ -19,6 +21,7 @@ const DataCategoryInput = ({
onChecked,
tooltip,
}: Props) => {
const features = useFeatures();
const handleRemoveDataCategory = (dataCategoryName: string) => {
onChecked(checked.filter((dc) => dc !== dataCategoryName));
};
Expand All @@ -33,11 +36,23 @@ const DataCategoryInput = ({
<Stack>
<Box display="flex" alignItems="center">
<Box mr="2" width="100%">
<DataCategoryDropdown
dataCategories={dataCategories}
checked={checked}
onChecked={onChecked}
/>
{features.plus ? (
<ClassifiedDataCategoryDropdown
dataCategories={dataCategories}
// TODO: make this real
mostLikelyCategories={dataCategories
.slice(0, 5)
.map((d) => ({ ...d, confidence: 97 }))}
checked={checked}
onChecked={onChecked}
/>
) : (
<DataCategoryDropdown
dataCategories={dataCategories}
checked={checked}
onChecked={onChecked}
/>
)}
ssangervasi marked this conversation as resolved.
Show resolved Hide resolved
</Box>
<QuestionTooltip label={tooltip} />
</Box>
Expand Down