@abcagency/hc-ui-components 1.4.8 → 1.4.11

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
+			}
+		]
 	};
 };