Skip to content
Snippets Groups Projects
Commit 76aaace2 authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

fix: notification filter on org unit and button to navigate to notification

parent 163bc7dd
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
solidifyShortCuts
(keydown.escape)="back()"
>
<h1 *ngIf="orgUnitIdObs | async as orgUnitId">
<h1 *ngIf="(orgUnitIdObs | async) as orgUnitId">
<ng-container *ngIf="modeObs | async as mode">
<ng-template [ngIf]="mode === notificationModeEnum.inbox">{{'preservationSpace.notifications.list.inboxForOrgUnit.title' | translate}}</ng-template>
<ng-template [ngIf]="mode === notificationModeEnum.sent">{{'preservationSpace.notifications.list.sentForOrgUnit.title' | translate}}</ng-template>
......@@ -17,7 +17,7 @@
[dlcmSpinner]="isLoadingObs | async"
>
<div align="right">
<dlcm-shared-button-refresh [isLoading]="orgUnitIdObs | async"
<dlcm-shared-button-refresh [isLoading]="isLoadingObs | async"
(refresh)="getAll()"
></dlcm-shared-button-refresh>
</div>
......
......@@ -258,4 +258,15 @@ export class PreservationSpaceNotificationState extends ResourceState<Preservati
ctx.dispatch(new PreservationSpaceNotificationAction.GetById(notificationId));
}
@OverrideDefaultAction()
@Action(PreservationSpaceNotificationAction.Clean)
clean(ctx: StateContext<PreservationSpaceNotificationStateModel>, action: PreservationSpaceNotificationAction.Clean): void {
const orgUnitId = ctx.getState().orgUnitId;
const mode = ctx.getState().mode;
super.clean(ctx, action);
ctx.patchState({
orgUnitId,
mode,
});
}
}
......@@ -5,18 +5,18 @@ import {
} from "@angular/core";
import {MatDialog} from "@angular/material/dialog";
import {ActivatedRoute} from "@angular/router";
import {NotificationHelper} from "@app/features/preservation-space/notification/helper/notification.helper";
import {orgUnitActionNameSpace} from "@app/features/preservation-space/organizational-unit/stores/organizational-unit.action";
import {OrganizationalUnitStateModel} from "@app/features/preservation-space/organizational-unit/stores/organizational-unit.state";
import {NotificationHelper} from "@app/features/preservation-space/notification/helper/notification.helper";
import {SharedAbstractListRoutable} from "@shared/components/routables/shared-abstract-list/shared-abstract-list.routable";
import {FieldTypeEnum} from "@shared/enums/field-type.enum";
import {LocalStateEnum} from "@shared/enums/local-state.enum";
import {OrganizationalUnit} from "@models";
import {Navigate} from "@ngxs/router-plugin";
import {
Actions,
Store,
} from "@ngxs/store";
import {SharedAbstractListRoutable} from "@shared/components/routables/shared-abstract-list/shared-abstract-list.routable";
import {FieldTypeEnum} from "@shared/enums/field-type.enum";
import {LocalStateEnum} from "@shared/enums/local-state.enum";
import {RoutesEnum} from "@shared/enums/routes.enum";
import {DataTableActions} from "@shared/models/data-table-actions.model";
import {RouterExtService} from "@shared/services/router-ext.service";
......@@ -68,13 +68,13 @@ export class OrgunitListRoutable extends SharedAbstractListRoutable<Organization
},
{
logo: "email",
callback: model => this.goToReceivedRequestNotification(model),
callback: model => this.goToSentRequestNotification(model),
placeholder: TRANSLATE("crud.list.action.goToSentRequestNotification"),
displayOnCondition: model => this._securityService.isRootOrAdmin(),
},
{
logo: "send",
callback: model => this.goToSentRequestNotification(model),
callback: model => this.goToReceivedRequestNotification(model),
placeholder: TRANSLATE("crud.list.action.goToReceivedRequestNotification"),
displayOnCondition: model => true,
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment