@abcagency/hc-ui-components 1.3.57 → 1.3.59

package/src/util/filterUtil.js

@@ -1,310 +1,311 @@
-/* eslint-disable no-undef */
-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,
-	selectedFilters
-) => {
-	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 == 'categoryClass'){
-				return {
-					id: fieldName,
-					title: siteConfig.fieldNames[fieldName],
-					items: getFilterOptions(allListings, allListings, fieldName)
-				};
-			}
-			if(fieldName == 'category' && selectedFilters.categoryClass){
-				const categoryClassKeys = Object.keys(selectedFilters.categoryClass);
-				const filteredListings = allListings.filter(
-					x => categoryClassKeys.includes(x.fields?.categoryClass)
-				);
-				return {
-					id: fieldName,
-					title: siteConfig.fieldNames[fieldName],
-					items: getFilterOptions(allListings, filteredListings, fieldName, false)
-				};
-			}
-			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) => {
-				let locationFilteredListings = allListings;
-				locationFilteredListings = allListings.filter(listing => {
-					return Object.entries(selectedFilters).every(([key, value]) => {
-						if (siteConfig.locationFiltersShown.includes(key)) return true;
-						if (value && typeof value === 'object' && value[listing.fields[key]] === true) {
-							return true;
-						}
-						return false;
-					});
-				});
-				if (index === 0) {
-					return {
-						id: fieldName,
-						title: siteConfig.fieldNames[fieldName],
-						items: getFilterOptions(allListings, locationFilteredListings, fieldName, true)
-					};
-				}
-				  if (fieldName === 'entityName' && filterOptions?.locations) {
-					const cityIncluded = siteConfig.locationFiltersShown.includes('city');
-					const stateIncluded = siteConfig.locationFiltersShown.includes('state');
-					const cityStateIncluded = siteConfig.locationFiltersShown.includes('cityState');
-					const uniqueCities = cityIncluded ? [...new Set(filteredListings.map(listing => listing.fields.city))] : [];
-					const uniqueStates = stateIncluded ? [...new Set(filteredListings.map(listing => listing.fields.state))] : [];
-					const uniqueCityStates = cityStateIncluded ? [...new Set(filteredListings.map(listing => listing.fields.cityState))] : [];
-					const filteredByLocation = locationFilteredListings.filter(listing => {
-						const cityMatches = cityIncluded ? uniqueCities.includes(listing.fields.city) : true;
-						const stateMatches = stateIncluded ? uniqueStates.includes(listing.fields.state) : true;
-						const cityStateMatches = cityStateIncluded ? uniqueCityStates.includes(listing.fields.cityState) : true;
-						return cityMatches && stateMatches && cityStateMatches;
-					});
-					return {
-						id: fieldName,
-						title: siteConfig.fieldNames[fieldName],
-						items: getFilterOptions(allListings, filteredByLocation, fieldName, true)
-					};
-				}
-				if (fieldName === 'city') {
-					if (siteConfig.locationFiltersShown.includes('state') && selectedFilters.state) {
-						const selectedStates = Object.keys(selectedFilters.state).filter(
-							state => selectedFilters.state[state] === true
-						);
-
-						const filteredByLocation = locationFilteredListings.filter(listing =>
-							selectedStates.includes(listing.fields.state)
-						);
-
-						return {
-							id: fieldName,
-							title: siteConfig.fieldNames[fieldName],
-							items: getFilterOptions(allListings, filteredByLocation, fieldName, true)
-						};
-					}
-				}
-
-				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 };
-};
+/* eslint-disable no-undef */
+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,
+	selectedFilters
+) => {
+	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 == 'categoryClass'){
+				return {
+					id: fieldName,
+					title: siteConfig.fieldNames[fieldName],
+					items: getFilterOptions(allListings, allListings, fieldName)
+				};
+			}
+			if(fieldName == 'category' && selectedFilters.categoryClass){
+				const categoryClassKeys = Object.keys(selectedFilters.categoryClass);
+				const filteredListings = allListings.filter(
+					x => categoryClassKeys.includes(x.fields?.categoryClass)
+				);
+				return {
+					id: fieldName,
+					title: siteConfig.fieldNames[fieldName],
+					items: getFilterOptions(allListings, filteredListings, fieldName, false)
+				};
+			}
+			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) => {
+				let locationFilteredListings = allListings;
+				locationFilteredListings = allListings.filter(listing => {
+					return Object.entries(selectedFilters).every(([key, value]) => {
+						if (siteConfig.locationFiltersShown.includes(key)) return true;
+						if (value && typeof value === 'object' && value[listing.fields[key]] === true) {
+							return true;
+						}
+						return false;
+					});
+				});
+				if (index === 0) {
+					return {
+						id: fieldName,
+						title: siteConfig.fieldNames[fieldName],
+						items: getFilterOptions(allListings, locationFilteredListings, fieldName, true)
+					};
+				}
+				  if (fieldName === 'entityName' && filterOptions?.locations) {
+					const cityIncluded = siteConfig.locationFiltersShown.includes('city');
+					const stateIncluded = siteConfig.locationFiltersShown.includes('state');
+					const cityStateIncluded = siteConfig.locationFiltersShown.includes('cityState');
+					const uniqueCities = cityIncluded ? [...new Set(filteredListings.map(listing => listing.fields.city))] : [];
+					const uniqueStates = stateIncluded ? [...new Set(filteredListings.map(listing => listing.fields.state))] : [];
+					const uniqueCityStates = cityStateIncluded ? [...new Set(filteredListings.map(listing => listing.fields.cityState))] : [];
+					const filteredByLocation = locationFilteredListings.filter(listing => {
+						const cityMatches = cityIncluded ? uniqueCities.includes(listing.fields.city) : true;
+						const stateMatches = stateIncluded ? uniqueStates.includes(listing.fields.state) : true;
+						const cityStateMatches = cityStateIncluded ? uniqueCityStates.includes(listing.fields.cityState) : true;
+						return cityMatches && stateMatches && cityStateMatches;
+					});
+					return {
+						id: fieldName,
+						title: siteConfig.fieldNames[fieldName],
+						items: getFilterOptions(allListings, filteredByLocation, fieldName, true)
+					};
+				}
+				if (fieldName === 'city') {
+					if (siteConfig.locationFiltersShown.includes('state') && selectedFilters.state) {
+						const selectedStates = Object.keys(selectedFilters.state).filter(
+							state => selectedFilters.state[state] === true
+						);
+
+						const filteredByLocation = locationFilteredListings.filter(listing =>
+							selectedStates.includes(listing.fields.state)
+						);
+
+						return {
+							id: fieldName,
+							title: siteConfig.fieldNames[fieldName],
+							items: getFilterOptions(allListings, filteredByLocation, fieldName, true)
+						};
+					}
+				}
+
+				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',
+		'uniqueId',
+		'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 || result.uniqueId === 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/loading.js

@@ -1,17 +1,17 @@
-import React from 'react';
-import Icon from '~/components/modules/icon';
-
-const Loading = () => {
-	return (
-		<div className="hc-flex hc-items-center hc-justify-center hc-w-full hc-h-full">
-			<Icon
-				icon="ph:spinner"
-				className="hc-animate-spin hc-text-gray-300"
-				width="40"
-				height="40"
-			/>
-		</div>
-	);
-};
-
-export default Loading;
+import React from 'react';
+import Icon from '~/components/modules/icon';
+
+const Loading = () => {
+	return (
+		<div className="hc-flex hc-items-center hc-justify-center hc-w-full hc-h-full">
+			<Icon
+				icon="ph:spinner"
+				className="hc-animate-spin hc-text-gray-300"
+				width="40"
+				height="40"
+			/>
+		</div>
+	);
+};
+
+export default Loading;