fixed cancel (#46)

aolarchive · Nov 1, 2016 · 126174d · 126174d
1 parent 8423e08
commit 126174d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ui/modules/www/JobsHelper/JobsHelper.js b/ui/modules/www/JobsHelper/JobsHelper.js
@@ -234,6 +234,7 @@ export function formatRun(run) {
 
 export function formatLast(run) {
   return formatRun({
+    run,
     id: run.jobId,
     jobId: run.plannedJob.jobSpec.id,
     enabled: run.plannedJob.jobSpec.enabled,
@@ -250,6 +251,7 @@ export function formatLast(run) {
 
 export function formatQueue(run) {
   return formatRun({
+    run,
     id: null,
     jobId: run.jobSpec.id,
     name: run.jobSpec.name,
@@ -263,6 +265,7 @@ export function formatQueue(run) {
 
 export function formatNext(run) {
   return formatRun({
+    run,
     name: run.name,
     time: run.time ? moment(run.time) : null,
     attemptNumber: run.attemptNumber,

diff --git a/ui/modules/www/RunStore/RunStore.js b/ui/modules/www/RunStore/RunStore.js
@@ -184,10 +184,10 @@ export const cancelRun = createRequestAction({
   endpoint: '/api/queue',
   method: 'delete',
   staticUrl: true,
-  requestFn(job) {
+  requestFn(run) {
     return {
       id: null,
-      send: job.plannedJob || job,
+      send: run.run || run,
     };
   },
   successFn(action) {

diff --git a/ui/webpack.config.babel.js b/ui/webpack.config.babel.js
@@ -113,7 +113,11 @@ export default {
       postcssCssnano({
         autoprefixer: false,
       }),
-      postcssReporter(),
+      postcssReporter({
+        plugins: [
+          '!postcss-discard-empty',
+        ],
+      }),
     ];
   },