minor ui fixes

dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts

@@ -96,6 +96,13 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 			}
 		});
 
+		this.formGroup.get('like').valueChanges
+			.pipe(takeUntil(this._destroyed), debounceTime(500))
+			.subscribe(x => this.refresh());
+		this.formGroup.get('order').valueChanges
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(x => this.refresh());
+
 		this.refresh();
 	}
 
@@ -119,12 +126,9 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 	}
 
 	refresh(): void {
-		if (!this.formGroup.get('order').value) {
-			this.formGroup.get('order').setValue(this.order.UpdatedAt);
-		}
 		this.lookup.onlyDraft = true;
 		this.lookup.page = { size: this.pageSize, offset: 0 };
-		this.lookup.orderField = this.formGroup.get('order').value;
+		this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
 		this.lookup.like = this.formGroup.get('like').value;
 		this.lookup.project = {
 
@@ -195,13 +199,6 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 		};
 
 		this.getItems();
-
-		this.formGroup.get('like').valueChanges
-			.pipe(takeUntil(this._destroyed), debounceTime(500))
-			.subscribe(x => this.refresh());
-		this.formGroup.get('order').valueChanges
-			.pipe(takeUntil(this._destroyed))
-			.subscribe(x => this.refresh());
 	}
 
 	loadMore() {

dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts

@@ -96,6 +96,16 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 			}
 		});
 
+		this.formGroup.get('like').valueChanges
+		.pipe(takeUntil(this._destroyed), debounceTime(500))
+		.subscribe(x => {
+			console.log('valueChanges');
+			this.refresh()
+		});
+		this.formGroup.get('order').valueChanges
+		.pipe(takeUntil(this._destroyed))
+		.subscribe(x => this.refresh());
+
 		this.refresh();
 	}
 
@@ -119,11 +129,8 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 	}
 
 	refresh(): void {
-		if (!this.formGroup.get('order').value) {
-			this.formGroup.get('order').setValue(this.order.UpdatedAt);
-		}
 		this.lookup.page = { size: this.pageSize, offset: 0 };
-		this.lookup.orderField = this.formGroup.get('order').value;
+		this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
 		this.lookup.like = this.formGroup.get('like').value;
 		this.lookup.project = {
 
@@ -193,13 +200,6 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 		};
 
 		this.getItems();
-
-		this.formGroup.get('like').valueChanges
-			.pipe(takeUntil(this._destroyed), debounceTime(500))
-			.subscribe(x => this.refresh());
-		this.formGroup.get('order').valueChanges
-			.pipe(takeUntil(this._destroyed))
-			.subscribe(x => this.refresh());
 	}
 
 	loadMore() {

dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.ts

@@ -92,10 +92,19 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
 				this.updateUrl();
 			}
 		});
-		if (this.isAuthenticated()) {
+
+		this.formGroup.get('like').valueChanges
+		.pipe(takeUntil(this._destroyed), debounceTime(500))
+		.subscribe(x => {
+			console.log('valueChanges');
+			this.refresh()
+		});
+		this.formGroup.get('order').valueChanges
+		.pipe(takeUntil(this._destroyed))
+		.subscribe(x => this.refresh());
+
 		this.refresh();
 	}
-	}
 
 	ngOnChanges() {
 		if (this.isActive) {
@@ -117,12 +126,9 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
 	}
 
 	refresh(): void {
-		if (!this.formGroup.get('order').value) {
-			this.formGroup.get('order').setValue(this.order.UpdatedAt);
-		}
 		this.lookup.page = { size: this.pageSize, offset: 0 };
 		this.lookup.onlyDescription = true;
-		this.lookup.orderField = this.formGroup.get('order').value;
+		this.lookup.orderField = this.formGroup.get('order').value ??this.order.UpdatedAt;
 		this.lookup.like = this.formGroup.get('like').value;
 		this.lookup.project = {
 
@@ -157,13 +163,6 @@ export class RecentEditedDescriptionActivityComponent extends BaseComponent impl
 		};
 
 		this.getItems();
-		
-		this.formGroup.get('like').valueChanges
-			.pipe(takeUntil(this._destroyed), debounceTime(500))
-			.subscribe(x => this.refresh());
-		this.formGroup.get('order').valueChanges
-			.pipe(takeUntil(this._destroyed))
-			.subscribe(x => this.refresh());
 	}
 
 	loadMore() {

dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts

@@ -101,6 +101,13 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 			}
 		});
 
+		this.formGroup.get('like').valueChanges
+			.pipe(takeUntil(this._destroyed), debounceTime(500))
+			.subscribe(x => this.refresh());
+		this.formGroup.get('order').valueChanges
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(x => this.refresh());
+
 		this.refresh();
 	}
 
@@ -124,12 +131,9 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 	}
 
 	refresh(): void {
-		if (!this.formGroup.get('order').value) {
-			this.formGroup.get('order').setValue(this.order.UpdatedAt);
-		}
 		this.lookup.page = { size: this.pageSize, offset: 0 };
 		this.lookup.onlyDmp = true;
-		this.lookup.orderField = this.formGroup.get('order').value;
+		this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
 		this.lookup.like = this.formGroup.get('like').value;
 		this.lookup.project = {
 			fields: [
@@ -169,13 +173,6 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 		};
 
 		this.getItems();
-
-		this.formGroup.get('like').valueChanges
-			.pipe(takeUntil(this._destroyed), debounceTime(500))
-			.subscribe(x => this.refresh());
-		this.formGroup.get('order').valueChanges
-			.pipe(takeUntil(this._destroyed))
-			.subscribe(x => this.refresh());
 	}
 
 	loadMore() {

dmp-frontend/src/assets/i18n/en.json

@@ -1712,7 +1712,7 @@
 			"INTERNAL": "Internal",
 			"EXTERNAL": "External"
 		},
-		"NOTIFICATION-TEMPLATE-KIND - HERE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!": { 
+		"NOTIFICATION-TEMPLATE-KIND": { 
 			"DRAFT": "Draft",
 			"SECONDARY": "Secondary",
 			"PRIMARY": "Primary",