[develop | DONE]: Add isBottomIntersecting in layoutService and use is when it is needed. Add capitalize all in order to capitalize all words with whitespace separator.

dashboard/sharedComponents/page-content/page-content.component.ts

@@ -132,42 +132,6 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
     this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {end: true, offset: footer_offset});
   }
 
-  /**
-   * @deprecated
-   *
-   * Should be smooth
-   *
-   * */
-  private observeBottom() {
-    let bottom = document.getElementById('bottom');
-    if (bottom) {
-      let bottomObs = new IntersectionObserver(entries => {
-        entries.forEach(entry => {
-          this.shouldSticky = !entry.isIntersecting;
-        })
-      });
-      this.subscriptions.push(bottomObs);
-      bottomObs.observe(bottom);
-    }
-  }
-
-  /**
-   * @deprecated
-   * */
-  private observeHeader() {
-    if (this.header) {
-      let headerObs = new IntersectionObserver(entries => {
-        entries.forEach(entry => {
-          if (entry.boundingClientRect.height > 0) {
-            this.layoutService.setReplaceHeader(!entry.isIntersecting);
-          }
-        })
-      });
-      this.subscriptions.push(headerObs);
-      headerObs.observe(this.header.nativeElement);
-    }
-  }
-
   private observeStickyFooter() {
     if (this.sticky_footer) {
       let resizeObs = new ResizeObserver(entries => {

dashboard/sharedComponents/sidebar/layout.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from "@angular/core";
+import {AfterViewInit, Injectable} from "@angular/core";
 import {BehaviorSubject, Observable, Subscriber} from "rxjs";
 import {ActivationStart, Router} from "@angular/router";
 import {Icon} from "../../../sharedComponents/menu";
@@ -92,6 +92,7 @@ export class LayoutService {
    * 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 isBottomIntersectingSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   private subscriptions: any[] = [];
 
   ngOnDestroy() {
@@ -119,6 +120,20 @@ export class LayoutService {
       this.subscriptions.push(resizeObs);
       resizeObs.observe(document.documentElement);
     }
+    if(typeof document !== "undefined") {
+      setTimeout(() => {
+        let bottom = document.getElementById('bottom');
+        if (bottom) {
+          let bottomObs = new IntersectionObserver(entries => {
+            entries.forEach(entry => {
+              this.isBottomIntersectingSubject.next(entry.isIntersecting);
+            })
+          });
+          this.subscriptions.push(bottomObs);
+          bottomObs.observe(bottom);
+        }
+      }, 500)
+    }
   }
 
   constructor(private router: Router) {
@@ -355,4 +370,8 @@ export class LayoutService {
   setHasHelpPopUp(value: boolean) {
     this.hasHelpPopUpSubject.next(value);
   }
+
+  get isBottomIntersecting(): Observable<boolean> {
+    return this.isBottomIntersectingSubject.asObservable();
+  }
 }

landingPages/dataProvider/dataProvider.component.html

@@ -2,7 +2,7 @@
 <schema2jsonld *ngIf="dataProviderInfo"
                [data]=dataProviderInfo [URL]="canonicalUrl" type="datasource"
                [otherURL]="(dataProviderInfo.provenance)?provenanceUrls:null"></schema2jsonld>
-<div *ngIf="dataProviderInfo && !dataProviderInfo.belongsTo" [innerHTML]="dataProviderInfo.message"
+<div *ngIf="dataProviderInfo && !dataProviderInfo.belongsTo && !isBottomIntersecting" [innerHTML]="dataProviderInfo.message"
      class="uk-alert uk-alert-warning uk-position-fixed uk-position-bottom-center uk-text-small" style="z-index: 1000;">
 </div>
 <!-- Desktop view -->

landingPages/dataProvider/dataProvider.component.ts

@@ -148,14 +148,13 @@ export class DataProviderComponent {
 	@ViewChild("descriptionDiv") descriptionDiv: ElementRef;
 	@ViewChild('descriptionModal') descriptionModal;
 
-  // public shouldSticky: boolean = true;
-
   subscriptions = [];
 	private sub: Subscription;
   properties: EnvProperties = properties;
   public openaireEntities = OpenaireEntities;
 
 	public isMobile: boolean = false;
+  public isBottomIntersecting: boolean = false;
 	public mobileContent: "info" | "metrics" | "actions" = "info";
 	public tabMobile: string = "";
 	public viewAllMobile: string = "";
@@ -198,6 +197,11 @@ export class DataProviderComponent {
   ngOnInit() {
 		this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
       this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.isBottomIntersecting.subscribe(isBottomIntersecting => {
+      this.isBottomIntersecting = isBottomIntersecting;
+      this.cdr.detectChanges();
     }));
     if (typeof document !== 'undefined') {
       this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => {
@@ -261,16 +265,6 @@ export class DataProviderComponent {
       } else {
         this.offset = 0;
       }
-      // let bottom = document.getElementById('bottom');
-      // if(bottom) {
-      //   let observer = new IntersectionObserver(entries => {
-      //     entries.forEach(entry => {
-      //       this.shouldSticky = !entry.isIntersecting;
-      //     })
-      //   });
-      //   this.subscriptions.push(observer);
-      //   observer.observe(bottom);
-      // }
       if(this.graph_and_feedback) {
         this.observeGraphAndFeedback();
       }

landingPages/organization/organization.component.html

@@ -3,7 +3,7 @@
                [URL]="properties.domain + properties.baseLink+this.properties.searchLinkToOrganization+organizationInfo.relcanId"
                type="organization">
 </schema2jsonld>
-<div *ngIf="organizationInfo && !organizationInfo.belongsTo" [innerHTML]="organizationInfo.message"
+<div *ngIf="organizationInfo && !organizationInfo.belongsTo && !isBottomIntersecting" [innerHTML]="organizationInfo.message"
      class="uk-alert uk-alert-warning uk-position-fixed uk-position-bottom-center uk-text-small" style="z-index: 1000;">
 </div>
 <!-- Desktop view -->

landingPages/organization/organization.component.ts

@@ -115,8 +115,6 @@ export class OrganizationComponent {
   public graph_height: number = 0;
   @ViewChild("graph_and_feedback") graph_and_feedback;
 
-  // public shouldSticky: boolean = true;
-
   subscriptions = [];
   innerReportSubscriptions = [];
   properties: EnvProperties;
@@ -131,6 +129,7 @@ export class OrganizationComponent {
   public deleteByInferenceOpened: boolean = false;
 
 	public isMobile: boolean = false;
+  public isBottomIntersecting: boolean = false;
   public mobileContent: "info" | "actions" = "info";
   public viewAllMobile: string = "";
 
@@ -162,6 +161,11 @@ export class OrganizationComponent {
   ngOnInit() {
 		this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
       this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.isBottomIntersecting.subscribe(isBottomIntersecting => {
+      this.isBottomIntersecting = isBottomIntersecting;
+      this.cdr.detectChanges();
     }));
 		this.properties = properties;
 		if (typeof document !== 'undefined') {
@@ -218,16 +222,6 @@ export class OrganizationComponent {
       } else {
         this.offset = 0;
       }
-      // let bottom = document.getElementById('bottom');
-      // if(bottom) {
-      //   let observer = new IntersectionObserver(entries => {
-      //     entries.forEach(entry => {
-      //       this.shouldSticky = !entry.isIntersecting;
-      //     })
-      //   });
-      //   this.subscriptions.push(observer);
-      //   observer.observe(bottom);
-      // }
       if(this.graph_and_feedback) {
         this.observeGraphAndFeedback();
       }

landingPages/project/project.component.html

@@ -2,7 +2,7 @@
 <schema2jsonld *ngIf="projectInfo"
                [data]=projectInfo [URL]="properties.domain+properties.baseLink+properties.searchLinkToProject+projectId"
                type="project"></schema2jsonld>
-<div *ngIf="projectInfo && !projectInfo.belongsTo" [innerHTML]="projectInfo.message"
+<div *ngIf="projectInfo && !projectInfo.belongsTo && !isBottomIntersecting" [innerHTML]="projectInfo.message"
      class="uk-alert uk-alert-warning uk-position-fixed uk-position-bottom-center uk-text-small" style="z-index: 1000;">
 </div>
 <!-- Desktop view -->

landingPages/project/project.component.ts

@@ -169,14 +169,13 @@ export class ProjectComponent {
 	@ViewChild("descriptionDiv") descriptionDiv: ElementRef;
 	@ViewChild('descriptionModal') descriptionModal;
 
-  // public shouldSticky: boolean = true;
-
   subscriptions = [];
 	private sub: Subscription;
   properties: EnvProperties;
   public openaireEntities = OpenaireEntities;
 
 	public isMobile: boolean = false;
+  public isBottomIntersecting: boolean = false;
 	public mobileContent: "info" | "metrics" | "actions" = "info";
 	public tabMobile: string = "";
 	public viewAllMobile: string = "";
@@ -209,6 +208,11 @@ export class ProjectComponent {
   ngOnInit() {
 		this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
       this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.isBottomIntersecting.subscribe(isBottomIntersecting => {
+      this.isBottomIntersecting = isBottomIntersecting;
+      this.cdr.detectChanges();
     }));
 		this.properties = properties;
 		if (typeof document !== 'undefined') {
@@ -278,16 +282,6 @@ export class ProjectComponent {
       } else {
         this.offset = 0;
       }
-      // let bottom = document.getElementById('bottom');
-      // if(bottom) {
-      //   let observer = new IntersectionObserver(entries => {
-      //     entries.forEach(entry => {
-      //       this.shouldSticky = !entry.isIntersecting;
-      //     })
-      //   });
-      //   this.subscriptions.push(observer);
-      //   observer.observe(bottom);
-      // }
       if(this.graph_and_feedback) {
         this.observeGraphAndFeedback();
       }
@@ -467,7 +461,6 @@ export class ProjectComponent {
       data => {
         this.projectInfo = data;
         this.projectInfo.setBelongsTo(id);
-        console.log(this.projectInfo);
         this.projectInfo.id = this.projectId;
 
         this.actionsAfterGettingProjectInfo();

landingPages/result/resultLanding.component.html

@@ -2,7 +2,7 @@
 <schema2jsonld *ngIf="resultLandingInfo && resultLandingInfo.record"
                [data]=resultLandingInfo.record [URL]="canonicalUrl"
                [searchActionRoute]="properties.searchLinkToResults"></schema2jsonld>
-<div *ngIf="resultLandingInfo && !resultLandingInfo.belongsTo" [innerHTML]="resultLandingInfo.message"
+<div *ngIf="resultLandingInfo && !resultLandingInfo.belongsTo && !isBottomIntersecting" [innerHTML]="resultLandingInfo.message"
      class="uk-alert uk-alert-warning uk-position-fixed uk-position-bottom-center uk-text-small" style="z-index: 1000;">
 </div>
 <!-- Desktop view -->

landingPages/result/resultLanding.component.ts

@@ -155,8 +155,6 @@ export class ResultLandingComponent {
 	@ViewChild("descriptionDiv") descriptionDiv: ElementRef;
 	@ViewChild('descriptionModal') descriptionModal;
 
-  // public shouldSticky: boolean = true;
-
   public mobileContent: "info" | "metrics" | "actions" = "info";
   public tabMobile: string = "";
   public viewAllMobile: string = "";
@@ -164,6 +162,7 @@ export class ResultLandingComponent {
 	@ViewChild("sdgFosSuggest") sdgFosSuggest: SdgFosSuggestComponent;
 
   public isMobile: boolean = false;
+  public isBottomIntersecting: boolean = false;
   // Full screen modals for small screens (mobile)
   @ViewChild('summaryFsModal') summaryFsModal: FullScreenModalComponent;
   @ViewChild('subjectsFsModal') subjectsFsModal: FullScreenModalComponent;
@@ -208,6 +207,11 @@ export class ResultLandingComponent {
   ngOnInit() {
     this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
       this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.isBottomIntersecting.subscribe(isBottomIntersecting => {
+      this.isBottomIntersecting = isBottomIntersecting;
+      this.cdr.detectChanges();
     }));
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
       this.isLoggedIn = !!user;
@@ -294,16 +298,6 @@ export class ResultLandingComponent {
       } else {
         this.offset = 0;
       }
-      // let bottom = document.getElementById('bottom');
-      // if(bottom) {
-      //   let observer = new IntersectionObserver(entries => {
-      //     entries.forEach(entry => {
-      //       this.shouldSticky = !entry.isIntersecting;
-      //     })
-      //   });
-      //   this.subscriptions.push(observer);
-      //   observer.observe(bottom);
-      // }
       if(this.graph_and_feedback) {
         this.observeGraphAndFeedback();
       }

utils/entities/resultLandingInfo.ts

@@ -209,7 +209,7 @@ export class ResultLandingInfo {
     this.belongsTo = !BelongsTo.result || BelongsTo.result.fields.findIndex(field => BelongsTo.check(this, field)) != -1;
     this.message = !this.belongsTo ? BelongsTo.result.message : null;
     if (this.message) {
-      this.message = this.message.replace('((result))', StringUtils.getEntityName(this.resultType));
+      this.message = this.message.replace('((result))', StringUtils.capitalizeAll(StringUtils.getEntityName(this.resultType)));
       this.message = this.message.replace('((type_id))', typeId);
       this.message = this.message.replace('((id))', id);
     }

utils/string-utils.class.ts

@@ -444,8 +444,12 @@ export class StringUtils {
     return <string []>words;
   }
 
-  public static capitalize(value: string): string {
+  public static capitalizeAll(str: string): string {
-    return value.charAt(0).toUpperCase() + value.slice(1);
+    return str.split(' ').map(value => StringUtils.capitalize(value)).join(' ');
+  }
+  
+  public static capitalize(str: string): string {
+    return str.charAt(0).toUpperCase() + str.slice(1);
   }
   
   /**