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: ` - - + + ` }) -export class SearchCompatibleDataprovidersTableComponent { - private errorCodes: ErrorCodes; - - public results =[]; - public filters =[]; - public baseUrl:string; - public searchUtils:SearchUtilsClass = new SearchUtilsClass(); - public sub: any; public subResults: any; - public _location:Location; - public searchFields:SearchFields = new SearchFields(); - public refineFields: string[] = this.searchFields.COMPATIBLE_DATAPROVIDER_FIELDS; - - /*public CSV: any = { "columnNames": [ "Title", "Type", "Coutries", "Compatibility" ], - "export":[] - }; - public CSVDownloaded = false; - public csvParams: string; - public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";*/ - - public disableForms: boolean = false; -properties:EnvProperties; - @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ; - - constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) { - this.errorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - } - - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.baseUrl = data.envSpecific.searchLinkToEntityRegistriesDataProvidersTable; - - }); - this.searchPage.refineFields = this.refineFields; - this.sub = this.route.queryParams.subscribe(params => { - this.searchUtils.keyword = (params['keyword']?params['keyword']:''); - //this.searchUtils.page = (params['page']=== undefined)?1:+params['page']; - this.filters = this.createFilters(); - this.searchPage.getParametersFromUrl(params); - this._getResults(); - }); - } - - public ngOnDestroy() { - if(this.sub){ - this.sub.unsubscribe(); - } - if(this.subResults){ - this.subResults.unsubscribe(); - } } - private _getResults(){ - //this.csvParams = this.resourcesQuery+"&type=datasources"; - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - this.disableForms = true; - this.results = []; - this.searchUtils.totalResults = 0; - - let size: number = 0; - this.subResults = this._searchDataprovidersService.searchCompatibleDataprovidersTable(this.properties).subscribe( - data => { - size = data; - if(size > 0) { - this.subResults = this._searchDataprovidersService.searchCompatibleDataproviders("", null, 1, size, [],this.properties).subscribe( - data => { - this.searchUtils.totalResults = data[0]; - console.info("search Content Providers [total results:"+this.searchUtils.totalResults+"]"); - this.results = data[1]; - - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = this.errorCodes.NONE; - } - this.disableForms = false; - this.searchPage.triggerInitialLoad(); - this.searchPage.transform(this.results); - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - - this.disableForms = false; - - } - ); - } else { - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.NONE; - this.disableForms = false; - } - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - } - ); - - } - private setFilters(){ - //TODO set filters from - } - - private createFilters():Filter[] { - var filter_names=["Type","Compatibility Level"]; - var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"]; - var searchFields = new SearchFields(); - var filter_original_ids = searchFields.COMPATIBLE_DATAPROVIDER_FIELDS; - var value_names=[ - /*[ - "Institutional Publication Repository","Thematic Publication Repository", "Other Publication Repository", - "Institutional Repositories Aggregators", - "Thematic Repositories Aggregators", "Other Repositories Aggregators", - "Data Repositories", "Data Repositories Aggregators", "Journals", "Journals Aggregators", "CRIS Systems", "Publication Catalogues"], - */ - [ - "Institutional Repository", "Thematic Repository", "Publication Repository", - "Institutional Repository Aggregator", - "Thematic Repositories Aggregators", "Publication Repository Aggregator", - "Data Repository", "Data Repository Aggregator", "CRIS Systems", "Publication Catalogue"], - - - - - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - - var value_original_ids=[ - ["pubsrepository::institutional","pubsrepository::thematic", "pubsrepository::unknown", "aggregator::pubsrepository::institutional","aggregator::pubsrepository::thematic","aggregator::pubsrepository::unknown", - "datarepository::unknown", "aggregator::datarepository", "cris", "pubscatalogue::unknown"], - //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"] - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - var filters: Filter[] =[]; - for(var i =0 ; i < filter_names.length;i++){ - var values:Value[] = []; - for(var j =0 ; j < value_names[i].length;j++){ - var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false} - values.push(value); - } - var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' }; - filters.push(filter); - } - return filters; - } +export class OpenaireSearchCompatibleDataprovidersTableComponent { } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts index ef3d75dd..495ccacf 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts @@ -2,26 +2,25 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import{SearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; - - -import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module'; +import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module'; -import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} 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 { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module'; @NgModule({ imports: [ CommonModule, FormsModule, - DataProvidersServiceModule, - SearchFormModule, SearchPageTableViewModule, CompatibleDataProvidersTableRoutingModule + CompatibleDataProvidersTableModule, + CompatibleDataProvidersTableRoutingModule ], providers:[FreeGuard, IsRouteEnabled], declarations: [ - SearchCompatibleDataprovidersTableComponent + OpenaireSearchCompatibleDataprovidersTableComponent ], exports: [ - SearchCompatibleDataprovidersTableComponent + OpenaireSearchCompatibleDataprovidersTableComponent ] }) -export class CompatibleDataProvidersTableModule { } +export class LibCompatibleDataProvidersTableModule { } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts index 797a4c63..dccd161b 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts @@ -2,8 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.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/searchPages/dataProviders/entityRegistries.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.module.ts index 492125a8..8d81f190 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.module.ts @@ -4,8 +4,11 @@ import { FormsModule } from '@angular/forms'; import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import {EntityRegistriesModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module'; @NgModule({ imports: [ diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts index a5529f63..8f4d411b 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts @@ -1,14 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import{SearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.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: SearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity }, canDeactivate: [PreviousRouteRecorder] } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts index 763f6d85..108c28d0 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts @@ -1,208 +1,16 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; -import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component'; -import {ErrorCodes, SearchFields,SearchDataprovidersService, -SearchUtilsClass, Filter, Value,EnvProperties } from 'ng-openaire-library'; +import {Component} from '@angular/core'; @Component({ - selector: 'search-entity-registries-table', + selector: 'openaire-search-entity-registries-table', template: ` - - + + ` }) -export class SearchEntityRegistriesTableComponent { - private errorCodes: ErrorCodes; +export class OpenaireSearchEntityRegistriesTableComponent { - public results =[]; - public filters =[]; - public baseUrl:string; - public searchUtils:SearchUtilsClass = new SearchUtilsClass(); - public sub: any; public subResults: any; - public _location:Location; - public searchFields:SearchFields = new SearchFields(); - public refineFields: string[] = this.searchFields.ENTITY_REGISTRIES_FIELDS; - public disableForms: boolean = false; -properties:EnvProperties; - @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ; - - constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) { - this.errorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - } - - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.baseUrl = data.envSpecific.searchLinkToEntityRegistriesDataProviders; - - }); - this.searchPage.refineFields = this.refineFields; - this.sub = this.route.queryParams.subscribe(params => { - this.searchUtils.keyword = (params['keyword']?params['keyword']:''); - //this.searchUtils.page = (params['page']=== undefined)?1:+params['page']; - this.filters = this.createFilters(); - - this.searchPage.getParametersFromUrl(params); - this._getResults("", false, this.searchUtils.page); - }); - } - - public ngOnDestroy() { - if(this.sub){ - this.sub.unsubscribe(); - } - if(this.subResults){ - this.subResults.unsubscribe(); - } } - private _getResults(parameters:string,refine:boolean, page: number){ - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - this.disableForms = true; - this.results = []; - this.searchUtils.totalResults = 0; - - let size: number = 0; - this.subResults = this._searchDataprovidersService.searchEntityRegistriesTable(this.properties).subscribe( - data => { - size = data; - if(size > 0) { - this.subResults = this._searchDataprovidersService.searchEntityRegistries("",null, page, size, [],this.properties).subscribe( - data => { - this.searchUtils.totalResults = data[0]; - console.info("search Entity Registries [total results:"+this.searchUtils.totalResults+"]"); - this.results = data[1]; - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = this.errorCodes.NONE; - } - this.disableForms = false; - this.searchPage.triggerInitialLoad(); - this.searchPage.transform(this.results); - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - - this.disableForms = false; - - } - ); - } else { - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.NONE; - this.disableForms = false; - } - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - } - ); -/* - this.subResults = this._searchDataprovidersService.searchEntityRegistries(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, []).subscribe( - data => { - this.searchUtils.totalResults = data[0]; - console.info("search Entity Registries: [Parameters:"+parameters+" ] [total results:"+this.searchUtils.totalResults+"]"); - this.results = data[1]; - this.searchPage.checkSelectedFilters(this.filters); - this.searchPage.updateBaseUrlWithParameters(this.filters); - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = errorCodes.NONE; - } - //this.searchPage.closeLoading(); - this.disableForms = false; - - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.ERROR; - //this.searchPage.closeLoading(); - this.disableForms = false; - - } - ); -*/ - } - private setFilters(){ - //TODO set filters from - } - - - private createFilters():Filter[] { - var filter_names=["Type","Compatibility Level"]; - var filter_ids=["datasourcetypename","datasourcecompatibilityname"]; - var searchFields = new SearchFields(); - var filter_original_ids = searchFields.ENTITY_REGISTRIES_FIELDS; - var value_names=[ - ["Funder database","Registry of repositories","Scholarly Comm. Infrastructure","Registry","Information Space","Web Source"], - - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - - var value_original_ids=[ - ["Funder database","Registry of repositories","Scholarly Comm. Infrastructure","Registry","Information Space","Web Source"], - //["entityregistry::projects","entityregistry::repositories","scholarcomminfra","entityregistry","infospace","websource"], - //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"] - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - - var filters: Filter[] =[]; - for(var i =0 ; i < filter_names.length;i++){ - var values:Value[] = []; - for(var j =0 ; j < value_names[i].length;j++){ - var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false} - values.push(value); - } - var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' }; - filters.push(filter); - } - return filters; - } } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts index 8ac5d509..6cb59045 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts @@ -2,23 +2,26 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import{SearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; -import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module'; -import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module'; -import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} from 'ng-openaire-library'; +import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; + import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module'; +import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/dataProviders/entityRegistriesTable.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, - DataProvidersServiceModule, - SearchFormModule, SearchPageTableViewModule, EntityRegistriesTableRoutingModule + EntityRegistriesTableRoutingModule, + EntityRegistriesTableModule ], providers:[FreeGuard, IsRouteEnabled], declarations: [ - SearchEntityRegistriesTableComponent + OpenaireSearchEntityRegistriesTableComponent ], exports: [ - SearchEntityRegistriesTableComponent + OpenaireSearchEntityRegistriesTableComponent ] }) -export class EntityRegistriesTableModule { } +export class LibEntityRegistriesTableModule { } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts index b78a72a7..a2ed125f 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchJournalsComponent} from './journals.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/journals.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journals.module.ts index cafa2b0c..db4d5953 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journals.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journals.module.ts @@ -4,8 +4,10 @@ import { FormsModule } from '@angular/forms'; import{ JournalsRoutingModule} from './journals-routing.module'; import{OpenaireSearchJournalsComponent} from './journals.component'; -import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, JournalsModule} from 'ng-openaire-library'; - +import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.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, JournalsRoutingModule, JournalsModule diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts index 1bc1053b..0222983e 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts @@ -1,14 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import{SearchJournalsTableComponent} from './journalsTable.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; +import{OpenaireSearchJournalsTableComponent} from './journalsTable.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: SearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity } , canDeactivate: [PreviousRouteRecorder] } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts index f8c3b9ea..7d4f066f 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts @@ -1,193 +1,15 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; -import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component'; -import {ErrorCodes, SearchFields,SearchDataprovidersService,EnvProperties, SearchUtilsClass, Filter, Value } from 'ng-openaire-library'; +import {Component } from '@angular/core'; @Component({ - selector: 'search-journals-table', + selector: 'openaire-search-journals-table', template: ` - - + + ` }) -export class SearchJournalsTableComponent { - private errorCodes: ErrorCodes; +export class OpenaireSearchJournalsTableComponent { - public results =[]; - public filters =[]; - public baseUrl:string; - public searchUtils:SearchUtilsClass = new SearchUtilsClass(); - public sub: any; public subResults: any; - public _location:Location; - public searchFields:SearchFields = new SearchFields(); - public refineFields: string[] = this.searchFields.JOURNAL_FIELDS; -properties:EnvProperties; - /*public CSV: any = { "columnNames": [ "Title", "Type", "Coutries", "Compatibility" ], - "export":[] - }; - public CSVDownloaded = false; - public csvParams: string; - public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";*/ - - public disableForms: boolean = false; - - @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ; - - constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) { - this.errorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - } - - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.baseUrl = data.envSpecific.searchLinkToJournalsTable; - - }); - this.searchPage.refineFields = this.refineFields; - this.sub = this.route.queryParams.subscribe(params => { - this.searchUtils.keyword = (params['keyword']?params['keyword']:''); - //this.searchUtils.page = (params['page']=== undefined)?1:+params['page']; - this.filters = this.createFilters(); - this.searchPage.getParametersFromUrl(params); - this._getResults(); - }); - } - - public ngOnDestroy() { - if(this.sub){ - this.sub.unsubscribe(); - } - if(this.subResults){ - this.subResults.unsubscribe(); - } - } - private _getResults(){ - //this.csvParams = this.resourcesQuery+"&type=datasources"; - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.LOADING; - this.disableForms = true; - this.results = []; - this.searchUtils.totalResults = 0; - - let size: number = 0; - this.subResults = this._searchDataprovidersService.searchJournalsTable(this.properties).subscribe( - data => { - size = data; - if(size > 0) { - this.subResults = this._searchDataprovidersService.searchJournals("", null, 1, size, [],this.properties).subscribe( - data => { - this.searchUtils.totalResults = data[0]; - console.info("search Journals [total results:"+this.searchUtils.totalResults+"]"); - this.results = data[1]; - - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = this.errorCodes.NONE; - } - this.disableForms = false; - this.searchPage.triggerInitialLoad(); - this.searchPage.transform(this.results); - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - - this.disableForms = false; - - } - ); - } else { - this.searchPage.checkSelectedFilters(this.filters); - - //var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = this.errorCodes.NONE; - this.disableForms = false; - } - }, - err => { - console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - } - } - ); - - } - private setFilters(){ - //TODO set filters from - } - - private createFilters():Filter[] { - var filter_names=["Type","Compatibility Level"]; - var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"]; - var searchFields = new SearchFields(); - var filter_original_ids = searchFields.JOURNAL_FIELDS; - var value_names=[ - /*[ - "Institutional Publication Repository","Thematic Publication Repository", "Other Publication Repository", - "Institutional Repositories Aggregators", - "Thematic Repositories Aggregators", "Other Repositories Aggregators", - "Data Repositories", "Data Repositories Aggregators", "Journals", "Journals Aggregators", "CRIS Systems", "Publication Catalogues"], - */ - ["Journal", "Journal Aggregator\/Publisher"], - - - - - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - - var value_original_ids=[ - ["pubsrepository::journal", "aggregator::pubsrepository::journals"], - //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"] - ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]]; - var filters: Filter[] =[]; - for(var i =0 ; i < filter_names.length;i++){ - var values:Value[] = []; - for(var j =0 ; j < value_names[i].length;j++){ - var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false} - values.push(value); - } - var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' }; - filters.push(filter); - } - return filters; - } } diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts index 3e46d8b7..c821bd2b 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts @@ -2,26 +2,26 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import{SearchJournalsTableComponent} from './journalsTable.component'; +import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; - -import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module'; import {JournalsTableRoutingModule} from './journalsTable-routing.module'; -import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} 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 { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module'; @NgModule({ imports: [ CommonModule, FormsModule, - DataProvidersServiceModule, - SearchFormModule, SearchPageTableViewModule, JournalsTableRoutingModule + JournalsTableModule, JournalsTableRoutingModule ], providers:[FreeGuard, IsRouteEnabled], declarations: [ - SearchJournalsTableComponent + OpenaireSearchJournalsTableComponent ], exports: [ - SearchJournalsTableComponent + OpenaireSearchJournalsTableComponent ] }) -export class JournalsTableModule { } +export class LibJournalsTableModule { } diff --git a/portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts b/portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts index efbe7772..84fef82a 100644 --- a/portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts +++ b/portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import {MainSearchModule} from 'ng-openaire-library'; +import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module'; import { OpenaireSearchComponent } from './search.component'; import { MainSearchRoutingModule } from './mainSearch-routing.module'; diff --git a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.html b/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.html deleted file mode 100644 index 9acf3b1c..00000000 --- a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.html +++ /dev/null @@ -1,186 +0,0 @@ -
-
-
-
-
-
- -
-
-
- Keywords: {{searchUtils.keyword}} - - - {{filter.title}}: - {{value.name}} - , - - - - - - Clear All - -
-
-
-
-
- -
- -
- - -
-
- -
Filter By:
- -
-
- -
-
- -
-
- - -
- -
-
-
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - - - -
-
- -
-

- - - - - -

-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
Name - - Type - - Country - - Institution - Compatibility -
- - - - - [no title available] - - - - {{dataprovider.type}} - - - - {{country}}{{(i < ( dataprovider['countries'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['countries'].slice(0,5).length-1 && dataprovider['countries'].length > 5)?"...":""}} - - - - - {{org.name}}{{org.name}}{{(i < ( dataprovider['organizations'].slice(0,5).length-1))?", ":""}}{{(i == dataprovider['organizations'].slice(0,5).length-1 && dataprovider['organizations'].length > 5)?"...":""}} - - - - - {{dataprovider.compatibility}} - - -
-
- -
-
- - {{searchUtils.totalResults}} content providers, page {{searchUtils.page}} of {{(totalPages())}} - - - - -
-
- - - -
- -
-

- - - - - -

- - -
-
- - -
- -
-
-
diff --git a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.ts b/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.ts deleted file mode 100644 index f02058df..00000000 --- a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.component.ts +++ /dev/null @@ -1,461 +0,0 @@ -import {Component, Input, ViewChild, Output, EventEmitter, ViewEncapsulation, OnInit, AfterViewInit} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import {Location} from '@angular/common'; -import { DataTableDirective } from 'angular-datatables'; -import { ActivatedRoute} from '@angular/router'; - -import {SearchFields, DOI, StringUtils,ModalLoading,ErrorCodes, PiwikService, SearchDataprovidersService} from 'ng-openaire-library'; -import {Meta, SearchUtilsClass, Filter, Value, SearchFilterComponent, SearchFilterModalComponent, EnvProperties} from 'ng-openaire-library'; - -@Component({ - selector: 'search-page-table', - templateUrl:'searchPageTableView.component.html', - styles: [` - #dpTable_info, #dpTable_paginate, #dpTable_length, #dpTable_filter{ - display: none; - } - - `], - encapsulation: ViewEncapsulation.None // this used in order styles to work - - }) -export class SearchPageTableViewComponent implements OnInit, AfterViewInit { - @Input() pageTitle = ""; - @Input() results; - @Input() filters = []; - @Input() type:string = ""; - @Input() entityType: string = ""; - @Input() searchUtils:SearchUtilsClass;// = new SearchUtilsClass(); - //@Output() downloadClick = new EventEmitter(); - @Input() showResultCount:boolean = true; - @Input() showRefine:boolean = true; - @Input() refineFields = []; - //@Input() csvParams: string; - //@Input() csvPath: string; - @Input() searchViewLink: string; - @Input() disableForms: boolean = false; - @Input() searchFormClass: string = "searchForm"; -@Input() formPlaceholderText = "Type Keywords..."; - @ViewChild (ModalLoading) loading : ModalLoading ; - private searchFieldsHelper:SearchFields = new SearchFields(); - private queryParameters: Map = new Map(); - public countFilters= 0; - public parameterNames:string[] =[]; - public parameterValues:string[] =[]; - - public rowsOnPage:number = 10; - - @ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ; - public currentFilter: Filter; - public errorCodes:ErrorCodes = new ErrorCodes(); - piwiksub: any; - dtOptions: DataTables.Settings = {}; - showTable = false; filteringAdded = false; - @ViewChild(DataTableDirective) datatableElement: DataTableDirective; - dtTrigger: Subject = new Subject(); //necessary - properties:EnvProperties; - constructor (private route: ActivatedRoute, private location: Location , private _meta: Meta, private _piwikService:PiwikService, private _searchDataprovidersService: SearchDataprovidersService ) { } - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - if(typeof window !== 'undefined') { - this.updateUrl(data.envSpecific.baseLink+location.pathname); - } - if(typeof document !== 'undefined' && data.envSpecific.enablePiwikTrack){ - this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe(); - } - }); - this.dtOptions = { - "paging": true, - "searching": false, - "lengthChange": false, - "pageLength": this.rowsOnPage - }; - this.updateTitle(this.pageTitle); - this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle); - - - } - ngOnDestroy() { - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } - - } - ngAfterViewInit(): void { - $.fn['dataTable'].ext.search.push((settings, data, dataIndex) => { - - if (this.filterData(data, this.searchUtils.keyword, this.filters)) { - return true; - } - return false; - }); - - - } - - - totalPages(): number { - let totalPages:any = this.searchUtils.totalResults/(this.rowsOnPage); - if(!(Number.isInteger(totalPages))) { - totalPages = (parseInt(totalPages, 10) + 1); - } - return totalPages; - } - - toggleModal($event) { - this.currentFilter = $event.value; - this.searchFilterModal.open(); - - } - - updateDescription(description:string){ - this._meta.updateMeta("description", description); - this._meta.updateProperty("og:description", description); - } - updateTitle(title:string){ - var _prefix ="OpenAIRE | "; - var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title); - this._meta.setTitle(_title ); - this._meta.updateProperty("og:title",_title); - } - updateUrl(url:string){ - this._meta.updateProperty("og:url", url); - } - -public getParametersFromUrl(params) { - for(var i=0; i< this.refineFields.length ; i++) { - var filterId = this.refineFields[i]; - if(params[filterId] != undefined) { - if(this.queryParameters == undefined){ - this.queryParameters = new Map(); - } - this.queryParameters[filterId]=decodeURIComponent(params[filterId]); - } - } -} - /* - * Mark as check the new filters that are selected, when you get them from search - */ - public checkSelectedFilters(filters:Filter[]){ - - this.filters = filters; - for(var i=0; i< filters.length ; i++){ - var filter:Filter = filters[i]; - filter.countSelectedValues = 0; - - if(this.queryParameters[filter.filterId] != undefined) { - let values = (decodeURIComponent(this.queryParameters[filter.filterId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/,-1); - for(let filterValue of filter.values) { - if(values.indexOf(StringUtils.quote(filterValue.id)) > -1) { - filterValue.selected = true; - filter.countSelectedValues++; - }else{ - filterValue.selected = false; - } - } - }else{ - for(let filterValue of filter.values) { - filterValue.selected = false; - } - } - } - - return filters; - } - - /* - * - */ - private createUrlParameters(filters:Filter[], includePage:boolean){ - var allLimits="";//location.search.slice(1); - this.parameterNames.splice(0,this.parameterNames.length); - this.parameterValues.splice(0,this.parameterValues.length); - - for (let filter of filters){ - var filterLimits=""; - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - filterLimits+=((filterLimits.length == 0)?'':',') +'"'+ StringUtils.URIEncode(value.id)+'"'; - } - } - this.queryParameters[filter.filterId]=filterLimits; - if(filterLimits.length > 0){ - this.parameterNames.push(filter.filterId); - this.parameterValues.push(filterLimits); - } - allLimits+=(allLimits.length==0?"?":"&")+((filterLimits.length == 0 )?'':filter.filterId + '='+ filterLimits) ; - } - } - if(this.searchUtils.keyword.length > 0 ){ - allLimits+=(allLimits.length==0?"?":"&")+'keyword=' + this.searchUtils.keyword; - this.parameterNames.push("keyword"); - this.parameterValues.push(this.searchUtils.keyword); - } - - - return allLimits; - } - - public isFiltered(){ - var filtered=false; - for (let filter of this.filters){ - if(filter.countSelectedValues > 0){ - filtered = true; - break; - } - } - if(this.searchUtils.keyword.length > 0 ){ - filtered = true; - } - return filtered; - } - private clearKeywords(){ - if(this.searchUtils.keyword.length > 0 ){ - this.searchUtils.keyword =''; - } - this.goTo(1); - } - private clearFilters(){ - for (var i =0 ; i < this.filters.length; i++) { - for (var j=0; j < this.filters[i].values.length; j++) { - if(this.filters[i].values[j].selected) { - this.filters[i].values[j].selected = false; - } - } - this.filters[i].countSelectedValues = 0; - } - this.clearKeywords(); - } - - private removeFilter(value:Value,filter:Filter){ - filter.countSelectedValues--; - if(value.selected == true){ - value.selected = false; - } - this.goTo(1); - } - goTo(page:number = 1){ - - this.searchUtils.page=page; - var table = $('#dpTable').DataTable(); - table.page( page - 1 ).draw( false ); - // Object { page: 0, pages: 3, start: 0, end: 10, length: 10, recordsTotal: 28, recordsDisplay: 21, serverSide: false } - var info = table.page.info(); - this.searchUtils.totalResults = info.recordsDisplay; - - var urlParameters = this.createUrlParameters(this.filters,true); - this.location.go(location.pathname,urlParameters); - - } - - filterChanged($event){ - this.goTo(1); - } - keywordChanged($event) { - this.searchUtils.keyword = $event.value; - this.goTo(1); - } -/* - downloadClicked($event) { - if($event.value == true) { - var queryParameters = this.createSearchQueryParameters(this.filters); - - this.downloadClick.emit({ - value: queryParameters - }); - } - } -*/ - - - getSelectedValues(filter):any{ - var selected = []; - if(filter.countSelectedValues >0){ - for (var i=0; i < filter.values.length; i++){ - if(filter.values[i].selected){ - selected.push(filter.values[i]); - } - } - } - return selected; - - } - /* - Trigger a table draw in order to get the initial filtering - */ - triggerInitialLoad(){ - setTimeout(function(){ - var table = $('#dpTable').DataTable(); - table.page( 0 ).draw( false ); - - }, 500); - } - -/* -Transform initial - not filtered results to get the filtered number -*/ - transform(results): any { - if(results.length > 0) { - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.LOADING; - - var result = results.filter(row=>this.filterAll(row, this.searchUtils.keyword.toLowerCase(),this.filters)); - - let oldTotal = this.searchUtils.totalResults; - console.log(" Length: "+result.length); - this.searchUtils.totalResults = result.length; - - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - this.searchUtils.status = errorCodes.NONE; - } - - // if(oldTotal != this.searchUtils.totalResults) { - // args[3].detectChanges(); - // } - return result; - } - return []; - } - - filterAll(row: any, query: string, filters:Filter[]) { - // console.log(row); - let returnValue: boolean = false; - - if(query) { - if(row.title.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.type.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.countries && row.countries.length > 0) { - for(let country of row.countries) { - if(country.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(row.compatibility && row.compatibility.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.organizations && row.organizations.length > 0) { - for(let organization of row.organizations) { - if(organization.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(!returnValue) { - return false; - } - } - - for (let filter of filters){ - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - - // make it generic in future commit - let field:string = ""; - if(filter.title == "Type") { - field = "type"; - } else if(filter.title == "Compatibility Level") { - field = "compatibility"; - } - - if(row[field] == value.name) { - returnValue = true; - if(filter.filterOperator == "or") { - break; - } - } else { - if(filter.filterOperator == "and") { - return false; - } - returnValue = false; - } - } - } - if(!returnValue) { - return false; - } - } - } - - return true; - } - filterQuery(data, query){ - if(data.toLowerCase().indexOf(query.toLowerCase()) > -1){ - return true; - }else{ - return false; - } - } - filterData(row: any, query: string, filters:Filter[]) { - - - let returnValue: boolean = false; - - if(query) { - for(var i=0; i <5; i++){ - var r= this.filterQuery(row[i], query); - // console.log(query+" "+ row+" "+r); - if(r) { - returnValue = true; - break; - } - } - - if(!returnValue) { - return false; - } - } - - for (let filter of filters){ - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - let field = 1; - if(filter.title == "Type") { - field = 1; - } else if(filter.title == "Compatibility Level") { - field = 4; - } - r= this.filterQuery(row[field], value.name); - if(r) { - returnValue = true; - if(filter.filterOperator == "or") { - break; - } - } else { - if(filter.filterOperator == "and") { - return false; - } - returnValue = false; - } - } - } - if(!returnValue) { - return false; - } - } - } - - return true; - } -} diff --git a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.module.ts b/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.module.ts deleted file mode 100644 index 3cb24ff9..00000000 --- a/portal-4cli-lib/src/app/searchPages/searchUtils/searchPageTableView.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import{SearchPageTableViewComponent} from './searchPageTableView.component'; - -import{LoadingModalModule, ReportsServiceModule, ModalModule, PagingModule, HelperModule, ErrorMessagesModule} from 'ng-openaire-library'; -import{PiwikServiceModule } from 'ng-openaire-library'; - -import {DataTablesModule} from 'angular-datatables'; - - -import {Meta, PreviousRouteRecorder, SearchFormModule, SearchResultsModule, SearchPagingModule, SearchDownloadModule, SearchFilterModule} from 'ng-openaire-library'; - -@NgModule({ - imports: [ - CommonModule, FormsModule,RouterModule, SearchFormModule, SearchResultsModule, LoadingModalModule, - ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, - DataTablesModule, SearchFilterModule, PiwikServiceModule, HelperModule, ErrorMessagesModule - ], - declarations: [ - SearchPageTableViewComponent -], - - providers:[ - PreviousRouteRecorder, Meta - ], - exports: [ - SearchPageTableViewComponent - ] -}) -export class SearchPageTableViewModule { } diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts index fec84294..078eb0ed 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.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/simple/searchDataProviders.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders.module.ts index 3cc4c940..fbfaf1ea 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders.module.ts @@ -3,8 +3,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library'; -import {SearchDataProvidersModule} 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 {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module'; @NgModule({ imports: [ CommonModule, FormsModule, diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts index 4e16b61a..05b5d6fc 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts @@ -2,7 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, EnvironmentSpecificResolver} from 'ng-openaire-library'; +import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; + +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/simple/searchDatasets.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets.module.ts index 87b41655..3116a599 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets.module.ts @@ -5,7 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import {SearchDatasetsModule, PreviousRouteRecorder, FreeGuard, IsRouteEnabled, EnvironmentSpecificResolver, EnvironmentSpecificService} from 'ng-openaire-library'; +import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' @NgModule({ @@ -17,7 +20,7 @@ import {SearchDatasetsModule, PreviousRouteRecorder, FreeGuard, IsRouteEnabled, declarations: [ OpenaireSearchDatasetsComponent ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled, EnvironmentSpecificResolver, EnvironmentSpecificService], + providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], exports: [ OpenaireSearchDatasetsComponent ] diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 5829cfb5..788e1117 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -2,7 +2,11 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.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/simple/searchOrganizations.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.module.ts index 095adf7e..f56c7c43 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.module.ts @@ -5,8 +5,11 @@ import { FormsModule } from '@angular/forms'; import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.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, SearchOrganizationsModule} from 'ng-openaire-library'; +import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module'; @NgModule({ imports: [ diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts index d2a89955..d7a63e1d 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchProjectsComponent} from './searchProjects.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/simple/searchProjects.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchProjects.module.ts index a54eff6a..b526ef9d 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchProjects.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchProjects.module.ts @@ -5,8 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled,SearchProjectsModule} 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 { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; @NgModule({ imports: [ CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts index c872b45c..04f8284e 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import{OpenaireSearchPublicationsComponent} from './searchPublications.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/simple/searchPublications.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchPublications.module.ts index b66a44e3..0209c7ca 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchPublications.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchPublications.module.ts @@ -5,7 +5,10 @@ import { FormsModule } from '@angular/forms'; import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchPublicationsModule} from 'ng-openaire-library'; +import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.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/simple/searchSoftware-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchSoftware-routing.module.ts index a7da5a88..87bfd841 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchSoftware-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import {OpenaireSearchSoftwareComponent} from './searchSoftware.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/simple/searchSoftware.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchSoftware.module.ts index 166ec32f..aef096f5 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchSoftware.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchSoftware.module.ts @@ -4,9 +4,12 @@ import { FormsModule } from '@angular/forms'; import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; import{OpenaireSearchSoftwareComponent} from './searchSoftware.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, SearchSoftwareModule} from 'ng-openaire-library'; +import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module'; @NgModule({ imports: [ diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index b7925b46..de725dac 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -1,6 +1,6 @@ { "enablePiwikTrack" : false, - "enableHelper" : false, + "enableHelper" : true, "useCache" : true, "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",