From 92b92d74374dc231bd991dc50ce1a7ab3ce6ec6d Mon Sep 17 00:00:00 2001 From: Cesar Agustin Garcia Vazquez Date: Mon, 11 May 2020 20:52:31 -0500 Subject: [PATCH 1/7] Updates NodeConfig's snapshot --- .../components/CustomNode/__snapshots__/NodeConfig.test.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/__tests__/components/CustomNode/__snapshots__/NodeConfig.test.js.snap b/front-end/__tests__/components/CustomNode/__snapshots__/NodeConfig.test.js.snap index 88e26d8..0697525 100644 --- a/front-end/__tests__/components/CustomNode/__snapshots__/NodeConfig.test.js.snap +++ b/front-end/__tests__/components/CustomNode/__snapshots__/NodeConfig.test.js.snap @@ -21,7 +21,7 @@ Object { tabindex="-1" >
Date: Mon, 11 May 2020 20:53:01 -0500 Subject: [PATCH 2/7] Removes unused file --- .../CustomAction/CustomDeleteItemsAction.js | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 front-end/src/components/CustomAction/CustomDeleteItemsAction.js diff --git a/front-end/src/components/CustomAction/CustomDeleteItemsAction.js b/front-end/src/components/CustomAction/CustomDeleteItemsAction.js deleted file mode 100644 index c5bb80b..0000000 --- a/front-end/src/components/CustomAction/CustomDeleteItemsAction.js +++ /dev/null @@ -1,39 +0,0 @@ -import * as _ from 'lodash' -import { Action, InputType } from '@projectstorm/react-canvas-core'; - -export interface CustomDeleteItemsActionOptions { - keyCodes?: number[]; -} - -/** - * Deletes all selected items, but asks for confirmation first - */ -export class CustomDeleteItemsAction extends Action { - constructor(options: CustomDeleteItemsActionOptions = {}) { - options = { - keyCodes: [46, 8], - ...options - }; - super({ - type: InputType.KEY_DOWN, - fire: (event: ActionEvent) => { - if (options.keyCodes.indexOf(event.event.keyCode) !== -1) { - const selectedEntities = this.engine.getModel().getSelectedEntities(); - if (selectedEntities.length > 0) { - const confirm = window.confirm('Are you sure you want to delete?'); - - if (confirm) { - _.forEach(selectedEntities, model => { - // only delete items which are not locked - if (!model.isLocked()) { - model.remove(); - } - }); - this.engine.repaintCanvas(); - } - } - } - } - }); - } -} From 64b5e09409c569c5b6a6883e205d247d65732f08 Mon Sep 17 00:00:00 2001 From: Cesar Agustin Garcia Vazquez Date: Mon, 11 May 2020 20:54:17 -0500 Subject: [PATCH 3/7] Changes Roller by Spinner from react-bootstrap --- front-end/src/components/CustomNode/GraphView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front-end/src/components/CustomNode/GraphView.js b/front-end/src/components/CustomNode/GraphView.js index c3316de..48198eb 100644 --- a/front-end/src/components/CustomNode/GraphView.js +++ b/front-end/src/components/CustomNode/GraphView.js @@ -1,6 +1,6 @@ import React from 'react'; import { VegaLite } from 'react-vega'; -import { Roller } from 'react-spinners-css'; +import { Spinner } from 'react-bootstrap'; import { Modal, Button } from 'react-bootstrap'; import propTypes from 'prop-types'; import { VariableSizeGrid as Grid } from 'react-window'; @@ -123,7 +123,7 @@ export default class GraphView extends React.Component { if (this.state.loading) { // Print loading spinner - body = (); + body = (); } else if (this.state.data.length < 1) { // Print message to load respective table/graph if (this.props.node.options.node_type === "visualization") { From 1948f383ff96304ea8587c494d6619ffb38c246a Mon Sep 17 00:00:00 2001 From: Cesar Agustin Garcia Vazquez Date: Mon, 11 May 2020 20:54:53 -0500 Subject: [PATCH 4/7] Fixes failing unit test --- front-end/src/components/VPPort/VPPortModel.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/front-end/src/components/VPPort/VPPortModel.js b/front-end/src/components/VPPort/VPPortModel.js index c72778d..668e514 100644 --- a/front-end/src/components/VPPort/VPPortModel.js +++ b/front-end/src/components/VPPort/VPPortModel.js @@ -9,6 +9,9 @@ export default class VPPortModel extends DefaultPortModel { } canLinkToPort(port) { + if (port == null) { + return false; + } // if connecting to flow port, make sure this is a flow port // and opposite of other's direction if (port.options.name.includes("flow")) { From ec24e0fc11de97ed9ab8b645cbe33389a4167e84 Mon Sep 17 00:00:00 2001 From: Cesar Agustin Garcia Vazquez Date: Mon, 11 May 2020 20:57:43 -0500 Subject: [PATCH 5/7] Installs jest-mock-canvas --- front-end/package-lock.json | 29 +++++++++++++++++++++++++++++ front-end/package.json | 1 + front-end/setupTests.js | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/front-end/package-lock.json b/front-end/package-lock.json index 7b30060..e70b956 100644 --- a/front-end/package-lock.json +++ b/front-end/package-lock.json @@ -4233,6 +4233,11 @@ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, + "cssfontparser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/cssfontparser/-/cssfontparser-1.2.1.tgz", + "integrity": "sha1-9AIvyPlwDGgCnVQghK+69CWj8+M=" + }, "cssnano": { "version": "4.1.10", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", @@ -7974,6 +7979,15 @@ } } }, + "jest-canvas-mock": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jest-canvas-mock/-/jest-canvas-mock-2.2.0.tgz", + "integrity": "sha512-DcJdchb7eWFZkt6pvyceWWnu3lsp5QWbUeXiKgEMhwB3sMm5qHM1GQhDajvJgBeiYpgKcojbzZ53d/nz6tXvJw==", + "requires": { + "cssfontparser": "^1.2.1", + "parse-color": "^1.0.0" + } + }, "jest-changed-files": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz", @@ -9895,6 +9909,21 @@ "safe-buffer": "^5.1.1" } }, + "parse-color": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz", + "integrity": "sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=", + "requires": { + "color-convert": "~0.5.0" + }, + "dependencies": { + "color-convert": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", + "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=" + } + } + }, "parse-json": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", diff --git a/front-end/package.json b/front-end/package.json index 64507d6..810eab2 100644 --- a/front-end/package.json +++ b/front-end/package.json @@ -13,6 +13,7 @@ "closest": "0.0.1", "dagre": "^0.8.5", "jest": "24.9.0", + "jest-canvas-mock": "^2.2.0", "jquery": "^3.4.1", "mathjs": "^6.6.1", "pathfinding": "^0.4.18", diff --git a/front-end/setupTests.js b/front-end/setupTests.js index ec9a12c..6cc7def 100644 --- a/front-end/setupTests.js +++ b/front-end/setupTests.js @@ -1,2 +1,2 @@ - +import 'jest-canvas-mock' import 'regenerator-runtime/runtime' From 45411972c85f29b32f85d4023356d17d5a829a35 Mon Sep 17 00:00:00 2001 From: Cesar Agustin Garcia Vazquez Date: Mon, 11 May 2020 20:58:26 -0500 Subject: [PATCH 6/7] Updates GraphView's snapshot --- .../__snapshots__/GraphView.test.js.snap | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/front-end/__tests__/components/CustomNode/__snapshots__/GraphView.test.js.snap b/front-end/__tests__/components/CustomNode/__snapshots__/GraphView.test.js.snap index 7294c1f..5689ab7 100644 --- a/front-end/__tests__/components/CustomNode/__snapshots__/GraphView.test.js.snap +++ b/front-end/__tests__/components/CustomNode/__snapshots__/GraphView.test.js.snap @@ -21,7 +21,7 @@ Object { tabindex="-1" >
View
+