Merge branch 'develop' into feature/linksRender

BennuFire · web-flow · commit 922504945762 · 2023-09-22T14:28:21.000+02:00
diff --git a/docs/modules/ROOT/pages/quickstart.adoc b/docs/modules/ROOT/pages/quickstart.adoc
@@ -8,7 +8,7 @@ https://neodash.graphapp.io.
 App Gallery].
 . Using Docker:
 ```
-docker pull neo4jlabs/neodash:latest      
+docker pull neo4jlabs/neodash:latest
 docker run -it --rm -p 5005:5005 neo4jlabs/neodash
 ```
 
diff --git a/docs/modules/ROOT/pages/user-guide/reports/pie-chart.adoc b/docs/modules/ROOT/pages/user-guide/reports/pie-chart.adoc
@@ -73,13 +73,13 @@ slice.
 |Margin Left (px) |number |50 |The margin in pixels on the left side of
 the visualization.
 
-|Margin Right (px) |number |24 |The margin in pixels on the right side
+|Margin Right (px) |number |50 |The margin in pixels on the right side
 of the visualization.
 
-|Margin Top (px) |number |24 |The margin in pixels on the top side of
+|Margin Top (px) |number |50 |The margin in pixels on the top side of
 the visualization.
 
-|Margin Bottom (px) |number |40 |The margin in pixels on the bottom side
+|Margin Bottom (px) |number |50 |The margin in pixels on the bottom side
 of the visualization.
 
 |Hide Selections |on/off |off |If enabled, hides the property selector
diff --git a/public/index.html b/public/index.html
@@ -30,6 +30,7 @@
 </head>
 
 <body>
+    <div id="overlay"></div>
     <div id="root"></div>
     <noscript>Please enable JavaScript to view this site.</noscript>
     <script src="bundle.js"></script>
diff --git a/public/style.css b/public/style.css
@@ -228,4 +228,11 @@
 		transform: scale(0.95);
 		box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
 	}
-}
+}
+
+/* Workaround for Needle not handling menu placement of dropdowns on modals */
+#overlay {
+  z-index: 99 !important;
+  position: absolute;
+}
+/* End workaround */
diff --git a/src/application/ApplicationThunks.ts b/src/application/ApplicationThunks.ts
@@ -124,7 +124,7 @@ export const createConnectionThunk =
         query,
         parameters,
         1,
-        () => {},
+        () => { },
         (records) => validateConnection(records)
       );
     } catch (e) {
@@ -254,7 +254,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
           dispatch(onConfirmLoadSharedDashboardThunk());
         }
 
-        window.history.pushState({}, document.title, '/');
+        window.history.pushState({}, document.title, window.location.pathname);
       } else {
         dispatch(setConnectionModalOpen(false));
         // dispatch(setWelcomeScreenOpen(false));
@@ -273,7 +273,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
             false
           )
         );
-        window.history.pushState({}, document.title, '/');
+        window.history.pushState({}, document.title, window.location.pathname);
       }
     } else {
       // dispatch(resetShareDetails());
diff --git a/src/card/settings/CardSettings.tsx b/src/card/settings/CardSettings.tsx
@@ -91,7 +91,11 @@ const NeoCardSettings = ({
   );
 
   return (
-    <div className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''} n-overflow-y-auto n-h-full`}>
+    <div
+      className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
+        expanded ? 'expanded' : ''
+      } n-overflow-y-auto n-h-full`}
+    >
       {cardSettingsHeader}
       <ReportItemContainer style={{ height: reportHeight }} className='-n-mt-2'>
         {cardSettingsContent}
diff --git a/src/card/settings/CardSettingsContent.tsx b/src/card/settings/CardSettingsContent.tsx
@@ -111,7 +111,7 @@ const NeoCardSettingsContent = ({
             label: report?.label || '',
             value: report?.label || '',
           },
-          menuPortalTarget: document.querySelector('body'),
+          menuPortalTarget: document.querySelector('#overlay'),
         }}
         fluid
         style={{ marginLeft: '0px', marginRight: '10px', width: '47%', maxWidth: '200px', display: 'inline-block' }}
@@ -133,7 +133,7 @@ const NeoCardSettingsContent = ({
               value: database,
             })),
             value: { label: databaseText, value: databaseText },
-            menuPortalTarget: document.querySelector('body'),
+            menuPortalTarget: document.querySelector('#overlay'),
           }}
           fluid
           style={{ marginLeft: '0px', marginRight: '10px', width: '47%', maxWidth: '200px', display: 'inline-block' }}
diff --git a/src/card/view/CardView.tsx b/src/card/view/CardView.tsx
@@ -213,7 +213,9 @@ const NeoCardView = ({
 
   return (
     <div
-      className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''}`}
+      className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
+        expanded ? 'expanded' : ''
+      }`}
       style={settings && settings.backgroundColor ? { backgroundColor: settings.backgroundColor } : {}}
     >
       {reportHeader}
diff --git a/src/card/view/CardViewFooter.tsx b/src/card/view/CardViewFooter.tsx
@@ -121,7 +121,7 @@ const NeoCardViewFooter = ({
                       : { label: selection[selectable], value: selection[selectable] },
                     isMulti: selectableFields[selectable].multiple,
                     isClearable: false,
-                    menuPortalTarget: document.querySelector('body'),
+                    menuPortalTarget: document.querySelector('#overlay'),
                   }}
                   fluid
                   style={{
diff --git a/src/card/view/CardViewHeader.tsx b/src/card/view/CardViewHeader.tsx
@@ -71,6 +71,9 @@ const NeoCardViewHeader = ({
       text: {
         primary: 'rgb(var(--palette-neutral-text))',
       },
+      action: {
+        disabled: 'rgb(var(--palette-neutral-text-weak))',
+      },
     },
   });
 
@@ -103,7 +106,7 @@ const NeoCardViewHeader = ({
                 onBlur={() => {
                   setEditing(false);
                 }}
-                className={'n-text-palette-neutral-text-default no-underline large'}
+                className={'no-underline large'}
                 label=''
                 disabled={!editable}
                 placeholder='Report name...'
@@ -117,6 +120,11 @@ const NeoCardViewHeader = ({
                 size={'small'}
                 style={{ paddingTop: '0px important!' }}
                 variant={'standard'}
+                sx={{
+                  '& .MuiInputBase-input.Mui-disabled': {
+                    WebkitTextFillColor: 'inherit',
+                  },
+                }}
               />
             </td>
           </tr>
diff --git a/src/chart/Utils.ts b/src/chart/Utils.ts
@@ -121,14 +121,14 @@ export const themeNivo = {
   textColor: 'rgb(var(--palette-neutral-text-default))',
   text: { fill: 'rgb(var(--palette-neutral-text-default))' },
   axis: {
-    ticks: { text: { fill: 'rgb(var(--palette-light-neutral-text-default))' } },
+    ticks: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
     legend: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
   },
   legends: {
-    text: { fill: 'rgb(var(--palette-neutral-text-weak))' },
-    title: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
-    ticks: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
-    hidden: { text: { fill: 'rgb(var(--palette-neutral-text-weak))' } },
+    text: { fill: 'rgb(var(--palette-neutral-text-default))' },
+    title: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
+    ticks: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
+    hidden: { text: { fill: 'rgb(var(--palette-neutral-text-default))' } },
   },
   markers: {
     text: { fill: 'rgb(var(--palette-neutral-text-default))' },
diff --git a/src/chart/bar/BarChart.tsx b/src/chart/bar/BarChart.tsx
@@ -28,7 +28,7 @@ const NeoBarChart = (props: ChartProps) => {
 
   const { records, selection } = props;
 
-  const [keys, setKeys] = React.useState({});
+  const [keys, setKeys] = React.useState<string[]>([]);
   const [data, setData] = React.useState<Record<string, any>[]>([]);
 
   useEffect(() => {
@@ -72,7 +72,7 @@ const NeoBarChart = (props: ChartProps) => {
         return row;
       });
 
-    setKeys(newKeys);
+    setKeys(Object.keys(newKeys));
     setData(newData);
   }, [selection]);
 
@@ -114,8 +114,8 @@ const NeoBarChart = (props: ChartProps) => {
   const chartColorsByScheme = getD3ColorsByScheme(colorScheme);
   // Compute bar color based on rules - overrides default color scheme completely.
   const getBarColor = (bar) => {
-    let { data, id } = bar;
-    let colorIndex = Object.keys(data).indexOf(id);
+    let { id } = bar;
+    let colorIndex = keys.indexOf(id);
     if (colorIndex >= chartColorsByScheme.length) {
       colorIndex %= chartColorsByScheme.length;
     }
@@ -218,7 +218,7 @@ const NeoBarChart = (props: ChartProps) => {
       layout={layout}
       groupMode={groupMode == 'stacked' ? 'stacked' : 'grouped'}
       enableLabel={enableLabel}
-      keys={Object.keys(keys)}
+      keys={keys}
       indexBy='index'
       margin={{
         top: marginTop,
diff --git a/src/chart/graph/component/GraphChartInspectModal.tsx b/src/chart/graph/component/GraphChartInspectModal.tsx
@@ -17,7 +17,9 @@ export const NeoGraphChartInspectModal = (props: GraphChartVisualizationProps) =
         aria-labelledby='form-dialog-title'
       >
         <Dialog.Header id='form-dialog-title'>
-          {props.interactivity.selectedEntity ? getEntityHeader(props.interactivity.selectedEntity) : ''}
+          {props.interactivity.selectedEntity
+            ? getEntityHeader(props.interactivity.selectedEntity, props.engine.selection)
+            : ''}
         </Dialog.Header>
         <Dialog.Content>
           <GraphEntityInspectionTable entity={props.interactivity.selectedEntity}></GraphEntityInspectionTable>
diff --git a/src/chart/graph/util/NodeUtils.ts b/src/chart/graph/util/NodeUtils.ts
@@ -24,8 +24,26 @@ export const parseNodeIconConfig = (iconStyle) => {
   }
 };
 
-export const getEntityHeader = (entity) => {
-  return (entity.labels && entity.labels.join(', ')) || entity.type;
+const getSelectedNodeProperty = (entity: any, sourceOrTarget: string, propertySelections: any) => {
+  const selection = propertySelections[entity[sourceOrTarget]?.mainLabel];
+  switch (selection) {
+    case '(label)':
+      return entity[sourceOrTarget]?.mainLabel;
+    case '(id)':
+      return entity[sourceOrTarget]?.id;
+    default:
+      return entity[sourceOrTarget]?.properties[selection];
+  }
+};
+
+const getRelPatternString = (entity: any, selection: any) => {
+  const sourceTitle = getSelectedNodeProperty(entity, 'source', selection);
+  const targetTitle = getSelectedNodeProperty(entity, 'target', selection);
+  return `(${sourceTitle ? sourceTitle : '[no value]'} --> ${targetTitle ? targetTitle : '[no value]'})`;
+};
+
+export const getEntityHeader = (entity: any, selection: any) => {
+  return entity.labels?.join(', ') || `${entity.type} ${getRelPatternString(entity, selection)}`;
 };
 
 export const drawDataURIOnCanvas = (node, strDataURI, canvas, defaultNodeSize) => {
diff --git a/src/chart/pie/PieChart.tsx b/src/chart/pie/PieChart.tsx
@@ -73,10 +73,10 @@ const NeoPieChart = (props: ChartProps) => {
   const settings = props.settings ? props.settings : {};
   const legendHeight = 20;
   // TODO to retrieve all defaults from the ReportConfig.ts file instead of hardcoding them in the file
-  const marginRight = settings.marginRight ? settings.marginRight : 24;
-  const marginLeft = settings.marginLeft ? settings.marginLeft : 24;
-  const marginTop = settings.marginTop ? settings.marginTop : 24;
-  const marginBottom = settings.marginBottom ? settings.marginBottom : 40;
+  const marginRight = settings.marginRight ? settings.marginRight : 50;
+  const marginLeft = settings.marginLeft ? settings.marginLeft : 50;
+  const marginTop = settings.marginTop ? settings.marginTop : 50;
+  const marginBottom = settings.marginBottom ? settings.marginBottom : 50;
   const sortByValue = settings.sortByValue ? settings.sortByValue : false;
   const enableArcLabels = settings.enableArcLabels !== undefined ? settings.enableArcLabels : true;
   const enableArcLinkLabels = settings.enableArcLinkLabels !== undefined ? settings.enableArcLinkLabels : true;
diff --git a/src/chart/table/TableChart.tsx b/src/chart/table/TableChart.tsx
@@ -276,13 +276,18 @@ export const NeoTableChart = (props: ChartProps) => {
             ColumnSortedAscendingIcon: () => <></>,
           }}
           getRowClassName={(params) => {
-            return `rule${evaluateRulesOnDict(params.row, styleRules, ['row color', 'row text color'])}`;
+            return ['row color', 'row text color']
+              .map((e) => {
+                return `rule${evaluateRulesOnDict(params.row, styleRules, [e])}`;
+              })
+              .join(' ');
           }}
           getCellClassName={(params) => {
-            return `rule${evaluateRulesOnDict({ [params.field]: params.value }, styleRules, [
-              'cell color',
-              'cell text color',
-            ])}`;
+            return ['cell color', 'cell text color']
+              .map((e) => {
+                return `rule${evaluateRulesOnDict({ [params.field]: params.value }, styleRules, [e])}`;
+              })
+              .join(' ');
           }}
         />
       </div>
diff --git a/src/config/ReportConfig.tsx b/src/config/ReportConfig.tsx
@@ -606,22 +606,22 @@ export const REPORT_TYPES = {
       marginLeft: {
         label: 'Margin Left (px)',
         type: SELECTION_TYPES.NUMBER,
-        default: 24,
+        default: 50,
       },
       marginRight: {
         label: 'Margin Right (px)',
         type: SELECTION_TYPES.NUMBER,
-        default: 24,
+        default: 50,
       },
       marginTop: {
         label: 'Margin Top (px)',
         type: SELECTION_TYPES.NUMBER,
-        default: 24,
+        default: 50,
       },
       marginBottom: {
         label: 'Margin Bottom (px)',
         type: SELECTION_TYPES.NUMBER,
-        default: 40,
+        default: 50,
       },
       refreshButtonEnabled: {
         label: 'Refreshable',
diff --git a/yarn.lock b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@adobe/css-tools@^4.0.1":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8"
-  integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
+  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
 
 "@alloc/quick-lru@^5.2.0":
   version "5.2.0"
