Merge branch 'main' into activity-feed-v3

client/src/app/components/molecular-profiles/molecular-profile-fusion-variant-card/molecular-profile-fusion-variant-card.component.html

@@ -14,19 +14,25 @@
     <nz-row [nzGutter]="[8, 16]">
       <nz-col [nzSpan]="24">
         <nz-row [nzGutter]="[8, 8]">
-          <!-- gene attributes block -->
+          <!-- fusion variant attributes block -->
           <nz-col nzSpan="24">
             <nz-descriptions
               nzLayout="horizontal"
               nzSize="small"
               [nzColumn]="4"
               nzBordered="true">
               <nz-descriptions-item
-                [nzSpan]="4"
+                [nzSpan]="2"
                 nzTitle="Fusion Variant">
                 <cvc-feature-variant-tag
                   [variant]="variant"></cvc-feature-variant-tag>
               </nz-descriptions-item>
+              <!-- VICC compliant name -->
+              <nz-descriptions-item
+                [nzSpan]="2"
+                nzTitle="VICC Compliant Name">
+                {{ variant.viccCompliantName }}
+              </nz-descriptions-item>
               <!-- aliases -->
               <nz-descriptions-item
                 [nzSpan]="2"

client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html

@@ -71,7 +71,8 @@
             nzLayout="vertical"
             nzSize="small"
             [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-            nzBordered="true">
+            nzBordered="true"
+            *ngIf="variant.creationActivity || variant.deprecationActivity">
             <!-- creation/deprecation curation events -->
             <ng-container *ngIf="variant.creationActivity">
               <nz-descriptions-item [nzTitle]="createdTitle">

client/src/app/components/variants/fusion-variant-summary/fusion-variant-summary.page.html

@@ -71,7 +71,8 @@
             nzLayout="vertical"
             nzSize="small"
             [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-            nzBordered="true">
+            nzBordered="true"
+            *ngIf="variant.creationActivity || variant.deprecationActivity">
             <!-- creation/deprecation curation events -->
             <ng-container *ngIf="variant.creationActivity">
               <nz-descriptions-item [nzTitle]="createdTitle">

client/src/app/components/variants/gene-variant-summary/gene-variant-summary.page.html

@@ -119,7 +119,8 @@
             nzLayout="vertical"
             nzSize="small"
             [nzColumn]="{ xxl: 2, xl: 2, lg: 1, md: 1, sm: 1, xs: 1 }"
-            nzBordered="true">
+            nzBordered="true"
+            *ngIf="variant.creationActivity || variant.deprecationActivity">
             <!-- creation/deprecation curation events -->
             <ng-container *ngIf="variant.creationActivity">
               <nz-descriptions-item [nzTitle]="createdTitle">

client/src/app/components/variants/variant-popover/variant-popover.component.html

@@ -23,6 +23,13 @@
         nzSize="small"
         [nzColumn]="2"
         nzBordered="true">
+        <!-- VICC compliant name -->
+        <nz-descriptions-item
+          nzTitle="VICC compliant name"
+          nzSpan="2"
+          *ngIf="variant.__typename == 'FusionVariant'">
+          {{ variant.viccCompliantName }}
+        </nz-descriptions-item>
         <!-- aliases -->
         <nz-descriptions-item
           nzTitle="Aliases"

client/src/app/components/variants/variant-popover/variant-popover.query.gql

@@ -11,6 +11,9 @@ fragment variantPopoverFields on VariantInterface {
   ... on GeneVariant {
     alleleRegistryId
   }
+  ... on FusionVariant {
+    viccCompliantName
+  }
   feature {
     id
     name

client/src/app/generated/civic.apollo-helpers.ts

@@ -1825,7 +1825,7 @@ export type PhenotypePopoverFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	url?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'factors' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'fusions' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'variantsTypeahead' | 'viewer' | QueryKeySpecifier)[];
+export type QueryKeySpecifier = ('acmgCode' | 'acmgCodesTypeahead' | 'activities' | 'activity' | 'assertion' | 'assertions' | 'browseDiseases' | 'browseFeatures' | 'browseMolecularProfiles' | 'browseSources' | 'browseVariantGroups' | 'browseVariants' | 'clingenCode' | 'clingenCodesTypeahead' | 'clinicalTrial' | 'clinicalTrials' | 'comment' | 'comments' | 'contributors' | 'countries' | 'dataReleases' | 'disease' | 'diseasePopover' | 'diseaseTypeahead' | 'entityTypeahead' | 'events' | 'evidenceItem' | 'evidenceItems' | 'factor' | 'factors' | 'feature' | 'featureTypeahead' | 'flag' | 'flags' | 'fusion' | 'fusions' | 'gene' | 'genes' | 'molecularProfile' | 'molecularProfiles' | 'nccnGuideline' | 'nccnGuidelinesTypeahead' | 'notifications' | 'organization' | 'organizationLeaderboards' | 'organizations' | 'phenotype' | 'phenotypePopover' | 'phenotypeTypeahead' | 'phenotypes' | 'previewCommentText' | 'previewMolecularProfileName' | 'remoteCitation' | 'revision' | 'revisions' | 'search' | 'searchByPermalink' | 'searchGenes' | 'source' | 'sourcePopover' | 'sourceSuggestionValues' | 'sourceSuggestions' | 'sourceTypeahead' | 'subscriptionForEntity' | 'therapies' | 'therapy' | 'therapyPopover' | 'therapyTypeahead' | 'timepointStats' | 'user' | 'userLeaderboards' | 'userTypeahead' | 'users' | 'validateRevisionsForAcceptance' | 'variant' | 'variantGroup' | 'variantGroups' | 'variantType' | 'variantTypePopover' | 'variantTypeTypeahead' | 'variantTypes' | 'variants' | 'variantsTypeahead' | 'viewer' | QueryKeySpecifier)[];
 export type QueryFieldPolicy = {
 	acmgCode?: FieldPolicy<any> | FieldReadFunction<any>,
 	acmgCodesTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1855,11 +1855,13 @@ export type QueryFieldPolicy = {
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItem?: FieldPolicy<any> | FieldReadFunction<any>,
 	evidenceItems?: FieldPolicy<any> | FieldReadFunction<any>,
+	factor?: FieldPolicy<any> | FieldReadFunction<any>,
 	factors?: FieldPolicy<any> | FieldReadFunction<any>,
 	feature?: FieldPolicy<any> | FieldReadFunction<any>,
 	featureTypeahead?: FieldPolicy<any> | FieldReadFunction<any>,
 	flag?: FieldPolicy<any> | FieldReadFunction<any>,
 	flags?: FieldPolicy<any> | FieldReadFunction<any>,
+	fusion?: FieldPolicy<any> | FieldReadFunction<any>,
 	fusions?: FieldPolicy<any> | FieldReadFunction<any>,
 	gene?: FieldPolicy<any> | FieldReadFunction<any>,
 	genes?: FieldPolicy<any> | FieldReadFunction<any>,

client/src/app/generated/server.model.graphql

@@ -8723,6 +8723,11 @@ type Query {
     variantOrigin: VariantOrigin
   ): EvidenceItemConnection!
 
+  """
+  Find a single gene by CIViC ID or NCIt ID
+  """
+  factor(id: Int, ncitId: String): Factor
+
   """
   List and filter factors.
   """
@@ -8819,6 +8824,11 @@ type Query {
     state: FlagState
   ): FlagConnection!
 
+  """
+  Find a single gene by CIViC ID
+  """
+  fusion(id: Int): Fusion
+
   """
   List and filter fusions.
   """

client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-detail.query.gql

@@ -10,6 +10,13 @@ fragment MolecularProfileDetailFields on MolecularProfile {
   deprecated
   deprecationReason
   complexMolecularProfileDeprecationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
     parsedNote {
       ...parsedCommentFragment
     }

client/src/app/views/molecular-profiles/molecular-profiles-detail/molecular-profiles-summary/molecular-profiles-summary.query.gql

@@ -49,6 +49,9 @@ fragment MolecularProfileSummaryFields on MolecularProfile {
       role
       profileImagePath(size: 32)
     }
+    parsedNote {
+      ...parsedCommentFragment
+    }
   }
 }
 

client/src/app/views/variants/variants-detail/variants-detail.query.gql

@@ -10,6 +10,13 @@ fragment VariantDetailFields on VariantInterface {
   deprecated
   deprecationReason
   deprecationActivity {
+    user {
+      id
+      displayName
+      role
+      profileImagePath(size: 32)
+    }
+    createdAt
     parsedNote {
       ...parsedCommentFragment
     }

client/src/app/views/variants/variants-detail/variants-summary/variants-summary.query.gql

@@ -64,6 +64,9 @@ fragment VariantSummaryFields on VariantInterface {
       profileImagePath(size: 32)
     }
     createdAt
+    parsedNote {
+      ...parsedCommentFragment
+    }
   }
   ... on GeneVariant {
     ... GeneVariantSummaryFields