From e92abcca77f50c1e48c082179a31547bc999bdba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Or=C5=82=C3=B3w?= <adrian.orlow@fishbrain.com>
Date: Mon, 27 Nov 2023 01:10:04 +0100
Subject: [PATCH] fix: make searchedBioEntitesSelectorOfCurrentMap less complex
---
.../config/pinsLayer/useOlMapPinsLayer.ts | 4 +--
src/redux/bioEntity/bioEntity.selectors.ts | 30 +++++--------------
src/redux/bioEntity/bioEntity.utils.ts | 14 ---------
3 files changed, 9 insertions(+), 39 deletions(-)
delete mode 100644 src/redux/bioEntity/bioEntity.utils.ts
diff --git a/src/components/Map/MapViewer/utils/config/pinsLayer/useOlMapPinsLayer.ts b/src/components/Map/MapViewer/utils/config/pinsLayer/useOlMapPinsLayer.ts
index 51523f77..6580ded5 100644
--- a/src/components/Map/MapViewer/utils/config/pinsLayer/useOlMapPinsLayer.ts
+++ b/src/components/Map/MapViewer/utils/config/pinsLayer/useOlMapPinsLayer.ts
@@ -1,5 +1,5 @@
/* eslint-disable no-magic-numbers */
-import { allBioEntitesSelectorOfCurrentMap } from '@/redux/bioEntity/bioEntity.selectors';
+import { searchedBioEntitesSelectorOfCurrentMap } from '@/redux/bioEntity/bioEntity.selectors';
import { usePointToProjection } from '@/utils/map/usePointToProjection';
import BaseLayer from 'ol/layer/Base';
import VectorLayer from 'ol/layer/Vector';
@@ -10,7 +10,7 @@ import { getBioEntitiesFeatures } from './getBioEntitiesFeatures';
export const useOlMapPinsLayer = (): BaseLayer => {
const pointToProjection = usePointToProjection();
- const contentBioEntites = useSelector(allBioEntitesSelectorOfCurrentMap);
+ const contentBioEntites = useSelector(searchedBioEntitesSelectorOfCurrentMap);
const bioEntityFeatures = useMemo(
() =>
diff --git a/src/redux/bioEntity/bioEntity.selectors.ts b/src/redux/bioEntity/bioEntity.selectors.ts
index bcaeda20..53b446e2 100644
--- a/src/redux/bioEntity/bioEntity.selectors.ts
+++ b/src/redux/bioEntity/bioEntity.selectors.ts
@@ -5,7 +5,6 @@ import { BioEntity, BioEntityContent } from '@/types/models';
import { createSelector } from '@reduxjs/toolkit';
import { currentSelectedSearchElement } from '../drawer/drawer.selectors';
import { currentModelIdSelector, modelsDataSelector } from '../models/models.selectors';
-import { reduceToJoinedMultiSearchResult } from './bioEntity.utils';
export const bioEntitySelector = createSelector(rootSelector, state => state.bioEntity);
@@ -23,36 +22,21 @@ export const loadingBioEntityStatusSelector = createSelector(
state => state?.loading,
);
-export const bioEntitiesForSelectedSearchElementOrAllFallback = createSelector(
+export const searchedBioEntitesSelectorOfCurrentMap = createSelector(
bioEntitySelector,
- bioEntitiesForSelectedSearchElement,
currentSelectedSearchElement,
- (
- bioEntitiesState,
- bioEntitiesOfSelected,
- currentSearchElement,
- ): MultiSearchData<BioEntityContent[]> | undefined => {
- if (!currentSearchElement) {
- const bioEntitiesFiltered = bioEntitiesState.data.filter(d => d !== undefined);
-
- return bioEntitiesFiltered.length === SIZE_OF_EMPTY_ARRAY
- ? undefined
- : bioEntitiesFiltered.reduce(reduceToJoinedMultiSearchResult);
- }
-
- return bioEntitiesOfSelected;
- },
-);
-
-export const allBioEntitesSelectorOfCurrentMap = createSelector(
- bioEntitiesForSelectedSearchElementOrAllFallback,
currentModelIdSelector,
- (bioEntities, currentModelId): BioEntity[] => {
+ (bioEntities, currentSearchElement, currentModelId): BioEntity[] => {
if (!bioEntities) {
return [];
}
return (bioEntities?.data || [])
+ .filter(({ searchQueryElement }) =>
+ currentSearchElement ? searchQueryElement === currentSearchElement : true,
+ )
+ .map(({ data }) => data || [])
+ .flat()
.filter(({ bioEntity }) => bioEntity.model === currentModelId)
.map(({ bioEntity }) => bioEntity);
},
diff --git a/src/redux/bioEntity/bioEntity.utils.ts b/src/redux/bioEntity/bioEntity.utils.ts
deleted file mode 100644
index 8aa0c336..00000000
--- a/src/redux/bioEntity/bioEntity.utils.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { MultiSearchData } from '@/types/fetchDataState';
-import { BioEntityContent } from '@/types/models';
-
-type MultiSearchBioEntityData = MultiSearchData<BioEntityContent[]>;
-type ToJoinedMultiSearchResultFun = (
- a: MultiSearchBioEntityData,
- b: MultiSearchBioEntityData,
-) => MultiSearchBioEntityData;
-
-export const reduceToJoinedMultiSearchResult: ToJoinedMultiSearchResultFun = (a, b) => ({
- ...b,
- searchQueryElement: `${a.searchQueryElement};${b.searchQueryElement}`,
- data: (a.data || []).concat(b.data || []),
-});
--
GitLab