@abcagency/hc-ui-components 1.0.2 → 1.0.4

package/dist/index.js

@@ -1190,27 +1190,25 @@ var setStorageObject = function setStorageObject(key, item) {
 };
 
 var updateURLWithFilters = function updateURLWithFilters(filters, location, navigate, query) {
-  console.log("attempting to update url");
-  console.log(filters);
-  console.log(location);
-  console.log(navigate);
-  console.log(query);
-  var searchParams = new URLSearchParams();
-
-  // Add the new filters to search params
+  var searchParams = new URLSearchParams(location.search);
+  Object.keys(Object.fromEntries(searchParams)).forEach(function (key) {
+    if (!key.includes('.') && key !== 'query') {
+      searchParams.set(key, searchParams.get(key));
+    }
+  });
+  if (query) {
+    searchParams.set('query', query);
+  }
   Object.keys(filters).forEach(function (category) {
     Object.keys(filters[category]).forEach(function (filter) {
+      var key = "".concat(category, ".").concat(filter);
       if (filters[category][filter]) {
-        var key = "".concat(category, ".").concat(filter);
         searchParams.set(key, 'true');
+      } else {
+        searchParams["delete"](key);
       }
     });
   });
-
-  // Add the query to search params if it exists
-  if (query) {
-    searchParams.set('query', query);
-  }
   navigate({
     search: searchParams.toString()
   }, {
@@ -1278,7 +1276,6 @@ var hasFiltersInURL = function hasFiltersInURL(location) {
   });
 };
 var hasQueryInUrl = function hasQueryInUrl(location) {
-  console.log(location);
   if (!location || !location.search) return;
   var queryParams = parseQueryParams(location.search);
   if (!queryParams) return;
@@ -1301,7 +1298,8 @@ var getQuery = function getQuery(location) {
 var MapListProvider = function MapListProvider(_ref) {
   var children = _ref.children,
     siteConfig = _ref.siteConfig,
-    resetFilters = _ref.resetFilters;
+    resetFilters = _ref.resetFilters,
+    navigateToDetails = _ref.navigateToDetails;
   var location = useLocation();
   var navigate = useNavigate();
   var _useState = useState(getStorageObject("listings", [])),
@@ -1545,7 +1543,8 @@ var MapListProvider = function MapListProvider(_ref) {
       setFilterByFavorites: setFilterByFavorites,
       filterByFavorites: filterByFavorites,
       commuteLocation: commuteLocation,
-      setCommuteLocation: setCommuteLocation
+      setCommuteLocation: setCommuteLocation,
+      navigateToDetails: navigateToDetails
     }
   }, children);
 };
@@ -3491,6 +3490,7 @@ var _templateObject;
 var ButtonGroupApply = function ButtonGroupApply(_ref) {
   var applyUrl = _ref.applyUrl,
     useDetailsPostMessage = _ref.useDetailsPostMessage,
+    navigateToDetails = _ref.navigateToDetails,
     _ref$applyText = _ref.applyText,
     applyText = _ref$applyText === void 0 ? 'Apply Now' : _ref$applyText,
     detailsUrl = _ref.detailsUrl,
@@ -3516,11 +3516,17 @@ var ButtonGroupApply = function ButtonGroupApply(_ref) {
   };
   return /*#__PURE__*/React.createElement("nav", {
     className: twMerge(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t\t\t\tflex flex-row justify-between gap-2 w-full\n\t\t\t\t", "\n\t\t\t"])), className !== null && className !== void 0 ? className : '')
-  }, detailsUrl && useDetailsPostMessage !== true && /*#__PURE__*/React.createElement(Button.Anchor, {
+  }, navigateToDetails !== null && /*#__PURE__*/React.createElement(Button.Btn, {
+    onClick: function onClick() {
+      navigateToDetails(itemId);
+    },
+    variant: detailsButtonVariant,
+    size: buttonSize
+  }, detailsText), detailsUrl && useDetailsPostMessage !== true && navigateToDetails === null && /*#__PURE__*/React.createElement(Button.Anchor, {
     href: detailsUrl,
     variant: detailsButtonVariant,
     size: buttonSize
-  }, detailsText), useDetailsPostMessage === true && /*#__PURE__*/React.createElement(Button.Btn, {
+  }, detailsText), useDetailsPostMessage === true && navigateToDetails === null && /*#__PURE__*/React.createElement(Button.Btn, {
     onClick: function onClick() {
       window.parent.postMessage({
         itemId: itemId,
@@ -3579,7 +3585,8 @@ var ListingDetails = function ListingDetails(_ref) {
   var _useMap = useMap(),
     travelTime = _useMap.travelTime;
   var _useMapList = useMapList(),
-    siteConfig = _useMapList.siteConfig;
+    siteConfig = _useMapList.siteConfig,
+    navigateToDetails = _useMapList.navigateToDetails;
   if (!item) {
     return null;
   }
@@ -3608,6 +3615,7 @@ var ListingDetails = function ListingDetails(_ref) {
     }))
   }, (matchingRecruiter === null || matchingRecruiter === void 0 ? void 0 : matchingRecruiter.firstName) && (matchingRecruiter === null || matchingRecruiter === void 0 ? void 0 : matchingRecruiter.lastName) && /*#__PURE__*/React.createElement(RecruiterDetails.Title, null, "".concat(matchingRecruiter === null || matchingRecruiter === void 0 ? void 0 : matchingRecruiter.firstName, " ").concat(matchingRecruiter === null || matchingRecruiter === void 0 ? void 0 : matchingRecruiter.lastName)), ((_item$details = item.details) === null || _item$details === void 0 || (_item$details = _item$details.recruiter) === null || _item$details === void 0 ? void 0 : _item$details.title) && /*#__PURE__*/React.createElement(RecruiterDetails.Text, null, item.details.recruiter.title)), /*#__PURE__*/React.createElement(ButtonGroupApply, {
     useDetailsPostMessage: siteConfig.useDetailsPostMessage,
+    navigateToDetails: navigateToDetails,
     includeDialog: siteConfig.useApplyDialog,
     internalApplyLink: siteConfig.internalApplyLink,
     companyName: siteConfig.companyName,
@@ -4552,7 +4560,9 @@ var getMapConfig = /*#__PURE__*/function () {
 
 var libraries = ['places'];
 var HireControlMap = function HireControlMap(_ref) {
-  var clientToken = _ref.clientToken;
+  var clientToken = _ref.clientToken,
+    _ref$navigateToDetail = _ref.navigateToDetails,
+    navigateToDetails = _ref$navigateToDetail === void 0 ? null : _ref$navigateToDetail;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     siteConfig = _useState2[0],
@@ -4602,16 +4612,19 @@ var HireControlMap = function HireControlMap(_ref) {
     }),
     isLoaded = _useLoadScript.isLoaded;
   return /*#__PURE__*/React.createElement(BrowserRouter, null, /*#__PURE__*/React.createElement(RootLayout, null, isLoaded && siteConfig && /*#__PURE__*/React.createElement(HomeBody, {
-    siteConfig: siteConfig
+    siteConfig: siteConfig,
+    navigateToDetails: navigateToDetails
   })));
 };
 var HomeBody = function HomeBody(_ref3) {
   var _siteConfig$pointsOfI, _siteConfig$pointsOfI2;
-  var siteConfig = _ref3.siteConfig;
+  var siteConfig = _ref3.siteConfig,
+    navigateToDetails = _ref3.navigateToDetails;
   var resetFilters = false;
   return /*#__PURE__*/React.createElement(MapListProvider, {
     siteConfig: siteConfig,
-    resetFilters: resetFilters
+    resetFilters: resetFilters,
+    navigateToDetails: navigateToDetails
   }, /*#__PURE__*/React.createElement(MapProvider, {
     resetFilters: resetFilters
   }, /*#__PURE__*/React.createElement(PlacesProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abcagency/hc-ui-components",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/modules/buttons/button-group-apply.js

@@ -6,6 +6,7 @@ import ApplyDialog from '../dialogs/apply-dialog';
 const ButtonGroupApply = ({
 	applyUrl,
 	useDetailsPostMessage,
+	navigateToDetails,
 	applyText = 'Apply Now',
 	detailsUrl,
 	detailsText = 'View Details',
@@ -35,7 +36,16 @@ const ButtonGroupApply = ({
 				${className ?? ''}
 			`}
 		>
-			{detailsUrl && useDetailsPostMessage !== true &&
+			{navigateToDetails !== null &&
+			<Button.Btn
+				onClick={() => { navigateToDetails(itemId)}}
+				variant={detailsButtonVariant}
+				size={buttonSize}
+			>
+				{detailsText}
+			</Button.Btn>
+			}
+			{detailsUrl && useDetailsPostMessage !== true && navigateToDetails === null &&
 				<Button.Anchor
 					href={detailsUrl}
 					variant={detailsButtonVariant}
@@ -44,7 +54,7 @@ const ButtonGroupApply = ({
 					{detailsText}
 				</Button.Anchor>
 			}
-			{useDetailsPostMessage === true &&
+			{useDetailsPostMessage === true && navigateToDetails === null &&
 			<Button.Btn
 				onClick={() => { window.parent.postMessage({ itemId: itemId, type:'LISTING_ID' }, '*');}}
 				variant={detailsButtonVariant}

package/src/components/modules/jobListing/listing-details.js

@@ -9,7 +9,7 @@ import CommutePill from "../buttons/commute-pill";
 
 const ListingDetails = ({ item, recruiters }) => {
 	const { travelTime } = useMap();
-	const { siteConfig } = useMapList();
+	const { siteConfig, navigateToDetails } = useMapList();
 	if (!item) {
 		return null;
 	}
@@ -65,6 +65,7 @@ const ListingDetails = ({ item, recruiters }) => {
 			)}
 			<ApplyButtonGroup
 				useDetailsPostMessage={siteConfig.useDetailsPostMessage}
+				navigateToDetails={navigateToDetails}
 				includeDialog={siteConfig.useApplyDialog}
 				internalApplyLink={siteConfig.internalApplyLink}
 				companyName={siteConfig.companyName}

package/src/contexts/mapListContext.js

@@ -24,7 +24,7 @@ const getQuery = (location) => {
 	return query;
 };
 
-export const MapListProvider = ({ children, siteConfig, resetFilters }) => {
+export const MapListProvider = ({ children, siteConfig, resetFilters, navigateToDetails }) => {
 	const location = useLocation();
 	const navigate = useNavigate();
 	const [allListings, setAllListings] = useState(getStorageObject("listings",[]));
@@ -204,7 +204,8 @@ export const MapListProvider = ({ children, siteConfig, resetFilters }) => {
 			setFilterByFavorites,
 			filterByFavorites,
 			commuteLocation,
-			setCommuteLocation
+			setCommuteLocation,
+			navigateToDetails
 		}}>
 			{children}
 		</MapListContext.Provider>

package/src/index.js

@@ -15,7 +15,7 @@ import { setClientAuthKey } from '~/clientToken.js';
 
 const libraries = ['places'];
 
-export const HireControlMap = ({ clientToken }) => {
+export const HireControlMap = ({ clientToken, navigateToDetails = null }) => {
   const [siteConfig, setSiteconfig] = useState(null);
 
   useEffect(() => {
@@ -51,18 +51,18 @@ export const HireControlMap = ({ clientToken }) => {
     <Router>
       <RootLayout>
           {isLoaded && siteConfig && (
-            <HomeBody siteConfig={siteConfig} />
+            <HomeBody siteConfig={siteConfig} navigateToDetails={navigateToDetails} />
           )}
       </RootLayout>
     </Router>
   );
 };
 
-const HomeBody = ({ siteConfig }) => {
+const HomeBody = ({ siteConfig, navigateToDetails }) => {
   const resetFilters = false;
 
   return (
-    <MapListProvider siteConfig={siteConfig} resetFilters={resetFilters}>
+    <MapListProvider siteConfig={siteConfig} resetFilters={resetFilters} navigateToDetails={navigateToDetails}>
       <MapProvider resetFilters={resetFilters}>
         <PlacesProvider
           placeMappings={siteConfig.pointsOfInterestConfig.placeMappings ?? {}}

package/src/util/urlFilterUtil.js

@@ -1,33 +1,33 @@
 export const updateURLWithFilters = (filters, location, navigate, query) => {
-	console.log("attempting to update url");
-	console.log(filters);
-	console.log(location);
-	console.log(navigate);
-	console.log(query);
-  
-	const searchParams = new URLSearchParams();
-  
-	// Add the new filters to search params
-	Object.keys(filters).forEach(category => {
-	  Object.keys(filters[category]).forEach(filter => {
-		if (filters[category][filter]) {
-		  const key = `${category}.${filter}`;
-		  searchParams.set(key, 'true');
-		}
-	  });
-	});
-  
-	// Add the query to search params if it exists
-	if (query) {
-	  searchParams.set('query', query);
-	}
-  
-	navigate({
-	  search: searchParams.toString(),
-	}, { replace: true });
-  
-	notifyParentOfUrlChange();
-  };
+  const searchParams = new URLSearchParams(location.search);
+
+  Object.keys(Object.fromEntries(searchParams)).forEach(key => {
+    if (!key.includes('.') && key !== 'query') {
+      searchParams.set(key, searchParams.get(key));
+    }
+  });
+
+  if (query) {
+    searchParams.set('query', query);
+  }
+
+  Object.keys(filters).forEach(category => {
+    Object.keys(filters[category]).forEach(filter => {
+      const key = `${category}.${filter}`;
+      if (filters[category][filter]) {
+        searchParams.set(key, 'true');
+      } else {
+        searchParams.delete(key);
+      }
+    });
+  });
+
+  navigate({
+    search: searchParams.toString(),
+  }, { replace: true });
+
+  notifyParentOfUrlChange();
+};
 
 function notifyParentOfUrlChange() {
   setTimeout(() => {
@@ -83,7 +83,6 @@ export const hasFiltersInURL = location => {
 };
 
 export const hasQueryInUrl = location => {
-  console.log(location);
   if (!location || !location.search) return;
   const queryParams = parseQueryParams(location.search);
   if (!queryParams) return;