diff --git a/projects/admin-console/src/app/dataset-update/dataset-update.component.html b/projects/admin-console/src/app/dataset-update/dataset-update.component.html index d9bc60f..d6fa0e7 100755 --- a/projects/admin-console/src/app/dataset-update/dataset-update.component.html +++ b/projects/admin-console/src/app/dataset-update/dataset-update.component.html @@ -2,7 +2,7 @@

Update Specification

- +

Use an expression in cron format to specify how often this data set gets updated.

Expression should be made up of 6 parts.

@@ -19,8 +19,8 @@

Use an expression in cron format to specify how often this

0 15 0,12 * * ? updates every day at 15 past midnight and 15 past noon.

0 0 12 ? * 3 updates every Tuesday at noon.

0 45 13 5 * ? updates at 1:45 pm on the fifth of every month.

-

To cancel an existing update just use a BLANK entry.

+

To cancel an existing update just use the word "cancel" as the entry.

You can read more about cron expressions in the Quartz documentation.

- +
diff --git a/projects/admin-console/src/app/dataset-update/dataset-update.component.ts b/projects/admin-console/src/app/dataset-update/dataset-update.component.ts index 60ce788..a5a0d1d 100755 --- a/projects/admin-console/src/app/dataset-update/dataset-update.component.ts +++ b/projects/admin-console/src/app/dataset-update/dataset-update.component.ts @@ -30,16 +30,19 @@ export class DatasetUpdateComponent implements OnInit { this.stateChanges = this.applicationStateService.stateChanged.subscribe(state => { if (state) { - this.update_dataset = state.dataset_to_edit_updates; - if ( this.update_dataset ) { - this.edit_dataset_update = true; - this.dataset_title = this.update_dataset.title; - if (this.update_dataset.datasetProperties) { - for (let i = 0; i < this.update_dataset.datasetProperties.length; i++) { - let property: DatasetProperty = this.update_dataset.datasetProperties[i]; - if ( property.type == 'update') { - this.cron_spec = property.value; - this.update_property = property; + // If it's show progress we're doing an update so don't set the form + if (!state.showProgress) { + this.update_dataset = state.dataset_to_edit_updates; + if (this.update_dataset) { + this.edit_dataset_update = true; + this.dataset_title = this.update_dataset.title; + if (this.update_dataset.datasetProperties) { + for (let i = 0; i < this.update_dataset.datasetProperties.length; i++) { + let property: DatasetProperty = this.update_dataset.datasetProperties[i]; + if (property.type == 'update') { + this.cron_spec = property.value; + this.update_property = property; + } } } } @@ -57,7 +60,7 @@ export class DatasetUpdateComponent implements OnInit { save() { let update: UpdateSpec = new class implements UpdateSpec { cron_spec: string; - datset: any; + dataset: any; }; this.applicationStateService.setForRequest(); update["cron_spec"] = this.cron_spec;