diff --git a/src/components/DownloadLogsFilePopover.vue b/src/components/DownloadLogsFilePopover.vue new file mode 100644 index 00000000..ab9e78bc --- /dev/null +++ b/src/components/DownloadLogsFilePopover.vue @@ -0,0 +1,76 @@ + + + \ No newline at end of file diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue index 77926a83..ec43e91e 100644 --- a/src/components/JobConfiguration.vue +++ b/src/components/JobConfiguration.vue @@ -6,7 +6,8 @@ - {{ translate("running") }} {{ timeTillJob(currentJob.runTime) }} + {{ currentJob.statusId == "SERVICE_CANCELLED" || currentJob.statusId == "SERVICE_CRASHED" ? timeTillJob(currentJob.cancelDateTime) : timeTillJob(currentJob.finishDateTime) }} + {{ translate("running") }} {{ timeTillJob(currentJob.runTime) }} @@ -19,33 +20,45 @@ - -
{{ translate("Run time") }}
- {{ translate(runTime.label) }} -
- - - - - - - + +
- -
{{ translate("Schedule") }}
- {{ freq.description }} -
+ +
@@ -76,20 +89,20 @@ -->
-
+
- {{ translate("Skip once") }} - {{ translate("Disable") }} + {{ translate("Skip once") }} + {{ translate("Disable") }}
- {{ translate("Save changes") }} + {{ translate("Save changes") }}
- {{ translate("Skip once") }} - {{ translate("Disable") }} - {{ translate("Save changes") }} + {{ translate("Skip once") }} + {{ translate("Disable") }} + {{ translate("Save changes") }}
@@ -97,7 +110,7 @@ {{ translate("History") }} - + {{ translate("Run now") }} @@ -105,14 +118,38 @@ {{ translate("Copy details") }} - + {{ translate("Pin job") }}
- + +
+ +

{{ translate('Import logs') }}

+ {{ translate('View details') }} +
+ + + + + {{ translate('Files received') }} + {{ getDataManagerLogs.length }} + + + + {{ translate('Files processed') }} + {{ getProcessedFileCount() }} + + + + {{ translate('Files with errors') }} + {{ getErrorFileCount() }} + + +
\ No newline at end of file diff --git a/src/views/JobDetails.vue b/src/views/JobDetails.vue index 4266336b..ebe0fac9 100644 --- a/src/views/JobDetails.vue +++ b/src/views/JobDetails.vue @@ -9,7 +9,7 @@ - + @@ -87,6 +87,10 @@ export default defineComponent({ const jobFreqTypeId = (Object.keys(this.jobFrequencyType).find((enumId: any) => enumId === id)) as any; this.freqType = (id && jobFreqTypeId) && this.jobFrequencyType[jobFreqTypeId]; } + }, + checkJobStatus(statusId: string) { + const statuses = ["SERVICE_CANCELLED", "SERVICE_CRASHED", "SERVICE_FAILED", "SERVICE_FINISHED", "SERVICE_RUNNING", "SERVICE_QUEUED"]; + return statuses.includes(statusId); } }, mounted() { diff --git a/src/views/Pipeline.vue b/src/views/Pipeline.vue index 2e8164fd..de90cbc7 100644 --- a/src/views/Pipeline.vue +++ b/src/views/Pipeline.vue @@ -180,7 +180,7 @@
- +
{{ job.parentJobId }} @@ -188,7 +188,7 @@
{{ job.statusId == "SERVICE_CANCELLED" || job.statusId == "SERVICE_CRASHED" ? timeFromNow(job.cancelDateTime) : timeFromNow(job.finishDateTime) }} - {{ job.statusDesc }} + {{ job.statusDesc }}
@@ -237,8 +237,8 @@
-