Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.8 & 2.0.9 - Hotfix for missing config & custom transposed table types #74

Merged
merged 80 commits into from
Feb 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9154fac
Updated version number
nielsdejong Dec 12, 2021
582de5b
Expandable charts when not in edit mode
Dec 15, 2021
d89d283
Merge pull request #44 from JipSogeti/expandable-charts-in-presentati…
nielsdejong Dec 16, 2021
451d72a
Apply global parameter value to selection chart
Dec 16, 2021
31e2438
Get parameter value earlier to apply as default state
Dec 16, 2021
9be8454
Minor fixes to chart interface, reorganized code to be able to avoid …
nielsdejong Dec 17, 2021
59deec3
Added example on how to use maps when returning dictionaries
nielsdejong Dec 19, 2021
28aaa1a
Made connection modal dismissable when connected to Neo4j
nielsdejong Dec 19, 2021
e0c608e
Made fullscreen reports work for maps and lines, now optionally avail…
nielsdejong Dec 19, 2021
523931b
Fixed load dashboard functionality to automatically pick up the selec…
nielsdejong Dec 19, 2021
c8bc604
Added button for returning to main menu screen
nielsdejong Dec 19, 2021
9117b82
Fixed z-index for fullscreen mode
nielsdejong Dec 19, 2021
d83ac1a
Revert some changes and add more comments
Dec 20, 2021
0815b54
Merge branch 'develop' into parameter-select-apply-value
Dec 20, 2021
cdf6097
Resolved rendering issues when loading parameter selection reports wi…
nielsdejong Dec 23, 2021
f593aab
Merged with latest develop branch
nielsdejong Dec 23, 2021
5e80068
Show placeholder when no query is specified
nielsdejong Dec 23, 2021
5ed29e2
Reset extra parameters on page load for parameter select report
nielsdejong Dec 23, 2021
b664d68
Merge pull request #47 from JipSogeti/parameter-select-apply-value
nielsdejong Dec 27, 2021
f099193
Pass Parameter Select value via hash to iframe without re-rendering (…
Dec 27, 2021
0f27f42
Cleanup of global dashboard settings menu
nielsdejong Dec 27, 2021
8f10729
Improved user interface and examples
nielsdejong Jan 2, 2022
e293981
Graph modal (#51)
Jan 2, 2022
e7f8110
Resolved bug in rendering graphs with node pairs that have relationsh…
nielsdejong Jan 2, 2022
a996dcf
Added option to manually specify node labels/property names in select…
nielsdejong Jan 2, 2022
61c5284
Updated release notes
nielsdejong Jan 2, 2022
33e0630
Added debug report button. Fixed table size issues by upgrading to la…
nielsdejong Jan 5, 2022
3a2d400
Fixed custom column width issue
nielsdejong Jan 5, 2022
23b37e4
Fixed example documentation with new styling
nielsdejong Jan 5, 2022
732a718
Support rendering native and custom types in Data Grid (#54)
Jan 7, 2022
9485dd9
Resolved error with slow queries for single value reports
nielsdejong Jan 7, 2022
bb7f681
Graph nodes stick after dragging, added option to store fixed graph l…
nielsdejong Jan 8, 2022
b61526e
Added experimental graph layouts
nielsdejong Jan 9, 2022
9b548fa
Merge branch 'master' into develop
nielsdejong Jan 9, 2022
3c0c200
Started adding manual timeout config, property selection for rel type…
nielsdejong Jan 17, 2022
a2fe46b
Finalized config for custom timeouts
nielsdejong Jan 17, 2022
41e59b1
Fixed invalid lowercasing of share URL generation
nielsdejong Jan 18, 2022
d3ca876
Added new types of parameter selection reports (relationship/free text)
nielsdejong Jan 23, 2022
b6c22e0
Updated all dependencies to latest version, made project work with no…
Jan 24, 2022
2e0aa1a
Fixed typo
nielsdejong Jan 24, 2022
831c03a
Merge branch 'develop' of github.com:nielsdejong/neodash into develop
nielsdejong Jan 24, 2022
9b88b8c
Updated README
nielsdejong Jan 25, 2022
4f39931
Sync with new dockerfile changes
nielsdejong Jan 25, 2022
3215186
Clean up of dependencies, removed merge artifacts
nielsdejong Jan 25, 2022
8cb5b06
Default fullscreen option for reports, graphs fit to canvas automatic…
nielsdejong Jan 25, 2022
e8aba2d
Added tiny report sizes
nielsdejong Jan 25, 2022
ece2d17
Fixed graph hover to match other app styling
nielsdejong Jan 25, 2022
17e32f9
Resolved merge artifacts
nielsdejong Jan 25, 2022
ecc5b9f
Added maximizing of card settings
nielsdejong Jan 25, 2022
51bf482
Added transposing option for tables
nielsdejong Jan 25, 2022
39a743b
Optimized cypher editor
nielsdejong Jan 25, 2022
3042db0
Updated dockerfile and bash scripts
nielsdejong Jan 26, 2022
097e6dc
Fixed incorrect pagesizes for tables
nielsdejong Jan 26, 2022
22f2272
Added pie charts. Improved styling for graph inspection modals
nielsdejong Jan 26, 2022
dbf2d0a
Updated release notes and README. Fixed deploy to AWS script
nielsdejong Jan 26, 2022
be74100
Fixed npm publish script to match new code structure
nielsdejong Jan 26, 2022
a615712
Added time chart support for line charts. Minor styling tweaks for th…
nielsdejong Jan 30, 2022
defee96
WIP on SSO framework. Added auto-run disabled reports. Fixed bug when…
nielsdejong Feb 2, 2022
216012f
Fixed autorun setting for reports, rendering values in transposed col…
nielsdejong Feb 7, 2022
483ea03
Changed base image to node
nielsdejong Feb 7, 2022
2ad2472
Updated dockerfile to create a smaller, security-vetted image
nielsdejong Feb 8, 2022
7e2fb92
Added docker file for creating ad-hoc standalone deployments
nielsdejong Feb 9, 2022
77e9bd0
cleaned up docker build/run files
nielsdejong Feb 9, 2022
6ffc8c0
Changed example values for docker run scripts
nielsdejong Feb 9, 2022
940005b
Changed example values for docker run scripts
nielsdejong Feb 9, 2022
0afb459
Updated README, clean up docker scripts
nielsdejong Feb 10, 2022
523a716
Fixed docker files, line chart views
nielsdejong Feb 11, 2022
cb0a9a7
Added drilldown FAB to graph view
nielsdejong Feb 11, 2022
7a26a98
Updated default font size for single number reports
nielsdejong Feb 11, 2022
285fe07
Added saving/loading dashboards to/from different databases
nielsdejong Feb 11, 2022
77193b1
Enabled loading/saving/sharing dashboards from other databases
nielsdejong Feb 11, 2022
84b97bd
Rebase from Master
nielsdejong Feb 11, 2022
d6253b1
Fixed merge artifacts that broke collection rendering in tables
nielsdejong Feb 12, 2022
7fbc3cc
updated release notes, permissions on bash files
nielsdejong Feb 12, 2022
2d73122
Hotfix for config reading in Neo4j Desktop
nielsdejong Feb 12, 2022
3950369
Hotfix for missing config in Neo4j Desktop
nielsdejong Feb 12, 2022
830fa67
2.0.8 hotfix
nielsdejong Feb 12, 2022
ab20f74
Hotfix for missing configuration check in 2.0.7
nielsdejong Feb 12, 2022
00d77f1
Sync with hotfix master branch
nielsdejong Feb 12, 2022
6201084
Hotfix for broken custom values in transposed table views
nielsdejong Feb 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added drilldown FAB to graph view
  • Loading branch information
nielsdejong committed Feb 11, 2022
commit cb0a9a75e3aadec89f8e7c134964c866f8178788
63 changes: 37 additions & 26 deletions src/chart/GraphChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import { NeoGraphItemInspectModal } from '../modal/GraphItemInspectModal';
import LockIcon from '@material-ui/icons/Lock';
import LockOpenIcon from '@material-ui/icons/LockOpen';
import SettingsOverscanIcon from '@material-ui/icons/SettingsOverscan';
import { Card, CardContent, CardHeader, Tooltip } from '@material-ui/core';
import { Card, CardContent, CardHeader, Fab, Tooltip } from '@material-ui/core';
import Table from '@material-ui/core/Table';
import TableBody from '@material-ui/core/TableBody';
import TableCell from '@material-ui/core/TableCell';
import TableContainer from '@material-ui/core/TableContainer';
import TableRow from '@material-ui/core/TableRow';
import SearchIcon from '@material-ui/icons/Search';

const update = (state, mutations) =>
Object.assign({}, state, mutations)
Expand Down Expand Up @@ -67,6 +68,7 @@ const NeoGraphChart = (props: ChartProps) => {
const fixNodeAfterDrag = props.settings && props.settings.fixNodeAfterDrag !== undefined ? props.settings.fixNodeAfterDrag : true;
const layout = props.settings && props.settings.layout !== undefined ? props.settings.layout : "force-directed";
const lockable = props.settings && props.settings.lockable !== undefined ? props.settings.lockable : true;
const drilldownLink = props.settings && props.settings.drilldownLink !== undefined ? props.settings.drilldownLink : "";
const selfLoopRotationDegrees = 45;
const rightClickToExpandNodes = false; // TODO - this isn't working properly yet, disable it.
const defaultNodeColor = "lightgrey"; // Color of nodes without labels
Expand Down Expand Up @@ -224,35 +226,35 @@ const NeoGraphChart = (props: ChartProps) => {
}

const generateTooltip = (value) => {
const tooltip = <Card>

<b style={{padding: "10px"}}>
const tooltip = <Card>

{value.labels ? (value.labels.length > 0 ? value.labels.join(", ") : "Node") : value.type}
<b style={{ padding: "10px" }}>

{value.labels ? (value.labels.length > 0 ? value.labels.join(", ") : "Node") : value.type}
</b>

{Object.keys(value.properties).length == 0 ?
<i><br/>(No properties)</i> :
<TableContainer>
<Table size="small">
<TableBody>
{Object.keys(value.properties).map((key) => (
<TableRow key={key}>
<TableCell component="th" scope="row" style={{padding: "3px", paddingLeft: "8px"}}>
{key}
</TableCell>
<TableCell align={"left"} style={{padding: "3px", paddingLeft: "8px"}}>
{(value.properties[key].toString().length <= 30) ?
value.properties[key].toString() :
value.properties[key].toString().substring(0, 40) + "..."}
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer> }
<i><br />(No properties)</i> :
<TableContainer>
<Table size="small">
<TableBody>
{Object.keys(value.properties).map((key) => (
<TableRow key={key}>
<TableCell component="th" scope="row" style={{ padding: "3px", paddingLeft: "8px" }}>
{key}
</TableCell>
<TableCell align={"left"} style={{ padding: "3px", paddingLeft: "8px" }}>
{(value.properties[key].toString().length <= 30) ?
value.properties[key].toString() :
value.properties[key].toString().substring(0, 40) + "..."}
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>}


</Card>;
return ReactDOMServer.renderToString(tooltip);
}
Expand Down Expand Up @@ -323,6 +325,15 @@ const NeoGraphChart = (props: ChartProps) => {
}} style={{ fontSize: "1.3rem", opacity: 0.6, bottom: 12, right: 12, position: "absolute", zIndex: 5 }} color="disabled" fontSize="small"></LockOpenIcon>
</Tooltip>
) : <></>}
{drilldownLink !== "" ?
<a href={drilldownLink} target="_blank">
<Fab style={{ position: "absolute", backgroundColor: "steelblue", right: "15px", zIndex: 50, top: "5px" }} color="primary" size="small" aria-label="search">
<Tooltip title="Investigate" aria-label="">
<SearchIcon />
</Tooltip>
</Fab>
</a> : <></>}

<ForceGraph2D
ref={fgRef}
width={width ? width - 10 : 0}
Expand Down
5 changes: 5 additions & 0 deletions src/config/ReportConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ export const REPORT_TYPES = {
values: [true, false],
default: true
},
"drilldownLink": {
label: "Drilldown Icon Link",
type: SELECTION_TYPES.TEXT,
default: ""
},
"hideSelections": {
label: "Hide Property Selection",
type: SELECTION_TYPES.LIST,
Expand Down