From 955e53913edcb85936b29881c91250baa0c31901 Mon Sep 17 00:00:00 2001 From: Adam Coffman Date: Thu, 14 Apr 2022 11:25:54 -0500 Subject: [PATCH 1/6] null is a valid value for ensembl version --- .../app/forms/config/types/ensembl-input/ensembl-input.type.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/forms/config/types/ensembl-input/ensembl-input.type.ts b/client/src/app/forms/config/types/ensembl-input/ensembl-input.type.ts index 7e88f9ff3..e47aa5670 100644 --- a/client/src/app/forms/config/types/ensembl-input/ensembl-input.type.ts +++ b/client/src/app/forms/config/types/ensembl-input/ensembl-input.type.ts @@ -26,7 +26,7 @@ export class EnsemblInputType extends FieldType { export const ensemblVersionValidator: ValidatorOption = { name: 'ensembl-version', validation: (c: AbstractControl, f: FormlyFieldConfig): ValidationErrors | null => { - if (c.value === undefined) { + if (c.value === undefined || c.value === null) { return null; } else { let versionNum = +c.value; From 350118c2d31a3ae3e4ea931c335fb990930641ce Mon Sep 17 00:00:00 2001 From: Susanna Kiwala Date: Fri, 15 Apr 2022 08:27:45 -0500 Subject: [PATCH 2/6] Color accepted evidence/assertion tags green --- client/src/app/core/pipes/color-name-for-status-pipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/core/pipes/color-name-for-status-pipe.ts b/client/src/app/core/pipes/color-name-for-status-pipe.ts index de3b9fd42..56c62aff9 100644 --- a/client/src/app/core/pipes/color-name-for-status-pipe.ts +++ b/client/src/app/core/pipes/color-name-for-status-pipe.ts @@ -10,7 +10,7 @@ export class ColorNameForStatusPipe implements PipeTransform { transform(status: Maybe): string { switch(status) { case(EvidenceStatus.Accepted): - return 'default' + return 'green' case(EvidenceStatus.Rejected): return 'red' case(EvidenceStatus.Submitted): From e69f8f4201cd129c32bb8c5b949dd6501ed37dfa Mon Sep 17 00:00:00 2001 From: Susanna Kiwala Date: Fri, 15 Apr 2022 09:14:48 -0500 Subject: [PATCH 3/6] Fix myvariantinfo empty prompt --- .../variants-detail/variants-summary/variants-summary.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html index 1837a4eaa..961b02057 100644 --- a/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html +++ b/client/src/app/views/variants/variants-detail/variants-summary/variants-summary.page.html @@ -301,7 +301,7 @@ - + From c95629c098b575825bc918b2cacf4b6f3107b2ef Mon Sep 17 00:00:00 2001 From: Susanna Kiwala Date: Fri, 15 Apr 2022 10:00:37 -0500 Subject: [PATCH 4/6] For count table columns, change the default order in which the sorting is executed --- .../assertions-table/assertions-table.component.html | 1 + .../clinical-trials-table.component.html | 2 ++ .../diseases/diseases-table/diseases-table.component.html | 4 ++++ .../components/drugs/drugs-table/drugs-table.component.html | 2 ++ .../evidence/evidence-table/evidence-table.component.html | 1 + .../components/genes/genes-table/genes-table.component.html | 3 +++ .../phenotypes-table/phenotypes-table.component.html | 2 ++ .../sources/sources-table/sources-table.component.html | 1 + .../variant-groups-table/variant-groups-table.component.html | 2 ++ .../variant-types-table/variant-types-table.component.html | 1 + .../variants/variants-table/variants-table.component.html | 3 +++ 11 files changed, 22 insertions(+) diff --git a/client/src/app/components/assertions/assertions-table/assertions-table.component.html b/client/src/app/components/assertions/assertions-table/assertions-table.component.html index 63964c664..9940b1c85 100644 --- a/client/src/app/components/assertions/assertions-table/assertions-table.component.html +++ b/client/src/app/components/assertions/assertions-table/assertions-table.component.html @@ -73,6 +73,7 @@ diff --git a/client/src/app/components/clinical-trials/clinical-trials-table/clinical-trials-table.component.html b/client/src/app/components/clinical-trials/clinical-trials-table/clinical-trials-table.component.html index 62c5043d2..a8a1953c5 100644 --- a/client/src/app/components/clinical-trials/clinical-trials-table/clinical-trials-table.component.html +++ b/client/src/app/components/clinical-trials/clinical-trials-table/clinical-trials-table.component.html @@ -22,6 +22,7 @@ nzRight [nzColumnKey]="sortColumns.SourceCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Source Count"> @@ -30,6 +31,7 @@ nzRight [nzColumnKey]="sortColumns.EvidenceItemCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Evidence Count"> diff --git a/client/src/app/components/diseases/diseases-table/diseases-table.component.html b/client/src/app/components/diseases/diseases-table/diseases-table.component.html index cb4179d9c..2eee0cd11 100644 --- a/client/src/app/components/diseases/diseases-table/diseases-table.component.html +++ b/client/src/app/components/diseases/diseases-table/diseases-table.component.html @@ -23,6 +23,7 @@ @@ -30,6 +31,7 @@ @@ -37,6 +39,7 @@ @@ -44,6 +47,7 @@ diff --git a/client/src/app/components/drugs/drugs-table/drugs-table.component.html b/client/src/app/components/drugs/drugs-table/drugs-table.component.html index cb17d8a7a..794937226 100644 --- a/client/src/app/components/drugs/drugs-table/drugs-table.component.html +++ b/client/src/app/components/drugs/drugs-table/drugs-table.component.html @@ -21,6 +21,7 @@ @@ -29,6 +30,7 @@ diff --git a/client/src/app/components/evidence/evidence-table/evidence-table.component.html b/client/src/app/components/evidence/evidence-table/evidence-table.component.html index e424ee11e..32334ebf0 100644 --- a/client/src/app/components/evidence/evidence-table/evidence-table.component.html +++ b/client/src/app/components/evidence/evidence-table/evidence-table.component.html @@ -91,6 +91,7 @@ @@ -34,6 +35,7 @@ nzRight [nzColumnKey]="sortColumns.EvidenceItemCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Evidence Count"> @@ -42,6 +44,7 @@ nzRight [nzColumnKey]="sortColumns.AssertionCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Assertion Count"> diff --git a/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.html b/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.html index 5b085463a..aa4e3edff 100644 --- a/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.html +++ b/client/src/app/components/phenotypes/phenotypes-table/phenotypes-table.component.html @@ -22,6 +22,7 @@ nzRight [nzColumnKey]="sortColumns.EvidenceItemCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Evidence Count"> @@ -30,6 +31,7 @@ nzRight [nzColumnKey]="sortColumns.AssertionCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Assertion Count"> diff --git a/client/src/app/components/sources/sources-table/sources-table.component.html b/client/src/app/components/sources/sources-table/sources-table.component.html index 8d92b143c..1d1d91688 100644 --- a/client/src/app/components/sources/sources-table/sources-table.component.html +++ b/client/src/app/components/sources/sources-table/sources-table.component.html @@ -37,6 +37,7 @@ diff --git a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html index ab751abc5..c672f80c8 100644 --- a/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html +++ b/client/src/app/components/variant-groups/variant-groups-table/variant-groups-table.component.html @@ -22,6 +22,7 @@ @@ -29,6 +30,7 @@ diff --git a/client/src/app/components/variant-types/variant-types-table/variant-types-table.component.html b/client/src/app/components/variant-types/variant-types-table/variant-types-table.component.html index ddb55e8bb..c067b7a85 100644 --- a/client/src/app/components/variant-types/variant-types-table/variant-types-table.component.html +++ b/client/src/app/components/variant-types/variant-types-table/variant-types-table.component.html @@ -22,6 +22,7 @@ nzRight [nzColumnKey]="sortColumns.VariantCount" [nzSortFn]="true" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Variant Count"> diff --git a/client/src/app/components/variants/variants-table/variants-table.component.html b/client/src/app/components/variants/variants-table/variants-table.component.html index a2c1c518b..7953f0518 100644 --- a/client/src/app/components/variants/variants-table/variants-table.component.html +++ b/client/src/app/components/variants/variants-table/variants-table.component.html @@ -31,6 +31,7 @@ nzRight [nzSortFn]="true" [nzColumnKey]="sortColumns.EvidenceScore" + [nzSortDirections]="['descend', 'ascend', null]" nz-tooltip nzTooltipTitle="Evidence Score">
 Score @@ -38,12 +39,14 @@ From 08786163b46a0e0f2108d2f9a0ed32e99826ddd7 Mon Sep 17 00:00:00 2001 From: Susanna Kiwala Date: Fri, 15 Apr 2022 10:00:53 -0500 Subject: [PATCH 5/6] Fix disease browse table assertion count sorting --- server/app/graphql/resolvers/browse_diseases.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/graphql/resolvers/browse_diseases.rb b/server/app/graphql/resolvers/browse_diseases.rb index 86be144df..007780362 100644 --- a/server/app/graphql/resolvers/browse_diseases.rb +++ b/server/app/graphql/resolvers/browse_diseases.rb @@ -41,7 +41,7 @@ class Resolvers::BrowseDiseases < GraphQL::Schema::Resolver when "EVIDENCE_ITEM_COUNT" scope.order("evidence_item_count #{value.direction}") when "ASSERTION_COUNT" - scope.order("evidence_item_count #{value.direction}") + scope.order("assertion_count #{value.direction}") when "GENE_COUNT" scope.order("gene_count #{value.direction}") end From e4818b964fc06202d2adf33b41a00dd573b23d48 Mon Sep 17 00:00:00 2001 From: Susanna Kiwala Date: Fri, 15 Apr 2022 11:42:42 -0500 Subject: [PATCH 6/6] Update open revisions counter after revision acceptance/rejection --- .../revision-list/revision-list.component.ts | 16 +++++-- .../revisions-list-and-filter.component.html | 3 +- .../revisions-list-and-filter.component.ts | 45 ++++++++++++++++++- .../icon-name-for-subscribable-entity.ts | 2 +- .../core/utilities/mutation-state-wrapper.ts | 6 +-- .../assertion-submit/assertion-submit.form.ts | 2 +- .../types/disease-input/disease-input.type.ts | 2 +- .../types/drug-input/drug-input.type.ts | 2 +- .../types/variant-input/variant-input.type.ts | 2 +- .../evidence-submit/evidence-submit.form.ts | 2 +- .../forms/source-submit/source-submit.form.ts | 2 +- .../variant-group-submit.form.ts | 2 +- 12 files changed, 68 insertions(+), 18 deletions(-) diff --git a/client/src/app/components/revisions/revision-list/revision-list.component.ts b/client/src/app/components/revisions/revision-list/revision-list.component.ts index 52edb2f80..7f4acc596 100644 --- a/client/src/app/components/revisions/revision-list/revision-list.component.ts +++ b/client/src/app/components/revisions/revision-list/revision-list.component.ts @@ -1,11 +1,12 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges, Output, EventEmitter, OnDestroy} from '@angular/core'; -import { AcceptRevisionGQL, AcceptRevisionMutation, AcceptRevisionMutationVariables, Maybe, Organization, RejectRevisionGQL, RejectRevisionMutation, RejectRevisionMutationVariables, Revision, ValidateRevisionsForAcceptanceGQL, ValidateRevisionsForAcceptanceQuery, ValidateRevisionsForAcceptanceQueryVariables, ValidationErrorFragment } from '@app/generated/civic.apollo'; -import { Observable, Subject, Subscription } from 'rxjs'; +import { AcceptRevisionGQL, AcceptRevisionMutation, AcceptRevisionMutationVariables, Maybe, Organization, RejectRevisionGQL, RejectRevisionMutation, RejectRevisionMutationVariables, Revision, ValidateRevisionsForAcceptanceGQL, ValidateRevisionsForAcceptanceQuery, ValidateRevisionsForAcceptanceQueryVariables, ValidationErrorFragment, VariantDetailGQL } from '@app/generated/civic.apollo'; +import { Observable, Subject } from 'rxjs'; import { Viewer, ViewerService } from '@app/core/services/viewer/viewer.service'; import { MutationState, MutatorWithState } from '@app/core/utilities/mutation-state-wrapper'; import { NetworkErrorsService } from '@app/core/services/network-errors.service'; import { map, startWith, takeUntil } from 'rxjs/operators'; import { QueryRef } from 'apollo-angular'; +import { InternalRefetchQueryDescriptor } from '@apollo/client/core/types'; type SuccessType = false | 'accepted' | 'rejected' @@ -16,6 +17,7 @@ type SuccessType = false | 'accepted' | 'rejected' }) export class RevisionListComponent implements OnInit, OnChanges, OnDestroy { @Input() revisions?: Revision[]; + @Input() refetchQuery!: InternalRefetchQueryDescriptor mostRecentOrg!: Maybe; @@ -54,7 +56,7 @@ export class RevisionListComponent implements OnInit, OnChanges, OnDestroy { private networkErrorService: NetworkErrorsService, private acceptRevisionsGql: AcceptRevisionGQL, private rejectRevisionsGql: RejectRevisionGQL, - private validationGql: ValidateRevisionsForAcceptanceGQL + private validationGql: ValidateRevisionsForAcceptanceGQL, ) { this.acceptRevisionsMutator= new MutatorWithState(networkErrorService) this.rejectRevisionsMutator = new MutatorWithState(networkErrorService) @@ -143,7 +145,10 @@ export class RevisionListComponent implements OnInit, OnChanges, OnDestroy { ids: this.selectedRevisionIds, organizationId: this.mostRecentOrg?.id, comment: this.revisionComment - } + }, + }, + { + refetchQueries: [this.refetchQuery] }) this.setupMutationResultHandlers(state, 'rejected') } @@ -157,6 +162,9 @@ export class RevisionListComponent implements OnInit, OnChanges, OnDestroy { organizationId: this.mostRecentOrg?.id, comment: this.revisionComment === "" ? undefined : this.revisionComment } + }, + { + refetchQueries: [this.refetchQuery] }) this.setupMutationResultHandlers(state, 'accepted') } diff --git a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.html b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.html index 15f84b563..e2ed130c5 100644 --- a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.html +++ b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.html @@ -2,7 +2,8 @@ - + diff --git a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts index 0e851961f..d81ae67fe 100644 --- a/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts +++ b/client/src/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.component.ts @@ -1,9 +1,10 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { RevisionsGQL, RevisionsQuery, RevisionsQueryVariables, Maybe, Organization, RevisionFragment, ModeratedEntities, RevisionStatus, PageInfo } from '@app/generated/civic.apollo'; +import { RevisionsGQL, RevisionsQuery, RevisionsQueryVariables, Maybe, RevisionFragment, ModeratedEntities, RevisionStatus, PageInfo, VariantDetailGQL, AssertionDetailGQL, GeneDetailGQL, EvidenceDetailGQL, VariantGroupDetailGQL} from '@app/generated/civic.apollo'; import { Observable, Subscription } from 'rxjs'; import { QueryRef } from 'apollo-angular'; import { map, pluck, startWith } from 'rxjs/operators'; +import { InternalRefetchQueryDescriptor } from '@apollo/client/core/types'; export interface SelectableFieldName { id: number @@ -55,9 +56,16 @@ export class RevisionsListAndFilterComponent implements OnDestroy, OnInit { private defaultPageSize = 10 + refetchQuery!: InternalRefetchQueryDescriptor + constructor( private gql: RevisionsGQL, - private route: ActivatedRoute + private route: ActivatedRoute, + private variantDetailGql: VariantDetailGQL, + private variantGroupDetailGql: VariantGroupDetailGQL, + private assertionDetailGql: AssertionDetailGQL, + private geneDetailGql: GeneDetailGQL, + private evidenceDetailGql: EvidenceDetailGQL, ) { } @@ -109,6 +117,39 @@ export class RevisionsListAndFilterComponent implements OnDestroy, OnInit { pluck('data', 'revisions', 'unfilteredCountForSubject') ) }); + + switch (this.entityType) { + case ModeratedEntities.Variant: + this.refetchQuery = { + query: this.variantDetailGql.document, + variables: { variantId: this.id } + } + return + case ModeratedEntities.Assertion: + this.refetchQuery = { + query: this.assertionDetailGql.document, + variables: { assertionId: this.id } + } + return + case ModeratedEntities.EvidenceItem: + this.refetchQuery = { + query: this.evidenceDetailGql.document, + variables: { evidenceId: this.id } + } + return + case ModeratedEntities.Gene: + this.refetchQuery = { + query: this.geneDetailGql.document, + variables: { geneId: this.id } + } + return + case ModeratedEntities.VariantGroup: + this.refetchQuery = { + query: this.variantGroupDetailGql.document, + variables: { variantGroupId: this.id } + } + return + } } ngOnDestroy() { diff --git a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts index 0881313ff..32e1041d6 100644 --- a/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts +++ b/client/src/app/core/pipes/icon-name-for-subscribable-entity.ts @@ -30,7 +30,7 @@ export class IconNameForSubscribableEntity implements PipeTransform { return 'civic:variant'; case SubscribableEntities.VariantGroup: case 'VARIANT_GROUP': - case 'VariantGrou': + case 'VariantGroup': return 'civic:variant-group'; default: console.log('String No icon name found for ' + e); diff --git a/client/src/app/core/utilities/mutation-state-wrapper.ts b/client/src/app/core/utilities/mutation-state-wrapper.ts index 784786114..178b451b2 100644 --- a/client/src/app/core/utilities/mutation-state-wrapper.ts +++ b/client/src/app/core/utilities/mutation-state-wrapper.ts @@ -1,6 +1,6 @@ import { BehaviorSubject, Subject } from "rxjs"; import { Mutation} from 'apollo-angular' -import { EmptyObject } from "apollo-angular/types"; +import { EmptyObject, MutationOptionsAlone } from "apollo-angular/types"; import { NetworkErrorsService } from "../services/network-errors.service"; import { finalize, takeUntil } from "rxjs/operators"; import { ApolloError, FetchResult } from '@apollo/client/core'; @@ -16,7 +16,7 @@ export class MutatorWithState, T extends {}, V extends constructor(private networkErrorService: NetworkErrorsService) { } //TODO - define the data callback in terms of M, not any - mutate(mutation: M, vars: V, dataCallback?: (data: any) => void): MutationState { + mutate(mutation: M, vars: V, options?: MutationOptionsAlone, dataCallback?: (data: any) => void): MutationState { let destroy$ = new Subject(); let stateVals = { @@ -28,7 +28,7 @@ export class MutatorWithState, T extends {}, V extends stateVals.isSubmitting$.next(true) - mutation.mutate(vars) + mutation.mutate(vars, options) .pipe( takeUntil(destroy$), finalize(() => { stateVals.isSubmitting$.next(false)}) diff --git a/client/src/app/forms/assertion-submit/assertion-submit.form.ts b/client/src/app/forms/assertion-submit/assertion-submit.form.ts index 9d3b0873a..cb51e8741 100644 --- a/client/src/app/forms/assertion-submit/assertion-submit.form.ts +++ b/client/src/app/forms/assertion-submit/assertion-submit.form.ts @@ -318,7 +318,7 @@ export class AssertionSubmitForm implements OnDestroy { let state = this.submitAssertionMutator.mutate(this.submitAssertionGQL, { input: input - }, + }, {}, (data) => { this.newId = data.submitAssertion.assertion.id; }) diff --git a/client/src/app/forms/config/types/disease-input/disease-input.type.ts b/client/src/app/forms/config/types/disease-input/disease-input.type.ts index d5016299f..7a8ac9d96 100644 --- a/client/src/app/forms/config/types/disease-input/disease-input.type.ts +++ b/client/src/app/forms/config/types/disease-input/disease-input.type.ts @@ -112,7 +112,7 @@ export class DiseaseInputType extends FieldType implements AfterViewInit, OnInit addDisease(diseaseName: string): void { if(diseaseName && diseaseName != '') { let doid = +this.enteredDoid ? +this.enteredDoid : undefined - let state = this.addDiseaseMutator.mutate(this.addDiseaseGQL, { name: diseaseName, doid: doid }, + let state = this.addDiseaseMutator.mutate(this.addDiseaseGQL, { name: diseaseName, doid: doid }, {}, (data) => { this.field.formControl?.setValue( {id: data.addDisease.disease.id, name: data.addDisease.disease.name} ) this.to.searchString = ''; diff --git a/client/src/app/forms/config/types/drug-input/drug-input.type.ts b/client/src/app/forms/config/types/drug-input/drug-input.type.ts index e4ba501cf..b53f20a48 100644 --- a/client/src/app/forms/config/types/drug-input/drug-input.type.ts +++ b/client/src/app/forms/config/types/drug-input/drug-input.type.ts @@ -112,7 +112,7 @@ export class DrugInputType extends FieldType implements AfterViewInit, OnInit, O addDrug(drugName: string): void { if(drugName && drugName != '') { - let state = this.addDrugMutator.mutate(this.addDrugGQL, { name: drugName }, + let state = this.addDrugMutator.mutate(this.addDrugGQL, { name: drugName }, {}, (data) => { this.field.formControl?.setValue( {id: data.addDrug.drug.id, name: data.addDrug.drug.name} ) diff --git a/client/src/app/forms/config/types/variant-input/variant-input.type.ts b/client/src/app/forms/config/types/variant-input/variant-input.type.ts index 558510ace..e01d89f00 100644 --- a/client/src/app/forms/config/types/variant-input/variant-input.type.ts +++ b/client/src/app/forms/config/types/variant-input/variant-input.type.ts @@ -110,7 +110,7 @@ export class VariantInputType extends FieldType implements OnInit, AfterViewInit addVariant(variantName: string): void { if(variantName && variantName != '' && this.to.geneId) { - let state = this.addVariantMutator.mutate(this.addVariantGQL, { name: variantName, geneId: this.to.geneId }, + let state = this.addVariantMutator.mutate(this.addVariantGQL, { name: variantName, geneId: this.to.geneId }, {}, (data) => { this.field.formControl?.setValue( {id: data.addVariant.variant.id, name: data.addVariant.variant.name}) this.to.searchString = ''; diff --git a/client/src/app/forms/evidence-submit/evidence-submit.form.ts b/client/src/app/forms/evidence-submit/evidence-submit.form.ts index ab04328ba..e35c59f68 100644 --- a/client/src/app/forms/evidence-submit/evidence-submit.form.ts +++ b/client/src/app/forms/evidence-submit/evidence-submit.form.ts @@ -301,7 +301,7 @@ export class EvidenceSubmitForm implements AfterViewInit, OnDestroy { if (input) { let state = this.submitEvidenceMutator.mutate(this.submitEvidenceGQL, { input: input - }, + }, {}, (data) => { this.newId = data.submitEvidence.evidenceItem.id; }) diff --git a/client/src/app/forms/source-submit/source-submit.form.ts b/client/src/app/forms/source-submit/source-submit.form.ts index a6f9d200c..c3c4dd8a2 100644 --- a/client/src/app/forms/source-submit/source-submit.form.ts +++ b/client/src/app/forms/source-submit/source-submit.form.ts @@ -129,7 +129,7 @@ export class SourceSubmitForm implements OnInit { if (input) { let state = this.suggestSourceMutator.mutate(this.suggestSourceGQL, { input: input - }, + }, {}, (data) => { this.newId = data.suggestSource.sourceSuggestion.id; }) diff --git a/client/src/app/forms/variant-group-submit/variant-group-submit.form.ts b/client/src/app/forms/variant-group-submit/variant-group-submit.form.ts index 7bbfbda9e..e635ef6f6 100644 --- a/client/src/app/forms/variant-group-submit/variant-group-submit.form.ts +++ b/client/src/app/forms/variant-group-submit/variant-group-submit.form.ts @@ -142,7 +142,7 @@ export class VariantGroupSubmitForm implements OnDestroy{ if (input) { let state = this.submitVariantGroupMutator.mutate(this.submitVariantGroupGQL, { input: input - }, + }, {}, (data) => { this.newId = data.submitVariantGroup.variantGroup.id; })