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 @@
Julkaisut - {{total$ | async}}
tulosta / sivu
- Mitä julkaisutietoja palvelu sisältää?
+
+
+ Mitä julkaisutietoja palvelu sisältää?
+
+
+
@@ -783,6 +788,12 @@ Julkaisut - {{total$ | async}}
+
+
+
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*/
@@ -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 @@
Mitä rahoitushakutietoja palvelu sisältää?
- Mitä {{ selectedTabData?.singular.toLowerCase() }}
- tietoja palvelu sisältää?
+ Mitä
+ {{ selectedTabData?.singular.toLowerCase() }}
+ tietoja palvelu sisältää?
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'
/>
-