Proof of concept without "global" aggregations

CSCfi · Jan 22, 2024 · aedb85a · aedb85a
1 parent 892ffd2
commit aedb85a
Show file tree

Hide file tree

Showing 3 changed files with 694 additions and 61 deletions.
diff --git a/src/app/portal/components/results/publications2/publications2.component.html b/src/app/portal/components/results/publications2/publications2.component.html
@@ -442,6 +442,45 @@ <h3 style='font-size: 1.4rem; margin: 0'>Rajaa hakua</h3>
           </app-collapsible>
         </div>
 
+        <!-- TODO DELETE -->
+        <div style='margin: 1rem'></div>
+
+        <div>
+          <app-collapsible [label]='labelText.publisherOpenAccess' hasTooltip='true'>
+            <ng-container tooltip>
+              TODO
+            </ng-container>
+
+            <ng-container *ngFor='let publisherOpenAccessFilter of publisherOpenAccessFilters$ | async'>
+              <app-filter-option [label]='publisherOpenAccessFilter.name'
+                                 [count]='publisherOpenAccessFilter.count'
+                                 [value]='publisherOpenAccessFilter.enabled'
+                                 (valueChange)='toggleParam("publisherOpenAccessCode", publisherOpenAccessFilter.id)'>
+              </app-filter-option>
+            </ng-container>
+          </app-collapsible>
+        </div>
+
+        <!-- TODO DELETE -->
+        <div style='margin: 1rem'></div>
+
+        <!-- selfArchive -->
+        <div>
+          <app-collapsible [label]='labelText.selfArchivedCode' hasTooltip='true'>
+            <ng-container tooltip>
+              TODO
+            </ng-container>
+
+            <ng-container *ngFor='let selfArchiveFilter of selfArchivedCodeFilters$ | async'>
+              <app-filter-option [label]='selfArchiveFilter.name'
+                                 [count]='selfArchiveFilter.count'
+                                 [value]='selfArchiveFilter.enabled'
+                                 (valueChange)='toggleParam("selfArchive", selfArchiveFilter.id)'>
+              </app-filter-option>
+            </ng-container>
+          </app-collapsible>
+        </div>
+
       </div>
     </div>
 

diff --git a/src/app/portal/components/results/publications2/publications2.component.ts b/src/app/portal/components/results/publications2/publications2.component.ts
@@ -15,7 +15,7 @@ import {
   getPublicationFormatAdditions, getPublicationTypeCodeAdditions,
   getYearAdditions,
   HighlightedPublication,
-  Publication2Service, getOpenAccessAdditions
+  Publication2Service, getOpenAccessAdditions, getPublisherOpenAccessCodeAdditions, getSelfArchivedCodeAdditions
 } from '@portal/services/publication2.service';
 import { map, take, tap } from 'rxjs/operators';
 import { SharedModule } from '@shared/shared.module';
@@ -64,7 +64,11 @@ export class Publications2Component implements OnDestroy {
     publisherInternationality: $localize`:@@publisherInternationality:Kustantajan kansainvälisyys`,
     language: $localize`:@@language:Kieli`,
     jufoLevel: $localize`:@@jufoLevel:Julkaisufoorumitaso`,
+
+    // TODO: tarkista vielä nämä
     openAccess: $localize`:@@openAccess:Avoin saatavuus`,
+    publisherOpenAccess: $localize`:@@publisherOpenAccess:Avoin saatavuus kustantajan palvelussa`,
+    selfArchivedCode: $localize`:@@selfArchivedCode:selfArchivedCode TODO`,
   }
 
   publicationTypeLabels = [
@@ -313,8 +317,6 @@ export class Publications2Component implements OnDestroy {
     tap(filters => this.updateFilterCount("parentPublicationType", filters.filter(filter => filter.enabled).length))
   );
 
-  // TODO: OPEN ACCESS FILTER
-
   additionsFromOpenAccess$ = this.aggregations$.pipe(
     map(aggs => getOpenAccessAdditions(aggs).map((bucket: any) => ({ id: bucket.key.toString(), count: bucket.doc_count })) ?? []),
     map(aggs => aggs.sort((a, b) => b.count - a.count))
@@ -324,13 +326,43 @@ export class Publications2Component implements OnDestroy {
     map(([additionsFromOpenAccess, enabledFilters]) => additionsFromOpenAccess.map(additionFromOpenAccess => ({
       id: additionFromOpenAccess.id,
       count: additionFromOpenAccess.count,
-      name: additionFromOpenAccess.id,                                // TODO TODO TODO TODO
+      name: additionFromOpenAccess.id,                                                                                  // TODO TODO TODO TODO
       enabled: enabledFilters.includes(additionFromOpenAccess.id)
     }))),
     tap(filters => this.updateFilterCount("openAccess", filters.filter(filter => filter.enabled).length))
   );
 
+  additionsFromPublisherOpenAccess$ = this.aggregations$.pipe(
+    map(aggs => getPublisherOpenAccessCodeAdditions(aggs).map((bucket: any) => ({ id: bucket.key.toString(), count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.sort((a, b) => b.count - a.count))
+  );
+
+  publisherOpenAccessFilters$ = combineLatest([this.additionsFromPublisherOpenAccess$, this.searchParams$.pipe(map(params => params.publisherOpenAccessCode ?? []))]).pipe(
+    map(([additionsFromPublisherOpenAccess, enabledFilters]) => additionsFromPublisherOpenAccess.map(additionFromPublisherOpenAccess => ({
+      id: additionFromPublisherOpenAccess.id,
+      count: additionFromPublisherOpenAccess.count,
+      name: additionFromPublisherOpenAccess.id,                                                                         // TODO TODO TODO TODO
+      enabled: enabledFilters.includes(additionFromPublisherOpenAccess.id)
+    }))),
+    tap(filters => this.updateFilterCount("publisherOpenAccess", filters.filter(filter => filter.enabled).length))
+  );
 
+  // TODO selfArchiveCode
+
+  additionsFromSelfArchivedCode$ = this.aggregations$.pipe(
+    map(aggs => getSelfArchivedCodeAdditions(aggs).map((bucket: any) => ({ id: bucket.key.toString(), count: bucket.doc_count })) ?? []),
+    map(aggs => aggs.sort((a, b) => b.count - a.count))
+  );
+
+  selfArchivedCodeFilters$ = combineLatest([this.additionsFromSelfArchivedCode$, this.searchParams$.pipe(map(params => params.selfArchiveCode ?? []))]).pipe(
+    map(([additionsFromSelfArchive, enabledFilters]) => additionsFromSelfArchive.map(additionFromSelfArchive => ({
+      id: additionFromSelfArchive.id,
+      count: additionFromSelfArchive.count,
+      name: additionFromSelfArchive.id,                                                                         // TODO TODO TODO TODO
+      enabled: enabledFilters.includes(additionFromSelfArchive.id)
+    }))),
+    tap(filters => this.updateFilterCount("selfArchiveCode", filters.filter(filter => filter.enabled).length))
+  );
 
   public mainFieldOfScienceName = {
     "1": $localize`:@@naturalSciences:Luonnontieteet`,