diff --git a/apps/ui/src/components/ChangesViewer.vue b/apps/ui/src/components/ChangesViewer.vue index 1ce8de6b..30189ea3 100644 --- a/apps/ui/src/components/ChangesViewer.vue +++ b/apps/ui/src/components/ChangesViewer.vue @@ -34,70 +34,7 @@ - - - -
-
- Jobs -
-
-
-
- Last full sync - Last synced - {{ last_job.dateStr }} -  {{ last_job.durationStr }} -
-
- Last transform took -  {{ last_transform.durationStr }} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
JobStartedFinished
{{ job.title }}{{ job.startedStr || job.state }} -  {{ job.progress.completed }} / {{ job.progress.total }} - Logs -
{{ job.title }}{{ job.startedStr }} - {{ job.finishedStr }} - ({{ job.durationStr }}) - Logs -
-
- @@ -117,33 +54,8 @@ export default { }, components: {StatusToolBar}, computed: { - active_jobs_reverse() { - return [].concat(this.active_jobs) - .map(a => { - return { - ...a, - finishedStr: a.finished ? new Date(a.finished).toISOString() : undefined, - startedStr: a.started ? new Date(a.started).toISOString() : undefined, - durationStr: a.started && a.finished ? Math.round((+new Date(a.finished) - +new Date(a.started)) / 100)/10 + 's' : undefined - }; - }) - .reverse(); - }, fileChanges() { return this.changes.filter(change => change.mimeType !== 'application/vnd.google-apps.folder'); - }, - archive() { - const arr = [].concat(this.$root.archive); - arr.sort((a, b) => b.finished - a.finished); - - return arr.map(a => { - return { - ...a, - finishedStr: new Date(a.finished).toISOString(), - startedStr: new Date(a.started).toISOString(), - durationStr: Math.round((+new Date(a.finished) - +new Date(a.started)) / 100)/10 + 's' - }; - }); } }, methods: { @@ -171,9 +83,6 @@ export default { this.$router.push(`/drive/${this.driveId}${path}`); } } - }, - showLogs(job) { - this.$router.push(`/drive/${this.driveId}#drive_logs:job-${job.id}`); } } }; diff --git a/apps/ui/src/components/JobsViewer.vue b/apps/ui/src/components/JobsViewer.vue new file mode 100644 index 00000000..e9f08214 --- /dev/null +++ b/apps/ui/src/components/JobsViewer.vue @@ -0,0 +1,120 @@ + + diff --git a/apps/ui/src/components/StatusToolBar.vue b/apps/ui/src/components/StatusToolBar.vue index 1fed80a7..2fb0cd20 100644 --- a/apps/ui/src/components/StatusToolBar.vue +++ b/apps/ui/src/components/StatusToolBar.vue @@ -1,11 +1,18 @@