Skip to content
Snippets Groups Projects
Commit 4f8bc229 authored by Adrian Orłów's avatar Adrian Orłów
Browse files

feat: rfc fixes

parent 05adb178
No related branches found
No related tags found
2 merge requests!223reset the pin numbers before search results are fetch (so the results will be...,!181feat: Add summary overlays with named elements (MIN-315)
Pipeline #88988 passed
import { SIZE_OF_EMPTY_ARRAY } from '@/constants/common'; import { SIZE_OF_EMPTY_ARRAY } from '@/constants/common';
import { MapOverlay } from '@/types/models'; import { MapOverlay } from '@/types/models';
import { useMemo } from 'react';
import { OverlayAxis } from '../OverlayAxis'; import { OverlayAxis } from '../OverlayAxis';
import { OverlayDataAxis } from '../OverlayData.types'; import { OverlayDataAxis } from '../OverlayData.types';
import { getAxesSortedByValue } from '../utils/getAxesSortedByValue'; import { getAxesSortedByValue } from '../utils/getAxesSortedByValue';
...@@ -12,6 +13,7 @@ interface Props { ...@@ -12,6 +13,7 @@ interface Props {
export const GroupedOverlayAxes = ({ overlay, axes }: Props): JSX.Element | null => { export const GroupedOverlayAxes = ({ overlay, axes }: Props): JSX.Element | null => {
const { idObject, name } = overlay; const { idObject, name } = overlay;
const overlayAxes = axes.filter(axis => axis.overlayId === idObject); const overlayAxes = axes.filter(axis => axis.overlayId === idObject);
const sortedAxes = useMemo(() => getAxesSortedByValue(overlayAxes), [overlayAxes]);
if (overlayAxes.length === SIZE_OF_EMPTY_ARRAY) { if (overlayAxes.length === SIZE_OF_EMPTY_ARRAY) {
return null; return null;
...@@ -23,7 +25,7 @@ export const GroupedOverlayAxes = ({ overlay, axes }: Props): JSX.Element | null ...@@ -23,7 +25,7 @@ export const GroupedOverlayAxes = ({ overlay, axes }: Props): JSX.Element | null
{name} {name}
</div> </div>
<div className="my-1 h-[1px] w-full bg-divide" /> <div className="my-1 h-[1px] w-full bg-divide" />
{getAxesSortedByValue(overlayAxes).map(axis => ( {sortedAxes.map(axis => (
<OverlayAxis key={axis.title} axis={axis} /> <OverlayAxis key={axis.title} axis={axis} />
))} ))}
</div> </div>
......
import { ZERO } from '@/constants/common'; import { ZERO } from '@/constants/common';
import { overlaysOpenedSelector } from '@/redux/overlayBioEntity/overlayBioEntity.selector'; import { overlaysOpenedSelector } from '@/redux/overlayBioEntity/overlayBioEntity.selector';
import { useMemo } from 'react';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { GroupedOverlayAxes } from './GroupedOverlayAxes'; import { GroupedOverlayAxes } from './GroupedOverlayAxes';
import { OverlayAxis } from './OverlayAxis'; import { OverlayAxis } from './OverlayAxis';
...@@ -19,6 +20,7 @@ export const OverlayData = ({ ...@@ -19,6 +20,7 @@ export const OverlayData = ({
const axes = useOverlaysAxes({ isShowOverlayBioEntityName }); const axes = useOverlaysAxes({ isShowOverlayBioEntityName });
const uniqueAxes = getUniqueAxes(axes); const uniqueAxes = getUniqueAxes(axes);
const openedOverlays = useSelector(overlaysOpenedSelector); const openedOverlays = useSelector(overlaysOpenedSelector);
const sortedAxes = useMemo(() => getAxesSortedByValue(uniqueAxes), [uniqueAxes]);
if (uniqueAxes.length === ZERO) { if (uniqueAxes.length === ZERO) {
return null; return null;
...@@ -26,7 +28,7 @@ export const OverlayData = ({ ...@@ -26,7 +28,7 @@ export const OverlayData = ({
const overlaysAxesContent = ( const overlaysAxesContent = (
<div className="flex flex-col gap-2 rounded-lg border border-divide p-4"> <div className="flex flex-col gap-2 rounded-lg border border-divide p-4">
{getAxesSortedByValue(uniqueAxes).map(axis => ( {sortedAxes.map(axis => (
<OverlayAxis key={axis.title} axis={axis} /> <OverlayAxis key={axis.title} axis={axis} />
))} ))}
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment