-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move the extra code in PortalModule into MysteryService
- Loading branch information
Showing
5 changed files
with
163 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,23 +5,26 @@ | |
| // :author: CSC - IT Center for Science Ltd., Espoo Finland [email protected] | ||
| // :license: MIT | ||
|
|
||
| import { Component, Inject, PLATFORM_ID } from '@angular/core'; | ||
| import { Component, inject, Inject, PLATFORM_ID } from '@angular/core'; | ||
| import { DOCUMENT, isPlatformBrowser, PlatformLocation } from '@angular/common'; | ||
| import { AppConfigService } from '@shared/services/app-config-service.service'; | ||
| import { OidcSecurityService } from 'angular-auth-oidc-client'; | ||
| import { NavigationStart, Router, RouterOutlet } from '@angular/router'; | ||
| import { take } from 'rxjs/operators'; | ||
| import { AppSettingsService } from '@shared/services/app-settings.service'; | ||
| import { AppSettingsService } from '@shared/services/app-settings.service'; | ||
| import { LayoutComponent } from './layout/layout.component'; | ||
| import { MysteryService } from '@portal/services/mystery.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-root', | ||
| templateUrl: './app.component.html', | ||
| styleUrls: ['./app.component.scss'], | ||
| standalone: true, | ||
| imports: [LayoutComponent, RouterOutlet], | ||
| @Component({ | ||
| selector: 'app-root', | ||
| templateUrl: './app.component.html', | ||
| styleUrls: ['./app.component.scss'], | ||
| standalone: true, | ||
| imports: [LayoutComponent, RouterOutlet], | ||
| }) | ||
| export class AppComponent { | ||
| mysteryService = inject(MysteryService); | ||
|
|
||
| title = 'research-fi-portal'; | ||
|
|
||
| constructor( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| import { Injectable, OnDestroy } from '@angular/core'; | ||
| import { Subscription } from 'rxjs'; | ||
| import { FaIconLibrary } from '@fortawesome/angular-fontawesome'; | ||
| import { Event, Router, Scroll } from '@angular/router'; | ||
| import { ViewportScroller } from '@angular/common'; | ||
| import { HistoryService } from '@portal/services/history.service'; | ||
| import { TabChangeService } from '@portal/services/tab-change.service'; | ||
| import { filter } from 'rxjs/operators'; | ||
| import { faExternalLinkAlt, faInfoCircle } from '@fortawesome/free-solid-svg-icons'; | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class MysteryService implements OnDestroy { | ||
| startPage; | ||
| routeSub: Subscription; | ||
|
|
||
| isResultPage(url: string) { | ||
| // Check if the page is on results, and that the tabname ends with 's' (not single result) | ||
| return ( | ||
| url?.includes('/results') && | ||
| url?.split('/')[2].split('?')[0].slice(-1) === 's' | ||
| ); | ||
| } | ||
|
|
||
| newPage(oldUrl: string, newUrl: string) { | ||
| // Check if both urls are on the results page (tab change) | ||
| if (this.isResultPage(oldUrl) && this.isResultPage(newUrl)) { | ||
| return false; | ||
| // Check deepest locations without query params | ||
| } else if ( | ||
| oldUrl?.split('/').slice(-1)[0].split('?')[0] === | ||
| newUrl.split('/').slice(-1)[0].split('?')[0] | ||
| ) { | ||
| return false; | ||
| // Same for fragments | ||
| } else if ( | ||
| oldUrl?.split('/').slice(-1)[0].split('#')[0] === | ||
| newUrl.split('/').slice(-1)[0].split('#')[0] | ||
| ) { | ||
| return false; | ||
| // Otherwise new page | ||
| } else { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| constructor( | ||
| library: FaIconLibrary, | ||
| router: Router, | ||
| viewportScroller: ViewportScroller, | ||
| private historyService: HistoryService, | ||
| private tabChangeService: TabChangeService | ||
| ) { | ||
| console.log('XXX MysteryService HERE!'); | ||
|
|
||
| this.startPage = router.parseUrl(router.url).queryParams.page || 1; | ||
|
|
||
| // Scroll to top of page | ||
| // Timeout value of 0 helps Firefox to scroll | ||
| const scrollToTop = () => { | ||
| console.log("XXX scrollToTop"); | ||
|
|
||
| setTimeout(() => viewportScroller.scrollToPosition([0, 0]), 0); | ||
| }; | ||
|
|
||
| // Used to prevent scroll to top when filters are selected | ||
| this.routeSub = router.events | ||
| .pipe(filter((e: Event): e is Scroll => e instanceof Scroll)) | ||
| .subscribe((e) => { | ||
| console.log("XXX routeSub fires"); | ||
|
|
||
| const currentUrl = e.routerEvent.url; | ||
| const history = this.historyService.history; | ||
| const resultPages = tabChangeService.tabData | ||
| .map((tab) => tab.link) | ||
| .filter((item) => item); | ||
|
|
||
| // Trigger new page so first tab focuses skip links | ||
| const prevPageLocation = history[history.length - 2]; | ||
| const currentPageLocation = currentUrl; | ||
| if (this.newPage(prevPageLocation, currentPageLocation)) { | ||
| this.tabChangeService.triggerNewPage(); | ||
| } | ||
|
|
||
| // Check that route is in results and not in single result | ||
| if ( | ||
| currentUrl.includes('/results') && | ||
| !resultPages.some((item) => | ||
| currentUrl.includes(`/${item.slice(0, -1)}/`) | ||
| ) | ||
| ) { | ||
| const targetPage = +router.parseUrl(currentUrl).queryParams.page || 1; | ||
| // Different page or coming from different route | ||
| if ( | ||
| this.startPage !== targetPage || | ||
| !history[history.length - 2]?.includes('/results') | ||
| ) { | ||
| scrollToTop(); | ||
| } | ||
| this.startPage = targetPage; | ||
|
|
||
| // Similar to /results but for /funding-calls | ||
| } else if (currentUrl.includes('/funding-calls')) { | ||
| const targetPage = +router.parseUrl(currentUrl).queryParams.page || 1; | ||
| // Different page or coming from different route | ||
| if ( | ||
| this.startPage !== targetPage || | ||
| !history[history.length - 2]?.includes('/funding-calls') | ||
| ) { | ||
| scrollToTop(); | ||
| } | ||
| this.startPage = targetPage; | ||
| } else if (currentUrl.includes('/science-research-figures')) { | ||
| // scroll to top only in single figure view | ||
| if (!history[history.length - 2]?.includes('figures/s')) { | ||
| scrollToTop(); | ||
| } | ||
| if (!currentUrl.includes('filter')) { | ||
| scrollToTop(); | ||
| } | ||
| } else { | ||
| scrollToTop(); | ||
| } | ||
| }); | ||
|
|
||
| console.log("XXX Adding global icons"); | ||
| // Add global icons | ||
| library.addIcons(faExternalLinkAlt as any, faInfoCircle as any); | ||
| } | ||
|
|
||
| ngOnDestroy(): void { | ||
| this.routeSub?.unsubscribe(); | ||
| } | ||
| } |
Oops, something went wrong.