Skip to content

Commit

Permalink
[Logs Explorer] Update logs overview highlight render condition (#191958
Browse files Browse the repository at this point in the history 
)

## 📓 Summary

Closes #191862 

The whole section was rendered even when the children highlights
wouldn't exist because the conditional rendering didn't account for the
flattened field value, but only for the formatted one.

Co-authored-by: Marco Antonio Ghiani <marcoantonio.ghiani@elastic.co>
  • Loading branch information
@tonyghiani
tonyghiani and Marco Antonio Ghiani authored Sep 3, 2024
1 parent 21f8c2f commit 5d77095
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions ...nified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview_highlights.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,46 +52,50 @@ export function LogsOverviewHighlights({
value: flattenedDoc[field],
});

const shouldRenderHighlight = (field: keyof LogDocumentOverview) => {
return Boolean(formattedDoc[field] && flattenedDoc[field]);
};

return (
<>
{/* Service & Infrastructure highlight */}
<HighlightSection
title={serviceInfraAccordionTitle}
data-test-subj="unifiedDocViewLogsOverviewHighlightSectionServiceInfra"
>
{formattedDoc[fieldConstants.SERVICE_NAME_FIELD] && (
{shouldRenderHighlight(fieldConstants.SERVICE_NAME_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewService"
label={serviceLabel}
fieldMetadata={fieldsMetadata[fieldConstants.SERVICE_NAME_FIELD]}
{...getHighlightProps(fieldConstants.SERVICE_NAME_FIELD)}
/>
)}
{formattedDoc[fieldConstants.HOST_NAME_FIELD] && (
{shouldRenderHighlight(fieldConstants.HOST_NAME_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewHostName"
label={hostNameLabel}
fieldMetadata={fieldsMetadata[fieldConstants.HOST_NAME_FIELD]}
{...getHighlightProps(fieldConstants.HOST_NAME_FIELD)}
/>
)}
{formattedDoc[fieldConstants.TRACE_ID_FIELD] && (
{shouldRenderHighlight(fieldConstants.TRACE_ID_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewTrace"
label={traceLabel}
fieldMetadata={fieldsMetadata[fieldConstants.TRACE_ID_FIELD]}
{...getHighlightProps(fieldConstants.TRACE_ID_FIELD)}
/>
)}
{formattedDoc[fieldConstants.ORCHESTRATOR_CLUSTER_NAME_FIELD] && (
{shouldRenderHighlight(fieldConstants.ORCHESTRATOR_CLUSTER_NAME_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewClusterName"
label={orchestratorClusterNameLabel}
fieldMetadata={fieldsMetadata[fieldConstants.ORCHESTRATOR_CLUSTER_NAME_FIELD]}
{...getHighlightProps(fieldConstants.ORCHESTRATOR_CLUSTER_NAME_FIELD)}
/>
)}
{formattedDoc[fieldConstants.ORCHESTRATOR_RESOURCE_ID_FIELD] && (
{shouldRenderHighlight(fieldConstants.ORCHESTRATOR_RESOURCE_ID_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewResourceId"
label={orchestratorResourceIdLabel}
Expand All @@ -105,7 +109,7 @@ export function LogsOverviewHighlights({
title={cloudAccordionTitle}
data-test-subj="unifiedDocViewLogsOverviewHighlightSectionCloud"
>
{formattedDoc[fieldConstants.CLOUD_PROVIDER_FIELD] && (
{shouldRenderHighlight(fieldConstants.CLOUD_PROVIDER_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewCloudProvider"
label={cloudProviderLabel}
Expand All @@ -120,31 +124,31 @@ export function LogsOverviewHighlights({
{...getHighlightProps(fieldConstants.CLOUD_PROVIDER_FIELD)}
/>
)}
{formattedDoc[fieldConstants.CLOUD_REGION_FIELD] && (
{shouldRenderHighlight(fieldConstants.CLOUD_REGION_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewCloudRegion"
label={cloudRegionLabel}
fieldMetadata={fieldsMetadata[fieldConstants.CLOUD_REGION_FIELD]}
{...getHighlightProps(fieldConstants.CLOUD_REGION_FIELD)}
/>
)}
{formattedDoc[fieldConstants.CLOUD_AVAILABILITY_ZONE_FIELD] && (
{shouldRenderHighlight(fieldConstants.CLOUD_AVAILABILITY_ZONE_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewCloudAz"
label={cloudAvailabilityZoneLabel}
fieldMetadata={fieldsMetadata[fieldConstants.CLOUD_AVAILABILITY_ZONE_FIELD]}
{...getHighlightProps(fieldConstants.CLOUD_AVAILABILITY_ZONE_FIELD)}
/>
)}
{formattedDoc[fieldConstants.CLOUD_PROJECT_ID_FIELD] && (
{shouldRenderHighlight(fieldConstants.CLOUD_PROJECT_ID_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewCloudProjectId"
label={cloudProjectIdLabel}
fieldMetadata={fieldsMetadata[fieldConstants.CLOUD_PROJECT_ID_FIELD]}
{...getHighlightProps(fieldConstants.CLOUD_PROJECT_ID_FIELD)}
/>
)}
{formattedDoc[fieldConstants.CLOUD_INSTANCE_ID_FIELD] && (
{shouldRenderHighlight(fieldConstants.CLOUD_INSTANCE_ID_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewCloudInstanceId"
label={cloudInstanceIdLabel}
Expand All @@ -158,23 +162,23 @@ export function LogsOverviewHighlights({
title={otherAccordionTitle}
data-test-subj="unifiedDocViewLogsOverviewHighlightSectionOther"
>
{formattedDoc[fieldConstants.LOG_FILE_PATH_FIELD] && (
{shouldRenderHighlight(fieldConstants.LOG_FILE_PATH_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewLogPathFile"
label={logPathFileLabel}
fieldMetadata={fieldsMetadata[fieldConstants.LOG_FILE_PATH_FIELD]}
{...getHighlightProps(fieldConstants.LOG_FILE_PATH_FIELD)}
/>
)}
{formattedDoc[fieldConstants.DATASTREAM_DATASET_FIELD] && (
{shouldRenderHighlight(fieldConstants.DATASTREAM_DATASET_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewDataset"
label={datasetLabel}
fieldMetadata={fieldsMetadata[fieldConstants.DATASTREAM_DATASET_FIELD]}
{...getHighlightProps(fieldConstants.DATASTREAM_DATASET_FIELD)}
/>
)}
{formattedDoc[fieldConstants.DATASTREAM_NAMESPACE_FIELD] && (
{shouldRenderHighlight(fieldConstants.DATASTREAM_NAMESPACE_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewNamespace"
label={namespaceLabel}
Expand All @@ -183,7 +187,7 @@ export function LogsOverviewHighlights({
{...getHighlightProps(fieldConstants.DATASTREAM_NAMESPACE_FIELD)}
/>
)}
{formattedDoc[fieldConstants.AGENT_NAME_FIELD] && (
{shouldRenderHighlight(fieldConstants.AGENT_NAME_FIELD) && (
<HighlightField
data-test-subj="unifiedDocViewLogsOverviewLogShipper"
label={shipperLabel}
Expand Down

0 comments on commit 5d77095

Please sign in to comment.