From 672055f9ca2417ad0977861d182d3a2c6863f008 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 18 Mar 2020 11:19:53 +0200
Subject: [PATCH] Fix issue when inserting dataset status on dataset listing

---
 .../dataset/listing/criteria/dataset-criteria.component.html  | 4 ++--
 .../ui/dataset/listing/criteria/dataset-criteria.component.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index 401fe56a6..e7f535af9 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -16,8 +16,8 @@
 			<div class="col-10 gray-container" *ngIf="!isPublic" >
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
-					<mat-list-item><mat-radio-button checked value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="0" [checked]="status == 0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="0" >{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
 			</div>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
index 51cce7441..55c7d6a8f 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts
@@ -173,6 +173,7 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(x => this.controlModified());
 		// if (this.criteria == null) { this.criteria = {}; }
+		this.formGroup.patchValue({'status': this.status !== undefined ? this.status : 'null'});
 	}
 
 	setCriteria(criteria: DatasetCriteria): void {