rename groupsIds to groupIds

guardian · Jan 30, 2025 · 8225941 · 8225941
1 parent 20e8acc
commit 8225941
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/fronts-client/src/components/FrontsEdit/Collection.tsx b/fronts-client/src/components/FrontsEdit/Collection.tsx
@@ -114,7 +114,7 @@ interface ConnectedCollectionContextProps extends CollectionContextProps {
 	handleBlur: () => void;
 	lastDesktopArticle?: string;
 	lastMobileArticle?: string;
-	groupsIds: string[];
+	groupIds: string[];
 	updateCardMeta: (id: string, meta: CardMeta) => void;
 	addImageToCard: (uuid: string, imageData: ValidationResponse) => void;
 }
@@ -137,7 +137,7 @@ class CollectionContext extends React.Component<ConnectedCollectionContextProps>
 			removeSupportingCard,
 			lastDesktopArticle,
 			lastMobileArticle,
-			groupsIds,
+			groupIds,
 			updateCardMeta,
 			addImageToCard,
 		} = this.props;
@@ -163,7 +163,7 @@ class CollectionContext extends React.Component<ConnectedCollectionContextProps>
 								isUneditable={isUneditable}
 								groupId={group.uuid}
 								groupName={group.name ? group.name : ''}
-								groupsIds={groupsIds}
+								groupIds={groupIds}
 								onMove={handleMove}
 								onDrop={handleInsert}
 								cardIds={group.cards}
@@ -198,7 +198,7 @@ class CollectionContext extends React.Component<ConnectedCollectionContextProps>
 													isUneditable={isUneditable}
 													cardId={card.uuid}
 													groupName={group.name ? group.name : ''}
-													groupsIds={groupsIds}
+													groupIds={groupIds}
 													onMove={handleMove}
 													onDrop={handleInsert}
 													cardTypeAllowList={this.getPermittedCardTypes(
@@ -264,10 +264,10 @@ const createMapStateToProps = () => {
 			collectionSet: props.browsingStage,
 		});
 
-		const groupsIds = state.collections.data[props.id]?.draft || [];
+		const groupIds = state.collections.data[props.id]?.draft || [];
 
 		return {
-			groupsIds: groupsIds,
+			groupIds: groupIds,
 			lastDesktopArticle: articleVisibilityDetails.desktop,
 			lastMobileArticle: articleVisibilityDetails.mobile,
 		};

diff --git a/fronts-client/src/components/FrontsEdit/FrontContent.tsx b/fronts-client/src/components/FrontsEdit/FrontContent.tsx
@@ -199,7 +199,7 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 			// if we're in the splash and we insert an article and there's already another article, then we also look at the index we're inserting to
 			// if we're inserting to index 0, i.e. top of the group, then we want to grab the pre-existing article and move it to the other group
 			else if (
-				!!move.to.groupsIds &&
+				!!move.to.groupIds &&
 				move.to.cards !== undefined &&
 				move.to.index === 0
 			) {
@@ -213,15 +213,15 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 				);
 
 				//then we need to move the other article to the other group
-				const otherGroup = move.to.groupsIds.filter(
+				const otherGroup = move.to.groupIds.filter(
 					(groupId) => groupId !== move.to.id,
 				)[0];
 				const existingCardData = move.to.cards[0];
 				const existingCardTo = {
 					index: 0,
 					id: otherGroup,
 					type: 'group',
-					groupsIds: move.to.groupsIds,
+					groupIds: move.to.groupIds,
 				};
 				const existingCardMoveData: Move<TCard> = {
 					data: existingCardData,
@@ -234,20 +234,20 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 			// if we're in the splash and we insert an article and there's already another article, then we also look at the index we're inserting to
 			// if we're inserting to index 1, i.e. bottom of the group, then we add this story to the other group
 			else if (
-				!!move.to.groupsIds &&
+				!!move.to.groupIds &&
 				!!numberOfArticlesAlreadyInGroup &&
 				numberOfArticlesAlreadyInGroup > 0 &&
 				move.to.index > 0
 			) {
-				const otherGroup = move.to.groupsIds.filter(
+				const otherGroup = move.to.groupIds.filter(
 					(groupId) => groupId !== move.to.id,
 				)[0];
 
 				const amendedTo = {
 					index: 0,
 					id: otherGroup,
 					type: 'group',
-					groupsIds: move.to.groupsIds,
+					groupIds: move.to.groupIds,
 				};
 				events.dropArticle(this.props.id, 'collection');
 
@@ -279,7 +279,7 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 			}
 			// if we're in the splash and we insert an article and there's already another article, then we also look at the index we're inserting to
 			// if we're inserting to index 0, i.e. top of the group, then we want to grab the pre-existing article and move it to the other group
-			else if (!!to.groupsIds && to.cards !== undefined && to.index === 0) {
+			else if (!!to.groupIds && to.cards !== undefined && to.index === 0) {
 				// we do the regular insert steps for the article we're inserting to splash
 				events.dropArticle(
 					this.props.id,
@@ -289,15 +289,15 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 
 				//then we need to move the other article to the other group
 
-				const otherGroup = to.groupsIds.filter(
+				const otherGroup = to.groupIds.filter(
 					(groupId) => groupId !== to.id,
 				)[0];
 				const existingCardData = to.cards[0];
 				const existingCardTo = {
 					index: 0,
 					id: otherGroup,
 					type: 'group',
-					groupsIds: to.groupsIds,
+					groupIds: to.groupIds,
 				};
 				const existingCardMoveData: Move<TCard> = {
 					data: existingCardData,
@@ -310,20 +310,20 @@ class FrontContent extends React.Component<FrontProps, FrontState> {
 			// if we're in the splash and we insert an article and there's already another article, then we also look at the index we're inserting to
 			// if we're inserting to index 1, i.e. bottom of the group, then we add this story to the other group
 			else if (
-				!!to.groupsIds &&
+				!!to.groupIds &&
 				!!numberOfArticlesAlreadyInGroup &&
 				numberOfArticlesAlreadyInGroup > 0 &&
 				to.index > 0
 			) {
-				const otherGroup = to.groupsIds.filter(
+				const otherGroup = to.groupIds.filter(
 					(groupId) => groupId !== to.id,
 				)[0];
 
 				const amendedTo = {
 					index: 0,
 					id: otherGroup,
 					type: 'group',
-					groupsIds: to.groupsIds,
+					groupIds: to.groupIds,
 				};
 				events.dropArticle(
 					this.props.id,

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

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

diff --git a/fronts-client/src/lib/dnd/Level.tsx b/fronts-client/src/lib/dnd/Level.tsx
@@ -11,7 +11,7 @@ interface PosSpec {
 	id: string;
 	index: number;
 	groupName?: string;
-	groupsIds?: string[];
+	groupIds?: string[];
 	cards?: any[];
 }
 
@@ -60,7 +60,7 @@ export interface LevelProps<T> {
 	parentId: string;
 	parentType: string;
 	groupName?: string;
-	groupsIds?: string[];
+	groupIds?: string[];
 	type: string;
 	getDropType?: (item: T) => string;
 	dragImageOffsetX?: number;
@@ -184,7 +184,7 @@ class Level<T> extends React.Component<Props<T>, State> {
 			type: this.props.parentType,
 			id: this.props.parentId,
 			groupName: this.props.groupName,
-			groupsIds: this.props.groupsIds,
+			groupIds: this.props.groupIds,
 			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
@@ -113,7 +113,7 @@ describe('Curation', () => {
 			to: {
 				cards: [{ id: '3' }, { id: '4' }],
 				groupName: undefined,
-				groupsIds: undefined,
+				groupIds: undefined,
 				id: '2',
 				index: 1,
 				type: 'a',
@@ -174,7 +174,7 @@ describe('Curation', () => {
 			to: {
 				cards: [{ id: '3' }, { id: '4' }],
 				groupName: undefined,
-				groupsIds: undefined,
+				groupIds: undefined,
 				id: '2',
 				index: 0,
 				type: 'a',
@@ -290,7 +290,7 @@ describe('Curation', () => {
 		expect(to).toEqual({
 			cards: [{ id: '1' }],
 			groupName: undefined,
-			groupsIds: undefined,
+			groupIds: undefined,
 			id: '2',
 			index: 1,
 			type: 'a',