Browse Source

Align with account dialog host

pull/7472/head
Thomas Kaul 3 weeks ago
parent
commit
162f6e3392
  1. 4
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  2. 15
      apps/client/src/app/pages/portfolio/activities/activity-dialog-host/activity-dialog-host.component.ts

4
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -324,7 +324,9 @@ export class GfActivitiesPageComponent implements OnInit {
this.hasPermissionToCreateActivity = this.hasPermissionToCreateActivity =
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user.permissions, permissions.createActivity); hasPermission(this.user.permissions, permissions.createActivity) &&
!this.user.settings?.isRestrictedView;
this.hasPermissionToDeleteActivity = this.hasPermissionToDeleteActivity =
!this.hasImpersonationId && !this.hasImpersonationId &&
hasPermission(this.user.permissions, permissions.deleteActivity); hasPermission(this.user.permissions, permissions.deleteActivity);

15
apps/client/src/app/pages/portfolio/activities/activity-dialog-host/activity-dialog-host.component.ts

@ -18,8 +18,9 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatDialog, MatDialogRef } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { DeviceDetectorService } from 'ngx-device-detector'; import { DeviceDetectorService } from 'ngx-device-detector';
import { Observable, of, Subject } from 'rxjs'; import { EMPTY, Observable, of, Subject } from 'rxjs';
import { import {
catchError,
distinctUntilChanged, distinctUntilChanged,
map, map,
switchMap, switchMap,
@ -78,16 +79,17 @@ export class GfActivityDialogHostComponent implements OnDestroy, OnInit {
return { activity, user }; return { activity, user };
}) })
); );
}),
catchError(() => {
this.navigateBack();
return EMPTY;
}) })
); );
}), }),
takeUntilDestroyed(this.destroyRef) takeUntilDestroyed(this.destroyRef)
) )
.subscribe({ .subscribe(({ activity, user }) => {
error: () => {
this.navigateBack();
},
next: ({ activity, user }) => {
if (mode === 'update') { if (mode === 'update') {
if ( if (
!activity || !activity ||
@ -134,7 +136,6 @@ export class GfActivityDialogHostComponent implements OnDestroy, OnInit {
}, },
isUpdate: false isUpdate: false
}); });
}
}); });
} }

Loading…
Cancel
Save