@abcagency/hc-ui-components 1.4.4 → 1.4.7

package/dist/services/listingEntityService.js

@@ -1,9 +1,8 @@
 import api from '../apis/hcApi.js';
 
-const getListingEntities = async (origin = '') => {
+const getListingEntities = async (entityIds, origin = '') => {
     try {
-        //need to update / or add better endpoint fo this to match original functioanlity
-        const response = await api.get(`/listingentities/MapEntities?origin=${origin}`);
+        const response = await api.post(`/ListingEntities?origin=${origin}`, entityIds);
         return response;
     }
     catch (error) {

package/dist/services/listingEntityService.js.map

@@ -1 +1 @@
-{"version":3,"file":"listingEntityService.js","sources":["../../src/services/listingEntityService.ts"],"sourcesContent":["import api from '~/apis/hcApi';\n\nexport const getListingEntities = async (origin = ''): Promise<any> => {\n\ttry {\n\t\t//need to update / or add better endpoint fo this to match original functioanlity\n\t\tconst response = await api.get<any>(`/listingentities/MapEntities?origin=${origin}`);\n\t\treturn response;\n\t} catch (error) {\n\t\tconsole.error(\"Error fetching listing entities:\", error);\n\t\tthrow error;\n\t}\n};\n\nexport default {\n\tgetListingEntities\n};\n"],"names":[],"mappings":";;AAEa,MAAA,kBAAkB,GAAG,OAAO,MAAM,GAAG,EAAE,KAAkB;IACrE,IAAI;;QAEH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAM,CAAuC,oCAAA,EAAA,MAAM,CAAE,CAAA,CAAC,CAAC;AACrF,QAAA,OAAO,QAAQ,CAAC;AAChB,KAAA;AAAC,IAAA,OAAO,KAAK,EAAE;AACf,QAAA,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;AACzD,QAAA,MAAM,KAAK,CAAC;AACZ,KAAA;AACF;;;;"}
+{"version":3,"file":"listingEntityService.js","sources":["../../src/services/listingEntityService.ts"],"sourcesContent":["import api from '~/apis/hcApi';\nimport { ListingEntity } from '~/types/ListingEntity';\n\nexport const getListingEntities = async (entityIds: number[], origin = ''): Promise<ListingEntity[]> => {\n\ttry {\n\t\tconst response = await api.post<ListingEntity[]>(`/ListingEntities?origin=${origin}`, entityIds);\n\t\treturn response;\n\t} catch (error) {\n\t\tconsole.error(\"Error fetching listing entities:\", error);\n\t\tthrow error;\n\t}\n};\n\nexport default {\n\tgetListingEntities\n};\n"],"names":[],"mappings":";;AAGO,MAAM,kBAAkB,GAAG,OAAO,SAAmB,EAAE,MAAM,GAAG,EAAE,KAA8B;IACtG,IAAI;AACH,QAAA,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAkB,CAAA,wBAAA,EAA2B,MAAM,CAAA,CAAE,EAAE,SAAS,CAAC,CAAC;AACjG,QAAA,OAAO,QAAQ,CAAC;AAChB,KAAA;AAAC,IAAA,OAAO,KAAK,EAAE;AACf,QAAA,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;AACzD,QAAA,MAAM,KAAK,CAAC;AACZ,KAAA;AACF;;;;"}

package/dist/services/listingService.js

@@ -2,16 +2,22 @@ import api from '../apis/hcApi.js';
 
 const getListings = async (params) => {
     try {
-        // 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`);
+        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(`/Listings?${query.toString()}`);
         return response;
     }
     catch (error) {

package/dist/services/listingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"listingService.js","sources":["../../src/services/listingService.ts"],"sourcesContent":["// listingService.ts\nimport { GetListingsParams } from '~/types/GetListingParams';\nimport api from '../apis/hcApi';\nimport { Listing } from '../types/Listings';\n\nexport const getListings = async (params?: GetListingsParams): Promise<Listing[]> => {\n\ttry {\n\t\t// const query = new URLSearchParams();\n\n\t\t// if (params) {\n\t\t// \tif (params.location) params.location.forEach(loc => query.append('location', loc));\n\t\t// \tif (params.category) params.category.forEach(cat => query.append('category', cat));\n\t\t// \tif (params.categoryClass) params.categoryClass.forEach(catClass => query.append('categoryClass', catClass));\n\t\t// \tif (params.education) params.education.forEach(edu => query.append('education', edu));\n\t\t// \tif (params.city) params.city.forEach(cty => query.append('city', cty));\n\t\t// \tif (params.state) params.state.forEach(st => query.append('state', st));\n\t\t// }\n\n\t\tconst response = await api.get(`/joblistings/maplistings`);\n\n\t\treturn response as Listing[];\n\t} catch (error) {\n\t\tconsole.error(error);\n\t\tthrow error;\n\t}\n};\n\nexport const getListingDetails = async (listingId: string) => {\n\ttry {\n\t\tconst response = await api.get(`/ListingDetails/${listingId}`);\n\t\treturn response;\n\t} catch (error) {\n\t\tconsole.error(error);\n\t\tthrow error;\n\t}\n};\n\nexport default {\n\tgetListings,\n\tgetListingDetails\n};\n"],"names":[],"mappings":";;MAKa,WAAW,GAAG,OAAO,MAA0B,KAAwB;IACnF,IAAI;;;;;;;;;;QAYH,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAA0B,wBAAA,CAAA,CAAC,CAAC;AAE3D,QAAA,OAAO,QAAqB,CAAC;AAC7B,KAAA;AAAC,IAAA,OAAO,KAAK,EAAE;AACf,QAAA,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACrB,QAAA,MAAM,KAAK,CAAC;AACZ,KAAA;AACF;;;;"}
+{"version":3,"file":"listingService.js","sources":["../../src/services/listingService.ts"],"sourcesContent":["// listingService.ts\nimport { GetListingsParams } from '~/types/GetListingParams';\nimport api from '../apis/hcApi';\nimport { Listing } from '../types/Listings';\n\nexport const getListings = async (params?: GetListingsParams): Promise<Listing[]> => {\n\ttry {\n\t\tconst query = new URLSearchParams();\n\n\t\tif (params) {\n\t\t\tif (params.location) params.location.forEach(loc => query.append('location', loc));\n\t\t\tif (params.category) params.category.forEach(cat => query.append('category', cat));\n\t\t\tif (params.categoryClass) params.categoryClass.forEach(catClass => query.append('categoryClass', catClass));\n\t\t\tif (params.education) params.education.forEach(edu => query.append('education', edu));\n\t\t\tif (params.city) params.city.forEach(cty => query.append('city', cty));\n\t\t\tif (params.state) params.state.forEach(st => query.append('state', st));\n\t\t}\n\n\t\tconst response = await api.get(`/Listings?${query.toString()}`);\n\t\treturn response as Listing[];\n\t} catch (error) {\n\t\tconsole.error(error);\n\t\tthrow error;\n\t}\n};\n\nexport const getListingDetails = async (listingId: string) => {\n\ttry {\n\t\tconst response = await api.get(`/ListingDetails/${listingId}`);\n\t\treturn response;\n\t} catch (error) {\n\t\tconsole.error(error);\n\t\tthrow error;\n\t}\n};\n\nexport default {\n\tgetListings,\n\tgetListingDetails\n};\n"],"names":[],"mappings":";;MAKa,WAAW,GAAG,OAAO,MAA0B,KAAwB;IACnF,IAAI;AACH,QAAA,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;AAEpC,QAAA,IAAI,MAAM,EAAE;YACX,IAAI,MAAM,CAAC,QAAQ;AAAE,gBAAA,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;YACnF,IAAI,MAAM,CAAC,QAAQ;AAAE,gBAAA,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;YACnF,IAAI,MAAM,CAAC,aAAa;AAAE,gBAAA,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC5G,IAAI,MAAM,CAAC,SAAS;AAAE,gBAAA,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;YACtF,IAAI,MAAM,CAAC,IAAI;AAAE,gBAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;YACvE,IAAI,MAAM,CAAC,KAAK;AAAE,gBAAA,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AACxE,SAAA;AAED,QAAA,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAa,UAAA,EAAA,KAAK,CAAC,QAAQ,EAAE,CAAA,CAAE,CAAC,CAAC;AAChE,QAAA,OAAO,QAAqB,CAAC;AAC7B,KAAA;AAAC,IAAA,OAAO,KAAK,EAAE;AACf,QAAA,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACrB,QAAA,MAAM,KAAK,CAAC;AACZ,KAAA;AACF;;;;"}

package/dist/types/contexts/mapListContext.d.ts

@@ -73,6 +73,7 @@ interface MapListProviderProps {
     defaultFilters?: Record<string, any>;
     containerStyle?: any;
     localStorageKey: string;
+    getListingEntitiesCallback?: (entityIds: number[], origin?: string) => Promise<Record<number, ListingEntity>>;
     ExpandListComponent?: React.ComponentType<{
         listing: Listing;
     }> | ((listing: Listing) => JSX.Element) | null;

package/dist/types/services/listingAggregatorService.d.ts

@@ -2,7 +2,7 @@ import { Listing } from '~/types/Listings';
 import { ListingEntity } from '~/types/ListingEntity';
 interface FetchListingsResult {
     listingsResult: Listing[];
-    entitiesByKey: Record<string, ListingEntity>;
+    fetchedEntities: Record<number, ListingEntity>;
     distinctItems: any;
 }
 declare const fetchListings: (commuteLocation: any | null, entities: ListingEntity[] | null, listings: Listing[] | null) => Promise<FetchListingsResult>;

package/dist/types/services/listingEntityService.d.ts

@@ -1,5 +1,6 @@
-export declare const getListingEntities: (origin?: string) => Promise<any>;
+import { ListingEntity } from '~/types/ListingEntity';
+export declare const getListingEntities: (entityIds: number[], origin?: string) => Promise<ListingEntity[]>;
 declare const _default: {
-    getListingEntities: (origin?: string) => Promise<any>;
+    getListingEntities: (entityIds: number[], origin?: string) => Promise<ListingEntity[]>;
 };
 export default _default;

package/dist/types/types/ListingEntity.d.ts

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

package/dist/types/types/ListingFields.d.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/dist/types/types/Listings.d.ts

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

package/dist/types/util/mapUtil.d.ts

@@ -1,9 +1,9 @@
-export function getDistinctItemsByProximity(items: any, listingEntitiesDetailsInput: any): any[];
-export function findCloseItems(entitiesByKey: any): {
+export function getDistinctItemsByProximity(items: any, listingEntitiesDetails: any): any[];
+export function findCloseItems(itemsObj: any): {
     item1: any;
     item2: any;
 }[];
-export function adjustItemPositions(entitiesByKey: any, closeItemPairs: any): any;
+export function adjustItemPositions(itemsObj: any, closeItemPairs: any): any;
 export function clusterOptions(clusterGridSize: any, fillColor: any): {
     gridSize: any;
     maxZoom: number;

package/dist/util/mapUtil.js

@@ -1,40 +1,34 @@
 import { objectSpread2 as _objectSpread2, defineProperty as _defineProperty } from '../_virtual/_rollupPluginBabelHelpers.js';
 
-var getDistinctItemsByProximity = function getDistinctItemsByProximity(items, listingEntitiesDetailsInput) {
+var getDistinctItemsByProximity = function getDistinctItemsByProximity(items, listingEntitiesDetails) {
   var clusters = {};
-  if (!listingEntitiesDetailsInput) return [];
-  var listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput) ? listingEntitiesDetailsInput.reduce(function (acc, entity) {
-    if (entity !== null && entity !== void 0 && entity.entityKey) acc[entity.entityKey] = entity;
-    return acc;
-  }, {}) : listingEntitiesDetailsInput;
+  if (!listingEntitiesDetails) return [];
   var closeItemPairs = findCloseItems(listingEntitiesDetails);
   if (closeItemPairs.length > 0) {
-    var adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
-    Object.assign(listingEntitiesDetails, adjusted);
+    listingEntitiesDetails = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
   }
   items === null || items === void 0 || items.forEach(function (item) {
-    var _item$fields;
-    var entityKey = item === null || item === void 0 || (_item$fields = item.fields) === null || _item$fields === void 0 ? void 0 : _item$fields.entityKey;
-    if (!entityKey || entityKey === '-1') return;
-    var entityDetails = listingEntitiesDetails[entityKey];
-    if (!entityDetails) {
-      console.error("Details not found for entityKey: ".concat(entityKey));
-      return;
-    }
-    item.mapDetails = entityDetails;
-    if (!clusters[entityKey]) {
-      clusters[entityKey] = _objectSpread2(_objectSpread2({}, entityDetails), {}, {
-        items: _defineProperty({}, item.id, item)
-      });
-    } else {
-      clusters[entityKey].items[item.id] = item;
+    if (item.entityId !== -1) {
+      var entityDetails = listingEntitiesDetails[item.entityId];
+      if (!entityDetails) {
+        console.error("Details not found for entityId: ".concat(item.entityId));
+        return;
+      }
+      item.mapDetails = entityDetails;
+      if (!clusters[item.entityId]) {
+        clusters[item.entityId] = _objectSpread2(_objectSpread2({}, item.mapDetails), {}, {
+          items: _defineProperty({}, item.id, item)
+        });
+      } else {
+        clusters[item.entityId].items[item.id] = item;
+      }
     }
   });
   return Object.values(clusters);
 };
-var findCloseItems = function findCloseItems(entitiesByKey) {
+var findCloseItems = function findCloseItems(itemsObj) {
   var closeItems = [];
-  var items = Object.values(entitiesByKey); // Convert object to array
+  var items = Object.values(itemsObj); // Convert object to array for iteration
   var proximityThreshold = 0.0001;
   for (var i = 0; i < items.length; i++) {
     for (var j = i + 1; j < items.length; j++) {
@@ -50,16 +44,14 @@ var findCloseItems = function findCloseItems(entitiesByKey) {
   }
   return closeItems;
 };
-var adjustItemPositions = function adjustItemPositions(entitiesByKey, closeItemPairs) {
+var adjustItemPositions = function adjustItemPositions(itemsObj, closeItemPairs) {
   var adjustmentValue = 0.0001;
-  var adjustedItems = _objectSpread2({}, entitiesByKey);
+  var adjustedItems = _objectSpread2({}, itemsObj); // Create a shallow copy of the object
+
   closeItemPairs.forEach(function (pair) {
-    var key2 = pair.item2.entityKey;
-    if (adjustedItems[key2]) {
-      adjustedItems[key2] = _objectSpread2(_objectSpread2({}, 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;
     }
   });
   return adjustedItems;

package/dist/util/mapUtil.js.map

@@ -1 +1 @@
-{"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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"}
+{"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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@abcagency/hc-ui-components",
-	"version": "1.4.04",
+	"version": "1.4.7",
 	"description": "UI Components for HireControl",
 	"main": "dist/index.js",
 	"files": [

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

@@ -25,9 +25,7 @@ const MapAccordionItemContainer = ({
 			selectItem(null, null, 9, { lat: 39.8283, lng: -98.5795 });
 		} else {
 			setStorageObject("selectedListItem", item);
-			console.log('mapItems here', mapItems);
-			//edited here for new structure of entity key
-			const location = mapItems.find(x => Object.prototype.hasOwnProperty.call(x.items, item.entityKey)) || null;
+			const location = mapItems.find(x => Object.prototype.hasOwnProperty.call(x.items, item.id)) || null;
 			selectItem(item, location, 12, {
 				lat: location?.latitude,
 				lng: location?.longitude

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,10 +256,9 @@ 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

@@ -78,9 +78,9 @@ const ButtonGroupApply = ({
 				</Button.Anchor>
 			) : null}
 
-			{item.fields.applyOnline == true && item.fields.applyUrl && !includeDialog &&
+			{item.applyOnline == 1 && item.applyUrl && !includeDialog &&
 				<Button.Anchor
-					href={item.fields.applyUrl}
+					href={item.applyUrl}
 					variant={applyButtonVariant}
 					size={buttonSize}
 					className={"map-apply-now-button"}
@@ -91,8 +91,8 @@ const ButtonGroupApply = ({
 					{applyNowText}
 				</Button.Anchor>
 			}
-			{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}>
+			{item.applyOnline == 1 && item.applyUrl && includeDialog &&
+				<ApplyDialog applyUrl={item.applyUrl} internalApplyLink={internalApplyLink} companyName={companyName} item={item} trackEvent={trackEvent} eventTypes={eventTypes} isIframe={isIframe}>
 					<Button.Anchor
 						variant={applyButtonVariant}
 						size={buttonSize}

package/src/contexts/mapListContext.tsx

@@ -92,6 +92,7 @@ interface MapListProviderProps {
   defaultFilters?: Record<string, any>;
   containerStyle?: any;
 	localStorageKey: string;
+	getListingEntitiesCallback?: (entityIds: number[], origin?: string) => Promise<Record<number, ListingEntity>>;
   ExpandListComponent?: React.ComponentType<{ listing: Listing }> | ((listing: Listing) => JSX.Element) | null;
 }
 
@@ -115,6 +116,7 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 	defaultFilters,
 	containerStyle,
 	ExpandListComponent,
+	getListingEntitiesCallback,
 	localStorageKey
 }) => {
 	const firstLoadFilters = () =>{
@@ -161,31 +163,29 @@ 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(
+				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,7 +207,7 @@ export const MapListProvider: React.FC<MapListProviderProps> = ({
 			try {
 				const {
 					listingsResult,
-					entitiesByKey,
+					fetchedEntities,
 					distinctItems
 				} = await fetchListings(commuteLocation, entities, listings);
 				if (defaultFilters) {
@@ -224,8 +224,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 +266,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,7 +6,7 @@ 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
 }
 
@@ -17,36 +17,35 @@ const fetchListings = async (
 ): 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()
+			? entities && entities.length > 0 ? entities : await getListingEntities(distinctEntityIds)
 			: await getListingEntities(
+				distinctEntityIds,
 				`${commuteLocation.lat}, ${commuteLocation.lng}`
 			);
-
-		//possible quick workaround fix, need to implement clearer code
-
-		const entitiesByKey = fetchedEntities;
 		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;