Merge 10feba6 into 4e605ca

aolarchive · Oct 11, 2016 · f52d6b7 · f52d6b7
2 parents 4e605ca + 10feba6
commit f52d6b7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/ui/modules/www/JobForm/JobForm.js b/ui/modules/www/JobForm/JobForm.js
@@ -235,7 +235,6 @@ export default class JobForm extends Component {
 
   hasParent() {
     const {fields: {parent: {value}}} = this.props;
-    console.log(value);
     return value !== null && value !== '';
   }
 

diff --git a/ui/modules/www/JobsHelper/JobsHelper.js b/ui/modules/www/JobsHelper/JobsHelper.js
@@ -69,10 +69,20 @@ export function jobToClient(job) {
 }
 
 export function jobToServer(job) {
-  if (_.isNumber(job.parent)) {
+  job = _.cloneDeep(job);
+  job.parent = parseInt(job.parent);
+
+  if (_.isNaN(job.parent)) {
+    job.parent = null;
+  } else if (_.isNumber(job.parent)) {
     job.cronString = null;
   }
 
+  delete job.depth;
+  delete job.shouldKeep;
+  delete job.children;
+  delete job.statusTags;
+
   return _.assign(job, {
     resultEmail: _.isArray(job.resultEmail) ? job.resultEmail : job.resultEmail.split('\n').map((line) => {
       return line.trim();

diff --git a/ui/modules/www/RerunJobsForm/RerunJobsForm.js b/ui/modules/www/RerunJobsForm/RerunJobsForm.js
@@ -13,8 +13,9 @@ import {connect} from 'react-redux';
 const jobIntervals = [
   'Hourly',
   'Daily',
-  'Weekly',
   'Monthly',
+  'Yearly',
+  'Weekly',
 ];
 
 // export
@@ -75,7 +76,7 @@ export default class RerunJobsForm extends Component {
 
     return (event) => {
       if (event.target.checked) {
-        intervals.onChange((intervals.value || intervals.defaultValue).concat(interval));
+        intervals.onChange((intervals.value || []).concat(interval));
       } else {
         intervals.onChange(intervals.value.splice(intervals.value.indexOf(interval), 1));
       }
@@ -103,8 +104,8 @@ export default class RerunJobsForm extends Component {
             {jobIntervals.map((interval, i) => {
               return (
                 <label key={i} className={formStyles.checkboxLabel}>
-                  <input type="checkbox" value={interval}
-                    onChange={::this.intervalSelect(interval)}/>
+                  <input type="checkbox" value={i}
+                    onChange={::this.intervalSelect(i)}/>
                   <span>{_.capitalize(interval)}</span>
                 </label>
               );

diff --git a/ui/modules/www/RunStore/RunStore.js b/ui/modules/www/RunStore/RunStore.js
@@ -54,6 +54,23 @@ function collectRuns(runs, now) {
   };
 }
 
+function matchesInterval(job, intervals) {
+  if (!job.cronString) {
+    return false;
+  }
+
+  if (!intervals) {
+    return true;
+  }
+
+  return job.cronString
+  .trim()
+  .split(' ')
+  .some((bit, i) => {
+    return (bit !== '*') && intervals.includes(i);
+  });
+}
+
 // types
 
 export const types = {
@@ -204,7 +221,7 @@ export const rerunJobs = createDispatcher((jobs, start, end, intervals) => {
 
   const collector = collectRuns(runs, now);
   jobs = jobs.filter((job) => {
-    return job.enabled && (!intervals || intervals.indexOf(job.interval) > -1);
+    return job.enabled && job.cronString && matchesInterval(job, intervals);
   });
 
   while (now.isBefore(then)) {

diff --git a/ui/modules/www/RunsList/RunsList.js b/ui/modules/www/RunsList/RunsList.js
@@ -124,9 +124,9 @@ export default class RunsList extends Component {
 
                   {run.replaceTime && (
                     <div className={styles.replaceTime}>
-                      {moment(run.replaceTime).format('M/D/YY')}
+                      {moment(run.replaceTime)[useLocalTime ? 'local' : 'utc']().format('M/D/YY')}
                       <br/>
-                      {moment(run.replaceTime).format('H:mm:ss')}
+                      {moment(run.replaceTime)[useLocalTime ? 'local' : 'utc']().format('H:mm:ss')}
                     </div>
                   )}
                 </header>
@@ -144,7 +144,7 @@ export default class RunsList extends Component {
                 <footer className={cn(styles.itemFooter, shared.clearfix)}>
                   {run.time ? (
                     <time className={styles.time}>
-                      {run.time[useLocalTime ? 'local' : 'utc']().format('M/D/YY h:mm A')}
+                      {run.time[useLocalTime ? 'local' : 'utc']().format('M/D/YY H:mm:ss')}
                     </time>
                   ) : null}