@abcagency/hc-ui-components 1.3.67 → 1.3.70

package/src/components/modules/maps/info-window-content.js

@@ -18,8 +18,9 @@ const InfoWindowContent = ({
 	let displayAddress = fullAddress;
 
 	if (mapInfoWindowConfig) {
-		if (mapInfoWindowConfig.entityHeaderField && mapDetails[mapInfoWindowConfig.entityHeaderField]) {
-			displayHeader = mapDetails[mapInfoWindowConfig.entityHeaderField];
+		if (mapInfoWindowConfig.entityHeaderField && (mapDetails[mapInfoWindowConfig.entityHeaderField] || mapDetails.address[mapInfoWindowConfig.entityHeaderField])) {
+			displayHeader = mapDetails[mapInfoWindowConfig.entityHeaderField] ?? mapDetails.address[mapInfoWindowConfig.entityHeaderField];
+
 		}
 
 		if (mapInfoWindowConfig.showEntityAddressFields) {

package/src/contexts/mapListContext.tsx

@@ -83,6 +83,7 @@ interface MapListProviderProps {
   easyApplyText: string;
   trackEvent: (event: string) => void;
   listings?: Listing[];
+	entities?: ListingEntity[];
   setFiltersUrl?:boolean;
   hiddenFilters?: string[];
   handleUrlUpdate: (searchParams: string) => void;
@@ -103,6 +104,7 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 	easyApplyText,
 	trackEvent,
 	listings = [],
+	entities = [],
 	setFiltersUrl,
 	hiddenFilters,
 	handleUrlUpdate,
@@ -199,10 +201,9 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 			try {
 				const {
 					listingsResult,
-					fetchedRecruiters,
 					fetchedEntities,
 					distinctItems
-				} = await fetchListings(query ?? '', siteConfig, commuteLocation);
+				} = await fetchListings(commuteLocation, entities, listings);
 				if (defaultFilters) {
 					const filteredListings = listingsResult.filter(listing => {
 					if (!listing.fields) return false;
@@ -217,8 +218,6 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 			} else {
 				setAllListings(listingsResult);
 			}
-
-				setRecruiters(fetchedRecruiters);
 				setListingEntities(fetchedEntities);
 				setMapItems(distinctItems);
 			} catch (error) {

package/src/services/listingAggregatorService.ts

@@ -7,6 +7,7 @@ import { Listing } from '~/types/Listings';
 import { Recruiter } from '~/types/Recruiter';
 import { ListingEntity } from '~/types/ListingEntity';
 import { MapConfig } from '~/types/config/MapConfig';
+import { List } from '@radix-ui/react-tabs';
 //import { ICommuteLocation } from '~/interfaces/ICommute';
 
 interface SiteConfig {
@@ -15,33 +16,23 @@ interface SiteConfig {
 
 interface FetchListingsResult {
   listingsResult: Listing[];
-  fetchedRecruiters: Recruiter[];
   fetchedEntities: Record<number, ListingEntity>;
   distinctItems: any; // Update this type based on the return type of getDistinctItemsByProximity
 }
 
 const fetchListings = async (
-	query: string,
-	siteConfig: MapConfig,
-	commuteLocation: any | null = null
+	commuteLocation: any | null = null,
+	entities: ListingEntity[] | null,
+	listings: Listing[] | null
 ): Promise<FetchListingsResult> => {
 	try {
-		const listingsResult = await getListings(
-
-		);
-
-		const recruiterIds: number[] = [
-			...new Set(listingsResult.map(listing => listing.recruiterId))
-		] as number[];
-
-		const fetchedRecruiters = await getRecruiters(recruiterIds);
-
+		const listingsResult = listings && listings.length > 0 ? listings : await getListings();
 		const distinctEntityIds: number[] = [
 			...new Set(listingsResult.map(listing => listing.entityId))
 		] as number[];
 
 		const fetchedEntities = !commuteLocation
-			? await getListingEntities(distinctEntityIds)
+			? entities && entities.length > 0 ? entities : await getListingEntities(distinctEntityIds)
 			: await getListingEntities(
 				distinctEntityIds,
 				`${commuteLocation.lat}, ${commuteLocation.lng}`
@@ -63,7 +54,6 @@ const fetchListings = async (
 
 		return {
 			listingsResult,
-			fetchedRecruiters,
 			fetchedEntities,
 			distinctItems
 		};