remove unnecessary number of cards in group prop

guardian · Jan 29, 2025 · 3f25f08 · 3f25f08
1 parent 562054c
commit 3f25f08
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 18 deletions.
diff --git a/fronts-client/src/components/FrontsEdit/Collection.tsx b/fronts-client/src/components/FrontsEdit/Collection.tsx
@@ -163,8 +163,6 @@ class CollectionContext extends React.Component<ConnectedCollectionContextProps>
 								isUneditable={isUneditable}
 								groupId={group.uuid}
 								groupName={group.name ? group.name : ''}
-								//todo: numberOfCards can probably just be got by the card array
-								numberOfCardsInGroup={group.cards.length}
 								groupsIds={groupsIds}
 								onMove={handleMove}
 								onDrop={handleInsert}
@@ -200,7 +198,6 @@ class CollectionContext extends React.Component<ConnectedCollectionContextProps>
 													isUneditable={isUneditable}
 													cardId={card.uuid}
 													groupName={group.name ? group.name : ''}
-													numberOfCardsInGroup={group.cards.length}
 													groupsIds={groupsIds}
 													onMove={handleMove}
 													onDrop={handleInsert}

diff --git a/fronts-client/src/components/FrontsEdit/FrontContent.tsx b/fronts-client/src/components/FrontsEdit/FrontContent.tsx
@@ -179,7 +179,7 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 	}
 
 	public handleMove = (move: Move<TCard>) => {
-		const numberOfArticlesAlreadyInGroup = move.to.numberOfCardsInGroup;
+		const numberOfArticlesAlreadyInGroup = move.to.cards?.length;
 
 		// if we are inserting an article into any group that is not the splash, then we just insert
 		if (move.to.groupName !== 'splash') {
@@ -262,7 +262,7 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 	};
 
 	public handleInsert = (e: React.DragEvent, to: PosSpec) => {
-		const numberOfArticlesAlreadyInGroup = to.numberOfCardsInGroup;
+		const numberOfArticlesAlreadyInGroup = to.cards?.length;
 
 		// if we are inserting an article into any group that is not the splash, then we just insert
 		if (to.groupName !== 'splash') {

diff --git a/fronts-client/src/components/clipboard/CardLevel.tsx b/fronts-client/src/components/clipboard/CardLevel.tsx
@@ -21,7 +21,6 @@ interface OuterProps {
 	dropMessage?: string;
 	cardTypeAllowList?: CardTypes[];
 	groupName?: string;
-	numberOfCardsInGroup?: number;
 	groupsIds?: string[];
 }
 
@@ -53,15 +52,13 @@ const CardLevel = ({
 	dropMessage,
 	cardTypeAllowList,
 	groupName,
-	numberOfCardsInGroup,
 	groupsIds,
 }: Props) => (
 	<CardTypeLevel
 		arr={supporting || []}
 		parentType="card"
 		parentId={cardId}
 		groupName={groupName}
-		numberOfCardsInGroup={numberOfCardsInGroup}
 		groupsIds={groupsIds}
 		onMove={onMove}
 		onDrop={onDrop}

diff --git a/fronts-client/src/components/clipboard/GroupLevel.tsx b/fronts-client/src/components/clipboard/GroupLevel.tsx
@@ -16,7 +16,6 @@ interface OuterProps {
 	onDrop: DropHandler;
 	isUneditable?: boolean;
 	groupName: string;
-	numberOfCardsInGroup: number;
 	groupsIds: string[];
 }
 
@@ -64,15 +63,13 @@ const GroupLevel = ({
 	onDrop,
 	isUneditable,
 	groupName,
-	numberOfCardsInGroup,
 	groupsIds,
 }: Props) => (
 	<CardTypeLevel
 		arr={cards}
 		parentType="group"
 		parentId={groupId}
 		groupName={groupName}
-		numberOfCardsInGroup={numberOfCardsInGroup}
 		groupsIds={groupsIds}
 		onMove={onMove}
 		onDrop={onDrop}

diff --git a/fronts-client/src/lib/dnd/Level.tsx b/fronts-client/src/lib/dnd/Level.tsx
@@ -11,7 +11,6 @@ interface PosSpec {
 	id: string;
 	index: number;
 	groupName?: string;
-	numberOfCardsInGroup?: number;
 	groupsIds?: string[];
 	cards?: any[];
 }
@@ -61,7 +60,6 @@ export interface LevelProps<T> {
 	parentId: string;
 	parentType: string;
 	groupName?: string;
-	numberOfCardsInGroup?: number;
 	groupsIds?: string[];
 	type: string;
 	getDropType?: (item: T) => string;
@@ -186,7 +184,6 @@ class Level<T> extends React.Component<Props<T>, State> {
 			type: this.props.parentType,
 			id: this.props.parentId,
 			groupName: this.props.groupName,
-			numberOfCardsInGroup: this.props.numberOfCardsInGroup,
 			groupsIds: this.props.groupsIds,
 			cards: this.props.arr,
 		};

diff --git a/fronts-client/src/lib/dnd/__tests__/dnd.spec.tsx b/fronts-client/src/lib/dnd/__tests__/dnd.spec.tsx
@@ -116,7 +116,6 @@ describe('Curation', () => {
 				groupsIds: undefined,
 				id: '2',
 				index: 1,
-				numberOfCardsInGroup: undefined,
 				type: 'a',
 			},
 		});
@@ -178,7 +177,6 @@ describe('Curation', () => {
 				groupsIds: undefined,
 				id: '2',
 				index: 0,
-				numberOfCardsInGroup: undefined,
 				type: 'a',
 			},
 		});
@@ -295,7 +293,6 @@ describe('Curation', () => {
 			groupsIds: undefined,
 			id: '2',
 			index: 1,
-			numberOfCardsInGroup: undefined,
 			type: 'a',
 		});
 	});

diff --git a/fronts-client/src/util/collectionUtils.ts b/fronts-client/src/util/collectionUtils.ts
@@ -64,7 +64,6 @@ export type InsertDropType = keyof typeof dropToCardMap;
 const dropToCard = (e: React.DragEvent): MappableDropType | null => {
 	for (const [type, fn] of Object.entries(dropToCardMap)) {
 		const data = e.dataTransfer.getData(type);
-
 		if (data) {
 			return fn(data);
 		}