Some minor changes to the dataset show_params page

client/src/components/DatasetInformation/DatasetInformation.vue

@@ -1,11 +1,11 @@
 <template>
     <DatasetProvider :id="hda_id" v-slot="{ item: dataset, loading }">
         <div v-if="!loading">
-            <h3>Dataset Information</h3>
+            <h3>Dataset Information (<a :href="'/datasets/edit?dataset_id=' + dataset.id" target="_top">edit</a>)</h3>
             <table id="dataset-details" class="tabletip info_data_table">
                 <tbody>
                     <tr>
-                        <td>Number</td>
+                        <td>Number in history</td>
                         <td id="number">{{ dataset.hid }}</td>
                     </tr>
                     <tr>
@@ -43,7 +43,13 @@
                     <tr v-if="dataset.history_id">
                         <td>History API ID</td>
                         <td>
-                            <div id="history_id">{{ dataset.history_id }} <decoded-id :id="dataset.history_id" /></div>
+                            <div id="history_id">
+                                {{ dataset.history_id }} <decoded-id :id="dataset.history_id" /> (<a
+                                    :href="'/histories/view?id=' + dataset.history_id"
+                                    target="_top"
+                                    >view</a
+                                >)
+                            </div>
                         </td>
                     </tr>
                     <tr v-if="dataset.uuid">

client/src/components/JobInformation/JobInformation.test.js

@@ -80,7 +80,7 @@ describe("JobInformation/JobInformation.vue", () => {
         expect(jobInfoTable).toBeTruthy();
         const rows = jobInfoTable.findAll("tr");
         // should contain 9 rows
-        expect(rows.length).toBe(9);
+        expect(rows.length).toBe(10);
     });
 
     it("stdout and stderr should be rendered", async () => {

client/src/components/JobInformation/JobInformation.vue

@@ -6,7 +6,7 @@
                 <tr v-if="job && job.tool_id">
                     <td>Galaxy Tool ID:</td>
                     <td id="galaxy-tool-id">
-                        {{ job.tool_id }}
+                        {{ job.tool_id }} (<a :href="'/root?tool_id=' + job.tool_id" target="_top">run</a>)
                         <copy-to-clipboard
                             message="Tool ID was copied to your clipboard"
                             :text="job.tool_id"
@@ -18,6 +18,24 @@
                     <td>Galaxy Tool Version:</td>
                     <td id="galaxy-tool-version">{{ job.tool_version }}</td>
                 </tr>
+                <tr v-if="job && showWorkflowInfo">
+                    <td>Created by workflow?</td>
+                    <td id="created-by-workflow">{{ job.workflow_invocation_step != None }}</td>
+                </tr>
+                <tr v-if="job && job.workflow_invocation_step && showWorkflowInfo">
+                    <td>Workflow ID:</td>
+                    <td id="workflow-id">
+                        {{ job.workflow_invocation_step.id }} (<a
+                            :href="'/workflow/display_by_id?id=' + job.workflow_invocation_step.id"
+                            target="_top"
+                            >view</a
+                        >)
+                    </td>
+                </tr>
+                <tr v-if="job && job.workflow_invocation_step && showWorkflowInfo">
+                    <td>Invocation ID:</td>
+                    <td id="invocation-id">{{ job.workflow_invocation_step.workflow_invocation_id }}</td>
+                </tr>
                 <tr v-if="job && includeTimes">
                     <td>Created</td>
                     <td id="created" v-if="job.create_time">
@@ -47,7 +65,11 @@
                 </tr>
                 <tr v-if="job && job.id">
                     <td>Job API ID:</td>
-                    <td id="encoded-job-id">{{ job.id }} <decoded-id :id="job.id" /></td>
+                    <td id="encoded-job-id">
+                        {{ job.id }} <decoded-id :id="job.id" /> (<a :href="'/root?job_id=' + job.id" target="_top"
+                            >rerun</a
+                        >)
+                    </td>
                 </tr>
                 <tr v-if="job && job.copied_from_job_id">
                     <td>Copied from Job API ID:</td>
@@ -84,6 +106,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        showWorkflowInfo: {
+            type: Boolean,
+            default: true,
+        },
     },
     created: function () {
         this.fetchJob(this.job_id);

client/src/components/WorkflowInvocationState/JobStep.vue

@@ -11,7 +11,7 @@
                 >
                     <div v-if="loading"><b-spinner label="Loading Job..."></b-spinner></div>
                     <div v-else>
-                        <job-information :job_id="item.id" v-if="item" />
+                        <job-information :job_id="item.id" v-if="item" :showWorkflowInfo="false" />
                         <p></p>
                         <job-parameters v-if="item" :jobId="item.id" :includeTitle="false" />
                     </div>

client/src/store/jobStore.js

@@ -14,7 +14,7 @@ const getters = {
 
 const actions = {
     fetchJob: async ({ commit }, jobId) => {
-        const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`);
+        const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true&view=workflow`);
         commit("saveJobForJobId", { jobId, job: data });
     },
 };

lib/galaxy/managers/jobs.py

@@ -391,9 +391,9 @@ def replace_dataset_ids(path, key, value):
         return None
 
 
-def view_show_job(trans, job, full: bool) -> typing.Dict:
+def view_show_job(trans, job, view, full: bool) -> typing.Dict:
     is_admin = trans.user_is_admin
-    job_dict = trans.app.security.encode_all_ids(job.to_dict('element', system_details=is_admin), True)
+    job_dict = trans.app.security.encode_all_ids(job.to_dict(view, system_details=is_admin), True)
     if full:
         job_dict.update(dict(
             tool_stdout=job.tool_stdout,

lib/galaxy/model/__init__.py

@@ -688,6 +688,7 @@ class TaskMetricNumeric(BaseJobMetric, RepresentById):
 class Job(JobLike, UsesCreateAndUpdateTime, Dictifiable, RepresentById):
     dict_collection_visible_keys = ['id', 'state', 'exit_code', 'update_time', 'create_time', 'galaxy_version']
     dict_element_visible_keys = ['id', 'state', 'exit_code', 'update_time', 'create_time', 'galaxy_version', 'command_version']
+    dict_workflow_visible_keys = ['id', 'state', 'exit_code', 'update_time', 'create_time', 'galaxy_version']
 
     """
     A job represents a request to run a tool given input datasets, tool
@@ -1130,6 +1131,11 @@ def to_dict(self, view='collection', system_details=False):
         rval = super().to_dict(view=view)
         rval['tool_id'] = self.tool_id
         rval['history_id'] = self.history_id
+
+        if view == 'workflow':
+            if self.workflow_invocation_step:
+                rval['workflow_invocation_step'] = self.workflow_invocation_step.to_dict() if self.workflow_invocation_step else {}
+
         if system_details:
             # System level details that only admins should have.
             rval['external_id'] = self.job_runner_external_id
@@ -5706,6 +5712,7 @@ def to_dict(self, view='collection', value_mapper=None):
         rval['order_index'] = self.workflow_step.order_index
         rval['workflow_step_label'] = self.workflow_step.label
         rval['workflow_step_uuid'] = str(self.workflow_step.uuid)
+        rval['workflow_invocation_id'] = self.workflow_invocation.id
         # Following no longer makes sense...
         # rval['state'] = self.job.state if self.job is not None else None
         if view == 'element':

lib/galaxy/webapps/galaxy/api/jobs.py

@@ -60,7 +60,7 @@ class FastAPIJobs:
     hda_manager: hdas.HDAManager = depends(hdas.HDAManager)
 
     @router.get("/api/job/{id}")
-    def show(self, id: EncodedDatabaseIdField, trans: ProvidesUserContext = DependsOnTrans, full: typing.Optional[bool] = False) -> typing.Dict:
+    def show(self, id: EncodedDatabaseIdField, trans: ProvidesUserContext = DependsOnTrans, view='element', full: typing.Optional[bool] = False) -> typing.Dict:
         """
         Return dictionary containing description of job data
 
@@ -70,7 +70,7 @@ def show(self, id: EncodedDatabaseIdField, trans: ProvidesUserContext = DependsO
         """
         id = trans.app.security.decode_id(id)
         job = self.job_manager.get_accessible_job(trans, id)
-        return view_show_job(trans, job, bool(full))
+        return view_show_job(trans, job, view, bool(full))
 
 
 class JobController(BaseGalaxyAPIController, UsesVisualizationMixin):
@@ -177,7 +177,8 @@ def show(self, trans: ProvidesUserContext, id, **kwd):
         """
         job = self.__get_job(trans, id)
         full_output = util.asbool(kwd.get('full', 'false'))
-        return view_show_job(trans, job, full_output)
+        view = kwd.get('view', 'element')
+        return view_show_job(trans, job, view, full_output)
 
     @expose_api
     def common_problems(self, trans: ProvidesUserContext, id, **kwd):