MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

[Explore|Trunk] 

New Search:
	use new serach page component for projects, organizations, datasources simple and advanced search pages.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@58074 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-02-11 15:09:08 +00:00
parent be9e64bdf8
commit 84d7984100
16 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
explore/angular.json
View File

@ -27,6 +27,7 @@
], ],
"styles": [ "styles": [
"src/styles.css", "src/styles.css",
"src/material.scss",
"node_modules/datatables.net-dt/css/jquery.dataTables.css" "node_modules/datatables.net-dt/css/jquery.dataTables.css"
], ],
"scripts": [ "scripts": [
@ -84,6 +85,7 @@
], ],
"styles": [ "styles": [
"src/styles.css", "src/styles.css",
"src/material.scss",
"node_modules/datatables.net-dt/css/jquery.dataTables.css" "node_modules/datatables.net-dt/css/jquery.dataTables.css"
], ],
"assets": [ "assets": [

10
explore/src/app/app.component.ts
View File

@ -90,13 +90,12 @@ export class AppComponent {
} }
buildMenu() { buildMenu() {
//TODO add check for research results route
this.menuItems = [ this.menuItems = [
{ {
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}), rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}), items: [
new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}), new MenuItem("", "Research Outcomes", "", "/search/find/research-results", false, [], [], {}),
new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}), new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}), new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {}) new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
@ -124,9 +123,6 @@ export class AppComponent {
new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})] new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})]
} }
]; ];
if(this.properties.environment == "development"){
this.menuItems[0].items.push(new MenuItem("", "Research outcomes", "", "/search/find/research-results", false, [], [], {}))
}
if (Session.isPortalAdministrator(this.user)) { if (Session.isPortalAdministrator(this.user)) {
this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {})); this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
this.userMenuItems.push(new MenuItem("", "Manage helptexts", this.userMenuItems.push(new MenuItem("", "Manage helptexts",

4
explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-dataprovider', selector: 'openaire-advanced-search-dataprovider',
template: ` template: `
<advanced-search-dataprovider> <search-dataproviders [simpleView]="false">
</advanced-search-dataprovider> </search-dataproviders>
` `
}) })

15
explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
View File

@ -1,20 +1,19 @@
import { NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import {CommonModule} from '@angular/common';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchDataProvidersRoutingModule, AdvancedSearchDataProvidersRoutingModule,
AdvancedSearchDataProvidersModule SearchDataProvidersModule
], ],
declarations: [ declarations: [

4
explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -4,8 +4,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-organizations', selector: 'openaire-advanced-search-organizations',
template: ` template: `
<advanced-search-organizations> <search-organizations [simpleView]="false">
</advanced-search-organizations> </search-organizations>
` `
}) })

16
explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
View File

@ -1,20 +1,18 @@
import { NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import {CommonModule} from '@angular/common';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module'; import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchOrganizationsModule, SearchOrganizationsModule,
AdvancedSearchOrganizationsRoutingModule AdvancedSearchOrganizationsRoutingModule
], ],

4
explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -2,8 +2,8 @@ import {Component, Input, ViewChild} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-projects', selector: 'openaire-advanced-search-projects',
template: ` template: `
<advanced-search-projects> <search-projects [simpleView]="false">
</advanced-search-projects> </search-projects>
` `
}) })

32
explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
View File

@ -1,29 +1,27 @@
import { NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import {CommonModule} from '@angular/common';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module'; import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchProjectsModule, SearchProjectsModule,
AdvancedSearchProjectsRoutingModule AdvancedSearchProjectsRoutingModule
], ],
declarations: [ declarations: [
OpenaireAdvancedSearchProjectsComponent OpenaireAdvancedSearchProjectsComponent
], ],
providers:[FreeGuard, IsRouteEnabled], providers: [FreeGuard, IsRouteEnabled],
exports: [ exports: [
OpenaireAdvancedSearchProjectsComponent OpenaireAdvancedSearchProjectsComponent
] ]
}) })
export class LibAdvancedSearchProjectsModule { } export class LibAdvancedSearchProjectsModule {
}

2
explore/src/app/searchPages/advanced/searchResearchResults.component.ts
View File

@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-results', selector: 'openaire-search-results',
template: ` template: `
<search-research-results resultType="publication" [simpleView]="false"></search-research-results> <search-research-results resultType="result" [simpleView]="false"></search-research-results>
` `
}) })

2
explore/src/app/searchPages/simple/searchDataProviders.module.ts
View File

@ -6,7 +6,7 @@ import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.mo
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module'; import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,

2
explore/src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -1,4 +1,4 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-dataproviders', selector: 'openaire-search-dataproviders',

2
explore/src/app/searchPages/simple/searchOrganizations.module.ts
View File

@ -8,8 +8,8 @@ import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.compone
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
@NgModule({ @NgModule({
imports: [ imports: [

2
explore/src/app/searchPages/simple/searchProjects.module.ts
View File

@ -8,7 +8,7 @@ import{OpenaireSearchProjectsComponent} from './searchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule

2
explore/src/app/searchPages/simple/searchResearchResults.component.ts
View File

@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-results', selector: 'openaire-search-results',
template: ` template: `
<search-research-results resultType="publication"></search-research-results> <search-research-results resultType="result"></search-research-results>
` `
}) })

2
explore/src/assets/env-properties.json
View File

@ -2,7 +2,7 @@
"environment" : "development", "environment" : "development",
"dashboard" : "explore", "dashboard" : "explore",
"enablePiwikTrack" : false, "enablePiwikTrack" : false,
"useCache" : true, "useCache" : false,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",

9
explore/src/material.scss Normal file
View File

@ -0,0 +1,9 @@
@import '~@angular/material/theming';
@include mat-core();
$my-app-primary: mat-palette($mat-gray, 900);
$my-app-accent: mat-palette($mat-light-green, 700);
$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent);
@include angular-material-theme($my-app-theme);