Skip to content

Commit 1b33524

Browse files
nielsdejongBennuFireTkrogholtTKQTHåkan Löfqvist
authored
Reverse PR to sync master with develop (#222)
* 2.1.6 Release (#211) * Added Hotfix for broken map visualization (#184) * Added Sankey charts, improved docs and tests (#189) * Sankey 0.1 * Sankey 0.9 with Docs * Included package-lock in repository. Fixed gitignore and webpack.config.js * Updated docs * Added test for sankey chart. Updated docs in various places. Handling of empty sankey charts without weights Co-authored-by: Niels de Jong <[email protected]> * Fixed flaky behaviour in parameter selection (#192) * Fixed flaky behaviour in parameter selection * Extended parameter select to support: custom # suggestions, optional case-sensitiveness, custom search types, and turn of deduplications * Updated version to 2.1.5 * Updated docs publish trigger * Update develop-deployment.yml * Refactored package.json to support yarn instead of npm (#199) * Replaced npm scripts by yarn, fixed issues in package.json * Upversioning some old dependencies * Bumped node version for test environment * Added extensions for table report, optional markdown descriptions (pop-ups), deep-linking pages and line-chart customizations (#196) * Added doubleclick = copy action to tables. Added description setting to all reports: * Added option to deep-link into a given pagenumber * Added rotation angles for line chart ticks * Updated docs for new extensions * Cycle detection (#206) * Cycle detection * Moving deps * Added support for default values in parameter select (#200) * Added setting to customize a map provider for map visualizations (#201) * Adding Radar Charts (#207) * Radar 0.1 * Radar 1.0 * Changed selection for radar chart * Removed old advanced config for radars * Bump docs version * Updated examples * Removed debug statements Co-authored-by: Niels de Jong <[email protected]> * 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]> * Updated release notes and changelog * Sunburst Child's color (#212) * Sunburst Child's color * Updated release notes and changelog * Merge * Fixed merge conflict Co-authored-by: Niels de Jong <[email protected]> Co-authored-by: BennuFire <[email protected]> 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: 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]> * Hotfix for broken deployment script * Hotfix for broken Dockerfile * Bump to version 2.1.7 to enable yarn-based packaging Co-authored-by: BennuFire <[email protected]> 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: 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 4825a86 commit 1b33524

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/master-deployment.yml

Lines changed: 3 additions & 3 deletions
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.6
74+
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.7
7575
build-npm:
7676
needs: build-test
7777
runs-on: ubuntu-latest
@@ -88,7 +88,7 @@ jobs:
8888
- run: yarn install
8989
- run: yarn run build
9090
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
91-
- run: yarn pack
91+
- run: npm pack
9292
- run: rm -rf target
9393
- run: mkdir target
9494
- run: mv *.tgz target/
@@ -100,7 +100,7 @@ jobs:
100100
- run: npx @neo4j/code-signer --app ./package --private-key neo4j-labs-app.pem --cert neo4j-labs-app.cert --passphrase ${{ secrets.NEO4J_DESKTOP_PASSPHRASE }}
101101
- run: echo "${{ secrets.NEO4J_DESKTOP_CERTIFICATE }}" > neo4j_desktop.cert
102102
- run: npx @neo4j/code-signer --verify --app ./package --root-cert neo4j_desktop.cert
103-
- run: cd package && yarn pack
103+
- run: cd package && npm pack
104104
- run: mv package/*.tgz .
105105
- run: rm -rf package
106106
- run: tar xvf *.tgz package

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.6"
41+
LABEL version="2.1.7"

changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## NeoDash 2.1.6
1+
## NeoDash 2.1.6 & 2.1.7
22
New features:
33
- Added *Radar Charts/Spider Charts*.
44
- Added optional markdown description for each report, to be displayed via the header.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neodash",
3-
"version": "2.1.6",
3+
"version": "2.1.7",
44
"description": "NeoDash - Neo4j Dashboard Builder",
55
"neo4jDesktop": {
66
"apiVersion": "^1.2.0"

release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## NeoDash 2.1.6
1+
## NeoDash 2.1.6 & 2.1.7
22
New features:
33
- Added *Radar Charts/Spider Charts*.
44
- Added optional markdown description for each report, to be displayed via the header.

src/modal/AboutModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import BugReportIcon from '@material-ui/icons/BugReport';
1212

1313
export const NeoAboutModal = ({ open, handleClose, getDebugState }) => {
1414
const app = "NeoDash - Neo4j Dashboard Builder";
15-
const version = "2.1.6";
15+
const version = "2.1.7";
1616

1717
const downloadDebugFile = () => {
1818
const element = document.createElement("a");

0 commit comments

Comments
 (0)