2 files changed, 21 insertions, 8 deletions
diff --git a/ui/imports/ui/components/scheduled-scan/scheduled-scan.html b/ui/imports/ui/components/scheduled-scan/scheduled-scan.html
index c5c5c72..2abdcaf 100644
--- a/ui/imports/ui/components/scheduled-scan/scheduled-scan.html
+++ b/ui/imports/ui/components/scheduled-scan/scheduled-scan.html
@@ -11,8 +11,17 @@
 <template name="ScheduledScan">
   <div class="os-scheduled-scan cards white">
 
+    {{#if (getState 'isMessage') }}
+    <div class="js-message-panel alert {{#if (getState 'isError')}}alert-danger{{/if}}
+        {{#if (getState 'isSuccess')}}alert-success{{/if}}" 
+        role="alert">
+      {{ getState 'message' }}
+    </div>
+    {{/if }}
+
     <h3>{{ getState 'pageHeader' }}</h3>
     <div class="sm-form-container">
+
       <form role="form" class="sm-item-form form-horizontal">
 
         <div class="sm-field-group-id cl-field-group">
@@ -103,14 +112,6 @@
 
       </form>
 
-      {{#if (getState 'isMessage') }}
-      <div class="js-message-panel alert {{#if (getState 'isError')}}alert-danger{{/if}}
-          {{#if (getState 'isSuccess')}}alert-success{{/if}}" 
-          role="alert">
-        {{ getState 'message' }}
-      </div>
-      {{/if }}
-
     </div>
   </div>
 </template>
diff --git a/ui/imports/ui/components/scheduled-scan/scheduled-scan.js b/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
index 4092d00..56622dc 100644
--- a/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
+++ b/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
@@ -41,10 +41,13 @@ Template.ScheduledScan.onCreated(function() {
     envsAsOptions: [],
     logLevelsAsOptions: [],
     pageHeader: 'Schedule a Scan',
+    reload: null,
   });
 
   instance.autorun(function () {
     let data = Template.currentData();
+    instance.state.get('reload');
+
     new SimpleSchema({
       _id: { 
         type: { _str: { type: String, regEx: SimpleSchema.RegEx.Id } }, 
@@ -55,6 +58,12 @@ Template.ScheduledScan.onCreated(function() {
     }).validate(data);
 
     instance.state.set('action', data.action);
+    instance.state.set('isError', false);
+    instance.state.set('isSuccess', false);
+    instance.state.set('isMessage', false);
+    instance.state.set('message', null);
+    instance.state.set('disabled', false);
+
     R.when(R.pipe(R.isNil, R.not), x => instance.state.set('_id', x))(data._id);
     R.when(R.pipe(R.isNil, R.not), x => instance.state.set('env', x))(data.env);
   });
@@ -500,4 +509,7 @@ function processActionResult(instance, error) {
   }
 
   //Router.go('/link-types-list');
+  setTimeout(() => {
+    instance.state.set('reload', Date.now());
+  }, 7000);
 }