From f2833576d32ec34088086d81e19dc7e8fdb46d84 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 8 Oct 2019 10:40:15 +0300
Subject: [PATCH] Fixes bug on public roles filters when logged out. (Issue
 #175)

---
 .../explore-dataset-filters.component.html    |  2 +-
 .../explore-dataset-filters.component.ts      |  6 +++
 .../explore-dmp-filters.component.html        | 50 ++++++++++---------
 .../explore-dmp-filters.component.ts          |  6 +++
 dmp-frontend/src/assets/i18n/en.json          |  2 +-
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
index e0271734d..3684f2955 100644
--- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
+++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
@@ -45,7 +45,7 @@
 			</mat-form-field>
 		</div>
 
-		<div class="col-10 gray-container">
+		<div *ngIf="isAuthenticated()" class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}</h6>
 			<mat-radio-group>
 				<mat-list-item><mat-radio-button value="null" checked (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
index f63f62551..2a2fd6880 100644
--- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
+++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
@@ -28,6 +28,7 @@ import { DataTableData } from '../../../core/model/data-table/data-table-data';
 import { DmpListingModel } from '../../../core/model/dmp/dmp-listing';
 import { ExploreDmpCriteriaModel } from '../../../core/query/explore-dmp/explore-dmp-criteria';
 import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria";
+import { AuthService } from '../../../core/services/auth/auth.service';
 
 @Component({
 	selector: 'app-explore-dataset-filters-component',
@@ -105,6 +106,7 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI
 
 	constructor(
 		public activatedRoute: ActivatedRoute,
+		private authentication: AuthService,
 		public grantService: GrantService,
 		public dmpService: DmpService,
 		public organisationService: OrganisationService,
@@ -361,4 +363,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI
 
 		return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data));
 	}
+
+	public isAuthenticated(): boolean {
+		return !(!this.authentication.current());
+	}
 }
diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
index f3683b5a6..9ae8fe5d3 100644
--- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
+++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
@@ -3,26 +3,29 @@
 	<div class="row" style="justify-content: center;">
 
 		<mat-form-field class="col-11 search">
-			<input matInput placeholder="{{'CRITERIA.GRANTS.LIKE'| translate}}" name="dmpCriteriaName"
-				[(ngModel)]="facetCriteria.like" (ngModelChange)="controlModified()">
+			<input matInput placeholder="{{'CRITERIA.GRANTS.LIKE'| translate}}" name="dmpCriteriaName" [(ngModel)]="facetCriteria.like" (ngModelChange)="controlModified()">
 			<mat-icon matSuffix class="style-icon">search</mat-icon>
 		</mat-form-field>
 
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
 			<mat-radio-group>
-				<mat-list-item><mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button></mat-list-item>
-				<mat-list-item><mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button></mat-list-item>
-				<mat-list-item><mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item>
+					<mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button>
+				</mat-list-item>
+				<mat-list-item>
+					<mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button>
+				</mat-list-item>
+				<mat-list-item>
+					<mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button>
+				</mat-list-item>
 			</mat-radio-group>
 		</div>
 
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.GRANT.TITLE' | translate }}</h6>
 			<mat-form-field>
-				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-GRANTS' | translate }}"
-					[configuration]="grantAutoCompleteConfiguration"
-					(optionSelected)="onGrantOptionSelected($event)" (optionRemoved)="onGrantOptionRemoved($event)">
+				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-GRANTS' | translate }}" [configuration]="grantAutoCompleteConfiguration" (optionSelected)="onGrantOptionSelected($event)" (optionRemoved)="onGrantOptionRemoved($event)">
 				</app-multiple-auto-complete>
 				<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
 			</mat-form-field>
@@ -31,30 +34,31 @@
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.PROFILES.TITLE' | translate }}</h6>
 			<mat-form-field>
-				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-SPEC' | translate }}"
-					[configuration]="profileAutoCompleteConfiguration"
-					(optionSelected)="onProfileOptionSelected($event)" (optionRemoved)="onProfileOptionRemoved($event)">
+				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-SPEC' | translate }}" [configuration]="profileAutoCompleteConfiguration" (optionSelected)="onProfileOptionSelected($event)" (optionRemoved)="onProfileOptionRemoved($event)">
 				</app-multiple-auto-complete>
 				<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
 			</mat-form-field>
 		</div>
 
-		<div class="col-10 gray-container">
-				<h6 class="category-title">{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}</h6>
-				<mat-radio-group>
-					<mat-list-item><mat-radio-button value="null" checked (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="0" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="1" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
-				</mat-radio-group>
-			</div>
+		<div *ngIf="isAuthenticated()" class="col-10 gray-container">
+			<h6 class="category-title">{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}</h6>
+			<mat-radio-group>
+				<mat-list-item>
+					<mat-radio-button value="null" checked (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.ANY' | translate }}</mat-radio-button>
+				</mat-list-item>
+				<mat-list-item>
+					<mat-radio-button value="0" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.OWNER' | translate }}</mat-radio-button>
+				</mat-list-item>
+				<mat-list-item>
+					<mat-radio-button value="1" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.MEMBER' | translate }}</mat-radio-button>
+				</mat-list-item>
+			</mat-radio-group>
+		</div>
 
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}</h6>
 			<mat-form-field>
-				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-ORGANIZATIONS' | translate }}"
-					[configuration]="organizationAutoCompleteConfiguration"
-					(optionSelected)="onOrganizationOptionSelected($event)"
-					(optionRemoved)="onOrganizationOptionRemoved($event)">
+				<app-multiple-auto-complete placeholder="{{ 'CRITERIA.DATA-SETS.SELECT-ORGANIZATIONS' | translate }}" [configuration]="organizationAutoCompleteConfiguration" (optionSelected)="onOrganizationOptionSelected($event)" (optionRemoved)="onOrganizationOptionRemoved($event)">
 				</app-multiple-auto-complete>
 				<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
 			</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
index 051b78c45..73c4f8048 100644
--- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
+++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
@@ -23,6 +23,7 @@ import { OrganizationModel } from "../../../core/model/organisation/organization
 import { OrganisationCriteria } from "../../../core/query/organisation/organisation-criteria";
 import { OrganisationService } from "../../../core/services/organisation/organisation.service";
 import { DatasetProfileCriteria } from "../../../core/query/dataset-profile/dataset-profile-criteria";
+import { AuthService } from '../../../core/services/auth/auth.service';
 
 @Component({
 	selector: 'app-explore-dmp-filters-component',
@@ -95,6 +96,7 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements
 		public activatedRoute: ActivatedRoute,
 		public languageService: TranslateService,
 		public grantService: GrantService,
+		private authentication: AuthService,
 		public datasetProfileService: DatasetService,
 		public organisationService: OrganisationService,
 		public externalSourcesService: ExternalSourcesService,
@@ -340,4 +342,8 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements
 	isOptionSelected(profile: any) {
 		return this.formGroup.value.map(x => x.id).indexOf(profile.id) !== -1;
 	}
+
+	public isAuthenticated(): boolean {
+		return !(!this.authentication.current());
+	}
 }
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 0c3ee1c97..3c653a58e 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -855,7 +855,7 @@
 			"EXTERNAL-SOURCE-HINT": "External source",
 			"ACTIONS": {
 				"YES": "Yes",
-				"No": "No"
+				"NO": "No"
 			}
 		},
 		"DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": {