Reverts direct pushes to master

Author: cesaragv

front-end/__tests__/components/CustomNode/__snapshots__/GraphView.test.js.snap

@@ -21,7 +21,7 @@ Object {
       tabindex="-1"
     >
       <div
-        class="modal-dialog GraphView modal-dialog-centered"
+        class="modal-dialog modal-dialog-centered"
         role="document"
       >
         <div
@@ -36,21 +36,6 @@ Object {
               <b />
                View
             </div>
-            <button
-              class="close"
-              type="button"
-            >
-              <span
-                aria-hidden="true"
-              >
-                ×
-              </span>
-              <span
-                class="sr-only"
-              >
-                Close
-              </span>
-            </button>
           </div>
           <div
             class="modal-body"
@@ -68,7 +53,6 @@ Object {
             </button>
             <button
               class="btn btn-secondary"
-              disabled=""
               type="button"
             >
               Load

front-end/__tests__/components/CustomNode/__snapshots__/NodeConfig.test.js.snap

@@ -21,7 +21,7 @@ Object {
       tabindex="-1"
     >
       <div
-        class="modal-dialog NodeConfig modal-dialog-centered"
+        class="modal-dialog modal-dialog-centered"
         role="document"
       >
         <div

front-end/babel.config.js

@@ -4,7 +4,6 @@ module.exports = {
   ],
   plugins: [
     "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-export-default-from"
+    "@babel/plugin-proposal-class-properties"
   ],
 };

front-end/package-lock.json

@@ -33,9 +33,25 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "jest --collect-coverage --passWithNoTests --no-cache",
+    "test": "jest --collect-coverage --passWithNoTests",
     "eject": "react-scripts eject"
   },
+  "jest": {
+    "coverageThreshold": {
+      "global": {
+        "branches": 80,
+        "functions": 80,
+        "lines": 80,
+        "statements": 80
+      }
+    },
+    "moduleNameMapper": {
+      "\\.(css|less)$": "<rootDir>/__mocks__/css/styleMock.js"
+    },
+    "setupFilesAfterEnv": [
+      "./setupTests.js"
+    ]
+  },
   "eslintConfig": {
     "extends": "react-app"
   },
@@ -53,10 +69,8 @@
   },
   "proxy": "http://back-end:8000",
   "devDependencies": {
-    "@babel/plugin-proposal-export-default-from": "^7.8.3",
     "@babel/preset-env": "^7.9.5",
     "@babel/preset-react": "^7.9.4",
-    "jest-canvas-mock": "^2.2.0",
     "react-test-renderer": "^16.13.1"
   }
 }

front-end/package.json

@@ -1,2 +1,2 @@
-import 'jest-canvas-mock';
+
 import 'regenerator-runtime/runtime'

front-end/setupTests.js

@@ -0,0 +1,39 @@
+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<React.KeyboardEvent>) => {
+				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();
+						}
+					}
+				}
+			}
+		});
+	}
+}

front-end/src/components/CustomAction/CustomDeleteItemsAction.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { VegaLite } from 'react-vega';
-import { Spinner } from 'react-bootstrap';
+import { Roller } from 'react-spinners-css';
 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 = (<Spinner animation="border" />);
+          body = (<Roller color="black" />);
       } else if (this.state.data.length < 1) {
           // Print message to load respective table/graph
           if (this.props.node.options.node_type === "visualization") {

front-end/src/components/CustomNode/GraphView.js

@@ -9,9 +9,6 @@ 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")) {