From df982704f08336af895b5b33c9fd297907fadb1e Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Wed, 1 May 2024 11:25:29 +0300 Subject: [PATCH] [master | DONE | CHANGED] move CustomRouteReuseStrategy to openaireLibrary --- src/app/app.module.ts | 2 +- src/app/openaireLibrary | 2 +- src/app/shared/custom-route-reuse-strategy.ts | 7 ------- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 src/app/shared/custom-route-reuse-strategy.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d9c2ed0..54972be 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -19,7 +19,7 @@ import {SearchOrcidService} from "./openaireLibrary/claims/claim-utils/service/s import {SearchOrcidServiceModule} from "./openaireLibrary/claims/claim-utils/service/searchOrcidService.module"; import {HelpPopUpModule} from './shared/help-pop-up/help-pop-up.module'; import {RouteReuseStrategy} from '@angular/router'; -import {CustomRouteReuseStrategy} from './shared/custom-route-reuse-strategy'; +import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-reuse-strategy'; @NgModule({ declarations: [ diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index b054a82..c4b57e9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b054a823daf43cfdbcbf2bdd727a3a7d3704b3ac +Subproject commit c4b57e91ab78bdbe16717c0060449ba83ea32968 diff --git a/src/app/shared/custom-route-reuse-strategy.ts b/src/app/shared/custom-route-reuse-strategy.ts deleted file mode 100644 index 05bc263..0000000 --- a/src/app/shared/custom-route-reuse-strategy.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {ActivatedRouteSnapshot, BaseRouteReuseStrategy} from "@angular/router"; - -export class CustomRouteReuseStrategy extends BaseRouteReuseStrategy { - shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean { - return future.routeConfig === curr.routeConfig || (!!future.routeConfig?.component && future.routeConfig?.component === curr.routeConfig?.component) - } -} \ No newline at end of file diff --git a/src/assets/common-assets b/src/assets/common-assets index 4d41ba3..e48bf94 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 4d41ba373dfb2dfd09ada4061bb1450dadb96993 +Subproject commit e48bf941bcdc567a3d09826b5686e70d43fafd46 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 860bd52..fe10d2e 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 860bd52a5f4becb94f5c3bf2bee9ae5944513b7a +Subproject commit fe10d2e9195fdebf3d906f28abbb072f3617c4ee