From cee38a46f862edfd4f8538885c6c9ca7037a6714 Mon Sep 17 00:00:00 2001 From: ashyad01 Date: Thu, 8 Dec 2022 14:44:12 +0530 Subject: [PATCH 1/4] WIP - implemented functionality on drag of vertical blue border --- src/components/dropWrapper/index.tsx | 1 - src/components/leftPanel/index.tsx | 3 + src/components/multiCards/index.tsx | 17 +++- src/screens/homePage/index.tsx | 124 +++++++++++++++++++++++++-- 4 files changed, 135 insertions(+), 10 deletions(-) diff --git a/src/components/dropWrapper/index.tsx b/src/components/dropWrapper/index.tsx index 3ebd431..efa1ffa 100644 --- a/src/components/dropWrapper/index.tsx +++ b/src/components/dropWrapper/index.tsx @@ -118,7 +118,6 @@ const DropWrapper: React.FC = ({ setColumnNumber(true); return; } - if ( event.currentTarget.contains(event.relatedTarget) || event?.target?.innerHTML?.includes('span') diff --git a/src/components/leftPanel/index.tsx b/src/components/leftPanel/index.tsx index 5d3efe0..b8bd8e8 100644 --- a/src/components/leftPanel/index.tsx +++ b/src/components/leftPanel/index.tsx @@ -295,6 +295,9 @@ const LeftPanel: React.FC = ({ CTID={card?.CTID} id={card.Id} type={card?.URI} + isDraggableCardVisibleMethod={(isDragTure: boolean) => + setDraggableCardVisible(isDragTure) + } setLeftpanelSelectedElem={setLeftpanelSelectedElem} /> ))} diff --git a/src/components/multiCards/index.tsx b/src/components/multiCards/index.tsx index 4df0902..66490ad 100644 --- a/src/components/multiCards/index.tsx +++ b/src/components/multiCards/index.tsx @@ -61,6 +61,7 @@ interface Props { setIsConditionalEditing?: (a: boolean) => void; isConditionalEditing?: (a: boolean) => void; getComponentConditionData?: (data: any) => void; + abc: (a: any) => void; } const MultiCard: React.FC = ({ @@ -89,6 +90,7 @@ const MultiCard: React.FC = ({ setDraggableCardVisible, setIsConditionalEditing, getComponentConditionData, + abc, }) => { const [showPopover, setShowPopover] = useState(false); @@ -119,6 +121,7 @@ const MultiCard: React.FC = ({ }; const onDragStart = (e: any) => { + abc(null); updateXarrow(); setIsZoomDisabled(true); const target = e.target; @@ -154,6 +157,7 @@ const MultiCard: React.FC = ({ !!setDraggableCardVisible && setDraggableCardVisible(false); e.target.style.visibility = 'visible'; + updateXarrow(); }; @@ -335,6 +339,11 @@ const MultiCard: React.FC = ({ (level: any) => data?.HasProgressionLevel === level?.CTID )?.Name : 'Pathway'; + + const onDropHandler = (e: any, draggableSide: string) => { + abc({ ...data, draggableSide }); + }; + return ( <> {isDraggableCardVisible ? ( @@ -342,6 +351,8 @@ const MultiCard: React.FC = ({
onDropHandler(e, 'left')} + // onDragOver={(e: any) => onDropHandler(e, 'left')} className={styles.draggableAreaBox} >
@@ -591,7 +602,11 @@ const MultiCard: React.FC = ({ className={styles.draggableAreaBox + ' ' + styles.hori} >
-
+
onDropHandler(e, 'right')} + >
) : (
= ({ event.stopPropagation(); setIsConditionalModalStatus(true); setConnectionsCTID(connections); - getComponentConditionData; const filteredEndComponent = [ ...pathwayComponentCards, ...updatedPathwayComponentConditionCards, @@ -397,6 +396,91 @@ const HomePage: React.FC = ({ ) => { const updatedPathwayWrapper = { ...pathwayComponent }; + if (!_.isUndefined(xyz) && !_.isNull(xyz) && !xyz.destinationColumn) { + const { draggableSide } = xyz; + const conditionalComponentOutOfProgressionLevel = + updatedPathwayComponentConditionCards?.filter( + (conditional_Card: any) => + _.toString(conditional_Card?.HasProgressionLevel) !== + _.toString(xyz?.HasProgressionLevel) + ); + + const restConditionalComponentInProgressionLevel = + updatedPathwayComponentConditionCards?.filter( + (conditional_Card: any) => + _.toString(conditional_Card?.HasProgressionLevel) === + _.toString(xyz?.HasProgressionLevel) + ); + + const componentCardInProgressionLevel = + pathwayComponent?.PathwayComponents?.filter( + (card: any) => card?.HasProgressionLevel === xyz?.HasProgressionLevel + ); + + let updatedPathwayComponentArray: any = []; + let updatedConditionalArray: any = []; + let updatedCard: any; + if (draggableSide === 'right') { + updatedCard = { + ...card, + ColumnNumber: xyz.ColumnNumber + 1, + RowNumber: xyz.RowNumber, + HasProgressionLevel: xyz.HasProgressionLevel, + }; + } + if (draggableSide === 'left') { + updatedCard = { + ...card, + ColumnNumber: xyz.ColumnNumber, + RowNumber: xyz.RowNumber, + HasProgressionLevel: xyz.HasProgressionLevel, + }; + } + + updatedPathwayComponentArray = componentCardInProgressionLevel.map( + (a: any) => ({ + ...a, + ColumnNumber: a?.destinationColumn + ? a?.ColumnNumber + : updatedCard.ColumnNumber <= a?.ColumnNumber + ? a?.ColumnNumber + 1 + : a?.ColumnNumber, + }) + ); + updatedConditionalArray = restConditionalComponentInProgressionLevel.map( + (a: any) => ({ + ...a, + ColumnNumber: + updatedCard.ColumnNumber <= a?.ColumnNumber + ? a.ColumnNumber + 1 + : a.ColumnNumber, + }) + ); + + const allComponentConditionalCard = [ + ...conditionalComponentOutOfProgressionLevel, + ...updatedConditionalArray, + ]; + + const allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + + const uniqueAllPathwayComponentArray = [ + ...new Map( + allPathwayComponentCard.map((item: any) => [item['CTID'], item]) + ).values(), + ]; + + updatedPathwayWrapper.ComponentConditions = allComponentConditionalCard; + updatedPathwayWrapper.PathwayComponents = uniqueAllPathwayComponentArray; + dispatch(updateMappedDataRequest(updatedPathwayWrapper)); + !!setIsConditionalEditing && setIsConditionalEditing(false); + + return; + } if (!destinationColumn) { card.destinationColumn = false; } @@ -408,13 +492,22 @@ const HomePage: React.FC = ({ updatedPathwayWrapper?.Pathway?.HasDestinationComponent !== ''; if (isComponentTab) { - card = { - HasProgressionLevel, - RowNumber, - ColumnNumber: ColumnNumber - 1, - }; + if (card?.Type === 'conditional') { + card = { + ...card, + HasProgressionLevel, + RowNumber, + ColumnNumber: ColumnNumber - 1, + }; + } else { + card = { + ...card, + HasProgressionLevel, + RowNumber, + ColumnNumber: ColumnNumber - 1, + }; + } } - if (columnNumberEsixt && !isPendingCards) { /* this block is to prevent to create a new column when we overlap pathwayComponent inside gameboard @@ -425,7 +518,6 @@ const HomePage: React.FC = ({ if (card?.Type === 'conditional') { /* This Function add only conditional cards*/ const updatedPathwayWrapper = { ...pathwayComponent }; - const updatedCards = updatedPathwayComponentConditionCards .filter((item: any) => item.RowId !== card.RowId) .concat({ @@ -484,6 +576,14 @@ const HomePage: React.FC = ({ dispatch(updateMappedDataRequest(updatedPathwayWrapper)); return; } + + if (columnNumberEsixt && !isPendingCards) { + /* + this block is to prevent to create a new column when we overlap pathwayComponent inside gameboard + */ + return; + } + if (!!destinationColumn && isDestinationCardExist) { const isCardAlreadyInDestinationColumn = pathwayComponentCards?.filter( (component_card: any) => @@ -994,6 +1094,11 @@ const HomePage: React.FC = ({ document.getElementById(item?.end)?.classList?.remove('active'); setConstraintIcon(false); }; + let xyz: any; + + const abc = (value: any) => { + xyz = value; + }; const getDropWrapperLayout = (column: any, index: any = 0) => { if (!column.semesters || !column.semesters.length) { const columnNumber = pathwayComponentCards @@ -1265,6 +1370,7 @@ const HomePage: React.FC = ({ getComponentConditionData={ getComponentConditionData } + abc={abc} /> ))} @@ -1296,6 +1402,7 @@ const HomePage: React.FC = ({ columnNumber={0} HasProgressionLevel="" ConstraintConditionState={false} + abc={abc} /> )} {!!isStartFromInitialColumnSelected && @@ -1332,6 +1439,7 @@ const HomePage: React.FC = ({ columnNumber={0} HasProgressionLevel="" ConstraintConditionState={false} + abc={abc} /> )} From 011f09cb859270f78b94e6b6ff44dc623d3d20b1 Mon Sep 17 00:00:00 2001 From: ashyad01 Date: Thu, 8 Dec 2022 19:07:44 +0530 Subject: [PATCH 2/4] WIP - stage-2 to implement on cards on drag of blue border --- src/components/multiCards/index.tsx | 14 +- src/screens/homePage/index.tsx | 199 ++++++++++++++++++++++++---- 2 files changed, 183 insertions(+), 30 deletions(-) diff --git a/src/components/multiCards/index.tsx b/src/components/multiCards/index.tsx index 66490ad..5371ec6 100644 --- a/src/components/multiCards/index.tsx +++ b/src/components/multiCards/index.tsx @@ -352,14 +352,17 @@ const MultiCard: React.FC = ({ id="verticalBorder" draggable={true} onDrop={(e: any) => onDropHandler(e, 'left')} - // onDragOver={(e: any) => onDropHandler(e, 'left')} className={styles.draggableAreaBox} >
-
+ {data.RowNumber > 1 && ( +
onDropHandler(e, 'upper')} + className={styles.draggableAreaBox + ' ' + styles.hori} + >
+ )}
= ({
onDropHandler(e, 'lower')} className={styles.draggableAreaBox + ' ' + styles.hori} >
diff --git a/src/screens/homePage/index.tsx b/src/screens/homePage/index.tsx index ce39b34..c3682d3 100644 --- a/src/screens/homePage/index.tsx +++ b/src/screens/homePage/index.tsx @@ -412,11 +412,6 @@ const HomePage: React.FC = ({ _.toString(xyz?.HasProgressionLevel) ); - const componentCardInProgressionLevel = - pathwayComponent?.PathwayComponents?.filter( - (card: any) => card?.HasProgressionLevel === xyz?.HasProgressionLevel - ); - let updatedPathwayComponentArray: any = []; let updatedConditionalArray: any = []; let updatedCard: any; @@ -436,27 +431,182 @@ const HomePage: React.FC = ({ HasProgressionLevel: xyz.HasProgressionLevel, }; } + if (draggableSide === 'lower') { + updatedCard = { + ...card, + ColumnNumber: xyz.ColumnNumber, + RowNumber: xyz.RowNumber + 1, + HasProgressionLevel: xyz.HasProgressionLevel, + }; - updatedPathwayComponentArray = componentCardInProgressionLevel.map( - (a: any) => ({ - ...a, - ColumnNumber: a?.destinationColumn - ? a?.ColumnNumber - : updatedCard.ColumnNumber <= a?.ColumnNumber - ? a?.ColumnNumber + 1 - : a?.ColumnNumber, - }) - ); - updatedConditionalArray = restConditionalComponentInProgressionLevel.map( - (a: any) => ({ - ...a, - ColumnNumber: - updatedCard.ColumnNumber <= a?.ColumnNumber - ? a.ColumnNumber + 1 - : a.ColumnNumber, - }) - ); + const componentCardInProgressionLevel = + pathwayComponent?.PathwayComponents?.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber === xyz.ColumnNumber + ); + updatedPathwayComponentArray = componentCardInProgressionLevel.map( + (a: any) => ({ + ...a, + RowNumber: a?.destinationColumn + ? a?.RowNumber + : updatedCard.RowNumber <= a?.RowNumber + ? a?.RowNumber + 1 + : a?.RowNumber, + }) + ); + + const conditionalCardInProgressionLevel = + restConditionalComponentInProgressionLevel.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber === xyz.ColumnNumber + ); + + const conditionalCardOutOfColumn = + restConditionalComponentInProgressionLevel.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber !== xyz.ColumnNumber + ); + + updatedConditionalArray = conditionalCardInProgressionLevel.map( + (a: any) => ({ + ...a, + RowNumber: + updatedCard.RowNumber <= a?.RowNumber + ? a.RowNumber + 1 + : a.RowNumber, + }) + ); + + const allComponentConditionalCard = [ + ...conditionalComponentOutOfProgressionLevel, + ...updatedConditionalArray, + ...conditionalCardOutOfColumn, + ]; + + const allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + + const uniqueAllPathwayComponentArray = [ + ...new Map( + allPathwayComponentCard.map((item: any) => [item['CTID'], item]) + ).values(), + ]; + updatedPathwayWrapper.ComponentConditions = allComponentConditionalCard; + updatedPathwayWrapper.PathwayComponents = + uniqueAllPathwayComponentArray; + dispatch(updateMappedDataRequest(updatedPathwayWrapper)); + + return; + } + if (draggableSide === 'upper') { + updatedCard = { + ...card, + ColumnNumber: xyz.ColumnNumber, + RowNumber: xyz.RowNumber - 1, + HasProgressionLevel: xyz.HasProgressionLevel, + }; + + const componentCardInProgressionLevel = + pathwayComponent?.PathwayComponents?.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber === xyz.ColumnNumber + ); + if ( + componentCardInProgressionLevel.some( + (card: any) => card.RowNumber === updatedCard.RowNumber + ) + ) { + updatedCard = { + ...card, + ColumnNumber: xyz.ColumnNumber, + RowNumber: xyz.RowNumber, + HasProgressionLevel: xyz.HasProgressionLevel, + }; + + updatedPathwayComponentArray = componentCardInProgressionLevel.map( + (a: any) => ({ + ...a, + RowNumber: a?.destinationColumn + ? a?.RowNumber + : updatedCard.RowNumber <= a?.RowNumber + ? a?.RowNumber + 1 + : a?.RowNumber, + }) + ); + + const conditionalCardInProgressionLevel = + restConditionalComponentInProgressionLevel.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber === xyz.ColumnNumber + ); + + const conditionalCardOutOfColumn = + restConditionalComponentInProgressionLevel.filter( + (card: any) => + card?.HasProgressionLevel === xyz?.HasProgressionLevel && + card.ColumnNumber !== xyz.ColumnNumber + ); + + updatedConditionalArray = conditionalCardInProgressionLevel.map( + (a: any) => ({ + ...a, + RowNumber: + updatedCard.RowNumber <= a?.RowNumber + ? a.RowNumber + 1 + : a.RowNumber, + }) + ); + + const allComponentConditionalCard = [ + ...conditionalComponentOutOfProgressionLevel, + ...updatedConditionalArray, + ...conditionalCardOutOfColumn, + ]; + + const allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + + const uniqueAllPathwayComponentArray = [ + ...new Map( + allPathwayComponentCard.map((item: any) => [item['CTID'], item]) + ).values(), + ]; + updatedPathwayWrapper.ComponentConditions = + allComponentConditionalCard; + updatedPathwayWrapper.PathwayComponents = + uniqueAllPathwayComponentArray; + dispatch(updateMappedDataRequest(updatedPathwayWrapper)); + return; + } else { + const allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + updatedCard, + ]; + + const uniqueAllPathwayComponentArray = [ + ...new Map( + allPathwayComponentCard.map((item: any) => [item['CTID'], item]) + ).values(), + ]; + + updatedPathwayWrapper.PathwayComponents = + uniqueAllPathwayComponentArray; + dispatch(updateMappedDataRequest(updatedPathwayWrapper)); + return; + } + } const allComponentConditionalCard = [ ...conditionalComponentOutOfProgressionLevel, ...updatedConditionalArray, @@ -477,7 +627,6 @@ const HomePage: React.FC = ({ updatedPathwayWrapper.ComponentConditions = allComponentConditionalCard; updatedPathwayWrapper.PathwayComponents = uniqueAllPathwayComponentArray; dispatch(updateMappedDataRequest(updatedPathwayWrapper)); - !!setIsConditionalEditing && setIsConditionalEditing(false); return; } From d486f37aa2716278cb2ce33100519610484187d0 Mon Sep 17 00:00:00 2001 From: ashyad01 Date: Thu, 8 Dec 2022 20:30:22 +0530 Subject: [PATCH 3/4] WIP- Fixed issue on drag and drop --- src/screens/homePage/index.tsx | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/screens/homePage/index.tsx b/src/screens/homePage/index.tsx index c3682d3..800d1ec 100644 --- a/src/screens/homePage/index.tsx +++ b/src/screens/homePage/index.tsx @@ -412,6 +412,11 @@ const HomePage: React.FC = ({ _.toString(xyz?.HasProgressionLevel) ); + const componentCardInProgressionLevel = + pathwayComponent?.PathwayComponents?.filter( + (card: any) => card?.HasProgressionLevel === xyz?.HasProgressionLevel + ); + let updatedPathwayComponentArray: any = []; let updatedConditionalArray: any = []; let updatedCard: any; @@ -604,9 +609,30 @@ const HomePage: React.FC = ({ updatedPathwayWrapper.PathwayComponents = uniqueAllPathwayComponentArray; dispatch(updateMappedDataRequest(updatedPathwayWrapper)); - return; } + return; } + + updatedPathwayComponentArray = componentCardInProgressionLevel.map( + (a: any) => ({ + ...a, + ColumnNumber: a?.destinationColumn + ? a?.ColumnNumber + : updatedCard.ColumnNumber <= a?.ColumnNumber + ? a?.ColumnNumber + 1 + : a?.ColumnNumber, + }) + ); + updatedConditionalArray = restConditionalComponentInProgressionLevel.map( + (a: any) => ({ + ...a, + ColumnNumber: + updatedCard.ColumnNumber <= a?.ColumnNumber + ? a.ColumnNumber + 1 + : a.ColumnNumber, + }) + ); + const allComponentConditionalCard = [ ...conditionalComponentOutOfProgressionLevel, ...updatedConditionalArray, From 72b53fc66035d8e763a648f82c8c6531b16e358e Mon Sep 17 00:00:00 2001 From: ashyad01 Date: Fri, 16 Dec 2022 20:15:01 +0530 Subject: [PATCH 4/4] fixed issue related to blue border with conditional --- src/screens/homePage/index.tsx | 111 +++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 33 deletions(-) diff --git a/src/screens/homePage/index.tsx b/src/screens/homePage/index.tsx index 800d1ec..aa362f8 100644 --- a/src/screens/homePage/index.tsx +++ b/src/screens/homePage/index.tsx @@ -484,19 +484,25 @@ const HomePage: React.FC = ({ : a.RowNumber, }) ); - + let allPathwayComponentCard: any; + if (card?.Type !== 'conditional') { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + } else { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + ]; + } const allComponentConditionalCard = [ ...conditionalComponentOutOfProgressionLevel, ...updatedConditionalArray, ...conditionalCardOutOfColumn, ]; - const allPathwayComponentCard = [ - ...updatedPathwayWrapper.PathwayComponents, - ...updatedPathwayComponentArray, - updatedCard, - ]; - const uniqueAllPathwayComponentArray = [ ...new Map( allPathwayComponentCard.map((item: any) => [item['CTID'], item]) @@ -576,13 +582,19 @@ const HomePage: React.FC = ({ ...updatedConditionalArray, ...conditionalCardOutOfColumn, ]; - - const allPathwayComponentCard = [ - ...updatedPathwayWrapper.PathwayComponents, - ...updatedPathwayComponentArray, - updatedCard, - ]; - + let allPathwayComponentCard: any; + if (card?.Type !== 'conditional') { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + } else { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + ]; + } const uniqueAllPathwayComponentArray = [ ...new Map( allPathwayComponentCard.map((item: any) => [item['CTID'], item]) @@ -595,10 +607,23 @@ const HomePage: React.FC = ({ dispatch(updateMappedDataRequest(updatedPathwayWrapper)); return; } else { - const allPathwayComponentCard = [ - ...updatedPathwayWrapper.PathwayComponents, - updatedCard, - ]; + let allPathwayComponentCard: any; + + if (card?.Type !== 'conditional') { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + updatedCard, + ]; + } else { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ]; + } + + // const allPathwayComponentCard = [ + // ...updatedPathwayWrapper.PathwayComponents, + // updatedCard, + // ]; const uniqueAllPathwayComponentArray = [ ...new Map( @@ -612,7 +637,6 @@ const HomePage: React.FC = ({ } return; } - updatedPathwayComponentArray = componentCardInProgressionLevel.map( (a: any) => ({ ...a, @@ -638,11 +662,26 @@ const HomePage: React.FC = ({ ...updatedConditionalArray, ]; - const allPathwayComponentCard = [ - ...updatedPathwayWrapper.PathwayComponents, - ...updatedPathwayComponentArray, - updatedCard, - ]; + let allPathwayComponentCard: any; + + if (card?.Type !== 'conditional') { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + updatedCard, + ]; + } else { + allPathwayComponentCard = [ + ...updatedPathwayWrapper.PathwayComponents, + ...updatedPathwayComponentArray, + ]; + } + + // const allPathwayComponentCard = [ + // ...updatedPathwayWrapper.PathwayComponents, + // ...updatedPathwayComponentArray, + // updatedCard, + // ]; const uniqueAllPathwayComponentArray = [ ...new Map( @@ -656,6 +695,9 @@ const HomePage: React.FC = ({ return; } + // if (columnNumberEsixt) { + // return; + // } if (!destinationColumn) { card.destinationColumn = false; } @@ -691,16 +733,19 @@ const HomePage: React.FC = ({ return; } if (card?.Type === 'conditional') { + if (columnNumberEsixt) { + return; + } /* This Function add only conditional cards*/ const updatedPathwayWrapper = { ...pathwayComponent }; - const updatedCards = updatedPathwayComponentConditionCards - .filter((item: any) => item.RowId !== card.RowId) - .concat({ - ...card, - RowNumber, - HasProgressionLevel, - ColumnNumber, - }); + const updatedCards = updatedPathwayWrapper?.ComponentConditions.filter( + (item: any) => item.RowId !== card.RowId + ).concat({ + ...card, + RowNumber, + HasProgressionLevel, + ColumnNumber, + }); setUpdatedPathwayComponentConditionCards(updatedCards); updatedPathwayWrapper.ComponentConditions = updatedCards; dispatch(updateMappedDataRequest(updatedPathwayWrapper)); @@ -843,7 +888,7 @@ const HomePage: React.FC = ({ firstColumn, }) ); - } else if (pathwayComponentCards.length !== 0) { + } else if (pathwayComponentCards.length !== 0 && !columnNumberEsixt) { setPathwayComponentCards( pathwayComponentCards .filter((item: any) => item.CTID !== card.CTID)