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.

Sign up for GitHub

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

GMS-65 frontend bugfixes #145

Merged
merged 2 commits into from
Dec 6, 2023
Merged

GMS-65 frontend bugfixes #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a9bf2a
GMS-65 Frontend bugfixes
peter-szrnka Dec 6, 2023
c90191f
GMS-65 Fix of component
peter-szrnka Dec 6, 2023
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
14 changes: 7 additions & 7 deletions code/gms-frontend/src/app/components/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div *ngIf="data">
<div *ngIf="data.admin === false">
<div *ngIf="data !== undefined && loading !== ''">
<div *ngIf="data.role === 'ROLE_USER'">
<div class="gms-box">
<div class="warning" *ngIf="!loading && data.apiKeyCount === 0">
<div class="warning" *ngIf="loading === 'LOADED' && data.apiKeyCount === 0">
Please add an API key!
</div>
<div class="warning" *ngIf="!loading && data.keystoreCount === 0">
<div class="warning" *ngIf="loading === 'LOADED' && data.keystoreCount === 0">
Please add a keystore!
</div>
<div class="gms-sub-box">
Expand Down Expand Up @@ -47,17 +47,17 @@
</div>
</div>
</div>
<div *ngIf="data.admin">
<div *ngIf="data.role === 'ROLE_ADMIN'">
<div class="gms-box">
<div class="gms-sub-box">
<mat-card class="gms-card-left">
<mat-card-content>
<mat-card-title>User management</mat-card-title>
<mat-card-subtitle>Manage your users</mat-card-subtitle>
<div class="warning" *ngIf="data.userCount === 0">
<div class="warning" *ngIf="loading === 'LOADED' && data.userCount === 0">
<b>Warning:</b> No user registered yet!
</div>
<p *ngIf="data.userCount > 0">
<p *ngIf="loading === 'LOADED' && data.userCount > 0">
Number of users: <b>{{data.userCount}}</b><br />
</p>
</mat-card-content>
Expand Down
2 changes: 1 addition & 1 deletion code/gms-frontend/src/app/components/home/home.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ tr th {

@media screen and (min-width: 1200px) {
.gms-sub-box {
display: inline-table;
display: inline-block;
width: 50%;
}

Expand Down
2 changes: 1 addition & 1 deletion code/gms-frontend/src/app/components/home/home.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('HomeComponent', () => {
totalElements: 0
},
userCount: 1,
admin: true,
role: 'ROLE_ADMIN',
apiKeyCount: 0,
keystoreCount: 0,
announcementCount: 0,
Expand Down
9 changes: 5 additions & 4 deletions code/gms-frontend/src/app/components/home/home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { ArrayDataSource } from "@angular/cdk/collections";
import { Component, OnInit } from "@angular/core";
import { Router } from "@angular/router";
import { SharedDataService } from "../../common/service/shared-data-service";
import { isSpecificUser } from "../../common/utils/permission-utils";
import { Event } from "../event/model/event.model";
import { User } from "../user/model/user.model";
import { EMPTY_HOME_DATA, HomeData } from "./model/home-data.model";
Expand All @@ -22,7 +21,7 @@ export class HomeComponent implements OnInit {
eventColumns: string[] = ['id', 'userId', 'eventDate', 'operation', 'target'];
eventDataSource: ArrayDataSource<Event>;
data: HomeData;
loading = true;
loading: string = '';

constructor(
public router: Router,
Expand All @@ -31,6 +30,7 @@ export class HomeComponent implements OnInit {
) {}

ngOnInit(): void {
this.loading = 'LOADING';
this.sharedData.userSubject$
.pipe(mergeMap((user: User | undefined): Observable<HomeData> => this.processUser(user)))
.subscribe((homeData: HomeData) => {
Expand All @@ -39,7 +39,7 @@ export class HomeComponent implements OnInit {
...homeData
};
this.eventDataSource = new ArrayDataSource<Event>(this.data.events.resultList);
this.loading = false;
this.loading = 'LOADED';
});
}

Expand All @@ -50,7 +50,8 @@ export class HomeComponent implements OnInit {

return this.homeService.getData().pipe(map((response): HomeData => {
const data: HomeData = response;
data.admin = isSpecificUser(user.roles, 'ROLE_ADMIN');
// TODO Refactor the app to allow only 1 type of role
data.role = user.roles[0];
return data;
}));
}
Expand Down
4 changes: 2 additions & 2 deletions code/gms-frontend/src/app/components/home/model/home-data.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export interface HomeData {
userCount : number,
announcements : AnnouncementList,
events : EventList,
admin? : boolean
role? : string
}

export const EMPTY_HOME_DATA: HomeData = {
Expand All @@ -25,7 +25,7 @@ export const EMPTY_HOME_DATA: HomeData = {
totalElements: 0
},
userCount: 0,
admin: false,
role: undefined,
apiKeyCount: 0,
keystoreCount: 0,
announcementCount: 0,
Expand Down
Loading