Destructured visMetaData and dataConfig Objects in all visualizations #1106
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,5 +7,6 @@ | |
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100%; | ||
| font-size: 20px; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,8 @@ import { find, isEmpty, last, some } from 'lodash'; | |
| import React, { useMemo } from 'react'; | ||
| import { | ||
| AGGREGATIONS, | ||
| BREAKDOWNS, | ||
| DEFAULT_BAR_CHART_STYLES, | ||
| GROUPBY, | ||
| } from '../../../../../common/constants/explorer'; | ||
| import { | ||
|
|
@@ -37,36 +37,61 @@ export const Bar = ({ visualizations, layout, config }: any) => { | |
| data: queriedVizData, | ||
| metadata: { fields }, | ||
| }, | ||
| userConfigs: { | ||
| dataConfig: { | ||
| colorTheme = [], | ||
| chartStyles = {}, | ||
| span = {}, | ||
| legend = {}, | ||
| panelOptions = {}, | ||
| [GROUPBY]: dimensions = [], | ||
| [AGGREGATIONS]: series = [], | ||
| [BREAKDOWNS]: breakdowns = [], | ||
| } = {}, | ||
| layoutConfig = {}, | ||
| availabilityConfig = {}, | ||
| }, | ||
| }, | ||
| vis: { | ||
| type, | ||
| icontype, | ||
| fillopacity, | ||
| orientation, | ||
| labelangle, | ||
| linewidth, | ||
| barwidth, | ||
| groupwidth, | ||
| showlegend, | ||
| legendposition, | ||
| }, | ||
| }: IVisualizationContainerProps = visualizations; | ||
|
|
||
|
There was a problem hiding this comment. You could destruct visMetaData at line 30 directly without renaming. Please apply this code review to all other charts that have this similar problem. There was a problem hiding this comment. Hi @mengweieric, this is already taken care, can you please check once https://github.com/opensearch-project/observability/pull/1106/files (commit id: 95fef81) |
||
| const lastIndex = fields.length - 1; | ||
|
|
||
| /** | ||
| * determine stylings | ||
| */ | ||
| const barOrientation = chartStyles.orientation || orientation; | ||
| const isVertical = barOrientation === BarOrientation.vertical; | ||
| const tickAngle = chartStyles.rotateBarLabels || labelangle; | ||
| const lineWidth = chartStyles.lineWidth || linewidth; | ||
| const fillOpacity = | ||
| chartStyles.fillOpacity !== undefined | ||
| ? chartStyles.fillOpacity / FILLOPACITY_DIV_FACTOR | ||
| : fillopacity / FILLOPACITY_DIV_FACTOR; | ||
| const barWidth = 1 - (chartStyles.barWidth || barwidth); | ||
| const groupWidth = 1 - (chartStyles.groupWidth || groupwidth); | ||
| const showLegend = !(legend.showLegend && legend.showLegend !== showlegend); | ||
| const legendPosition = legend.position || legendposition; | ||
|
|
||
| visualizations.data?.rawVizData?.dataConfig?.metrics | ||
| ? visualizations.data.rawVizData.dataConfig.metrics | ||
| : []; | ||
| const labelSize = chartStyles.labelSize || DEFAULT_BAR_CHART_STYLES.LabelSize; | ||
| const legendSize = legend.legendSize; | ||
| const getSelectedColorTheme = (field: any, index: number) => | ||
| (colorTheme.length > 0 && | ||
| colorTheme.find((colorSelected) => colorSelected.name.name === field.label)?.color) || | ||
| PLOTLY_COLOR[index % PLOTLY_COLOR.length]; | ||
|
|
||
| let bars; | ||
|
|
@@ -76,30 +101,29 @@ export const Bar = ({ visualizations, layout, config }: any) => { | |
| */ | ||
| const xaxes = useMemo(() => { | ||
| // breakdown selections | ||
| if (breakdowns) { | ||
| return [ | ||
| ...dimensions.filter( | ||
| (dimension) => !some(breakdowns, (breakdown) => breakdown.label === dimension.label) | ||
| ), | ||
| ]; | ||
| } | ||
|
|
||
| // span selection | ||
| const timestampField = find(fields, (field) => field.type === 'timestamp'); | ||
| if (span && span.time_field && timestampField) { | ||
| return [timestampField, ...dimensions]; | ||
| } | ||
|
|
||
| return [...dimensions]; | ||
| }, [dimensions, breakdowns]); | ||
|
|
||
| /** | ||
| * determine y axis | ||
| */ | ||
| const yaxes = useMemo(() => { | ||
| return Array.isArray(series) ? [...series] : []; | ||
| }, [series]); | ||
|
|
||
| /** | ||
| * prepare data for visualization, map x-xais to y-xais | ||
|
|
@@ -124,7 +148,7 @@ export const Bar = ({ visualizations, layout, config }: any) => { | |
| return { | ||
| y: isVertical ? queriedVizData[getPropName(yMetric)] : chartAxis, | ||
| x: isVertical ? chartAxis : queriedVizData[getPropName(yMetric)], | ||
| type: type, | ||
| marker: { | ||
| color: fillColor, | ||
| line: { | ||
|
|
@@ -139,12 +163,12 @@ export const Bar = ({ visualizations, layout, config }: any) => { | |
|
|
||
| if ( | ||
| isEmpty(queriedVizData) || | ||
| !Array.isArray(dimensions) || | ||
| !Array.isArray(series) || | ||
| (breakdowns && !Array.isArray(breakdowns)) || | ||
| yaxes.length === 0 | ||
| ) | ||
| return <EmptyPlaceholder icon={icontype} />; | ||
|
|
||
| // If chart has length of result buckets < 16 | ||
| // then use the LONG_CHART_COLOR for all the bars in the chart | ||
|
|
@@ -155,8 +179,8 @@ export const Bar = ({ visualizations, layout, config }: any) => { | |
| colorway: plotlyColorway, | ||
| ...layout, | ||
| ...(layoutConfig.layout && layoutConfig.layout), | ||
| title: panelOptions.title || layoutConfig.layout?.title || '', | ||
| barmode: chartStyles.mode || visualizations.vis.mode, | ||
| xaxis: { | ||
| ...(isVertical && { tickangle: tickAngle }), | ||
| automargin: true, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we take look at reviews from previous PRs and having one more reviewer internally to review to avoid spending effort reviewing the same issues? Previously we've reviewed some similar code already like this, below code piece can be further simplified as
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mengweieric Sure, will ensure in next PRs that such small issues can be addressed internally.