changing report config default options (#724)

* changing report config default options * Minor style fixes --------- Co-authored-by: Alfred Rubin <alfredo.rubin@neo4j.com> Co-authored-by: Niels de Jong <niels-121@hotmail.com>
neo4j-labs · Jan 8, 2024 · e6d535a · e6d535a
1 parent 2d4e5f2
commit e6d535a
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 631 deletions.
diff --git a/gallery/tsconfig.json b/gallery/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -20,7 +16,5 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": [
-    "src"
-  ],
+  "include": ["src"]
 }
diff --git a/public/style.css b/public/style.css
@@ -165,7 +165,7 @@
   white-space: pre;
   background-position: 0px -11px;
   padding-right: 0px !important;
-  margin-top: 0px !important;
+  margin-top: 0px;
   padding-left: 30px;
   padding-top: 0px !important;
   padding-bottom: 0px !important;

diff --git a/src/application/ApplicationThunks.ts b/src/application/ApplicationThunks.ts
@@ -87,10 +87,9 @@ export const createConnectionThunk =
                 'ERR - connect to DB',
                 database,
                 '',
-                `Error while trying to establish connection to Neo4j DB in ${ 
-                  neodashMode 
-                  } mode at ${ 
-                  Date(Date.now()).substring(0, 33)}`
+                `Error while trying to establish connection to Neo4j DB in ${neodashMode} mode at ${Date(
+                  Date.now()
+                ).substring(0, 33)}`
               )
             );
           }
@@ -113,11 +112,10 @@ export const createConnectionThunk =
                 'INF - connect to DB',
                 database,
                 '',
-                `${username 
-                  } established connection to Neo4j DB in ${ 
-                  neodashMode 
-                  } mode at ${ 
-                  Date(Date.now()).substring(0, 33)}`
+                `${username} established connection to Neo4j DB in ${neodashMode} mode at ${Date(Date.now()).substring(
+                  0,
+                  33
+                )}`
               )
             );
           }

diff --git a/src/application/logging/LoggingThunk.ts b/src/application/logging/LoggingThunk.ts
@@ -33,13 +33,13 @@ export const createLogThunk =
         () => {},
         (records) => {
           if (records && records[0] && records[0]._fields && records[0]._fields[0] && records[0]._fields[0] == uuid) {
-            console.log(`log created: ${  uuid}`);
+            console.log(`log created: ${uuid}`);
           } else {
             // we only show error notification one time
             const state = getState();
             const loggingSettings = applicationGetLoggingSettings(state);
             let LogErrorNotificationNum = Number(loggingSettings.logErrorNotification);
-            console.log(`Error creating log for ${  (LogErrorNotificationNum - 4) * -1  } times`);
+            console.log(`Error creating log for ${(LogErrorNotificationNum - 4) * -1} times`);
             if (LogErrorNotificationNum > 0) {
               dispatch(
                 createNotificationThunk(
@@ -60,7 +60,7 @@ export const createLogThunk =
       const state = getState();
       const loggingSettings = applicationGetLoggingSettings(state);
       let LogErrorNotificationNum = Number(loggingSettings.logErrorNotification);
-      console.log(`Error creating log for ${  (LogErrorNotificationNum - 4) * -1  } times`);
+      console.log(`Error creating log for ${(LogErrorNotificationNum - 4) * -1} times`);
       if (LogErrorNotificationNum > 0) {
         dispatch(
           createNotificationThunk(

diff --git a/src/card/settings/CardSettingsContent.tsx b/src/card/settings/CardSettingsContent.tsx
@@ -8,7 +8,7 @@ import NeoCodeEditorComponent, {
 import { getReportTypes } from '../../extensions/ExtensionUtils';
 import { Dropdown } from '@neo4j-ndl/react';
 import { EXTENSIONS_CARD_SETTINGS_COMPONENT } from '../../extensions/ExtensionConfig';
-import { update } from '../../utils/ObjectManipulation';
+import { objMerge } from '../../utils/ObjectManipulation';
 
 const NeoCardSettingsContent = ({
   pagenumber,
@@ -156,7 +156,7 @@ const NeoCardSettingsContent = ({
       {report && report.settingsComponent ? (
         <SettingsComponent
           onReportSettingUpdate={onReportSettingUpdate}
-          settings={update({ helperText: report.helperText, inputMode: report.inputMode }, reportSettings)}
+          settings={objMerge({ helperText: report.helperText, inputMode: report.inputMode }, reportSettings)}
           database={database}
           query={query}
           onQueryUpdate={onQueryUpdate}

diff --git a/src/chart/bar/BarChart.tsx b/src/chart/bar/BarChart.tsx
@@ -111,10 +111,9 @@ const NeoBarChart = (props: ChartProps) => {
     if (legendPosition === 'Horizontal') {
       // Calculate margin based on whether the legend is shown
       return showLegend ? legendWidth * 0.3 + marginBottom + 50 : legendWidth * 0.3 + marginBottom;
-    } 
-      // Return the default marginBottom if legendPosition is not 'Horizontal'
-      return marginBottom;
-
+    }
+    // Return the default marginBottom if legendPosition is not 'Horizontal'
+    return marginBottom;
   }
 
   // Using the function in your code
@@ -316,33 +315,32 @@ const NeoBarChart = (props: ChartProps) => {
           ],
         },
       ];
-    } 
-      // Vertical legend
-      return [
-        {
-          dataFrom: 'keys',
-          anchor: 'bottom-right',
-          direction: 'column',
-          justify: false,
-          translateX: legendWidth + 10,
-          translateY: 0,
-          itemsSpacing: 1,
-          itemWidth: legendWidth,
-          itemHeight: 20,
-          itemDirection: 'left-to-right',
-          itemOpacity: 0.85,
-          symbolSize: 15,
-          effects: [
-            {
-              on: 'hover',
-              style: {
-                itemOpacity: 1,
-              },
+    }
+    // Vertical legend
+    return [
+      {
+        dataFrom: 'keys',
+        anchor: 'bottom-right',
+        direction: 'column',
+        justify: false,
+        translateX: legendWidth + 10,
+        translateY: 0,
+        itemsSpacing: 1,
+        itemWidth: legendWidth,
+        itemHeight: 20,
+        itemDirection: 'left-to-right',
+        itemOpacity: 0.85,
+        symbolSize: 15,
+        effects: [
+          {
+            on: 'hover',
+            style: {
+              itemOpacity: 1,
             },
-          ],
-        },
-      ];
-
+          },
+        ],
+      },
+    ];
   };
 
   // Height of each legend item

diff --git a/src/chart/bar/util.ts b/src/chart/bar/util.ts
@@ -11,7 +11,7 @@ export function getOriginalRecordForNivoClickEvent(e, records, selection) {
   // TODO - rewrite this to be more optimal (using list comprehensions, etc.)
   const usesGroups = Object.keys(e.data).length > 2;
   const group = e.id;
-  const {value} = e;
+  const { value } = e;
   const category = e.indexValue;
 
   // Go through all records and find the first record `r` where the event's values match exactly.
@@ -34,12 +34,12 @@ export function getOriginalRecordForNivoClickEvent(e, records, selection) {
         return dict;
       }
     } else if (recordCategory == category && recordValue == value) {
-        const dict = {};
-        for (const i in Object.keys(r._fieldLookup)) {
-          const key = Object.keys(r._fieldLookup)[i];
-          dict[key] = r._fields[r._fieldLookup[key]];
-        }
-        return dict;
+      const dict = {};
+      for (const i in Object.keys(r._fieldLookup)) {
+        const key = Object.keys(r._fieldLookup)[i];
+        dict[key] = r._fields[r._fieldLookup[key]];
       }
+      return dict;
+    }
   }
 }
diff --git a/src/component/editor/CodeViewerComponent.tsx b/src/component/editor/CodeViewerComponent.tsx
@@ -18,6 +18,7 @@ const NeoCodeViewerComponent = ({ value = '', placeholder = '' }) => {
           paddingLeft: '10px',
           background: 'none',
           overflow: 'scroll !important',
+          marginTop: '5px',
           border: '1px solid lightgray',
         }}
         className={'textinput-linenumbers'}