Merge pull request #19311 from mvdbeek/fix_import_of_previously_delet…

…ed_trs_workflow

[24.2] Fix import of previously-deleted TRS workflow

lib/galaxy/managers/workflows.py

@@ -2084,6 +2084,7 @@ def to_json(column, keys: List[str]):
             .join(model.Workflow, model.Workflow.id == model.StoredWorkflow.latest_workflow_id)
             .filter(
                 and_(
+                    model.StoredWorkflow.deleted == false(),
                     to_json(model.Workflow.source_metadata, ["trs_tool_id"]) == trs_id,
                     to_json(model.Workflow.source_metadata, ["trs_version_id"]) == trs_version,
                 )
@@ -2095,7 +2096,7 @@ def to_json(column, keys: List[str]):
             )
         else:
             stmnt = stmnt.filter(model.StoredWorkflow.importable == true())
-        return sa_session.execute(stmnt).scalar()
+        return sa_session.execute(stmnt.order_by(model.StoredWorkflow.id.desc()).limit(1)).scalar()
 
 
 class RefactorRequest(RefactorActions):