diff --git a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/Condition.tsx b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/Condition.tsx index 5c79bf192..840a80aa6 100644 --- a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/Condition.tsx +++ b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/Condition.tsx @@ -105,10 +105,10 @@ export const Condition = ({ onDelete, prefix = "", deletable, containerProps }: alignItems="flex-start" {...containerProps} borderRadius="md" - outline={isFocused ? `2px solid ${getChakraColor("whiteAlpha.600")}` : undefined} + outline={isFocused ? `2px solid ${getChakraColor("blue.300")}` : undefined} bg={isFocused ? "blackAlpha.500" : undefined} _hover={{ - outline: `2px solid ${getChakraColor("whiteAlpha.800")} !important`, + outline: `2px solid ${getChakraColor("blue.100")} !important`, background: "blackAlpha.700", }} pt={2} diff --git a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/LogicalExpressionForm.tsx b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/LogicalExpressionForm.tsx index 9be60902a..3feebee26 100644 --- a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/LogicalExpressionForm.tsx +++ b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/LogicalExpressionForm.tsx @@ -3,7 +3,6 @@ import { Box, BoxProps, Button, - CloseButton, Divider, Flex, FormControl, @@ -158,30 +157,26 @@ export const LogicalExpressionForm = ({ onDeleted, prefix = "", containerProps } // overflow="auto" bg={isFocused ? "blackAlpha.500" : undefined} outlineOffset={4} - outline={isFocused ? `2px solid ${getChakraColor("whiteAlpha.600")}` : undefined} + outline={isFocused ? `2px solid ${getChakraColor("blue.300")}` : undefined} _hover={{ - outline: `2px solid ${getChakraColor("whiteAlpha.800")} !important`, + outline: `2px solid ${getChakraColor("blue.100")} !important`, background: "blackAlpha.700", }} > - {({ onClick, isFocused, isExpanded }) => { + {({ onClick }) => { return ( - {isExpanded ? ( - - ) : ( - - )} + {isExpanded ? : } Condition Group @@ -205,7 +200,7 @@ export const LogicalExpressionForm = ({ onDeleted, prefix = "", containerProps } {isExpanded && ( {!!fields.length && ( - + {(fields as Array)?.map((child, childIndex) => { const childPrefix = `${prefix}children.${childIndex}.`; @@ -266,14 +261,12 @@ export const LogicalExpressionForm = ({ onDeleted, prefix = "", containerProps } - diff --git a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/index.tsx b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/index.tsx index 877fd51a5..5dc29be14 100644 --- a/services/backend-api/client/src/features/feedConnections/components/FiltersForm/index.tsx +++ b/services/backend-api/client/src/features/feedConnections/components/FiltersForm/index.tsx @@ -49,7 +49,6 @@ export const FiltersForm = ({ control, formState: { isDirty, isSubmitting }, setValue, - resetField, reset, } = formMethods; @@ -59,11 +58,6 @@ export const FiltersForm = ({ name: "expression", }); - const onClickReset = (e?: React.MouseEvent) => { - e?.preventDefault(); - resetField("expression"); - }; - const onDeletedExpression = async () => { setValue("expression", null, { shouldDirty: true,