Skip to content

Commit

Permalink
UAT feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
TheAndrewJackson committed Dec 6, 2023
1 parent 97ba3a9 commit 5f1490b
Showing 1 changed file with 31 additions and 16 deletions.
47 changes: 31 additions & 16 deletions clients/admin-ui/src/pages/management/consent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
selectPurposes,
useGetPurposesQuery,
} from "~/features/common/purpose.slice";
import QuestionTooltip from "~/features/common/QuestionTooltip";
import { errorToastParams, successToastParams } from "~/features/common/toast";
import {
useGetHealthQuery,
Expand Down Expand Up @@ -166,7 +167,7 @@ const ConsentConfigPage: NextPage = () => {
if (isErrorResult(result)) {
const errorMsg = getErrorMessage(
result.error,
`An unexpected error occurred while saving TCF Purpose Override setting. Please try again.`
`An unexpected error occurred while saving vendor override settings. Please try again.`
);
toast(errorToastParams(errorMsg));
}
Expand All @@ -179,7 +180,6 @@ const ConsentConfigPage: NextPage = () => {
});

if (e.target.checked) {
console.log("toggling off");
await patchTcfPurposeOverridesTrigger(
tcfPurposeOverrides!.map((po) => ({
...po,
Expand Down Expand Up @@ -245,7 +245,7 @@ const ConsentConfigPage: NextPage = () => {
fontWeight="medium"
color="gray.700"
>
TCF status:{" "}
TCF status{" "}
{isTcfEnabled ? (
<Badge backgroundColor="green.100">Enabled </Badge>
) : (
Expand All @@ -259,8 +259,11 @@ const ConsentConfigPage: NextPage = () => {
color="gray.700"
>
To {isTcfEnabled ? "disable" : "enable"} TCF, please contact
your Fides Administrator or{" "}
<DocsLink href="https://ethyca.com">Ethyca support</DocsLink>.
your Fides administrator or{" "}
<DocsLink href="mailto:[email protected]">
Ethyca support
</DocsLink>
.
</Text>
</Box>

Expand All @@ -282,21 +285,33 @@ const ConsentConfigPage: NextPage = () => {
{isTcfEnabled ? (
<>
<Text
marginBottom={2}
mb={2}
fontSize="sm"
lineHeight="5"
fontWeight="medium"
color="gray.700"
>
Override vendor purposes:{" "}
Configure overrides for TCF related purposes.
</Text>
<Flex alignItems="center" marginBottom={2}>
<Switch
size="sm"
colorScheme="purple"
isChecked={isOverrideEnabled}
onChange={handleOverrideOnChange}
isDisabled={isPatchConfigSettingsLoading}
/>
</Text>
<Text
px={2}
fontSize="sm"
lineHeight="5"
fontWeight="medium"
color="gray.700"
>
Override vendor purposes
</Text>
<QuestionTooltip label="Toggle on if you want to globally change any flexible legal bases or remove TCF purposes from your CMP" />
</Flex>
<Text
mb={2}
fontSize="sm"
Expand All @@ -306,7 +321,7 @@ const ConsentConfigPage: NextPage = () => {
>
{isOverrideEnabled
? "The table below allows you to adjust which TCF purposes you allow as part of your user facing notices and business activites."
: "Toggle on if you want to globally change any flexible legal bases or remove TCF purposes from your CMP."}
: null}
</Text>
</>
) : null}
Expand All @@ -318,10 +333,10 @@ const ConsentConfigPage: NextPage = () => {
color="gray.700"
>
To configure this section, select the purposes you allow and
where available, the appropriate legal basis (either Consent
or Legitimate Interest). Read the guide on{" "}
<DocsLink href="https://ethyca.com">
TCF Override here.{" "}
where available, the appropriate legal bases (either Consent
or Legitimate Interest).{" "}
<DocsLink href="https://fid.es/tcf-overrides">
Read the guide on vendor overrides here.{" "}
</DocsLink>
</Text>
) : null}
Expand Down Expand Up @@ -373,7 +388,7 @@ const ConsentConfigPage: NextPage = () => {
fontWeight="medium"
lineHeight="4"
>
Include in CMP
Allowed
</Text>
</Flex>
<Flex
Expand All @@ -388,7 +403,7 @@ const ConsentConfigPage: NextPage = () => {
fontWeight="medium"
lineHeight="4"
>
Require Consent
Consent
</Text>
</Flex>
<Flex flex="1" alignItems="center">
Expand All @@ -398,7 +413,7 @@ const ConsentConfigPage: NextPage = () => {
fontWeight="medium"
lineHeight="4"
>
Use Legitmate Interest
Legitimate interest
</Text>
</Flex>
</Flex>
Expand Down

0 comments on commit 5f1490b

Please sign in to comment.