Added fix for inconsistent url + encryption specifications

Author: nielsdejong

release-notes.md

@@ -1,10 +1,5 @@
-### NeoDash 1.1 - Multi-page & interactive Neo4j dashboard builder
-- Added multi-page dashboards with new dashboard file format.
-- Added geographical (Map) visualizations.
-- Added better markdown support for code fragments and lists.
-- Added the option to embed webpages into reports using iFrames.
-- Resolved bug where node labels clip out of graph visualization reports.
-- Improved/added documentation (hints) as part of the dashboard builder.
-- Improved performance of the 'Property selection' reports.
-- A ton of stability improvements and misc bug fixes!
-
+### NeoDash 1.1.1 - Neo4j Dashboard Builder
+- Added dashboard sharing functionality.
+- Fixed unintuitive margins for bar chart reports.
+- Added abort button to save/load screen.
+- Added automatic fix for inconsistent DB url + encryption configurations.

src/NeoDash.js

@@ -155,6 +155,17 @@ class NeoDash extends React.Component {
         try {
             this.connected = false;
             var url = this.connection.url;
+
+            // When specifying an encrypted connection, we don't need the bolt+s / neo4j+s scheme.
+            if (this.connection.encryption === "on" && url.startsWith("bolt+s://")){
+                url = url.replace("bolt+s://", "bolt://")
+                this.connection.url = url;
+            }
+            if (this.connection.encryption === "on" && url.startsWith("neo4j+s://")){
+                url = url.replace("neo4j+s://", "neo4j://")
+                this.connection.url = url;
+            }
+
             if (!(url.startsWith("bolt://") || url.startsWith("bolt+routing://") || url.startsWith("neo4j://"))) {
                 url = "neo4j://" + url;
             }
@@ -390,10 +401,12 @@ class NeoDash extends React.Component {
                     // this.createExternalDashboardLoadPopupModal()
                     let parsedJson = this.parseJson(data);
                     this.state.json = data;
+                    this.externalLoaded = true;
                     // this.buildJSONFromReportsState();
                     // console.log(this.state.connectionToLoad)
                     if (this.state.connectionToLoad) {
                         this.connection = this.state.connectionToLoad;
+                        console.log(this.connection)
                         if (this.connection.password) {
                             this.confirmation = true;
                             this.connect();
@@ -407,7 +420,8 @@ class NeoDash extends React.Component {
                     })
                     this.stateChanged({label: "OpenConnectionModal"})
                     var select = document.getElementById('root');
-                    select.removeChild(select.childNodes.item(9));
+                    // TODO - remove duplicate modal
+                    // select.removeChild(select.childNodes.item(9));
 
 
                 }).catch(error => {

src/component/NeoShareModal.js

@@ -14,7 +14,7 @@ import NeoTextInput from "./NeoTextInput";
  * The content of the modal is a large multi-line textbox for specifying a dashboard file as JSON.
  */
 class NeoShareModal extends NeoModal {
-    baseURL = "http://localhost:3000/";
+    baseURL = "https://nielsdejong.nl/neodash/";
 
     constructor(props) {
         super(props);