From dd4d87219a55db0ff36d912c2404ab8693c93914 Mon Sep 17 00:00:00 2001
From: Niels de Jong <Niels-121@hotmail.com>
Date: Mon, 10 Oct 2022 14:35:39 +0200
Subject: [PATCH 01/11] Added hotfix for race condition in Neo4j Desktop (#230)

* Added hotfix for race condition in Neo4j Desktop

* Bumped version number

* Added check to ensure the database list doesn't get reloaded too often

* Added TODOs
---
 .github/workflows/master-deployment.yml |  2 +-
 Dockerfile                              |  2 +-
 changelog.md                            |  4 ++--
 package.json                            |  2 +-
 release-notes.md                        |  4 ++--
 src/application/ApplicationActions.ts   |  4 ++--
 src/application/ApplicationReducer.ts   |  6 ++++--
 src/application/ApplicationSelectors.ts |  4 +++-
 src/application/ApplicationThunks.ts    |  2 +-
 src/card/Card.tsx                       | 20 ++++++++++++--------
 src/dashboard/Dashboard.tsx             | 10 +++++++---
 src/modal/AboutModal.tsx                |  2 +-
 src/report/Report.tsx                   |  4 ----
 src/settings/SettingsSelectors.ts       | 14 +++++++++++---
 14 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/master-deployment.yml b/.github/workflows/master-deployment.yml
index e50686e6d..a00943219 100644
--- a/.github/workflows/master-deployment.yml
+++ b/.github/workflows/master-deployment.yml
@@ -78,7 +78,7 @@ jobs:
       context: .
       file: ./Dockerfile
       push: true
-      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.8
+      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.9
  build-npm:
    needs: build-test
    runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index 094027973..7ee58368a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,4 +38,4 @@ RUN chown -R nginx:nginx /usr/share/nginx/html/
 USER nginx
 EXPOSE 5005
 HEALTHCHECK cmd curl --fail http://localhost:5005 || exit 1
-LABEL version="2.1.8"
+LABEL version="2.1.9"
diff --git a/changelog.md b/changelog.md
index fdd2e851d..4ddc15ac9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,4 @@
-## NeoDash 2.1.8
+## NeoDash 2.1.8 & 2.1.9
 New features:
 - Added the [Dashboard Gallery](https://neodash-gallery.graphapp.io), a live gallery of example NeoDash dashboards.
 - Added **Gauge Charts**, a contribution of the [BlueHound](https://github.com/zeronetworks/BlueHound) fork.
@@ -10,7 +10,7 @@ Bug fixes:
 - Fixed issue preventing dashboards to be shared with a non-standard database name.
 - Fixed table chart breaking when returning a property called 'id' with a null value.
 - Fixed bug not allowing users to select a different database when loading/saving a dashboard.
-
+- **Added error handler for database list race condition in Neo4j Desktop**.
 
 
 ## NeoDash 2.1.6 & 2.1.7
diff --git a/package.json b/package.json
index 25c14e5cf..4d9e80d7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neodash",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "NeoDash - Neo4j Dashboard Builder",
   "neo4jDesktop": {
     "apiVersion": "^1.2.0"
diff --git a/release-notes.md b/release-notes.md
index 80e53a503..bfb179e9c 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,4 +1,4 @@
-## NeoDash 2.1.8
+## NeoDash 2.1.8 & 2.1.9
 New features:
 - Added the [Dashboard Gallery](https://neodash-gallery.graphapp.io), a live gallery of example NeoDash dashboards.
 - Added **Gauge Charts**, a contribution of the [BlueHound](https://github.com/zeronetworks/BlueHound) fork.
@@ -10,6 +10,6 @@ Bug fixes:
 - Fixed issue preventing dashboards to be shared with a non-standard database name.
 - Fixed table chart breaking when returning a property called 'id' with a null value.
 - Fixed bug not allowing users to select a different database when loading/saving a dashboard.
-
+- **Added error handler for database list race condition in Neo4j Desktop**.
 
 For a complete version history, see the [Changelog](https://github.com/neo4j-labs/neodash/blob/master/changelog.md).
diff --git a/src/application/ApplicationActions.ts b/src/application/ApplicationActions.ts
index 114ad7375..8fc4be2b2 100644
--- a/src/application/ApplicationActions.ts
+++ b/src/application/ApplicationActions.ts
@@ -88,9 +88,9 @@ export const setShareDetailsFromUrl = (type: string, id: string, standalone: boo
 });
 
 export const SET_STANDALONE_ENABLED = 'APPLICATION/SET_STANDALONE_ENABLED';
-export const setStandaloneEnabled = (standalone: boolean, standaloneProtocol: string, standaloneHost: string, standalonePort: string, standaloneDatabase: string, standaloneDashboardName: string, standaloneDashboardDatabase: string, standaloneDashboardURL: string ) => ({
+export const setStandaloneEnabled = (standalone: boolean, standaloneProtocol: string, standaloneHost: string, standalonePort: string, standaloneDatabase: string, standaloneDashboardName: string, standaloneDashboardDatabase: string, standaloneDashboardURL: string, standaloneUsername: string, standalonePassword: string) => ({
     type: SET_STANDALONE_ENABLED,
-    payload: { standalone, standaloneProtocol, standaloneHost, standalonePort, standaloneDatabase, standaloneDashboardName, standaloneDashboardDatabase, standaloneDashboardURL },
+    payload: { standalone, standaloneProtocol, standaloneHost, standalonePort, standaloneDatabase, standaloneDashboardName, standaloneDashboardDatabase, standaloneDashboardURL, standaloneUsername, standalonePassword },
 });
 
 export const SET_STANDALONE_MODE = 'APPLICATION/SET_STANDALONE_MODE';
diff --git a/src/application/ApplicationReducer.ts b/src/application/ApplicationReducer.ts
index 48f31c04e..4307b3906 100644
--- a/src/application/ApplicationReducer.ts
+++ b/src/application/ApplicationReducer.ts
@@ -103,7 +103,7 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
         }
 
         case SET_STANDALONE_ENABLED: {
-            const { standalone, standaloneProtocol, standaloneHost, standalonePort, standaloneDatabase, standaloneDashboardName, standaloneDashboardDatabase, standaloneDashboardURL } = payload;
+            const { standalone, standaloneProtocol, standaloneHost, standalonePort, standaloneDatabase, standaloneDashboardName, standaloneDashboardDatabase, standaloneDashboardURL, standaloneUsername, standalonePassword } = payload;
             state = update(state, {
                 standalone: standalone,
                 standaloneProtocol: standaloneProtocol,
@@ -112,7 +112,9 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
                 standaloneDatabase: standaloneDatabase,
                 standaloneDashboardName: standaloneDashboardName, 
                 standaloneDashboardDatabase: standaloneDashboardDatabase,
-                standaloneDashboardURL: standaloneDashboardURL
+                standaloneDashboardURL: standaloneDashboardURL,
+                standaloneUsername: standaloneUsername,
+                standalonePassword: standalonePassword
             })
             return state;
         }
diff --git a/src/application/ApplicationSelectors.ts b/src/application/ApplicationSelectors.ts
index 94d1d4a28..f577141f7 100644
--- a/src/application/ApplicationSelectors.ts
+++ b/src/application/ApplicationSelectors.ts
@@ -73,7 +73,9 @@ export const applicationGetStandaloneSettings = (state: any) => {
         "standaloneDatabase": state.application.standaloneDatabase,
         "standaloneDashboardName": state.application.standaloneDashboardName,
         "standaloneDashboardDatabase": state.application.standaloneDashboardDatabase,
-        "standaloneDashboardURL": state.application.standaloneDashboardURL
+        "standaloneDashboardURL": state.application.standaloneDashboardURL,
+        "standaloneUsername": state.application.standaloneUsername,
+        "standalonePassword": state.application.standalonePassword
     }
 }
 
diff --git a/src/application/ApplicationThunks.ts b/src/application/ApplicationThunks.ts
index fda23f1ab..2ca4790a1 100644
--- a/src/application/ApplicationThunks.ts
+++ b/src/application/ApplicationThunks.ts
@@ -272,7 +272,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
         dispatch(setSSOEnabled(config['ssoEnabled'], config["ssoDiscoveryUrl"]));
         const state = getState();
         const standalone = config['standalone'];// || (state.application.shareDetails !== undefined && state.application.shareDetails.standalone);
-        dispatch(setStandaloneEnabled(standalone, config['standaloneProtocol'], config['standaloneHost'], config['standalonePort'], config['standaloneDatabase'], config['standaloneDashboardName'], config['standaloneDashboardDatabase'], config["standaloneDashboardURL"]))
+        dispatch(setStandaloneEnabled(standalone, config['standaloneProtocol'], config['standaloneHost'], config['standalonePort'], config['standaloneDatabase'], config['standaloneDashboardName'], config['standaloneDashboardDatabase'], config["standaloneDashboardURL"], config['standaloneUsername'], config['standalonePassword']))
         dispatch(setConnectionModalOpen(false));
 
         // Auto-upgrade the dashboard version if an old version is cached.
diff --git a/src/card/Card.tsx b/src/card/Card.tsx
index b8e51d02f..946ba6fd1 100644
--- a/src/card/Card.tsx
+++ b/src/card/Card.tsx
@@ -57,16 +57,20 @@ const NeoCard = ({
     const {driver} = useContext<Neo4jContextState>(Neo4jContext);
 
     const [databaseList, setDatabaseList] = React.useState([database])
+    const [databaseListLoaded, setDatabaseListLoaded] = React.useState(false);
 
     // fetching the list of databases from neo4j, filtering out the 'system' db
     useEffect(() => {
-        loadDatabaseListFromNeo4j(driver, (result) => {
-            let index = result.indexOf("system")
-            if (index > -1) { // only splice array when item is found
-                result.splice(index, 1); // 2nd parameter means remove one item only
-            }
-            setDatabaseList(result)
-        });
+        if(!databaseListLoaded){
+            loadDatabaseListFromNeo4j(driver, (result) => {
+                let index = result.indexOf("system")
+                if (index > -1) { // only splice array when item is found
+                    result.splice(index, 1); // 2nd parameter means remove one item only
+                }
+                setDatabaseList(result)
+            });
+            setDatabaseListLoaded(true);
+        }
     }, [report.query]);
 
     const [settingsOpen, setSettingsOpen] = React.useState(false);
@@ -204,7 +208,7 @@ const NeoCard = ({
 const mapStateToProps = (state, ownProps) => ({
     report: getReportState(state, ownProps.index),
     editable: getDashboardIsEditable(state),
-    database: getDatabase(state, ownProps.dashboardSettings.pagenumber, ownProps.index),
+    database: getDatabase(state, ownProps && ownProps.dashboardSettings ? ownProps.dashboardSettings.pagenumber : undefined, ownProps.index),
     globalParameters: getGlobalParameters(state)
 });
 
diff --git a/src/dashboard/Dashboard.tsx b/src/dashboard/Dashboard.tsx
index ab3efc43d..0967938de 100644
--- a/src/dashboard/Dashboard.tsx
+++ b/src/dashboard/Dashboard.tsx
@@ -4,7 +4,7 @@ import Container from '@material-ui/core/Container';
 import NeoDrawer from './drawer/DashboardDrawer';
 import NeoDashboardHeader from './header/DashboardHeader';
 import { createDriver, Neo4jProvider, useConnection } from 'use-neo4j';
-import { applicationGetConnection, applicationHasAboutModalOpen } from '../application/ApplicationSelectors';
+import { applicationGetConnection, applicationGetStandaloneSettings, applicationHasAboutModalOpen } from '../application/ApplicationSelectors';
 import { connect } from 'react-redux';
 import NeoDashboardConnectionUpdateHandler from '../component/misc/DashboardConnectionUpdateHandler';
 import { forceRefreshPage } from '../page/PageActions';
@@ -15,7 +15,7 @@ import { downloadComponentAsImage } from '../chart/ChartUtils';
 
 
 
-const Dashboard = ({ pagenumber, connection, onConnectionUpdate, onDownloadDashboardAsImage }) => {
+const Dashboard = ({ pagenumber, connection, applicationSettings, onConnectionUpdate, onDownloadDashboardAsImage }) => {
     const [drawerOpen, setDrawerOpen] = React.useState(false);
     const driver = createDriver(connection.protocol, connection.url, connection.port, connection.username, connection.password);
 
@@ -43,6 +43,9 @@ const Dashboard = ({ pagenumber, connection, onConnectionUpdate, onDownloadDashb
         ></NeoDashboardHeader>
         <main style={{ flexGrow: 1, height: '100vh', overflow: 'auto', backgroundColor: "#fafafa" }}>
             <Container maxWidth="xl" style={{ marginTop: "60px" }}>
+            {applicationSettings.standalonePassword ? <div style={{textAlign: "center", color: "red", zIndex: 999, paddingTop: 60, marginBottom: -50}}>
+                Warning: NeoDash is running with a plaintext password in config.json.
+                </div> : <></>}
                 <NeoPage></NeoPage>
             </Container>
         </main>
@@ -52,7 +55,8 @@ const Dashboard = ({ pagenumber, connection, onConnectionUpdate, onDownloadDashb
 
 const mapStateToProps = state => ({
     connection: applicationGetConnection(state),
-    pagenumber: getPageNumber(state)
+    pagenumber: getPageNumber(state),
+    applicationSettings: applicationGetStandaloneSettings(state)
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/src/modal/AboutModal.tsx b/src/modal/AboutModal.tsx
index 9a649d30f..fd9d6fea7 100644
--- a/src/modal/AboutModal.tsx
+++ b/src/modal/AboutModal.tsx
@@ -12,7 +12,7 @@ import BugReportIcon from '@material-ui/icons/BugReport';
 
 export const NeoAboutModal = ({ open, handleClose, getDebugState }) => {
     const app = "NeoDash - Neo4j Dashboard Builder";
-    const version = "2.1.8";
+    const version = "2.1.9";
 
     const downloadDebugFile = () => {
         const element = document.createElement("a");
diff --git a/src/report/Report.tsx b/src/report/Report.tsx
index 6310d3e69..6f3179cda 100644
--- a/src/report/Report.tsx
+++ b/src/report/Report.tsx
@@ -56,9 +56,6 @@ export const NeoReport = ({
 
         // Determine the set of fields from the configurations.
         var numericFields = (REPORT_TYPES[type].selection && fields) ? Object.keys(REPORT_TYPES[type].selection).filter(field => REPORT_TYPES[type].selection[field].type == SELECTION_TYPES.NUMBER && !REPORT_TYPES[type].selection[field].multiple) : [];
-        var numericOrDatetimeFields = (REPORT_TYPES[type].selection && fields) ? Object.keys(REPORT_TYPES[type].selection).filter(field => REPORT_TYPES[type].selection[field].type == SELECTION_TYPES.NUMBER_OR_DATETIME && !REPORT_TYPES[type].selection[field].multiple) : [];
-        var textFields = (REPORT_TYPES[type].selection && fields) ? Object.keys(REPORT_TYPES[type].selection).filter(field => REPORT_TYPES[type].selection[field].type == SELECTION_TYPES.TEXT && !REPORT_TYPES[type].selection[field].multiple) : [];
-        var optionalFields = (REPORT_TYPES[type].selection && fields) ? Object.keys(REPORT_TYPES[type].selection).filter(field => REPORT_TYPES[type].selection[field].optional == true) : [];
 
         // Take care of multi select fields, they need to be added to the numeric fields too.
         if (REPORT_TYPES[type].selection) {
@@ -69,7 +66,6 @@ export const NeoReport = ({
             });
         }
 
-        const defaultKeyField = (REPORT_TYPES[type].selection) ? Object.keys(REPORT_TYPES[type].selection).find(field => REPORT_TYPES[type].selection[field].key == true) : undefined;
         const useNodePropsAsFields = REPORT_TYPES[type].useNodePropsAsFields == true;
         const useReturnValuesAsFields = REPORT_TYPES[type].useReturnValuesAsFields == true;
 
diff --git a/src/settings/SettingsSelectors.ts b/src/settings/SettingsSelectors.ts
index fde107482..170c9e8ab 100644
--- a/src/settings/SettingsSelectors.ts
+++ b/src/settings/SettingsSelectors.ts
@@ -10,9 +10,17 @@ The database related to a card is, at its start, the same as the one defined ins
 a user can modify the database that is used by a card with a new option inside the card itself.
  */
 export const getDatabase = (state: any, pageNumber:number, cardIndex:number) => {
-    let reportDatabase = state.dashboard.pages[pageNumber].reports[cardIndex].database
-    if (reportDatabase != undefined) {
+    if(state == undefined || pageNumber == undefined || cardIndex == undefined){
+        // TODO - use DMBS default database instead of neo4j.
+        return "neo4j";
+    }
+    if( state.dashboard.pages[pageNumber] == undefined || state.dashboard.pages[pageNumber].reports[cardIndex] == undefined){
+        // TODO - use DMBS default database instead of neo4j.
+        return "neo4j";
+    }
+    let reportDatabase = state.dashboard.pages[pageNumber].reports[cardIndex].database;
+    if (reportDatabase !== undefined) {
         return reportDatabase
     }
-    return state.application.connection.database.length > 0 ? state.application.connection.database : "neo4j"
+    return state.application.connection.database ? state.application.connection.database : "neo4j";
 }

From 4011c9815eb85c4f3853e44cd97bd71ecdd37ac8 Mon Sep 17 00:00:00 2001
From: Niels de Jong <Niels-121@hotmail.com>
Date: Thu, 13 Oct 2022 12:25:04 +0200
Subject: [PATCH 02/11] Fixed bug coming from a race condition in record
 objects for bar/pie charts (#233)

---
 src/chart/bar/BarChart.tsx | 42 +++++++++++++++++++++-----------------
 src/chart/pie/PieChart.tsx | 42 +++++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/chart/bar/BarChart.tsx b/src/chart/bar/BarChart.tsx
index 90c36419c..24376f998 100644
--- a/src/chart/bar/BarChart.tsx
+++ b/src/chart/bar/BarChart.tsx
@@ -36,28 +36,32 @@ const NeoBarChart = (props: ChartProps) => {
 
     const keys = {};
     const data: Record<string, any>[] = records.reduce((data: Record<string, any>[], row: Record<string, any>) => {
-        if (!selection || !selection['index'] || !selection['value']) {
-            return data;
-        }
-        const index = convertRecordObjectToString(row.get(selection['index']));
-        const idx = data.findIndex(item => item.index === index)
+        try {
+            if (!selection || !selection['index'] || !selection['value']) {
+                return data;
+            }
+            const index = convertRecordObjectToString(row.get(selection['index']));
+            const idx = data.findIndex(item => item.index === index)
 
-        const key = selection['key'] !== "(none)" ? recordToNative(row.get(selection['key'])) : selection['value'];
-        const value = recordToNative(row.get(selection['value']));
+            const key = selection['key'] !== "(none)" ? recordToNative(row.get(selection['key'])) : selection['value'];
+            const value = recordToNative(row.get(selection['value']));
 
-        if (isNaN(value)) {
-            return data;
-        }
-        keys[key] = true;
+            if (isNaN(value)) {
+                return data;
+            }
+            keys[key] = true;
 
-        if (idx > -1) {
-            data[idx][key] = value
-        }
-        else {
-            data.push({ index, [key]: value })
+            if (idx > -1) {
+                data[idx][key] = value
+            }
+            else {
+                data.push({ index, [key]: value })
+            }
+            return data
+        } catch (e) {
+            console.error(e);
+            return [];
         }
-
-        return data
     }, [])
         .map(row => {
             Object.keys(keys).forEach(key => {
@@ -104,7 +108,7 @@ const NeoBarChart = (props: ChartProps) => {
     }
 
     // TODO: Get rid of duplicate pie slice names...
-    
+
     return <ResponsiveBar
         layout={settings.layout == "horizontal" ? 'horizontal' : 'vertical'}
         groupMode={groupMode == "stacked" ? 'stacked' : 'grouped'}
diff --git a/src/chart/pie/PieChart.tsx b/src/chart/pie/PieChart.tsx
index 8fb9aeecb..ef66a2388 100644
--- a/src/chart/pie/PieChart.tsx
+++ b/src/chart/pie/PieChart.tsx
@@ -20,29 +20,33 @@ const NeoPieChart = (props: ChartProps) => {
 
     const keys = {};
     const data: Record<string, any>[] = records.reduce((data: Record<string, any>[], row: Record<string, any>) => {
-        if (!selection || !selection['index'] || !selection['value']) {
-            return data;
-        }
+        try {
+            if (!selection || !selection['index'] || !selection['value']) {
+                return data;
+            }
 
-        const index = convertRecordObjectToString(row.get(selection['index']));
-        const idx = data.findIndex(item => item.index === index)
+            const index = convertRecordObjectToString(row.get(selection['index']));
+            const idx = data.findIndex(item => item.index === index)
+            const key = selection['key'] !== "(none)" ? recordToNative(row.get(selection['key'])) : selection['value'];
+            const value = recordToNative(row.get(selection['value']));
 
-        const key = selection['key'] !== "(none)" ? recordToNative(row.get(selection['key'])) : selection['value'];
-        const value = recordToNative(row.get(selection['value']));
+            if (isNaN(value)) {
+                return data;
+            }
+            keys[key] = true;
 
-        if (isNaN(value)) {
-            return data;
-        }
-        keys[key] = true;
+            if (idx > -1) {
+                data[idx][key] = value
+            }
+            else {
+                data.push({ id: index, label: index, value: value })
+            }
 
-        if (idx > -1) {
-            data[idx][key] = value
-        }
-        else {
-            data.push({ id: index, label: index, value: value })
+            return data
+        } catch (e) {
+            console.error(e);
+            return [];
         }
-
-        return data
     }, [])
         .map(row => {
             Object.keys(keys).forEach(key => {
@@ -99,7 +103,7 @@ const NeoPieChart = (props: ChartProps) => {
     if (data.length == 0) {
         return <NoDrawableDataErrorMessage />
     }
-    
+
     return <ResponsivePie
         data={data}
         sortByValue={sortByValue}

From f5734d34e0e25deb2faed29d7ad3bf1ffb652c51 Mon Sep 17 00:00:00 2001
From: BennuFire <agudeloharold13@gmail.com>
Date: Sat, 15 Oct 2022 08:53:43 +0200
Subject: [PATCH 03/11] Share from self (#232)

* Share from self

* Workaround desktop

* Hide button too
---
 src/modal/ShareModal.tsx | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/modal/ShareModal.tsx b/src/modal/ShareModal.tsx
index 04b4cfb53..d4a06a266 100644
--- a/src/modal/ShareModal.tsx
+++ b/src/modal/ShareModal.tsx
@@ -23,6 +23,7 @@ import { applicationGetConnection } from '../application/ApplicationSelectors';
 
 // const shareBaseURL = "http://localhost:3000";
 const shareBaseURL = "http://neodash.graphapp.io";
+const shareLocalURL = window.location.origin.startsWith("file")?  shareBaseURL : window.location.origin;
 const styles = {
 
 };
@@ -42,6 +43,8 @@ export const NeoShareModal = ({ connection, loadDashboardListFromNeo4j, loadData
     const [shareFileURL, setShareFileURL] = React.useState("");
     const [shareConnectionDetails, setShareConnectionDetails] = React.useState("No");
     const [shareStandalone, setShareStandalone] = React.useState("No");
+    const [selfHosted, setSelfHosted] = React.useState("No");
+
     const [shareLink, setShareLink] = React.useState(null);
 
 
@@ -164,6 +167,7 @@ export const NeoShareModal = ({ connection, loadDashboardListFromNeo4j, loadData
                                 setShareConnectionDetails(e)
                             }}
                         />
+                            {shareLocalURL != shareBaseURL ?
                         <NeoSetting key={"standalone"} name={"standalone"}
                             value={shareStandalone}
                             style={{ marginLeft: "0px", width: "100%", marginBottom: "10px" }}
@@ -179,11 +183,24 @@ export const NeoShareModal = ({ connection, loadDashboardListFromNeo4j, loadData
                                     setShareConnectionDetails("Yes")
                                 }
                             }}
+                        /> : <></>}
+                        <NeoSetting key={"selfHosted"} name={"selfHosted"}
+                                    value={selfHosted}
+                                    style={{ marginLeft: "0px", width: "100%", marginBottom: "10px" }}
+                                    type={SELECTION_TYPES.LIST}
+                                    helperText={"Share the dashboard using self Hosted Neodash, otherwise neodash.graphapp.io will be used"}
+                                    label={"Self Hosted Dashboard"}
+                                    defaultValue={"No"}
+                                    choices={["Yes", "No"]}
+                                    onChange={(e) => {
+                                        setShareLink(null);
+                                        setSelfHosted(e);
+                                    }}
                         />
                         <Button
                             component="label"
                             onClick={(e) => {
-                                setShareLink((shareBaseURL + "/?share&type=" + shareType + "&id=" + encodeURIComponent(shareID) + "&dashboardDatabase=" + encodeURIComponent(dashboardDatabase) +
+                                setShareLink((( selfHosted == "Yes" ? shareLocalURL :shareBaseURL ) + "/?share&type=" + shareType + "&id=" + encodeURIComponent(shareID) + "&dashboardDatabase=" + encodeURIComponent(dashboardDatabase) +
                                     (shareConnectionDetails == "Yes" ? "&credentials=" + encodeURIComponent(connection.protocol + "://"
                                         + connection.username + ":" + connection.password + "@" + connection.database + ":" + connection.url + ":" + connection.port) : "")
                                     + (shareStandalone == "Yes" ? "&standalone=" + shareStandalone : "")));

From e86efda52ef4d25e5580b8471d05446c3d1dcfc4 Mon Sep 17 00:00:00 2001
From: BennuFire <agudeloharold13@gmail.com>
Date: Mon, 24 Oct 2022 11:26:11 +0200
Subject: [PATCH 04/11] Custom label position (#234)

---
 .../pages/user-guide/reports/bar-chart.adoc   |  7 ++
 src/chart/bar/BarChart.tsx                    | 73 ++++++++++++++++++-
 src/config/ReportConfig.tsx                   | 16 ++++
 3 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/docs/modules/ROOT/pages/user-guide/reports/bar-chart.adoc b/docs/modules/ROOT/pages/user-guide/reports/bar-chart.adoc
index 68783a9f2..24f431362 100644
--- a/docs/modules/ROOT/pages/user-guide/reports/bar-chart.adoc
+++ b/docs/modules/ROOT/pages/user-guide/reports/bar-chart.adoc
@@ -67,6 +67,13 @@ groups returned by the Cypher query.
 |Show Values on Bars |on/off |off |If enabled, shows the category value
 inside the respective bar.
 
+|Skip label on width (px) |number |0 |Skip label if bar width is lower than provided value, ignored if 0.
+
+|Skip label on height (px) |number |0 |Skip label if bar height is lower than provided value, ignored if 0.
+
+|Custom label position |off/top/bottom |off | Allow user to place label out of the bar. This will override any other
+label configuration.
+
 |Label Rotation (degrees) |number |45 |the angle at which the bar labels
 are rotated.
 
diff --git a/src/chart/bar/BarChart.tsx b/src/chart/bar/BarChart.tsx
index 24376f998..eb489f6f8 100644
--- a/src/chart/bar/BarChart.tsx
+++ b/src/chart/bar/BarChart.tsx
@@ -80,7 +80,13 @@ const NeoBarChart = (props: ChartProps) => {
     const marginBottom = (settings["marginBottom"]) ? settings["marginBottom"] : 40;
     const legend = (settings["legend"]) ? settings["legend"] : false;
     const labelRotation = (settings["labelRotation"] != undefined) ? settings["labelRotation"] : 45;
-    const labelSkipSize = (settings["barValues"]) ? 1 : 2000;
+
+    const labelSkipWidth = (settings["labelSkipWidth"]) ? (settings["labelSkipWidth"]) : 0;
+    const labelSkipHeight = (settings["labelSkipHeight"]) ? (settings["labelSkipHeight"]) : 0;
+    const enableLabel = (settings["barValues"]) ? settings["barValues"] : false;
+    const positionLabel = (settings["positionLabel"]) ? settings["positionLabel"] : 'off';
+
+    const layout = (settings["layout"]) ? settings["layout"] : 'vertical';
     const colorScheme = (settings["colors"]) ? settings["colors"] : 'set2';
     const groupMode = (settings["groupMode"]) ? settings["groupMode"] : 'stacked';
     const valueScale = (settings["valueScale"]) ? settings["valueScale"] : 'linear';
@@ -107,11 +113,69 @@ const NeoBarChart = (props: ChartProps) => {
         return <NoDrawableDataErrorMessage />
     }
 
+    const BarComponent = ({ bar, borderColor }) => {
+        let shade = false;
+        let darkTop = false;
+        let includeIndex = false;
+        let x = bar.width/ 2,y = bar.height / 2, textAnchor = "middle";
+        if (positionLabel == "top")
+            if(layout == "vertical")
+                y = - 10 ;
+            else
+                x = bar.width + 10;
+        else if (positionLabel == "bottom")
+                if(layout == "vertical")
+                    y = bar.height + 10;
+                else
+                    x = - 10 ;
+
+            return (
+                    <g transform={`translate(${bar.x},${bar.y})`}>
+                    {shade ? <rect x={-3} y={7} width={bar.width} height={bar.height} fill="rgba(0, 0, 0, .07)" />  : <></>}
+                    <rect width={bar.width} height={bar.height} fill={bar.color} />
+                    { darkTop ? <rect
+                        x={bar.width - 5}
+                        width={5}
+                        height={bar.height}
+                        fill={borderColor}
+                        fillOpacity={0.2}
+                    /> :  <></> }
+                    {includeIndex ? <text
+                        x={bar.width - 16}
+                        y={bar.height / 2}
+                        textAnchor="end"
+                        dominantBaseline="central"
+                        fill="black"
+                        style={{
+                                fontWeight: 900,
+                                    fontSize: 15,
+                                }}
+                    >
+                        {bar.data.indexValue}
+                    </text> :  <></> }
+                    { enableLabel ? <text
+                        x={x}
+                        y={y}
+                        textAnchor={textAnchor}
+                        dominantBaseline="central"
+                        fill={borderColor}
+                        style={{
+                                fontWeight: 400,
+                                    fontSize: 13,
+                                }}
+                    >
+                        {bar.data.value}
+                    </text> :  <></> }
+                </g>
+            )
+        }
     // TODO: Get rid of duplicate pie slice names...
 
+    const extraProperties = positionLabel == "off" ? {} : { barComponent : BarComponent };
     return <ResponsiveBar
-        layout={settings.layout == "horizontal" ? 'horizontal' : 'vertical'}
+        layout={layout}
         groupMode={groupMode == "stacked" ? 'stacked' : 'grouped'}
+        enableLabel = {enableLabel}
         data={data}
         keys={Object.keys(keys)}
         indexBy="index"
@@ -133,9 +197,10 @@ const NeoBarChart = (props: ChartProps) => {
             tickPadding: 5,
             tickRotation: 0,
         }}
-        labelSkipWidth={labelSkipSize}
-        labelSkipHeight={labelSkipSize}
+        labelSkipWidth={labelSkipWidth}
+        labelSkipHeight={labelSkipHeight}
         labelTextColor={{ from: 'color', modifiers: [['darker', 1.6]] }}
+        { ...extraProperties}
         legends={(legend) ? [
             {
                 dataFrom: 'keys',
diff --git a/src/config/ReportConfig.tsx b/src/config/ReportConfig.tsx
index fae09d38b..2804318e1 100644
--- a/src/config/ReportConfig.tsx
+++ b/src/config/ReportConfig.tsx
@@ -301,6 +301,22 @@ export const REPORT_TYPES = {
                 values: [true, false],
                 default: false
             },
+            "labelSkipWidth": {
+                label: "Skip label on width (px)",
+                type: SELECTION_TYPES.NUMBER,
+                default: 0
+            },
+            "labelSkipHeight": {
+                label: "Skip label on height (px)",
+                type: SELECTION_TYPES.NUMBER,
+                default: 0
+            },
+            "positionLabel": {
+                label: "Custom label position",
+                type: SELECTION_TYPES.LIST,
+                values: ["off", "top", "bottom"],
+                default: "off"
+            },
             "labelRotation": {
                 label: "Label Rotation (degrees)",
                 type: SELECTION_TYPES.NUMBER,

From 2530cdbb86650e5f83d26998c614d90635580374 Mon Sep 17 00:00:00 2001
From: Niels de Jong <Niels-121@hotmail.com>
Date: Thu, 27 Oct 2022 15:03:42 +0200
Subject: [PATCH 05/11] Updated gallery to allow for logos to be put in the
 card header (#239)

---
 gallery/src/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gallery/src/App.tsx b/gallery/src/App.tsx
index fa3e6ab56..323c18e11 100644
--- a/gallery/src/App.tsx
+++ b/gallery/src/App.tsx
@@ -59,7 +59,7 @@ function App() {
             filteredList.map(item => {
               return <div className='m-4 n-bg-neutral-10 n-shadow-l4'>
                 <div className="">
-                  <h4 className="p-3 float-right opacity-50">{item['language']}</h4>
+                  <h4 className="p-3 float-right">{item['language']}{item['logo'] ? <a target="_blank" href={item['authorURL']}><img style={{width: 30}} src={item['logo']}></img></a> : <></>}</h4>
                   <h4 className="p-3">{item['title']}</h4>
                   <p className="p-3">
                     {item['description']}

From bacda69a07f34e9ff728690be5345911903bf47e Mon Sep 17 00:00:00 2001
From: Niels de Jong <niels-121@hotmail.com>
Date: Thu, 27 Oct 2022 15:22:17 +0200
Subject: [PATCH 06/11] Added functionality for recovering debug reports

---
 src/dashboard/DashboardThunks.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/dashboard/DashboardThunks.ts b/src/dashboard/DashboardThunks.ts
index ca6809a53..2ad2a5f0f 100644
--- a/src/dashboard/DashboardThunks.ts
+++ b/src/dashboard/DashboardThunks.ts
@@ -66,7 +66,19 @@ export const loadDashboardThunk = (text) => (dispatch: any, getState: any) => {
             dispatch(resetDashboardState());
             return
         }
-        const dashboard = JSON.parse(text);
+        var dashboard = JSON.parse(text);
+
+        // Sanity check - make sure we didn't try to load a debug
+        if (dashboard["_persist"] && dashboard["application"] && dashboard["dashboard"]) {
+            dispatch(createNotificationThunk("Loaded a Debug Report", "Recovery-mode active. All report types were set to 'table'."));
+            dashboard['dashboard']['pages'].map(p => {
+                p['reports'].map(r => {
+                    r['type'] = 'table';
+                })
+            });
+            dashboard = dashboard['dashboard'];
+        }
+
 
         // Attempt upgrade if dashboard version is outdated.
         if (dashboard["version"] == "1.1") {

From a339b2eff2af1acc0142ee079f2a1b2fce4a8129 Mon Sep 17 00:00:00 2001
From: Niels de Jong <niels-121@hotmail.com>
Date: Thu, 27 Oct 2022 15:23:24 +0200
Subject: [PATCH 07/11] Fixed comments

---
 src/dashboard/DashboardThunks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dashboard/DashboardThunks.ts b/src/dashboard/DashboardThunks.ts
index 2ad2a5f0f..a26c6bdc5 100644
--- a/src/dashboard/DashboardThunks.ts
+++ b/src/dashboard/DashboardThunks.ts
@@ -68,7 +68,7 @@ export const loadDashboardThunk = (text) => (dispatch: any, getState: any) => {
         }
         var dashboard = JSON.parse(text);
 
-        // Sanity check - make sure we didn't try to load a debug
+        // If we load a debug report, take out the 'dashboard' value and set it to safe values.
         if (dashboard["_persist"] && dashboard["application"] && dashboard["dashboard"]) {
             dispatch(createNotificationThunk("Loaded a Debug Report", "Recovery-mode active. All report types were set to 'table'."));
             dashboard['dashboard']['pages'].map(p => {

From c6a4e95ba6ce985a32f09824e2c4ac637845b836 Mon Sep 17 00:00:00 2001
From: BennuFire <agudeloharold13@gmail.com>
Date: Fri, 28 Oct 2022 14:15:28 +0200
Subject: [PATCH 08/11] Closes #243 line graph with datetime crashing (#245)

* BugFix

* Docs on Point Mode
---
 .../pages/user-guide/reports/line-chart.adoc  |  2 +-
 src/chart/line/LineChart.tsx                  | 36 ++++++++++++++-----
 src/config/ReportConfig.tsx                   |  2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/docs/modules/ROOT/pages/user-guide/reports/line-chart.adoc b/docs/modules/ROOT/pages/user-guide/reports/line-chart.adoc
index 1e7c64c4e..dbb3e6611 100644
--- a/docs/modules/ROOT/pages/user-guide/reports/line-chart.adoc
+++ b/docs/modules/ROOT/pages/user-guide/reports/line-chart.adoc
@@ -53,7 +53,7 @@ Colors are assigned automatically to the different fields selected in
 the report footer.
 
 |X Scale |List |linear |How to scale the values on the x-axis. Can be
-either linear or logarithmic.
+either linear, logarithmic or point. Use point for categorical data.
 
 |Y Scale |List |linear |How to scale the values on the y-axis. Can be
 either linear or logarithmic.
diff --git a/src/chart/line/LineChart.tsx b/src/chart/line/LineChart.tsx
index 3762cc22c..c7878a429 100644
--- a/src/chart/line/LineChart.tsx
+++ b/src/chart/line/LineChart.tsx
@@ -30,6 +30,8 @@ const NeoLineChart = (props: ChartProps) => {
     }
 
     const [isTimeChart, setIsTimeChart] = React.useState(false);
+    const [parseFormat, setParseFormat] = React.useState("%Y-%m-%dT%H:%M:%SZ");
+
     const settings = (props.settings) ? props.settings : {};
 
     const colorScheme = (settings["colors"]) ? settings["colors"] : 'set2';
@@ -88,23 +90,31 @@ const NeoLineChart = (props: ChartProps) => {
         data: []
     }))
 
+    const isDate = (x) => {
+        return x.__isDate__;
+    }
+
     const isDateTime = (x) => {
-        return x !== undefined && x.day !== undefined && x.hour !== undefined && x.minute !== undefined &&
-            x.month !== undefined && x.nanosecond !== undefined && x.second !== undefined && x.year !== undefined;
+        return x.__isDateTime__;
+    }
+
+    const isDateTimeOrDate = (x) => {
+        return isDate(x) || isDateTime(x) || x instanceof Date;
     }
 
     records.forEach((row) => {
         selection['value'].forEach(key => {
             const index = data.findIndex(item => (item as Record<string, any>).id === key)
-            const x: any = row.get(selection['x']) || 0
+            let x: any = row.get(selection['x']) || 0
             const y: any = recordToNative(row.get(key)) || 0
             if (data[index] && !isNaN(y)) {
-                if (isDateTime(x)) {
+                if (isDate(x)) {
                     data[index].data.push({ x, y })
-                }
-                if (!isNaN(x)) {
+                } else if (isDateTime(x)) {
+                    x = new Date(x.toString());
                     data[index].data.push({ x, y })
                 }
+                else data[index].data.push({ x, y })
             }
         })
     })
@@ -124,13 +134,20 @@ const NeoLineChart = (props: ChartProps) => {
 
     // TODO - Nivo has a bug that, when we switch from a time-axis to a number axis, the visualization breaks.
     // Therefore, we now require a manual refresh.
-    const chartIsTimeChart = (data[0] !== undefined && data[0].data[0] !== undefined && data[0].data[0]['x'] !== undefined && isNaN(data[0].data[0]['x']));
+
+
+    const chartIsTimeChart = (data[0] !== undefined && data[0].data[0] !== undefined && data[0].data[0]['x'] !== undefined && isDateTimeOrDate(data[0].data[0]['x']));
+
     if (isTimeChart !== chartIsTimeChart) {
         if (!chartIsTimeChart) {
             return <div style={{ margin: "15px" }}>
                 Line chart switched from time-axis to number-axis.
                 Please re-run the report to see your changes. </div>;
         }
+
+        let p = chartIsTimeChart ? (isDateTime(data[0].data[0]['x']) ? "%Y-%m-%dT%H:%M:%SZ": "%Y-%m-%d" ) : "";
+
+        setParseFormat(p);
         setIsTimeChart(chartIsTimeChart);
     }
 
@@ -151,12 +168,13 @@ const NeoLineChart = (props: ChartProps) => {
         return <code style={{ margin: "10px" }}>Invalid tick size specification for time chart. Parameter value must be set to "every [number] ['years', 'months', 'weeks', 'days', 'hours', 'seconds', 'milliseconds']".</code>;
     }
 
-
+//T18:40:32.142+0100
+    //%Y-%m-%dT%H:%M:%SZ
     const lineViz = <div className="h-full w-full overflow-hidden" style={{ height: "100%" }}>
         <ResponsiveLine
             data={data}
             xScale={isTimeChart ?
-                { format: "%Y-%m-%dT%H:%M:%SZ", type: "time" } :
+                {  format: parseFormat, type: "time" } :
                 xScale == 'linear' ?
                     { type: xScale, min: minXValue, max: maxXValue, stacked: false, reverse: false } :
                     { type: xScale, min: minXValue, max: maxXValue, constant: xScaleLogBase, base: xScaleLogBase }
diff --git a/src/config/ReportConfig.tsx b/src/config/ReportConfig.tsx
index 2804318e1..13299a37a 100644
--- a/src/config/ReportConfig.tsx
+++ b/src/config/ReportConfig.tsx
@@ -534,7 +534,7 @@ export const REPORT_TYPES = {
             "xScale": {
                 label: "X Scale",
                 type: SELECTION_TYPES.LIST,
-                values: ["linear", "log"],
+                values: ["linear", "log", "point"],
                 default: "linear"
             },
             "yScale": {

From daa3107ae62eac5d1c5d94761745edf12daacd03 Mon Sep 17 00:00:00 2001
From: BennuFire <agudeloharold13@gmail.com>
Date: Fri, 28 Oct 2022 15:06:13 +0200
Subject: [PATCH 09/11] Added support for session parameters. Fixed release
 pipelines, added release notes. (#235)

* Username on Params

* Updated session parameter template

* Added support for session parameters

* Added session parameter documentation, changelog, and bumped version number

* Added warning about cookies

* Updated release notes

Co-authored-by: Niels de Jong <niels-121@hotmail.com>
---
 .github/workflows/develop-deployment.yml      | 30 -----------------
 .github/workflows/master-deployment.yml       | 32 ++++++++++++++++++-
 Dockerfile                                    |  2 +-
 changelog.md                                  | 10 ++++++
 .../ROOT/pages/user-guide/dashboards.adoc     |  2 ++
 .../ROOT/pages/user-guide/reports/index.adoc  | 14 ++++++++
 package.json                                  |  2 +-
 release-notes.md                              | 21 ++++--------
 src/application/ApplicationActions.ts         |  7 ++++
 src/application/ApplicationReducer.ts         |  7 +++-
 src/application/ApplicationThunks.ts          | 10 ++++--
 src/card/Card.tsx                             |  4 +--
 src/modal/AboutModal.tsx                      |  2 +-
 src/settings/SettingsActions.ts               |  2 ++
 src/settings/SettingsSelectors.ts             |  2 ++
 src/settings/SettingsThunks.ts                | 24 +++++++++++---
 16 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/develop-deployment.yml b/.github/workflows/develop-deployment.yml
index 503a1e92c..b8d2381be 100644
--- a/.github/workflows/develop-deployment.yml
+++ b/.github/workflows/develop-deployment.yml
@@ -31,16 +31,6 @@ jobs:
         build: yarn run build
         start: yarn run dev
         wait-on: 'http://localhost:3000'
- deploy-docs:
-    needs: build-test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger Developer Event
-        uses: peter-evans/repository-dispatch@main
-        with:
-          token: ${{ secrets.DOCS_REFRESH_TOKEN }}
-          repository: neo4j-documentation/docs-refresh
-          event-type: labs
  build-s3:
    needs: build-test
    runs-on: ubuntu-latest
@@ -63,23 +53,3 @@ jobs:
        aws-region: us-west-1
    - run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
    - run: aws s3 rm s3://neodash-test.graphapp.io/ --recursive && aws s3 sync dist s3://neodash-test.graphapp.io/ --acl public-read
- deploy-gallery:
-   runs-on: ubuntu-latest
-   strategy:
-     matrix:
-       node-version: [18.x]
-   steps:
-   - uses: actions/checkout@v2
-   - name: Use Node.js ${{ matrix.node-version }}
-     uses: actions/setup-node@v1
-     with:
-       node-version: ${{ matrix.node-version }}
-   - run: cd gallery && yarn install
-   - run: cd gallery && CI=false yarn run build
-   - name: Set AWS credentials
-     uses: aws-actions/configure-aws-credentials@v1
-     with:
-       aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-       aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-       aws-region: us-west-1
-   - run: aws s3 rm s3://neodash-gallery.graphapp.io/ --recursive && aws s3 sync gallery/build s3://neodash-gallery.graphapp.io/ --acl public-read
diff --git a/.github/workflows/master-deployment.yml b/.github/workflows/master-deployment.yml
index a00943219..6621d9527 100644
--- a/.github/workflows/master-deployment.yml
+++ b/.github/workflows/master-deployment.yml
@@ -78,7 +78,7 @@ jobs:
       context: .
       file: ./Dockerfile
       push: true
-      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.9
+      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.10
  build-npm:
    needs: build-test
    runs-on: ubuntu-latest
@@ -116,3 +116,33 @@ jobs:
    - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
    - name: Publish package to NPM 📦
      run: npm publish --access public neodash*.tgz
+ deploy-gallery:
+   runs-on: ubuntu-latest
+   strategy:
+     matrix:
+       node-version: [18.x]
+   steps:
+   - uses: actions/checkout@v2
+   - name: Use Node.js ${{ matrix.node-version }}
+     uses: actions/setup-node@v1
+     with:
+       node-version: ${{ matrix.node-version }}
+   - run: cd gallery && yarn install
+   - run: cd gallery && CI=false yarn run build
+   - name: Set AWS credentials
+     uses: aws-actions/configure-aws-credentials@v1
+     with:
+       aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+       aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+       aws-region: us-west-1
+   - run: aws s3 rm s3://neodash-gallery.graphapp.io/ --recursive && aws s3 sync gallery/build s3://neodash-gallery.graphapp.io/ --acl public-read
+ deploy-docs:
+    needs: build-test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Developer Event
+        uses: peter-evans/repository-dispatch@main
+        with:
+          token: ${{ secrets.DOCS_REFRESH_TOKEN }}
+          repository: neo4j-documentation/docs-refresh
+          event-type: labs
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7ee58368a..a12904eac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,4 +38,4 @@ RUN chown -R nginx:nginx /usr/share/nginx/html/
 USER nginx
 EXPOSE 5005
 HEALTHCHECK cmd curl --fail http://localhost:5005 || exit 1
-LABEL version="2.1.9"
+LABEL version="2.1.10"
diff --git a/changelog.md b/changelog.md
index 4ddc15ac9..ac0aa607d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,13 @@
+## NeoDash 2.1.10
+This is a minor update which adds some operational/styling improvements, and a bug fix for line charts.
+
+Changes:
+- Added customizable label positions for bar charts.
+- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)\
+- Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
+- Added option to restore debug reports in recovery mode.
+
+
 ## NeoDash 2.1.8 & 2.1.9
 New features:
 - Added the [Dashboard Gallery](https://neodash-gallery.graphapp.io), a live gallery of example NeoDash dashboards.
diff --git a/docs/modules/ROOT/pages/user-guide/dashboards.adoc b/docs/modules/ROOT/pages/user-guide/dashboards.adoc
index b77d9215b..5392f11eb 100644
--- a/docs/modules/ROOT/pages/user-guide/dashboards.adoc
+++ b/docs/modules/ROOT/pages/user-guide/dashboards.adoc
@@ -82,6 +82,8 @@ When using Neo4j multi-database, you will be given the choice of which
 database to save the dashboard in. 
 3. Copy-paste the JSON file directly.
 
+> Keep in mind that your currently active dashboard is stored in the browser cache. If you clear your cache (cookies), the dashboard is gone.
+
 === Load a Dashboard
 
 Just like in the save screen, a dashboard can be loaded in one of three
diff --git a/docs/modules/ROOT/pages/user-guide/reports/index.adoc b/docs/modules/ROOT/pages/user-guide/reports/index.adoc
index c872f8fdb..843852a65 100644
--- a/docs/modules/ROOT/pages/user-guide/reports/index.adoc
+++ b/docs/modules/ROOT/pages/user-guide/reports/index.adoc
@@ -99,6 +99,20 @@ Ultimately, it is important to understand that the order of the rules is
 important. If a node matches multiple rules, the first rule that matches
 will be used. If no rules are matched, the default style will be used.
 
+== Parameters
+...
+
+Parameters can be set in a dashboard by using a link:parameter-select[Parameter Select] report. Set parameters are then available in any Cypher query across the dashboard.
+
+In addition, **session parameters** are available based on the currently active database connection.
+
+|===
+|Parameter | Description
+| $session_uri | The URI of the current active database connection.
+| $session_database | The Neo4j database that was connected to when the user logged in.
+| $session_username | The username used to authenticate to Neo4j.
+|===
+
 == Report Types
 
 To learn more about a specific report type, see one of the following
diff --git a/package.json b/package.json
index 4d9e80d7f..b89fa9fc8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neodash",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "NeoDash - Neo4j Dashboard Builder",
   "neo4jDesktop": {
     "apiVersion": "^1.2.0"
diff --git a/release-notes.md b/release-notes.md
index bfb179e9c..f22809bad 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,15 +1,8 @@
-## NeoDash 2.1.8 & 2.1.9
-New features:
-- Added the [Dashboard Gallery](https://neodash-gallery.graphapp.io), a live gallery of example NeoDash dashboards.
-- Added **Gauge Charts**, a contribution of the [BlueHound](https://github.com/zeronetworks/BlueHound) fork.
-- Updated testing pipeline to work as an independent procedure.
-- Added option to select a different Neo4j database for each report. ([#188](https://github.com/neo4j-labs/neodash/issues/118))
-- Added **Report Actions**, a neodash extension (available in beta) only on [https://neodash.graphapp.io](https://neodash.graphapp.io). ([#27](https://github.com/neo4j-labs/neodash/issues/27))
- 
-Bug fixes:
-- Fixed issue preventing dashboards to be shared with a non-standard database name.
-- Fixed table chart breaking when returning a property called 'id' with a null value.
-- Fixed bug not allowing users to select a different database when loading/saving a dashboard.
-- **Added error handler for database list race condition in Neo4j Desktop**.
+## NeoDash 2.1.10
+This is a minor update which adds some operational/styling improvements, and a bug fix for line charts.
 
-For a complete version history, see the [Changelog](https://github.com/neo4j-labs/neodash/blob/master/changelog.md).
+Changes:
+- Added customizable label positions for bar charts.
+- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)\
+- Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
+- Added option to restore debug reports in recovery mode.
diff --git a/src/application/ApplicationActions.ts b/src/application/ApplicationActions.ts
index 8fc4be2b2..7b38b2c29 100644
--- a/src/application/ApplicationActions.ts
+++ b/src/application/ApplicationActions.ts
@@ -117,6 +117,13 @@ export const setWaitForSSO = (wait: boolean ) => ({
     payload: { wait },
 });
 
+export const SET_SESSION_PARAMETERS = 'APPLICATION/SET_SESSION_PARAMETERS';
+export const setSessionParameters = ( parameters: any ) => ({
+    type: SET_SESSION_PARAMETERS,
+    payload: { parameters },
+});
+
+
 export const SET_DASHBOARD_TO_LOAD_AFTER_CONNECTING = 'APPLICATION/SET_DASHBOARD_TO_LOAD_AFTER_CONNECTING';
 export const setDashboardToLoadAfterConnecting = (id: any) => ({
     type: SET_DASHBOARD_TO_LOAD_AFTER_CONNECTING,
diff --git a/src/application/ApplicationReducer.ts b/src/application/ApplicationReducer.ts
index 4307b3906..98fa091e4 100644
--- a/src/application/ApplicationReducer.ts
+++ b/src/application/ApplicationReducer.ts
@@ -9,6 +9,7 @@ import {
     SET_DASHBOARD_TO_LOAD_AFTER_CONNECTING, SET_DESKTOP_CONNECTION_PROPERTIES, SET_OLD_DASHBOARD, 
     SET_PARAMETERS_TO_LOAD_AFTER_CONNECTING, 
     SET_REPORT_HELP_MODAL_OPEN, 
+    SET_SESSION_PARAMETERS, 
     SET_SHARE_DETAILS_FROM_URL, SET_SSO_ENABLED, SET_STANDALONE_DASHBOARD_DATEBASE, SET_STANDALONE_ENABLED, 
     SET_STANDALONE_MODE, SET_WAIT_FOR_SSO, SET_WELCOME_SCREEN_OPEN
 } from "./ApplicationActions";
@@ -101,7 +102,11 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
             state = update(state, { waitForSSO: wait })
             return state;
         }
-
+        case SET_SESSION_PARAMETERS: {
+            const { parameters } = payload;
+            state = update(state, { sessionParameters: parameters })
+            return state;
+        }
         case SET_STANDALONE_ENABLED: {
             const { standalone, standaloneProtocol, standaloneHost, standalonePort, standaloneDatabase, standaloneDashboardName, standaloneDashboardDatabase, standaloneDashboardURL, standaloneUsername, standalonePassword } = payload;
             state = update(state, {
diff --git a/src/application/ApplicationThunks.ts b/src/application/ApplicationThunks.ts
index 2ca4790a1..29684b4e9 100644
--- a/src/application/ApplicationThunks.ts
+++ b/src/application/ApplicationThunks.ts
@@ -5,7 +5,11 @@ import { NEODASH_VERSION } from "../dashboard/DashboardReducer";
 import { loadDashboardFromNeo4jByNameThunk, loadDashboardFromNeo4jByUUIDThunk, loadDashboardThunk, upgradeDashboardVersion } from "../dashboard/DashboardThunks";
 import { createNotificationThunk } from "../page/PageThunks";
 import { QueryStatus, runCypherQuery } from "../report/ReportQueryRunner";
-import { setPageNumberThunk, updateGlobalParametersThunk, updateGlobalParameterThunk } from "../settings/SettingsThunks";
+import {
+    setPageNumberThunk,
+    updateGlobalParametersThunk,
+    updateSessionParameterThunk
+} from "../settings/SettingsThunks";
 import {
     setConnected, setConnectionModalOpen, setConnectionProperties, setDesktopConnectionProperties,
     resetShareDetails, setShareDetailsFromUrl, setWelcomeScreenOpen, setDashboardToLoadAfterConnecting,
@@ -40,7 +44,9 @@ export const createConnectionThunk = (protocol, url, port, database, username, p
                 dispatch(setConnectionProperties(protocol, url, port, database, username, password));
                 dispatch(setConnectionModalOpen(false));
                 dispatch(setConnected(true));
-
+                dispatch(updateSessionParameterThunk("session_uri", protocol + "://" + url + ":" + port));
+                dispatch(updateSessionParameterThunk("session_database", database));
+                dispatch(updateSessionParameterThunk("session_username", username));
                 // If we have remembered to load a specific dashboard after connecting to the database, take care of it here.
                 const application = getState().application;
                 if (application.dashboardToLoadAfterConnecting && (application.dashboardToLoadAfterConnecting.startsWith("http") || application.dashboardToLoadAfterConnecting.startsWith("./") || application.dashboardToLoadAfterConnecting.startsWith("/"))) {
diff --git a/src/card/Card.tsx b/src/card/Card.tsx
index 946ba6fd1..d3cdfb548 100644
--- a/src/card/Card.tsx
+++ b/src/card/Card.tsx
@@ -19,7 +19,7 @@ import {
 import {toggleReportSettings} from './CardActions';
 import {getReportState} from './CardSelectors';
 import {debounce, Dialog, DialogContent} from '@material-ui/core';
-import {getDashboardIsEditable, getDatabase, getGlobalParameters} from '../settings/SettingsSelectors';
+import {getDashboardIsEditable, getDatabase, getGlobalParameters, getSessionParameters} from '../settings/SettingsSelectors';
 import {updateGlobalParameterThunk} from '../settings/SettingsThunks';
 import {createNotificationThunk} from '../page/PageThunks';
 import useDimensions from 'react-cool-dimensions';
@@ -209,7 +209,7 @@ const mapStateToProps = (state, ownProps) => ({
     report: getReportState(state, ownProps.index),
     editable: getDashboardIsEditable(state),
     database: getDatabase(state, ownProps && ownProps.dashboardSettings ? ownProps.dashboardSettings.pagenumber : undefined, ownProps.index),
-    globalParameters: getGlobalParameters(state)
+    globalParameters: {...getGlobalParameters(state), ...getSessionParameters(state)} 
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/src/modal/AboutModal.tsx b/src/modal/AboutModal.tsx
index fd9d6fea7..f655c595d 100644
--- a/src/modal/AboutModal.tsx
+++ b/src/modal/AboutModal.tsx
@@ -12,7 +12,7 @@ import BugReportIcon from '@material-ui/icons/BugReport';
 
 export const NeoAboutModal = ({ open, handleClose, getDebugState }) => {
     const app = "NeoDash - Neo4j Dashboard Builder";
-    const version = "2.1.9";
+    const version = "2.1.10";
 
     const downloadDebugFile = () => {
         const element = document.createElement("a");
diff --git a/src/settings/SettingsActions.ts b/src/settings/SettingsActions.ts
index a520b3337..bb4b0ff94 100644
--- a/src/settings/SettingsActions.ts
+++ b/src/settings/SettingsActions.ts
@@ -5,3 +5,5 @@ export const updateDashboardSetting = (setting: string, value: any) => ({
 });
 
 
+
+
diff --git a/src/settings/SettingsSelectors.ts b/src/settings/SettingsSelectors.ts
index 170c9e8ab..535e97399 100644
--- a/src/settings/SettingsSelectors.ts
+++ b/src/settings/SettingsSelectors.ts
@@ -5,6 +5,8 @@ export const getDashboardIsEditable = (state: any) => state.dashboard.settings.e
 
 export const getGlobalParameters = (state: any) => state.dashboard.settings.parameters;
 
+export const getSessionParameters = (state: any) => state.application.sessionParameters;
+
 /*
 The database related to a card is, at its start, the same as the one defined inside the application connection field, however
 a user can modify the database that is used by a card with a new option inside the card itself.
diff --git a/src/settings/SettingsThunks.ts b/src/settings/SettingsThunks.ts
index f9027581a..15b6130c9 100644
--- a/src/settings/SettingsThunks.ts
+++ b/src/settings/SettingsThunks.ts
@@ -1,12 +1,9 @@
-import { hardResetCardSettings, toggleCardSettings, toggleReportSettings } from "../card/CardActions";
+import { setSessionParameters } from "../application/ApplicationActions";
+import { hardResetCardSettings } from "../card/CardActions";
 import { createNotificationThunk } from "../page/PageThunks";
 import { updateDashboardSetting } from "./SettingsActions";
 
 
-const update = (state, mutations) =>
-    Object.assign({}, state, mutations)
-
-
 export const setPageNumberThunk = (number) => (dispatch: any, getState: any) => {
     try {
         const pages = getState().dashboard.pages;
@@ -41,6 +38,23 @@ export const updateGlobalParameterThunk = (key, value) => (dispatch: any, getSta
     }
 }
 
+export const updateSessionParameterThunk = (key, value) => (dispatch: any, getState: any) => {
+    try {
+        const application =  getState().application;
+        const parameters = application.sessionParameters ? application.sessionParameters : {};
+        if (value !== undefined) {
+            parameters[key] = value;
+        } else {
+            delete parameters[key];
+        }
+
+        dispatch(setSessionParameters({ ...parameters }))
+
+    } catch (e) {
+        dispatch(createNotificationThunk("Unable to update session parameter", e));
+    }
+}
+
 
 export const updateGlobalParametersThunk = (newParameters) => (dispatch: any, getState: any) => {
 

From d6404a9be64716638de425966574e918181d7846 Mon Sep 17 00:00:00 2001
From: Niels de Jong <niels-121@hotmail.com>
Date: Fri, 28 Oct 2022 15:10:55 +0200
Subject: [PATCH 10/11] Fixed typo in release notes

---
 changelog.md     | 2 +-
 release-notes.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index ac0aa607d..7501650e3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,7 @@ This is a minor update which adds some operational/styling improvements, and a b
 
 Changes:
 - Added customizable label positions for bar charts.
-- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)\
+- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)
 - Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
 - Added option to restore debug reports in recovery mode.
 
diff --git a/release-notes.md b/release-notes.md
index f22809bad..2e1737a1b 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -3,6 +3,6 @@ This is a minor update which adds some operational/styling improvements, and a b
 
 Changes:
 - Added customizable label positions for bar charts.
-- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)\
+- Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)
 - Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
 - Added option to restore debug reports in recovery mode.

From 59922161356efb50c33e59a0f99af016cf73e9fa Mon Sep 17 00:00:00 2001
From: Niels de Jong <niels-121@hotmail.com>
Date: Fri, 28 Oct 2022 15:17:04 +0200
Subject: [PATCH 11/11] Fixed release notes

---
 changelog.md     | 2 +-
 release-notes.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 7501650e3..003df330e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,7 +6,7 @@ Changes:
 - Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)
 - Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
 - Added option to restore debug reports in recovery mode.
-
+- Added option to share dashboards from self-hosted deployments.
 
 ## NeoDash 2.1.8 & 2.1.9
 New features:
diff --git a/release-notes.md b/release-notes.md
index 2e1737a1b..0798000c8 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -6,3 +6,4 @@ Changes:
 - Fixed bug where datetimes were not handled correctly by line charts. (https://github.com/neo4j-labs/neodash/issues/243)
 - Added **session parameters**, set automatically and available to Cypher queries ([Documentation](https://neo4j.com/labs/neodash/2.1/user-guide/reports/)).
 - Added option to restore debug reports in recovery mode.
+- Added option to share dashboards from self-hosted deployments.
\ No newline at end of file