From 7386f8a2bdd2de7a39616b1f371751c59aaebc65 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Fri, 8 Dec 2023 11:51:11 -0500 Subject: [PATCH 1/8] Fix, basic - preformatted html tag --- client/src/components/JobInformation/JobInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index eef0dfc7195d..304fe4c4127c 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -56,7 +56,7 @@ Job Messages From 8aa78f2c1819bdef6ca78ddd0e99b6928b6751cb Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Fri, 8 Dec 2023 15:39:24 -0500 Subject: [PATCH 2/8] Fix, moderate - bulletted list --- .../src/components/JobInformation/JobInformation.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index 304fe4c4127c..cec4222d2b48 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -56,7 +56,15 @@ Job Messages From 3f4cc7650c8083c2d5f44992ee83be8ad2454c01 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Wed, 3 Jan 2024 17:35:39 -0500 Subject: [PATCH 3/8] Add check if output is not an array of objects --- client/src/components/JobInformation/JobInformation.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index cec4222d2b48..8ca109503399 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -55,7 +55,7 @@ Job Messages -
    +
    • [{{ index }}]
        @@ -66,6 +66,9 @@
    +
    + {{ job.job_messages }} +
    From bb214baa34bd6328eb7c181d0193a4973ed642e4 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Mon, 8 Jan 2024 08:11:36 -0500 Subject: [PATCH 4/8] Upgraded component to Vue 3 --- .../JobInformation/JobInformation.vue | 98 ++++++++----------- 1 file changed, 39 insertions(+), 59 deletions(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index 8ca109503399..a9a3902b4089 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -1,6 +1,41 @@ + + - - From 003d2e10d8d44add1a8b175dc3994a5be1734528 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Mon, 8 Jan 2024 08:19:50 -0500 Subject: [PATCH 5/8] Extra space removed --- client/src/components/JobInformation/JobInformation.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index a9a3902b4089..f1d9501eb53b 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -95,8 +95,8 @@ function updateJob(fromProvider) { [{{ index }}]
    • - {{ name }} - : {{ value }} + {{ name }}: + {{ value }}
    From 399824ef9f2f66a17a8c9f189c19b66aa28f0037 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Tue, 9 Jan 2024 21:45:12 -0500 Subject: [PATCH 6/8] Remove index enumeration and indentation; separate multiple errors with border line instead. Prevent metadata from printing when there is no value. --- .../JobInformation/JobInformation.vue | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index f1d9501eb53b..0cbb1ab7d3bb 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -31,6 +31,17 @@ const jobIsTerminal = computed(() => job.value && !JOB_STATES_MODEL.NON_TERMINAL function updateJob(fromProvider) { job.value = fromProvider; } + +function filterMetadata(jobMessages) { + return jobMessages.map((item) => { + return Object.entries(item).reduce((acc, [key, value]) => { + if (value) { + acc[key] = value; + } + return acc; + }, {}); + }); +} + + From 11229cd3f4a9d3dfce176d64df914b593449f47f Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Wed, 10 Jan 2024 13:48:19 -0500 Subject: [PATCH 8/8] Added job error message detail using HTML formatting --- client/src/components/JobInformation/JobInformation.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index c5cf3e08b619..9ee7707a121b 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -29,8 +29,8 @@ const runTime = computed(() => const jobIsTerminal = computed(() => job.value && !JOB_STATES_MODEL.NON_TERMINAL_STATES.includes(job.value.state)); const metadataDetail = ref({ - exit_code: - "Tools may use exit codes to indicate specific execution errors. Many programs use 0 to indicate success and non-zero exit codes to indicate errors. Galaxy allows each tool to specify exit codes that indicate errors. https://docs.galaxyproject.org/en/master/dev/schema.html#tool-stdio-exit-code", + exit_code: `Tools may use exit codes to indicate specific execution errors. Many programs use 0 to indicate success and non-zero exit codes to indicate errors. Galaxy allows each tool to specify exit codes that indicate errors. https://docs.galaxyproject.org/en/master/dev/schema.html#tool-stdio-exit-code`, + error_level: `NO_ERROR = 0
    LOG = 1
    QC = 1.1
    WARNING = 2
    FATAL = 3
    FATAL_OOM = 4
    MAX = 4`, }); function updateJob(fromProvider) { @@ -114,7 +114,7 @@ function filterMetadata(jobMessages) {
  • {{ name }}: