Skip to content
Snippets Groups Projects
Commit 63ad5d04 authored by Vink, S.A. (Sjoerd)'s avatar Vink, S.A. (Sjoerd)
Browse files

feat(map_nodelink): fixed merge issue

parent 21e3ef37
No related branches found
No related tags found
1 merge request!151feat(map_nodelink)
Pipeline #137593 passed
Stage: tag-release
Stage: get-release-tag
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 40 deletions
libs/shared/lib/vis/visualizations/mapvis/components/layers/choropleth-layer/ChoroplethOptions.tsx
+ 8
− 8
View file @ 63ad5d04
......@@ -26,10 +26,10 @@ export default function ChoroplethOptions({ settings, graphMetadata, updateSetti
});
}, [graphMetadata]);
const spatialAttributes = useMemo(() => {
if (!settings.node || !(Object.keys(graphMetadata.nodes.types).length > 0)) return [];
return Object.entries(graphMetadata.nodes.types[settings.node].attributes).map((kv) => kv[0]);
}, [settings.node]);
const spatialAttributes: { [id: string]: string[] } = {};
graphMetadata.nodes.labels.forEach((node) => {
spatialAttributes[node] = Object.entries(graphMetadata.nodes.types[node].attributes).map((kv) => kv[0]);
});
const handleCollapseToggle = (nodeType: string) => {
setCollapsed((prevCollapsed) => ({
......@@ -61,8 +61,8 @@ export default function ChoroplethOptions({ settings, graphMetadata, updateSetti
label="Longitude"
type="dropdown"
value={settings?.[nodeType]?.lon}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lon: val as string } })}
/>
......@@ -71,8 +71,8 @@ export default function ChoroplethOptions({ settings, graphMetadata, updateSetti
label="Latitude"
type="dropdown"
value={settings?.[nodeType]?.lat}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lat: val as string } })}
/>
</div>
......
libs/shared/lib/vis/visualizations/mapvis/components/layers/heatmap-layer/HeatLayerOptions.tsx
+ 8
− 8
View file @ 63ad5d04
......@@ -26,10 +26,10 @@ export default function HeatLayerOptions({ settings, graphMetadata, updateSettin
});
}, [graphMetadata]);
const spatialAttributes = useMemo(() => {
if (!settings.node || !(Object.keys(graphMetadata.nodes.types).length > 0)) return [];
return Object.entries(graphMetadata.nodes.types[settings.node].attributes).map((kv) => kv[0]);
}, [settings.node]);
const spatialAttributes: { [id: string]: string[] } = {};
graphMetadata.nodes.labels.forEach((node) => {
spatialAttributes[node] = Object.entries(graphMetadata.nodes.types[node].attributes).map((kv) => kv[0]);
});
const handleCollapseToggle = (nodeType: string) => {
setCollapsed((prevCollapsed) => ({
......@@ -61,8 +61,8 @@ export default function HeatLayerOptions({ settings, graphMetadata, updateSettin
label="Longitude"
type="dropdown"
value={settings?.[nodeType]?.lon}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lon: val as string } })}
/>
......@@ -71,8 +71,8 @@ export default function HeatLayerOptions({ settings, graphMetadata, updateSettin
label="Latitude"
type="dropdown"
value={settings?.[nodeType]?.lat}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lat: val as string } })}
/>
......
libs/shared/lib/vis/visualizations/mapvis/components/layers/icon-layer/IconOptions.tsx
+ 8
− 8
View file @ 63ad5d04
......@@ -26,10 +26,10 @@ export default function IconOptions({ settings, graphMetadata, updateSettings }:
});
}, [graphMetadata]);
const spatialAttributes = useMemo(() => {
if (!settings.node || !(Object.keys(graphMetadata.nodes.types).length > 0)) return [];
return Object.entries(graphMetadata.nodes.types[settings.node].attributes).map((kv) => kv[0]);
}, [settings.node]);
const spatialAttributes: { [id: string]: string[] } = {};
graphMetadata.nodes.labels.forEach((node) => {
spatialAttributes[node] = Object.entries(graphMetadata.nodes.types[node].attributes).map((kv) => kv[0]);
});
const handleCollapseToggle = (nodeType: string) => {
setCollapsed((prevCollapsed) => ({
......@@ -61,8 +61,8 @@ export default function IconOptions({ settings, graphMetadata, updateSettings }:
label="Longitude"
type="dropdown"
value={settings?.[nodeType]?.lon}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lon: val as string } })}
/>
......@@ -71,8 +71,8 @@ export default function IconOptions({ settings, graphMetadata, updateSettings }:
label="Latitude"
type="dropdown"
value={settings?.[nodeType]?.lat}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lat: val as string } })}
/>
<div className="flex items-center gap-1">
......
libs/shared/lib/vis/visualizations/mapvis/components/layers/node-layer/NodeOptions.tsx
+ 8
− 8
View file @ 63ad5d04
......@@ -27,10 +27,10 @@ export default function NodeOptions({ settings, graphMetadata, updateSettings }:
});
}, [graphMetadata]);
const spatialAttributes = useMemo(() => {
if (!settings.node || !(Object.keys(graphMetadata.nodes.types).length > 0)) return [];
return Object.entries(graphMetadata.nodes.types[settings.node].attributes).map((kv) => kv[0]);
}, [settings.node]);
const spatialAttributes: { [id: string]: string[] } = {};
graphMetadata.nodes.labels.forEach((node) => {
spatialAttributes[node] = Object.entries(graphMetadata.nodes.types[node].attributes).map((kv) => kv[0]);
});
const handleCollapseToggle = (nodeType: string) => {
setCollapsed((prevCollapsed) => ({
......@@ -62,8 +62,8 @@ export default function NodeOptions({ settings, graphMetadata, updateSettings }:
label="Longitude"
type="dropdown"
value={settings?.[nodeType]?.lon}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lon: val as string } })}
/>
......@@ -72,8 +72,8 @@ export default function NodeOptions({ settings, graphMetadata, updateSettings }:
label="Latitude"
type="dropdown"
value={settings?.[nodeType]?.lat}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lat: val as string } })}
/>
......
libs/shared/lib/vis/visualizations/mapvis/components/layers/nodelink-layer/NodeLinkOptions.tsx
+ 8
− 8
View file @ 63ad5d04
......@@ -41,10 +41,10 @@ export default function NodeLinkOptions({ settings, graphMetadata, updateSetting
});
}, [graphMetadata]);
const spatialAttributes = useMemo(() => {
if (!settings.node || !(Object.keys(graphMetadata.nodes.types).length > 0)) return [];
return Object.entries(graphMetadata.nodes.types[settings.node].attributes).map((kv) => kv[0]);
}, [settings.node]);
const spatialAttributes: { [id: string]: string[] } = {};
graphMetadata.nodes.labels.forEach((node) => {
spatialAttributes[node] = Object.entries(graphMetadata.nodes.types[node].attributes).map((kv) => kv[0]);
});
const handleCollapseToggle = (nodeType: string) => {
setCollapsed((prevCollapsed) => ({
......@@ -76,8 +76,8 @@ export default function NodeLinkOptions({ settings, graphMetadata, updateSetting
label="Longitude"
type="dropdown"
value={settings?.[nodeType]?.lon}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lon: val as string } })}
/>
......@@ -86,8 +86,8 @@ export default function NodeLinkOptions({ settings, graphMetadata, updateSetting
label="Latitude"
type="dropdown"
value={settings?.[nodeType]?.lat}
options={[...spatialAttributes]}
disabled={!settings.node || spatialAttributes.length < 1}
options={[...spatialAttributes[nodeType]]}
disabled={!settings.node || spatialAttributes[nodeType].length < 1}
onChange={(val) => updateSettings({ [nodeType]: { ...settings?.[nodeType], lat: val as string } })}
/>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment