From 8e5f134bea29e23ecb7eb48abc3abfc6ee6d6b97 Mon Sep 17 00:00:00 2001
From: Olli Mannevaara <olli.mannevaara@identio.fi>
Date: Thu, 29 Feb 2024 15:49:49 +0200
Subject: [PATCH] Hide unknown or missing values from being filter values

---
 .../publications2.component.html              | 13 +++++++++++-
 .../publications2/publications2.component.ts  | 20 +++++++++++++++++--
 .../components/results/results.component.html |  8 +++-----
 .../search-bar2/search-bar2.component.html    |  7 ++++++-
 .../search-bar2/search-bar2.component.ts      |  3 +++
 src/i18n/messages.en.xlf                      |  8 ++++++++
 src/i18n/messages.sv.xlf                      |  8 ++++++++
 src/i18n/messages.xlf                         |  7 +++++++
 8 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/app/portal/components/results/publications2/publications2.component.html b/src/app/portal/components/results/publications2/publications2.component.html
index f16cfa089..3eaa02afb 100644
--- a/src/app/portal/components/results/publications2/publications2.component.html
+++ b/src/app/portal/components/results/publications2/publications2.component.html
@@ -565,7 +565,12 @@ <h2>Julkaisut - {{total$ | async}}</h2>
 
         tulosta / sivu
 
-        <a href='#'>Mitä julkaisutietoja palvelu sisältää?</a>
+        <a [routerLink]='["/service-info"]' fragment='service-info2'>
+          <ng-container i18n="@@publication2.contentInfo">
+            Mitä julkaisutietoja palvelu sisältää?
+          </ng-container>
+        </a>
+
       </div>
     </div>
   </div>
@@ -783,6 +788,12 @@ <h2>Julkaisut - {{total$ | async}}</h2>
           </ng-container>
         </ng-container>
 
+        <!-- make "pill" for running clearFilters -->
+        <div style='display: inline-flex; align-items: center; background-color: white; border: 2px solid #4546b9; padding: 7px 3px; border-radius: 4px; cursor: pointer; font-weight: bold; margin: 4px' (click)='clearFilters()'>
+          <div style='font-size: 0.8rem; padding-left: 8px'>Tyhjennä rajaukset</div>
+          <i class='fa fa-times' style='padding-left: 7px; padding-right: 8px' aria-hidden='true'></i>
+        </div>
+
       </div>
     </ng-container>
   </div>
diff --git a/src/app/portal/components/results/publications2/publications2.component.ts b/src/app/portal/components/results/publications2/publications2.component.ts
index 812984f38..36141aa83 100644
--- a/src/app/portal/components/results/publications2/publications2.component.ts
+++ b/src/app/portal/components/results/publications2/publications2.component.ts
@@ -23,7 +23,7 @@ import {
   HighlightedPublication,
   Publication2Service, SearchParams
 } from '@portal/services/publication2.service';
-import { map, take, tap } from 'rxjs/operators';
+import { filter, map, take, tap } from 'rxjs/operators';
 import { SharedModule } from '@shared/shared.module';
 import { SearchBar2Component } from '@portal/search-bar2/search-bar2.component';
 import { NgArrayPipesModule, NgMathPipesModule } from 'ngx-pipes';
@@ -127,6 +127,17 @@ export class Publications2Component implements OnDestroy {
     this.filterCount$.next(count);
   }
 
+  clearFilters() {
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: {
+        q: this.keywords,
+        page: this.page.toString(),
+        size: this.size.toString(),
+      }
+    });
+  }
+
   displayedColumns: string[] = ['icon', 'publicationName', 'authorsText', 'publisherName', 'publicationYear'];
 
   highlights$ = this.publications2Service.getSearch(); // TODO: /*: Observable<HighlightedPublication[]>*/
@@ -192,6 +203,7 @@ export class Publications2Component implements OnDestroy {
 
   publicationFormatAdditions$ = this.aggregations$.pipe(
     map(aggs => getPublicationFormatAdditions(aggs).map((bucket: any) => ({ id: bucket.key, count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.filter(publicationFormatAddition => publicationFormatAddition.id !== "-1")),
     map(aggs => aggs.sort((a, b) => b.count - a.count))
   );
 
@@ -209,6 +221,7 @@ export class Publications2Component implements OnDestroy {
 
   publicationAudienceAdditions$ = this.aggregations$.pipe(
     map(aggs => getPublicationAudienceAdditions(aggs).map((bucket: any) => ({ id: bucket.key, count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.filter(publicationAudienceAddition => publicationAudienceAddition.id !== "-1")),
     map(aggs => aggs.sort((a, b) => b.count - a.count))
   );
 
@@ -224,7 +237,8 @@ export class Publications2Component implements OnDestroy {
 
   peerReviewedAdditions$ = this.aggregations$.pipe(
     map(aggs => getPeerReviewedAdditions(aggs).map((bucket: any) => ({ id: bucket.key, count: bucket.doc_count })) ?? []),
-    map(aggs => aggs.sort((a, b) => b.count - a.count))
+    map(aggs => aggs.filter(peerReviewedAddition => ![' ', '-1'].includes(peerReviewedAddition.id))),
+    map(aggs => aggs.sort((a, b) => b.count - a.count)),
   );
 
   peerReviewedNames$ = this.publications2Service.getPeerReviewedNames();
@@ -241,11 +255,13 @@ export class Publications2Component implements OnDestroy {
 
   parentPublicationTypeAdditions$ = this.aggregations$.pipe(
     map(aggs => getParentPublicationTypeAdditions(aggs).map((bucket: any) => ({ id: bucket.key, count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.filter(parentPublicationTypeAddition => parentPublicationTypeAddition.id !== "-1")),
     map(aggs => aggs.sort((a, b) => b.count - a.count))
   );
 
   publisherInternationalityAdditions$ = this.aggregations$.pipe(
     map(aggs => getPublisherInternationalityAdditions(aggs).map((bucket: any) => ({ id: bucket.key.toString(), count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.filter(internationalPublicationAddition => internationalPublicationAddition.id !== "9")),
     map(aggs => aggs.sort((a, b) => b.count - a.count))
   );
 
diff --git a/src/app/portal/components/results/results.component.html b/src/app/portal/components/results/results.component.html
index db7509bfd..2e9d583da 100644
--- a/src/app/portal/components/results/results.component.html
+++ b/src/app/portal/components/results/results.component.html
@@ -189,11 +189,9 @@ <h1 #srHeader aria-live="polite" class="sr-only"></h1>
               Mitä rahoitushakutietoja palvelu sisältää?
             </ng-container>
 
-              <ng-container *ngIf="selectedTabData.singular !== 'Rahoitushaku'" i18n="@@resultInfo1">Mitä</ng-container
-              ><span *ngIf="selectedTabData.singular !== 'Rahoitushaku'"> {{ selectedTabData?.singular.toLowerCase() }}</span>
-              <ng-container *ngIf="selectedTabData.singular !== 'Rahoitushaku'" i18n="@@resultInfo2"
-                >tietoja palvelu sisältää?</ng-container
-              >
+              <ng-container *ngIf="selectedTabData.singular !== 'Rahoitushaku'" i18n="@@resultInfo1">Mitä</ng-container>
+                      <span *ngIf="selectedTabData.singular !== 'Rahoitushaku'"> {{ selectedTabData?.singular.toLowerCase() }}</span>
+              <ng-container *ngIf="selectedTabData.singular !== 'Rahoitushaku'" i18n="@@resultInfo2">tietoja palvelu sisältää?</ng-container>
             </strong>
           </a>
         </div>
diff --git a/src/app/portal/search-bar2/search-bar2.component.html b/src/app/portal/search-bar2/search-bar2.component.html
index bf4830832..a48acaffc 100644
--- a/src/app/portal/search-bar2/search-bar2.component.html
+++ b/src/app/portal/search-bar2/search-bar2.component.html
@@ -21,7 +21,12 @@
     tabindex='0'
   />
 
-  <button matRipple style='display:flex; justify-content: center; align-items: center; background-color: white; height: 55px; width: 115px; margin-right: 8px' (click)='search.emit(keywords)'>
+  <button matRipple style='display: flex; justify-content: center; align-items: center; background-color: white; height: 55px; width: 115px; margin-right: 8px' (click)='search.emit(keywords)'>
     Hae
   </button>
+
+  <div matRipple i18n='@@searchHelpButton' style='cursor: pointer; user-select: none; color: white; font-size: 14px; padding: 0 1rem; display: flex; justify-content: center; align-items: center; margin-right: 8px' (click)='instructions.emit()'>
+    Hakuohje
+    <i class='fas fa-chevron-down' style='margin-left: 0.5rem'></i>
+  </div>
 </div>
diff --git a/src/app/portal/search-bar2/search-bar2.component.ts b/src/app/portal/search-bar2/search-bar2.component.ts
index 3df1cfd4b..d1e21a992 100644
--- a/src/app/portal/search-bar2/search-bar2.component.ts
+++ b/src/app/portal/search-bar2/search-bar2.component.ts
@@ -22,6 +22,9 @@ export class SearchBar2Component {
   // search is pressed output
   @Output() search = new EventEmitter<string>();
 
+  // instruction button is pressed output
+  @Output() instructions = new EventEmitter<void>();
+
   public keywords = this.route.snapshot.queryParams.q ?? "";
 
   searchKeywords(keywords: string) {
diff --git a/src/i18n/messages.en.xlf b/src/i18n/messages.en.xlf
index 6279b2053..2b6dddb66 100644
--- a/src/i18n/messages.en.xlf
+++ b/src/i18n/messages.en.xlf
@@ -6730,6 +6730,14 @@
         <source>Haettaessa ISSN:ä: issn:"1234-1234"</source>
         <target>When searching for ISSN: issn:"1234-1234"</target>
       </trans-unit>
+
+
+
+      <trans-unit id="publication2.contentInfo">
+        <source>Mitä julkaisutietoja palvelu sisältää?</source>
+        <target>What publication information is included in the service?</target>
+      </trans-unit>
+
     </body>
   </file>
 </xliff>
diff --git a/src/i18n/messages.sv.xlf b/src/i18n/messages.sv.xlf
index 0b1f889f8..3a02d2038 100644
--- a/src/i18n/messages.sv.xlf
+++ b/src/i18n/messages.sv.xlf
@@ -6735,6 +6735,14 @@ uppgifter till datalagret för forskningsinformation. De gemensamma personuppgif
         <source>Haettaessa ISSN:ä: issn:"1234-1234"</source>
         <target>När du söker efter ISSN: issn:"1234-1234"</target>
       </trans-unit>
+
+
+
+      <trans-unit id="publication2.contentInfo">
+        <source>Mitä julkaisutietoja palvelu sisältää?</source>
+        <target>Vilka publikationsuppgifter finns i tjänsten?</target>
+      </trans-unit>
+
     </body>
   </file>
 </xliff>
diff --git a/src/i18n/messages.xlf b/src/i18n/messages.xlf
index 611fe5be4..13c6f859a 100644
--- a/src/i18n/messages.xlf
+++ b/src/i18n/messages.xlf
@@ -2726,6 +2726,13 @@
       <trans-unit id="publication2.tutorial.8">
         <source>Haettaessa ISSN:ä: issn:"1234-1234"</source>
       </trans-unit>
+
+
+
+      <trans-unit id="publication2.contentInfo">
+        <source>Mitä julkaisutietoja palvelu sisältää?</source>
+      </trans-unit>
+
     </body>
   </file>
 </xliff>