From 4f249df831f272283be2213f2fd041d8cb5e6c97 Mon Sep 17 00:00:00 2001 From: Faisal-imtiyaz123 <142205282+Faisal-imtiyaz123@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:43:00 +0530 Subject: [PATCH] Fixes data importer showing incorrect unmatched fields (# 6138) (#6311) fixes #6138 --------- Co-authored-by: Thomas Trompette --- .../MatchColumnsStep/components/TemplateColumn.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx index eb65c9266ddb..6190742aadf0 100644 --- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx +++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx @@ -1,10 +1,10 @@ // TODO: We should create our own accordion component import { Accordion, - AccordionButton as ChakraAccordionButton, AccordionIcon, AccordionItem, AccordionPanel, + AccordionButton as ChakraAccordionButton, } from '@chakra-ui/accordion'; import styled from '@emotion/styled'; import { IconChevronDown, IconForbid } from 'twenty-ui'; @@ -15,6 +15,7 @@ import { Fields } from '@/spreadsheet-import/types'; import { Column, Columns, ColumnType } from '../MatchColumnsStep'; +import { isDefined } from '~/utils/isDefined'; import { SubMatchingSelect } from './SubMatchingSelect'; const StyledContainer = styled.div` @@ -68,7 +69,8 @@ const getAccordionTitle = ( )?.label; return `Match ${fieldLabel} (${ - 'matchedOptions' in column && column.matchedOptions.length + 'matchedOptions' in column && + column.matchedOptions.filter((option) => !isDefined(option.value)).length } Unmatched)`; };