Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts

@@ -8,7 +8,7 @@ import { Subscription } from "rxjs";
 	template: `
 		<div class="editor-wrapper" [class]="wrapperClasses">
 			<angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id"
-							[config]="editorConfig" [formControl]="form" [required]="form.value ? false : required"
+							[config]="editorConfig" [formControl]="form" [required]="required"
 							placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"
 							(paste)="pasteWithoutFormatting($event)"></angular-editor>
 			<mat-icon *ngIf="form.value && editable" (click)="parentFormGroup.get(controlName).patchValue('')" class="clear">close</mat-icon>

dmp-frontend/src/notification-service/ui/inapp-notification/listing-dialog/mine-inapp-notification-listing-dialog.component.html

@@ -3,18 +3,24 @@
 	<div class="row">
 		<div class="col-12">
 			<mat-nav-list class="inapp-notification-listing-dialog">
-				<a *ngFor="let inappNotification of inappNotifications; last as last;" mat-list-item (click)="goToNotification(inappNotification)">
-					<div class="d-flex justify-content-between">
-						<div class="d-flex">
-							<mat-icon *ngIf="inappNotification.trackingState === notificationInAppTrackingEnum.Delivered" mat-list-icon class="mr-3">drafts</mat-icon>
-							<mat-icon *ngIf="inappNotification.trackingState === notificationInAppTrackingEnum.Stored" mat-list-icon class="mr-3">mail</mat-icon>
-							<span mat-line>{{ inappNotification.subject | sumarizeText:21 }}</span>
+				<ng-container *ngFor="let inappNotification of inappNotifications; last as last;">
+					<a mat-list-item (click)="goToNotification(inappNotification)">
+						<div class="row justify-content-between">
+							<div class="col-auto">
+								<mat-icon *ngIf="inappNotification.trackingState === notificationInAppTrackingEnum.Delivered" mat-list-icon>drafts</mat-icon>
+								<mat-icon *ngIf="inappNotification.trackingState === notificationInAppTrackingEnum.Stored" mat-list-icon>mail</mat-icon>
+							</div>
+							<div class="col mt-1 pl-0" style="overflow: hidden; text-overflow: ellipsis;">
+								<span mat-line>{{ inappNotification.subject }}</span>
+							</div>
+							
+							<div class="col-auto mt-1">
+								<span mat-line class="secondary-text">{{ inappNotification.createdAt | date : 'short'}}</span>
+							</div>
 						</div>
-						
-						<span mat-line class="secondary-text">{{ inappNotification.createdAt | date : 'short'}}</span>
-						<mat-divider inset *ngIf="!last"></mat-divider>
-					</div>
-				</a>
+					</a>
+					<mat-divider *ngIf="!last"></mat-divider>
+				</ng-container>
 				<a *ngIf="authService.hasPermission(authService.permissionEnum.ViewMineInAppNotificationPage)" (click)="goToNotifications()">
 					<mat-list-item>{{'NAV-BAR.INAPP-NOTIFICATIONS' | translate}}</mat-list-item>
 				</a>