Skip to content
Snippets Groups Projects
Commit d395b1c8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

loading should appear until overlay data for current model are not available

parent f45faf2f
No related branches found
No related tags found
3 merge requests!264Resolve "add support for matomo",!236Main,!235Resolve "opening overlay issue"
Pipeline #94719 passed
import { OverlayBioEntityRender } from '@/types/OLrendering'; import { OverlayBioEntityRender } from '@/types/OLrendering';
import { createSelector } from '@reduxjs/toolkit'; import { createSelector } from '@reduxjs/toolkit';
import { allSubmapConnectionsBioEntitySelector } from '@/redux/bioEntity/bioEntity.selectors'; import { allSubmapConnectionsBioEntitySelector } from '@/redux/bioEntity/bioEntity.selectors';
import { mapModelIdSelector } from '@/redux/map/map.selectors';
import { currentSearchedBioEntityId } from '../drawer/drawer.selectors'; import { currentSearchedBioEntityId } from '../drawer/drawer.selectors';
import { currentModelIdSelector } from '../models/models.selectors'; import { currentModelIdSelector } from '../models/models.selectors';
import { import {
...@@ -86,9 +87,18 @@ export const isOverlayActiveSelector = createSelector( ...@@ -86,9 +87,18 @@ export const isOverlayActiveSelector = createSelector(
); );
export const isOverlayLoadingSelector = createSelector( export const isOverlayLoadingSelector = createSelector(
[overlayBioEntitySelector, (_, overlayId: number): number => overlayId], [overlayBioEntitySelector, mapModelIdSelector, (_, overlayId: number): number => overlayId],
({ overlaysId, data }, overlayId) => ({ overlaysId, data }, mapId, overlayId) => {
overlaysId.includes(overlayId) && data[overlayId] && !Object.keys(data[overlayId]).length, let result = false;
if (overlaysId.includes(overlayId)) {
if (data[overlayId] && !Object.keys(data[overlayId]).length) {
result = true;
} else if (data[overlayId] && !data[overlayId][mapId]) {
result = true;
}
}
return result;
},
); );
export const activeOverlaysSelector = createSelector( export const activeOverlaysSelector = createSelector(
......
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