Skip to content

Commit

Permalink
[WEB/UI][#noissue] Fix scatter chart bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@BillionaireDY @binDongKim
BillionaireDY authored and binDongKim committed Mar 21, 2022
1 parent 4d3348d commit b6276c9
Show file tree
Hide file tree
Showing 10 changed files with 123 additions and 123 deletions.
204 changes: 102 additions & 102 deletions web/src/main/angular/package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...c/main/angular/src/app/core/components/scatter-chart/scatter-chart-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ export class ScatterChartContainerComponent implements OnInit, OnDestroy {
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.setScatterY();
Expand Down
4 changes: 2 additions & 2 deletions ...nents/scatter-chart/scatter-chart-for-filtered-map-info-per-server-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ export class ScatterChartForFilteredMapInfoPerServerContainerComponent implement
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.setScatterY();
Expand Down
4 changes: 2 additions & 2 deletions ...e/components/scatter-chart/scatter-chart-for-filtered-map-side-bar-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ export class ScatterChartForFilteredMapSideBarContainerComponent implements OnIn
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.setScatterY();
Expand Down
4 changes: 2 additions & 2 deletions ...p/core/components/scatter-chart/scatter-chart-for-full-screen-mode-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ export class ScatterChartForFullScreenModeContainerComponent implements OnInit,
private messageQueueService: MessageQueueService
) {}
ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.setScatterY();
Expand Down
4 changes: 2 additions & 2 deletions ...pp/core/components/scatter-chart/scatter-chart-for-info-per-server-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ export class ScatterChartForInfoPerServerContainerComponent implements OnInit, A
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.setScatterY();
Expand Down
4 changes: 2 additions & 2 deletions web/src/main/angular/src/app/core/components/scatter-chart/scatter-chart.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ export class ScatterChartComponent implements OnInit, OnDestroy, OnChanges {
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const sampleScatter = this.webAppSettingDataService.getExperimentalOption('scatterSampling');
this.sampleScatter = sampleScatter === null ? configutaion.sampleScatter.value : sampleScatter;
this.sampleScatter = sampleScatter === null ? configuration.sampleScatter.value : sampleScatter;
});
}

Expand Down
4 changes: 2 additions & 2 deletions web/src/main/angular/src/app/core/components/server-map/server-map-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ export class ServerMapContainerComponent implements OnInit, OnDestroy {
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerMapRealTime = this.webAppSettingDataService.getExperimentalOption('serverMapRealTime');
this.enableServerMapRealTime = enableServerMapRealTime === null ? configutaion.enableServerMapRealTime.value : enableServerMapRealTime;
this.enableServerMapRealTime = enableServerMapRealTime === null ? configuration.enableServerMapRealTime.value : enableServerMapRealTime;
});

this.funcServerMapImagePath = this.webAppSettingDataService.getServerMapIconPathMakeFunc();
Expand Down
4 changes: 2 additions & 2 deletions ...app/core/components/state-button/state-button-for-transaction-list-container.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export class StateButtonForTransactionListContainerComponent implements OnInit,
) {}

ngOnInit() {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});


Expand Down
10 changes: 5 additions & 5 deletions ...n/angular/src/app/core/components/transaction-table-grid/transaction-meta-data.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ export class TransactionMetaDataService {
private componentFactoryResolver: ComponentFactoryResolver,
private injector: Injector
) {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configutaion => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configutaion.enableServerSideScanForScatter.value : enableServerSideScan;
});

this.onTransactionDataLoad$ = this.outTransactionDataLoad.asObservable();
this.onTransactionDataRange$ = this.outTransactionDataRange.asObservable();
this.onTransactionDataCount$ = this.outTransactionDataCount.asObservable();
Expand All @@ -63,6 +58,11 @@ export class TransactionMetaDataService {
});
}
loadData(): void {
this.webAppSettingDataService.getExperimentalConfiguration().subscribe(configuration => {
const enableServerSideScan = this.webAppSettingDataService.getExperimentalOption('scatterScan');
this.enableServerSideScan = enableServerSideScan === null ? configuration.enableServerSideScanForScatter.value : enableServerSideScan;
});

if (this.enableServerSideScan) {
this.http.get<{metadata: ITransactionMetaData[], resultFrom: number, complete: boolean}>(this.requestURLV2, this.makeV2RequestOptionsArgs())
.pipe(
Expand Down

0 comments on commit b6276c9

Please sign in to comment.