Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix empty price array crash #108

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/pages/server-compare/server-compare.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,15 @@ export class ServerCompareComponent implements OnInit, AfterViewInit {

server.vendor = vendors.find((v: any) => v.vendor_id === server.vendor_id);

if(server.prices) {
if(server.prices?.length > 0) {
server.prices.forEach((price: any) => {
price.region = regions.find((r: any) => r.region_id === price.region_id);
price.zone = zones.find((z: any) => z.zone_id === price.zone_id);
});
}

server.score = server.benchmark_scores?.find((b: any) => b.benchmark_id === 'stress_ng:cpu_all' && (b.config as any)?.cores === server.vcpus)?.score;
server.price = server.prices ? server.prices[0].price : 0;
server.price = server.prices?.length ? server.prices[0].price : 0;
server.score_per_price = server.price && server.score ? server.score / server.price : (server.score || 0);

this.servers.push(server);
Expand Down
19 changes: 11 additions & 8 deletions src/app/pages/server-details/server-details.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,17 +215,20 @@ export class ServerDetailsComponent implements OnInit, OnDestroy {
this.serverDetails = JSON.parse(JSON.stringify(serverDetails)) as any;

this.serverDetails.benchmark_scores = benchmarks;
this.serverDetails.prices = JSON.parse(JSON.stringify(prices))?.sort((a: any, b: any) => a.price - b.price);
this.serverDetails.vendor = vendors.find((v: any) => v.vendor_id === this.serverDetails.vendor_id);
this.serverDetails.score = this.serverDetails.benchmark_scores?.find((b) => b.benchmark_id === 'stress_ng:cpu_all' && (b.config as any)?.cores === this.serverDetails.vcpus)?.score;
this.serverDetails.price = this.serverDetails.prices ? this.serverDetails.prices[0].price : 0;
this.serverDetails.score_per_price = this.serverDetails.price && this.serverDetails.score ? this.serverDetails.score / this.serverDetails.price : (this.serverDetails.score || 0);

if(this.serverDetails.prices) {
this.serverDetails.prices.forEach((price: any) => {
price.region = regions.find((r: any) => r.region_id === price.region_id);
price.zone = zones.find((z: any) => z.zone_id === price.zone_id);
});
if(prices) {
this.serverDetails.prices = JSON.parse(JSON.stringify(prices))?.sort((a: any, b: any) => a.price - b.price);

if(this.serverDetails.prices?.length > 0) {
this.serverDetails.price = this.serverDetails.prices ? this.serverDetails.prices[0].price : 0;
this.serverDetails.prices.forEach((price: any) => {
price.region = regions.find((r: any) => r.region_id === price.region_id);
price.zone = zones.find((z: any) => z.zone_id === price.zone_id);
});
}
}

// list all regions where the server is available
Expand Down Expand Up @@ -461,7 +464,7 @@ export class ServerDetailsComponent implements OnInit, OnDestroy {
}
}
}).catch((error) => {

console.error(error);
if(error?.status === 404) {
this.toastErrorMsg = 'Server not found. Please try again later.';
} else if(error?.status === 500) {
Expand Down