@abcagency/hc-ui-components 1.4.8 → 1.4.11

package/dist/util/mapUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapUtil.js","sources":["../../src/util/mapUtil.js"],"sourcesContent":["export const getDistinctItemsByProximity = (items, listingEntitiesDetails) => {\n\tconst clusters = {};\n\n\tif (!listingEntitiesDetails) return [];\n\n\tconst closeItemPairs = findCloseItems(listingEntitiesDetails);\n\tif (closeItemPairs.length > 0) {\n\t\tlistingEntitiesDetails = adjustItemPositions(\n\t\t\tlistingEntitiesDetails,\n\t\t\tcloseItemPairs\n\t\t);\n\t}\n\n\titems?.forEach(item => {\n\t\tif(item.entityId !== -1){\n\n\t\t\tconst entityDetails = listingEntitiesDetails[item.entityId];\n\n\t\t\tif (!entityDetails) {\n\t\t\t\tconsole.error(`Details not found for entityId: ${item.entityId}`);\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\titem.mapDetails = entityDetails;\n\n\t\t\tif (!clusters[item.entityId]) {\n\t\t\t\tclusters[item.entityId] = {\n\t\t\t\t\t...item.mapDetails,\n\t\t\t\t\titems: { [item.id]: item }\n\t\t\t\t};\n\t\t\t} else {\n\t\t\t\tclusters[item.entityId].items[item.id] = item;\n\t\t\t}}\n\t});\n\n\treturn Object.values(clusters);\n};\n\nexport const findCloseItems = itemsObj => {\n\tconst closeItems = [];\n\tconst items = Object.values(itemsObj); // Convert object to array for iteration\n\tconst proximityThreshold = 0.0001;\n\n\tfor (let i = 0; i < items.length; i++) {\n\t\tfor (let j = i + 1; j < items.length; j++) {\n\t\t\tconst distanceLat = Math.abs(items[i].latitude - items[j].latitude);\n\t\t\tconst distanceLng = Math.abs(items[i].longitude - items[j].longitude);\n\t\t\tif (\n\t\t\t\tdistanceLat < proximityThreshold &&\n\t\t\t\tdistanceLng < proximityThreshold\n\t\t\t) {\n\t\t\t\tcloseItems.push({ item1: items[i], item2: items[j] });\n\t\t\t}\n\t\t}\n\t}\n\n\treturn closeItems;\n};\n\nexport const adjustItemPositions = (itemsObj, closeItemPairs) => {\n\tconst adjustmentValue = 0.0001;\n\tconst adjustedItems = { ...itemsObj }; // Create a shallow copy of the object\n\n\tcloseItemPairs.forEach(pair => {\n\t\tif (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {\n\t\t\tadjustedItems[pair.item2.id].latitude += adjustmentValue;\n\t\t\tadjustedItems[pair.item2.id].longitude += adjustmentValue;\n\t\t}\n\t});\n\n\treturn adjustedItems;\n};\n\nexport const clusterOptions = (clusterGridSize, fillColor) => {\n\treturn {\n\t\tgridSize: clusterGridSize,\n\t\tmaxZoom:15,\n\t\tstyles:[{\n\t\t\turl: createSvgDataUri(fillColor),\n\t\t\ttextColor:'white',\n\t\t\theight: 40,\n\t\t\twidth: 40\n\t\t}]\n\t};\n};\n\nfunction createSvgDataUri(fillColor) {\n\tconst svg = `<svg width=\"50\" height=\"50\" xmlns=\"http://www.w3.org/2000/svg\">\n\t  <circle cx=\"25\" cy=\"25\" r=\"20\" fill=\"${fillColor}\" />\n\t</svg>`;\n\treturn `data:image/svg+xml;base64,${btoa(svg)}`;\n}\n"],"names":["getDistinctItemsByProximity","items","listingEntitiesDetails","clusters","closeItemPairs","findCloseItems","length","adjustItemPositions","forEach","item","entityId","entityDetails","console","error","concat","mapDetails","_objectSpread","_defineProperty","id","Object","values","itemsObj","closeItems","proximityThreshold","i","j","distanceLat","Math","abs","latitude","distanceLng","longitude","push","item1","item2","adjustmentValue","adjustedItems","pair","clusterOptions","clusterGridSize","fillColor","gridSize","maxZoom","styles","url","createSvgDataUri","textColor","height","width","svg","btoa"],"mappings":"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"}
+{"version":3,"file":"mapUtil.js","sources":["../../src/util/mapUtil.js"],"sourcesContent":["export const getDistinctItemsByProximity = (items, listingEntitiesDetailsInput) => {\n\tconst clusters = {};\n\n\tif (!listingEntitiesDetailsInput) return [];\n\n\tconst listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput)\n\t\t? listingEntitiesDetailsInput.reduce((acc, entity) => {\n\t\t\tif (entity?.entityKey) acc[entity.entityKey] = entity;\n\t\t\treturn acc;\n\t\t  }, {})\n\t\t: listingEntitiesDetailsInput;\n\n\tconst closeItemPairs = findCloseItems(listingEntitiesDetails);\n\tif (closeItemPairs.length > 0) {\n\t\tconst adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);\n\t\tObject.assign(listingEntitiesDetails, adjusted);\n\t}\n\n\titems?.forEach(item => {\n\t\tconst entityKey = item?.fields?.entityKey;\n\t\tif (!entityKey || entityKey === '-1') return;\n\t\tconst entityDetails = listingEntitiesDetails[entityKey];\n\t\tif (!entityDetails) {\n\t\t\tconsole.error(`Details not found for entityKey: ${entityKey}`);\n\t\t\treturn;\n\t\t}\n\n\t\titem.mapDetails = entityDetails;\n\n\t\tif (!clusters[entityKey]) {\n\t\t\tclusters[entityKey] = {\n\t\t\t\t...entityDetails,\n\t\t\t\titems: { [item.id]: item }\n\t\t\t};\n\t\t} else {\n\t\t\tclusters[entityKey].items[item.id] = item;\n\t\t}\n\t});\n\n\treturn Object.values(clusters);\n};\n\nexport const findCloseItems = entitiesByKey => {\n\tconst closeItems = [];\n\tconst items = Object.values(entitiesByKey); // Convert object to array\n\tconst proximityThreshold = 0.0001;\n\n\tfor (let i = 0; i < items.length; i++) {\n\t\tfor (let j = i + 1; j < items.length; j++) {\n\t\t\tconst distanceLat = Math.abs(items[i].latitude - items[j].latitude);\n\t\t\tconst distanceLng = Math.abs(items[i].longitude - items[j].longitude);\n\t\t\tif (distanceLat < proximityThreshold && distanceLng < proximityThreshold) {\n\t\t\t\tcloseItems.push({ item1: items[i], item2: items[j] });\n\t\t\t}\n\t\t}\n\t}\n\n\treturn closeItems;\n};\n\nexport const adjustItemPositions = (entitiesByKey, closeItemPairs) => {\n\tconst adjustmentValue = 0.0001;\n\tconst adjustedItems = { ...entitiesByKey };\n\n\tcloseItemPairs.forEach(pair => {\n\t\tconst key2 = pair.item2.entityKey;\n\t\tif (adjustedItems[key2]) {\n\t\t\tadjustedItems[key2] = {\n\t\t\t\t...adjustedItems[key2],\n\t\t\t\tlatitude: adjustedItems[key2].latitude + adjustmentValue,\n\t\t\t\tlongitude: adjustedItems[key2].longitude + adjustmentValue\n\t\t\t};\n\t\t}\n\t});\n\n\treturn adjustedItems;\n};\n\nexport const clusterOptions = (clusterGridSize, fillColor) => {\n\treturn {\n\t\tgridSize: clusterGridSize,\n\t\tmaxZoom: 15,\n\t\tstyles: [\n\t\t\t{\n\t\t\t\turl: createSvgDataUri(fillColor),\n\t\t\t\ttextColor: 'white',\n\t\t\t\theight: 40,\n\t\t\t\twidth: 40\n\t\t\t}\n\t\t]\n\t};\n};\n\nfunction createSvgDataUri(fillColor) {\n\tconst svg = `<svg width=\"50\" height=\"50\" xmlns=\"http://www.w3.org/2000/svg\">\n\t  <circle cx=\"25\" cy=\"25\" r=\"20\" fill=\"${fillColor}\" />\n\t</svg>`;\n\treturn `data:image/svg+xml;base64,${btoa(svg)}`;\n}\n"],"names":["getDistinctItemsByProximity","items","listingEntitiesDetailsInput","clusters","listingEntitiesDetails","Array","isArray","reduce","acc","entity","entityKey","closeItemPairs","findCloseItems","length","adjusted","adjustItemPositions","Object","assign","forEach","item","_item$fields","fields","entityDetails","console","error","concat","mapDetails","_objectSpread","_defineProperty","id","values","entitiesByKey","closeItems","proximityThreshold","i","j","distanceLat","Math","abs","latitude","distanceLng","longitude","push","item1","item2","adjustmentValue","adjustedItems","pair","key2","clusterOptions","clusterGridSize","fillColor","gridSize","maxZoom","styles","url","createSvgDataUri","textColor","height","width","svg","btoa"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@abcagency/hc-ui-components",
-	"version": "1.4.8",
+	"version": "1.4.11",
 	"description": "UI Components for HireControl",
 	"main": "dist/index.js",
 	"files": [
@@ -9,7 +9,12 @@
 	],
 	"scripts": {
 		"build": "cross-env NODE_ENV=production rollup -c",
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"prepublishOnly": "npm run build",
+		"release:patch": "npm version patch && npm run build && npm publish",
+		"release:minor": "npm version minor && npm run build && npm publish",
+		"release:major": "npm version major && npm run build && npm publish",
+		"version": "npm run build && git add dist/"
 	},
 	"keywords": [
 		"hirecontrol",

package/src/components/HireControlMap.js

@@ -48,7 +48,7 @@ function useSiteConfig(clientToken, siteConfiguration = null) {
 }
 
 // Component to handle all context providers
-const ContextProviders = ({ children, siteConfig, trackEvent, ...mapListProps }) => { return(
+const ContextProviders = ({ children, siteConfig, trackEvent, googleMapsApiKey, ...mapListProps }) => { return(
 	<TrackEventProvider trackEvent={trackEvent}>
 		<ThemeProvider
 			uiText={siteConfig.colors.uiText}
@@ -63,6 +63,7 @@ const ContextProviders = ({ children, siteConfig, trackEvent, ...mapListProps })
 					<PlacesProvider
 						placeMappings={siteConfig.pointsOfInterestConfig.placeMappings ?? {}}
 						additionalMapMarkers={mapListProps.additionalMapMarkers}
+						googleMapsApiKey={googleMapsApiKey}
 						markerColors={{
 							fillColor: siteConfig.colors.primary,
 							strokeColor: siteConfig.colors.primaryDark,
@@ -87,6 +88,7 @@ const ContextProviders = ({ children, siteConfig, trackEvent, ...mapListProps })
 //
 export const HireControlMap = ({
 	clientToken,
+	googleMapsApiKey, // Required: Google Maps API key from Next.js
 	containerStyle = { height: '100vh' },
 	navigateToDetails = null,
 	navigateToEasyApply = null,
@@ -118,12 +120,27 @@ export const HireControlMap = ({
 	const { siteConfig, error } = useSiteConfig(clientToken, siteConfiguration);
 
 	// Load Google Maps
-	const { isLoaded: isMapsLoaded } = useLoadScript({
-		googleMapsApiKey: process.env.GOOGLE_MAPS_API_KEY,
+	const { isLoaded: isMapsLoaded, loadError } = useLoadScript({
+		googleMapsApiKey: googleMapsApiKey,
 		version: 'quarterly',
 		libraries: LIBRARIES
 	});
 
+	// Show loading state or error if Google Maps hasn't loaded yet
+	if (!googleMapsApiKey) {
+		console.error('Google Maps API key is required');
+		return <div className="hc-p-4">Google Maps API key is required</div>;
+	}
+
+	if (loadError) {
+		console.error('Google Maps failed to load:', loadError);
+		return <div className="hc-p-4">Error loading Google Maps</div>;
+	}
+
+	if (!isMapsLoaded) {
+		return <div className="hc-p-4">Loading Maps...</div>;
+	}
+
 	if (error || !siteConfig) {
 		return <div className="hc-p-4"></div>;
 	}
@@ -169,6 +186,7 @@ export const HireControlMap = ({
 		<ContextProviders
 			siteConfig={siteConfig}
 			trackEvent={trackEvent}
+			googleMapsApiKey={googleMapsApiKey || process.env.GOOGLE_MAPS_API_KEY}
 			{...mapListProps}
 		>
 			<Grid

package/src/components/containers/accordions/filter-item-container.js

@@ -21,8 +21,8 @@ const FilterItemContainer = ({
 		event.stopPropagation();
 		setSelectedFilters(prevFilters => {
 			const updatedFilters = { ...prevFilters };
-			if(subcategoryRequireCategory && fieldKey == 'categoryClass'){
-				delete updatedFilters['category'];
+			if(subcategoryRequireCategory && fieldKey == 'category'){
+				delete updatedFilters['subCategory'];
 			}
 			if(fieldKey == 'state' || fieldKey == 'city' || fieldKey == 'cityState'){
 				delete updatedFilters.entityId;

package/src/components/containers/accordions/map-accordion-item-container.js

@@ -25,7 +25,11 @@ const MapAccordionItemContainer = ({
 			selectItem(null, null, 9, { lat: 39.8283, lng: -98.5795 });
 		} else {
 			setStorageObject("selectedListItem", item);
-			const location = mapItems.find(x => Object.prototype.hasOwnProperty.call(x.items, item.id)) || null;
+			console.log('mapItems here', mapItems);
+			//edited here for new structure of entity key
+			console.log('the item in questions is',item);
+			const location = mapItems.find(x => Object.prototype.hasOwnProperty.call(x.items, item.fields.entityKey)) || null;
+			console.log('location is', location);
 			selectItem(item, location, 12, {
 				lat: location?.latitude,
 				lng: location?.longitude
@@ -35,7 +39,7 @@ const MapAccordionItemContainer = ({
 
 	const handleItemClick = item => {
 		trackEvent(eventTypes.JOB_LISTING_SELECTED, {
-			jobTitle: item.fields.position,
+			jobTitle: item.fields.title,
 			jobCategory: item.fields.category,
 			entityDisplayName: item?.mapDetails?.entityDisplayName
 		});

package/src/components/containers/filter/filter-item-container.js

@@ -55,30 +55,30 @@ const FilterItemContainer = ({
 				delete updatedFilters[field];
 			}
 
-			if (field === 'categoryClass' && subcategoryRequireCategory) {
+			if (field === 'category' && subcategoryRequireCategory) {
 				const activeCategoryClass = itemKey;
 				const categoriesToConsiderForRemoval = new Set(
 					filteredListings
-						.filter(listing => listing.fields.categoryClass === activeCategoryClass)
-						.flatMap(listing => listing.fields.category || [])
+						.filter(listing => listing.fields.category === activeCategoryClass)
+						.flatMap(listing => listing.fields.subCategory || [])
 				);
 
 				const categoriesToRetain = new Set(
 					filteredListings
-						.filter(listing => listing.fields.categoryClass !== activeCategoryClass)
-						.flatMap(listing => listing.fields.category || [])
+						.filter(listing => listing.fields.category !== activeCategoryClass)
+						.flatMap(listing => listing.fields.subCategory || [])
 						.filter(category => categoriesToConsiderForRemoval.has(category))
 				);
 
-				if (updatedFilters['category']) {
-					Object.keys(updatedFilters['category']).forEach(categoryKey => {
+				if (updatedFilters['subCategory']) {
+					Object.keys(updatedFilters['subCategory']).forEach(categoryKey => {
 						if (categoriesToConsiderForRemoval.has(categoryKey) && !categoriesToRetain.has(categoryKey)) {
-							delete updatedFilters['category'][categoryKey];
+							delete updatedFilters['subCategory'][categoryKey];
 						}
 					});
 
-					if (Object.keys(updatedFilters['category']).length === 0) {
-						delete updatedFilters['category'];
+					if (Object.keys(updatedFilters['subCategory']).length === 0) {
+						delete updatedFilters['subCategory'];
 					}
 				}
 			}

package/src/components/containers/maps/info-window-content-container.js

@@ -57,7 +57,7 @@ const InfoWindowContentContainer = ({
 			newFilters.state = { [items[0].fields.state]: true };
 			filters.push({ filterType: 'state', filterChecked: items[0].fields.state });
 		}
-
+		
 		newFilters.entityName = { [items[0].fields.entityName]: true };
 		filters.push({ filterType: 'entityName', filterChecked: items[0].fields.entityName });
 

package/src/components/containers/maps/map-container.js

@@ -256,9 +256,10 @@ const MapContainer = ({ markerConfigs, infoWindowClasses, clusterGridSize = 60 }
 	if (!mapItems) {
 		return null;
 	}
+
 	const mapItemsKey = mapItems.map(item => item.id).join("-");
 
-	console.log(location);
+
 	return (
 		<Map
 			zoom={zoom}

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/contexts/placesContext.js

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useEffect, useState } from 'react';
+import React, { createContext, useContext, useEffect, useState, useCallback } from 'react';
 
 import { markerIconProps } from '~/util/mapIconUtil';
 
@@ -10,7 +10,7 @@ const PlacesContext = createContext();
 
 export const usePlaces = () => useContext(PlacesContext);
 
-export const PlacesProvider = ({ children, placeMappings, markerColors, additionalMapMarkers }) => {
+export const PlacesProvider = ({ children, placeMappings, markerColors, additionalMapMarkers, googleMapsApiKey }) => {
 	const { selectedPlaces, zoom, center } = useMap();
 	const [poiMarkers, setPoiMarkers] = useState({ markers: [], icon: null });
 	const [currentCenter, setCurrentCenter] = useState(center);
@@ -18,7 +18,7 @@ export const PlacesProvider = ({ children, placeMappings, markerColors, addition
 	const [placesWindow, setPlacesWindow] = useState(false);
 	const [selectedPlaceMarker, setSelectedPlaceMarker] = useState(null);
 
-	const getRadiusForZoom = () => {
+	const getRadiusForZoom = useCallback(() => {
 		if (currentZoom >= 18) return 1000;
 		if (currentZoom <= 10) return 0;
 
@@ -31,7 +31,7 @@ export const PlacesProvider = ({ children, placeMappings, markerColors, addition
 		else if (radius > maxRadius) radius = maxRadius;
 
 		return radius;
-	};
+	}, [currentZoom]);
 
 	useEffect(() => {
 		if (!selectedPlaces || (!selectedPlaces.length > 0) || !center || currentZoom < 12) {
@@ -49,7 +49,7 @@ export const PlacesProvider = ({ children, placeMappings, markerColors, addition
 			const location = { latitude: currentCenter.lat, longitude: currentCenter.lng };
 
 			try {
-				const response = await searchNearbyPlaces(poiTypes, location, radius);
+				const response = await searchNearbyPlaces(poiTypes, location, radius, googleMapsApiKey || process.env.GOOGLE_MAPS_API_KEY);
 				const newMarkers = response.places.map(place => {
 					const getParentCategory = types => {
 						const selectedTypes = selectedPOICategories.reduce((acc, category) => {
@@ -82,7 +82,7 @@ export const PlacesProvider = ({ children, placeMappings, markerColors, addition
 		};
 
 		fetchPlaces();
-	}, [selectedPlaces, currentZoom, currentCenter]);
+	}, [selectedPlaces, currentZoom, currentCenter, placeMappings, markerColors.placeMarkers, googleMapsApiKey, getRadiusForZoom, center]);
 
 	return (
 		<PlacesContext.Provider value={{

package/src/services/googlePlacesNearbyService.ts

@@ -6,12 +6,13 @@ export interface Location {
 export const searchNearbyPlaces = async (
 	typesArray: string[],
 	location: Location,
-	radius: number
+	radius: number,
+	apiKey?: string
 ): Promise<any> => {
 	const url = 'https://places.googleapis.com/v1/places:searchNearby';
 	const headers = {
 		'Content-Type': 'application/json',
-		'X-Goog-Api-Key': process.env.GOOGLE_MAPS_API_KEY as string,
+		'X-Goog-Api-Key': apiKey || (process.env.GOOGLE_MAPS_API_KEY as string),
 		'X-Goog-FieldMask': 'places.location,places.displayName,places.types'
 	};
 	const data = {

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);