Skip to content

Commit 8c4ad8d

Browse files
nielsdejongTkrogholtTKQTHåkan Löfqvistmariusconjeaud
authored
Restructuring Record Mapper Architecture (#193)
* Stability fixes for 2.0.11 * Added prototype SSO implementation * Changed dockerfile usage from ENV to ARG (#93) * Stability fixes for 2.0.11 (#76) Fix for rendering dictionaries in tables/single value charts. Added resize handler for fullscreen map views. Added missing auto-run config to pie charts. Fixed broken value scale parameter for bar charts. * Changed dockerfile usage from ENV to ARG Also using CMD as opposed to ENTRYPOINT * Updated supporting docker scripts * Renamed docker run scripts, deleted docker-build.bash * Changed dockerfile usage from ENV to ARG Also using CMD as opposed to ENTRYPOINT * Updated supporting docker scripts * Renamed docker run scripts, deleted docker-build.bash * Updated README to match new Docker image setup Co-authored-by: Niels de Jong <[email protected]> Co-authored-by: Tobias <[email protected]> * Added color selector component. Clean up/refactoring of file names * Tweaking of color picker for advanced settings, added framework for rule-based styling of reports * Clean up, refactoring of project structure * Added version number to Dockerfile * Moved version number in docker file to before RUN command * Added some more comments to the docker scripts * Restructured scripts and docker file locations, added conf.d * Added conf.d directory * Updated version number and Dockerfile references * updated path to conf.d * Updated version number in dockerfile * First version of rule-based styling is completed * Fixed handling of nginx configuration file (#98) * Remedied errors in handling of nginx configs * Adjusted copy of default.conf Co-authored-by: Tobias Krøgholt <[email protected]> * Update Dockerfile * Update Dockerfile * Improved handling of null values in tables * Added support for custom style rules to relevant report types * Removed standalone password from default configuration * Fixed default styling for config.json * Updated release notes, readme and docker push script for 2.0.12 * Updated description of component hierarchy * Set dockerfile to pull from master by default * Changed docker startup script to contain a message for the user * Updated dockerfile startup message * Fixed startup message in Dockerfile * Corrected null check for table rendering * Better null handling for rule based evaluation in tables * Cleanup of code documentation * Updated documentation * Clean up of comments * Work in progress on drag-and-drop dashboards/pages * Styling fixes for resizable layout * Styling for drag-and-drop pages/reports. Bumped version to 2.1 * Fixed icon for card settings * WIP on the drag-and-drop dashboard header * WIP on drag-and-drop page reordering * Added support for loading dashboards from a relative URL in standalone mode * Hotfix for broken demo dashboard * Refactoring dashboard header code * Controlled drag-and-drop state for dashboards * Drag-and-drop layout for pages with dynamic add-card placement * Tweaking style for the new resizable reports * Bump to 2.0.15. Added option to replace dashboard parameters in Markdown and iFrame strings * added html to image to lib * Tweaking the resizeable report/page view * W.I.P. on downloading reports/dashboard as image * Style tweaks * Added button to download entire dashboard as an image * Updated release notes for 2.0.15 * Dockerfile - Configuration through env variables at runtime (#125) * Configuration throug env variables - Env variables can now be used to define the contents of config.json (when the container starts) - Added tips for setting up single sign on * Cleanup of Dockerfile and README * Removed temporary files * Bumped version number Co-authored-by: Håkan Löfqvist <[email protected]> * Updated release notes * Updated README on Docker deployments * Add bar chart report ; add catch for when a dashboard is cached * Finish rebasing from 2.0.15 * Added pie chart report and generalized report testing * Added auto-position of add card button * Added dashboard upgrading from 2.0 --> 2.1 * Clean up. Added help modal for reports * Added Hierarchical Charts (#124) * Added extra option (standalone dashboard by URL to build config * WIP on dockerfile * Reverted back to old Docker config * Fixed import for react-color-picker, clean up Dockerfile * Updated material-ui-color-picker dependency * Report updates base on global params Disable refresh when a global parameter is changed that is not used in the report * Update CardView.tsx Removing extra logs * Hierarchical Charts Hierarchical Charts Added Pie Chart Options added Pie Chart Percentage Default true * Added extra option (standalone dashboard by URL to build config * WIP on dockerfile * Reverted back to old Docker config * Fixed import for react-color-picker, clean up Dockerfile * Updated material-ui-color-picker dependency * Update CardView.tsx Removing extra logs * Hierarchical Charts Hierarchical Charts Added Pie Chart Options added Pie Chart Percentage Default true * Added extra option (standalone dashboard by URL to build config * Merge * Reverted back to old Docker config * Merge * Updated material-ui-color-picker dependency * Added missing line in Dockerfile * Icon + quick fix Fixes base on comments * Added comments to describe functionality * Fixed comments on PR review for hierarchy reports * Updated Dockerfile and package.json * Removed console.log Co-authored-by: Niels de Jong <[email protected]> * Fixed button style of reset for hierarchy reports * Removed legacy docker scripts * Removed temporary logging * Removed editable button for non-editable cards * Clean up of card settings * Fixed bug where code-editor will duplicate text * Added auto upgrade of cached dashboard version * added new query + 3 new testcases * added a few more tests and also some code to make testing easier * Fixed bug where the code editor didn't update internal state after pasting * Update README.md * Update README.md * Update README.md * Finalized cypress tests * testing GH actions * testing GH actions * Removed CD experiment * Fixed upload S3 script - revert * Added CD config * Fixed case-sensentive import error * Docs and Small Fixes Docs on hierarchical reports. Fix on restart button Fix on lodash names * Fixed description text for hierarhical charts examples * added small change to run test in the background * added githhub action for cypress * syntax changes * small modification 2.0 * wait-on mod * renamed the deploy to develop and created a master with docker * small master docker test on dev * docker-ready * syntax fix * deleted develop for test purpose * syntax fix * syntax fix final * added dependency between different jobs * Fixed typos in in-app docs * removed 2 files + test to publish npm * mod * made changes * added npm install * modified stuff * take 345 * take 346 * take 347 * take 348 * take 349 * take 350 * take 351 * take 351 * added develop-deployment.yml and new stuff(still master pulls develop) + removed publish-package-npm.bash * Tweaked workaround for paste+replace bug in codemirror * Fixed bug where iFrame URL does not get replaced by parameters if it's the only text in the page. Fixed bug where minimizing card settings results in a glitched page layout * Changed the 'save as image' library * Added google site tracker * Code cleanup, added comments * Downgraded mui data grid * Downgrade mui datagrid * Removed video generation from .cypress.json, fixed workflows, reverted index.html * Updated workflows * Fix bug where neodash will ask you to clear a dashboard when none exists * Fixed bug where editing the vertical alignment of a single value caused the number to clip * Added placeholder for docs * Updated cypress test to work better on GitHub test VM's. Added placeholder for new adocs * Added warning handler for Cypress * Removed it.only from Cypress IT * Fixed cypress test to reflect new cached dashboard changes * Updated GitHub workflows, added small wait after entering URL to allow for Redux cache sync * Added publish to npm step. Removed debug settings. * Fixed error in workflow definition * Added changelog, release-notes, final fixes to CI/CD pipeline, style fix for parameter selectors * Fixed release notes * Final tweaks to workflows & changelog * Updated cypress stress test to wait for loading the stress dashboards * Fixed flaky test in Cypress stress test * Feature/rebase 2.1 master (#139) * 2.1 Release (#131) ## NeoDash 2.1 The 2.1 release is a major update to the NeoDash application. Main updates: - Added new drag-and-drop dashboard layout - reports can be **moved** and **resized** freely within the dashboard. - Updated dashboard file format for new layout (2.0 dashboards are automatically migrated). - Pages can now be reordered by dragging and dropping. - Added three new hierarchical report types: - Treemaps - Sunburst Charts - Circle Packing Charts - Styling/usability improvements for pie charts. - Improved image download (screenshot functionality) for all report types. - Parameter select reports now resize the selector to fit the available space. Other changes: - Added continuous integration and deployment workflows. - Created a new [User Guide](https://github.com/nielsdejong/neodash/wiki/User-Guide) with documentation on all report customizations is available. - Added a new [Developer Guide](https://github.com/nielsdejong/neodash/wiki/Developer-Guide) with info on installing, building and extending the application. * Bumped version new to fix npm signature * Fixed npm publish command in workflow * Reverse Pull-Request to sync develop with master (#141) * 2.1 Release (#131) ## NeoDash 2.1 The 2.1 release is a major update to the NeoDash application. Main updates: - Added new drag-and-drop dashboard layout - reports can be **moved** and **resized** freely within the dashboard. - Updated dashboard file format for new layout (2.0 dashboards are automatically migrated). - Pages can now be reordered by dragging and dropping. - Added three new hierarchical report types: - Treemaps - Sunburst Charts - Circle Packing Charts - Styling/usability improvements for pie charts. - Improved image download (screenshot functionality) for all report types. - Parameter select reports now resize the selector to fit the available space. Other changes: - Added continuous integration and deployment workflows. - Created a new [User Guide](https://github.com/nielsdejong/neodash/wiki/User-Guide) with documentation on all report customizations is available. - Added a new [Developer Guide](https://github.com/nielsdejong/neodash/wiki/Developer-Guide) with info on installing, building and extending the application. * 2.1.1 - npm signature hotfix (#140) Hotfix for npm signature signing * Added different npm registry syntax * Fixed Docker version number in deploy scripts * Reverse PR (#143) * 2.1.1 - npm signature hotfix (#140) Hotfix for npm signature signing * Added different npm registry syntax * Added step in workflow for injecting the deployment HTML file into the npm published package (#147) * Added GitHub issue templates (#145) * Added issue templates * Fixed issue template directory * Converted Wiki Docs to ASCII-doc, updating README (#146) * Converting docs to adoc * Renamed adoc files * Updated README. Updated Home page of the adocs to match labs standard * Added tags * Added screenshot * Fixed adoc spacing * Fixed styling on adoc files * Final adjustments to ASCIIdoc migration of the Wiki * Feature/add clone button to report (#150) * added a skeleton for the clone button feature * removed a comment * removed stuff and also added a new icon * Minor performance improvements on report cloning Co-authored-by: aleksandarneo4j <[email protected]> Co-authored-by: Bennu <[email protected]> Co-authored-by: Niels de Jong <[email protected]> * Fix on Hierarchical Charts (#151) * Renamed some variables * Renamed helper function Co-authored-by: Niels de Jong <[email protected]> * Several bug fixes for 2.1.2 (#148) * Made resize button more visible. Added docker environment variables for standaloneUsername and standalonePassword. Fixed width of card title headers for standalone mode. Fixed rendering issue for nullable columns in tables * Removed deprecated string parameters * Changed grid compaction type from horizontal to vertical * Bumped version number. Changed all GitHub references to new organization * Updated release notes * Re-enabled all IT tests * Added documentation portal in new and improved ASCIIdoc format (#156) * Created new documentation structure * Renamed navigation adoc fiel * Restructuring of documentation * Updated page structure * Added README for documentation directory, code to run docs locally * Restructring and cleaning up docs * Updated links and images in documentation portal * Renamed quickstart * Renamed quickstart in docs folder * Add bg color (#158) * Add bg color * Added some minor robustness to report background color, updated docs Co-authored-by: Vitor Horta <[email protected]> Co-authored-by: Niels de Jong <[email protected]> * Temporarily disabled flaky Cypress test (#161) * Added handling of share URL without password + better date handling for line charts (#162) * Added handling of special case where no password is provided in the share URL * Improved handling of date/datetime types for line charts * fixed the reszie issue + returned card to how it was before my chnages * Removed old docs * Restructuring * Re-architecting many things. Record mapper is now gone * Made bar charts/line charts work with the new architecture * bumped version number * Made bar charts stable with new architecture * Cont. development on restructuring w/o record mapper * Record mapper refactoring - bar/line/pie charts * Fixed sunburst to no longer use record mapper * Restructure treemap, choropleth, and circle packing to not use record mapper * Removed default (cached) selection from page state initialization * Added lockfile * Fix invalid merge * Fixed Radar chart to work without the record mapper * WIP on release notes * Added skeleton for tests * Merge Co-authored-by: Tkrogholt <[email protected]> Co-authored-by: Tobias <[email protected]> Co-authored-by: Håkan Löfqvist <[email protected]> Co-authored-by: Marius Conjeaud <[email protected]> Co-authored-by: BennuFire <[email protected]> Co-authored-by: aleksandarneo4j <[email protected]> Co-authored-by: MariusC <[email protected]> Co-authored-by: Aleksandar <[email protected]> Co-authored-by: Vitor Horta <[email protected]> Co-authored-by: Vitor Horta <[email protected]>
1 parent d6188fb commit 8c4ad8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+997
-1366
lines changed

.github/workflows/master-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
context: .
7272
file: ./Dockerfile
7373
push: true
74-
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.5
74+
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.6
7575
build-npm:
7676
needs: build-test
7777
runs-on: ubuntu-latest

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ RUN chown -R nginx:nginx /usr/share/nginx/html/
3838
USER nginx
3939
EXPOSE 5005
4040
HEALTHCHECK cmd curl --fail http://localhost:5005 || exit 1
41-
LABEL version="2.1.5"
41+
LABEL version="2.1.6"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ After building a dashboard, you can chose to deploy a read-only, standalone inst
3232

3333
## Questions / Suggestions
3434
If you have any questions about NeoDash, please reach out to the maintainers:
35-
- Create an [Issue](https://github.com/nielsdejong/neodash/issues/new) on GitHub for feature requests/bugs.
35+
- Create an [Issue](https://github.com/neo4j-labs/neodash/issues/new) on GitHub for feature requests/bugs.
3636
- Connect with us on the [Neo4j Discord](https://neo4j.com/developer/discord/).
3737
- Create a post on the Neo4j [Community Forum](https://community.neo4j.com/).
3838

cypress/integration/start_page.spec.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,15 @@ describe('NeoDash E2E Tests', () => {
170170
cy.get('main .react-grid-item:eq(2) .MuiCardContent-root h1').should('have.text', 'Hello')
171171
})
172172

173+
// it('creates a radar report', () => {
174+
// // TODO - create a test for radar.
175+
// })
176+
177+
178+
// it('creates a sankey report', () => {
179+
// // TODO - create a test for sankey charts.
180+
// })
181+
173182
// Test load stress-test dashboard from file
174183
// TODO - this test is flaky, especially in GitHub actions environment.
175184
it.skip('test load dashboard from file and stress test report customizations', () => {

docs/modules/ROOT/nav.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*** xref:user-guide/reports/sunburst.adoc[Sunburst]
1313
*** xref:user-guide/reports/circle-packing.adoc[Circle Packing]
1414
*** xref:user-guide/reports/treemap.adoc[Treemap]
15+
*** xref:user-guide/reports/radar.adoc[Radar Chart]
1516
*** xref:user-guide/reports/sankey.adoc[Sankey Chart]
1617
*** xref:user-guide/reports/map.adoc[Map]
1718
*** xref:user-guide/reports/choropleth.adoc[Choropleth]

docs/modules/ROOT/pages/user-guide/faq.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ When you’re done building a dashboard and want to show to others as a
4242
read-only web page, you can set up a link:standalone%20mode[Standalone
4343
Mode] deployment of NeoDash.
4444

45-
If you need help setting this up, please contact the
46-
mailto:[email protected][team] and we can help out.
45+
If you need help setting this up, please contact the NeoDash team.
4746

4847
== 4. Is NeoDash Production Ready?
4948

@@ -57,8 +56,7 @@ used.
5756
access to the right people. As a rule of thumb, you should give NeoDash
5857
access to the people that can also see Bloom.
5958

60-
For other questions regarding setting up your own production deployment,
61-
please mailto:[email protected][contact us].
59+
For other questions regarding setting up your own production deployment, contact the NeoDash team.
6260

6361
== 5. Can I use NeoDash with Neo4j Community Edition?
6462

@@ -73,7 +71,7 @@ issue on https://github.com/neo4j-labs/neodash/issues[Github]. Issues
7371
will be addressed on a best-effort basis.
7472

7573
If you’re looking for a specific feature with high priority, you can
76-
reach out to the mailto:[email protected][Neo4j Team].
74+
reach out to the Neo4j team.
7775

7876
== 7. How can I contribute to NeoDash myself?
7977

@@ -88,4 +86,4 @@ dashboard, let us know!
8886
== 8. Can I get professional help with NeoDash?
8987

9088
If you are interested in a services agreement to support your NeoDash deployment, please reach out to the
91-
mailto:niels.dejong@neo4j.com[Neo4j Services Team].
89+
https://neo4j.com/professional-services/[Neo4j Services Team].

docs/modules/ROOT/pages/user-guide/publishing.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ These three configurations must be set for NeoDash to be able to run in
3434
3. A hardcoded dashboard to load.
3535

3636
Technical details on setting this up are documented in the link:../../developer-guide/standalone-mode[Standalone
37-
Mode] page. If you need help setting this up, please reach out to the
38-
mailto:[email protected][Neo4j Team].
37+
Mode] page.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,11 @@ pages:
112112
- link:sunburst[Sunburst]
113113
- link:circle-packing[Circle Packing]
114114
- link:treemap[Treemap]
115+
- link:radar[Radar Chart]
115116
- link:map[Map]
117+
- link:choropleth[Choropleth Chart]
116118
- link:single-value[Single Value]
119+
- link:sankey[Sankey Chart]
117120
- link:raw-json[Raw JSON]
118121
- link:parameter-select[Parameter Select]
119122
- link:iframe[iFrame]

docs/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neodash",
3-
"version": "2.1.5",
3+
"version": "2.1.6",
44
"description": "NeoDash - Neo4j Dashboard Builder",
55
"neo4jDesktop": {
66
"apiVersion": "^1.2.0"
@@ -28,7 +28,7 @@
2828
"test-headless": "yarn cypress run"
2929
},
3030
"keywords": [],
31-
"author": "Niels de Jong",
31+
"author": "Neo4j Labs",
3232
"dependencies": {
3333
"@material-ui/core": "^4.12.3",
3434
"@material-ui/icons": "^4.11.2",

0 commit comments

Comments
 (0)