From 1a767223edeccd21e11241cfc814ceaadf04d7d4 Mon Sep 17 00:00:00 2001 From: Ananya Date: Fri, 19 Apr 2024 15:42:44 +0530 Subject: [PATCH 1/5] VULCAN-650- fixed expand cell renderer issue --- src/component/misc/DataGridExpandRenderer.tsx | 12 ++++++++---- src/report/ReportRecordProcessing.tsx | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/component/misc/DataGridExpandRenderer.tsx b/src/component/misc/DataGridExpandRenderer.tsx index 98bb42d0b..799b460e8 100644 --- a/src/component/misc/DataGridExpandRenderer.tsx +++ b/src/component/misc/DataGridExpandRenderer.tsx @@ -3,6 +3,7 @@ import Box from '@mui/material/Box'; import { Paper, Popper, Typography } from '@mui/material'; import { GridRenderCellParams } from '@mui/x-data-grid'; import { useEffect } from 'react'; +import { RenderString } from '../../report/ReportRecordProcessing'; interface GridCellExpandProps { value: string; @@ -106,13 +107,16 @@ const GridCellExpand = React.memo((props: GridCellExpandProps) => { export function renderCellExpand(params: GridRenderCellParams, lineBreakAfterListEntry: boolean) { let value = params.value?.low ? params.value.low : params.value; + if (typeof value === 'string' || value instanceof String) { + return RenderString(value) + } const stringifiedObj = value ? JSON.stringify(value) - .replaceAll(',', lineBreakAfterListEntry ? ',\r\n' : ', ') // TODO: Consolidate to a regex - .replaceAll(']', '') - .replaceAll('[', '') - .replaceAll('"', '') + .replaceAll(',', lineBreakAfterListEntry ? ',\r\n' : ', ') // TODO: Consolidate to a regex + .replaceAll(']', '') + .replaceAll('[', '') + .replaceAll('"', '') : ''; return ; diff --git a/src/report/ReportRecordProcessing.tsx b/src/report/ReportRecordProcessing.tsx index ed850d18d..ec2cee335 100644 --- a/src/report/ReportRecordProcessing.tsx +++ b/src/report/ReportRecordProcessing.tsx @@ -257,7 +257,7 @@ function RenderArray(value) { return mapped; } -function RenderString(value) { +export function RenderString(value) { const str = value?.toString() || ''; if (str.startsWith('http') || str.startsWith('https')) { return ( From 4939f8e907e9c42f9db8a04618a3323d9955557d Mon Sep 17 00:00:00 2001 From: Ananya Date: Tue, 23 Apr 2024 15:43:00 +0530 Subject: [PATCH 2/5] Link displayed in two lines --- src/component/misc/DataGridExpandRenderer.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/component/misc/DataGridExpandRenderer.tsx b/src/component/misc/DataGridExpandRenderer.tsx index 799b460e8..08a018110 100644 --- a/src/component/misc/DataGridExpandRenderer.tsx +++ b/src/component/misc/DataGridExpandRenderer.tsx @@ -108,7 +108,8 @@ const GridCellExpand = React.memo((props: GridCellExpandProps) => { export function renderCellExpand(params: GridRenderCellParams, lineBreakAfterListEntry: boolean) { let value = params.value?.low ? params.value.low : params.value; if (typeof value === 'string' || value instanceof String) { - return RenderString(value) + const displayLink = RenderString(value); + return ; } const stringifiedObj = value From 4fef6170210042b7d83d7dbdf218b74f9557480c Mon Sep 17 00:00:00 2001 From: Ananya Date: Tue, 30 Apr 2024 15:38:16 +0530 Subject: [PATCH 3/5] if-else to ternary operator --- src/component/misc/DataGridExpandRenderer.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/component/misc/DataGridExpandRenderer.tsx b/src/component/misc/DataGridExpandRenderer.tsx index 08a018110..4a5a889f3 100644 --- a/src/component/misc/DataGridExpandRenderer.tsx +++ b/src/component/misc/DataGridExpandRenderer.tsx @@ -107,9 +107,8 @@ const GridCellExpand = React.memo((props: GridCellExpandProps) => { export function renderCellExpand(params: GridRenderCellParams, lineBreakAfterListEntry: boolean) { let value = params.value?.low ? params.value.low : params.value; - if (typeof value === 'string' || value instanceof String) { - const displayLink = RenderString(value); - return ; + const displayLink = typeof value === 'string' || value instanceof String ? RenderString(value) : ''; + return ; } const stringifiedObj = value From cbd0b6429ababd0ae477fb94b2d435e67baf10b7 Mon Sep 17 00:00:00 2001 From: Ananya Date: Thu, 2 May 2024 16:55:40 +0530 Subject: [PATCH 4/5] PR reviews implemented --- src/component/misc/DataGridExpandRenderer.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/misc/DataGridExpandRenderer.tsx b/src/component/misc/DataGridExpandRenderer.tsx index 4a5a889f3..07899a9a6 100644 --- a/src/component/misc/DataGridExpandRenderer.tsx +++ b/src/component/misc/DataGridExpandRenderer.tsx @@ -109,7 +109,7 @@ export function renderCellExpand(params: GridRenderCellParams, line let value = params.value?.low ? params.value.low : params.value; const displayLink = typeof value === 'string' || value instanceof String ? RenderString(value) : ''; return ; - } + const stringifiedObj = value ? JSON.stringify(value) @@ -119,5 +119,5 @@ export function renderCellExpand(params: GridRenderCellParams, line .replaceAll('"', '') : ''; - return ; + //return ; } From f528f2c343391ce6124a6ca08267a0918a8dd750 Mon Sep 17 00:00:00 2001 From: Ananya Date: Fri, 3 May 2024 08:56:34 +0530 Subject: [PATCH 5/5] removed old code --- src/component/misc/DataGridExpandRenderer.tsx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/component/misc/DataGridExpandRenderer.tsx b/src/component/misc/DataGridExpandRenderer.tsx index 07899a9a6..8450d7bd4 100644 --- a/src/component/misc/DataGridExpandRenderer.tsx +++ b/src/component/misc/DataGridExpandRenderer.tsx @@ -109,15 +109,5 @@ export function renderCellExpand(params: GridRenderCellParams, line let value = params.value?.low ? params.value.low : params.value; const displayLink = typeof value === 'string' || value instanceof String ? RenderString(value) : ''; return ; - - const stringifiedObj = value - ? JSON.stringify(value) - .replaceAll(',', lineBreakAfterListEntry ? ',\r\n' : ', ') // TODO: Consolidate to a regex - .replaceAll(']', '') - .replaceAll('[', '') - .replaceAll('"', '') - : ''; - - //return ; }