From 5f21a9dd6cf3665d5cd1f5d9afe8248531d4e2c5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 1 May 2024 16:00:21 +0300 Subject: [PATCH] Update libraries. Add custom strategy route. --- src/app/app.component.ts | 19 +++++-------------- src/app/app.module.ts | 3 +++ src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cbb8682..1ed0d96 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,24 +1,16 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; -import {ActivatedRoute, Data, NavigationEnd, Params, Router} from '@angular/router'; -import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; +import {ChangeDetectorRef, Component, OnInit} from '@angular/core'; +import {ActivatedRoute, Params, Router} from '@angular/router'; import {Role, Session, User} from './openaireLibrary/login/utils/helper.class'; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder.service"; -import {BehaviorSubject, Subscriber, Subscription} from "rxjs"; +import {Subscription} from "rxjs"; import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; import {MenuItem} from "./openaireLibrary/sharedComponents/menu"; -import { - Category, - Stakeholder, - StakeholderEntities, - Topic, - Visibility -} from "./openaireLibrary/monitor/entities/stakeholder"; +import {Category, Stakeholder, Topic, Visibility} from "./openaireLibrary/monitor/entities/stakeholder"; import {LinksResolver} from "./search/links-resolver"; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; -import {properties} from "../environments/environment"; import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; -import {StakeholderConfiguration, StakeholderUtils} from "./openaireLibrary/monitor-admin/utils/indicator-utils"; +import {StakeholderUtils} from "./openaireLibrary/monitor-admin/utils/indicator-utils"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {ConnectHelper} from "./openaireLibrary/connect/connectHelper"; import {ResourcesService} from "./openaireLibrary/monitor/services/resources.service"; @@ -26,7 +18,6 @@ import {StringUtils} from "./openaireLibrary/utils/string-utils.class"; import { NotificationConfiguration } from "./openaireLibrary/notifications/notifications-sidebar/notifications-sidebar.component"; -import {StakeholderBaseComponent} from "./openaireLibrary/monitor-admin/utils/stakeholder-base.component"; import {SidebarBaseComponent} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-base.component"; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d1594e6..a874b2a 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,6 +30,8 @@ import {IconsService} from "./openaireLibrary/utils/icons/icons.service"; import {incognito} from "./openaireLibrary/utils/icons/icons"; import {AdminDashboardGuard} from "./openaireLibrary/monitor-admin/utils/adminDashboard.guard"; import {CacheIndicatorsModule} from "./openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators.module"; +import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-reuse-strategy"; +import {RouteReuseStrategy} from "@angular/router"; @NgModule({ @@ -50,6 +52,7 @@ import {CacheIndicatorsModule} from "./openaireLibrary/monitor-admin/utils/cache declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ + {provide: RouteReuseStrategy, useClass: CustomRouteReuseStrategy}, {provide: APP_ID, useValue: 'monitor-dashboard'}, AdminLoginGuard, AdminDashboardGuard, LoginGuard, { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6d9d118..6e96974 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6d9d118d575564b1e249b5f673c00c395f14f04c +Subproject commit 6e96974364507f347ee4ed65307073e5ca12e476 diff --git a/src/assets/common-assets b/src/assets/common-assets index 8d2f834..e48bf94 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 8d2f8348d8a601fad14844d920791fe7370bd4a2 +Subproject commit e48bf941bcdc567a3d09826b5686e70d43fafd46 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 886854f..fe10d2e 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 886854fcba4c9ed20630ae3ca8da3d2014442672 +Subproject commit fe10d2e9195fdebf3d906f28abbb072f3617c4ee