Merge branch 'develop' into si/fixSSOMultipleProviders

Author: BennuFire

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>

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) => {

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>