mpana/sc-portal
Archived
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases Wiki Activity

fetch _all_ packages and only filter the displayed ones

Browse Source 
fetch _all_ packages and only filter the displayed ones so that old images can still grab info about their package
This commit is contained in:
Dragos 2021-06-01 14:30:04 +03:00
parent 4a100cf9d4
commit bffce99fb0
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/app/catalog/helpers/catalog.service.ts
View File

@ -46,23 +46,18 @@ export class CatalogService
{ {
return this.httpClient.get(`./assets/data/packages.json`).pipe(map(prices => return this.httpClient.get(`./assets/data/packages.json`).pipe(map(prices =>
{ {
let filteredPackages: CatalogPackage[] = []; packages.forEach(pkg =>
{
pkg.price = prices[pkg.id];
for (let pkg of packages) let size = this.fileSizePipe.transform(pkg.memory * 1024 * 1024);
if (pkg.group === PackageGroupsEnum.Vm || pkg.group === PackageGroupsEnum.Infra) [pkg.memorySize, pkg.memorySizeLabel] = size.split(' ');
{
pkg.price = prices[pkg.id];
let size = this.fileSizePipe.transform(pkg.memory * 1024 * 1024); size = this.fileSizePipe.transform(pkg.disk * 1024 * 1024);
[pkg.memorySize, pkg.memorySizeLabel] = size.split(' '); [pkg.diskSize, pkg.diskSizeLabel] = size.split(' ');
});
size = this.fileSizePipe.transform(pkg.disk * 1024 * 1024); return packages;
[pkg.diskSize, pkg.diskSizeLabel] = size.split(' ');
filteredPackages.push(pkg);
}
return filteredPackages;
})) }))
})); }));
} }

3
app/src/app/catalog/packages/packages.component.ts
View File

@ -62,7 +62,8 @@ export class PackagesComponent implements OnInit, OnDestroy, OnChanges
this.catalogService.getPackages() this.catalogService.getPackages()
.subscribe(response => .subscribe(response =>
{ {
this._packages = response; this._packages = response.filter(pkg => pkg.group === PackageGroupsEnum.Vm ||
pkg.group === PackageGroupsEnum.Infra);
this.setPackagesByImageType(); this.setPackagesByImageType();