@abcagency/hc-ui-components 1.3.19 → 1.3.21

package/src/util/urlFilterUtil.js

@@ -1,90 +1,85 @@
-export const updateURLWithFilters = (filters, location, navigate, query) => {
-	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(() => {
-		var message = {
-			type: 'URL_CHANGE',
-			url: window.location.href
-		};
-		window.parent.postMessage(message, "*");
-	}, 500);
-}
-
-export const parseQueryParams = search => {
-	const queryParams = {};
-	if (!search) return queryParams;
-	let queryString = search.split('?')[1];
-	if (!queryString) {
-		return queryParams;
-	}
-	queryString = queryString.replaceAll('+', ' ');
-	queryString.split('&').forEach(param => {
-		const [key, value] = param.split('=');
-		queryParams[decodeURIComponent(key)] = decodeURIComponent(value);
-	});
-	return queryParams;
-};
-
-export const filtersFromURL = location => {
-	if (!location || !location.search) return;
-	const filters = {};
-	let queryParam = null;
-	const queryParams = parseQueryParams(location.search);
-	if (!queryParams) return;
-	Object.keys(queryParams).forEach(key => {
-		if (key && key.includes('.')) {
-			const [category, filter] = key.split('.');
-			if (!filters[category]) {
-				filters[category] = {};
-			}
-			filters[category][filter] = queryParams[key] === 'true';
-		} else if (key === 'query') {
-			queryParam = queryParams[key];
-		}
-	});
-
-	return { filters, query: queryParam };
-};
-
-export const hasFiltersInURL = location => {
-	if (!location || !location.search) return;
-	const queryParams = parseQueryParams(location.search);
-	if (!queryParams) return;
-	return Object.keys(queryParams).some(key => key.includes('.'));
-};
-
-export const hasQueryInUrl = location => {
-	if (!location || !location.search) return;
-	const queryParams = parseQueryParams(location.search);
-	if (!queryParams) return;
-	return Object.keys(queryParams).includes('query');
-};
+export const updateURLWithFilters = (filters, location, query) => {
+	const searchParams = new URLSearchParams(location.search);
+
+	for (const key of searchParams.keys()) {
+	  if (key.includes('.') || key === 'query') {
+			searchParams.delete(key);
+	  }
+	}
+
+	if (query) {
+	  searchParams.set('query', query);
+	}
+
+	for (const category in filters) {
+	  for (const filter in filters[category]) {
+			const key = `${category}.${filter}`;
+			if (filters[category][filter]) {
+		  searchParams.set(key, 'true');
+			}
+	  }
+	}
+
+	const newUrl = `${location.pathname}?${searchParams.toString()}`;
+	window.history.replaceState({}, '', newUrl);
+};
+
+function notifyParentOfUrlChange() {
+	setTimeout(() => {
+		var message = {
+			type: 'URL_CHANGE',
+			url: window.location.href
+		};
+		window.parent.postMessage(message, "*");
+	}, 500);
+}
+
+export const parseQueryParams = search => {
+	const queryParams = {};
+	if (!search) return queryParams;
+	let queryString = search.split('?')[1];
+	if (!queryString) {
+		return queryParams;
+	}
+	queryString = queryString.replaceAll('+', ' ');
+	queryString.split('&').forEach(param => {
+		const [key, value] = param.split('=');
+		queryParams[decodeURIComponent(key)] = decodeURIComponent(value);
+	});
+	return queryParams;
+};
+
+export const filtersFromURL = location => {
+	if (!location || !location.search) return;
+	const filters = {};
+	let queryParam = null;
+	const queryParams = parseQueryParams(location.search);
+	if (!queryParams) return;
+	Object.keys(queryParams).forEach(key => {
+		if (key && key.includes('.')) {
+			const [category, filter] = key.split('.');
+			if (!filters[category]) {
+				filters[category] = {};
+			}
+			filters[category][filter] = queryParams[key] === 'true';
+		} else if (key === 'query') {
+			queryParam = queryParams[key];
+		}
+	});
+
+	return { filters, query: queryParam };
+};
+
+export const hasFiltersInURL = location => {
+	if (!location || !location.search) return;
+	const queryParams = parseQueryParams(location.search);
+	if (!queryParams) return;
+	return Object.keys(queryParams).some(key => key.includes('.'));
+};
+
+export const hasQueryInUrl = location => {
+	if (!location || !location.search) return;
+	const queryParams = parseQueryParams(location.search);
+	if (!queryParams) return;
+	return Object.keys(queryParams).includes('query');
+};