MaDgIK
/
aggregator
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

[Aggregator | Trunk]: Remove properties service and resolver 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@60778 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2021-04-01 14:59:03 +00:00
parent 0f1e65411d
commit d9b4e45c31
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/app-routing.module.ts
View File

@ -1,10 +1,5 @@
import {NgModule} from '@angular/core';
import {Routes, RouterModule} from '@angular/router';
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
import {OpenaireErrorPageComponent} from './error/errorPage.component';
const routes: Routes = [
@ -88,16 +83,13 @@ const routes: Routes = [
{ path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
{ path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
{ path: 'participate/deposit/learn-how', loadChildren: './deposit/deposit.module#LibDepositModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'participate/deposit/search', loadChildren: './deposit/searchDataprovidersToDeposit.module#LibSearchDataprovidersToDepositModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'participate/deposit/learn-how', loadChildren: './deposit/deposit.module#LibDepositModule'},
{ path: 'participate/deposit/search', loadChildren: './deposit/searchDataprovidersToDeposit.module#LibSearchDataprovidersToDepositModule'},
// Linking Pages
{ path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule'},
{ path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule'},
{ path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule'},
{path: 'develop', loadChildren: './develop/develop.module#DevelopModule'},
{path: 'user-info', loadChildren: './login/libUser.module#LibUserModule'},
{path: 'error', component: OpenaireErrorPageComponent},
{path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
@ -105,8 +97,7 @@ const routes: Routes = [
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
exports: [RouterModule]
})
export class AppRoutingModule {
}

6
src/app/app.component.ts
View File

@ -1,7 +1,6 @@
import {Component, Inject, RendererFactory2, ViewEncapsulation} from '@angular/core';
import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
import {AggregatorInfo, PortalAggregators} from "./utils/aggregators";
import {UserManagementService} from "./openaireLibrary/services/user-management.service";
import {User} from "./openaireLibrary/login/utils/helper.class";
@ -39,7 +38,6 @@ import {DOCUMENT} from "@angular/common";
<bottom *ngIf="isClient && properties" [properties]=properties></bottom>
</div>
`
})
export class AppComponent {
isClient: boolean = false;
@ -54,8 +52,8 @@ export class AppComponent {
header: Header;
agg: AggregatorInfo = null;
subscriptions = [];
constructor(private propertiesService: EnvironmentSpecificService,
private userManagementService: UserManagementService, private configurationService: ConfigurationService, @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2) {
constructor(private userManagementService: UserManagementService, private configurationService: ConfigurationService, @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2) {
this.id = ConnectHelper.getCommunityFromDomain(this.properties.domain);
this.agg = PortalAggregators.getFilterInfoByMenuId(this.id);
this.setStyles();

9
src/app/app.module.ts
View File

@ -5,16 +5,11 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {CommonModule} from '@angular/common';
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
import {AppComponent} from './app.component';
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
import {ErrorModule} from './openaireLibrary/error/error.module';
import {OpenaireErrorPageComponent} from './error/errorPage.component';
import {AppRoutingModule} from './app-routing.module';
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
@ -23,7 +18,6 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
@NgModule({
imports: [
SharedModule,
BrowserAnimationsModule,
@ -40,7 +34,7 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
declarations: [AppComponent, OpenaireErrorPageComponent],
exports: [AppComponent],
providers: [
EnvironmentSpecificResolver, ConfigurationService,
ConfigurationService,
{
provide: HTTP_INTERCEPTORS,
useClass: HttpInterceptorService,
@ -56,6 +50,5 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
],
bootstrap: [AppComponent]
})
export class AppModule {
}