Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

# Conflicts:
#	dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts

dmp-frontend/package-lock.json

@@ -9226,11 +9226,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
+            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "^1.0.2",
+            "escape-string-regexp": "1.0.5",
-            "has-ansi": "^2.0.0",
+            "has-ansi": "2.0.0",
-            "strip-ansi": "^3.0.0",
+            "strip-ansi": "3.0.1",
-            "supports-color": "^2.0.0"
+            "supports-color": "2.0.0"
           }
         },
         "del": {
@@ -9239,13 +9239,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
+            "globby": "5.0.0",
-            "is-path-cwd": "^1.0.0",
+            "is-path-cwd": "1.0.0",
-            "is-path-in-cwd": "^1.0.0",
+            "is-path-in-cwd": "1.0.1",
-            "object-assign": "^4.0.1",
+            "object-assign": "4.1.1",
-            "pify": "^2.0.0",
+            "pify": "2.3.0",
-            "pinkie-promise": "^2.0.0",
+            "pinkie-promise": "2.0.1",
-            "rimraf": "^2.2.8"
+            "rimraf": "2.6.2"
           }
         },
         "extend": {
@@ -9271,12 +9271,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
+            "array-union": "1.0.2",
-            "arrify": "^1.0.0",
+            "arrify": "1.0.1",
-            "glob": "^7.0.3",
+            "glob": "7.1.2",
-            "object-assign": "^4.0.1",
+            "object-assign": "4.1.1",
-            "pify": "^2.0.0",
+            "pify": "2.3.0",
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         },
         "har-schema": {

dmp-frontend/src/app/app.component.html

@@ -1,22 +1,22 @@
 <app-navigation class="fixed"></app-navigation>
 
 <div class="container-fluid main-container">
-	<div class="row">
+	<div class="row" *ngIf="helpContentEnabled">
 		<app-help-content position="top"></app-help-content>
 	</div>
 	<div class="row">
 		<div class="col-md-2">
-			<app-help-content position="left"></app-help-content>
+			<app-help-content position="left" *ngIf="helpContentEnabled"></app-help-content>
 		</div>
 		<div class="col-md-8">
 			<app-breadcrumb *ngIf="this.isAuthenticated() && (hasBreadCrumb | async)"></app-breadcrumb>
 			<router-outlet (activate)='onActivate($event)' (deactivate)='onDeactivate($event)'></router-outlet>
 		</div>
 		<div class="col-md-2">
-			<app-help-content position="right"></app-help-content>
+			<app-help-content position="right" *ngIf="helpContentEnabled"></app-help-content>
 		</div>
 	</div>
-	<div class="row">
+	<div class="row" *ngIf="helpContentEnabled">
 		<app-help-content position="bottom"></app-help-content>
 	</div>
 </div>

dmp-frontend/src/app/app.component.ts

@@ -23,6 +23,7 @@ export class AppComponent implements OnInit {
 
 	hasBreadCrumb = Observable.of(false);
 	sideNavOpen = false;
+	helpContentEnabled = environment.HelpService.Enabled;
 
 	constructor(
 		private router: Router,

dmp-frontend/src/app/app.constants.ts

@@ -3,5 +3,5 @@ export const HostConfiguration = {
 	Server: environment.Server,
 	App: environment.App,
 	CacheLifeTimeMillis: 30000,
-	HelpServiceUrl: environment.HelpServiceUrl
+	HelpServiceUrl: environment.HelpService.Url
 };

dmp-frontend/src/app/services/auth/auth.service.ts

@@ -121,7 +121,7 @@ export class AuthService {
 				return princ;
 			})
 			.catch((error: any) => {
-				console.warn('could not retrieve me info:\n', error);
+				//console.warn('could not retrieve me info:\n', error);
 				this.clear();
 				const princ = this.current();
 				this.router.navigate(['/login']);

dmp-frontend/src/app/shared/components/auto-complete/auto-complete.component.ts

@@ -13,7 +13,7 @@ export class AutoCompleteComponent implements OnInit, ErrorStateMatcher {
 	@Input() placeholder: String;
 	@Input() disabled: boolean;
 
-	@Input() typeaheadMS: number;
+	@Input() typeaheadMS = 300;
 	@Input() formCtrl: FormControl;
 	@Input() required = false;
 	@Input() displayFunction: Function;

dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.html

@@ -10,7 +10,7 @@
 	</mat-chip>
 </mat-chip-list>
 <mat-selection-list #optionsList (selectionChange)="selectionChanged($event)">
-	<mat-list-option *ngFor="let option of (options | async) | slice:0:10" [value]="option" [selected]="isOptionSelected(option)">
+	<mat-list-option class="facet-option-item" *ngFor="let option of (options | async) | slice:0:10" [value]="option" [selected]="isOptionSelected(option)">
 		<p>{{ displayLabel(option) }}</p>
 	</mat-list-option>
 </mat-selection-list>

dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.scss

@@ -0,0 +1,5 @@
+.facet-option-item {
+	height: auto !important;
+	min-height: 48px;
+	padding: 0.5em;
+}

dmp-frontend/src/app/utilities/culture/culture-service.ts

@@ -46,7 +46,7 @@ export class CultureService {
 
 		const newCulture = this.cultureValues.get(newCultureName);
 		if (!newCulture) {
-			console.error(`unsupported culture given: ${newCultureName}`); //TODO: throw error?
+			//console.error(`unsupported culture given: ${newCultureName}`); //TODO: throw error?
 			return;
 		}
 		this.currentCulture = newCulture;
@@ -55,11 +55,11 @@ export class CultureService {
 		// Set angular locale based on user selection.
 		let locale = newCulture.name;
 		import(`@angular/common/locales/${locale}.js`).catch(reason => {
-			console.warn('Could not load locale: ' + locale);
+			//console.warn('Could not load locale: ' + locale);
 			locale = newCulture.name.split('-')[0];
-			console.warn('Will try ' + locale);
+			//console.warn('Will try ' + locale);
 			return import(`@angular/common/locales/${locale}.js`).catch(resutl => {
-				console.error('Could not load locale: ' + locale);
+				//console.error('Could not load locale: ' + locale);
 			});
 		}).then(selectedLocale => {
 			registerLocaleData(selectedLocale.default);

dmp-frontend/src/environments/environment.prod.ts

@@ -1,7 +1,10 @@
 export const environment = {
 	production: true,
-  Server: 'https://devel.opendmp.eu/srv/api/',
+	Server: 'https://opendmp.eu/srv/api/',
-  App: 'https://devel.opendmp.eu/',
+	App: 'https://opendmp.eu/',
-  HelpServiceUrl: 'https://devel.opendmp.eu/content-service/',
+	HelpService: {
+		Enabled: false,
+		Url: 'https://opendmp.eu/content-service/',
+	},
 	defaultCulture: 'en-US'
 };

dmp-frontend/src/environments/environment.staging.ts

@@ -0,0 +1,10 @@
+export const environment = {
+	production: true,
+	Server: 'https://devel.opendmp.eu/srv/api/',
+	App: 'https://devel.opendmp.eu/',
+	HelpService: {
+		Enabled: false,
+		Url: 'https://devel.opendmp.eu/content-service/',
+	},
+	defaultCulture: 'en-US'
+};

dmp-frontend/src/environments/environment.ts

@@ -5,8 +5,11 @@
 
 export const environment = {
 	production: false,
-  Server: 'http://devel-21.local.cite.gr:8080/api/',
+	Server: 'http://devel-21.local.cite.gr:5000/api/',
 	App: 'http://localhost:4200/',
-  HelpServiceUrl: 'localhost:5000/',
+	HelpService: {
+		Enabled: false,
+		Url: 'localhost:5000/',
+	},
 	defaultCulture: 'en-US'
 };