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

Removed restriction of: not compatibility 'hostedby' from OpenAIRE Compatible Dataproviders page & renaming of that page to OpenAIRE Content Providers 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47575 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2017-06-18 23:55:24 +00:00
parent 5012261491
commit 7b851aa569
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
portal-2/src/app/app-routing.module.ts
View File

@ -167,8 +167,8 @@ export function getUserModule() {
{ path: 'search/find/dataproviders', loadChildren: getSearchDataProvidersModule }, { path: 'search/find/dataproviders', loadChildren: getSearchDataProvidersModule },
{ path: 'search/find/organizations', loadChildren: getSearchOrganizationsModule }, { path: 'search/find/organizations', loadChildren: getSearchOrganizationsModule },
{ path: 'search/find/people', loadChildren: getSearchPeopleModule }, { path: 'search/find/people', loadChildren: getSearchPeopleModule },
{ path: 'search/data-providers', loadChildren: getCompatibleDataProvidersModule }, { path: 'search/content-providers', loadChildren: getCompatibleDataProvidersModule },
{ path: 'search/data-providers-table', loadChildren: getCompatibleDataProvidersTableModule }, { path: 'search/content-providers-table', loadChildren: getCompatibleDataProvidersTableModule },
{ path: 'search/entity-registries', loadChildren: getEntityRegistriesModule }, { path: 'search/entity-registries', loadChildren: getEntityRegistriesModule },
{ path: 'search/entity-registries-table', loadChildren: getEntityRegistriesTableModule }, { path: 'search/entity-registries-table', loadChildren: getEntityRegistriesTableModule },
{ path: 'search/advanced/publications', loadChildren: getAdvancedSearchPublicationsModule }, { path: 'search/advanced/publications', loadChildren: getAdvancedSearchPublicationsModule },

8
portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
View File

@ -12,10 +12,10 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
import {ExportCSVComponent} from '../../utils/exportCSV.class'; import {ExportCSVComponent} from '../../utils/exportCSV.class';
@Component({ @Component({
selector: 'search-dataproviders', selector: 'search-content-providers',
template: ` template: `
<search-page pageTitle="Compatible Dataproviders" <search-page pageTitle="OpenAIRE Content Providers"
type="datasources" entityType="dataprovider" [(filters)] = "filters" type="datasources" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils" [(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false [baseUrl] = "baseUrl" [showResultCount]=false
@ -23,7 +23,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
(downloadClick)="downloadClicked($event)" (downloadClick)="downloadClicked($event)"
[csvParams]="csvParams" csvPath="resources" [csvParams]="csvParams" csvPath="resources"
[disableForms]="disableForms" [disableForms]="disableForms"
[tableViewLink]="'/search/data-providers-table'"> [tableViewLink]="'/search/content-providers-table'">
</search-page> </search-page>
<!--table-view [(datasources)] = results></table-view--> <!--table-view [(datasources)] = results></table-view-->
@ -48,7 +48,7 @@ export class SearchCompatibleDataprovidersComponent {
"export":[] "export":[]
}; };
public CSVDownloaded = false; public CSVDownloaded = false;
public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))"; public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";
public csvParams: string; public csvParams: string;
public disableForms: boolean = false; public disableForms: boolean = false;

8
portal-2/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
View File

@ -12,10 +12,10 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
import {ExportCSVComponent} from '../../utils/exportCSV.class'; import {ExportCSVComponent} from '../../utils/exportCSV.class';
@Component({ @Component({
selector: 'search-dataproviders-table', selector: 'search-content-providers-table',
template: ` template: `
<search-page-table pageTitle="Compatible Dataproviders" <search-page-table pageTitle="OpenAIRE Content Providers"
type="datasources" entityType="dataprovider" [(filters)] = "filters" type="datasources" entityType="dataprovider" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils" [(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false [baseUrl] = "baseUrl" [showResultCount]=false
@ -23,7 +23,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.class';
(downloadClick)="downloadClicked($event)" (downloadClick)="downloadClicked($event)"
[csvParams]="csvParams" csvPath="resources" [csvParams]="csvParams" csvPath="resources"
[disableForms]="disableForms" [disableForms]="disableForms"
[searchViewLink]="'/search/data-providers'"> [searchViewLink]="'/search/content-providers'">
</search-page-table> </search-page-table>
<!--table-view [(datasources)] = results></table-view--> <!--table-view [(datasources)] = results></table-view-->
@ -48,7 +48,7 @@ export class SearchCompatibleDataprovidersTableComponent {
"export":[] "export":[]
}; };
public CSVDownloaded = false; public CSVDownloaded = false;
public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))"; public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";
public csvParams: string; public csvParams: string;
public disableForms: boolean = false; public disableForms: boolean = false;

6
portal-2/src/app/services/searchDataproviders.service.ts
View File

@ -66,7 +66,7 @@ export class SearchDataprovidersService {
searchCompatibleDataprovidersTable (params: string,refineParams:string):any { searchCompatibleDataprovidersTable (params: string,refineParams:string):any {
let size: number = 0; let size: number = 0;
let url: string= OpenaireProperties.getSearchResourcesAPIURL(); let url: string= OpenaireProperties.getSearchResourcesAPIURL();
url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))" url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))"
if(params!= null && params != '' ) { if(params!= null && params != '' ) {
url += params; url += params;
} }
@ -90,7 +90,7 @@ export class SearchDataprovidersService {
searchCompatibleDataproviders (params: string,refineParams:string, page: number, size: number, refineFields:string[] ):any { searchCompatibleDataproviders (params: string,refineParams:string, page: number, size: number, refineFields:string[] ):any {
console.info("in search Compatible Dataproviders service function"); console.info("in search Compatible Dataproviders service function");
let url: string = OpenaireProperties.getSearchResourcesAPIURL(); let url: string = OpenaireProperties.getSearchResourcesAPIURL();
url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))" url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))"
if(params!= null && params != '' ) { if(params!= null && params != '' ) {
url += params; url += params;
} }
@ -294,7 +294,7 @@ export class SearchDataprovidersService {
searchCompatibleDataprovidersCSV (params: string,refineParams:string, page: number, size: number):any { searchCompatibleDataprovidersCSV (params: string,refineParams:string, page: number, size: number):any {
let url = OpenaireProperties.getSearchResourcesAPIURL(); let url = OpenaireProperties.getSearchResourcesAPIURL();
url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))" url += "?query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))"
if(params!= null && params != '' ) { if(params!= null && params != '' ) {
url += params; url += params;
} }

6
portal-2/src/app/sharedComponents/navigationBar.component.ts
View File

@ -46,7 +46,7 @@ import {Session} from '../login/utils/helper.class';
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Data Providers Data Providers
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="uk-link" routerLink="/search/data-providers" class="uk-offcanvas-close custom-offcanvas-close" >Compatible Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/content-providers" class="uk-offcanvas-close custom-offcanvas-close" >Compatible Data Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li>
</ul> </ul>
</li> </li>
@ -141,12 +141,12 @@ import {Session} from '../login/utils/helper.class';
</div> </div>
</li> </li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="uk-link" routerLink="/search/data-providers" class="" aria-expanded="false">Data Providers</a> <a routerLinkActive="uk-link" routerLink="/search/content-providers" class="" aria-expanded="false">Data Providers</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')"> <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="uk-link" routerLink="/search/data-providers">Compatible Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/content-providers">Compatible Data Providers</a></li>
<li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Entity Registries</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Entity Registries</a></li>
</ul> </ul>
</div> </div>

4
portal-2/src/app/utils/properties/openaireProperties.ts
View File

@ -19,8 +19,8 @@ export class OpenaireProperties {
private static searchLinkToDatasets = "search/find/datasets"; private static searchLinkToDatasets = "search/find/datasets";
private static searchLinkToOrganizations = "search/find/organizations"; private static searchLinkToOrganizations = "search/find/organizations";
private static searchLinkToPeople = "search/find/people"; private static searchLinkToPeople = "search/find/people";
public static searchLinkToCompatibleDataProviders = "search/data-providers"; public static searchLinkToCompatibleDataProviders = "search/content-providers";
public static searchLinkToCompatibleDataProvidersTable = "search/data-providers-table"; public static searchLinkToCompatibleDataProvidersTable = "search/content-providers-table";
public static searchLinkToEntityRegistriesDataProviders = "search/entity-registries"; public static searchLinkToEntityRegistriesDataProviders = "search/entity-registries";
public static searchLinkToEntityRegistriesDataProvidersTable = "search/entity-registries-table"; public static searchLinkToEntityRegistriesDataProvidersTable = "search/entity-registries-table";

2
portal-2/src/assets/sitemap.xml
View File

@ -81,7 +81,7 @@
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/data-providers]]></loc> <loc><![CDATA[https://demo.openaire.eu/search/content-providers]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>

2
portal-2/src/server.routes.ts
View File

@ -15,7 +15,7 @@ export const routes: string[] = [
'search/find/people','search/find/publications','search/find/projects','search/find/datasets','search/find/dataproviders','search/find/organizations', 'search/find/people','search/find/publications','search/find/projects','search/find/datasets','search/find/dataproviders','search/find/organizations',
'search/advanced/people','search/advanced/publications','search/advanced/projects','search/advanced/datasets','search/advanced/dataproviders','search/advanced/organizations', 'search/advanced/people','search/advanced/publications','search/advanced/projects','search/advanced/datasets','search/advanced/dataproviders','search/advanced/organizations',
'participate/deposit-publications','participate/deposit-datasets','participate/deposit-publications-result','participate/deposit-datasets-result', 'participate/deposit-subject-result', 'participate/deposit-publications','participate/deposit-datasets','participate/deposit-publications-result','participate/deposit-datasets-result', 'participate/deposit-subject-result',
'search/data-providers','search/data-providers-table','search/entity-registries','search/entity-registries-table','project-report', 'search/content-providers','search/content-providers-table','search/entity-registries','search/entity-registries-table','project-report',
'claims','myclaims','participate/claim', 'participate/direct-claim', 'claims-project-manager', 'claims','myclaims','participate/claim', 'participate/direct-claim', 'claims-project-manager',
'test', 'user-info', 'test', 'user-info',
'**','error' '**','error'