Skip to content

Commit

Permalink
fix(trackerCard): no custom validation on tracker without requiredComp
Browse files Browse the repository at this point in the history
  • Loading branch information
Clm-Roig committed Apr 16, 2022
1 parent 8bbc254 commit 595cf6f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
16 changes: 10 additions & 6 deletions src/components/TrackerCard/TrackerCardActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const TrackerCardActions: FC<Props> = ({
selectedCompletions,
tracker
}) => {
const { requiredCompletions } = tracker;
const dispatch = useAppDispatch();
const { enqueueSnackbar } = useSnackbar();
const [isCompleteValidationOpen, setIsCompleteValidationOpen] = useState(false);
Expand Down Expand Up @@ -83,12 +84,15 @@ const TrackerCardActions: FC<Props> = ({
onClick={() => setIsCompleteValidationOpen(true)}>
<CheckIcon fontSize="large" />
</IconButton>
<IconButton
color="primary"
size="large"
onClick={() => setIsCustomValidationOpen(true)}>
<CheckCircleIcon fontSize="large" />
</IconButton>

{requiredCompletions.length > 0 && (
<IconButton
color="primary"
size="large"
onClick={() => setIsCustomValidationOpen(true)}>
<CheckCircleIcon fontSize="large" />
</IconButton>
)}
</>
)}
{isHidden ? (
Expand Down
16 changes: 10 additions & 6 deletions src/components/TrackerCard/TrackerCardContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,16 @@ const TrackerCardContent: FC<Props> = ({

return (
<CardContent {...cardContentProps}>
<Typography>Requis :</Typography>
<CompletionChipList
completions={requiredCompletions}
onChipClick={onChipClick}
selectedCompletions={selectedCompletions}
/>
{requiredCompletions.length > 0 && (
<>
<Typography>Requis :</Typography>
<CompletionChipList
completions={requiredCompletions}
onChipClick={onChipClick}
selectedCompletions={selectedCompletions}
/>
</>
)}
{remainingCompletions.length > 0 && (
<>
<Typography>Restants :</Typography>
Expand Down

0 comments on commit 595cf6f

Please sign in to comment.