@abcagency/hc-ui-components 1.4.5 → 1.4.8

package/src/contexts/mapListContext.tsx

@@ -11,6 +11,7 @@ import { Listing } from '~/types/Listings';
 import { ListingEntity } from '~/types/ListingEntity';
 import { Recruiter } from '~/types/Recruiter';
 import { MapConfig, MapConfig as SiteConfig } from '~/types/config/MapConfig';
+import { get } from 'http';
 
 interface MapListContextProps {
   loading: boolean;
@@ -92,6 +93,7 @@ interface MapListProviderProps {
   defaultFilters?: Record<string, any>;
   containerStyle?: any;
 	localStorageKey: string;
+	getListingEntitiesCallback?: (entityIds: number[], origin?: string) => Promise<ListingEntity[]>;
   ExpandListComponent?: React.ComponentType<{ listing: Listing }> | ((listing: Listing) => JSX.Element) | null;
 }
 
@@ -115,6 +117,7 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 	defaultFilters,
 	containerStyle,
 	ExpandListComponent,
+	getListingEntitiesCallback,
 	localStorageKey
 }) => {
 	const firstLoadFilters = () =>{
@@ -161,31 +164,31 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 		if (!commuteLocation) return;
 
 		async function fetchEntities() {
+			const distinctEntityIds = [
+				...new Set(allListings.map(listing => listing.entityId ?? -1))
+			];
 			try {
-				//gonna need to fix this here
-				console.log("Fetching entities for commute location", commuteLocation);
-				const fetchedEntities = await getListingEntities(
+				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}`
 				);
-				const entitiesByKey = fetchedEntities;
-
 				setListingEntities(fetchedEntities);
 				const newFilteredListings: Listing[] = [...filteredListings] ?? [];
-				console.log("Filtered lsitngs:", newFilteredListings);
-				console.log("all listings", allListings);
 				for (let i = 0; i < allListings.length; i++) {
 					const listing = newFilteredListings[i];
 					if (
 						listing &&
 						listing.fields &&
-						listing.fields.entityKey !== undefined &&
-						listing.fields.entityKey !== ''
+						listing.entityId !== undefined &&
+						listing.entityId !== -1
 					) {
-						const entityKey = listing.fields.entityKey;
-						const travelTime = entitiesByKey[entityKey]?.travelTime;
-						console.log("Entity for listing with travel time", entityKey, entitiesByKey[entityKey]);
+						const entityId = listing.entityId;
+						const travelTime = fetchedEntities[entityId]?.travelTime;
+
 						if (travelTime !== undefined && listing.fields) {
-							console.log("Setting travel time for listing", travelTime);
 							listing.fields.travelTime = travelTime;
 						}
 					}
@@ -207,9 +210,9 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 			try {
 				const {
 					listingsResult,
-					entitiesByKey,
+					fetchedEntities,
 					distinctItems
-				} = await fetchListings(commuteLocation, entities, listings);
+				} = await fetchListings(commuteLocation, entities, listings, getListingEntitiesCallback);
 				if (defaultFilters) {
 					const filteredListings = listingsResult.filter(listing => {
 					if (!listing.fields) return false;
@@ -224,8 +227,8 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 			} else {
 				setAllListings(listingsResult);
 			}
-				setListingEntities(entitiesByKey);
-				setMapItems(Object.values(mapItems));
+				setListingEntities(fetchedEntities);
+				setMapItems(distinctItems);
 			} catch (error) {
 				console.log(error);
 			}
@@ -266,7 +269,7 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 				updateURLWithFilters(tempSelectedFilters, window.location, tempQuery, handleUrlUpdate);
 			}
 			tempQuery != null ? localStorage.setItem('query', tempQuery) : localStorage.removeItem('query');
-			setMapItems(Object.values(mapItems));
+			setMapItems(mapItems);
 
 			if (tempSelectedFilters) {
 				const keys = Object.keys(tempSelectedFilters);

package/src/services/listingAggregatorService.ts

@@ -6,47 +6,48 @@ import { ListingEntity } from '~/types/ListingEntity';
 
 interface FetchListingsResult {
   listingsResult: Listing[];
-  entitiesByKey: Record<string, ListingEntity>;
+  fetchedEntities: Record<number, ListingEntity>;
   distinctItems: any; // Update this type based on the return type of getDistinctItemsByProximity
 }
 
 const fetchListings = async (
 	commuteLocation: any | null = null,
 	entities: ListingEntity[] | null,
-	listings: Listing[] | null
+	listings: Listing[] | null,
+	getListingEntitiesCallback?: (entityIds: number[], 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 : await getListingEntities()
-			: await getListingEntities(
+			? entities && entities.length > 0 ? entities : !getListingEntitiesCallback ? await getListingEntities(distinctEntityIds) : await getListingEntitiesCallback(distinctEntityIds)
+			: !getListingEntitiesCallback ? await getListingEntities(
+				distinctEntityIds,
 				`${commuteLocation.lat}, ${commuteLocation.lng}`
-			);
-
-		//possible quick workaround fix, need to implement clearer code
-
-		const entitiesByKey = fetchedEntities;
+			) : await getListingEntitiesCallback(	distinctEntityIds,
+				`${commuteLocation.lat}, ${commuteLocation.lng}`);
 		for (let i = 0; i < listingsResult.length; i++) {
 			const listing = listingsResult[i];
-			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 (listing.entityId && listing.entityId !== -1 && listing.fields) {
+				const entity = fetchedEntities[listing.entityId];
 				if (entity) {
 					listing.fields.travelTime = entity.travelTime;
 				}
 			}
 		}
+
 		const distinctItems = getDistinctItemsByProximity(
 			listingsResult,
-			entitiesByKey,
+			fetchedEntities
 		);
 
 		return {
 			listingsResult,
-			entitiesByKey,
-			//temp fix, need to fix the proximity function to work with entity key and use
-			distinctItems: distinctItems
+			fetchedEntities,
+			distinctItems
 		};
 	} catch (error) {
 		console.error("Error fetching listings:", error);

package/src/services/listingEntityService.ts

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

package/src/services/listingService.ts

@@ -5,19 +5,18 @@ import { Listing } from '../types/Listings';
 
 export const getListings = async (params?: GetListingsParams): Promise<Listing[]> => {
 	try {
-		// const query = new URLSearchParams();
+		const query = new URLSearchParams();
 
-		// 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(`/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/ListingEntity.ts

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

package/src/types/ListingFields.ts

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

package/src/types/Listings.ts

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

package/src/util/mapUtil.js

@@ -1,55 +1,54 @@
-export const getDistinctItemsByProximity = (items, listingEntitiesDetailsInput) => {
+export const getDistinctItemsByProximity = (items, listingEntitiesDetails) => {
 	const clusters = {};
 
-	if (!listingEntitiesDetailsInput) return [];
-
-	const listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput)
-		? listingEntitiesDetailsInput.reduce((acc, entity) => {
-			if (entity?.entityKey) acc[entity.entityKey] = entity;
-			return acc;
-		  }, {})
-		: listingEntitiesDetailsInput;
+	if (!listingEntitiesDetails) return [];
 
 	const closeItemPairs = findCloseItems(listingEntitiesDetails);
 	if (closeItemPairs.length > 0) {
-		const adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
-		Object.assign(listingEntitiesDetails, adjusted);
+		listingEntitiesDetails = adjustItemPositions(
+			listingEntitiesDetails,
+			closeItemPairs
+		);
 	}
 
 	items?.forEach(item => {
-		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;
-		}
+		if(item.entityId !== -1){
 
-		item.mapDetails = entityDetails;
+			const entityDetails = listingEntitiesDetails[item.entityId];
 
-		if (!clusters[entityKey]) {
-			clusters[entityKey] = {
-				...entityDetails,
-				items: { [item.id]: item }
-			};
-		} else {
-			clusters[entityKey].items[item.id] = item;
-		}
+			if (!entityDetails) {
+				console.error(`Details not found for entityId: ${item.entityId}`);
+				return;
+			}
+
+			item.mapDetails = entityDetails;
+
+			if (!clusters[item.entityId]) {
+				clusters[item.entityId] = {
+					...item.mapDetails,
+					items: { [item.id]: item }
+				};
+			} else {
+				clusters[item.entityId].items[item.id] = item;
+			}}
 	});
 
 	return Object.values(clusters);
 };
 
-export const findCloseItems = entitiesByKey => {
+export const findCloseItems = itemsObj => {
 	const closeItems = [];
-	const items = Object.values(entitiesByKey); // Convert object to array
+	const items = Object.values(itemsObj); // Convert object to array for iteration
 	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] });
 			}
 		}
@@ -58,18 +57,14 @@ export const findCloseItems = entitiesByKey => {
 	return closeItems;
 };
 
-export const adjustItemPositions = (entitiesByKey, closeItemPairs) => {
+export const adjustItemPositions = (itemsObj, closeItemPairs) => {
 	const adjustmentValue = 0.0001;
-	const adjustedItems = { ...entitiesByKey };
+	const adjustedItems = { ...itemsObj }; // Create a shallow copy of the object
 
 	closeItemPairs.forEach(pair => {
-		const key2 = pair.item2.entityKey;
-		if (adjustedItems[key2]) {
-			adjustedItems[key2] = {
-				...adjustedItems[key2],
-				latitude: adjustedItems[key2].latitude + adjustmentValue,
-				longitude: adjustedItems[key2].longitude + adjustmentValue
-			};
+		if (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {
+			adjustedItems[pair.item2.id].latitude += adjustmentValue;
+			adjustedItems[pair.item2.id].longitude += adjustmentValue;
 		}
 	});
 
@@ -79,15 +74,13 @@ export const adjustItemPositions = (entitiesByKey, 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
+		}]
 	};
 };