Merge pull request #155 from neo4j-contrib/feature/merge-configuration

Merge Vis config with default

Author: thebestnom

.eslintrc.yml

@@ -1,4 +1,4 @@
-parser: babel-eslint
+parser: "@babel/eslint-parser"
 env:
   browser: true
   es6: true
@@ -10,7 +10,7 @@ globals:
   Atomics: readonly
   SharedArrayBuffer: readonly
 parserOptions:
-  ecmaVersion: 2018
+  ecmaVersion: 2020
   sourceType: module
 plugins:
   - jest

.github/workflows/CI.yml

@@ -1,20 +1,18 @@
 name: CI
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 jobs:
   build:
     name: Lint Test and Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: borales/actions-yarn@v2.0.0
+      - name: Setup node
+        uses: actions/setup-node@v2
         with:
-          cmd: install
-      - uses: borales/actions-yarn@v2.0.0
-        with:
-          cmd: eslint
-      - uses: borales/actions-yarn@v2.0.0
-        with:
-          cmd: test
-      - uses: borales/actions-yarn@v2.0.0
-        with:
-          cmd: build
+          node-version: "14"
+      - run: yarn install
+      - run: yarn eslint
+      - run: yarn test
+      - run: yarn build

dist/neovis-without-dependencies.js

@@ -0,0 +1,23 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+/*! Hammer.JS - v2.0.17-rc - 2019-12-16
+ * http://naver.github.io/egjs
+ *
+ * Forked By Naver egjs
+ * Copyright (c) hammerjs
+ * Licensed under the MIT license */
+
+/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */

dist/neovis-without-dependencies.js.map

@@ -38,9 +38,11 @@
 		function draw() {
 			var config = {
 				container_id: 'viz',
-				server_url: 'bolt://34.201.68.240:38312',
-				server_user: 'neo4j',
-				server_password: 'gland-presentation-worry',
+                neo4j: {
+					server_url: 'bolt://localhost:7687',
+					server_user: 'neo4j',
+					server_password: 'gland-presentation-worry',
+				},
 				labels: {
 					//"Character": "name",
 					'Character': {

dist/neovis.js

@@ -1,6 +1,5 @@
-import { DataSet } from "vis-data";
-import { Node as VisNode, Edge as VisEdge } from "vis-network";
-import { Node as Neo4jNode, Relationship as Neo4jRelationship } from "neo4j-driver";
+import {Node as VisNode, Edge as VisEdge, Options as visNetworkOptions, DataSet, Network} from "vis-network";
+import { Node as Neo4jNode, Relationship as Neo4jRelationship, Driver as Neo4jDriver } from "neo4j-driver";
 
 export const NEOVIS_DEFAULT_CONFIG: unique symbol;
 export const NEOVIS_ADVANCED_CONFIG: unique symbol;
@@ -31,10 +30,15 @@ export interface IRelationshipConfig extends RecursiveMapTo<VisEdge, string>{
 
 export interface INeovisConfig {
     container_id: string;
-    server_url: string;
-    server_user: string;
     server_database: string;
-    server_password: string;
+    neo4j: Neo4jDriver | {
+        server_url: string;
+        server_user: string;
+        server_password: string;
+        encrypted?: "ENCRYPTION_OFF" | "ENCRYPTION_ON";
+        trust?: "TRUST_ALL_CERTIFICATES" | "TRUST_SYSTEM_CA_SIGNED_CERTIFICATES";
+    };
+    visConfig: visNetworkOptions;
     labels?: {
         [label: string]: ILabelConfig,
         [NEOVIS_DEFAULT_CONFIG]?: IRelationshipConfig
@@ -43,13 +47,8 @@ export interface INeovisConfig {
         [relationship: string]: IRelationshipConfig,
         [NEOVIS_DEFAULT_CONFIG]?: IRelationshipConfig
     };
-    arrows?: boolean;
-    hierarchical?: boolean;
-    hierarchical_sort_method?: "hubsize" | "directed";
     initial_cypher?: string;
     console_debug?: boolean;
-    encrypted?: "ENCRYPTION_OFF" | "ENCRYPTION_ON";
-    trust?: "TRUST_ALL_CERTIFICATES" | "TRUST_SYSTEM_CA_SIGNED_CERTIFICATES";
 }
 
 export interface INode extends VisNode {
@@ -64,6 +63,7 @@ declare class Neovis {
     constructor(config: INeovisConfig);
     get nodes(): DataSet<INode>;
     get edges(): DataSet<IEdge>;
+    get network(): Network;
     render(): void;
     clearNetwork(): void;
     registerOnEvent(eventType: string, handler: (event: any) => void): void;

dist/neovis.js.LICENSE.txt

@@ -36,32 +36,32 @@
   },
   "homepage": "https://github.com/neo4j-contrib/neovis.js#readme",
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.4",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
-    "babel-eslint": "^10.0.3",
-    "babel-loader": "^8.0.6",
-    "cross-env": "^7.0.0",
-    "css-loader": "^3.4.2",
-    "eslint": "^6.8.0",
-    "eslint-plugin-jest": "^23.6.0",
-    "file-loader": "^5.0.2",
-    "jest": "^26.6.2",
-    "jest-canvas-mock": "^2.2.0",
+    "@babel/cli": "^7.12.13",
+    "@babel/core": "^7.12.13",
+    "@babel/eslint-parser": "^7.12.13",
+    "@babel/plugin-proposal-class-properties": "^7.12.13",
+    "@babel/plugin-transform-runtime": "^7.12.15",
+    "@babel/preset-env": "^7.12.13",
+    "babel-loader": "^8.2.2",
+    "cross-env": "^7.0.3",
+    "css-loader": "^5.0.1",
+    "eslint": "^7.19.0",
+    "eslint-plugin-jest": "^24.1.3",
+    "file-loader": "^6.2.0",
+    "jest": "^26.6.3",
+    "jest-canvas-mock": "^2.3.1",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.1",
-    "style-loader": "^1.1.3",
-    "url-loader": "^3.0.0",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.10"
+    "rimraf": "^3.0.2",
+    "style-loader": "^2.0.0",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.21.2",
+    "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.8.4",
+    "@babel/runtime-corejs3": "^7.12.13",
+    "deepmerge": "^4.2.2",
     "neo4j-driver": "^4.1.0",
-    "vis-data": "^7.0.0",
-    "vis-network": "^7.3.5"
+    "vis-network": "^9.0.2"
   },
   "jest": {
     "moduleNameMapper": {