From 3b6822c71f32512533793e6b57f6ff017f4c874e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 1 Aug 2023 11:40:55 +0300 Subject: [PATCH 01/16] Update material to version 15 --- .../claimEntitiesSelection.component.ts | 39 ------------------- .../claimProjectSearchForm.module.ts | 20 ++++------ dashboard/divId/divIds.module.ts | 12 +----- .../page-help-content-form.module.ts | 13 +++---- landingPages/feedback/feedback.module.ts | 3 +- .../citeThis/citeThis.component.ts | 12 +----- .../landing-utils/citeThis/citeThis.module.ts | 3 +- .../organization/organization.module.ts | 2 - landingPages/project/project.module.ts | 3 +- landingPages/result/resultLanding.module.ts | 4 +- .../notify-form/notify-form.module.ts | 3 +- .../advancedSearchForm.component.html | 11 +----- .../searchUtils/advancedSearchForm.module.ts | 3 +- .../searchUtils/entitiesSelection.module.ts | 3 +- .../searchUtils/quick-selections.component.ts | 1 - .../searchUtils/searchFilter.module.ts | 20 ++++------ .../searchUtils/searchSorting.module.ts | 14 +++---- .../search-input/search-input.module.ts | 3 +- utils/entities/entities.module.ts | 23 ----------- 19 files changed, 39 insertions(+), 153 deletions(-) delete mode 100644 claims/claim-utils/claimEntitiesSelection.component.ts delete mode 100644 utils/entities/entities.module.ts diff --git a/claims/claim-utils/claimEntitiesSelection.component.ts b/claims/claim-utils/claimEntitiesSelection.component.ts deleted file mode 100644 index 66c70f71..00000000 --- a/claims/claim-utils/claimEntitiesSelection.component.ts +++ /dev/null @@ -1,39 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import {ShowOptions} from './claimHelper.class'; -import {MatSelect} from "@angular/material/select"; -import {OpenaireEntities} from "../../utils/properties/searchFields"; - - -@Component({ - selector: 'claim-enities-selection', - - template:` - - - - {{openaireEntities.RESULTS}} - {{openaireEntities.PROJECTS}} - {{openaireEntities.COMMUNITIES}} - - - - - - `, - -}) -export class ClaimEntitiesSelectionComponent{ - @ViewChild(MatSelect) matSelect: MatSelect; - @Input() showOptions:ShowOptions = new ShowOptions(); - public openaireEntities = OpenaireEntities; - - open() { - if (this.matSelect && !this.matSelect.focused) { - this.matSelect.open(); - } - } - -} diff --git a/claims/claim-utils/claimProjectSearchForm.module.ts b/claims/claim-utils/claimProjectSearchForm.module.ts index 5293d430..3d2ace89 100644 --- a/claims/claim-utils/claimProjectSearchForm.module.ts +++ b/claims/claim-utils/claimProjectSearchForm.module.ts @@ -1,11 +1,9 @@ -import { NgModule } from '@angular/core'; +import {NgModule} from '@angular/core'; -import { SharedModule } from '../../../openaireLibrary/shared/shared.module'; -import { CommonModule } from '@angular/common'; +import {SharedModule} from '../../shared/shared.module'; +import {CommonModule} from '@angular/common'; import {ClaimProjectsSearchFormComponent} from './claimProjectSearchForm.component'; -// import {LoadingModalModule} from '../../utils/modal/loadingModal.module'; - import {ProjectServiceModule} from '../../landingPages/project/projectService.module'; import {ProjectsServiceModule} from '../../services/projectsService.module'; import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module'; @@ -13,29 +11,25 @@ import {HelperModule} from '../../utils/helper/helper.module'; import {ClaimResultsModule} from './claimResults.module'; -import {PagingModule } from '../../utils/paging.module'; +import {PagingModule} from '../../utils/paging.module'; import {SearchFilterModule} from '../../searchPages/searchUtils/searchFilter.module'; import {RangeFilterModule} from "../../utils/rangeFilter/rangeFilter.module"; -import {ClaimEntitiesSelectionComponent} from "./claimEntitiesSelection.component"; -import {MatSelectModule} from "@angular/material/select"; import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-input/advanced-search-input.module"; import {InputModule} from "../../sharedComponents/input/input.module"; import {DropdownFilterModule} from "../../utils/dropdown-filter/dropdown-filter.module"; - @NgModule({ +@NgModule({ imports: [ SharedModule, CommonModule, // LoadingModalModule, ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule, HelperModule, - PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, MatSelectModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule + PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule ], providers:[ ], declarations: [ ClaimProjectsSearchFormComponent, - ClaimEntitiesSelectionComponent - ], - exports: [ClaimProjectsSearchFormComponent, ClaimEntitiesSelectionComponent] + exports: [ClaimProjectsSearchFormComponent] }) export class ClaimProjectsSearchFormModule { } diff --git a/dashboard/divId/divIds.module.ts b/dashboard/divId/divIds.module.ts index e379ded4..eca996e6 100644 --- a/dashboard/divId/divIds.module.ts +++ b/dashboard/divId/divIds.module.ts @@ -6,14 +6,6 @@ import {AlertModalModule} from '../../utils/modal/alertModal.module'; import {DivIdsComponent} from './divIds.component'; import {AdminToolServiceModule} from "../../services/adminToolService.module"; import {InputModule} from "../../sharedComponents/input/input.module"; - - -import {MatAutocompleteModule} from '@angular/material/autocomplete'; -import { MatCheckboxModule } from "@angular/material/checkbox"; -import { MatFormFieldModule } from "@angular/material/form-field"; - - -import {MatChipsModule} from '@angular/material/chips'; import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module"; import {PageContentModule} from "../sharedComponents/page-content/page-content.module"; import {ClassesRoutingModule} from "./classes-routing.module"; @@ -24,8 +16,8 @@ import {LoadingModule} from "../../utils/loading/loading.module"; @NgModule({ imports: [ CommonModule, RouterModule, FormsModule, - AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule, - MatCheckboxModule, AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule + AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, + AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule ], declarations: [DivIdsComponent], exports: [DivIdsComponent] diff --git a/dashboard/helpTexts/page-help-content-form.module.ts b/dashboard/helpTexts/page-help-content-form.module.ts index 243a11d7..27e34ae4 100644 --- a/dashboard/helpTexts/page-help-content-form.module.ts +++ b/dashboard/helpTexts/page-help-content-form.module.ts @@ -8,21 +8,20 @@ import {PageContentFormComponent} from './page-help-content-form.component'; import {PageHelpContentFormRoutingModule} from './page-help-content-form-routing.module'; import {AdminToolServiceModule} from '../../services/adminToolService.module'; import {InputModule} from '../../sharedComponents/input/input.module'; -import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {IconsModule} from '../../utils/icons/icons.module'; import {PageContentModule} from '../sharedComponents/page-content/page-content.module'; import {RouterModule} from '@angular/router'; import {LoadingModule} from '../../utils/loading/loading.module'; +import {MatSlideToggleModule} from "@angular/material/slide-toggle"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, SafeHtmlPipeModule, CKEditorModule, - AlertModalModule, ReactiveFormsModule, PageHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, MatSlideToggleModule, IconsModule, PageContentModule, LoadingModule + AlertModalModule, ReactiveFormsModule, PageHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, IconsModule, PageContentModule, LoadingModule, MatSlideToggleModule ], - declarations: [ - PageContentFormComponent - ], - exports: [PageContentFormComponent] + declarations: [PageContentFormComponent], + exports: [PageContentFormComponent] }) -export class PageHelpContentFormModule {} +export class PageHelpContentFormModule { +} diff --git a/landingPages/feedback/feedback.module.ts b/landingPages/feedback/feedback.module.ts index 23ba3680..69f72d67 100644 --- a/landingPages/feedback/feedback.module.ts +++ b/landingPages/feedback/feedback.module.ts @@ -3,7 +3,6 @@ import {CommonModule} from "@angular/common"; import {FeedbackComponent} from "./feedback.component"; import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module"; import {ReactiveFormsModule} from "@angular/forms"; -import {MatSelectModule} from "@angular/material/select"; import {AlertModalModule} from "../../utils/modal/alertModal.module"; import {EmailService} from "../../utils/email/email.service"; import {RecaptchaModule} from "ng-recaptcha"; @@ -11,7 +10,7 @@ import {IconsModule} from "../../utils/icons/icons.module"; import {InputModule} from "../../sharedComponents/input/input.module"; @NgModule({ - imports: [CommonModule, LandingHeaderModule, ReactiveFormsModule, MatSelectModule, AlertModalModule, RecaptchaModule, IconsModule, InputModule], + imports: [CommonModule, LandingHeaderModule, ReactiveFormsModule, AlertModalModule, RecaptchaModule, IconsModule, InputModule], declarations: [FeedbackComponent], providers: [EmailService], exports: [FeedbackComponent] diff --git a/landingPages/landing-utils/citeThis/citeThis.component.ts b/landingPages/landing-utils/citeThis/citeThis.component.ts index 0334d387..660a4b0d 100644 --- a/landingPages/landing-utils/citeThis/citeThis.component.ts +++ b/landingPages/landing-utils/citeThis/citeThis.component.ts @@ -1,19 +1,9 @@ -import { - Component, - Inject, - Input, - OnDestroy, - OnInit, - RendererFactory2, - ViewEncapsulation -} from '@angular/core'; +import {Component, Inject, Input, OnDestroy, OnInit, RendererFactory2, ViewEncapsulation} from '@angular/core'; import {Citation, CitationData} from './citation.class'; -import {ResultLandingInfo} from "../../../utils/entities/resultLandingInfo"; import {DOCUMENT} from "@angular/common"; import {EnvProperties} from "../../../utils/properties/env-properties"; import {properties} from "../../../../../environments/environment"; import {PiwikService} from "../../../utils/piwik/piwik.service"; -import {ResultPreview} from "../../../utils/result-preview/result-preview"; declare var Cite: any; // Based on https://citation.js.org/api/tutorial-getting_started.html browser release diff --git a/landingPages/landing-utils/citeThis/citeThis.module.ts b/landingPages/landing-utils/citeThis/citeThis.module.ts index 53583b5f..8de1bdbc 100644 --- a/landingPages/landing-utils/citeThis/citeThis.module.ts +++ b/landingPages/landing-utils/citeThis/citeThis.module.ts @@ -3,13 +3,12 @@ import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {CiteThisComponent} from './citeThis.component'; -import { MatSelectModule } from "@angular/material/select"; import {InputModule} from "../../../sharedComponents/input/input.module"; @NgModule({ imports: [ - CommonModule, FormsModule, MatSelectModule, InputModule + CommonModule, FormsModule, InputModule ], declarations: [ CiteThisComponent diff --git a/landingPages/organization/organization.module.ts b/landingPages/organization/organization.module.ts index a367d897..9a4a2737 100644 --- a/landingPages/organization/organization.module.ts +++ b/landingPages/organization/organization.module.ts @@ -23,7 +23,6 @@ import {HelperModule} from "../../utils/helper/helper.module"; import {OrganizationsDeletedByInferenceModule} from "./deletedByInference/deletedByInference.module"; import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module"; import {FeedbackModule} from "../feedback/feedback.module"; -import {MatSelectModule} from "@angular/material/select"; import {TabsModule} from "../../utils/tabs/tabs.module"; import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module"; import {LoadingModule} from '../../utils/loading/loading.module'; @@ -50,7 +49,6 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod ProjectsServiceModule, Schema2jsonldModule, SEOServiceModule, HelperModule, OrganizationsDeletedByInferenceModule, LandingHeaderModule, FeedbackModule, - MatSelectModule, TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule, FullScreenModalModule, EGIDataTransferModule, EntityActionsModule ], declarations: [ diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts index e17a294c..713c9f1f 100644 --- a/landingPages/project/project.module.ts +++ b/landingPages/project/project.module.ts @@ -2,7 +2,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; -import {MatSelectModule} from "@angular/material/select"; import {ProjectComponent} from './project.component'; import {ProjectServiceModule} from './projectService.module'; @@ -41,7 +40,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod IFrameModule, ReportsServiceModule, SearchResearchResultsServiceModule, ProjectServiceModule, Schema2jsonldModule, SEOServiceModule, HelperModule, - LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule, + LandingHeaderModule, FeedbackModule, AltMetricsModule, TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule, FullScreenModalModule, SafeHtmlPipeModule, EGIDataTransferModule, EntityActionsModule ], diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts index 67a0a8fb..3803a598 100644 --- a/landingPages/result/resultLanding.module.ts +++ b/landingPages/result/resultLanding.module.ts @@ -28,8 +28,6 @@ import {FeedbackModule} from "../feedback/feedback.module"; import {TabsModule} from "../../utils/tabs/tabs.module"; import {LoadingModule} from "../../utils/loading/loading.module"; import {OrcidModule} from "../../orcid/orcid.module"; -import {MatFormFieldModule} from "@angular/material/form-field"; -import {MatSelectModule} from "@angular/material/select"; import {IconsModule} from "../../utils/icons/icons.module"; import {IconsService} from "../../utils/icons/icons.service"; import {cite, fire, graph, landmark, link, link_to, quotes, rocket, versions} from "../../utils/icons/icons"; @@ -48,7 +46,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod AltMetricsModule, Schema2jsonldModule, SEOServiceModule, DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule, AnnotationModule, LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule, - OrcidModule, MatFormFieldModule, MatSelectModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule, + OrcidModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule, SdgFosSuggestModule, FullScreenModalModule, SafeHtmlPipeModule, EntityActionsModule ], declarations: [ diff --git a/notifications/notify-form/notify-form.module.ts b/notifications/notify-form/notify-form.module.ts index ea7dda32..84e4ede3 100644 --- a/notifications/notify-form/notify-form.module.ts +++ b/notifications/notify-form/notify-form.module.ts @@ -1,13 +1,12 @@ import {NgModule} from "@angular/core"; import {NotifyFormComponent} from "./notify-form.component"; import {CommonModule} from "@angular/common"; -import {MatCheckboxModule} from "@angular/material/checkbox"; import {ReactiveFormsModule} from "@angular/forms"; import {InputModule} from "../../sharedComponents/input/input.module"; import {NotificationUserModule} from "../notification-user/notification-user.module"; @NgModule({ - imports: [CommonModule, MatCheckboxModule, ReactiveFormsModule, InputModule, NotificationUserModule], + imports: [CommonModule, ReactiveFormsModule, InputModule, NotificationUserModule], declarations: [NotifyFormComponent], exports: [NotifyFormComponent] }) diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index f0d88901..846c6bc2 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -33,10 +33,7 @@ [options]="fieldIdsOptions" (valueChange)="fieldIdsChanged(i,selectedField.id)" type="select">
- + >
-
Please check your from date diff --git a/searchPages/searchUtils/advancedSearchForm.module.ts b/searchPages/searchUtils/advancedSearchForm.module.ts index d9cf2b9b..5d5c17a0 100644 --- a/searchPages/searchUtils/advancedSearchForm.module.ts +++ b/searchPages/searchUtils/advancedSearchForm.module.ts @@ -10,7 +10,6 @@ import {DateFilterModule} from './dateFilter.module'; import {SearchFormModule} from './searchForm.module'; import {QuickSelectionsModule} from "./quick-selections.module"; import {EntitiesSelectionModule} from "./entitiesSelection.module"; -import {MatSelectModule} from "@angular/material/select"; import {IconsModule} from "../../utils/icons/icons.module"; import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module"; import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-input/advanced-search-input.module"; @@ -22,7 +21,7 @@ import {filters} from "../../utils/icons/icons"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule, - SearchFormModule, QuickSelectionsModule, EntitiesSelectionModule, MatSelectModule, IconsModule, SearchInputModule, AdvancedSearchInputModule, InputModule + SearchFormModule, QuickSelectionsModule, EntitiesSelectionModule, IconsModule, SearchInputModule, AdvancedSearchInputModule, InputModule ], declarations: [ AdvancedSearchFormComponent, diff --git a/searchPages/searchUtils/entitiesSelection.module.ts b/searchPages/searchUtils/entitiesSelection.module.ts index 9a281ee4..e10a0e9d 100644 --- a/searchPages/searchUtils/entitiesSelection.module.ts +++ b/searchPages/searchUtils/entitiesSelection.module.ts @@ -3,13 +3,12 @@ import {CommonModule} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import {EntitiesSelectionComponent} from "./entitiesSelection.component"; -import { MatSelectModule } from "@angular/material/select"; import {InputModule} from "../../sharedComponents/input/input.module"; @NgModule({ imports: [ CommonModule, FormsModule, - RouterModule, ReactiveFormsModule, MatSelectModule, InputModule + RouterModule, ReactiveFormsModule, InputModule ], declarations: [ EntitiesSelectionComponent, diff --git a/searchPages/searchUtils/quick-selections.component.ts b/searchPages/searchUtils/quick-selections.component.ts index ee9dd8b4..0931a405 100644 --- a/searchPages/searchUtils/quick-selections.component.ts +++ b/searchPages/searchUtils/quick-selections.component.ts @@ -6,7 +6,6 @@ import {ConfigurationService} from "../../utils/configuration/configuration.serv import {Subscription} from "rxjs"; import {ActivatedRoute, Router} from "@angular/router"; import {properties} from "../../../../environments/environment"; -import {OpenaireEntities} from "../../utils/properties/searchFields"; @Component({ selector: 'quick-selections', diff --git a/searchPages/searchUtils/searchFilter.module.ts b/searchPages/searchUtils/searchFilter.module.ts index 382884c1..6f8bc92b 100644 --- a/searchPages/searchUtils/searchFilter.module.ts +++ b/searchPages/searchUtils/searchFilter.module.ts @@ -1,29 +1,25 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; import {SearchFilterComponent} from './searchFilter.component'; -import{SearchFilterModalComponent} from './searchFilterModal.component'; +import {SearchFilterModalComponent} from './searchFilterModal.component'; import {ModalModule} from '../../utils/modal/modal.module'; -import { MatSelectModule } from "@angular/material/select"; import {RouterModule} from "@angular/router"; import {InputModule} from '../../sharedComponents/input/input.module'; import {IconsModule} from "../../utils/icons/icons.module"; @NgModule({ imports: [ - CommonModule, FormsModule, ModalModule, MatSelectModule, RouterModule, + CommonModule, FormsModule, ModalModule, RouterModule, InputModule, IconsModule ], declarations: [ SearchFilterComponent, SearchFilterModalComponent -], - - providers:[ ], exports: [ SearchFilterComponent, SearchFilterModalComponent - - ] + ] }) -export class SearchFilterModule { } +export class SearchFilterModule { +} diff --git a/searchPages/searchUtils/searchSorting.module.ts b/searchPages/searchUtils/searchSorting.module.ts index 140dc0fa..51992dfd 100644 --- a/searchPages/searchUtils/searchSorting.module.ts +++ b/searchPages/searchUtils/searchSorting.module.ts @@ -1,16 +1,14 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {RouterModule} from '@angular/router'; -import{SearchSortingComponent} from './searchSorting.component'; -import { MatSelectModule } from "@angular/material/select"; +import {SearchSortingComponent} from './searchSorting.component'; import {InputModule} from '../../sharedComponents/input/input.module'; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, MatSelectModule, - InputModule + CommonModule, FormsModule, RouterModule, InputModule ], declarations: [ SearchSortingComponent diff --git a/sharedComponents/search-input/search-input.module.ts b/sharedComponents/search-input/search-input.module.ts index 158b7815..7e5c2de4 100644 --- a/sharedComponents/search-input/search-input.module.ts +++ b/sharedComponents/search-input/search-input.module.ts @@ -1,13 +1,12 @@ import {NgModule} from '@angular/core'; import {SharedModule} from '../../../openaireLibrary/shared/shared.module'; import {SearchInputComponent} from './search-input.component'; -import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {IconsModule} from '../../utils/icons/icons.module'; import {InputModule} from "../input/input.module"; import {ClickModule} from "../../utils/click/click.module"; @NgModule({ - imports: [SharedModule, MatAutocompleteModule, IconsModule, InputModule, ClickModule], + imports: [SharedModule, IconsModule, InputModule, ClickModule], declarations: [SearchInputComponent], exports: [SearchInputComponent] }) diff --git a/utils/entities/entities.module.ts b/utils/entities/entities.module.ts deleted file mode 100644 index 76e06335..00000000 --- a/utils/entities/entities.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - - -//Entities -import {OrganizationInfo} from './organizationInfo'; -import {ProjectInfo} from './projectInfo'; -import {Publication} from './publication'; -import {ResultLandingInfo} from './resultLandingInfo'; -import {SearchResult} from './searchResult'; -import {DataProviderInfo} from './dataProviderInfo'; -import {Metrics} from './metrics'; - -@NgModule({ - imports: [ CommonModule, FormsModule ], - declarations: [ - - ], - exports: [ - ] -}) -export class EntitiesModule { } From 51e39801796e6c49c97cc721c7b1e797a45a8880 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 1 Aug 2023 14:29:27 +0300 Subject: [PATCH 02/16] Update angular to version 16 --- .../communityGuard/connectAdminLoginGuard.guard.ts | 11 ++--------- connect/communityGuard/isCommunity.guard.ts | 12 +++--------- error/isRouteEnabled.guard.ts | 4 ++-- http-interceptor.service.ts | 2 +- login/adminLoginGuard.guard.ts | 11 ++--------- login/freeGuard.guard.ts | 10 ++-------- login/loginGuard.guard.ts | 13 ++----------- utils/can-exit.guard.ts | 4 ++-- utils/piwik/previousRouteRecorder.guard.ts | 4 ++-- 9 files changed, 18 insertions(+), 53 deletions(-) diff --git a/connect/communityGuard/connectAdminLoginGuard.guard.ts b/connect/communityGuard/connectAdminLoginGuard.guard.ts index 2b55ede5..86359230 100644 --- a/connect/communityGuard/connectAdminLoginGuard.guard.ts +++ b/connect/communityGuard/connectAdminLoginGuard.guard.ts @@ -1,20 +1,13 @@ import {filter, map, mergeMap, take} from 'rxjs/operators'; import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable, of} from 'rxjs'; import {Session} from '../../login/utils/helper.class'; import {LoginErrorCodes} from '../../login/utils/guardHelper.class'; import {UserManagementService} from "../../services/user-management.service"; @Injectable() -export class ConnectAdminLoginGuard implements CanActivate, CanActivateChild { +export class ConnectAdminLoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/connect/communityGuard/isCommunity.guard.ts b/connect/communityGuard/isCommunity.guard.ts index 41b737c2..9dd04798 100644 --- a/connect/communityGuard/isCommunity.guard.ts +++ b/connect/communityGuard/isCommunity.guard.ts @@ -1,11 +1,5 @@ -import { Injectable } from '@angular/core'; -import { - Router, - CanActivate, - ActivatedRouteSnapshot, - RouterStateSnapshot, - CanLoad, Route, UrlSegment, CanActivateChild, UrlTree -} from '@angular/router'; +import {Injectable} from '@angular/core'; +import {ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree} from '@angular/router'; import {Observable} from 'rxjs'; import {ConnectHelper} from '../connectHelper'; @@ -14,7 +8,7 @@ import {CommunityService} from "../community/community.service"; import {map} from "rxjs/operators"; @Injectable() -export class IsCommunity implements CanActivate, CanActivateChild { +export class IsCommunity { constructor(private router: Router, private communityService: CommunityService) { diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts index 2c8d704c..2dca90fb 100644 --- a/error/isRouteEnabled.guard.ts +++ b/error/isRouteEnabled.guard.ts @@ -1,13 +1,13 @@ import {Observable} from 'rxjs'; import {take, tap} from 'rxjs/operators'; import {Injectable} from '@angular/core'; -import {ActivatedRouteSnapshot, CanActivate, Data, Router, RouterStateSnapshot, UrlTree} from '@angular/router'; +import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {ConfigurationService} from '../utils/configuration/configuration.service'; import {ConnectHelper} from '../connect/connectHelper'; import {properties} from "../../../environments/environment"; @Injectable() -export class IsRouteEnabled implements CanActivate { +export class IsRouteEnabled { constructor(private router: Router, private config: ConfigurationService) { diff --git a/http-interceptor.service.ts b/http-interceptor.service.ts index 7b0a4104..03b66510 100644 --- a/http-interceptor.service.ts +++ b/http-interceptor.service.ts @@ -2,7 +2,7 @@ import {Injectable, Inject, PLATFORM_ID, Optional} from '@angular/core'; import {HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpResponse, HttpHeaders} from '@angular/common/http'; import {Observable, of} from 'rxjs'; import {tap} from 'rxjs/operators'; -import {TransferState, makeStateKey, StateKey} from '@angular/platform-browser'; +import {TransferState, makeStateKey, StateKey} from '@angular/core'; import {isPlatformServer} from '@angular/common'; import {properties} from "../../environments/environment"; import {REQUEST} from "./utils/tokens"; diff --git a/login/adminLoginGuard.guard.ts b/login/adminLoginGuard.guard.ts index 53b2ec94..ddb800ab 100644 --- a/login/adminLoginGuard.guard.ts +++ b/login/adminLoginGuard.guard.ts @@ -1,12 +1,5 @@ import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, Data, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {Session} from './utils/helper.class'; import {LoginErrorCodes} from './utils/guardHelper.class'; @@ -16,7 +9,7 @@ import {map, tap} from "rxjs/operators"; @Injectable({ providedIn: 'root' }) -export class AdminLoginGuard implements CanActivate, CanActivateChild { +export class AdminLoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/login/freeGuard.guard.ts b/login/freeGuard.guard.ts index c2141a70..13d5941e 100644 --- a/login/freeGuard.guard.ts +++ b/login/freeGuard.guard.ts @@ -1,16 +1,10 @@ import { Injectable } from '@angular/core'; -import { - Router, - CanActivate, - ActivatedRouteSnapshot, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { Router, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {LoginErrorCodes} from './utils/guardHelper.class'; @Injectable() -export class FreeGuard implements CanActivate { +export class FreeGuard { constructor(private router: Router) { } diff --git a/login/loginGuard.guard.ts b/login/loginGuard.guard.ts index 0c9f737c..297f52df 100644 --- a/login/loginGuard.guard.ts +++ b/login/loginGuard.guard.ts @@ -1,14 +1,5 @@ import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, - CanLoad, - Route, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Route, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {LoginErrorCodes} from './utils/guardHelper.class'; import {map, tap} from "rxjs/operators"; @@ -17,7 +8,7 @@ import {UserManagementService} from "../services/user-management.service"; @Injectable({ providedIn: 'root' }) -export class LoginGuard implements CanActivate, CanLoad, CanActivateChild { +export class LoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/utils/can-exit.guard.ts b/utils/can-exit.guard.ts index 61947899..692a970f 100644 --- a/utils/can-exit.guard.ts +++ b/utils/can-exit.guard.ts @@ -1,6 +1,6 @@ import {Observable} from 'rxjs'; import {Injectable} from '@angular/core'; -import {CanDeactivate} from '@angular/router'; + export interface IDeactivateComponent { canExit: () => Observable | Promise | boolean; @@ -9,7 +9,7 @@ export interface IDeactivateComponent { @Injectable({ providedIn: 'root' }) -export class CanExitGuard implements CanDeactivate { +export class CanExitGuard { constructor() { } diff --git a/utils/piwik/previousRouteRecorder.guard.ts b/utils/piwik/previousRouteRecorder.guard.ts index e4961b7a..4d050618 100644 --- a/utils/piwik/previousRouteRecorder.guard.ts +++ b/utils/piwik/previousRouteRecorder.guard.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; -import { CanDeactivate, Router} from '@angular/router'; +import { Router } from '@angular/router'; import {Observable} from 'rxjs'; import {properties} from "../../../../environments/environment"; @Injectable({ providedIn: 'root' }) // do not forget to register this class as a provider -export class PreviousRouteRecorder implements CanDeactivate { +export class PreviousRouteRecorder { constructor(private router: Router) { } canDeactivate(component: any): Observable | boolean { From e7429881ca7788fb218cc0063a0bc1e3bdb626f4 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 2 Aug 2023 14:08:04 +0300 Subject: [PATCH 03/16] Delete a > in advanced form --- searchPages/searchUtils/advancedSearchForm.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 846c6bc2..8019c91c 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -33,7 +33,7 @@ [options]="fieldIdsOptions" (valueChange)="fieldIdsChanged(i,selectedField.id)" type="select">
- > +
Date: Fri, 4 Aug 2023 14:45:41 +0300 Subject: [PATCH 04/16] Import transferState from angular/core --- cache-interceptor.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cache-interceptor.service.ts b/cache-interceptor.service.ts index a3a67d32..14e0f648 100644 --- a/cache-interceptor.service.ts +++ b/cache-interceptor.service.ts @@ -1,6 +1,5 @@ -import { Injectable, Inject, PLATFORM_ID } from '@angular/core'; +import {Injectable, Inject, PLATFORM_ID, TransferState} from '@angular/core'; import { HttpInterceptor, HttpRequest, HttpHandler } from '@angular/common/http'; -import { TransferState } from '@angular/platform-browser'; import { properties } from "../../environments/environment"; @Injectable({ From d9a828363002336b3d333174560796706c7c1bce Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 22 Aug 2023 17:08:46 +0300 Subject: [PATCH 05/16] Update to Uikit 3.16.24 --- claims/linking/linkingGeneric.component.html | 4 +- .../page-content/page-content.component.ts | 39 +------------------ .../sidebar/sideBar.component.html | 3 +- fos/fos.component.html | 2 +- .../dataProvider/dataProvider.component.html | 6 +-- .../organization/organization.component.html | 6 +-- landingPages/project/project.component.html | 6 +-- .../result/resultLanding.component.html | 8 ++-- login/userMini.component.ts | 7 ++-- monitor/methodology/terminology.component.ts | 4 +- sharedComponents/input/input.component.ts | 4 +- sharedComponents/navigationBar.component.html | 28 ++++++------- .../search-input/search-input.component.ts | 1 + .../entitiesAutoComplete.component.ts | 2 +- .../staticAutoComplete.component.ts | 2 +- utils/theme/theme.component.html | 8 ++-- 16 files changed, 45 insertions(+), 85 deletions(-) diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html index 9d0b1379..7f394dd2 100644 --- a/claims/linking/linkingGeneric.component.html +++ b/claims/linking/linkingGeneric.component.html @@ -45,7 +45,7 @@
-
+
-
+
diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts index 54261153..654f82e6 100644 --- a/dashboard/sharedComponents/page-content/page-content.component.ts +++ b/dashboard/sharedComponents/page-content/page-content.component.ts @@ -80,9 +80,6 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy { } ngOnInit() { - if(this.isBrowser) { - this.stickyBugWorkaround(); - } this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => { this.isMobile = isMobile; if(this.isBrowser) { @@ -132,41 +129,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy { 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. - * TODO when UIKit will be updated => remove - * - * */ - stickyBugWorkaround() { - let sidebarOffset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-width')) - - Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-mini-width')); - let transitionDelay = Number.parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-transition-delay')) * 1000; - this.subscriptions.push(this.layoutService.isOpen.subscribe(isOpen => { - if (this.sticky.header) { - if (isOpen) { - this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) - sidebarOffset + 'px'; - } else { - this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) + sidebarOffset + 'px'; - } - setTimeout(() => { - this.sticky.header.$emit(); - }, transitionDelay); - } - if (this.sticky.footer) { - if (isOpen) { - this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) - sidebarOffset + 'px'; - } else { - this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) + sidebarOffset + 'px'; - } - setTimeout(() => { - this.sticky.footer.$emit(); - }, transitionDelay); - } - this.cdr.detectChanges(); - })); + this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {end: true, offset: footer_offset}); } /** diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html index 9bba0b18..35e20996 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.html +++ b/dashboard/sharedComponents/sidebar/sideBar.component.html @@ -29,7 +29,7 @@
-
{{item.title}} +
  • -
    +
    • diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 376cbb87..4ec30f37 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -17,7 +17,7 @@
      + uk-sticky="end: true; media: @m" [attr.offset]="offset">
      - {{menu.title}} - {{menu.title}} - {{menu.title}} + [fragment]="menu.fragment">{{menu.title}} + + {{menu.title}}
      • {{menu.title}} -
        -
        -
        -
        • diff --git a/sharedComponents/search-input/search-input.component.ts b/sharedComponents/search-input/search-input.component.ts index ea7e87df..0b2a3e02 100644 --- a/sharedComponents/search-input/search-input.component.ts +++ b/sharedComponents/search-input/search-input.component.ts @@ -90,6 +90,7 @@ export class SearchInputComponent implements OnInit, AfterViewInit { ngAfterViewInit() { if(typeof document !== 'undefined') { this.ratio = Number.parseFloat(getComputedStyle(this.searchInput.nativeElement).getPropertyValue('--search-input-icon-ratio')); + this.cdr.detectChanges() } } diff --git a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts index 9a3faee1..080f3dab 100644 --- a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts +++ b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts @@ -31,7 +31,7 @@ import {AutoCompleteValue} from "../../searchPages/searchUtils/searchHelperClass
        + uk-dropdown="pos: bottom-left; mode: none; stretch: true; offset: 15; flip: false; shift: false" [attr.target]="'#' + id" [attr.boundary]="'#' + id">
        -
        diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 68893685..2f0e4d78 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -182,7 +182,7 @@ (stickyForm?'':' ') : (+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom uk-padding-remove-top ' + ((usedBy == 'deposit' || usedBy == 'orcid') ? ' uk-padding-remove-top ' : ' '))" - [attr.uk-sticky]="((stickyForm || (simpleView && mobile))?'{offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+ + [attr.uk-sticky]="((stickyForm || (simpleView && mobile))?'{offset:100;start:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+ (usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ? ' uk-position-relative ' :(' uk-section ' ))+'}':null)">
        From befbfd071b96dec562ac39b0d4b65e869fd094ce Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 11:43:07 +0300 Subject: [PATCH 07/16] Add xsmall padding in graph_elements instread of margins because of uikit upgrade --- .../dataProvider/dataProvider.component.html | 4 ++- .../organization/organization.component.html | 26 ++++++++++--------- landingPages/project/project.component.html | 4 ++- .../result/resultLanding.component.html | 4 ++- monitor/methodology/terminology.component.ts | 8 +++--- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 4ec30f37..5246c1b0 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -48,7 +48,8 @@
        -
        +
        +
        Powered by OpenAIRE graph @@ -63,6 +64,7 @@ Give us feedback
        +
        -
        - - - Powered by OpenAIRE graph - - +
        +
        + + + Powered by OpenAIRE graph + + Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} - -
        - Found an issue? - Give us feedback -
        -
        + +
        + Found an issue? + Give us feedback +
        +
        +
        -
        +
        +
        Powered by OpenAIRE graph @@ -100,6 +101,7 @@ Give us feedback
        +
        -
        +
        +
        Powered by OpenAIRE graph @@ -96,6 +97,7 @@ Give us feedback
        +
        -
        -
        +
        Powered by OpenAIRE graph @@ -83,9 +83,9 @@ declare var ResizeObserver;
        -
        -
        +
        Powered by OpenAIRE graph From 7906b056c919a95d9edbe6bcc00e364f2af4dab7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 16:42:52 +0300 Subject: [PATCH 08/16] Fix drops and dropdowns in avalableOn, result-preview and showAuthors --- .../landing-utils/availableOn.component.ts | 7 +++-- utils/authors/showAuthors.component.ts | 2 +- .../result-preview.component.html | 30 ++++++++++--------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index 9a1d217c..b3d47e2b 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -26,9 +26,10 @@ import {RouterHelper} from "../../utils/routerHelper.class"; -
        - +
        +
        + +
        diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts index a9987197..12a8784a 100644 --- a/utils/authors/showAuthors.component.ts +++ b/utils/authors/showAuthors.component.ts @@ -26,7 +26,7 @@ import {properties} from "../../../../environments/environment"; {{author.fullName + ";"}} -
        +
        diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index d8608abb..5bc75d3f 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -216,20 +216,22 @@ [name]="result.measure.bip[0].icon"> {{result.measure.bip[0].value}} -
        - - - - - - -
        - - {{metric.name}}{{metric.value}}
        -
        - BIP! - Powered by BIP! +
        +
        + + + + + + +
        + + {{metric.name}}{{metric.value}}
        +
        + BIP! + Powered by BIP! +
        From 55a995a34890318b024d458cdd978a9d044d8b47 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 29 Aug 2023 10:53:51 +0300 Subject: [PATCH 09/16] Input: Date add calendar in mobile dropdown --- sharedComponents/input/input.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index d3a6722b..ad0bd9a4 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -199,6 +199,9 @@ declare var UIkit; uk-dropdown="pos: bottom-left; mode: none; flip: false ; shift: false" [attr.target]="'#' + id" [attr.boundary]="'#' + id" (click)="$event.stopPropagation()">
        + + +
          From 1be082c2f37c0a7da1c06de23e7588718b8b647c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 30 Aug 2023 11:11:23 +0300 Subject: [PATCH 10/16] Add hasStickyHeaderOnMobile in layoutService --- .../sharedComponents/sidebar/layout.service.ts | 18 ++++++++++++++++++ sharedComponents/navigationBar.component.html | 2 +- sharedComponents/navigationBar.component.ts | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts index 39a2eaa8..38ae65c7 100644 --- a/dashboard/sharedComponents/sidebar/layout.service.ts +++ b/dashboard/sharedComponents/sidebar/layout.service.ts @@ -79,6 +79,10 @@ export class LayoutService { * Add hasMenuSearchBar: false/ nothing on data of route config, if the search bar in the menu should not appear, otherwise true. */ private hasMenuSearchBarSubject: BehaviorSubject = new BehaviorSubject(false); + /** + * Add hasStickyHeaderOnMobile: true in order to activate uk-sticky in header of mobile/tablet devices. + * */ + private hasStickyHeaderOnMobileSubject: BehaviorSubject = new BehaviorSubject(false); private subscriptions: any[] = []; @@ -177,6 +181,12 @@ export class LayoutService { } else { this.setHasMenuSearchBar(false); } + if (data['hasStickyHeaderOnMobile'] !== undefined && + data['hasStickyHeaderOnMobile'] === true) { + this.setHasStickyHeaderOnMobile(true); + } else { + this.setHasStickyHeaderOnMobile(false); + } } })); this.setObserver(); @@ -311,4 +321,12 @@ export class LayoutService { setHasMenuSearchBar(value: boolean) { this.hasMenuSearchBarSubject.next(value); } + + get hasStickyHeaderOnMobile(): Observable { + return this.hasStickyHeaderOnMobileSubject.asObservable(); + } + + setHasStickyHeaderOnMobile(value: boolean) { + this.hasStickyHeaderOnMobileSubject.next(value); + } } diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 83f49b47..873c0cd9 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -1,5 +1,5 @@
          -