Merge branch 'main' into release

griffithlab · Nov 5, 2024 · 0a70e6d · 0a70e6d
2 parents 5ddbe35 + c1a6161
commit 0a70e6d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.ts b/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.ts
@@ -121,7 +121,7 @@ export class CvcPhenotypesTableComponent implements OnInit {
 
     // entity relay connection
     this.connection$ = this.result$.pipe(
-      pluck('data', 'phenotypes'),
+      pluck('data', 'browsePhenotypes'),
       filter(isNonNulled)
     ) as Observable<BrowsePhenotypeConnection>
 
@@ -195,7 +195,10 @@ export class CvcPhenotypesTableComponent implements OnInit {
     this.cdr.detectChanges()
   }
 
-  trackByIndex(_: number, data: Maybe<PhenotypeBrowseTableRowFieldsFragment>): Maybe<number> {
+  trackByIndex(
+    _: number,
+    data: Maybe<PhenotypeBrowseTableRowFieldsFragment>
+  ): Maybe<number> {
     return data?.id
   }
 }
diff --git a/client/src/app/components/therapies/therapies-table/therapies-table.component.ts b/client/src/app/components/therapies/therapies-table/therapies-table.component.ts
@@ -122,7 +122,7 @@ export class CvcTherapiesTableComponent implements OnInit {
     ) // skip 1st true/false sequence
 
     this.connection$ = this.result$.pipe(
-      pluck('data', 'therapies'),
+      pluck('data', 'browseTherapies'),
       filter(isNonNulled)
     ) as Observable<BrowseTherapyConnection>
 

diff --git a/client/src/app/graphql/graphql.type-policies.ts b/client/src/app/graphql/graphql.type-policies.ts
@@ -73,7 +73,12 @@ export const CvcTypePolicies: StrictTypedTypePolicies = {
         'status',
         'submitterId',
       ]),
-      browseDiseases: relayStylePagination(['name', 'doid', 'geneNames', 'id']),
+      browseTherapies: relayStylePagination([
+        'name',
+        'ncitId',
+        'therapyAlias',
+        'sortBy',
+      ]),
       events: relayStylePagination([
         'subject',
         'organizationId',
@@ -141,8 +146,15 @@ export const CvcTypePolicies: StrictTypedTypePolicies = {
         'resolvingUserId',
         'state',
       ]),
-      phenotypes: relayStylePagination(['hpoId', 'name', 'id']),
+      browsePhenotypes: relayStylePagination(['hpoId', 'name', 'sortBy']),
       variantTypes: relayStylePagination(['soid', 'name', 'id']),
+      browseDiseases: relayStylePagination([
+        'name',
+        'doid',
+        'diseaseAlias',
+        'featureName',
+        'sortBy',
+      ]),
       therapies: relayStylePagination(['ncitId', 'name', 'id']),
       clinicalTrials: relayStylePagination(['nctId', 'name', 'id']),
       notifications: relayStylePagination([