Skip to content

Commit a13fd95

Browse files
committed
Merge
2 parents 080fe49 + 166efbf commit a13fd95

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This is a patch release following 2.4.0. It contains several new features for se
1818
Included:
1919
- Improvements to customizability of the bar chart (styling, legend customization, report actions). [#689](https://github.com/neo4j-labs/neodash/pull/689)
2020
- Improved dashboard settings interface, fixed alignment for table download button. [#729](https://github.com/neo4j-labs/neodash/pull/729)
21-
- Adjusted ordering of suggested labels/proFperties for parameter selectors. [#728](https://github.com/neo4j-labs/neodash/pull/728)
21+
- Adjusted ordering of suggested labels/properties for parameter selectors. [#728](https://github.com/neo4j-labs/neodash/pull/728)
2222
- Better handling of date parameters when saving/loading dashboards. [#727](https://github.com/neo4j-labs/neodash/pull/727)
2323
- Fixed incorrect z-index issue for form creation modals. [#726](https://github.com/neo4j-labs/neodash/pull/726)
2424
- Adjusted filtering tooltip on tables to avoid hiding result data. [#712](https://github.com/neo4j-labs/neodash/pull/712)

docs/modules/ROOT/pages/user-guide/reports/graph3d.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
link:../../extensions/advanced-visualizations[label:Advanced Visualization[]]
44

5-
The 3D graph report extends the default graph visualization with another dimensions.
6-
It supports ~95% of the features & customizations for the regular (2D) graph, including rule-based styling and report actions.
5+
The 3D graph report extends the default graph visualization with another dimension.
6+
It supports most of the features & customizations for the regular (2D) graph, including rule-based styling and report actions.
7+
Users can explore the 3D graph by zooming and panning through 3D space.
8+
79

810
== Examples
911

src/extensions/actions/ActionsRuleCreationModal.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ export const NeoCustomReportActionsModal = ({
251251
}
252252

253253
// When we are accessing node properties (not page names), parse the node label + property pair to only show properties.
254-
if (rule.customization !== 'set page' && (type == 'graph' || type == 'map')) {
254+
// Fields for graph and map reports are structured differently than regular reports (table, bar, etc.), so we access suggestions differently.
255+
if (rule.customization !== 'set page' && (type == 'graph' || type == 'map' || type == 'graph3d')) {
255256
suggestions = suggestions.map((e) => e.split('.')[1] || e);
256257
}
257258

@@ -334,7 +335,7 @@ export const NeoCustomReportActionsModal = ({
334335
const td2Styling = (type) => ({ width: type === 'bar' ? '15%' : '30%' });
335336
const td2DropdownClassname = (type) => `n-align-middle n-pr-1 ${type === 'bar' ? 'n-w-full' : 'n-w-2/5'}`;
336337
const td2Autocomplete = (type, index, rule) =>
337-
(type !== 'bar' ? (
338+
(type !== 'bar' && rule.condition !== 'rowCheck' ? (
338339
<Autocomplete
339340
className='n-align-middle n-inline-block n-w-/5'
340341
disableClearable={true}
@@ -418,7 +419,7 @@ export const NeoCustomReportActionsModal = ({
418419
className={td2DropdownClassname(type)}
419420
style={{
420421
minWidth: '140px',
421-
width: ruleTrigger.disableFieldSelection === true ? '100%' : '140px',
422+
width: ruleTrigger?.disableFieldSelection === true ? '100%' : '140px',
422423
display: 'inline-block',
423424
}}
424425
selectProps={{
@@ -440,7 +441,7 @@ export const NeoCustomReportActionsModal = ({
440441

441442
<td style={{ width: '6%' }} className='n-text-center'>
442443
<span style={{ fontWeight: 'bold', color: 'black', marginLeft: 5, marginRight: 5 }}>
443-
{!ruleTrigger.multiple ? 'SET' : 'APPEND'}
444+
{!ruleTrigger?.multiple ? 'SET' : 'APPEND'}
444445
</span>
445446
</td>
446447

@@ -472,7 +473,7 @@ export const NeoCustomReportActionsModal = ({
472473

473474
<td width='5%' className='n-text-center'>
474475
<span style={{ fontWeight: 'bold', color: 'black', marginLeft: 5, marginRight: 5 }}>
475-
{!ruleTrigger.multiple ? 'TO' : 'WITH'}
476+
{!ruleTrigger?.multiple ? 'TO' : 'WITH'}
476477
</span>
477478
</td>
478479

0 commit comments

Comments
 (0)