Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiberiuichim
tiberiuichim committed Aug 4, 2023
1 parent 10bd7db commit be17ddf
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 71 deletions.
139 changes: 70 additions & 69 deletions searchlib/components/SearchApp/FacetApp.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
* it needs to be executed in the context of a search app
*/
import React from 'react';
// import { isEqual } from 'lodash';
// import useDeepCompareEffect from 'use-deep-compare-effect';

import { Facet as SUIFacet } from '@eeacms/search/components';
import { useSearchContext, useSearchDriver } from '@eeacms/search/lib/hocs'; // , useSearchDriver

// const sorter = (fa, fb) =>
// fa.field === fb.field ? 0 : fa.field < fb.field ? -1 : 0;

export default function FacetApp(props) {
const searchContext = useSearchContext();
const { appConfig, registry, field, onChange, value } = props;
// const { field, onChange, value } = props;
const driver = useSearchDriver();
// console.log({ searchContext, props, driver });
const { filters, removeFilter, addFilter } = searchContext; // driver.state
Expand Down Expand Up @@ -49,35 +43,8 @@ export default function FacetApp(props) {
[field, value, addFilter, removeFilter],
);

// useDeepCompareEffect(() => {
// // on initializing the form, set the active value as filters
// const activeFilter = filters?.find((filter) => filter.field === field);
// if (value && !activeFilter) {
// console.log('useDeep', activeFilter);
// const sortedFilters = [...filters, value].sort(sorter);
// driver._setState({ filters: sortedFilters });
// }
// }, [value, filters, field, setFilter, driver]); // searchContext

// const activeValue = filters.find((f) => f.field === field);

// const dirty = !isEqual(activeValue, value);
// console.log('redraw facet', { value, activeValue, dirty });

const timerRef = React.useRef();

// const sortedFilters = [...filters].sort(sorter);

// useDeepCompareEffect(() => {
// timerRef.current && clearTimeout(timerRef.current);
// timerRef.current = setTimeout(() => {
// if (!isEqual(activeValue, value)) {
// console.log('onchange', { activeValue, value });
// onChange(activeValue);
// }
// }, 200);
// }, [removeFilter, field, activeValue, value, onChange]);

React.useEffect(
() => () => {
removeFilter(field); // when the Facet is removed, we remove the filter
Expand All @@ -89,44 +56,9 @@ export default function FacetApp(props) {

React.useEffect(() => {
value && addFilter(value.field, value.values, value.type);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

// React.useEffect(() => {
// const { plugins } = driver.events;
// const plugId = `trackFilters-${field}`;
//
// if (!plugins.find((plug) => plug.id === plugId)) {
// function subscribe(payload) {
// const { filters } = driver.state;
// const activeValue = filters.find((f) => f.field === field);
// if (!activeValue) {
// onChange(null);
// return;
// }
// if (!isEqual(activeValue, value)) {
// onChange(activeValue);
// }
// }
// plugins.push({
// id: plugId,
// subscribe,
// });
// }
//
// return () => {
// driver.events.plugins = driver.events.plugins.filter(
// (plug) => plug.id !== plugId,
// );
//
// // handles deleting the facet
// driver._setState({
// filters: [
// ...driver.state.filters.filter((f) => f.field !== field),
// ].sort(sorter),
// });
// };
// }, [driver, field, onChange, value]);

return (
<SUIFacet
{...props}
Expand All @@ -152,3 +84,72 @@ export default function FacetApp(props) {
/>
);
}

// const { field, onChange, value } = props;
// import { isEqual } from 'lodash';
// import useDeepCompareEffect from 'use-deep-compare-effect';
// const sorter = (fa, fb) =>
// fa.field === fb.field ? 0 : fa.field < fb.field ? -1 : 0;

// React.useEffect(() => {
// const { plugins } = driver.events;
// const plugId = `trackFilters-${field}`;
//
// if (!plugins.find((plug) => plug.id === plugId)) {
// function subscribe(payload) {
// const { filters } = driver.state;
// const activeValue = filters.find((f) => f.field === field);
// if (!activeValue) {
// onChange(null);
// return;
// }
// if (!isEqual(activeValue, value)) {
// onChange(activeValue);
// }
// }
// plugins.push({
// id: plugId,
// subscribe,
// });
// }
//
// return () => {
// driver.events.plugins = driver.events.plugins.filter(
// (plug) => plug.id !== plugId,
// );
//
// // handles deleting the facet
// driver._setState({
// filters: [
// ...driver.state.filters.filter((f) => f.field !== field),
// ].sort(sorter),
// });
// };
// }, [driver, field, onChange, value]);

// useDeepCompareEffect(() => {
// // on initializing the form, set the active value as filters
// const activeFilter = filters?.find((filter) => filter.field === field);
// if (value && !activeFilter) {
// console.log('useDeep', activeFilter);
// const sortedFilters = [...filters, value].sort(sorter);
// driver._setState({ filters: sortedFilters });
// }
// }, [value, filters, field, setFilter, driver]); // searchContext

// const activeValue = filters.find((f) => f.field === field);

// const dirty = !isEqual(activeValue, value);
// console.log('redraw facet', { value, activeValue, dirty });

// const sortedFilters = [...filters].sort(sorter);

// useDeepCompareEffect(() => {
// timerRef.current && clearTimeout(timerRef.current);
// timerRef.current = setTimeout(() => {
// if (!isEqual(activeValue, value)) {
// console.log('onchange', { activeValue, value });
// onChange(activeValue);
// }
// }, 200);
// }, [removeFilter, field, activeValue, value, onChange]);
4 changes: 2 additions & 2 deletions searchlib/components/SearchApp/useSearchApp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@eeacms/search/lib/request';

import {
removeFilter,
// removeFilter,
clearFilters,
resetFilters,
resetSearch,
Expand Down Expand Up @@ -147,7 +147,7 @@ export default function useSearchApp(props) {
resetFilters,
resetSearch,
clearFilters,
removeFilter,
// removeFilter,
addFilter,
};
Object.keys(funcs).forEach((name) => {
Expand Down

0 comments on commit be17ddf

Please sign in to comment.