Dev 349 forreal #125
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
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 |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ import { ServerCompareService } from '../../services/server-compare.service'; | |
| import { DropdownManagerService } from '../../services/dropdown-manager.service'; | ||
| import { AnalyticsService } from '../../services/analytics.service'; | ||
| import { CurrencyOption, availableCurrencies } from '../../tools/shared_data'; | ||
| import { ChartFromBenchmarkTemplate, ChartFromBenchmarkTemplateOptions, redisChartTemplate, redisChartTemplateCallbacks, staticWebChartCompareTemplate, staticWebChartTemplate, staticWebChartTemplateCallbacks } from '../server-details/chartFromBenchmarks'; | ||
|
|
||
| Chart.register(annotationPlugin); | ||
|
|
||
|
|
@@ -165,6 +166,23 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
|
|
||
| selectedRedisOption: any = this.redisOptions[0]; | ||
|
|
||
| multiBarCharts: any[] = [ | ||
| { | ||
| chart: JSON.parse(JSON.stringify(redisChartTemplate)), | ||
| callbacks: redisChartTemplateCallbacks, | ||
| dropdown: undefined, | ||
| data: [], | ||
| show_more: false, | ||
| }, | ||
| { | ||
| chart: JSON.parse(JSON.stringify(staticWebChartCompareTemplate)), | ||
| callbacks: staticWebChartTemplateCallbacks, | ||
| dropdown: undefined, | ||
| data: [], | ||
| show_more: false, | ||
| } | ||
| ]; | ||
|
|
||
|
Comment on lines
+169
to
+185
There was a problem hiding this comment. 🛠️ Refactor suggestion Specify types and avoid inefficient object cloning in The Additionally, using Example: // Define an interface for chart items
interface MultiBarChartItem {
chart: ChartFromBenchmarkTemplate;
callbacks: any;
dropdown?: any;
data: any[];
show_more: boolean;
}
// Declare the array with the specific type
multiBarCharts: MultiBarChartItem[] = [
{
chart: { ...redisChartTemplate },
callbacks: redisChartTemplateCallbacks,
dropdown: undefined,
data: [],
show_more: false,
},
{
chart: { ...staticWebChartCompareTemplate },
callbacks: staticWebChartTemplateCallbacks,
dropdown: undefined,
data: [],
show_more: false,
}
]; |
||
| compressDropdown: any; | ||
| availableCompressMethods: any[] = []; | ||
| selectedCompressMethod: any; | ||
|
|
@@ -401,20 +419,38 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| category.data = this.benchmarkMeta.filter((b: any) => category.benchmarks.includes(b.benchmark_id)); | ||
| }); | ||
|
|
||
| this.multiBarCharts.forEach((chartTemplate) => { | ||
| const benchmarks = chartTemplate.chart.options.map((o: any) => o.benchmark_id); | ||
| chartTemplate.data = this.benchmarkMeta.filter((b: any) => benchmarks.includes(b.benchmark_id)); | ||
| }); | ||
|
|
||
| if(isPlatformBrowser(this.platformId)) { | ||
|
|
||
| this.initializeBenchmarkCharts(); | ||
|
|
||
| this.getCompressChartOptions(); | ||
|
|
||
| this.generateChartsData(); | ||
| this.generateBWMemChart(); | ||
| this.generateSSLChart(); | ||
| this.generateCompressChart(); | ||
| //this.generateMultiBarChart(this.selectedStaticWebOption, this.selectedConnections); | ||
| //this.generateMultiBarChart(this.selectedRedisOption, this.selectedOperation); | ||
|
|
||
| this.multiBarCharts.forEach((chart) => { | ||
| this.generateMultiBarChart(chart.chart); | ||
| }); | ||
|
Comment on lines
+440
to
+442
There was a problem hiding this comment. Verify the argument passed to In the loop, Apply this fix: - this.generateMultiBarChart(chart.chart);
+ this.generateMultiBarChart(chart);
|
||
|
|
||
| this.dropdownManager.initDropdown('currency_button', 'currency_options').then((dropdown) => { | ||
| this.dropdownCurrency = dropdown; | ||
| }); | ||
|
|
||
| this.multiBarCharts.forEach((chart) => { | ||
| this.dropdownManager.initDropdown(chart.chart.id + '_button', chart.chart.id + '_options').then((dropdown) => { | ||
| chart.dropdown = dropdown; | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| }).catch((err) => { | ||
| this.analytics.SentryException(err, {tags: { location: this.constructor.name, function: 'compareInit' }}); | ||
|
|
@@ -915,14 +951,23 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| } | ||
| } | ||
|
|
||
| generateMultiBarChart(chartTemplate: ChartFromBenchmarkTemplate) { | ||
|
|
||
| const option: ChartFromBenchmarkTemplateOptions = chartTemplate.options[chartTemplate.selectedOption]; | ||
| const benchmark_id = option.benchmark_id; | ||
| const labelsField = option.labelsField; | ||
| const scaleField = option.scaleField; | ||
|
|
||
| if(!chartTemplate.secondaryOptions || chartTemplate.selectedSecondaryOption === undefined) { | ||
| return; | ||
| } | ||
|
|
||
| const optionsSecondary = chartTemplate.secondaryOptions[chartTemplate.selectedSecondaryOption]; | ||
|
|
||
| console.log(optionsSecondary, labelsField); | ||
|
|
||
| const labelValue = optionsSecondary.value; | ||
| const selectedName = optionsSecondary.name; | ||
|
|
||
| const dataSet = this.benchmarkMeta?.find((x: any) => x.benchmark_id === benchmark_id); | ||
|
|
||
|
|
@@ -966,7 +1011,7 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| chartData.datasets[i].data.push({ | ||
| data:item.score, | ||
| label: size, | ||
| unit: option.YLabel, | ||
| note: item.note | ||
| }); | ||
| } else { | ||
|
|
@@ -975,6 +1020,19 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| }); | ||
| }); | ||
|
|
||
| console.log(chartData); | ||
|
|
||
| if(chartData) { | ||
| chartTemplate.chartData = { labels: chartData.labels, datasets: chartData.datasets }; | ||
| chartTemplate.chartOptions.scales.y.title.text = option.YLabel; | ||
| chartTemplate.chartOptions.scales.x.title.text = option.XLabel; | ||
| chartTemplate.chartOptions.plugins.title.text = option.title; | ||
| } else { | ||
| chartTemplate.chartData = undefined; | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| if(benchmark_id.includes('static_web')) { | ||
| this.barChartDataStaticWeb = { labels: chartData.labels, datasets: chartData.datasets }; | ||
|
|
||
|
|
@@ -1007,6 +1065,7 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| }); | ||
| } | ||
| } | ||
| */ | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1140,6 +1199,30 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
| } | ||
| } | ||
|
|
||
| initializeBenchmarkCharts() { | ||
|
|
||
| this.multiBarCharts.forEach((chartItem: any) => { | ||
| chartItem.chart.chartOptions.plugins.tooltip.callbacks = chartItem.callbacks; | ||
| this.initializeMultiBarChart(chartItem.chart); | ||
| }); | ||
| } | ||
|
|
||
| initializeMultiBarChart(chartTemplate: ChartFromBenchmarkTemplate) { | ||
| chartTemplate.options.forEach((option: ChartFromBenchmarkTemplateOptions) => { | ||
| const benchmark = this.benchmarkMeta.find((b: any) => b.benchmark_id === option.benchmark_id); | ||
| if(benchmark) { | ||
| option.name = benchmark.name; | ||
| option.unit = benchmark.unit; | ||
| option.higher_is_better = benchmark.higher_is_better; | ||
| option.icon = benchmark.higher_is_better ? 'circle-arrow-up' : 'circle-arrow-down'; | ||
| option.tooltip = benchmark.higher_is_better ? 'Higher is better' : 'Lower is better'; | ||
| option.title = ' ' | ||
| option.XLabel = benchmark.config_fields ? ((benchmark.config_fields as any)[option.scaleField] as string) : ''; | ||
| option.YLabel = benchmark.unit; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| isBrowser() { | ||
| return isPlatformBrowser(this.platformId); | ||
| } | ||
|
|
@@ -1195,25 +1278,25 @@ export class ServerCompareComponent implements OnInit, AfterViewInit { | |
|
|
||
| selectStaticWebOption(item: any) { | ||
| this.selectedStaticWebOption = item; | ||
| //this.generateMultiBarChart(this.selectedStaticWebOption, this.selectedConnections); | ||
| this.dropdownStaticWeb?.hide(); | ||
| } | ||
|
|
||
| selectStaticWebConnOption(item: any) { | ||
| this.selectedConnections = item; | ||
| //this.generateMultiBarChart(this.selectedStaticWebOption, this.selectedConnections); | ||
| this.dropdownConnections?.hide(); | ||
| } | ||
|
|
||
| selectRedisOption(item: any) { | ||
| this.selectedRedisOption = item; | ||
| //this.generateMultiBarChart(this.selectedRedisOption, this.selectedOperation); | ||
| this.dropdownRedis?.hide(); | ||
| } | ||
|
|
||
| selectRedisOpOption(item: any) { | ||
| this.selectedOperation = item; | ||
| //this.generateMultiBarChart(this.selectedRedisOption, this.selectedOperation); | ||
| this.dropdownOperation?.hide(); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
Remove Placeholder Text "FOOBAR" from Header
The header at line 514 contains a hardcoded string
"FOOBAR"which appears to be a placeholder or leftover from debugging. It should be removed to ensure the chart displays the correct name.Apply this diff to fix the issue:
📝 Committable suggestion