Merge remote-tracking branch 'origin/main' into civicpy

griffithlab · Oct 29, 2024 · 888d44b · 888d44b
2 parents e9f3ccc + ac9cb4e
commit 888d44b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
@@ -129,6 +129,7 @@ export enum ActivitySubjectInput {
   Assertion = 'ASSERTION',
   Comment = 'COMMENT',
   EvidenceItem = 'EVIDENCE_ITEM',
+  ExonCoordinate = 'EXON_COORDINATE',
   Feature = 'FEATURE',
   Flag = 'FLAG',
   MolecularProfile = 'MOLECULAR_PROFILE',
@@ -137,6 +138,7 @@ export enum ActivitySubjectInput {
   Source = 'SOURCE',
   SourceSuggestion = 'SOURCE_SUGGESTION',
   Variant = 'VARIANT',
+  VariantCoordinate = 'VARIANT_COORDINATE',
   VariantGroup = 'VARIANT_GROUP'
 }
 
@@ -5251,6 +5253,7 @@ export type QueryEvidenceItemsArgs = {
   evidenceType?: InputMaybe<EvidenceType>;
   first?: InputMaybe<Scalars['Int']['input']>;
   id?: InputMaybe<Scalars['Int']['input']>;
+  ids?: InputMaybe<Array<Scalars['Int']['input']>>;
   last?: InputMaybe<Scalars['Int']['input']>;
   molecularProfileId?: InputMaybe<Scalars['Int']['input']>;
   molecularProfileName?: InputMaybe<Scalars['String']['input']>;

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
@@ -159,6 +159,7 @@ enum ActivitySubjectInput {
   ASSERTION
   COMMENT
   EVIDENCE_ITEM
+  EXON_COORDINATE
   FEATURE
   FLAG
   MOLECULAR_PROFILE
@@ -167,6 +168,7 @@ enum ActivitySubjectInput {
   SOURCE
   SOURCE_SUGGESTION
   VARIANT
+  VARIANT_COORDINATE
   VARIANT_GROUP
 }
 

diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
@@ -1063,6 +1063,18 @@
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "EXON_COORDINATE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "VARIANT_COORDINATE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "possibleTypes": null

diff --git a/server/app/graphql/types/activities/activity_subject_input_type.rb b/server/app/graphql/types/activities/activity_subject_input_type.rb
@@ -13,6 +13,6 @@ class ActivitySubjectInputType < Types::BaseEnum
     value 'REVISION_SET', value: 'RevisionSet'
     value 'COMMENT', value: 'Comment'
     value 'EXON_COORDINATE', value: 'ExonCoordinate'
-    value 'GENE_COORDINATE', value: 'GeneCoordinate'
+    value 'VARIANT_COORDINATE', value: 'VariantCoordinate'
   end
 end