Skip to content

Commit 6f98404

Browse files
committed
Fix errors type and maintain error messsage
Fixes #18874
1 parent b7a002d commit 6f98404

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

client/src/api/schema/schema.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14020,9 +14020,11 @@ export interface components {
1402014020
* Errors
1402114021
* @description Errors associated with the invocation.
1402214022
*/
14023-
errors?: {
14024-
[key: string]: unknown;
14025-
} | null;
14023+
errors?:
14024+
| {
14025+
[key: string]: unknown;
14026+
}[]
14027+
| null;
1402614028
/**
1402714029
* Galaxy Version
1402814030
* @description The version of Galaxy this object was generated with.

lib/galaxy/managers/markdown_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def handle_error(self, container, line, error):
418418

419419
class ReadyForExportMarkdownDirectiveHandler(GalaxyInternalMarkdownDirectiveHandler):
420420
def __init__(self, trans, extra_rendering_data=None):
421-
extra_rendering_data = extra_rendering_data or {}
421+
extra_rendering_data = extra_rendering_data if extra_rendering_data is not None else {}
422422
self.trans = trans
423423
self.extra_rendering_data = extra_rendering_data
424424

lib/galaxy/schema/invocation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ class InvocationReport(Model, WithModelClass):
470470
generate_time: Optional[str] = schema.GenerateTimeField
471471
generate_version: Optional[str] = schema.GenerateVersionField
472472

473-
errors: Optional[Dict[str, Any]] = Field(
473+
errors: Optional[List[Dict[str, Any]]] = Field(
474474
default=None,
475475
title="Errors",
476476
description="Errors associated with the invocation.",

0 commit comments

Comments
 (0)