Chore: constraint context field legal values improvement (#6729)

Improves how we show context field legal values in the new strategy configuration. Refactored makeStyles to styled components Closes # [1-2235](https://linear.app/unleash/issue/1-2235/context-field-ui-in-strategy-configuration) Before: ![Screenshot 2024-03-28 at 12 19 12](https://github.com/Unleash/unleash/assets/104830839/43c62cf4-f344-476f-9ef6-75e388fab000) After: ![Screenshot 2024-03-28 at 13 03 46](https://github.com/Unleash/unleash/assets/104830839/16dd03e0-bc67-402b-ba54-56fa1af136a5) Signed-off-by: andreas-unleash <[email protected]>
Unleash · Mar 28, 2024 · 81aff26 · 81aff26
1 parent d3847fd
commit 81aff26
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 41 deletions.
diff --git a/...traintAccordionEdit/ConstraintAccordionEditBody/LegalValueLabel/LegalValueLabel.styles.ts b/...traintAccordionEdit/ConstraintAccordionEditBody/LegalValueLabel/LegalValueLabel.styles.ts
@@ -1,17 +1,24 @@
-import { makeStyles } from 'tss-react/mui';
+import { styled } from '@mui/material';
 
-export const useStyles = makeStyles()((theme) => ({
-    container: {
-        display: 'inline-block',
-        wordBreak: 'break-word',
-    },
-    value: {
-        lineHeight: 1.33,
-        fontSize: theme.fontSizes.smallBody,
-    },
-    description: {
-        lineHeight: 1.33,
-        fontSize: theme.fontSizes.smallerBody,
-        color: theme.palette.action.active,
+export const StyledContainer = styled('div')(({ theme }) => ({
+    display: 'inline-block',
+    wordBreak: 'break-word',
+    padding: theme.spacing(0.5, 1),
+    background: theme.palette.common.white,
+    border: `1px solid ${theme.palette.divider}`,
+    borderRadius: theme.shape.borderRadius,
+
+    '&:hover': {
+        border: `2px solid ${theme.palette.primary.main}`,
     },
 }));
+
+export const StyledValue = styled('div')(({ theme }) => ({
+    lineHeight: 1.33,
+    fontSize: theme.fontSizes.smallBody,
+}));
+export const StyledDescription = styled('div')(({ theme }) => ({
+    lineHeight: 1.33,
+    fontSize: theme.fontSizes.smallerBody,
+    color: theme.palette.action.active,
+}));
diff --git a/...n/ConstraintAccordionEdit/ConstraintAccordionEditBody/LegalValueLabel/LegalValueLabel.tsx b/...n/ConstraintAccordionEdit/ConstraintAccordionEditBody/LegalValueLabel/LegalValueLabel.tsx
@@ -1,5 +1,9 @@
 import type { ILegalValue } from 'interfaces/context';
-import { useStyles } from './LegalValueLabel.styles';
+import {
+    StyledContainer,
+    StyledValue,
+    StyledDescription,
+} from './LegalValueLabel.styles';
 import type React from 'react';
 import { FormControlLabel } from '@mui/material';
 
@@ -9,23 +13,21 @@ interface ILegalValueTextProps {
 }
 
 export const LegalValueLabel = ({ legal, control }: ILegalValueTextProps) => {
-    const { classes: styles } = useStyles();
-
     return (
-        <div className={styles.container}>
+        <StyledContainer>
             <FormControlLabel
                 value={legal.value}
                 control={control}
                 label={
                     <>
-                        <div className={styles.value}>{legal.value}</div>
-                        <div className={styles.description}>
+                        <StyledValue>{legal.value}</StyledValue>
+                        <StyledDescription>
                             {legal.description}
-                        </div>
+                        </StyledDescription>
                     </>
                 }
             />
-        </div>
+        </StyledContainer>
     );
 };
 

diff --git a/...cordionEdit/ConstraintAccordionEditBody/RestrictiveLegalValues/RestrictiveLegalValues.tsx b/...cordionEdit/ConstraintAccordionEditBody/RestrictiveLegalValues/RestrictiveLegalValues.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
-import { Alert, Checkbox } from '@mui/material';
+import { Alert, Checkbox, styled } from '@mui/material';
 import { useThemeStyles } from 'themes/themeStyles';
 import { ConstraintValueSearch } from 'component/common/ConstraintAccordion/ConstraintValueSearch/ConstraintValueSearch';
 import { ConstraintFormHeader } from '../ConstraintFormHeader/ConstraintFormHeader';
@@ -50,6 +50,17 @@ export const getIllegalValues = (
     return constraintValues.filter((value) => deletedValuesSet.has(value));
 };
 
+const StyledValuesContainer = styled('div')(({ theme }) => ({
+    display: 'flex',
+    flexWrap: 'wrap',
+    gap: theme.spacing(1),
+    padding: theme.spacing(2),
+    border: `1px solid ${theme.palette.divider}`,
+    borderRadius: theme.shape.borderRadiusMedium,
+    maxHeight: '378px',
+    overflow: 'auto',
+}));
+
 export const RestrictiveLegalValues = ({
     data,
     values,
@@ -136,24 +147,25 @@ export const RestrictiveLegalValues = ({
                     />
                 }
             />
-            {filteredValues.map((match) => (
-                <LegalValueLabel
-                    key={match.value}
-                    legal={match}
-                    control={
-                        <Checkbox
-                            checked={Boolean(valuesMap[match.value])}
-                            onChange={() => onChange(match.value)}
-                            name={match.value}
-                            color='primary'
-                            disabled={deletedLegalValues
-                                .map(({ value }) => value)
-                                .includes(match.value)}
-                        />
-                    }
-                />
-            ))}
-
+            <StyledValuesContainer>
+                {filteredValues.map((match) => (
+                    <LegalValueLabel
+                        key={match.value}
+                        legal={match}
+                        control={
+                            <Checkbox
+                                checked={Boolean(valuesMap[match.value])}
+                                onChange={() => onChange(match.value)}
+                                name={match.value}
+                                color='primary'
+                                disabled={deletedLegalValues
+                                    .map(({ value }) => value)
+                                    .includes(match.value)}
+                            />
+                        }
+                    />
+                ))}
+            </StyledValuesContainer>
             <ConditionallyRender
                 condition={Boolean(error)}
                 show={<p className={styles.error}>{error}</p>}