Tidy up

Author: abeddow91

dotcom-rendering/.vscode/settings.json

@@ -146,7 +146,7 @@ export const HighlightsCard = ({
 					headlineText={headlineText}
 					dataLinkName={dataLinkName}
 					isExternalLink={isExternalLink}
-					trackCardClick={trackCardClick}
+					trackCardClick={() => trackCardClick}
 				/>
 
 				<div css={content}>

dotcom-rendering/src/components/Masthead/HighlightsCard.tsx

@@ -12,10 +12,9 @@ import { isServer } from '../lib/isServer';
 import { ophanComponentId } from '../lib/ophan-helpers';
 import {
 	getHighlightCards,
-	getHighlightHistory,
 	resetStoredHighlights,
 	trackCardEngagement,
-} from '../lib/personalHighlights';
+} from '../lib/personaliseHighlights';
 import { palette } from '../palette';
 import type { DCRFrontCard } from '../types/front';
 import { HighlightsCard } from './Masthead/HighlightsCard';
@@ -300,31 +299,20 @@ export const ScrollableHighlights = ({ trails, frontId }: Props) => {
 	}, [orderedTrails]);
 
 	useEffect(() => {
-		const ooo = getHighlightHistory();
-		const orderedHighlights = getHighlightCards();
-		console.log('>>> stored history', ooo);
-		console.log('>>> ordered highlights', orderedHighlights);
-		console.log('>>> trails', trails);
+		const personalisedHighlights = getHighlightCards();
 		if (
-			orderedHighlights.length === 0 ||
-			orderedHighlights.length !== trails.length ||
-			!isEqual(orderedHighlights, trails)
+			personalisedHighlights.length === 0 ||
+			personalisedHighlights.length !== trails.length ||
+			!isEqual(personalisedHighlights, trails)
 		) {
-			console.log(
-				'>>> highlights are out of whack',
-				orderedHighlights.length === 0,
-				orderedHighlights.length !== trails.length,
-				!isEqual(orderedHighlights, trails),
-			);
-			// store in local cache but dont bother setting in test trails as thats already set to trails
+			// store in local cache but don't bother setting in test trails as they are already set to trails
 			resetStoredHighlights(trails);
 			// display highlights
 			setShouldShowHighlights(true);
 			return;
 		}
-		console.log('>>> highlights are good');
 		// otherwise history is different to trails so set in state
-		setOrderedTrails(orderedHighlights);
+		setOrderedTrails(personalisedHighlights);
 	}, [trails]);
 
 	const { ophanComponentLink, ophanComponentName, ophanFrontName } =

dotcom-rendering/src/components/ScrollableHighlights.importable.tsx

@@ -12,7 +12,7 @@ import {
 	trackCardClick,
 	trackCardEngagement,
 	trackCardView,
-} from './personalHighlights';
+} from './personaliseHighlights';
 
 // Mock @guardian/libs storage + isObject
 jest.mock('@guardian/libs', () => {

dotcom-rendering/src/lib/personalHighlights.test.ts renamed to dotcom-rendering/src/lib/personaliseHighlights.test.ts

@@ -12,7 +12,7 @@ import type { DCRFrontCard } from '../types/front';
  * */
 
 type HighlightCardHistory = {
-	card: DCRFrontCard; // TODO: store a card indentifier rather than the whole card.
+	card: DCRFrontCard; // TODO: store a card identifier (eg url) rather than the whole card.
 	viewCount: number;
 	wasClicked: boolean;
 };
@@ -25,7 +25,6 @@ export const HighlightsHistoryKey = 'gu.history.highlights';
 
 const MAX_VIEW_COUNT = 3;
 
-// todo: improve type of card
 const isValidHighlightHistory = (
 	history: unknown,
 ): history is HighlightHistory =>