Deposit Pages: Show proper messages (Publications or Research Data) | Landing pages' tabs: redirect results to search pages

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@44893 d315682c-612b-4755-9ff5-7f18f6832af3

portal-2/src/app/deposit/deposit.component.ts

@@ -20,7 +20,7 @@ import {SearchOrganizationsService} from '../services/searchOrganizations.servic
                     </i>
                     Then you are required to publish in
                     <a href="{{openAccess}}">open access</a>.
-                    One way to do this is to deposit your publications into an
+                    One way to do this is to deposit your {{requestFor}} into an
                     <a href="{{openAccessRepo}}">open access repository</a>.
                 </p>
                 <p>
@@ -82,8 +82,7 @@ export class DepositComponent {
 
           if(this.requestFor == "Publications") {
               this._router.navigate( ['deposit-publications-result'], { queryParams: { "organizationId": id } } );
-          } else if(this.requestFor == "Datasets") {
+          } else if(this.requestFor == "Research Data") {
-              console.info("call deposit result for datasets")
               this._router.navigate( ['deposit-datasets-result'], { queryParams: { "organizationId": id } } );
           }
         }

portal-2/src/app/deposit/depositDatasets.component.ts

@@ -3,7 +3,7 @@ import {Component} from '@angular/core';
 @Component({
     selector: 'deposit-datasets',
     template: `
-        <deposit [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit>
+        <deposit [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Research Data'"></deposit>
     `
 })
 

portal-2/src/app/deposit/depositDatasetsResult.component.ts

@@ -3,7 +3,7 @@ import {Component} from '@angular/core';
 @Component({
     selector: 'deposit-datasets-result',
     template: `
-        <deposit-result [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit-result>
+        <deposit-result [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Research Data'"></deposit-result>
     `
 })
 

portal-2/src/app/deposit/depositResult.component.ts

@@ -34,7 +34,7 @@ import {OrganizationService} from '../services/organization.service';
             </div>
 
             <div *ngIf="searchDataprovidersComponent.searchUtils.totalResults > 0">
-                <p>Please use the information/contacts shown below to deposit your publications.</p>
+                <p>Please use the information/contacts shown below to deposit your {{requestFor}}.</p>
                 <!--showDataProviders [dataProviders]=dataProviders></showDataProviders-->
                 <div class = "text-right" *ngIf = "searchDataprovidersComponent.searchUtils.totalResults > 10" ><a [href] = "linkToSearchDataproviders" >View all {{searchDataprovidersComponent.searchUtils.totalResults}} results</a></div>
                 <search-result [(results)]="searchDataprovidersComponent.results" [(status)]= "searchDataprovidersComponent.searchUtils.status"></search-result>
@@ -60,7 +60,7 @@ import {OrganizationService} from '../services/organization.service';
                     No ID for organization.
                 </div>
 
-                You can still deposit your publications and/or research data in
+                You can still deposit your {{requestFor}} in
                 <a href="{{zenodo}}">OpenAIRE's Zenodo catch-all repository </a>
                 hosted by CERN.
             </div>

portal-2/src/app/landingPages/dataProvider/datasetsTab.component.ts

@@ -32,7 +32,7 @@ export class DatasetsTabComponent {
     constructor () {}
 
     ngOnInit() {
-        this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets()+this.paramsForSearchLink;
+        this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets()+this.paramsForSearchLink;
     }
 
     ngOnDestroy() {}

portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts

@@ -32,7 +32,8 @@ export class DatasourcesTabComponent {
     constructor () {}
 
     ngOnInit() {
-        this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders()+this.paramsForSearchLink;
+        this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders()+this.paramsForSearchLink;
+        console.info(this.linkToSearchDataproviders);
     }
 
     ngOnDestroy() {}

portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts

@@ -33,7 +33,7 @@ export class ProjectsTabComponent {
     constructor () {}
 
     ngOnInit() {
-        this.linkToSearchProjects = OpenaireProperties.getLinkToSearchProjects()+this.paramsForSearchLink;
+        this.linkToSearchProjects = OpenaireProperties.getLinkToAdvancedSearchProjects()+this.paramsForSearchLink;
     }
 
     ngOnDestroy() {}

portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts

@@ -32,7 +32,7 @@ export class PublicationsTabComponent {
     constructor () {}
 
     ngOnInit() {
-        this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink;
+        this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+this.paramsForSearchLink;
     }
 
     ngOnDestroy() {}

portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts

@@ -22,8 +22,8 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th class="text-center">Name</th>
+                        <th class="text-center">Data Provider Name</th>
-                        <th class="text-center">Aggregation Number</th>
+                        <th class="text-center">Number of publications/ datasets</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -34,7 +34,9 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
                             </a>
                         </td>
                         <td class="text-center">
-                            {{item.count}}
+                            <a href="{{linkToSearchPublications}}{{item.id}}&ho=and&collectedFrom={{dataproviderId}}&co=and" target="_blank">
+                                {{item.count}}
+                            </a>
                         </td>
                     </tr>
                 </tbody>
@@ -44,14 +46,14 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
 })
 
 export class RelatedDatasourcesTabComponent {
-    @Input() paramsForSearchLink: string = "";
+    @Input() dataproviderId: string;
     @Input() searchPublicationsComponent : SearchPublicationsComponent;
     private linkToSearchPublications = "";
 
     constructor () {}
 
     ngOnInit() {
-        //this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications()+this.paramsForSearchLink;
+        this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications()+"?&hostedBy=";//+ +"&ho=and&collectedFrom="+ +"&co=and";
     }
 
     ngOnDestroy() {}

portal-2/src/app/landingPages/dataProvider/tabs.component.ts

@@ -112,6 +112,7 @@ import { SearchDataprovidersService } from '../../services/searchDataproviders.s
                                   [organizations]="organizations">
                 </organizationsTab>
                 <relatedDatasourcesTab *ngIf="i>0 && tab.content=='relatedDatasourcesTab'"
+                    [dataproviderId]="id"
                     [searchPublicationsComponent]="searchPublicationsComponentAggregators">
                 </relatedDatasourcesTab>
                 <div *ngIf="i>0 && tab.content=='metricsTab'" class="well">
@@ -171,9 +172,9 @@ export class TabsComponent {
         }
 
         if(this.resultsBy == "collectedFrom") {
-            this.paramsForSearchLink = "?collectedfromdatasourceid="+this.id;
+            this.paramsForSearchLink = "?collectedFrom="+this.id+"&co=and";
         } else if (this.resultsBy == "hostedBy") {
-            this.paramsForSearchLink = "?resulthostingdatasourceid="+this.id;
+            this.paramsForSearchLink = "?hostedBy="+this.id+"&ho=and";
         }
     }
 

portal-2/src/app/landingPages/organization/organization.component.ts

@@ -222,7 +222,7 @@ export class OrganizationComponent {
 
          private searchDataproviders() {
            this.searchDataprovidersComponent.getResultsForEntity("organization", this.organizationId, 1, 10);
-           this.linkToSearchDataproviders = OpenaireProperties.getLinkToSearchDataProviders();
+           this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders() + "?organization=" + this.organizationId + "&or=and";;
          }
 
          private searchDataprovidersInit() {

portal-2/src/app/landingPages/person/person.component.ts

@@ -112,11 +112,11 @@ export class PersonComponent {
 
     private searchPublications() {
       this.searchPublicationsComponent.getResultsForEntity("person", this.personId, 1, 10);
-      this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications();
+      this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?person=" + this.personId + "&pe=and";
      }
 
      private searchDatasets() {
        this.searchDatasetsComponent.getResultsForEntity("person", this.personId, 1, 10);
-       this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets();
+       this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?person=" + this.personId + "&pe=and";
      }
 }

portal-2/src/app/landingPages/project/project.component.html

@@ -147,8 +147,8 @@
                     </li>
                     <li role="separator" class="list-group-item divider"></li>
                     <li class="list-group-item">
-                        <a data-toggle="tab" href="">
+                        <a data-toggle="tab" href="{{linkToSearchPublications}}">
-                            Publication details
+                            View all Project Publications
                         </a>
                     </li>
                     <li class="list-group-item">

portal-2/src/app/landingPages/project/project.component.ts

@@ -91,12 +91,12 @@ export class ProjectComponent{
 
   private searchPublications() {
     this.searchPublicationsComponent.getResultsForEntity("project", this.projectId, 1, 10);
-    this.linkToSearchPublications = OpenaireProperties.getLinkToSearchPublications() + "?relprojectid=" + this.projectId;
+    this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications() + "?project=" + this.projectId+"&pr=and";
   }
 
   private searchDatasets() {
       this.searchDatasetsComponent.getResultsForEntity("project", this.projectId, 1, 10);
-      this.linkToSearchDatasets = OpenaireProperties.getLinkToSearchDatasets() + "?relprojectid=" + this.projectId;;
+      this.linkToSearchDatasets = OpenaireProperties.getLinkToAdvancedSearchDatasets() + "?project=" + this.projectId+"&pr=and";
   }
 
   private searchDatasetsInit() {

portal-2/src/app/sharedComponents/navigationBar.component.ts

@@ -56,7 +56,7 @@ import 'rxjs/Rx';
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Deposit <span class=""></span></a>
         <ul class="dropdown-menu">
           <li><a  href="/deposit-publications">Deposit Publications</a></li>
-          <li><a   href="/deposit-datasets">Deposit Datasets</a></li>
+          <li><a   href="/deposit-datasets">Deposit Research Data</a></li>
         </ul>
       </li>
 

portal-2/src/app/utils/entities/dataProviderInfo.ts

@@ -79,6 +79,7 @@ export class DataProviderInfo {
                             "aggregator::pubsrepository::unknown",
                             "aggregator::pubsrepository::journals",
                             "entityregistry::projects",
+                            "entityregistry::repositories",
                             "infospace",
                             "scholarcomminfra",
                             "pubscatalogue::unknown"

portal-2/src/app/utils/properties/openaireProperties.ts

@@ -117,6 +117,26 @@ export class OpenaireProperties {
         return this.baseSearchLink + this.searchLinkToPeople;
     }
 
+    //Advanced searchPages
+    public static getLinkToAdvancedSearchPublications():string{
+      return this.baseSearchLink + this.searchLinkToAdvancedPublications;
+    }
+    public static getLinkToAdvancedSearchProjects():string{
+      return this.baseSearchLink + this.searchLinkToAdvancedProjects;
+    }
+    public static getLinkToAdvancedSearchDataProviders():string{
+      return this.baseSearchLink + this.searchLinkToAdvancedDataProviders;
+    }
+    public static getLinkToAdvancedSearchDatasets():string{
+      return this.baseSearchLink + this.searchLinkToAdvancedDatasets;
+    }
+    public static getLinkToAdvancedSearchOrganizations():string{
+      return this.baseSearchLink + this.searchLinkToAdvancedOrganizations;
+    }
+    public static getLinkToAdvancedSearchPeople():string{
+        return this.baseSearchLink + this.searchLinkToAdvancedPeople;
+    }
+
     // Services - APIs' getters
     // public static getSearchAPIURL():string{
     //   return this.searchAPIURL;