Merge branch 'develop'

src/app/app.component.ts

@@ -443,11 +443,14 @@ export class AppComponent implements OnInit, OnDestroy {
         this.bottomMenuItems.push(new MenuItem("", "Sources and methodology", "", "/content", false, [], [], {}));
       }
       if (this.user) {
-        this.userMenuItems = [ /*new MenuItem("","My profile","","",false,[],[],{}),*/
+        this.userMenuItems = [
-          new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [], {}),
           new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {}),
           new MenuItem("", "Invite users", "", "/invite", false, [], [], {}),
         ];
+        if(properties.environment != 'beta'){
+          this.userMenuItems = [new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [], {})]
+            .concat(this.userMenuItems)
+        }
         if (this.isManager) {
           this.userMenuItems.push(new MenuItem("", "Support", "https://tools.openaire.eu/group/openaire_rcd", "", false, [], [], {}))
         }

src/app/claims/myClaims/myClaims.component.ts

@@ -8,13 +8,12 @@ import {properties} from "../../../environments/environment";
 @Component({
     selector: 'openaire-my-claims',
     template: `
-    <my-claims  [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [communityId]=communityId></my-claims>
+    <my-claims  [claimsInfoURL]="claimsInfoURL" [communityId]=communityId></my-claims>
 `
 
 })
  export class OpenaireMyClaimsComponent {
   claimsInfoURL:string;
-  userInfoURL: string;
   communityId:string;
   sub;
 
@@ -28,7 +27,6 @@ import {properties} from "../../../environments/environment";
 
   public ngOnInit() {
     this.claimsInfoURL = properties.claimsInformationLink;
-     this.userInfoURL = properties.userInfoUrl;
      this.sub = this.route.queryParams.subscribe(
        communityId => {
          this.communityId  = ConnectHelper.getCommunityFromDomain(properties.domain);

src/app/community/community.component.html

@@ -181,7 +181,7 @@
                                   [onChangeNavigate]="false"></entities-selection>
               <div input #input class="uk-width-expand"  placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
             </advanced-search-input>
-            <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
+            <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto" uk-dropdown="mode: click">
               <div class="uk-padding-small">
                 <quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
               </div>

src/app/community/community.component.ts

@@ -478,7 +478,7 @@ export class CommunityComponent {
   }
 
   createParams(param) {
-    return StringUtils.quote(StringUtils.URIEncode(param));
+    return StringUtils.URIEncode(param);
   }
 
   private setActiveTab(entityType: string) {

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit e63d61b4693843c30ed41440e90bd3b6b6865806
+Subproject commit e30672043b03c607fb6c6c1c490d4fa34a772d3d

src/app/searchPages/communities/searchCommunities.component.ts

@@ -97,7 +97,7 @@ export class SearchCommunitiesComponent {
       this.searchPage.refineFields = this.refineFields;
       this.searchLink = this.properties.searchLinkToCommunities;
       this.selectedFields = [];
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, null, params, "community", null);
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [],[], this.fieldIdsMap, null, params, "community", null);
       
       let queryParams = params;
       if (typeof document !== 'undefined') {

src/app/searchPages/simple/searchDataproviders.component.ts

@@ -94,7 +94,7 @@ export class OpenaireSearchDataprovidersComponent {
             this.searchUtils.validateSize(params['size']);
             this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
             this.selectedFields = [];
-            this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, [], [], this.fieldIdsMap, this.customFilter, params, "dataprovider");
+            this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, [], [], [], this.fieldIdsMap, this.customFilter, params, "dataprovider");
             if (this.initialLoad) {
               this.initialLoad = false;
               this._getResults();
@@ -163,7 +163,7 @@ export class OpenaireSearchDataprovidersComponent {
     this.searchUtils.totalResults = results.length;
     this.results = results.slice((this.searchUtils.page - 1) * this.searchUtils.size, this.searchUtils.page *this.searchUtils.size );
     this.searchUtils.status = this.results.length == 0 ? this.errorCodes.NONE:  this.errorCodes.DONE;
-    this.searchPage.buildPageURLParameters(this.filters, [], false);
+    this.searchPage.buildPageURLParameters(this.filters, [], [], false);
     this.disableForms = false;
     this.enableSearchView = true;
   }

src/app/searchPages/simple/searchProjects.component.ts

@@ -96,7 +96,7 @@ export class OpenaireSearchProjectsComponent {
             this.searchUtils.validateSize(params['size']);
             this.keyword = decodeURIComponent(params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
             this.selectedFields = [];
-            this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, this.customFilter, params, "project");
+            this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap, this.customFilter, params, "project");
             if(this.initialLoad) {
               this.initialLoad = false;
               this._getCommunityFunders();

src/app/subjects/subjects.component.ts

@@ -382,7 +382,7 @@ export class SubjectsComponent {
   }
   
   createParams(param) {
-    return StringUtils.quote(StringUtils.URIEncode(param));
+    return StringUtils.URIEncode(param);
   }
   
   ngOnDestroy() {

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit e82544c43fa55393581d5278a8b0540d64bf30f0
+Subproject commit 3b437aafda7a716a0a89785a106456cbe520dce3

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 921802642010c1057b79de55f93361f0b25a7b3d
+Subproject commit 99ab54cdd7b973a2ba047f0a6b37667270b58439