Merge pull request #1702 from CentreForDigitalHumanities/feature/dedu…

…plicate-corpora Feature/deduplicate corpora
CentreForDigitalHumanities · Nov 21, 2024 · 7280eea · 7280eea
2 parents 7d6d098 + f3c80e1
commit 7280eea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/users/models.py b/backend/users/models.py
@@ -33,7 +33,7 @@ def searchable_corpora(self):
         if self.is_superuser:
             return Corpus.objects.filter(active=True)
 
-        return Corpus.objects.filter(active=True, groups__user=self)
+        return Corpus.objects.filter(active=True, groups__user=self).distinct()
 
 
 class AnoymousProfile(object):

diff --git a/frontend/src/app/services/corpus.service.ts b/frontend/src/app/services/corpus.service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/member-ordering */
 import { Injectable } from '@angular/core';
 
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, lastValueFrom } from 'rxjs';
 
 import {
     Corpus,
@@ -68,7 +68,7 @@ export class CorpusService {
             return this.corporaPromise;
         } else {
             this.corporaPromise = this.apiRetryService
-                .requireLogin((api) => api.corpus().toPromise())
+                .requireLogin((api) => lastValueFrom(api.corpus()))
                 .then((data) => this.parseCorpusList(data));
             return this.corporaPromise;
         }