Merge branch 'magjac:master' into master

Author: ba-tno

.gitignore

@@ -25,3 +25,6 @@ yarn.lock
 # generated files
 src/shapes.js
 src/dotParser.js
+
+coverage-cypress
+coverage-jest

CHANGELOG.md

@@ -7,16 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+ * Add a snackbar add a Snackbar showing when the application has been updated and if the underlying Graphviz version has been updated or not.
+ * Make the version in the about dialog a link to the version in CHANGELOG.md.
  * Bundle @hpcc-js/wasm instead of loading from unpkg
  * Upgraded d3-graphviz to version 3.0.6, thereby upgrading @hpcc-js-/wasm to version 0.3.13, thereby upgrading Graphviz to version 2.44.0.
  * Added "Export as SVG" to main menu (thanks @pRizz).
 
-## [0.6.4]
+## [0.6.4] - 2020-04-29
 ### Fixed
 * Drawing edges or inserting nodes does not work in production bundle #139
 * Navigating back to the referring page after URL import requires clicking back twice in the browser #155
 
-## [0.6.3]
+## [0.6.3] - 2020-04-09
 ### Changed
 * Upgraded [d3-graphviz](https://gitlab.com/magjac/d3-graphviz) to version [3.0.5](https://github.com/magjac/d3-graphviz/blob/master/CHANGELOG.md#305) thereby replacing [Viz.js](https://github.com/mdaines/viz.js/) with [@hpcc-js/wasm](https://github.com/hpcc-systems/hpcc-js-wasm).
 * Upgraded [Graphviz](https://gitlab.com/graphviz/graphviz) to version [2.42.4](https://gitlab.com/graphviz/graphviz/-/releases/2.42.4) through [@hpcc-js/wasm](https://github.com/hpcc-systems/hpcc-js-wasm) version [0.3.11](https://github.com/hpcc-systems/hpcc-js-wasm/releases/tag/v0.3.11), including fixes for:
@@ -30,7 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 0.6.2
 Never released
 
-## [0.6.1]
+## [0.6.1] - 2020-01-03
 ### Fixed
 * Module not found: Can't resolve './DoYouWantToDeleteDialog'. #93
 * Stuck at "Starting the development server". #95
@@ -40,7 +42,7 @@ Never released
 * Ctrl- or Shift-click the canvas deselects already selected components. #107
 * Unselected components are not cleared in text editor. #108
 
-## [0.6.0]
+## [0.6.0] - 2018-10-01
 ### Added
 * Export as URL. Generates a link to the application with the DOT source code as an URL parameter.
 * Specification of the DOT source code through a URL parameter. #69
@@ -162,7 +164,7 @@ Never released
   * Mouse interactions
 
 [Unreleased]: https://github.com/magjac/graphviz-visual-editor/compare/v0.6.4...HEAD
-[0.6.4]: https://github.com/magjac/graphviz-visual-editor/compare/v0.6.3...v0.6.3
+[0.6.4]: https://github.com/magjac/graphviz-visual-editor/compare/v0.6.3...v0.6.4
 [0.6.3]: https://github.com/magjac/graphviz-visual-editor/compare/v0.6.1...v0.6.3
 [0.6.1]: https://github.com/magjac/graphviz-visual-editor/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/magjac/graphviz-visual-editor/compare/v0.5.0...v0.6.0

Makefile

@@ -1,5 +1,8 @@
 GENERATED_FILES = \
+	src/graphvizVersion.js \
+	src/graphviz-versions.json \
 	src/shapes.js \
+	src/versions.json \
 	readme.html \
 	changelog.html \
 	src/dotParser.js \
@@ -12,13 +15,25 @@ src/shapes.js: bin/generate-nodes.js
 	bin/generate-nodes.js > tmp.js
 	mv tmp.js $@
 
+src/graphvizVersion.js: bin/generate-graphviz-version.js
+	bin/generate-graphviz-version.js > tmp.js
+	mv tmp.js $@
+
+src/versions.json: CHANGELOG.md bin/generate-versions.py
+	bin/generate-versions.py CHANGELOG.md > tmp.js
+	mv tmp.js $@
+
+src/graphviz-versions.json: graphviz/CHANGELOG.md bin/generate-versions.py
+	bin/generate-versions.py graphviz/CHANGELOG.md > tmp.js
+	mv tmp.js $@
+
 src/dotParser.js: src/dotGrammar.pegjs
 	node_modules/.bin/pegjs $< tmp.js
 	echo "/* eslint-disable */" | cat - tmp.js > tmp2.js
 	mv tmp2.js $@
 	rm tmp.js
 
-graphviz:
+graphviz graphviz/CHANGELOG.md:
 	git clone --depth 1 https://gitlab.com/graphviz/graphviz.git
 
 dots parse-all-graphviz-dots: dotfiles.txt
@@ -27,7 +42,7 @@ dots parse-all-graphviz-dots: dotfiles.txt
 	  ./bin/dotparser.js < $$dotfile > `dirname $$dotfile`/`basename $$dotfile .dot`.json; \
 	done
 
-dotfiles.txt:
+dotfiles.txt: graphviz
 	find graphviz -name '*.dot' | egrep -v "(nullderefrebuildlist\.dot|^graphviz/rtest/.*)$$" > $@
 
 readme: readme.html

bin/generate-graphviz-version.js

@@ -0,0 +1,26 @@
+#! /usr/bin/env node
+
+var hpccWasm = require("@hpcc-js/wasm/dist");
+var fs_promises = require("fs").promises;
+
+global.fetch = function (filename) {
+  return fs_promises.open(filename, 'r').then((filehandle) => {
+    return filehandle.readFile().then(data => {
+      return {
+        ok: true,
+        arrayBuffer: () => data,
+      };
+    });
+  });
+}
+
+global.document = {
+  "currentScript": {
+    src: './node_modules/@hpcc-js/wasm/dist/index.js'
+  }
+};
+
+hpccWasm.graphvizVersion().then(graphvizVersion => {
+  console.log(`const graphvizVersion = "${graphvizVersion}";`);
+  console.log('export {graphvizVersion};');
+});

bin/generate-versions.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+"""generator of versions JSON file from a CHANGELOG.md file"""
+
+import json
+import re
+import sys
+from typing import List
+
+def main(args: List[str]) -> int: # pylint: disable=missing-function-docstring
+
+  with open(args[1]) as fp:
+    versions = {}
+    for  line in fp:
+      mo = re.match("## \[([0-9][^\]]*)] [-–] (.*)$", line)
+      if mo:
+        version = mo.group(1)
+        release_date = mo.group(2)
+        versions[version] = {"release_date": release_date}
+
+  print(json.dumps(versions, indent=4))
+
+  return 0
+
+if __name__ == "__main__":
+  sys.exit(main(sys.argv))

cypress/integration/rendering.spec.js

@@ -55,7 +55,7 @@ describe('Basic rendering from DOT source', function() {
         switch (engine) {
         case 'circo':
           cy.wrap(graph0).invoke('height').should('eq', 58.666656494140625);
-          cy.wrap(graph0).invoke('width').should('eq', 264.21337890625);
+          cy.wrap(graph0).invoke('width').should('eq', 264.2266845703125);
           break;
         case 'dot':
           cy.wrap(graph0).invoke('height').should('eq', 154.66665649414062);
@@ -71,7 +71,7 @@ describe('Basic rendering from DOT source', function() {
           break;
         case 'osage':
           cy.wrap(graph0).invoke('height').should('eq', 58.666656494140625);
-          cy.wrap(graph0).invoke('width').should('eq', 173.693359375);
+          cy.wrap(graph0).invoke('width').should('eq', 172.3599853515625);
           break;
         case 'patchwork':
           cy.wrap(graph0).invoke('height').should('eq',70.29330444335938);

cypress/support/commands.js

@@ -1,16 +1,21 @@
+import packageJSON from '../../package.json';
+
 Cypress.Commands.add("startApplication", (options) => {
+  localStorage.setItem('version', packageJSON.version);
   cy.visit('http://localhost:3000/', options);
   cy.waitForTransition();
 });
 
 Cypress.Commands.add("startCleanApplication", (options) => {
   localStorage.setItem('dotSrc', 'digraph {}');
+  localStorage.setItem('version', packageJSON.version);
   cy.visit('http://localhost:3000/', options);
   cy.canvasGraph().should('exist');
 });
 
 Cypress.Commands.add("startApplicationWithDotSource", (dotSrc, options) => {
   localStorage.setItem('dotSrc', dotSrc);
+  localStorage.setItem('version', packageJSON.version);
   cy.visit('http://localhost:3000/', options);
   cy.canvasGraph().should('exist');
 });