Merge branch 'features' into staging

client/src/app/components/events/event-timeline-item/event-timeline-item.component.html

@@ -12,7 +12,7 @@
       *ngIf="tagDisplay != 'hideUser'"></cvc-user-tag>
 
     <!-- verb -->
-    <span nz-typography>{{ event.action | eventVerbiage : 'feed' }}&nbsp;</span>
+    <span nz-typography>{{ event.action | eventVerbiage: 'feed' }}&nbsp;</span>
 
     <!-- originating object -->
     <ng-container *ngIf="event.originatingObject as object">
@@ -76,7 +76,10 @@
         *ngSwitchCase="'EvidenceItem'"
         [evidence]="subject"></cvc-evidence-tag>
       <cvc-feature-variant-tag
-        *ngSwitchCase="'Variant'"
+        *ngSwitchCase="'GeneVariant'"
+        [variant]="subject"></cvc-feature-variant-tag>
+      <cvc-feature-variant-tag
+        *ngSwitchCase="'FactorVariant'"
         [variant]="subject"></cvc-feature-variant-tag>
       <cvc-revision-tag
         *ngSwitchCase="'Revision'"

client/src/app/core/pipes/typename-to-icon.pipe.ts

@@ -8,6 +8,9 @@ import { Maybe } from '@app/generated/civic.apollo'
 export class TypenameToIconPipe implements PipeTransform {
   transform(value: Maybe<string>): string {
     if (!value) return ''
+    if (value.endsWith('Variant')) {
+      return 'civic-variant'
+    }
     return `civic-${value.replace(/_/g, '').toLowerCase()}`
   }
 }

client/src/app/core/utilities/get-entity-color.ts

@@ -14,6 +14,8 @@ export const EntityColors = new Map<string, string>([
   ['Source', '#f9ba45'],
   ['Therapy', '#ac3996'],
   ['Variant', '#74d34c'],
+  ['GeneVariant', '#74d34c'],
+  ['FactorVariant', '#74d34c'],
   ['VariantGroup', '#74d34c'],
   ['VariantType', '#74d34c'],
 

client/src/app/forms/types/feature-select/feature-select.type.html

@@ -5,7 +5,7 @@
       <nz-select
         [disabled]="!props.canChangeFeatureType"
         [(ngModel)]="selectedFeatureType"
-        (ngModelChange)="this.onFeatureType$?.next($event)">
+        (ngModelChange)="this.onFeatureType$.next($event)">
         <nz-option
           nzValue="GENE"
           nzLabel="Gene"></nz-option>

client/src/app/forms/types/feature-select/feature-select.type.ts

@@ -32,7 +32,8 @@ import { FormlyFieldProps } from '@ngx-formly/ng-zorro-antd/form-field'
 import { NzSelectOptionInterface } from 'ng-zorro-antd/select'
 import mixin from 'ts-mixin-extended'
 import { FeatureIdWithCreationStatus } from './feature-quick-add/feature-quick-add.form'
-import { BehaviorSubject } from 'rxjs'
+import { BehaviorSubject, Subscription } from 'rxjs'
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'
 
 export type CvcFeatureSelectFieldOption = Partial<
   FieldTypeConfig<Partial<CvcFeatureSelectFieldProps>>
@@ -67,6 +68,7 @@ const FeatureSelectMixin = mixin(
   >()
 )
 
+@UntilDestroy()
 @Component({
   selector: 'cvc-feature-select',
   templateUrl: './feature-select.type.html',
@@ -94,7 +96,7 @@ export class CvcFeatureSelectField
   optionTemplates?: QueryList<TemplateRef<any>>
 
   selectedFeatureType?: FeatureInstanceTypes = this.props.featureType
-  onFeatureType$?: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
+  onFeatureType$: BehaviorSubject<Maybe<FeatureInstanceTypes>> =
     new BehaviorSubject<Maybe<FeatureInstanceTypes>>(undefined)
 
   constructor(
@@ -107,6 +109,12 @@ export class CvcFeatureSelectField
 
   ngAfterViewInit(): void {
     this.selectedFeatureType = this.props.featureType
+    if (this.props.featureTypeCallback) {
+      this.onFeatureType$
+        .pipe(untilDestroyed(this))
+        .subscribe((ft) => this.props.featureTypeCallback(ft))
+      this.onFeatureType$.next(this.selectedFeatureType)
+    }
     this.configureBaseField() // mixin fn
     this.configureEntitySelectField({
       // mixin fn

client/src/app/forms/types/molecular-profile-select/mp-finder/mp-finder.component.ts

@@ -7,14 +7,19 @@ import {
 import { UntypedFormGroup } from '@angular/forms'
 import { EntityFieldSubjectMap } from '@app/forms/states/base.state'
 import { CvcFormRowWrapperProps } from '@app/forms/wrappers/form-row/form-row.wrapper'
-import { MolecularProfile, Variant } from '@app/generated/civic.apollo'
+import {
+  CreateableFeatureTypes,
+  MolecularProfile,
+  Variant,
+} from '@app/generated/civic.apollo'
 import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core'
 import { Apollo, gql } from 'apollo-angular'
 import { Maybe } from 'graphql/jsutils/Maybe'
 import { NzFormLayoutType } from 'ng-zorro-antd/form'
 import { BehaviorSubject } from 'rxjs'
 import { tag } from 'rxjs-spy/operators'
 import { CvcVariantSelectFieldOption } from '../../variant-select/variant-select.type'
+import { EnumToTitlePipe } from '@app/core/pipes/enum-to-title-pipe'
 
 type MpFinderModel = {
   featureId?: number
@@ -40,6 +45,7 @@ export class MpFinderComponent {
   model: MpFinderModel
   form: UntypedFormGroup
   config: FormlyFieldConfig[]
+  featureType?: CreateableFeatureTypes
 
   finderState: MpFinderState = {
     formLayout: 'horizontal',
@@ -76,6 +82,9 @@ export class MpFinderComponent {
               showExtra: false,
               showErrorTip: false,
               required: true,
+              featureTypeCallback: (ft: CreateableFeatureTypes) => {
+                this.featureType = ft
+              },
             },
           },
           <CvcVariantSelectFieldOption>{
@@ -110,10 +119,11 @@ export class MpFinderComponent {
 
   getSelectedVariant(variantId: Maybe<number>): Maybe<Variant> {
     if (!variantId) return
+    const feature = new EnumToTitlePipe().transform(this.featureType)
     const fragment = {
-      id: `Variant:${variantId}`,
+      id: `${feature}Variant:${variantId}`,
       fragment: gql`
-        fragment VariantSelectQuery on Variant {
+        fragment VariantSelectQuery on ${feature}Variant {
           id
           name
           link

client/src/app/forms/types/variant-select/variant-select.query.gql

@@ -14,7 +14,15 @@ query VariantSelectTypeahead($name: String!, $featureId: Int) {
 
 query VariantSelectTag($variantId: Int!) {
   variant(id: $variantId) {
-    ...VariantSelectTypeaheadFields
+    ... on Variant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on GeneVariant {
+      ...VariantSelectTypeaheadFields
+    }
+    ... on FactorVariant {
+      ...VariantSelectTypeaheadFields
+    }
   }
 }
 

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

@@ -2125,6 +2125,19 @@ export type VariantAliasKeySpecifier = ('name' | VariantAliasKeySpecifier)[];
 export type VariantAliasFieldPolicy = {
 	name?: FieldPolicy<any> | FieldReadFunction<any>
 };
+export type VariantConnectionKeySpecifier = ('edges' | 'nodes' | 'pageCount' | 'pageInfo' | 'totalCount' | VariantConnectionKeySpecifier)[];
+export type VariantConnectionFieldPolicy = {
+	edges?: FieldPolicy<any> | FieldReadFunction<any>,
+	nodes?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageCount?: FieldPolicy<any> | FieldReadFunction<any>,
+	pageInfo?: FieldPolicy<any> | FieldReadFunction<any>,
+	totalCount?: FieldPolicy<any> | FieldReadFunction<any>
+};
+export type VariantEdgeKeySpecifier = ('cursor' | 'node' | VariantEdgeKeySpecifier)[];
+export type VariantEdgeFieldPolicy = {
+	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
+	node?: FieldPolicy<any> | FieldReadFunction<any>
+};
 export type VariantGroupKeySpecifier = ('comments' | 'description' | 'events' | 'flagged' | 'flags' | 'id' | 'lastAcceptedRevisionEvent' | 'lastCommentEvent' | 'lastSubmittedRevisionEvent' | 'link' | 'name' | 'revisions' | 'sources' | 'variants' | VariantGroupKeySpecifier)[];
 export type VariantGroupFieldPolicy = {
 	comments?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -3038,6 +3051,14 @@ export type StrictTypedTypePolicies = {
 		keyFields?: false | VariantAliasKeySpecifier | (() => undefined | VariantAliasKeySpecifier),
 		fields?: VariantAliasFieldPolicy,
 	},
+	VariantConnection?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantConnectionKeySpecifier | (() => undefined | VariantConnectionKeySpecifier),
+		fields?: VariantConnectionFieldPolicy,
+	},
+	VariantEdge?: Omit<TypePolicy, "fields" | "keyFields"> & {
+		keyFields?: false | VariantEdgeKeySpecifier | (() => undefined | VariantEdgeKeySpecifier),
+		fields?: VariantEdgeFieldPolicy,
+	},
 	VariantGroup?: Omit<TypePolicy, "fields" | "keyFields"> & {
 		keyFields?: false | VariantGroupKeySpecifier | (() => undefined | VariantGroupKeySpecifier),
 		fields?: VariantGroupFieldPolicy,