Merge branch 'main' into clean-up-resolvers-ts

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 
+## [2.30.2](https://github.com/chanzuckerberg/czid-graphql-federation-server/compare/v2.30.1...v2.30.2) (2024-04-19)
+
+
+### Bug Fixes
+
+* Update NextGen schema with new errorLabel field and pass it through SampleForReport ([#325](https://github.com/chanzuckerberg/czid-graphql-federation-server/issues/325)) ([ddfe8d5](https://github.com/chanzuckerberg/czid-graphql-federation-server/commit/ddfe8d5ff126f88a23afdc402f4c8516f61f54a6))
+* Update schema ([#326](https://github.com/chanzuckerberg/czid-graphql-federation-server/issues/326)) ([a510e29](https://github.com/chanzuckerberg/czid-graphql-federation-server/commit/a510e29658ace8a98a2815ac55dc0f72ec7ffd3b))
+
 ## [2.30.1](https://github.com/chanzuckerberg/czid-graphql-federation-server/compare/v2.30.0...v2.30.1) (2024-04-12)
 
 

example-queries/sample-for-report-query.graphql

@@ -36,7 +36,10 @@ query SampleViewSampleQuery($railsSampleId: String, $snapshotLinkId: String) {
       deprecated
       executed_at
       id
-      input_error
+      input_error {
+        label
+        message
+      }
       inputs {
         accession_id
         accession_name

json-schemas/sampleForReportResponse.json

@@ -113,7 +113,15 @@
                         "type": "boolean"
                     },
                     "input_error": {
-                        "type": "string"
+                        "type": "object",
+                        "properties": {
+                            "label": {
+                                "type": "string"
+                            },
+                            "message": {
+                                "type": "string"
+                            }
+                        }
                     },
                     "inputs": {
                         "type": "object",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "czi-graphql-federation",
-  "version": "2.30.1",
+  "version": "2.30.2",
   "description": "",
   "scripts": {
     "start": "mesh start",

sample-responses/sampleForReport.json

@@ -36,7 +36,10 @@
           "wdl_version": "3.4.18",
           "executed_at": "2023-10-17T07:10:33.000-07:00",
           "deprecated": false,
-          "input_error": "hi",
+          "input_error": {
+            "label": "InsufficientReadsError",
+            "message": "There were not enough reads."
+          },
           "inputs": {
               "accession_id": "11",
               "accession_name": "11",

sources/nextgen-entities-schema.graphql

@@ -2091,6 +2091,15 @@ type Taxon implements EntityInterface & Node {
   upstreamDatabase(where: UpstreamDatabaseWhereClause = null, orderBy: [UpstreamDatabaseOrderByClause!] = []): UpstreamDatabase
   upstreamDatabaseIdentifier: String!
   level: TaxonLevel!
+  taxParentId: ID
+  taxSpeciesId: ID
+  taxGenusId: ID
+  taxFamilyId: ID
+  taxOrderId: ID
+  taxClassId: ID
+  taxPhylumId: ID
+  taxKingdomId: ID
+  taxSuperkingdomId: ID
   consensusGenomes(
     where: ConsensusGenomeWhereClause = null
     orderBy: [ConsensusGenomeOrderByClause!] = []

sources/nextgen-workflows-schema.graphql

@@ -278,6 +278,7 @@ type WorkflowRun implements EntityInterface & Node {
   outputsJson: String
   workflowRunnerInputsJson: String
   status: WorkflowRunStatus
+  errorLabel: String
   errorMessage: String
   workflowVersion(where: WorkflowVersionWhereClause = null, orderBy: [WorkflowVersionOrderByClause!] = []): WorkflowVersion
   steps(
@@ -315,6 +316,7 @@ type WorkflowRun implements EntityInterface & Node {
   ): WorkflowRunEntityInputConnection!
   entityInputsAggregate(where: WorkflowRunEntityInputWhereClause = null): WorkflowRunEntityInputAggregate
   rawInputsJson: String
+  deprecatedById: ID
   ownerUserId: Int!
   collectionId: Int
   createdAt: DateTime!
@@ -354,6 +356,7 @@ enum WorkflowRunCountColumns {
   outputsJson
   workflowRunnerInputsJson
   status
+  errorLabel
   errorMessage
   workflowVersion
   steps
@@ -513,6 +516,7 @@ type WorkflowRunGroupByOptions {
   outputsJson: String
   workflowRunnerInputsJson: String
   status: WorkflowRunStatus
+  errorLabel: String
   errorMessage: String
   workflowVersion: WorkflowVersionGroupByOptions
   rawInputsJson: String
@@ -532,6 +536,7 @@ type WorkflowRunMinMaxColumns {
   executionId: String
   outputsJson: String
   workflowRunnerInputsJson: String
+  errorLabel: String
   errorMessage: String
   rawInputsJson: String
   ownerUserId: Int
@@ -555,6 +560,7 @@ input WorkflowRunOrderByClause {
   outputsJson: orderBy
   workflowRunnerInputsJson: orderBy
   status: orderBy
+  errorLabel: orderBy
   errorMessage: orderBy
   workflowVersion: WorkflowVersionOrderByClause
   rawInputsJson: orderBy
@@ -748,6 +754,7 @@ input WorkflowRunUpdateInput {
   outputsJson: String = null
   workflowRunnerInputsJson: String = null
   status: WorkflowRunStatus = null
+  errorLabel: String = null
   errorMessage: String = null
   deprecatedById: ID = null
   deletedAt: DateTime = null
@@ -761,6 +768,7 @@ input WorkflowRunWhereClause {
   outputsJson: StrComparators
   workflowRunnerInputsJson: StrComparators
   status: WorkflowRunStatusEnumComparators
+  errorLabel: StrComparators
   errorMessage: StrComparators
   workflowVersion: WorkflowVersionWhereClause
   steps: WorkflowRunStepWhereClause

tests/__snapshots__/UnifiedSchema.test.ts.snap

@@ -2559,6 +2559,15 @@ type Taxon implements EntityInterface & Node {
     where: SequencingReadWhereClause = null
   ): SequencingReadConnection!
   sequencingReadsAggregate(where: SequencingReadWhereClause = null): SequencingReadAggregate
+  taxClassId: ID
+  taxFamilyId: ID
+  taxGenusId: ID
+  taxKingdomId: ID
+  taxOrderId: ID
+  taxParentId: ID
+  taxPhylumId: ID
+  taxSpeciesId: ID
+  taxSuperkingdomId: ID
   updatedAt: DateTime
   upstreamDatabase(orderBy: [UpstreamDatabaseOrderByClause!] = [], where: UpstreamDatabaseWhereClause = null): UpstreamDatabase
   upstreamDatabaseIdentifier: String!
@@ -3105,6 +3114,7 @@ type WorkflowRun implements EntityInterface & Node {
   createdAt: DateTime!
   deletedAt: DateTime
   deprecated: Boolean!
+  deprecatedById: ID
   endedAt: DateTime
   entityInputs(
     """Returns the items in the list that come after the specified cursor."""
@@ -3119,6 +3129,7 @@ type WorkflowRun implements EntityInterface & Node {
     where: WorkflowRunEntityInputWhereClause = null
   ): WorkflowRunEntityInputConnection!
   entityInputsAggregate(where: WorkflowRunEntityInputWhereClause = null): WorkflowRunEntityInputAggregate
+  errorLabel: String
   errorMessage: String
   executedAt: ISO8601DateTime
   executionId: String
@@ -3186,6 +3197,7 @@ enum WorkflowRunCountColumns {
   deprecatedBy
   endedAt
   entityInputs
+  errorLabel
   errorMessage
   executionId
   id
@@ -3341,6 +3353,7 @@ type WorkflowRunGroupByOptions {
   deletedAt: DateTime
   deprecatedBy: WorkflowRunGroupByOptions
   endedAt: DateTime
+  errorLabel: String
   errorMessage: String
   executionId: String
   id: UUID
@@ -3360,6 +3373,7 @@ type WorkflowRunMinMaxColumns {
   createdAt: DateTime
   deletedAt: DateTime
   endedAt: DateTime
+  errorLabel: String
   errorMessage: String
   executionId: String
   outputsJson: String
@@ -3383,6 +3397,7 @@ input WorkflowRunOrderByClause {
   deletedAt: orderBy
   deprecatedBy: orderBy
   endedAt: orderBy
+  errorLabel: orderBy
   errorMessage: orderBy
   executionId: orderBy
   id: orderBy
@@ -3574,6 +3589,7 @@ input WorkflowRunUpdateInput {
   deletedAt: DateTime = null
   deprecatedById: ID = null
   endedAt: DateTime = null
+  errorLabel: String = null
   errorMessage: String = null
   executionId: String = null
   outputsJson: String = null
@@ -3588,6 +3604,7 @@ input WorkflowRunWhereClause {
   deprecatedById: UUIDComparators
   endedAt: DatetimeComparators
   entityInputs: WorkflowRunEntityInputWhereClause
+  errorLabel: StrComparators
   errorMessage: StrComparators
   executionId: StrComparators
   id: UUIDComparators
@@ -4707,7 +4724,7 @@ type query_SampleForReport_workflow_runs_items {
   deprecated: Boolean
   executed_at: String!
   id: String!
-  input_error: String
+  input_error: query_SampleForReport_workflow_runs_items_input_error
   inputs: query_SampleForReport_workflow_runs_items_inputs!
   rails_workflow_run_id: String
   run_finalized: Boolean!
@@ -4716,6 +4733,11 @@ type query_SampleForReport_workflow_runs_items {
   workflow: String
 }
 
+type query_SampleForReport_workflow_runs_items_input_error {
+  label: String
+  message: String
+}
+
 type query_SampleForReport_workflow_runs_items_inputs {
   accession_id: String
   accession_name: String