@abcagency/hc-ui-components 1.3.20 → 1.3.22

package/src/util/filterUtil.js

@@ -1,239 +1,239 @@
-import { getDistinctItemsByProximity } from '~/util/mapUtil';
-
-import Fuse from 'fuse.js';
-
-export const getFilterOptions = (listings, filteredListings, field, excludeZeroCount = null) => {
-	const options = new Set();
-	listings.forEach(listing => {
-		if (listing.fields[field]) {
-			options.add(listing.fields[field]);
-		}
-	});
-
-	const optionCounts = {};
-	options.forEach(option => {
-		optionCounts[option] = 0;
-	});
-
-	filteredListings.forEach(listing => {
-		const value = listing.fields[field];
-		if (value && optionCounts.hasOwnProperty(value)) {
-			optionCounts[value] += 1;
-		}
-	});
-
-	return Array.from(options)
-		.sort()
-		.map(option => ({
-			name: option,
-			count: optionCounts[option] || 0
-		}))
-		.filter(option => !(excludeZeroCount === true && option.count === 0));
-};
-
-export const getSpecialFeatureOptions = (listings, filteredListings, siteConfig, favorites) => {
-	const specialFeatures = siteConfig.specialFeatures;
-	const featureCounts = Object.keys(specialFeatures).sort().reduce((acc, key) => {
-		acc[specialFeatures[key]] = 0;
-		return acc;
-	}, {});
-
-	filteredListings.forEach(listing => {
-		Object.entries(specialFeatures).forEach(([featureKey, featureName]) => {
-			if (listing.fields[featureKey] === 1) {
-				featureCounts[featureName] += 1;
-			}
-		});
-	});
-
-	const specialFeatureOptions = Object.entries(featureCounts).map(([name, count]) => ({
-		name,
-		count
-	}));
-
-	for (let option of specialFeatureOptions) {
-		if (option.name === 'Favorite') {
-			option.count = filteredListings.filter(x => favorites.includes(x.id)).length;
-		}
-	}
-
-	return specialFeatureOptions;
-};
-
-const getPointsOfInterestOptions = pointsOfInterestNames => {
-	return Object.entries(pointsOfInterestNames).sort().map(([key, name]) => ({
-		key,
-		name
-	}));
-};
-
-export const generateFilterOptions = (
-	filteredListings,
-	allListings,
-	siteConfig,
-	filterOptions,
-	parentField,
-	favorites
-) => {
-	if (allListings.length > 0) {
-		const dynamicFilters = siteConfig.fieldFiltersShown.map(fieldName => {
-			if (fieldName === parentField && filterOptions?.filters) {
-				return filterOptions.filters.find(filter => filter.id === fieldName);
-			}
-			if (fieldName == "specialFeatures") {
-				return {
-					id: fieldName,
-					title: siteConfig.fieldNames[fieldName],
-					items: getSpecialFeatureOptions(allListings, filteredListings, siteConfig, favorites).sort()
-				};
-			}
-			return {
-				id: fieldName,
-				title: siteConfig.fieldNames[fieldName],
-				items: getFilterOptions(allListings, filteredListings, fieldName)
-			};
-		});
-
-		const locations =
-			siteConfig.locationFiltersShown.map((fieldName, index) => {
-				if (index === 0 && filterOptions?.locations) {
-					return filterOptions.locations.find(filter => filter.id === fieldName);
-				}
-				return {
-					id: fieldName,
-					title: siteConfig.fieldNames[fieldName],
-					items: getFilterOptions(allListings, filteredListings, fieldName, true)
-				};
-			});
-
-		const pointsOfInterest = {
-			id: "pointsOfInterest",
-			title: siteConfig.pointsOfInterestConfig.title,
-			items: getPointsOfInterestOptions(
-				siteConfig.pointsOfInterestConfig.pointsOfInterestNames
-			)
-		};
-
-		return {
-			filters: dynamicFilters,
-			locations: locations,
-			pointsOfInterest: pointsOfInterest
-		};
-	}
-
-	return null;
-};
-
-export const applyFilters = (
-	allListings,
-	selectedFilters,
-	query,
-	listingEntities,
-	favorites,
-	siteConfig
-) => {
-	let results = allListings;
-	let invertedSpecialFeaturesMap;
-	if (siteConfig.specialFeatures) {
-		invertedSpecialFeaturesMap = Object.entries(siteConfig.specialFeatures).reduce((acc, [key, value]) => {
-			acc[value] = key;
-			return acc;
-		}, {});
-
-	}
-	const hasFavorite = !!selectedFilters.specialFeatures && !!selectedFilters.specialFeatures.Favorite;
-
-	if (hasFavorite && selectedFilters.specialFeatures.Favorite == true) {
-		results = results.filter(x => favorites.includes(x.id));
-	}
-	var favorite;
-	if (hasFavorite) {
-		favorite = selectedFilters.specialFeatures.Favorite;
-		delete selectedFilters.specialFeatures.Favorite;
-	}
-	for (const [field, filterItems] of Object.entries(selectedFilters)) {
-		const formattedField = field;
-		if (field === "pointsOfInterest") continue;
-		if (field === "specialFeatures" && invertedSpecialFeaturesMap && Object.keys(filterItems).length > 0) {
-			results = results.filter(listing => {
-				return Object.entries(filterItems).some(([filterName, filterValue]) => {
-					const listingFieldName = invertedSpecialFeaturesMap[filterName];
-					return filterValue && listing.fields[listingFieldName] === 1;
-				});
-			});
-		} else if (Object.keys(filterItems).length > 0) {
-			results = results.filter(listing =>
-				filterItems.hasOwnProperty(listing.fields[formattedField])
-			);
-		}
-	}
-	if (query) {
-		results = searchResults(results, query);
-	}
-	const distinctItems = getDistinctItemsByProximity(results, listingEntities);
-	if (hasFavorite) {
-		selectedFilters.specialFeatures.Favorite = favorite;
-	}
-	return { filteredListings: results, mapItems: distinctItems };
-};
-
-function searchResults(results, query) {
-	const fields = [
-		'id',
-		'fields.posted',
-		'fields.subtitle',
-		'fields.education',
-		'fields.position',
-		'fields.category',
-		'fields.categoryclass',
-		'fields.shift',
-		'fields.citystate',
-		'fields.city',
-		'fields.state',
-		'fields.schedule',
-		'fields.customflag1',
-		'fields.bonus',
-		'fields.remote',
-		'fields.useclientjoburl',
-		'fields.datecreated',
-		'fields.datelastedited'
-	];
-
-	const options = {
-		includeScore: true,
-		threshold: 0.3,
-		keys: fields
-	};
-
-	const fuse = new Fuse(results, options);
-	const lowerCaseQuery = query.toLowerCase();
-	const queryTerms = lowerCaseQuery.split(' ');
-
-	const exactIdMatch = results.find(result => result.id.toString() === query);
-	if (exactIdMatch) {
-		return [exactIdMatch];
-	}
-
-	const fuseQuery = queryTerms.map(term => ({
-		$or: fields.map(field => ({ [field]: term }))
-	}));
-
-	const fuseResults = fuse.search({ $and: fuseQuery });
-
-	return fuseResults.map(result => result.item);
-}
-
-export const filterListingsByLocation = (
-	allListings,
-	selectedLocation,
-	listingEntities
-) => {
-	let results = allListings;
-	if (selectedLocation !== null) {
-		results = results.filter(item =>
-			selectedLocation.items.hasOwnProperty(item.id)
-		);
-	}
-	const mapItems = getDistinctItemsByProximity(results, listingEntities);
-	return { filteredListings: results, mapItems: mapItems };
-};
+import { getDistinctItemsByProximity } from '~/util/mapUtil';
+
+import Fuse from 'fuse.js';
+
+export const getFilterOptions = (listings, filteredListings, field, excludeZeroCount = null) => {
+	const options = new Set();
+	listings.forEach(listing => {
+		if (listing.fields[field]) {
+			options.add(listing.fields[field]);
+		}
+	});
+
+	const optionCounts = {};
+	options.forEach(option => {
+		optionCounts[option] = 0;
+	});
+
+	filteredListings.forEach(listing => {
+		const value = listing.fields[field];
+		if (value && optionCounts.hasOwnProperty(value)) {
+			optionCounts[value] += 1;
+		}
+	});
+
+	return Array.from(options)
+		.sort()
+		.map(option => ({
+			name: option,
+			count: optionCounts[option] || 0
+		}))
+		.filter(option => !(excludeZeroCount === true && option.count === 0));
+};
+
+export const getSpecialFeatureOptions = (listings, filteredListings, siteConfig, favorites) => {
+	const specialFeatures = siteConfig.specialFeatures;
+	const featureCounts = Object.keys(specialFeatures).sort().reduce((acc, key) => {
+		acc[specialFeatures[key]] = 0;
+		return acc;
+	}, {});
+
+	filteredListings.forEach(listing => {
+		Object.entries(specialFeatures).forEach(([featureKey, featureName]) => {
+			if (listing.fields[featureKey] == 1) {
+				featureCounts[featureName] += 1;
+			}
+		});
+	});
+
+	const specialFeatureOptions = Object.entries(featureCounts).map(([name, count]) => ({
+		name,
+		count
+	}));
+
+	for (let option of specialFeatureOptions) {
+		if (option.name === 'Favorite') {
+			option.count = filteredListings.filter(x => favorites.includes(x.id)).length;
+		}
+	}
+
+	return specialFeatureOptions;
+};
+
+const getPointsOfInterestOptions = pointsOfInterestNames => {
+	return Object.entries(pointsOfInterestNames).sort().map(([key, name]) => ({
+		key,
+		name
+	}));
+};
+
+export const generateFilterOptions = (
+	filteredListings,
+	allListings,
+	siteConfig,
+	filterOptions,
+	parentField,
+	favorites
+) => {
+	if (allListings.length > 0) {
+		const dynamicFilters = siteConfig.fieldFiltersShown.map(fieldName => {
+			if (fieldName === parentField && filterOptions?.filters) {
+				return filterOptions.filters.find(filter => filter.id === fieldName);
+			}
+			if (fieldName == "specialFeatures") {
+				return {
+					id: fieldName,
+					title: siteConfig.fieldNames[fieldName],
+					items: getSpecialFeatureOptions(allListings, filteredListings, siteConfig, favorites).sort()
+				};
+			}
+			return {
+				id: fieldName,
+				title: siteConfig.fieldNames[fieldName],
+				items: getFilterOptions(allListings, filteredListings, fieldName)
+			};
+		});
+
+		const locations =
+			siteConfig.locationFiltersShown.map((fieldName, index) => {
+				if (index === 0 && filterOptions?.locations) {
+					return filterOptions.locations.find(filter => filter.id === fieldName);
+				}
+				return {
+					id: fieldName,
+					title: siteConfig.fieldNames[fieldName],
+					items: getFilterOptions(allListings, filteredListings, fieldName, true)
+				};
+			});
+
+		const pointsOfInterest = {
+			id: "pointsOfInterest",
+			title: siteConfig.pointsOfInterestConfig.title,
+			items: getPointsOfInterestOptions(
+				siteConfig.pointsOfInterestConfig.pointsOfInterestNames
+			)
+		};
+
+		return {
+			filters: dynamicFilters,
+			locations: locations,
+			pointsOfInterest: pointsOfInterest
+		};
+	}
+
+	return null;
+};
+
+export const applyFilters = (
+	allListings,
+	selectedFilters,
+	query,
+	listingEntities,
+	favorites,
+	siteConfig
+) => {
+	let results = allListings;
+	let invertedSpecialFeaturesMap;
+	if (siteConfig.specialFeatures) {
+		invertedSpecialFeaturesMap = Object.entries(siteConfig.specialFeatures).reduce((acc, [key, value]) => {
+			acc[value] = key;
+			return acc;
+		}, {});
+
+	}
+	const hasFavorite = !!selectedFilters.specialFeatures && !!selectedFilters.specialFeatures.Favorite;
+
+	if (hasFavorite && selectedFilters.specialFeatures.Favorite == true) {
+		results = results.filter(x => favorites.includes(x.id));
+	}
+	var favorite;
+	if (hasFavorite) {
+		favorite = selectedFilters.specialFeatures.Favorite;
+		delete selectedFilters.specialFeatures.Favorite;
+	}
+	for (const [field, filterItems] of Object.entries(selectedFilters)) {
+		const formattedField = field;
+		if (field === "pointsOfInterest") continue;
+		if (field === "specialFeatures" && invertedSpecialFeaturesMap && Object.keys(filterItems).length > 0) {
+			results = results.filter(listing => {
+				return Object.entries(filterItems).some(([filterName, filterValue]) => {
+					const listingFieldName = invertedSpecialFeaturesMap[filterName];
+					return filterValue && listing.fields[listingFieldName] == 1;
+				});
+			});
+		} else if (Object.keys(filterItems).length > 0) {
+			results = results.filter(listing =>
+				filterItems.hasOwnProperty(listing.fields[formattedField])
+			);
+		}
+	}
+	if (query) {
+		results = searchResults(results, query);
+	}
+	const distinctItems = getDistinctItemsByProximity(results, listingEntities);
+	if (hasFavorite) {
+		selectedFilters.specialFeatures.Favorite = favorite;
+	}
+	return { filteredListings: results, mapItems: distinctItems };
+};
+
+function searchResults(results, query) {
+	const fields = [
+		'id',
+		'fields.posted',
+		'fields.subtitle',
+		'fields.education',
+		'fields.position',
+		'fields.category',
+		'fields.categoryclass',
+		'fields.shift',
+		'fields.citystate',
+		'fields.city',
+		'fields.state',
+		'fields.schedule',
+		'fields.customflag1',
+		'fields.bonus',
+		'fields.remote',
+		'fields.useclientjoburl',
+		'fields.datecreated',
+		'fields.datelastedited'
+	];
+
+	const options = {
+		includeScore: true,
+		threshold: 0.3,
+		keys: fields
+	};
+
+	const fuse = new Fuse(results, options);
+	const lowerCaseQuery = query.toLowerCase();
+	const queryTerms = lowerCaseQuery.split(' ');
+
+	const exactIdMatch = results.find(result => result.id.toString() === query);
+	if (exactIdMatch) {
+		return [exactIdMatch];
+	}
+
+	const fuseQuery = queryTerms.map(term => ({
+		$or: fields.map(field => ({ [field]: term }))
+	}));
+
+	const fuseResults = fuse.search({ $and: fuseQuery });
+
+	return fuseResults.map(result => result.item);
+}
+
+export const filterListingsByLocation = (
+	allListings,
+	selectedLocation,
+	listingEntities
+) => {
+	let results = allListings;
+	if (selectedLocation !== null) {
+		results = results.filter(item =>
+			selectedLocation.items.hasOwnProperty(item.id)
+		);
+	}
+	const mapItems = getDistinctItemsByProximity(results, listingEntities);
+	return { filteredListings: results, mapItems: mapItems };
+};

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');
+};