Skip to content

Commit

Permalink
Merge branch 'release_24.1' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvdbeek
mvdbeek committed Aug 30, 2024
2 parents 5452c14 + 12ce6af commit 2f59e59
Show file tree
Hide file tree
Showing 20 changed files with 635 additions and 499 deletions.
1 change: 1 addition & 0 deletions client/src/api/invocations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export type WorkflowInvocationElementView = components["schemas"]["WorkflowInvoc
export type WorkflowInvocationCollectionView = components["schemas"]["WorkflowInvocationCollectionView"];
export type InvocationJobsSummary = components["schemas"]["InvocationJobsResponse"];
export type InvocationStep = components["schemas"]["InvocationStep"];
export type InvocationMessage = components["schemas"]["InvocationMessageResponseUnion"];

export type StepJobSummary =
| components["schemas"]["InvocationStepJobsResponseStepModel"]
Expand Down
185 changes: 171 additions & 14 deletions client/src/api/schema/schema.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9883,6 +9883,142 @@ export interface components {
*/
visible: boolean;
};
/** HDCACustom */
HDCACustom: {
/**
* Dataset Collection ID
* @example 0123456789ABCDEF
*/
collection_id?: string;
/**
* Collection Type
* @description The type of the collection, can be `list`, `paired`, or define subcollections using `:` as separator like `list:paired` or `list:list`.
*/
collection_type?: string | null;
/**
* Contents URL
* @description The relative URL to access the contents of this History.
*/
contents_url?: string | null;
/**
* Create Time
* @description The time and date this item was created.
*/
create_time?: string | null;
/**
* Deleted
* @description Whether this item is marked as deleted.
*/
deleted?: boolean | null;
/**
* Element Count
* @description The number of elements contained in the dataset collection. It may be None or undefined if the collection could not be populated.
*/
element_count?: number | null;
/**
* Elements
* @description The summary information of each of the elements inside the dataset collection.
*/
elements?: components["schemas"]["DCESummary"][] | null;
/**
* Elements Datatypes
* @description A set containing all the different element datatypes in the collection.
*/
elements_datatypes?: string[] | null;
/**
* HID
* @description The index position of this item in the History.
*/
hid?: number | null;
/**
* History Content Type
* @description This is always `dataset_collection` for dataset collections.
*/
history_content_type?: "dataset_collection" | null;
/**
* History ID
* @example 0123456789ABCDEF
*/
history_id?: string;
/**
* Id
* @example 0123456789ABCDEF
*/
id?: string;
/**
* Implicit Collection Jobs Id
* @description Encoded ID for the ICJ object describing the collection of jobs corresponding to this collection
*/
implicit_collection_jobs_id?: string | null;
/**
* Job Source ID
* @description The encoded ID of the Job that produced this dataset collection. Used to track the state of the job.
*/
job_source_id?: string | null;
/**
* Job Source Type
* @description The type of job (model class) that produced this dataset collection. Used to track the state of the job.
*/
job_source_type?: components["schemas"]["JobSourceType"] | null;
/**
* Job State Summary
* @description Overview of the job states working inside the dataset collection.
*/
job_state_summary?: components["schemas"]["HDCJobStateSummary"] | null;
/**
* Model class
* @description The name of the database model class.
* @constant
*/
model_class?: "HistoryDatasetCollectionAssociation";
/**
* Name
* @description The name of the item.
*/
name?: string | null;
/**
* Populated
* @description Whether the dataset collection elements (and any subcollections elements) were successfully populated.
*/
populated?: boolean | null;
/**
* Populated State
* @description Indicates the general state of the elements in the dataset collection:- 'new': new dataset collection, unpopulated elements.- 'ok': collection elements populated (HDAs may or may not have errors).- 'failed': some problem populating, won't be populated.
*/
populated_state?: components["schemas"]["DatasetCollectionPopulatedState"] | null;
/**
* Populated State Message
* @description Optional message with further information in case the population of the dataset collection failed.
*/
populated_state_message?: string | null;
tags?: components["schemas"]["TagCollection"] | null;
/**
* Type
* @description This is always `collection` for dataset collections.
*/
type?: "collection" | null;
/**
* Type - ID
* @description The type and the encoded ID of this item. Used for caching.
*/
type_id?: string | null;
/**
* Update Time
* @description The last time and date this item was updated.
*/
update_time?: string | null;
/**
* URL
* @deprecated
* @description The relative URL to access this item.
*/
url?: string | null;
/**
* Visible
* @description Whether this item is visible or hidden to the user by default.
*/
visible?: boolean | null;
};
/**
* HDCADetailed
* @description History Dataset Collection Association detailed information.
Expand Down Expand Up @@ -10064,6 +10200,11 @@ export interface components {
* @description The number of elements contained in the dataset collection. It may be None or undefined if the collection could not be populated.
*/
element_count?: number | null;
/**
* Elements Datatypes
* @description A set containing all the different element datatypes in the collection.
*/
elements_datatypes: string[];
/**
* HID
* @description The index position of this item in the History.
Expand Down Expand Up @@ -10678,6 +10819,7 @@ export interface components {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand All @@ -10695,6 +10837,7 @@ export interface components {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand Down Expand Up @@ -11486,6 +11629,18 @@ export interface components {
[key: string]: number;
};
};
InvocationMessageResponseUnion:
| components["schemas"]["InvocationCancellationReviewFailedResponse"]
| components["schemas"]["InvocationCancellationHistoryDeletedResponse"]
| components["schemas"]["InvocationCancellationUserRequestResponse"]
| components["schemas"]["InvocationFailureDatasetFailedResponse"]
| components["schemas"]["InvocationFailureCollectionFailedResponse"]
| components["schemas"]["InvocationFailureJobFailedResponse"]
| components["schemas"]["InvocationFailureOutputNotFoundResponse"]
| components["schemas"]["InvocationFailureExpressionEvaluationFailedResponse"]
| components["schemas"]["InvocationFailureWhenNotBooleanResponse"]
| components["schemas"]["InvocationUnexpectedFailureResponse"]
| components["schemas"]["InvocationEvaluationWarningWorkflowOutputNotFoundResponse"];
/** InvocationOutput */
InvocationOutput: {
/**
Expand Down Expand Up @@ -16826,19 +16981,7 @@ export interface components {
* Messages
* @description A list of messages about why the invocation did not succeed.
*/
messages: (
| components["schemas"]["InvocationCancellationReviewFailedResponse"]
| components["schemas"]["InvocationCancellationHistoryDeletedResponse"]
| components["schemas"]["InvocationCancellationUserRequestResponse"]
| components["schemas"]["InvocationFailureDatasetFailedResponse"]
| components["schemas"]["InvocationFailureCollectionFailedResponse"]
| components["schemas"]["InvocationFailureJobFailedResponse"]
| components["schemas"]["InvocationFailureOutputNotFoundResponse"]
| components["schemas"]["InvocationFailureExpressionEvaluationFailedResponse"]
| components["schemas"]["InvocationFailureWhenNotBooleanResponse"]
| components["schemas"]["InvocationUnexpectedFailureResponse"]
| components["schemas"]["InvocationEvaluationWarningWorkflowOutputNotFoundResponse"]
)[];
messages: components["schemas"]["InvocationMessageResponseUnion"][];
/**
* Model class
* @description The name of the database model class.
Expand Down Expand Up @@ -17567,7 +17710,10 @@ export interface operations {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"];
"application/json":
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
};
/** @description Request Error */
Expand Down Expand Up @@ -17863,6 +18009,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand Down Expand Up @@ -18021,6 +18168,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
Expand Down Expand Up @@ -22584,13 +22732,15 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
| (
| components["schemas"]["HDACustom"]
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand Down Expand Up @@ -23411,6 +23561,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
Expand Down Expand Up @@ -23474,6 +23625,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
Expand Down Expand Up @@ -23755,13 +23907,15 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
| (
| components["schemas"]["HDACustom"]
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand Down Expand Up @@ -23824,6 +23978,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
Expand Down Expand Up @@ -23887,6 +24042,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"];
};
Expand Down Expand Up @@ -24182,6 +24338,7 @@ export interface operations {
| components["schemas"]["HDADetailed"]
| components["schemas"]["HDASummary"]
| components["schemas"]["HDAInaccessible"]
| components["schemas"]["HDCACustom"]
| components["schemas"]["HDCADetailed"]
| components["schemas"]["HDCASummary"]
)[];
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Help/terms.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ galaxy:
invocations:
states:
scheduled: |
This state indicates the workflow invocation has had all of its job scheduled. This means all the
This state indicates the workflow invocation has had all of its jobs scheduled. This means all the
datasets are likely created and Galaxy has created the stubs for the jobs in the workflow. *The jobs
themselves might not have been queued or running.*
Expand Down
Loading

0 comments on commit 2f59e59

Please sign in to comment.