Skip to content

Commit 1008d39

Browse files
committed
fix: remove conditional rendering for AS_400 module and filter out in module retrieval
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent 64bb9e6 commit 1008d39

2 files changed

Lines changed: 17 additions & 14 deletions

File tree

frontend/src/app/app-module/services/module.service.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,26 @@ export class ModuleService {
6666
return this.serversCache$.pipe(
6767
filter(response => !!response),
6868
tap(() => this.loadingBehaviorSubject$.next(true)),
69-
switchMap(response => this.getModules({
70-
...request,
71-
'serverId.equals': response.body[0].id
72-
}))
69+
switchMap(response =>
70+
this.getModules({
71+
...request,
72+
'serverId.equals': response.body[0].id
73+
})
74+
)
7375
);
7476
}
7577

7678
private getModules(req: RequestModule): Observable<any[]> {
77-
return this.utmModulesService.getModules(req).pipe(
78-
map(response => {
79-
response.body.map(m => {
80-
if (m.moduleName === this.utmModulesEnum.BITDEFENDER) {
81-
m.prettyName = m.prettyName + ' GravityZone';
82-
}
83-
});
84-
return response.body;
85-
}),
79+
return this.utmModulesService.getModules(req)
80+
.pipe(
81+
map(response => {
82+
response.body.map(m => {
83+
if (m.moduleName === this.utmModulesEnum.BITDEFENDER) {
84+
m.prettyName = m.prettyName + ' GravityZone';
85+
}
86+
});
87+
return response.body.filter(m => m.moduleName !== this.utmModulesEnum.AS_400);
88+
}),
8689
catchError(error => {
8790
console.error(error);
8891
this.utmToastService.showError(

frontend/src/app/app-module/shared/components/app-module-card/app-module-card.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="module.moduleName !== UtmModulesEnum.AS_400" class="module-card card text-center p-2 m-0 d-flex flex-column align-items-center justify-content-between">
1+
<div class="module-card card text-center p-2 m-0 d-flex flex-column align-items-center justify-content-between">
22
<div class="d-flex flex-column w-100">
33
<!--<div *ngIf="version === versionType.COMMUNITY && ModulesEnterprise.includes(module.moduleName)" class="d-flex justify-content-end">
44
<span class="badge p-1 border-1 m-1 bg-success-300"> Enterprise </span>

0 commit comments

Comments
 (0)