Merge remote-tracking branch 'origin/develop'

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

@@ -13,7 +13,6 @@ import {
 import {LayoutService, SidebarItem} from "../sidebar/layout.service";
 
 declare var UIkit;
-declare var ResizeObserver;
 
 @Component({
   selector: '[page-content]',
@@ -99,8 +98,12 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
 
   ngAfterViewInit() {
     if (typeof document !== "undefined") {
+      if (this.sticky_footer) {
+        this.initFooter();
         this.observeStickyFooter();
+      }
       if (this.shouldSticky && typeof document !== 'undefined') {
+        setTimeout(() => {
           this.sticky.header = UIkit.sticky((this.headerSticky ? this.header.nativeElement : this.actions.nativeElement), {
             offset: this.offset
           });
@@ -112,10 +115,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
             this.isStickyActive = false;
             this.cdr.detectChanges();
           }));
-      }
+        });
-      if (this.sticky_footer) {
-        let footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
-        this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {bottom: true, offset: footer_offset});
       }
     }
   }
@@ -124,12 +124,16 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
     this.subscriptions.forEach(subscription => {
       if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
         subscription.disconnect();
-      } else if (typeof ResizeObserver !== "undefined" && subscription instanceof IntersectionObserver) {
+      } else if (typeof IntersectionObserver !== "undefined" && subscription instanceof IntersectionObserver) {
         subscription.disconnect();
       }
     });
   }
   
+  initFooter() {
+    let footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
+    this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {bottom: true, offset: footer_offset});
+  }
 
   /**
    * Workaround for sticky not update bug when sidebar is toggled.
@@ -206,8 +210,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       let resizeObs = new ResizeObserver(entries => {
         entries.forEach(entry => {
           setTimeout(() => {
-            this.sticky.footer.offset = this.calcStickyFooterOffset(entry.target);
+            this.initFooter();
-            this.cdr.detectChanges();
           });
         })
       });

dashboard/sharedComponents/sidebar/layout.service.ts

@@ -59,7 +59,7 @@ export class LayoutService {
   /**
    *  Add hasQuickContact: false on data of route config, if the quick-contact fixed button is not needed.
    */
-  private hasQuickContactSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  private hasQuickContactSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   /**
    *  Add activeMenuItem: string on data of route config, if page should activate a specific MenuItem and route url does not match.
    */

dashboard/sharedComponents/sidebar/sideBar.component.ts

@@ -49,7 +49,9 @@ export class SideBarComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
   }
 
   ngAfterViewInit() {
+    setTimeout(() => {
       this.toggle(true);
+    });
   }
 
   ngOnChanges(changes: SimpleChanges) {

monitor/methodology/terminology.component.less

@@ -0,0 +1,3 @@
+.uk-width-medium {
+  width: 350px;
+}

monitor/methodology/terminology.component.ts

@@ -50,7 +50,7 @@ declare var ResizeObserver;
 				</div>
 				<div class="uk-section uk-container uk-container-large" uk-scrollspy-class>
 					<div id="parentContainer" class="uk-grid uk-grid-large" uk-grid>
-						<div class="uk-width-1-4 uk-margin-top">
+						<div class="uk-width-medium uk-margin-top">
 							<div class="uk-sticky" uk-sticky="bottom: !#parentContainer; offset: 100;">
 								<slider-tabs type="scrollable" position="left">
 									<slider-tab tabId="entities" tabTitle="1. Entities"></slider-tab>
@@ -116,7 +116,8 @@ declare var ResizeObserver;
 				</div>
 			</div>
 		</div>
-  `
+  `,
+  styleUrls: ['terminology.component.less']
 })
 export class TerminologyComponent implements OnInit, OnDestroy, AfterViewInit, AfterContentChecked {
   public tab: 'entities' | 'attributes' = 'entities';

sharedComponents/quick-contact/quick-contact.service.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from "rxjs";
 	providedIn: "root"
 })
 export class QuickContactService {
-	private display: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+	private display: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
 	public get isDisplayed(): Observable<boolean> {
 		return this.display.asObservable();

utils/dataTransfer/transferData.component.ts

@@ -60,7 +60,7 @@ export class EGIDataTransferComponent {
   }
 
   ngAfterViewInit() {
-    if(this.isOpen){
+    if(this.isOpen && typeof document !== 'undefined'){
       this.open();
     }
   }