Merge pull request #186 from mercedes-benz/develop

Sprint 56

Author: suhasmatapathi

public/index.html

@@ -35,5 +35,22 @@
     <noscript>Please enable JavaScript to view this site.</noscript>
     <script src="bundle.js"></script>
 </body>
+<script>
+ document.addEventListener('keydown', function(e) {
+   if (
+     e.key === 'F12' ||
+     (e.ctrlKey && e.shiftKey && ['I','J','C'].includes(e.key)) ||
+     (e.metaKey && e.altKey && ['I','J'].includes(e.key)) ||
+     (e.metaKey && e.shiftKey && e.key === 'C') ||
+     (e.metaKey && e.altKey) ||
+     (e.metaKey && e.shiftKey) ||
+     (e.ctrlKey && e.shiftKey)
+   ) {
+     e.preventDefault();
+     e.stopImmediatePropagation();
+   }
+ }, true);
+ document.addEventListener('contextmenu', e => e.preventDefault(), true);
+</script>
 
 </html>

src/application/Application.tsx

@@ -119,9 +119,14 @@ const Application = ({
     }
   }, [themeMode]);
 
+  const disableContextMenu = (e) => {
+    e.preventDefault();
+  };
+
   // Only render the dashboard component if we have an active Neo4j connection.
   return (
     <div
+      onContextMenu={disableContextMenu}
       ref={ref}
       className={`n-bg-palette-neutral-bg-default n-h-screen n-w-screen n-flex n-flex-col n-overflow-hidden`}
     >

src/chart/graph/GraphChartVisualization2D.tsx

@@ -33,5 +33,12 @@ export const NeoGraphChartVisualization2D = (props: GraphChartVisualizationProps
       generateRelCanvasObject(link, ctx, props.style.relLabelFontSize, props.style.relLabelColor),
   };
   const props2d = { ...props, config: config2d };
-  return <NeoGraphChartVisualizationBase {...props2d} />;
+  const handleContextMenu = (e) => {
+    e.stopPropagation();
+  };
+  return (
+    <div onContextMenu={handleContextMenu}>
+      <NeoGraphChartVisualizationBase {...props2d} />
+    </div>
+  );
 };

src/component/misc/DataGridExpandRenderer.tsx

@@ -8,14 +8,15 @@ import { valueIsArray } from '../../chart/ChartUtils';
 interface GridCellExpandProps {
   value: string;
   width: number;
+  lineBreakAfterListEntry?: boolean;
 }
 
 function isOverflown(element: Element): boolean {
   return element.scrollHeight > element.clientHeight || element.scrollWidth > element.clientWidth;
 }
 
 const GridCellExpand = React.memo((props: GridCellExpandProps) => {
-  const { width, value } = props;
+  const { width, value, lineBreakAfterListEntry } = props;
   const wrapper = React.useRef<HTMLDivElement | null>(null);
   const cellDiv = React.useRef(null);
   const cellValue = React.useRef(null);
@@ -95,7 +96,14 @@ const GridCellExpand = React.memo((props: GridCellExpandProps) => {
       {showPopper && (
         <Popper open={showFullCell && anchorEl !== null} anchorEl={anchorEl} style={{ width, marginLeft: -17 }}>
           <Paper elevation={1} style={{ minHeight: wrapper.current!.offsetHeight - 3 }}>
-            <Typography variant='body2' style={{ padding: 8, whiteSpace: 'normal', wordBreak: 'break-word' }}>
+            <Typography
+              variant='body2'
+              style={{
+                padding: 8,
+                whiteSpace: lineBreakAfterListEntry ? 'pre-line' : 'normal',
+                wordBreak: 'break-word',
+              }}
+            >
               {value}
             </Typography>
           </Paper>
@@ -106,19 +114,28 @@ const GridCellExpand = React.memo((props: GridCellExpandProps) => {
 });
 
 export function renderCellExpand(params: GridRenderCellParams<any, string>, lineBreakAfterListEntry: boolean) {
- 
   let value = params.value?.low ? params.value.low : params.value;
-  
-  if(!value){
-    value=""
-  }
-  return (typeof value==="string" || value instanceof String)
-    ? <GridCellExpand value={RenderString(value)} width={params.colDef.computedWidth} />
-    : (valueIsArray(value)) ? <GridCellExpand value={RenderArray(Array.from(value), false, lineBreakAfterListEntry)} width={params.colDef.computedWidth} /> 
-    : <GridCellExpand value={JSON.stringify(value)
-      .replaceAll(',', lineBreakAfterListEntry ? ',\r\n' : ', ') 
-      .replaceAll(']', '')
-      .replaceAll('[', '')
-      .replaceAll('"', '')} width={params.colDef.computedWidth} />;
 
+  if (!value) {
+    value = '';
+  }
+  return typeof value === 'string' || value instanceof String ? (
+    <GridCellExpand value={RenderString(value)} width={params.colDef.computedWidth} lineBreakAfterListEntry />
+  ) : valueIsArray(value) ? (
+    <GridCellExpand
+      value={RenderArray(Array.from(value), false, lineBreakAfterListEntry)}
+      width={params.colDef.computedWidth}
+      lineBreakAfterListEntry
+    />
+  ) : (
+    <GridCellExpand
+      value={JSON.stringify(value)
+        .replaceAll(',', lineBreakAfterListEntry ? ',\r\n' : ', ')
+        .replaceAll(']', '')
+        .replaceAll('[', '')
+        .replaceAll('"', '')}
+      width={params.colDef.computedWidth}
+      lineBreakAfterListEntry
+    />
+  );
 }