Merge pull request #937 from europeana/develop

Merge develop into master

Author: andyjmaclean

projects/sandbox/src/app/_services/debias.service.ts

@@ -1,5 +1,6 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { inject, Injectable, ModelSignal } from '@angular/core';
+import { DestroyRef, inject, Injectable, ModelSignal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Observable, timer } from 'rxjs';
 import { switchMap, takeWhile } from 'rxjs/operators';
 import { apiSettings } from '../../environments/apisettings';
@@ -8,6 +9,7 @@ import { DebiasDereferenceResult, DebiasInfo, DebiasReport, DebiasState } from '
 @Injectable({ providedIn: 'root' })
 export class DebiasService {
   private readonly http = inject(HttpClient);
+  private readonly destroyRef = inject(DestroyRef);
 
   dereferencedSuggestion: string;
 
@@ -29,6 +31,7 @@ export class DebiasService {
         switchMap(() => {
           return this.getDebiasInfo(datasetId);
         }),
+        takeUntilDestroyed(this.destroyRef),
         takeWhile((info: DebiasInfo) => {
           signal.set(info);
           return ![DebiasState.COMPLETED, DebiasState.ERROR].includes(info.state);

projects/sandbox/src/app/dataset-info/dataset-info.component.html

@@ -2,15 +2,15 @@
   <span
     *ngIf="cmpDebias && canOfferDebiasView()"
     class="debias-display"
-    [ngClass]="{ locked: !authenticated() }"
-    [attr.title]="!authenticated() ? 'debias report (log in to enable)' : undefined"
+    [ngClass]="{ locked: !keycloak.authenticated }"
+    [attr.title]="!keycloak.authenticated ? 'debias report (log in to enable)' : undefined"
   >
-    <span class="locked-indicator" *ngIf="!authenticated()"></span>
+    <span class="locked-indicator" *ngIf="!keycloak.authenticated"></span>
 
     <!-- view link -->
     <a
       *ngIf="cmpDebias.debiasReport"
-      [attr.tabindex]="authenticated() ? '0' : null"
+      [attr.tabindex]="keycloak.authenticated ? '0' : null"
       class="debias-opener"
       title="view debias report"
       (click)="runOrShowDebiasReport(false)"
@@ -27,7 +27,8 @@
       </span>
     </a>
 
-    @let canRunDebias = isOwner() && modelDebiasInfo()?.state === DebiasState.READY;
+    @let canRunDebias = isOwner() && (modelDebiasInfo().state === DebiasState.READY) && cmpDebias &&
+    !cmpDebias.debiasReport;
 
     <!-- run link / decoration -->
 
@@ -82,7 +83,11 @@
   #modalDebias
 >
   <ng-container *ngIf="datasetId()">
-    <sb-debias [datasetId]="datasetId()" #cmpDebias></sb-debias>
+    <sb-debias
+      [datasetId]="datasetId()"
+      [(signalDebiasInfo)]="modelDebiasInfo"
+      #cmpDebias
+    ></sb-debias>
   </ng-container>
 </lib-modal>
 

projects/sandbox/src/app/dataset-info/dataset-info.component.spec.ts

@@ -27,7 +27,6 @@ describe('DatasetInfoComponent', () => {
   let fixture: ComponentFixture<DatasetInfoComponent>;
   let modalConfirms: ModalConfirmService;
   let matomo: MatomoService;
-  let keycloak: Keycloak;
   let debias: DebiasService;
 
   const eventKeycloakLoggedOut = ({
@@ -75,10 +74,9 @@ describe('DatasetInfoComponent', () => {
       })
       .compileComponents();
 
-    debias = TestBed.inject(DebiasService);
     modalConfirms = TestBed.inject(ModalConfirmService);
     matomo = TestBed.inject(MatomoService);
-    keycloak = TestBed.inject(Keycloak);
+    debias = TestBed.inject(DebiasService);
   };
 
   const getConfirmResult = (): Observable<boolean> => {
@@ -102,7 +100,7 @@ describe('DatasetInfoComponent', () => {
     it('should pre-authenticate', () => {
       TestBed.flushEffects();
       fixture.detectChanges();
-      expect(component.authenticated()).toBeTruthy();
+      expect(component.keycloakSignal()).toBeTruthy();
     });
 
     it('should initiate polling', fakeAsync(() => {
@@ -123,6 +121,33 @@ describe('DatasetInfoComponent', () => {
 
       expect(component.cmpDebias.pollDebiasReport).toHaveBeenCalled();
     }));
+
+    it('should run the debias report', fakeAsync(() => {
+      fixture.componentRef.setInput('datasetId', '1');
+      fixture.detectChanges();
+      TestBed.flushEffects();
+      tick(1);
+
+      const datasetInfo = component.datasetInfo();
+      expect(datasetInfo).toBeTruthy();
+      if (datasetInfo) {
+        expect(datasetInfo['created-by-id']).toEqual('1234');
+      }
+
+      component.keycloak.idTokenParsed = { sub: '1234' };
+
+      spyOn(debias, 'runDebiasReport').and.callThrough();
+
+      component.runOrShowDebiasReport(true);
+      tick(1);
+      fixture.detectChanges();
+      TestBed.flushEffects();
+      tick(1);
+      expect(debias.runDebiasReport).toHaveBeenCalled();
+      expect(component.isOwner()).toBeTruthy();
+
+      component.keycloak.idTokenParsed = { sub: '' };
+    }));
   });
 
   describe('Not logged in)', () => {
@@ -139,7 +164,6 @@ describe('DatasetInfoComponent', () => {
     it('should create', () => {
       expect(component).toBeTruthy();
       expect(component.datasetInfo()).toBeFalsy();
-      expect(component.authenticated()).toBeFalsy();
     });
 
     it('should track the user viewing the published records', () => {
@@ -254,13 +278,11 @@ describe('DatasetInfoComponent', () => {
       TestBed.flushEffects();
       tick(1);
 
-      component.authenticated.set(true);
-      keycloak.idTokenParsed = { sub: '1234' };
-
-      component.cmpDebias.isBusy = true;
-      tick(1);
-      expect(component.authenticated()).toBeTruthy();
-      TestBed.flushEffects();
+      const datasetInfo = component.datasetInfo();
+      expect(datasetInfo).toBeTruthy();
+      if (datasetInfo) {
+        expect(datasetInfo['created-by-id']).toEqual('1234');
+      }
 
       spyOn(debias, 'runDebiasReport').and.callThrough();
 
@@ -270,68 +292,6 @@ describe('DatasetInfoComponent', () => {
       TestBed.flushEffects();
       tick(1);
       expect(debias.runDebiasReport).not.toHaveBeenCalled();
-
-      component.cmpDebias.isBusy = false;
-
-      component.runOrShowDebiasReport(true);
-      fixture.detectChanges();
-      TestBed.flushEffects();
-      tick(1);
-      expect(debias.runDebiasReport).toHaveBeenCalled();
-
-      component.authenticated.set(false);
-      keycloak.idTokenParsed = { sub: 'tokenUnknown' };
-      component.authenticated.set(true);
-
-      TestBed.flushEffects();
-
-      component.runOrShowDebiasReport(true);
-      fixture.detectChanges();
-      TestBed.flushEffects();
-      tick(1);
-      expect(debias.runDebiasReport).toHaveBeenCalledTimes(1);
-    }));
-
-    it('should show the debias report', fakeAsync(() => {
-      fixture.componentRef.setInput('datasetId', '1');
-      fixture.detectChanges();
-
-      component.authenticated.set(true);
-      keycloak.idTokenParsed = { sub: '1234' };
-
-      spyOn(modalConfirms, 'open').and.callFake(getConfirmResult);
-
-      tick(1);
-      fixture.detectChanges();
-
-      component.runOrShowDebiasReport(false);
-      expect(modalConfirms.open).toHaveBeenCalled();
-    }));
-
-    it('should compute the debias owner', fakeAsync(() => {
-      const tokenOwner = '1234';
-      const tokenNonOwner = '4321';
-
-      fixture.componentRef.setInput('datasetId', '1');
-      keycloak.idTokenParsed = { sub: tokenNonOwner };
-
-      fixture.detectChanges();
-      component.authenticated.set(true);
-      tick(1);
-
-      expect(component.authenticated()).toBeTruthy();
-
-      fixture.detectChanges();
-      TestBed.flushEffects();
-      expect(component.isOwner()).toBeFalsy();
-
-      component.authenticated.set(false);
-      keycloak.idTokenParsed = { sub: tokenOwner };
-      component.authenticated.set(true);
-
-      TestBed.flushEffects();
-
-      expect(component.isOwner()).toBeTruthy();
     }));
   });
 });

projects/sandbox/src/app/dataset-info/dataset-info.component.ts

@@ -18,15 +18,14 @@ import {
   linkedSignal,
   model,
   ModelSignal,
-  signal,
   ViewChild
 } from '@angular/core';
 import { toObservable, toSignal } from '@angular/core/rxjs-interop';
 import { switchMap, tap } from 'rxjs';
 import { take } from 'rxjs/operators';
 
 import Keycloak from 'keycloak-js';
-import { KEYCLOAK_EVENT_SIGNAL, KeycloakEventType } from 'keycloak-angular';
+import { KEYCLOAK_EVENT_SIGNAL } from 'keycloak-angular';
 
 import {
   ClickAwareDirective,
@@ -65,8 +64,8 @@ export class DatasetInfoComponent extends SubscriptionManager {
   private readonly debias = inject(DebiasService);
   private readonly sandbox = inject(SandboxService);
   private readonly matomo = inject(MatomoService);
-  private readonly keycloakSignal = inject(KEYCLOAK_EVENT_SIGNAL);
-  private readonly keycloak = inject(Keycloak);
+
+  readonly keycloakSignal = inject(KEYCLOAK_EVENT_SIGNAL);
 
   public DatasetStatus = DatasetStatus;
   public DebiasState = DebiasState;
@@ -77,6 +76,7 @@ export class DatasetInfoComponent extends SubscriptionManager {
     'top-level-nav'
   ];
 
+  readonly keycloak = inject(Keycloak);
   readonly pushHeight = input(false);
   readonly modalIdPrefix = input('');
   readonly datasetId = input.required<string>();
@@ -85,17 +85,15 @@ export class DatasetInfoComponent extends SubscriptionManager {
   @ViewChild('cmpDebias') cmpDebias: DebiasComponent;
 
   // Top-level signals
-  authenticated = signal(false);
 
   isOwner = computed(() => {
-    let value = false;
-    if (this.authenticated()) {
+    if (this.keycloakSignal()) {
       const info = this.datasetInfo();
       if (info && info['created-by-id'] === this.keycloak.idTokenParsed?.sub) {
-        value = true;
+        return true;
       }
     }
-    return value;
+    return false;
   });
 
   canOfferDebiasView = linkedSignal({
@@ -109,7 +107,7 @@ export class DatasetInfoComponent extends SubscriptionManager {
   });
 
   modelDebiasInfo: ModelSignal<DebiasInfo> = model(({
-    status: DebiasState.INITIAL
+    state: DebiasState.INITIAL
   } as unknown) as DebiasInfo);
 
   datasetInfo = toSignal(
@@ -168,15 +166,6 @@ export class DatasetInfoComponent extends SubscriptionManager {
 
   constructor() {
     super();
-    effect(() => {
-      const keycloakEvent = this.keycloakSignal();
-      if (keycloakEvent.type === KeycloakEventType.Ready) {
-        this.authenticated.set(true);
-      } else {
-        this.authenticated.set(false);
-      }
-    });
-
     effect(() => {
       // close modal and trigger poll for info on dataset id change
       if (this.modalConfirms.isOpen(this.modalIdPrefix() + this.modalIdDebias)) {
@@ -187,13 +176,9 @@ export class DatasetInfoComponent extends SubscriptionManager {
 
     effect(() => {
       // trigger poll for report (to get detections number)
-      if (
-        ![DebiasState.ERROR, DebiasState.INITIAL, DebiasState.READY].includes(
-          this.modelDebiasInfo().state
-        )
-      ) {
+      if ([DebiasState.PROCESSING, DebiasState.COMPLETED].includes(this.modelDebiasInfo().state)) {
         if (this.cmpDebias) {
-          this.cmpDebias.pollDebiasReport(this.modelDebiasInfo);
+          this.cmpDebias.pollDebiasReport();
         }
       }
     });
@@ -268,7 +253,7 @@ export class DatasetInfoComponent extends SubscriptionManager {
     const datasetId = this.datasetId();
     this.subs.push(
       this.debias.runDebiasReport(datasetId).subscribe(() => {
-        this.cmpDebias.pollDebiasReport(this.modelDebiasInfo);
+        this.cmpDebias.pollDebiasReport();
       })
     );
   }
@@ -290,7 +275,6 @@ export class DatasetInfoComponent extends SubscriptionManager {
    **/
   runOrShowDebiasReport(run: boolean, openerRef?: HTMLElement, openViaKeyboard = false): void {
     if (run && !this.isOwner()) {
-      console.log('not allowed to run');
       return;
     }
     if (run) {