Browse Source

Feature/update confirmation dialog

pull/3671/head
Daniel Idem 1 year ago
parent
commit
3325f84551
  1. 16
      apps/client/src/app/components/access-table/access-table.component.ts
  2. 12
      apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
  3. 1
      apps/client/src/app/components/admin-overview/admin-overview.component.ts
  4. 4
      apps/client/src/app/components/admin-platform/admin-platform.component.ts
  5. 4
      apps/client/src/app/components/admin-tag/admin-tag.component.ts
  6. 4
      apps/client/src/app/components/admin-users/admin-users.component.ts
  7. 17
      apps/client/src/app/components/user-account-settings/user-account-settings.component.ts

16
apps/client/src/app/components/access-table/access-table.component.ts

@ -1,3 +1,5 @@
import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type';
import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config'; import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
import { Access } from '@ghostfolio/common/interfaces'; import { Access } from '@ghostfolio/common/interfaces';
@ -29,7 +31,7 @@ export class AccessTableComponent implements OnChanges, OnInit {
public defaultLanguageCode = DEFAULT_LANGUAGE_CODE; public defaultLanguageCode = DEFAULT_LANGUAGE_CODE;
public displayedColumns = []; public displayedColumns = [];
public constructor() {} public constructor(private notificationService: NotificationService) {}
public ngOnInit() {} public ngOnInit() {}
@ -46,12 +48,12 @@ export class AccessTableComponent implements OnChanges, OnInit {
} }
public onDeleteAccess(aId: string) { public onDeleteAccess(aId: string) {
const confirmation = confirm( this.notificationService.confirm({
$localize`Do you really want to revoke this granted access?` confirmFn: () => {
);
if (confirmation) {
this.accessDeleted.emit(aId); this.accessDeleted.emit(aId);
} },
confirmType: ConfirmationDialogType.Warn,
title: $localize`Do you really want to revoke this granted access?`
});
} }
} }

12
apps/client/src/app/components/admin-market-data/admin-market-data.service.ts

@ -46,14 +46,6 @@ export class AdminMarketDataService {
} }
); );
forkJoin(deleteRequests)
.pipe(
catchError(() => {
this.notificationService.alert({
title: '',
message: $localize`Oops! Could not delete profiles.`
});
forkJoin(deleteRequests) forkJoin(deleteRequests)
.pipe( .pipe(
catchError(() => { catchError(() => {
@ -65,12 +57,12 @@ export class AdminMarketDataService {
}), }),
finalize(() => { finalize(() => {
window.location.reload(); window.location.reload();
setTimeout(() => { setTimeout(() => {}, 300);
}, 300);
}) })
) )
.subscribe(() => {}); .subscribe(() => {});
}, },
confirmType: ConfirmationDialogType.Warn, confirmType: ConfirmationDialogType.Warn,
title: $localize`Do you really want to delete these profiles?` title: $localize`Do you really want to delete these profiles?`
}); });

1
apps/client/src/app/components/admin-overview/admin-overview.component.ts

@ -1,3 +1,4 @@
import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type';
import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
import { AdminService } from '@ghostfolio/client/services/admin.service'; import { AdminService } from '@ghostfolio/client/services/admin.service';
import { CacheService } from '@ghostfolio/client/services/cache.service'; import { CacheService } from '@ghostfolio/client/services/cache.service';

4
apps/client/src/app/components/admin-platform/admin-platform.component.ts

@ -47,10 +47,10 @@ export class AdminPlatformComponent implements OnInit, OnDestroy {
private dataService: DataService, private dataService: DataService,
private deviceService: DeviceDetectorService, private deviceService: DeviceDetectorService,
private dialog: MatDialog, private dialog: MatDialog,
private notificationService: NotificationService,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router, private router: Router,
private userService: UserService, private userService: UserService
private notificationService: NotificationService
) { ) {
this.route.queryParams this.route.queryParams
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))

4
apps/client/src/app/components/admin-tag/admin-tag.component.ts

@ -47,10 +47,10 @@ export class AdminTagComponent implements OnInit, OnDestroy {
private dataService: DataService, private dataService: DataService,
private deviceService: DeviceDetectorService, private deviceService: DeviceDetectorService,
private dialog: MatDialog, private dialog: MatDialog,
private notificationService: NotificationService,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router, private router: Router,
private userService: UserService, private userService: UserService
private notificationService: NotificationService
) { ) {
this.route.queryParams this.route.queryParams
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))

4
apps/client/src/app/components/admin-users/admin-users.component.ts

@ -41,8 +41,8 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
private changeDetectorRef: ChangeDetectorRef, private changeDetectorRef: ChangeDetectorRef,
private dataService: DataService, private dataService: DataService,
private impersonationStorageService: ImpersonationStorageService, private impersonationStorageService: ImpersonationStorageService,
private userService: UserService, private notificationService: NotificationService,
private notificationService: NotificationService private userService: UserService
) { ) {
this.info = this.dataService.fetchInfo(); this.info = this.dataService.fetchInfo();

17
apps/client/src/app/components/user-account-settings/user-account-settings.component.ts

@ -1,5 +1,5 @@
import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type'; import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type';
import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
import { DataService } from '@ghostfolio/client/services/data.service'; import { DataService } from '@ghostfolio/client/services/data.service';
import { import {
KEY_STAY_SIGNED_IN, KEY_STAY_SIGNED_IN,
@ -76,8 +76,7 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {
private snackBar: MatSnackBar, private snackBar: MatSnackBar,
private tokenStorageService: TokenStorageService, private tokenStorageService: TokenStorageService,
private userService: UserService, private userService: UserService,
public webAuthnService: WebAuthnService, public webAuthnService: WebAuthnService
private notificationService: NotificationService
) { ) {
const { baseCurrency, currencies } = this.dataService.fetchInfo(); const { baseCurrency, currencies } = this.dataService.fetchInfo();
@ -150,18 +149,6 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {
public onCloseAccount() { public onCloseAccount() {
this.notificationService.confirm({ this.notificationService.confirm({
confirmFn: () => { confirmFn: () => {
this.dataService
.deleteOwnUser({
accessToken: this.deleteOwnUserForm.get('accessToken').value
})
.pipe(
catchError(() => {
this.notificationService.alert({
title: '',
message: $localize`Oops! Incorrect Security Token.`
});
if (confirmation) {
this.dataService this.dataService
.deleteOwnUser({ .deleteOwnUser({
accessToken: this.deleteOwnUserForm.get('accessToken').value accessToken: this.deleteOwnUserForm.get('accessToken').value

Loading…
Cancel
Save