From e30d69993f8cdb3c11d2f2d79f5e016d02371395 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Sun, 10 Jun 2018 23:25:33 +0000
Subject: [PATCH] 1. Landing pages: Rename 'Other Metrics' to 'Metrics' in
 appbox. 2. Landing pages: In tabs which need extra query, do not show 'view
 all' option until status is DONE (not as soon as totalResults > 0 -> set by
 count query).

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52424 d315682c-612b-4755-9ff5-7f18f6832af3
---
 landingPages/dataProvider/dataProvider.component.html     | 2 +-
 landingPages/dataProvider/datasetsTab.component.ts        | 2 +-
 landingPages/dataProvider/datasourcesTab.component.ts     | 2 +-
 landingPages/dataProvider/projectsTab.component.ts        | 2 +-
 landingPages/dataProvider/publicationsTab.component.ts    | 2 +-
 landingPages/dataProvider/softwareTab.component.ts        | 2 +-
 landingPages/dataProvider/statisticsTab.component.ts      | 2 +-
 landingPages/landing-utils/metrics.component.ts           | 2 +-
 .../landing-utils/searchingProjectsInTab.component.ts     | 2 +-
 landingPages/organization/organization.component.html     | 4 ++--
 landingPages/project/project.component.html               | 8 ++++----
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html
index ea408f67..fb3e48ce 100644
--- a/landingPages/dataProvider/dataProvider.component.html
+++ b/landingPages/dataProvider/dataProvider.component.html
@@ -162,7 +162,7 @@
 
                             <errorMessages [status]="[fetchPublications.searchUtils.status, fetchDatasets.searchUtils.status]" [type]="'statistics'" tab_error_class=true></errorMessages>
 
-                            <div *ngIf="(fetchPublications.searchUtils.totalResults != 0 || fetchDatasets.searchUtils.totalResults != 0)">
+                            <div *ngIf="(fetchPublications.searchUtils.status == errorCodes.DONE || fetchDatasets.searchUtils.status == errorCodes.DONE)">
                               <p class="uk-text-bold">Latest Research Result Timeline</p>
                               <i-frame  [url]=docsTimelineUrl width="800" height="350"></i-frame>
                               <p class="uk-text-bold">Research Result Types</p>
diff --git a/landingPages/dataProvider/datasetsTab.component.ts b/landingPages/dataProvider/datasetsTab.component.ts
index 4ea12491..b00999ba 100644
--- a/landingPages/dataProvider/datasetsTab.component.ts
+++ b/landingPages/dataProvider/datasetsTab.component.ts
@@ -9,7 +9,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchDatasets.searchUtils.status]" [type]="'research data'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchDatasets.searchUtils.totalResults > 0">
+        <div *ngIf="fetchDatasets.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults > 10" >
                 <a  [queryParams]="paramsForSearchLink"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchDatasets" class="uk-button uk-button-text">
diff --git a/landingPages/dataProvider/datasourcesTab.component.ts b/landingPages/dataProvider/datasourcesTab.component.ts
index 650965ea..b1f6598b 100644
--- a/landingPages/dataProvider/datasourcesTab.component.ts
+++ b/landingPages/dataProvider/datasourcesTab.component.ts
@@ -9,7 +9,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
+        <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults > 10">
                 <a  [queryParams]="paramsForSearchLink"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchDataproviders" class="uk-button uk-button-text">
diff --git a/landingPages/dataProvider/projectsTab.component.ts b/landingPages/dataProvider/projectsTab.component.ts
index 054acfdf..7bb5866f 100644
--- a/landingPages/dataProvider/projectsTab.component.ts
+++ b/landingPages/dataProvider/projectsTab.component.ts
@@ -10,7 +10,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchProjects.searchUtils.status]" [type]="'projects'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchProjects.searchUtils.totalResults > 0">
+        <div *ngIf="fetchProjects.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchProjects.searchUtils.totalResults > 10">
                 <a  [queryParams]="paramsForSearchLink"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects" class="uk-button uk-button-text">
diff --git a/landingPages/dataProvider/publicationsTab.component.ts b/landingPages/dataProvider/publicationsTab.component.ts
index b7c18fa4..ea7d4b4b 100644
--- a/landingPages/dataProvider/publicationsTab.component.ts
+++ b/landingPages/dataProvider/publicationsTab.component.ts
@@ -9,7 +9,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchPublications.searchUtils.totalResults > 0">
+        <div *ngIf="fetchPublications.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults > 10">
                 <a  [queryParams]="paramsForSearchLink"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
diff --git a/landingPages/dataProvider/softwareTab.component.ts b/landingPages/dataProvider/softwareTab.component.ts
index fc1ccc87..96602160 100644
--- a/landingPages/dataProvider/softwareTab.component.ts
+++ b/landingPages/dataProvider/softwareTab.component.ts
@@ -9,7 +9,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchSoftware.searchUtils.status]" [type]="'software'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchSoftware.searchUtils.totalResults > 0">
+        <div *ngIf="fetchSoftware.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchSoftware.searchUtils.totalResults > 10" >
                 <a  [queryParams]="paramsForSearchLink"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchSoftware" class="uk-button uk-button-text">
diff --git a/landingPages/dataProvider/statisticsTab.component.ts b/landingPages/dataProvider/statisticsTab.component.ts
index 3cf66e20..d858defe 100644
--- a/landingPages/dataProvider/statisticsTab.component.ts
+++ b/landingPages/dataProvider/statisticsTab.component.ts
@@ -9,7 +9,7 @@ import { ErrorCodes} from '../../utils/properties/errorCodes';
     <div *ngIf="show">
       <errorMessages [status]="[searchPublicationsComponent.searchUtils.status, DatasetsComponent.searchUtils.status]" [type]="'statistics'" tab_error_class=true></errorMessages>
 
-      <div *ngIf="searchPublicationsComponent.searchUtils.totalResults != 0 || searchDatasetsComponent.searchUtils.totalResults != 0">
+      <div *ngIf="searchPublicationsComponent.searchUtils.status == errorCodes.DONE || searchDatasetsComponent.searchUtils.status == errorCodes.DONE">
         <p class="uk-text-bold">Latest Documents Timeline</p>
         <i-frame  [url]=docsTimelineUrl width="800" height="350"></i-frame>
         <p class="uk-text-bold">Documents Types</p>
diff --git a/landingPages/landing-utils/metrics.component.ts b/landingPages/landing-utils/metrics.component.ts
index 5df3bdbb..6c74785b 100644
--- a/landingPages/landing-utils/metrics.component.ts
+++ b/landingPages/landing-utils/metrics.component.ts
@@ -75,7 +75,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     </div>
     <div *ngIf="shortView">
       <dl *ngIf="metrics" class="uk-description-list-line">
-        <dt class="title">Other Metrics</dt>
+        <dt class="title">Metrics</dt>
         <dd class="line" >
           {{metrics.pageViews | number}} views in OpenAIRE
         </dd>
diff --git a/landingPages/landing-utils/searchingProjectsInTab.component.ts b/landingPages/landing-utils/searchingProjectsInTab.component.ts
index fa830249..52acd2d6 100644
--- a/landingPages/landing-utils/searchingProjectsInTab.component.ts
+++ b/landingPages/landing-utils/searchingProjectsInTab.component.ts
@@ -14,7 +14,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
     template: `
         <errorMessages [status]="[fetchProjects.searchUtils.status]" [type]="'projects'" tab_error_class=true></errorMessages>
 
-        <div *ngIf="fetchProjects.searchUtils.totalResults > 0">
+        <div *ngIf="fetchProjects.searchUtils.status == errorCodes.DONE">
             <div class = "uk-text-right" *ngIf = "fetchProjects.searchUtils.totalResultsNoFilters > 10">
                 <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
                     routerLinkActive="router-link-active" [routerLink]="linkToSearchProjects" class="uk-button uk-button-text">
diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html
index ac50a3a0..393369e8 100644
--- a/landingPages/organization/organization.component.html
+++ b/landingPages/organization/organization.component.html
@@ -26,7 +26,7 @@
                    <div class="uk-accordion-content">
                      <errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
 
-                     <div *ngIf="fetchPublications.searchUtils.totalResults > 0">
+                     <div *ngIf="fetchPublications.searchUtils.status == errorCodes.DONE">
                          <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults > 10">
                              <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
                                  routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
@@ -63,7 +63,7 @@
                      <div class="uk-accordion-content">
                        <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'" tab_error_class=true></errorMessages>
 
-                       <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
+                       <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.DONE">
 
                            <div class = "uk-text-right" *ngIf = "fetchDataproviders.searchUtils.totalResults > 10">
                                <a  [queryParams]="routerHelper.createQueryParams(['organization', 'or'], [organizationId, 'and'])"
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 0d51cc3e..46d56a8c 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -90,7 +90,7 @@
                    <div class="uk-accordion-content">
                      <errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
 
-                     <div *ngIf="fetchPublications.searchUtils.totalResults > 0">
+                     <div *ngIf="fetchPublications.searchUtils.status == errorCodes.DONE">
                          <div class = "uk-text-right" *ngIf = "fetchPublications.searchUtils.totalResults > 10" >
                              <a  [queryParams]="routerHelper.createQueryParams(['project', 'pr'], [projectId, 'and'])"
                                  routerLinkActive="router-link-active" [routerLink]="linkToSearchPublications" class="uk-button uk-button-text">
@@ -115,7 +115,7 @@
                     <div class="uk-accordion-content">
                       <errorMessages [status]="[fetchDatasets.searchUtils.status]" [type]="'research data'" tab_error_class=true></errorMessages>
 
-                      <div *ngIf="fetchDatasets.searchUtils.totalResults > 0">
+                      <div *ngIf="fetchDatasets.searchUtils.status == errorCodes.DONE">
 
                           <div class = "uk-text-right" *ngIf = "fetchDatasets.searchUtils.totalResults > 10">
                               <a [queryParams]="routerHelper.createQueryParams(['project', 'pr'], [projectId, 'and'])"
@@ -141,7 +141,7 @@
                      <div class="uk-accordion-content">
                        <errorMessages [status]="[fetchSoftware.searchUtils.status]" [type]="'software'" tab_error_class=true></errorMessages>
 
-                       <div *ngIf="fetchSoftware.searchUtils.totalResults > 0">
+                       <div *ngIf="fetchSoftware.searchUtils.status == errorCodes.DONE">
 
                            <div class = "uk-text-right" *ngIf = "fetchSoftware.searchUtils.totalResults > 10">
                                <a [queryParams]="routerHelper.createQueryParams(['project', 'pr'], [projectId, 'and'])"
@@ -164,7 +164,7 @@
                    <div class="uk-accordion-content">
                      <errorMessages [status]="[fetchPublications.searchUtils.status, fetchDatasets.searchUtils.status]" [type]="'statistics'" tab_error_class=true></errorMessages>
 
-                     <div *ngIf="statsClicked && (fetchPublications.searchUtils.totalResults != 0 || fetchDatasets.searchUtils.totalResults != 0)">
+                     <div *ngIf="statsClicked && (fetchPublications.searchUtils.status == errorCodes.DONE || fetchDatasets.searchUtils.status == errorCodes.DONE)">
 
                          <div>
                            <p class="uk-text-bold">Research Results</p>