Merge remote-tracking branch 'origin/develop' into plugins-functionality

dashboard/sharedComponents/sidebar/layout.service.ts

@@ -88,6 +88,10 @@ export class LayoutService {
    * Handle it manually in the component, it doesn't use data
    * */
   private rootClassSubject: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+  /**
+   * Display help pop-up on non-admin pages. (default true for the rest of the pages)
+   * */
+  private hasHelpPopUpSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
   private subscriptions: any[] = [];
 
   ngOnDestroy() {
@@ -343,4 +347,12 @@ export class LayoutService {
       this.rootClassSubject.next(value);
     }
   }
+
+  get hasHelpPopUp(): Observable<boolean> {
+    return this.hasHelpPopUpSubject.asObservable();
+  }
+
+  setHasHelpPopUp(value: boolean) {
+    this.hasHelpPopUpSubject.next(value);
+  }
 }

login/utils/helper.class.ts

@@ -234,6 +234,7 @@ export class Role {
   }
 
   public static mapType(type: string, communityMap: boolean = true): string {
+    type = type.replace(this.GROUP, '');
     if (type == "ri" && communityMap) {
       type = "community";
     } else if (type == "organization") {

role-verification/role-verification.component.ts

@@ -93,6 +93,8 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
   public userInfoLinkPrefix = '';
   @Input()
   public userInfoLink = null;
+  @Input()
+  public relativeTo: ActivatedRoute = this._route;
   public user: User;
   public verification: any;
   public code: UntypedFormControl;
@@ -150,7 +152,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
                   'errorCode': LoginErrorCodes.NOT_LOGIN,
                   'redirectUrl': this._router.url
                 },
-                relativeTo: this._route
+                relativeTo: this.relativeTo
               });
             }
           } else if(this.isMember) {

services/searchResearchResults.service.ts

@@ -133,7 +133,14 @@ export class SearchResearchResultsService {
     return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
         .pipe(map(res => [res['meta'].total, this.parseResults(resultType, res['results'], properties), RefineResultsUtils.parse(res['refineResults'], refineFields, "publication")]));
   }
+ countResults(field:string,value:string): any {
+    let url = properties.utilsService + "/portals/countResults";
+    if (field && value) {
+      url += "?field=" + encodeURIComponent(field) + "&value="+encodeURIComponent(value);
+    }
 
+    return this.http.get((properties.useLongCache  ) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
+  }
   searchResultForEntity(resultType: string, params: string, page: number, size: number, properties: EnvProperties): any {
     let link = properties.searchAPIURLLAst;
     //let url = link+params+"/"+this.getEntityQueryName(resultType,true)+ "?format=json";