@abcagency/hc-ui-components 1.5.1 → 1.5.2

package/dist/util/mapUtil.js

@@ -1,34 +1,44 @@
 import { objectSpread2 as _objectSpread2, defineProperty as _defineProperty } from '../_virtual/_rollupPluginBabelHelpers.js';
 
-var getDistinctItemsByProximity = function getDistinctItemsByProximity(items, listingEntitiesDetails) {
+var getDistinctItemsByProximity = function getDistinctItemsByProximity(items, listingEntitiesDetailsInput) {
   var clusters = {};
-  if (!listingEntitiesDetails) return [];
+  if (!listingEntitiesDetailsInput) return [];
+  var listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput) ? listingEntitiesDetailsInput.reduce(function (acc, entity) {
+    if (entity !== null && entity !== void 0 && entity.entityKey) acc[entity.entityKey.toLowerCase()] = entity;
+    return acc;
+  }, {}) : Object.keys(listingEntitiesDetailsInput).reduce(function (acc, key) {
+    acc[key.toLowerCase()] = listingEntitiesDetailsInput[key];
+    return acc;
+  }, {});
   var closeItemPairs = findCloseItems(listingEntitiesDetails);
   if (closeItemPairs.length > 0) {
-    listingEntitiesDetails = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
+    var adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
+    Object.assign(listingEntitiesDetails, adjusted);
   }
   items === null || items === void 0 || items.forEach(function (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;
-      }
+    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.toLowerCase()];
+    if (!entityDetails) {
+      console.error("Details not found for entityKey: ".concat(entityKey));
+      return;
+    }
+    item.mapDetails = entityDetails;
+    var normalizedEntityKey = entityKey.toLowerCase();
+    if (!clusters[normalizedEntityKey]) {
+      clusters[normalizedEntityKey] = _objectSpread2(_objectSpread2({}, entityDetails), {}, {
+        items: _defineProperty({}, item.id, item)
+      });
+    } else {
+      clusters[normalizedEntityKey].items[item.id] = item;
     }
   });
   return Object.values(clusters);
 };
-var findCloseItems = function findCloseItems(itemsObj) {
+var findCloseItems = function findCloseItems(entitiesByKey) {
   var closeItems = [];
-  var items = Object.values(itemsObj); // Convert object to array for iteration
+  var items = Object.values(entitiesByKey); // Convert object to array
   var proximityThreshold = 0.0001;
   for (var i = 0; i < items.length; i++) {
     for (var j = i + 1; j < items.length; j++) {
@@ -44,14 +54,16 @@ var findCloseItems = function findCloseItems(itemsObj) {
   }
   return closeItems;
 };
-var adjustItemPositions = function adjustItemPositions(itemsObj, closeItemPairs) {
+var adjustItemPositions = function adjustItemPositions(entitiesByKey, closeItemPairs) {
   var adjustmentValue = 0.0001;
-  var adjustedItems = _objectSpread2({}, itemsObj); // Create a shallow copy of the object
-
+  var adjustedItems = _objectSpread2({}, entitiesByKey);
   closeItemPairs.forEach(function (pair) {
-    if (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {
-      adjustedItems[pair.item2.id].latitude += adjustmentValue;
-      adjustedItems[pair.item2.id].longitude += adjustmentValue;
+    var key2 = pair.item2.entityKey;
+    if (adjustedItems[key2]) {
+      adjustedItems[key2] = _objectSpread2(_objectSpread2({}, adjustedItems[key2]), {}, {
+        latitude: adjustedItems[key2].latitude + adjustmentValue,
+        longitude: adjustedItems[key2].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, 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.toLowerCase()] = entity;\n\t\t\treturn acc;\n\t\t  }, {})\n\t\t: Object.keys(listingEntitiesDetailsInput).reduce((acc, key) => {\n\t\t\tacc[key.toLowerCase()] = listingEntitiesDetailsInput[key];\n\t\t\treturn acc;\n\t\t  }, {});\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.toLowerCase()];\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\tconst normalizedEntityKey = entityKey.toLowerCase();\n\t\tif (!clusters[normalizedEntityKey]) {\n\t\t\tclusters[normalizedEntityKey] = {\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[normalizedEntityKey].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","toLowerCase","Object","keys","key","closeItemPairs","findCloseItems","length","adjusted","adjustItemPositions","assign","forEach","item","_item$fields","fields","entityDetails","console","error","concat","mapDetails","normalizedEntityKey","_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.5.1",
+	"version": "1.5.2",
 	"description": "UI Components for HireControl",
 	"main": "dist/index.js",
 	"files": [
@@ -24,6 +24,12 @@
 	"author": "Aloysius Butler & Clark",
 	"license": "ISC",
 	"dependencies": {
+		"ajv": "^8.16.0",
+		"ajv-keywords": "^5.1.0",
+		"fuse.js": "^7.0.0",
+		"tailwind-merge": "^2.2.0"
+	},
+	"peerDependencies": {
 		"@headlessui/react": "^1.7.19",
 		"@iconify/react": "^4.1.1",
 		"@radix-ui/react-accordion": "^1.1.2",
@@ -32,25 +38,56 @@
 		"@radix-ui/react-select": "^2.0.0",
 		"@radix-ui/react-tabs": "^1.0.4",
 		"@react-google-maps/api": "^2.19.3",
-		"@testing-library/react": "^13.4.0",
-		"ajv": "^8.16.0",
-		"ajv-keywords": "^5.1.0",
 		"framer-motion": "^10.18.0",
-		"fuse.js": "^7.0.0",
-		"npm": "^10.8.1",
+		"react": ">=18.0.0",
+		"react-dom": ">=18.0.0",
 		"react-router-dom": "^6.23.1",
-		"react-scripts": "5.0.1",
 		"react-wrap-balancer": "^1.1.1",
-		"rollup-plugin-filesize": "^10.0.0",
-		"rollup-plugin-progress": "^1.1.2",
-		"rollup-plugin-visualizer": "^5.12.0",
-		"tailwind-merge": "^2.2.0",
-		"use-places-autocomplete": "^4.0.1",
-		"web-vitals": "^2.1.4"
+		"use-places-autocomplete": "^4.0.1"
 	},
-	"resolutions": {
-		"react": "^18.3.1",
-		"react-dom": "^18.3.1"
+	"peerDependenciesMeta": {
+		"@headlessui/react": {
+			"optional": false
+		},
+		"@iconify/react": {
+			"optional": false
+		},
+		"@radix-ui/react-accordion": {
+			"optional": false
+		},
+		"@radix-ui/react-dialog": {
+			"optional": false
+		},
+		"@radix-ui/react-popover": {
+			"optional": false
+		},
+		"@radix-ui/react-select": {
+			"optional": false
+		},
+		"@radix-ui/react-tabs": {
+			"optional": false
+		},
+		"@react-google-maps/api": {
+			"optional": false
+		},
+		"framer-motion": {
+			"optional": false
+		},
+		"react": {
+			"optional": false
+		},
+		"react-dom": {
+			"optional": false
+		},
+		"react-router-dom": {
+			"optional": false
+		},
+		"react-wrap-balancer": {
+			"optional": false
+		},
+		"use-places-autocomplete": {
+			"optional": false
+		}
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.24.6",
@@ -68,8 +105,9 @@
 		"@tailwindcss/aspect-ratio": "^0.4.2",
 		"@tailwindcss/forms": "^0.5.7",
 		"@tailwindcss/typography": "^0.5.13",
+		"@testing-library/react": "^16.0.0",
 		"@types/node": "^20.14.2",
-		"@types/react": "^18.3.3",
+		"@types/react": "^19.0.0",
 		"@typescript-eslint/eslint-plugin": "^7.13.0",
 		"@typescript-eslint/parser": "^7.13.0",
 		"autoprefixer": "^10.4.19",
@@ -86,9 +124,14 @@
 		"postcss": "^8.4.38",
 		"postcss-prefixer": "^3.0.0",
 		"postcss-preset-env": "^9.5.14",
+		"react": "19.1.1",
+		"react-dom": "19.1.1",
 		"rollup": "^4.18.0",
+		"rollup-plugin-filesize": "^10.0.0",
 		"rollup-plugin-peer-deps-external": "^2.2.4",
 		"rollup-plugin-postcss": "^4.0.2",
+		"rollup-plugin-progress": "^1.1.2",
+		"rollup-plugin-visualizer": "^5.12.0",
 		"tailwindcss": "^3.4.3",
 		"tailwindcss-animate": "^1.0.7",
 		"typescript": "^4.9.5"

package/src/components/HireControlMap.js

@@ -15,7 +15,7 @@ import { ThemeProvider } from '~/contexts/themeContext';
 import { getMapConfig } from '~/services/configService';
 import { setClientAuthKey } from '~/clientToken.js';
 
-import '../styles/index.css';
+import '../styles/components.css';
 
 // Libraries for Google Maps
 const LIBRARIES = ['places'];
@@ -59,7 +59,7 @@ const ContextProviders = ({ children, siteConfig, trackEvent, googleMapsApiKey,
 			secondaryDark={siteConfig.colors.secondaryDark}
 		>
 			<MapListProvider siteConfig={siteConfig} {...mapListProps}>
-				<MapProvider resetFilters={mapListProps.resetFilters} defaultZoomOverride={mapListProps.defaultZoomOverride}>
+				<MapProvider resetFilters={mapListProps.resetFilters} defaultZoomOverride={mapListProps.defaultZoomOverride} localStorageKey={mapListProps.localStorageKey}>
 					<PlacesProvider
 						placeMappings={siteConfig.pointsOfInterestConfig.placeMappings ?? {}}
 						additionalMapMarkers={mapListProps.additionalMapMarkers}
@@ -98,6 +98,9 @@ export const HireControlMap = ({
 	easyApplyUrl = null,
 	easyApplyText = 'Easy Apply',
 	isIframe = false,
+	hideMap = false, // Override to hide map even if siteConfig.showMap is true
+	hideFilters = false, // Hide the entire filter section
+	noEntities = false, // Skip entity fetching and hide entity-related filters
 	trackEvent = (eventType, eventObj) => {
 		console.log(eventType);
 		console.log(eventObj);
@@ -167,9 +170,15 @@ export const HireControlMap = ({
 		ExpandListComponent: ExpandListComponent ?? null,
 		additionalMapMarkers,
 		isIframe,
-		localStorageKey
+		localStorageKey,
+		hideMap,
+		hideFilters,
+		noEntities
 	};
 
+	// Calculate effective showMap value (hideMap overrides siteConfig.showMap)
+	const effectiveShowMap = hideMap ? false : siteConfig.showMap;
+
 	// Prepare marker configuration
 	const markerConfigs = {
 		fillColor: siteConfig.colors.primary,
@@ -192,18 +201,20 @@ export const HireControlMap = ({
 			<Grid
 				as='section'
 				id='job-search-interface'
-				columns='md:hc-grid-cols-[1fr_2.5fr] lg:hc-grid-cols-[1fr_3.5fr]'
+				columns={hideFilters ? 'hc-grid-cols-1' : 'md:hc-grid-cols-[1fr_2.5fr] lg:hc-grid-cols-[1fr_3.5fr]'}
 				gap='hc-gap-0'
 				autoRows={false}
 				className={'hc-bundle hc-items-stretch hc-divide-x hc-divide-uiAccent/20'}
 			>
-				<Grid.Item className='hc-bg-gray-100'>
-					<Filter isDesktop={true} showMap={siteConfig.showMap} className='hc-hidden md:hc-block' />
-				</Grid.Item>
+				{!hideFilters && (
+					<Grid.Item className='hc-bg-gray-100'>
+						<Filter isDesktop={true} showMap={effectiveShowMap} className='hc-hidden md:hc-block' />
+					</Grid.Item>
+				)}
 				<MapList
 					containerStyle={containerStyle}
 					mapPosition={siteConfig.mapPosition}
-					showMap={siteConfig.showMap}
+					showMap={effectiveShowMap}
 					fieldsShown={siteConfig.fieldsShown}
 					specialFeatures={siteConfig.specialFeatures}
 					fieldNames={siteConfig.fieldNames}

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

@@ -12,7 +12,7 @@ const AccordionFiltersContainer = ({
 	setSelectedListItem,
 	SubcategoryRequireCategory
 }) => {
-	const { filterOptions, selectedFilters, setSelectedFilters, siteConfig, hiddenFilters } = useMapList();
+	const { filterOptions, selectedFilters, setSelectedFilters, siteConfig, hiddenFilters, noEntities } = useMapList();
 
 	const handleSetSelectedFilters = prevFilters => {
 		setSelectedFilters(prevFilters);
@@ -25,6 +25,11 @@ const AccordionFiltersContainer = ({
 		 displayedFilters = filterOptions?.filters.filter(filter => !hiddenFilters.includes(filter.id));
 	}
 
+	// Hide entity-dependent filters when noEntities is true
+	if (noEntities && displayedFilters) {
+		displayedFilters = displayedFilters.filter(filter => filter.id !== 'entityName');
+	}
+
 	return (
 		<AccordionFilters
 			className={className}

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 => x.entityKey?.toLowerCase() === item.fields.entityKey?.toLowerCase()) || 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-container.js

@@ -24,7 +24,8 @@ const FilterContainer = ({
 		handleSettingFavorites,
 		setQuery,
 		siteConfig,
-		containerStyle
+		containerStyle,
+		noEntities
 	} = useMapList();
 	const [defaultValue, setDefaultValue] = useState(siteConfig?.defaultFilterOpen ? siteConfig?.defaultFilterOpen : null);
 	const handleReset = () => {
@@ -64,7 +65,7 @@ const FilterContainer = ({
 				SubcategoryRequireCategory={siteConfig.subcategoryRequireCategory}
 			/>
 			<FilterSearch />
-			{siteConfig.hideLocations !== true &&
+			{siteConfig.hideLocations !== true && !noEntities &&
 			<FilterLocations
 				setHasActiveFilters={setHasActiveFilters}
 				defaultValue={defaultValue}

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/filter/location-container.js

@@ -12,7 +12,7 @@ const FilterLocationContainer = ({
 	setLocation,
 	setSelectedListItem
 }) => {
-	const { setSelectedFilters, selectedFilters, filterOptions } = useMapList();
+	const { setSelectedFilters, selectedFilters, filterOptions, noEntities } = useMapList();
 
 	const locations = filterOptions?.locations;
 	const pointsOfInterest = filterOptions?.pointsOfInterest;
@@ -29,8 +29,8 @@ const FilterLocationContainer = ({
 			setSelectedFilters={setSelectedFilters}
 			selectedFilters={selectedFilters}
 		>
-			{showMap && <FilterCommute className="hc-mt-6" />}
-			{showMap && (
+			{showMap && !noEntities && <FilterCommute className="hc-mt-6" />}
+			{showMap && !noEntities && (
 				<FilterPointsOfInterest
 					className="hc-mt-4"
 					pointsOfInterest={pointsOfInterest}

package/src/components/containers/list/item-list-container.tsx

@@ -23,17 +23,17 @@ const ItemsListContainer: React.FC<ItemsListContainerProps> = ({
 	fieldsShown,
 	specialFeatures
 }) => {
-	const { filteredListings, loading, commuteLocation, sortSetting, setSortSetting, ExpandListComponent, favorites } = useMapList();
+	const { filteredListings, loading, commuteLocation, sortSetting, setSortSetting, ExpandListComponent, favorites, noEntities } = useMapList();
 	const { itemLimit, loader, scrollContainerRef, itemRefs } = useListLogic(filteredListings as any);
 	const { selectedListItem } = useMap();
 	const { trackEvent, eventTypes } = useTrackEvent() as any;
 	const itemExpandedContent = (item: any, recruiter: any) =>
 		item ? (ExpandListComponent  ? <ExpandListComponent listing={item} /> : <ListingDetailsContainer item={item} recruiter={recruiter} />) : null;
 
-	if (!fieldsShown.includes('travelTime') && commuteLocation != null && Object.entries(commuteLocation).length > 0) {
+	if (!fieldsShown.includes('travelTime') && commuteLocation != null && Object.entries(commuteLocation).length > 0 && !noEntities) {
 		fieldsShown.push('travelTime');
 		fieldNames['travelTime'] = 'Commute';
-	} else if (fieldsShown.includes('travelTime') && !commuteLocation) {
+	} else if (fieldsShown.includes('travelTime') && (!commuteLocation || noEntities)) {
 		fieldsShown = fieldsShown.filter(x => x !== 'travelTime');
 	}
 

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"
 					},
 					{