diff --git a/portal-4cli-lib/package.json b/portal-4cli-lib/package.json
index 120fdafc..571b693a 100644
--- a/portal-4cli-lib/package.json
+++ b/portal-4cli-lib/package.json
@@ -8,8 +8,8 @@
],
"scripts": {
"ng": "ng",
- "start": "PORT=5000 ng serve --disable-host-check --host 0.0.0.0",
- "start:dynamic": "PORT=5000 npm run build:dynamic && npm run serve:dynamic",
+ "start": "ng serve --disable-host-check --host 0.0.0.0",
+ "start:dynamic": "npm run build:dynamic && npm run serve:dynamic",
"start:static": "npm run build:static && npm run serve:static",
"build": "ng build",
"build:client-and-server-bundles": "ng build --prod -sm --stats-json && ng build --prod --app 1 --output-hashing=false",
diff --git a/portal-4cli-lib/src/app/app-routing.module.ts b/portal-4cli-lib/src/app/app-routing.module.ts
index 5b67f3ee..a0146885 100644
--- a/portal-4cli-lib/src/app/app-routing.module.ts
+++ b/portal-4cli-lib/src/app/app-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
-import {EnvironmentSpecificResolver, EnvironmentSpecificService} from 'ng-openaire-library';
-import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule} from 'ng-openaire-library';
+import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
import { OpenaireErrorPageComponent } from './error/errorPage.component';
@@ -29,11 +29,11 @@ const routes: Routes = [
{ path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/content-providers', loadChildren: './searchPages/dataProviders/compatibleDataProviders.module#LibCompatibleDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
- { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#CompatibleDataProvidersTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#LibCompatibleDataProvidersTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/entity-registries', loadChildren: './searchPages/dataProviders/entityRegistries.module#LibEntityRegistriesModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
- { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#EntityRegistriesTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#LibEntityRegistriesTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/journals', loadChildren: './searchPages/dataProviders/journals.module#LibJournalsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
- { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#JournalsTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#LibJournalsTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
diff --git a/portal-4cli-lib/src/app/app.component.ts b/portal-4cli-lib/src/app/app.component.ts
index b53aa5c2..d8a42bc7 100644
--- a/portal-4cli-lib/src/app/app.component.ts
+++ b/portal-4cli-lib/src/app/app.component.ts
@@ -2,7 +2,9 @@ import { Component, Directive, ElementRef, Renderer, ChangeDetectionStrategy, Vi
import {Observable} from 'rxjs/Observable';
import {ActivatedRoute} from '@angular/router';
-import {MenuItem, RootMenuItem, EnvironmentSpecificService, EnvProperties} from 'ng-openaire-library';
+import { EnvProperties} from './openaireLibrary/utils/properties/env-properties';
+import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
@Component({
diff --git a/portal-4cli-lib/src/app/app.module.ts b/portal-4cli-lib/src/app/app.module.ts
index 4f8471ed..88095938 100755
--- a/portal-4cli-lib/src/app/app.module.ts
+++ b/portal-4cli-lib/src/app/app.module.ts
@@ -8,7 +8,15 @@ import { HttpModule } from '@angular/http';
import { RouterModule } from '@angular/router';
import { AppComponent } from './app.component';
-import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule, EnvironmentSpecificResolver} from 'ng-openaire-library';
+
+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';
diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
index ed85a202..2f23dd9b 100644
--- a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
+++ b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
@@ -1,7 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
-import{ PreviousRouteRecorder, IsRouteEnabled ,AdminLoginGuard} from 'ng-openaire-library';
+import{ AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts
index 44aafc97..d4a4380b 100644
--- a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts
+++ b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts
@@ -3,7 +3,11 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
-import{ClaimsAdminModule, PreviousRouteRecorder, IsRouteEnabled ,AdminLoginGuard} from 'ng-openaire-library';
+import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
+import {AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
index 0f8d6ff3..eef611eb 100644
--- a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
+++ b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
@@ -1,7 +1,10 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireClaimsByTokenComponent } from './claimsByToken.component';
-import{ PreviousRouteRecorder, IsRouteEnabled ,LoginGuard} from 'ng-openaire-library';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts
index f2260f71..77faa3b7 100644
--- a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts
+++ b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts
@@ -3,7 +3,9 @@ import { RouterModule } from '@angular/router';
import { SharedModule } from '../../shared/shared.module';
import { OpenaireClaimsByTokenComponent } from './claimsByToken.component';
//ClaimsByTokenModule,
-import{ PreviousRouteRecorder, IsRouteEnabled ,LoginGuard} from 'ng-openaire-library';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts b/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts
index cb21ccc6..69467758 100644
--- a/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts
+++ b/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDirectLinkingComponent } from './directLinking.component';
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts b/portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts
index d5178a47..34e279dc 100644
--- a/portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts
+++ b/portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts
@@ -2,8 +2,11 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { OpenaireDirectLinkingComponent } from './directLinking.component';
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, DirectLinkingModule} from 'ng-openaire-library';
+import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module';
import {DirectLinkingRoutingModule} from './directLinking-routing.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts b/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts
index 3a1dcd65..091218ae 100644
--- a/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts
+++ b/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts
@@ -1,8 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireLinkingComponent } from './linkingGeneric.component';
-
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts b/portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts
index a25deb37..95ae3edb 100644
--- a/portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts
+++ b/portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts
@@ -3,7 +3,10 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import {OpenaireLinkingComponent} from './linkingGeneric.component';
import {LinkingRoutingModule} from './linking-routing.module';
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, LinkingGenericModule} from 'ng-openaire-library';
+import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts b/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts
index 94fcc002..c75a9949 100644
--- a/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts
+++ b/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireMyClaimsComponent } from './myClaims.component';
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts b/portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts
index b3e793fb..8402be16 100644
--- a/portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts
+++ b/portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts
@@ -3,7 +3,10 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { OpenaireMyClaimsComponent } from './myClaims.component';
import { MyClaimsRoutingModule } from './myClaims-routing.module';
-import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard, MyClaimsModule} from 'ng-openaire-library';
+import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
index 965f11d3..cc4ce15a 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component';
-import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts
index d4aa85f1..63815f7f 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts
@@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms';
import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component';
import {DepositBySubjectResultsRoutingModule} from './depositBySubjectResult-routing.module';
-import {DepositBySubjectResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled } from 'ng-openaire-library';
-
+import {DepositBySubjectResultsModule } from '../../openaireLibrary/deposit/datasets/depositBySubjectResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts
index 5d5f9b72..dfd4af8b 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts
@@ -2,7 +2,10 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositDatasetsComponent } from './depositDatasets.component';
-import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts
index 98f05046..257a1e3c 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts
@@ -4,8 +4,10 @@ import { FormsModule } from '@angular/forms';
import { OpenaireDepositDatasetsComponent } from './depositDatasets.component';
import {DepositDatasetsRoutingModule} from './depositDatasets-routing.module';
-import {DepositDatasetsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {DepositDatasetsModule} from '../../openaireLibrary/deposit/datasets/depositDatasets.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
CommonModule, FormsModule,
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
index 5f520fa6..6867cc02 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
@@ -1,8 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
-import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-import {OpenaireProperties} from '../../utils/openaireProperties';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts
index 35ba3ce0..1843d32a 100644
--- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts
+++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts
@@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms';
import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
import {DepositDatasetsResultsRoutingModule} from './depositDatasetsResults-routing.module';
-import {DepositDatasetsResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {DepositDatasetsResultsModule} from '../../openaireLibrary/deposit/datasets/depositDatasetsResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts
index 3cdbe1fa..729a8521 100644
--- a/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts
+++ b/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts
@@ -1,7 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositPublicationsComponent } from './depositPublications.component';
-import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts
index 9e0868d3..b0196072 100644
--- a/portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts
+++ b/portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts
@@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms';
import { OpenaireDepositPublicationsComponent } from './depositPublications.component';
import {DepositPublicationsRoutingModule} from './depositPublications-routing.module';
-import {DepositPublicationsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {DepositPublicationsModule} from '../../openaireLibrary/deposit/publications/depositPublications.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
CommonModule, FormsModule,
diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
index cf4031d1..b9ab7ee2 100644
--- a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
+++ b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
@@ -1,7 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component';
-import { FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts
index 3433697d..b8411c88 100644
--- a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts
+++ b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts
@@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms';
import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component';
import {DepositPublicationsResultRoutingModule} from './depositPublicationsResult-routing.module';
-import {DepositPublicationsResultsModule, FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {DepositPublicationsResultsModule} from '../../openaireLibrary/deposit/publications/depositPublicationsResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
CommonModule, FormsModule,
diff --git a/portal-4cli-lib/src/app/home/home-routing.module.ts b/portal-4cli-lib/src/app/home/home-routing.module.ts
index 8ee1c6a1..e372e73f 100644
--- a/portal-4cli-lib/src/app/home/home-routing.module.ts
+++ b/portal-4cli-lib/src/app/home/home-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{HomeComponent} from './home.component';
-import {FreeGuard,PreviousRouteRecorder} from 'ng-openaire-library';
-
+import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
diff --git a/portal-4cli-lib/src/app/home/home.component.ts b/portal-4cli-lib/src/app/home/home.component.ts
index f4a5b8d6..e78399ba 100644
--- a/portal-4cli-lib/src/app/home/home.component.ts
+++ b/portal-4cli-lib/src/app/home/home.component.ts
@@ -3,12 +3,21 @@ import {Observable} from 'rxjs/Observable';
import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common';
import "rxjs/add/observable/zip";
-import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library';
-
-import {SearchPublicationsService, SearchDataprovidersService, SearchProjectsService, SearchDatasetsService, SearchOrganizationsService, SearchFields} from 'ng-openaire-library';
-import { ErrorCodes, RouterHelper, NumberUtils, RefineFieldResultsService, PiwikService} from 'ng-openaire-library';
-import{EnvProperties} from 'ng-openaire-library';
+import {Meta} from '../openaireLibrary/sharedComponents/metaService';
+import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
+import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
+import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
+import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
+import { SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
+import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+import { RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+import { SearchFields} from '../openaireLibrary/utils/properties/searchFields';
+import { NumberUtils} from '../openaireLibrary/utils/number-utils.class';
+import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
+import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
+import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
@Component({
selector: 'home',
@@ -71,7 +80,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
var url = this.properties.baseLink+this._router.url;
this._meta.updateProperty("og:url", url);
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
- this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
+ this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
}
this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity ).subscribe(data => {
diff --git a/portal-4cli-lib/src/app/home/home.module.ts b/portal-4cli-lib/src/app/home/home.module.ts
index 5e2e2d93..c6590ddf 100644
--- a/portal-4cli-lib/src/app/home/home.module.ts
+++ b/portal-4cli-lib/src/app/home/home.module.ts
@@ -6,11 +6,22 @@ import { RouterModule } from '@angular/router';
import{HomeRoutingModule} from './home-routing.module';
import{HomeComponent} from './home.component';
+import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
+import { DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module';
+import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
+import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
+import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
+import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
+import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
-import {DataProvidersServiceModule, DatasetsServiceModule,ProjectsServiceModule,PublicationsServiceModule,
- OrganizationsServiceModule,SearchFormModule,PiwikServiceModule,RefineFieldResultsServiceModule,HelperModule} from 'ng-openaire-library';
-import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library';
-@NgModule({
+import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
+
+import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
+import {Meta} from '../openaireLibrary/sharedComponents/metaService';
+import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
+import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ @NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
RefineFieldResultsServiceModule,
diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
index def1dc2b..ace5723c 100644
--- a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDataProviderComponent } from './dataProvider.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts b/portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts
index 1a8b3fb8..e1b38198 100644
--- a/portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts
@@ -2,11 +2,12 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
-import { DataProviderModule } from 'ng-openaire-library';
+import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
import { OpenaireDataProviderComponent } from './dataProvider.component';
import {DataProviderRoutingModule} from './dataProvider-routing.module';
-import { FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [DataProviderModule, DataProviderRoutingModule],
diff --git a/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts b/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts
index 035589de..45e3eba1 100644
--- a/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDatasetComponent } from './dataset.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts b/portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts
index 5806e24b..f167d67b 100644
--- a/portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts
@@ -4,9 +4,11 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
-import { DatasetModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library';
+import { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module';
import { OpenaireDatasetComponent } from './dataset.component';
-
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {DatasetRoutingModule} from './dataset-routing.module';
@NgModule({
imports: [DatasetModule, DatasetRoutingModule],
diff --git a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
index fab0839b..7d3895a8 100644
--- a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
RouterModule.forChild([
diff --git a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
index 88686700..769370d8 100644
--- a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
@@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
-import { HtmlProjectReportModule , FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
diff --git a/portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts b/portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts
index f1d70320..4fc9dfb2 100644
--- a/portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts
@@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
-import { OrganizationModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireOrganizationComponent } from './organization.component';
import {OrganizationRoutingModule} from './organization-routing.module';
diff --git a/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts b/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts
index 6bab0603..ab650020 100644
--- a/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireOrganizationComponent } from './organization.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
diff --git a/portal-4cli-lib/src/app/landingPages/project/libProject.module.ts b/portal-4cli-lib/src/app/landingPages/project/libProject.module.ts
index 7951c8de..8e2dbd96 100644
--- a/portal-4cli-lib/src/app/landingPages/project/libProject.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/project/libProject.module.ts
@@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
-import { ProjectModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library';
-
+import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireProjectComponent } from './project.component';
import {ProjectRoutingModule} from './project-routing.module';
diff --git a/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts b/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts
index 7b838068..ff1c8c3f 100644
--- a/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireProjectComponent } from './project.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts b/portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts
index 0cbfcbbd..8a8eae27 100644
--- a/portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts
@@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { RouterModule } from '@angular/router';
-import { PublicationModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library';
-
+import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenairePublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module';
diff --git a/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts b/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts
index da19a833..78b0202e 100644
--- a/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenairePublicationComponent } from './publication.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts b/portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts
index 70039419..2d11fad7 100644
--- a/portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts
@@ -4,8 +4,10 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
-import { SoftwareModule, FreeGuard, PreviousRouteRecorder, IsRouteEnabled } from 'ng-openaire-library';
-
+import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module';
@NgModule({
diff --git a/portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts b/portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts
index bf1956dc..845f9fd3 100644
--- a/portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts
+++ b/portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireSoftwareComponent } from './software.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/login/libUser.module.ts b/portal-4cli-lib/src/app/login/libUser.module.ts
index 8e543b52..b1040ceb 100644
--- a/portal-4cli-lib/src/app/login/libUser.module.ts
+++ b/portal-4cli-lib/src/app/login/libUser.module.ts
@@ -4,7 +4,9 @@ import { FormsModule } from '@angular/forms';
import {OpenaireUserComponent } from './user.component';
import { UserRoutingModule } from './user-routing.module';
-import {PreviousRouteRecorder, UserModule} from 'ng-openaire-library';
+import { UserModule} from '../openaireLibrary/login/user.module';
+
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/login/user-routing.module.ts b/portal-4cli-lib/src/app/login/user-routing.module.ts
index 3d58ea36..1a8ad90c 100644
--- a/portal-4cli-lib/src/app/login/user-routing.module.ts
+++ b/portal-4cli-lib/src/app/login/user-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireUserComponent } from './user.component';
-import {PreviousRouteRecorder} from 'ng-openaire-library';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/reload/libReload.module.ts b/portal-4cli-lib/src/app/reload/libReload.module.ts
index 9586b0e8..d982aaa9 100644
--- a/portal-4cli-lib/src/app/reload/libReload.module.ts
+++ b/portal-4cli-lib/src/app/reload/libReload.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
- import{ReloadModule} from 'ng-openaire-library';
+ import{ReloadModule} from '../openaireLibrary/reload/reload.module';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
index 3c9b7ecc..6102cd11 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
@@ -1,7 +1,9 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
index 3f7613e3..03ab04be 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
@@ -4,7 +4,11 @@ import { FormsModule } from '@angular/forms';
import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {AdvancedSearchDataProvidersModule,FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
index 2b9626b0..02434539 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
index f91d6b4b..3df2c856 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
@@ -6,7 +6,10 @@ import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-rout
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
- import {AdvancedSearchDatasetsModule,FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+ import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
index 0307f56c..c2ed9f0b 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
index c4cdd3d8..6bccbcce 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
@@ -5,9 +5,11 @@ import { FormsModule } from '@angular/forms';
import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
- import {AdvancedSearchOrganizationsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+ import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
index 3dcbfd0e..df772948 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts
index 41830dcd..4949aa83 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts
@@ -6,7 +6,10 @@ import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-rout
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
- import {AdvancedSearchProjectsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+ import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
index a3e1fc25..936ae995 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts
index 166d8d26..3b92f3dc 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts
@@ -6,7 +6,10 @@ import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublicati
import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
- import {AdvancedSearchPublicationsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+ import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
index 529a16da..e352163d 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
index 649b1b1d..f379f3da 100644
--- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
@@ -6,7 +6,10 @@ import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-rout
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
- import {AdvancedSearchSoftwareModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+ import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
index 502d4d9b..d9bcecc1 100644
--- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
@@ -2,7 +2,9 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
index 4196f9a9..8ce1cb9d 100644
--- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
@@ -5,8 +5,11 @@ import { FormsModule } from '@angular/forms';
import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, CompatibleDataProvidersModule} from 'ng-openaire-library';
+import { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
@NgModule({
imports: [
diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
index 21b3bb5b..2e230003 100644
--- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
+++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
@@ -1,14 +1,16 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
-import{SearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: SearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+ { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
}, canDeactivate: [PreviousRouteRecorder] }
diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
index c125f254..eb8908f5 100644
--- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
+++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
@@ -1,198 +1,14 @@
import {Component, Input, ViewChild} from '@angular/core';
-import {Location} from '@angular/common';
-import { ActivatedRoute} from '@angular/router';
-import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component';
-import {ErrorCodes, SearchFields,SearchDataprovidersService, SearchUtilsClass,
-Filter, Value, EnvProperties } from 'ng-openaire-library';
+
@Component({
- selector: 'search-content-providers-table',
+ selector: 'openaire-search-content-providers-table',
template: `
-