Skip to content

Commit

Permalink
Refactor code
Browse files Browse the repository at this point in the history
  • Loading branch information
kertal committed Oct 15, 2024
1 parent 931aa13 commit b50e996
Showing 1 changed file with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ export const useDiscoverHistogram = ({
hideChart,
}: UseDiscoverHistogramProps) => {
const services = useDiscoverServices();
const savedSearchData$ = stateContainer.dataState.data$;
const savedSearchHits$ = savedSearchData$.totalHits$;
const { main$, documents$, totalHits$ } = stateContainer.dataState.data$;
const savedSearchState = useSavedSearch();
const isEsqlMode = useIsEsqlMode();

Expand Down Expand Up @@ -154,7 +153,7 @@ export const useDiscoverHistogram = ({
* Total hits
*/

const setTotalHitsError = useMemo(() => sendErrorTo(savedSearchHits$), [savedSearchHits$]);
const setTotalHitsError = useMemo(() => sendErrorTo(totalHits$), [totalHits$]);

useEffect(() => {
const subscription = createTotalHitsObservable(unifiedHistogram?.state$)?.subscribe(
Expand All @@ -170,7 +169,7 @@ export const useDiscoverHistogram = ({
return;
}

const { result: totalHitsResult } = savedSearchHits$.getValue();
const { result: totalHitsResult } = totalHits$.getValue();

if (
(status === UnifiedHistogramFetchStatus.loading ||
Expand All @@ -186,7 +185,7 @@ export const useDiscoverHistogram = ({

// Do not sync the loading state since it's already handled by fetchAll
if (fetchStatus !== FetchStatus.LOADING) {
savedSearchHits$.next({
totalHits$.next({
fetchStatus,
result,
});
Expand All @@ -197,7 +196,7 @@ export const useDiscoverHistogram = ({
}

// Check the hits count to set a partial or no results state
checkHitCount(savedSearchData$.main$, result);
checkHitCount(main$, result);
}
);

Expand All @@ -206,8 +205,8 @@ export const useDiscoverHistogram = ({
};
}, [
isEsqlMode,
savedSearchData$.main$,
savedSearchHits$,
main$,
totalHits$,
setTotalHitsError,
stateContainer.appState,
unifiedHistogram?.state$,
Expand Down Expand Up @@ -236,7 +235,7 @@ export const useDiscoverHistogram = ({

const [initialEsqlProps] = useState(() =>
getUnifiedHistogramPropsForEsql({
documentsValue: savedSearchData$.documents$.getValue(),
documentsValue: documents$.getValue(),
savedSearch: stateContainer.savedSearchState.getState(),
})
);
Expand Down

0 comments on commit b50e996

Please sign in to comment.