@@ -129,6 +122,7 @@
Update {{ data.name }}
mat-raised-button
color="primary"
(click)="done()"
+ [disabled]="form.invalid || !costEstimation"
>
Update
diff --git a/webgui/webapp/src/app/pages/admin-page/components/admin-user-click-dialog/admin-user-click-dialog.component.ts b/webgui/webapp/src/app/pages/admin-page/components/admin-user-click-dialog/admin-user-click-dialog.component.ts
index da0cdd2..747f6f3 100644
--- a/webgui/webapp/src/app/pages/admin-page/components/admin-user-click-dialog/admin-user-click-dialog.component.ts
+++ b/webgui/webapp/src/app/pages/admin-page/components/admin-user-click-dialog/admin-user-click-dialog.component.ts
@@ -14,13 +14,23 @@ import {
FormGroup,
FormsModule,
ReactiveFormsModule,
+ Validators,
} from '@angular/forms';
import { AdminService } from 'src/app/pages/admin-page/services/admin.service';
-import { catchError, of } from 'rxjs';
+import {
+ catchError,
+ debounceTime,
+ distinctUntilChanged,
+ forkJoin,
+ of,
+} from 'rxjs';
import * as _ from 'lodash';
import { ComponentSpinnerComponent } from 'src/app/components/component-spinner/component-spinner.component';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
+import { AwsService } from 'src/app/services/aws.service';
+import { bytesToGigabytes, gigabytesToBytes } from 'src/app/utils/file';
+import { UserQuotaService } from 'src/app/services/userquota.service';
@Component({
selector: 'app-admin-user-click-dialog',
@@ -48,44 +58,108 @@ export class AdminUserClickDialogComponent implements OnInit {
protected loading = false;
protected disableDelete = false;
+ // quota
+ protected costEstimation: number | null = 0;
+ protected usageSize = 0;
+ protected usageCount = 0;
+
constructor(
public dialogRef: MatDialogRef
,
private fb: FormBuilder,
private as: AdminService,
+ private uq: UserQuotaService,
+ private aws: AwsService,
private dg: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any,
) {
this.form = this.fb.group({
administrators: [false],
- managers: [false],
+ quotaSize: ['', [Validators.required, Validators.min(0)]],
+ quotaQueryCount: ['', [Validators.required, Validators.min(0)]],
});
}
ngOnInit(): void {
+ this.dialogRef.afterOpened().subscribe(() => {
+ this.getUserGroups();
+ });
+
+ this.onChangeCalculateCost();
+ }
+
+ onChangeCalculateCost() {
+ this.form.valueChanges
+ .pipe(debounceTime(400), distinctUntilChanged())
+ .subscribe((values) => {
+ if (values.quotaQueryCount && values.quotaSize) {
+ this.aws
+ .calculateQuotaEstimationPerMonth(
+ values.quotaQueryCount,
+ values.quotaSize,
+ )
+
+ .subscribe((res) => {
+ this.costEstimation = res;
+ });
+ }
+ });
+ }
+
+ getUserGroups() {
this.loading = true;
- this.as
+ // Define both observables
+ const userQuota$ = this.uq
+ .getUserQuota(this.data.sub)
+ .pipe(catchError(() => of(null)));
+
+ const userGroups$ = this.as
.listUsersGroups(this.data.email)
- .pipe(catchError(() => of(null)))
- .subscribe((response: any) => {
- const groups = _.get(response, 'groups', []);
- const user = _.get(response, 'user', null);
- const authorizer = _.get(response, 'authorizer', null);
- const groupNames = _.map(
- groups,
- (group) => _.split(group.GroupName, '-')[0],
- );
- const userGroups: { [key: string]: boolean } = {};
- _.each(groupNames, (gn: string) => {
- userGroups[gn] = true;
- });
- _.merge(this.initialGroups, userGroups);
- this.form.patchValue(userGroups);
- if (user === authorizer) {
- this.form.get('administrators')?.disable();
- this.disableDelete = true;
+ .pipe(catchError(() => of(null)));
+
+ // Use forkJoin to run them in parallel
+ forkJoin({ userQuota: userQuota$, userGroups: userGroups$ }).subscribe(
+ ({ userQuota, userGroups }) => {
+ // Process user quota response
+ if (userQuota) {
+ this.costEstimation = userQuota.CostEstimation;
+ this.usageSize = userQuota.Usage.usageSize;
+ this.usageCount = userQuota.Usage.usageCount;
+
+ this.form.patchValue({
+ quotaSize: bytesToGigabytes(userQuota.Usage.quotaSize),
+ quotaQueryCount: userQuota.Usage.quotaQueryCount,
+ });
+ }
+
+ // Process user groups response
+ if (userGroups) {
+ const groups = _.get(userGroups, 'groups', []);
+ const user = _.get(userGroups, 'user', null);
+ const authorizer = _.get(userGroups, 'authorizer', null);
+ const groupNames = _.map(
+ groups,
+ (group) => _.split(group.GroupName, '-')[0],
+ );
+ const userGroupsObj: { [key: string]: boolean } = {};
+ _.each(groupNames, (gn: string) => {
+ userGroupsObj[gn] = true;
+ });
+ _.merge(this.initialGroups, userGroupsObj);
+ this.form.patchValue(userGroupsObj);
+
+ if (user === authorizer) {
+ this.form.get('administrators')?.disable();
+ this.disableDelete = true;
+ }
}
+
this.loading = false;
- });
+ },
+ (error) => {
+ console.error('Error loading user data:', error);
+ this.loading = false;
+ },
+ );
}
async delete() {
@@ -117,19 +191,33 @@ export class AdminUserClickDialogComponent implements OnInit {
this.dialogRef.close();
}
- done(): void {
- if (_.isEqual(this.initialGroups, this.form.value)) {
- this.dialogRef.close();
- return;
- }
+ updateQuota() {
+ return this.uq
+ .upsertUserQuota(this.data.sub, this.costEstimation, {
+ quotaSize: gigabytesToBytes(this.form.value.quotaSize),
+ quotaQueryCount: this.form.value.quotaQueryCount,
+ usageSize: this.usageSize, // bytes
+ usageCount: this.usageCount,
+ })
+ .pipe(catchError(() => of(null)));
+ }
+ updateUser() {
+ const groups = _.pick(this.form.value, ['administrators']);
+ return this.as
+ .updateUsersGroups(this.data.email, groups)
+ .pipe(catchError(() => of(null)));
+ }
+
+ done(): void {
this.loading = true;
- this.as
- .updateUsersGroups(this.data.email, this.form.value)
- .pipe(catchError(() => of(null)))
- .subscribe(() => {
- this.loading = false;
- this.dialogRef.close();
- });
+
+ const updateQuota$ = this.updateQuota();
+ const updateUser$ = this.updateUser();
+
+ forkJoin([updateQuota$, updateUser$]).subscribe(() => {
+ this.loading = false;
+ this.dialogRef.close();
+ });
}
}
diff --git a/webgui/webapp/src/app/pages/clinic-page/svep-results/svep-results.component.html b/webgui/webapp/src/app/pages/clinic-page/svep-results/svep-results.component.html
index aca29b6..1917cec 100644
--- a/webgui/webapp/src/app/pages/clinic-page/svep-results/svep-results.component.html
+++ b/webgui/webapp/src/app/pages/clinic-page/svep-results/svep-results.component.html
@@ -16,6 +16,7 @@ View Results
class="w-[110px] mr-1"
mat-raised-button
color="primary"
+ style="color: white"
[routerLink]="[]"
[queryParams]="{ jobId: requestIdFormControl.value }"
>Load
-
+
Login