1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00

Constraint View header adjustments

This commit is contained in:
andreas-unleash 2022-07-21 15:27:29 +03:00
parent 9316b633a2
commit c16272ec26
8 changed files with 23 additions and 26 deletions

View File

@ -49,7 +49,7 @@ export const useStyles = makeStyles()(theme => ({
headerValuesContainerWrapper: { headerValuesContainerWrapper: {
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
justifyContent: 'center' justifyContent: 'center',
}, },
headerValuesContainer: { headerValuesContainer: {
display: 'flex', display: 'flex',

View File

@ -1,8 +1,7 @@
import { Button, FormControlLabel, Switch } from '@mui/material'; import { Button } from '@mui/material';
import { IConstraint } from 'interfaces/strategy'; import { IConstraint } from 'interfaces/strategy';
import { CANCEL } from '../ConstraintAccordionEdit'; import { CANCEL } from '../ConstraintAccordionEdit';
import { ConstraintFormHeader } from './ConstraintFormHeader/ConstraintFormHeader';
import { useStyles } from './ConstraintAccordionEditBody.styles'; import { useStyles } from './ConstraintAccordionEditBody.styles';
import React from 'react'; import React from 'react';
import { newOperators } from 'constants/operators'; import { newOperators } from 'constants/operators';

View File

@ -1,6 +1,5 @@
import { IUnleashContextDefinition } from 'interfaces/context'; import { IUnleashContextDefinition } from 'interfaces/context';
import { IConstraint } from 'interfaces/strategy'; import { IConstraint } from 'interfaces/strategy';
import { CaseInsensitive } from '../CaseInsensitive/CaseInsensitive';
import { DateSingleValue } from '../DateSingleValue/DateSingleValue'; import { DateSingleValue } from '../DateSingleValue/DateSingleValue';
import { FreeTextInput } from '../FreeTextInput/FreeTextInput'; import { FreeTextInput } from '../FreeTextInput/FreeTextInput';
import { RestrictiveLegalValues } from '../RestrictiveLegalValues/RestrictiveLegalValues'; import { RestrictiveLegalValues } from '../RestrictiveLegalValues/RestrictiveLegalValues';

View File

@ -4,7 +4,7 @@ import { useStyles } from 'component/common/ConstraintAccordion/ConstraintAccord
import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext';
import GeneralSelect from 'component/common/GeneralSelect/GeneralSelect'; import GeneralSelect from 'component/common/GeneralSelect/GeneralSelect';
import { ConstraintIcon } from 'component/common/ConstraintAccordion/ConstraintIcon'; import { ConstraintIcon } from 'component/common/ConstraintAccordion/ConstraintIcon';
import { Delete, Edit, Help } from '@mui/icons-material'; import { Delete, Edit } from '@mui/icons-material';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { import {
dateOperators, dateOperators,

View File

@ -1,7 +1,7 @@
import { Button, IconButton, Tooltip } from '@mui/material'; import { Tooltip } from '@mui/material';
import { ReactComponent as NegatedIcon } from '../../../../../../assets/icons/24_Negator.svg'; import { ReactComponent as NegatedIcon } from '../../../../../../assets/icons/24_Negator.svg';
import { ReactComponent as NegatedIconOff } from '../../../../../../assets/icons/24_Negator off.svg'; import { ReactComponent as NegatedIconOff } from '../../../../../../assets/icons/24_Negator off.svg';
import React, { useMemo } from 'react'; import React from 'react';
import { IConstraint } from '../../../../../../interfaces/strategy'; import { IConstraint } from '../../../../../../interfaces/strategy';
import { import {
StyledToggleButtonOff, StyledToggleButtonOff,

View File

@ -1,5 +1,4 @@
import { Accordion, AccordionSummary, AccordionDetails } from '@mui/material'; import { Accordion, AccordionSummary, AccordionDetails } from '@mui/material';
import { ExpandMore } from '@mui/icons-material';
import { IConstraint } from 'interfaces/strategy'; import { IConstraint } from 'interfaces/strategy';
import { ConstraintAccordionViewBody } from './ConstraintAccordionViewBody/ConstraintAccordionViewBody'; import { ConstraintAccordionViewBody } from './ConstraintAccordionViewBody/ConstraintAccordionViewBody';

View File

@ -53,8 +53,10 @@ const StyledSingleValueChip = styled(Chip)(({ theme }) => ({
}, },
})); }));
const StyledIconWrapper = styled('div')<{ marginRight?: string, marginTop?: string }>( const StyledIconWrapper = styled('div')<{
({ theme, marginRight, marginTop }) => ({ marginRight?: string;
marginTop?: string;
}>(({ theme, marginRight, marginTop }) => ({
backgroundColor: theme.palette.grey[200], backgroundColor: theme.palette.grey[200],
width: 28, width: 28,
height: 47, height: 47,
@ -63,9 +65,8 @@ const StyledIconWrapper = styled('div')<{ marginRight?: string, marginTop?: stri
padding: '10px 0', padding: '10px 0',
color: theme.palette.primary.main, color: theme.palette.primary.main,
marginRight: marginRight ? marginRight : '0.75rem', marginRight: marginRight ? marginRight : '0.75rem',
marginTop: marginTop ? marginTop: 0 marginTop: marginTop ? marginTop : 0,
}) }));
);
interface IConstraintAccordionViewHeaderProps { interface IConstraintAccordionViewHeaderProps {
compact: boolean; compact: boolean;
@ -208,8 +209,10 @@ export const ConstraintAccordionViewHeader = ({
'valuesExpandLabel' 'valuesExpandLabel'
)} )}
> >
{!expanded ? `Expand to view all ( {!expanded
${constraint?.values?.length})` : 'Collapse to view less' } ? `Expand to view all (
${constraint?.values?.length})`
: 'Collapse to view less'}
</p> </p>
} }
/> />

View File

@ -1,9 +1,6 @@
import { IConstraint } from 'interfaces/strategy'; import { IConstraint } from 'interfaces/strategy';
import { formatOperatorDescription } from 'component/common/ConstraintAccordion/ConstraintOperator/formatOperatorDescription'; import { formatOperatorDescription } from 'component/common/ConstraintAccordion/ConstraintOperator/formatOperatorDescription';
import { useStyles } from 'component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.styles'; import { useStyles } from 'component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.styles';
import { ConditionallyRender } from '../../ConditionallyRender/ConditionallyRender';
import { ReactComponent as NegatedIcon } from '../../../../assets/icons/24_Negator.svg';
import { colors } from '../../../../themes/colors';
import React from 'react'; import React from 'react';
interface IConstraintOperatorProps { interface IConstraintOperatorProps {