@abcagency/hc-ui-components 1.4.9 → 1.4.12

package/src/components/modules/buttons/button-group-apply.js

@@ -31,19 +31,19 @@ const ButtonGroupApply = ({
 
 	const trackApplyNow = () => {
 		//console.log('calling trackApplyNow');
-		trackEvent(eventTypes.APPLY_NOW_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.APPLY_NOW_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 	const trackApplyOpen = () => {
 		//console.log('calling trackApplyOpen');
-		trackEvent(eventTypes.APPLY_OPEN_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.APPLY_OPEN_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 	const trackEasyApply = () => {
 		//console.log('calling trackEasyApply');
-		trackEvent(eventTypes.EASY_APPLY_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.EASY_APPLY_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 	const trackViewDetails = () => {
 		//console.log('calling trackViewDetails');
-		trackEvent(eventTypes.VIEW_DETAILS_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.VIEW_DETAILS_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 
 	return (
@@ -78,9 +78,9 @@ const ButtonGroupApply = ({
 				</Button.Anchor>
 			) : null}
 
-			{item.applyOnline == 1 && item.applyUrl && !includeDialog &&
+			{item.fields.applyOnline == true && item.fields.applyUrl && !includeDialog &&
 				<Button.Anchor
-					href={item.applyUrl}
+					href={item.fields.applyUrl}
 					variant={applyButtonVariant}
 					size={buttonSize}
 					className={"map-apply-now-button"}
@@ -91,8 +91,8 @@ const ButtonGroupApply = ({
 					{applyNowText}
 				</Button.Anchor>
 			}
-			{item.applyOnline == 1 && item.applyUrl && includeDialog &&
-				<ApplyDialog applyUrl={item.applyUrl} internalApplyLink={internalApplyLink} companyName={companyName} item={item} trackEvent={trackEvent} eventTypes={eventTypes} isIframe={isIframe}>
+			{item.fields.applyOnline == true && item.fields.applyUrl && includeDialog &&
+				<ApplyDialog applyUrl={item.fields.applyUrl} internalApplyLink={internalApplyLink} companyName={companyName} item={item} trackEvent={trackEvent} eventTypes={eventTypes} isIframe={isIframe}>
 					<Button.Anchor
 						variant={applyButtonVariant}
 						size={buttonSize}

package/src/components/modules/dialogs/apply-dialog.js

@@ -7,11 +7,11 @@ import Icon from '~/components/modules/icon';
 const ApplyDialog = ({ children, applyUrl, internalApplyLink, companyName, item, trackEvent, eventTypes, isIframe }) => {
 	const trackApplyOption1 = () => {
 		//console.log('calling trackApplyOption1');
-		trackEvent(eventTypes.APPLY_OPTION_1_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.APPLY_OPTION_1_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 	const trackApplyOption2 = () => {
 		//console.log('calling trackApplyOption2');
-		trackEvent(eventTypes.APPLY_OPTION_2_CLICKED, { jobCategory: item.fields.category, jobCategoryClass: item.fields.categoryClass, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
+		trackEvent(eventTypes.APPLY_OPTION_2_CLICKED, { jobCategory: item.fields.subCategory, jobCategoryClass: item.fields.category, jobEntity: item.fields.entityName, jobListingId: item.id, jobSchedule: item.fields.schedule });
 	};
 
 	return (

package/src/components/modules/list/field-mapper-desktop.jsx

@@ -11,7 +11,7 @@ const FieldMapperDesktop = ({
 	const orderedFields = fieldsShown.filter(field => field in item.fields);
 
 	const specialFeaturePills = field => {
-		return field === 'position' && specialFeatures &&
+		return field === 'title' && specialFeatures &&
       Object.entries(specialFeatures).map(([featureKey, featureLabel]) => {
       	return item.fields[featureKey] == 1 && (
       		<PillWrapper key={featureKey}>{featureLabel}</PillWrapper>
@@ -29,7 +29,7 @@ const FieldMapperDesktop = ({
 						className={`
               hc-hidden md:hc-block hc-px-2
               ${index === 0 ? "hc-pl-7" : ""}
-              ${field.toLowerCase() === "position" ? "hc-col-span-4 hc-text-balance hc-font-semibold" : (field.toLowerCase() === "state" || field.toLowerCase() == "favorite") ? "hc-col-span-1" : "hc-col-span-2"}
+              ${field.toLowerCase() === "title" ? "hc-col-span-4 hc-text-balance hc-font-semibold" : (field.toLowerCase() === "state" || field.toLowerCase() == "favorite") ? "hc-col-span-1" : "hc-col-span-2"}
             `}
 					>
 						<span className="hc-sr-only">{capitalize(field)}</span>

package/src/components/modules/list/field-mapper-mobile.jsx

@@ -12,7 +12,7 @@ const FieldMapperMobile = ({
 	includeFavorite = true
 }) => {
 	const specialFeaturePills = field => {
-		return field === 'position' && specialFeatures &&
+		return field === 'title' && specialFeatures &&
       Object.entries(specialFeatures).map(([featureKey, featureLabel]) => {
       	return item.fields[featureKey] == 1 && (
       		<PillWrapper key={featureKey}>{featureLabel}</PillWrapper>
@@ -22,11 +22,11 @@ const FieldMapperMobile = ({
 
 	return (
 		<Grid.Item className="md:hc-hidden">
-			{fieldsShown.includes("position") &&
+			{fieldsShown.includes("title") &&
         <>
         	<div className="hc-flex hc-items-start">
         		<div className="hc-flex hc-justify-between hc-items-center hc-min-w-[100%]">
-        			<h3 className="hc-font-bold hc-mb-3 hc-flex-1">{item.fields.position}</h3>
+        			<h3 className="hc-font-bold hc-mb-3 hc-flex-1">{item.fields.title}</h3>
         			{includeFavorite && <div className="hc-flex hc-justify-end hc-pb-2">
         				<Icon
         					icon={isFavorite ? "mdi:heart" : "mdi:heart-outline"}
@@ -41,20 +41,20 @@ const FieldMapperMobile = ({
         			}
         		</div>
         	</div>
-        	{specialFeatures && <div className='hc-pb-4'>{specialFeaturePills("position", true)} </div>}
+        	{specialFeatures && <div className='hc-pb-4'>{specialFeaturePills("title", true)} </div>}
         </>
 			}
 
 			<ul className="hc-space-y-2 hc-text-xs">
 				{[
 					{
-						field: "categoryClass",
-						name: "categoryClass",
+						field: "category",
+						name: "category",
 						icon: "icon-park-solid:tree-list"
 					},
 					{
-						field: "category",
-						name: "Category",
+						field: "subCategory",
+						name: "subCategory",
 						icon: "icon-park-solid:tree-list"
 					},
 					{

package/src/components/modules/list/header-item.js

@@ -57,7 +57,7 @@ const HeaderItem = ({
 			size="none"
 			className={`
 				hc-p-2 hc-rounded-none hc-text-left hc-normal-case hover:hc-bg-uiAccent/5 focus:hc-bg-uiAccent/5
-				${field.toLowerCase() === "position" ? "hc-pl-7 hc-col-span-4" : (field.toLowerCase() === "state" || field.toLowerCase() == "favorite") ? "hc-col-span-1" : "hc-col-span-2"}
+				${field.toLowerCase() === "title" ? "hc-pl-7 hc-col-span-4" : (field.toLowerCase() === "state" || field.toLowerCase() == "favorite") ? "hc-col-span-1" : "hc-col-span-2"}
 				${className ?? ""}
 			`}
 			{...rest}

package/src/contexts/mapListContext.tsx

@@ -93,7 +93,7 @@ interface MapListProviderProps {
   defaultFilters?: Record<string, any>;
   containerStyle?: any;
 	localStorageKey: string;
-	getListingEntitiesCallback?: (entityIds: number[], origin?: string) => Promise<ListingEntity[]>;
+	getListingEntitiesCallback?: (origin?: string) => Promise<any>;
   ExpandListComponent?: React.ComponentType<{ listing: Listing }> | ((listing: Listing) => JSX.Element) | null;
 }
 
@@ -160,34 +160,31 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 		setStorageObject("commuteLocation", commuteLocation);
 	}, [commuteLocation]);
 
+
 	useEffect(() => {
 		if (!commuteLocation) return;
 
 		async function fetchEntities() {
-			const distinctEntityIds = [
-				...new Set(allListings.map(listing => listing.entityId ?? -1))
-			];
 			try {
-				console.log(getListingEntitiesCallback);
-				console.log("fetching entities")
-				const fetchedEntities = getListingEntitiesCallback !== null && getListingEntitiesCallback !== undefined ? await getListingEntitiesCallback(distinctEntityIds,
-					`${commuteLocation.lat}, ${commuteLocation.lng}`) : await getListingEntities(
-					distinctEntityIds,
-					`${commuteLocation.lat}, ${commuteLocation.lng}`
-				);
+				let fetchedEntities;
+				if (getListingEntitiesCallback) {
+					fetchedEntities = await getListingEntitiesCallback(`${commuteLocation.lat}, ${commuteLocation.lng}`);
+				} else {
+					fetchedEntities = await getListingEntities(`${commuteLocation.lat}, ${commuteLocation.lng}`);
+				}
 				setListingEntities(fetchedEntities);
-				const newFilteredListings: Listing[] = [...filteredListings] ?? [];
+				// Update travelTime on listings
+				const newFilteredListings: Listing[] = [...filteredListings];
 				for (let i = 0; i < allListings.length; i++) {
 					const listing = newFilteredListings[i];
 					if (
 						listing &&
 						listing.fields &&
-						listing.entityId !== undefined &&
-						listing.entityId !== -1
+						listing.fields.entityKey &&
+						listing.fields.entityKey !== ''
 					) {
-						const entityId = listing.entityId;
-						const travelTime = fetchedEntities[entityId]?.travelTime;
-
+						const entityKey = listing.fields.entityKey;
+						const travelTime = fetchedEntities[entityKey]?.travelTime;
 						if (travelTime !== undefined && listing.fields) {
 							listing.fields.travelTime = travelTime;
 						}
@@ -199,35 +196,35 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 		}
 
 		fetchEntities();
-	}, [commuteLocation, allListings, siteConfig.companyId]);
+	}, [commuteLocation, allListings, siteConfig.companyId, getListingEntitiesCallback]);
 
 	useEffect(() => {
 		const handleFetchListings = async () => {
-			if (!getStorageObject('listings') ?? [].length) {
-				setLoading(true);
-			}
+		if (!(getStorageObject('listings', []) || []).length) {
+			setLoading(true);
+		}
 
-			try {
-				const {
-					listingsResult,
-					fetchedEntities,
-					distinctItems
-				} = await fetchListings(commuteLocation, entities, listings, getListingEntitiesCallback);
-				if (defaultFilters) {
-					const filteredListings = listingsResult.filter(listing => {
-					if (!listing.fields) return false;
+		try {
+			const {
+				listingsResult,
+				entitiesByKey,
+				distinctItems
+			} = await fetchListings(commuteLocation, entities, listings, getListingEntitiesCallback);
+			if (defaultFilters) {
+				const filteredListings = listingsResult.filter(listing => {
+				if (!listing.fields) return false;
 
-					return Object.keys(defaultFilters).every(filterKey => {
-						const filterValues = defaultFilters[filterKey as keyof typeof defaultFilters];
-						const listingValue = listing.fields ? listing.fields[filterKey as keyof typeof listing.fields] : null;
-						return filterValues.includes(listingValue);
-					});
+				return Object.keys(defaultFilters).every(filterKey => {
+					const filterValues = defaultFilters[filterKey as keyof typeof defaultFilters];
+					const listingValue = listing.fields ? listing.fields[filterKey as keyof typeof listing.fields] : null;
+					return filterValues.includes(listingValue);
 				});
-				setAllListings(filteredListings);
-			} else {
-				setAllListings(listingsResult);
-			}
-				setListingEntities(fetchedEntities);
+			});
+			setAllListings(filteredListings);
+		} else {
+			setAllListings(listingsResult);
+		}
+			setListingEntities(entitiesByKey);
 				setMapItems(distinctItems);
 			} catch (error) {
 				console.log(error);

package/src/services/listingAggregatorService.ts

@@ -6,7 +6,8 @@ import { ListingEntity } from '~/types/ListingEntity';
 
 interface FetchListingsResult {
   listingsResult: Listing[];
-  fetchedEntities: Record<number, ListingEntity>;
+   entitiesByKey: Record<string, ListingEntity>;
+
   distinctItems: any; // Update this type based on the return type of getDistinctItemsByProximity
 }
 
@@ -14,25 +15,25 @@ const fetchListings = async (
 	commuteLocation: any | null = null,
 	entities: ListingEntity[] | null,
 	listings: Listing[] | null,
-	getListingEntitiesCallback?: (entityIds: number[], origin?: string) => Promise<ListingEntity[]>,
+	getListingEntitiesCallback?: (origin?: string) => Promise<ListingEntity[]>,
 ): Promise<FetchListingsResult> => {
 	try {
 		const listingsResult = listings && listings.length > 0 ? listings : await getListings();
-		const distinctEntityIds: number[] = [
-			...new Set(listingsResult.map(listing => listing.entityId))
-		] as number[];
 
 		const fetchedEntities = !commuteLocation
-			? entities && entities.length > 0 ? entities : !getListingEntitiesCallback ? await getListingEntities(distinctEntityIds) : await getListingEntitiesCallback(distinctEntityIds)
+			? entities && entities.length > 0 ? entities : !getListingEntitiesCallback ? await getListingEntities() : await getListingEntitiesCallback()
 			: !getListingEntitiesCallback ? await getListingEntities(
-				distinctEntityIds,
+
 				`${commuteLocation.lat}, ${commuteLocation.lng}`
-			) : await getListingEntitiesCallback(	distinctEntityIds,
+			) : await getListingEntitiesCallback(
 				`${commuteLocation.lat}, ${commuteLocation.lng}`);
+				        const entitiesByKey = fetchedEntities;
 		for (let i = 0; i < listingsResult.length; i++) {
 			const listing = listingsResult[i];
-			if (listing.entityId && listing.entityId !== -1 && listing.fields) {
-				const entity = fetchedEntities[listing.entityId];
+						if (listing.fields && listing.fields.entityKey && listing.fields.entityKey !== '' && listing.fields) {
+				const entity = entitiesByKey[listing.fields.entityKey];
+				console.log("Entity for listing with travel time", listing.fields.entityKey, entity);
+
 				if (entity) {
 					listing.fields.travelTime = entity.travelTime;
 				}
@@ -46,7 +47,7 @@ const fetchListings = async (
 
 		return {
 			listingsResult,
-			fetchedEntities,
+			entitiesByKey,
 			distinctItems
 		};
 	} catch (error) {

package/src/services/listingEntityService.ts

@@ -1,9 +1,9 @@
 import api from '~/apis/hcApi';
-import { ListingEntity } from '~/types/ListingEntity';
 
-export const getListingEntities = async (entityIds: number[], origin = ''): Promise<ListingEntity[]> => {
+export const getListingEntities = async (origin = ''): Promise<any> => {
 	try {
-		const response = await api.post<ListingEntity[]>(`/ListingEntities?origin=${origin}`, entityIds);
+		//need to update / or add better endpoint fo this to match original functioanlity
+		const response = await api.get<any>(`/listingentities/MapEntities?origin=${origin}`);
 		return response;
 	} catch (error) {
 		console.error("Error fetching listing entities:", error);

package/src/services/listingService.ts

@@ -5,18 +5,8 @@ import { Listing } from '../types/Listings';
 
 export const getListings = async (params?: GetListingsParams): Promise<Listing[]> => {
 	try {
-		const query = new URLSearchParams();
+		const response = await api.get(`/joblistings/maplistings`);
 
-		if (params) {
-			if (params.location) params.location.forEach(loc => query.append('location', loc));
-			if (params.category) params.category.forEach(cat => query.append('category', cat));
-			if (params.categoryClass) params.categoryClass.forEach(catClass => query.append('categoryClass', catClass));
-			if (params.education) params.education.forEach(edu => query.append('education', edu));
-			if (params.city) params.city.forEach(cty => query.append('city', cty));
-			if (params.state) params.state.forEach(st => query.append('state', st));
-		}
-
-		const response = await api.get(`/Listings?${query.toString()}`);
 		return response as Listing[];
 	} catch (error) {
 		console.error(error);

package/src/types/GetListingParams.ts

@@ -1,7 +1,7 @@
 export type GetListingsParams = {
 	location?: string[];
 	category?: string[];
-	categoryClass?: string[];
+	subCategory?: string[];
 	education?: string[];
 	city?: string[];
 	state?: string[];

package/src/types/ListingEntity.ts

@@ -1,9 +1,10 @@
 import { Address } from './Address';
 
 export type ListingEntity = {
-  id: number;
+  id: string;
   listingId: number;
   latitude: number;
+	entityKey: string;
   longitude: number;
   entityDisplayName?: string;
   address?: Address;

package/src/types/ListingFields.ts

@@ -2,9 +2,10 @@ export type ListingFields = {
 	posted?: string;
 	subTitle?: string;
 	education?: string;
-	position?: string;
+	title?: string;
 	category?: string;
-	categoryClass?: string;
+	subCategory?: string;
+	applyUrl?: string;
 	shift?: string;
 	custom1?: string;
 	custom2?: string;
@@ -22,5 +23,6 @@ export type ListingFields = {
 	useClientJobUrl?: boolean;
 	dateCreated: Date;
 	dateLastEdited?: Date;
+	entityKey: string;
 	travelTime?: string;
   }

package/src/types/Listings.ts

@@ -7,7 +7,6 @@ import { SimilarListing } from './SimilarListing';
 export type Listing = {
   id: number;
   fields?: ListingFields;
-  entityId?: number;
   applyUrl?: string;
   applyOnline?: number;
   detailsUrl?: string;

package/src/util/filterUtil.js

@@ -82,17 +82,17 @@ export const generateFilterOptions = (
 			if (fieldName === parentField && filterOptions?.filters) {
 				return filterOptions.filters.find(filter => filter.id === fieldName);
 			}
-			if(fieldName == 'categoryClass'){
+			if(fieldName == 'category'){
 				return {
 					id: fieldName,
 					title: siteConfig.fieldNames[fieldName],
 					items: getFilterOptions(allListings, allListings, fieldName)
 				};
 			}
-			if(fieldName == 'category' && selectedFilters.categoryClass){
-				const categoryClassKeys = Object.keys(selectedFilters.categoryClass);
+			if(fieldName == 'subCategory' && selectedFilters.category){
+				const categoryKeys = Object.keys(selectedFilters.category);
 				const filteredListings = allListings.filter(
-					x => categoryClassKeys.includes(x.fields?.categoryClass)
+					x => categoryKeys.includes(x.fields?.category)
 				);
 				return {
 					id: fieldName,
@@ -255,9 +255,9 @@ function searchResults(results, query) {
 		'fields.posted',
 		'fields.subtitle',
 		'fields.education',
-		'fields.position',
+		'fields.title',
 		'fields.category',
-		'fields.categoryclass',
+		'fields.subCategory',
 		'fields.shift',
 		'fields.citystate',
 		'fields.city',

package/src/util/mapUtil.js

@@ -1,54 +1,55 @@
-export const getDistinctItemsByProximity = (items, listingEntitiesDetails) => {
+export const getDistinctItemsByProximity = (items, listingEntitiesDetailsInput) => {
 	const clusters = {};
 
-	if (!listingEntitiesDetails) return [];
+	if (!listingEntitiesDetailsInput) return [];
+
+	const listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput)
+		? listingEntitiesDetailsInput.reduce((acc, entity) => {
+			if (entity?.entityKey) acc[entity.entityKey] = entity;
+			return acc;
+		  }, {})
+		: listingEntitiesDetailsInput;
 
 	const closeItemPairs = findCloseItems(listingEntitiesDetails);
 	if (closeItemPairs.length > 0) {
-		listingEntitiesDetails = adjustItemPositions(
-			listingEntitiesDetails,
-			closeItemPairs
-		);
+		const adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
+		Object.assign(listingEntitiesDetails, adjusted);
 	}
 
 	items?.forEach(item => {
-		if(item.entityId !== -1){
-
-			const entityDetails = listingEntitiesDetails[item.entityId];
-
-			if (!entityDetails) {
-				console.error(`Details not found for entityId: ${item.entityId}`);
-				return;
-			}
+		const entityKey = item?.fields?.entityKey;
+		if (!entityKey || entityKey === '-1') return;
+		const entityDetails = listingEntitiesDetails[entityKey];
+		if (!entityDetails) {
+			console.error(`Details not found for entityKey: ${entityKey}`);
+			return;
+		}
 
-			item.mapDetails = entityDetails;
+		item.mapDetails = entityDetails;
 
-			if (!clusters[item.entityId]) {
-				clusters[item.entityId] = {
-					...item.mapDetails,
-					items: { [item.id]: item }
-				};
-			} else {
-				clusters[item.entityId].items[item.id] = item;
-			}}
+		if (!clusters[entityKey]) {
+			clusters[entityKey] = {
+				...entityDetails,
+				items: { [item.id]: item }
+			};
+		} else {
+			clusters[entityKey].items[item.id] = item;
+		}
 	});
 
 	return Object.values(clusters);
 };
 
-export const findCloseItems = itemsObj => {
+export const findCloseItems = entitiesByKey => {
 	const closeItems = [];
-	const items = Object.values(itemsObj); // Convert object to array for iteration
+	const items = Object.values(entitiesByKey); // Convert object to array
 	const proximityThreshold = 0.0001;
 
 	for (let i = 0; i < items.length; i++) {
 		for (let j = i + 1; j < items.length; j++) {
 			const distanceLat = Math.abs(items[i].latitude - items[j].latitude);
 			const distanceLng = Math.abs(items[i].longitude - items[j].longitude);
-			if (
-				distanceLat < proximityThreshold &&
-				distanceLng < proximityThreshold
-			) {
+			if (distanceLat < proximityThreshold && distanceLng < proximityThreshold) {
 				closeItems.push({ item1: items[i], item2: items[j] });
 			}
 		}
@@ -57,14 +58,18 @@ export const findCloseItems = itemsObj => {
 	return closeItems;
 };
 
-export const adjustItemPositions = (itemsObj, closeItemPairs) => {
+export const adjustItemPositions = (entitiesByKey, closeItemPairs) => {
 	const adjustmentValue = 0.0001;
-	const adjustedItems = { ...itemsObj }; // Create a shallow copy of the object
+	const adjustedItems = { ...entitiesByKey };
 
 	closeItemPairs.forEach(pair => {
-		if (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {
-			adjustedItems[pair.item2.id].latitude += adjustmentValue;
-			adjustedItems[pair.item2.id].longitude += adjustmentValue;
+		const key2 = pair.item2.entityKey;
+		if (adjustedItems[key2]) {
+			adjustedItems[key2] = {
+				...adjustedItems[key2],
+				latitude: adjustedItems[key2].latitude + adjustmentValue,
+				longitude: adjustedItems[key2].longitude + adjustmentValue
+			};
 		}
 	});
 
@@ -74,13 +79,15 @@ export const adjustItemPositions = (itemsObj, closeItemPairs) => {
 export const clusterOptions = (clusterGridSize, fillColor) => {
 	return {
 		gridSize: clusterGridSize,
-		maxZoom:15,
-		styles:[{
-			url: createSvgDataUri(fillColor),
-			textColor:'white',
-			height: 40,
-			width: 40
-		}]
+		maxZoom: 15,
+		styles: [
+			{
+				url: createSvgDataUri(fillColor),
+				textColor: 'white',
+				height: 40,
+				width: 40
+			}
+		]
 	};
 };