merging with develop

src/chart/parameter/ParameterSelectCardSettings.tsx

@@ -23,7 +23,7 @@ const ParameterSelectCardSettings = ({ query, database, settings, onReportSettin
 
   const [queryText, setQueryText] = React.useState(query);
   const debouncedQueryUpdate = useCallback(debounce(onQueryUpdate, 250), []);
-  const debouncedRunCypherQuery = useCallback(debounce(connectionModule.runQuery, RUN_QUERY_DELAY_MS), []);
+  const debouncedRunQuery = useCallback(debounce(connectionModule.runQuery, RUN_QUERY_DELAY_MS), []);
 
   const { manualPropertyNameSpecification } = settings;
   const [labelInputText, setLabelInputText] = React.useState(settings.entityType);
@@ -82,7 +82,7 @@ const ParameterSelectCardSettings = ({ query, database, settings, onReportSettin
         setSchema: () => {},
       };
 
-      debouncedRunCypherQuery(driver, queryParams, queryCallback);
+      debouncedRunQuery(driver, queryParams, queryCallback);
     },
     [database]
   );

src/dashboard/sidebar/modal/DashboardSidebarAccessModal.tsx

@@ -3,9 +3,10 @@ import { IconButton, Button, Dialog, TextInput } from '@neo4j-ndl/react';
 import { Menu, MenuItem, Chip } from '@mui/material';
 import { Neo4jContext, Neo4jContextState } from 'use-neo4j/dist/neo4j.context';
 import { PlusCircleIconOutline } from '@neo4j-ndl/react/icons';
-import { QueryStatus, runCypherQuery } from '../../../report/ReportQueryRunner';
 import { createNotificationThunk } from '../../../page/PageThunks';
 import { useDispatch } from 'react-redux';
+import { runCypherQuery } from '../../../connection/neo4j/runCypherQuery';
+import { QueryStatus } from '../../../connection/interfaces';
 /**
  * Configures setting the current Neo4j database connection for the dashboard.
  * @param open - Whether the modal is open or not.
@@ -15,8 +16,8 @@ import { useDispatch } from 'react-redux';
  */
 export const NeoDashboardSidebarAccessModal = ({ open, database, dashboard, handleClose }) => {
   const [anchorEl, setAnchorEl] = useState(null);
-  const [selectedLabels, setSelectedLabels] = useState([]);
-  const [allLabels, setAllLabels] = useState([]);
+  const [selectedLabels, setSelectedLabels] = useState<string[]>([]);
+  const [allLabels, setAllLabels] = useState<string[]>([]);
   const [neo4jLabels, setNeo4jLabels] = useState([]);
   const [newLabel, setNewLabel] = useState('');
   const INITIAL_LABEL = '_Neodash_Dashboard';
@@ -28,35 +29,30 @@ export const NeoDashboardSidebarAccessModal = ({ open, database, dashboard, hand
     if (!open) {
       return;
     }
-    runCypherQuery(
+    runCypherQuery({
       driver,
       database,
-      'CALL db.labels()',
-      {},
-      1000,
-      () => {},
-      (records) => setNeo4jLabels(records.map((record) => record.get('label')))
-    );
+      query: 'CALL db.labels()',
+      setRecords: (records) => setNeo4jLabels(records.map((record) => record.get('label'))),
+    });
 
     const query = `
     MATCH (d:${INITIAL_LABEL} {uuid: "${dashboard.uuid}"})
     RETURN labels(d) as labels
     `;
-    runCypherQuery(
+    runCypherQuery({
       driver,
       database,
       query,
-      {},
-      1000,
-      (error) => {
+      setError: (error) => {
         console.error(error);
       },
-      (records) => {
+      setRecords: (records) => {
         // Set the selectedLabels state to the labels of the dashboard
         setSelectedLabels(records[0].get('labels'));
         setAllLabels(records[0].get('labels'));
-      }
-    );
+      },
+    });
     setFeedback('');
     setNewLabel('');
   }, [open]);
@@ -114,13 +110,12 @@ export const NeoDashboardSidebarAccessModal = ({ open, database, dashboard, hand
     RETURN 1;
     `;
 
-    runCypherQuery(
+    runCypherQuery({
       driver,
       database,
       query,
-      { selectedLabels: selectedLabels },
-      1000,
-      (status) => {
+      parameters: { selectedLabels: selectedLabels },
+      setStatus: (status) => {
         if (status == QueryStatus.COMPLETE) {
           dispatch(
             createNotificationThunk(
@@ -138,8 +133,7 @@ export const NeoDashboardSidebarAccessModal = ({ open, database, dashboard, hand
           );
         }
       },
-      () => {}
-    );
+    });
   };
 
   return (

src/extensions/forms/chart/NeoForm.tsx

@@ -30,7 +30,7 @@ const NeoForm = (props: ChartProps) => {
   const [submitButtonActive, setSubmitButtonActive] = React.useState(true);
   const [status, setStatus] = React.useState(FormStatus.DATA_ENTRY);
   const [formResults, setFormResults] = React.useState([]);
-  const debouncedRunCypherQuery = useCallback(debounce(props.queryCallback, RUN_QUERY_DELAY_MS), []);
+  const debouncedRunQuery = useCallback(debounce(props.queryCallback, RUN_QUERY_DELAY_MS), []);
 
   // Helper function to force a refresh on all reports that depend on the form.
   // All reports that use one or more parameters used in the form will be refreshed.
@@ -87,7 +87,7 @@ const NeoForm = (props: ChartProps) => {
                 return;
               }
               setStatus(FormStatus.RUNNING);
-              debouncedRunCypherQuery(props.query, props.parameters, (records) => {
+              debouncedRunQuery(props.query, props.parameters, (records) => {
                 setFormResults(records);
                 if (records && records[0] && records[0].error) {
                   setStatus(FormStatus.ERROR);

src/extensions/rbac/RBACManagementMenu.tsx

@@ -2,8 +2,8 @@ import React, { useEffect, useState, useContext } from 'react';
 import { Menu, MenuItem, MenuItems } from '@neo4j-ndl/react';
 import { UserIconOutline } from '@neo4j-ndl/react/icons';
 import { Neo4jContext, Neo4jContextState } from 'use-neo4j/dist/neo4j.context';
-import { QueryStatus, runCypherQuery } from '../../report/ReportQueryRunner';
 import RBACManagementModal from './RBACManagementModal';
+import { runCypherQuery } from '../../connection/neo4j/runCypherQuery';
 
 /**
  * Component for providing a menu of all the roles in the neo4j database to the user whenever they press on the
@@ -20,22 +20,20 @@ export const RBACManagementMenu = ({ anchorEl, MenuOpen, handleClose, createNoti
       return;
     }
     const query = `SHOW PRIVILEGES YIELD role, action WHERE role <> "PUBLIC" RETURN role, 'dbms_actions' in collect(action)`;
-    runCypherQuery(
+    runCypherQuery({
       driver,
-      'system',
+      database: 'system',
       query,
-      {},
-      1000,
-      () => {},
-      (records) => {
+
+      setRecords: (records) => {
         if (records[0].error) {
           createNotification('Unable to retrieve roles', records[0].error);
           return;
         }
         // Only display roles which are not able to do 'dbms_actions', i.e. they are not admins.
         setRoles(records.filter((r) => r._fields[1] == false).map((record) => record._fields[0]));
-      }
-    );
+      },
+    });
   }, [MenuOpen]);
 
   if (roles.length == 0) {