fix(fe): validate cron format before send save request

semaphoreui · Sep 6, 2021 · 28cea35 · 28cea35
1 parent c236737
commit 28cea35
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 12 deletions.
diff --git a/api/projects/schedules.go b/api/projects/schedules.go
@@ -61,6 +61,25 @@ func GetTemplateSchedules(w http.ResponseWriter, r *http.Request) {
 	helpers.WriteJSON(w, http.StatusOK, tplSchedules)
 }
 
+func validateCronFormat(cronFormat string, w http.ResponseWriter) bool {
+	err := schedules.ValidateCronFormat(cronFormat)
+	if err == nil {
+		return true
+	}
+	helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
+		"error": "Cron: " + err.Error(),
+	})
+	return false
+}
+
+func ValidateScheduleCronFormat(w http.ResponseWriter, r *http.Request) {
+	var schedule db.Schedule
+	if !helpers.Bind(w, r, &schedule) {
+		return
+	}
+
+	_ = validateCronFormat(schedule.CronFormat, w)
+}
 
 // AddSchedule adds a template to the database
 func AddSchedule(w http.ResponseWriter, r *http.Request) {
@@ -71,16 +90,12 @@ func AddSchedule(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := schedules.ValidateCronFormat(schedule.CronFormat)
-	if err != nil {
-		helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
-			"error": "Cron: " + err.Error(),
-		})
+	if !validateCronFormat(schedule.CronFormat, w) {
 		return
 	}
 
 	schedule.ProjectID = project.ID
-	schedule, err = helpers.Store(r).CreateSchedule(schedule)
+	schedule, err := helpers.Store(r).CreateSchedule(schedule)
 	if err != nil {
 		helpers.WriteError(w, err)
 		return
@@ -130,15 +145,11 @@ func UpdateSchedule(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := schedules.ValidateCronFormat(schedule.CronFormat)
-	if err != nil {
-		helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
-			"error": "Cron: " + err.Error(),
-		})
+	if !validateCronFormat(schedule.CronFormat, w) {
 		return
 	}
 
-	err = helpers.Store(r).UpdateSchedule(schedule)
+	err := helpers.Store(r).UpdateSchedule(schedule)
 	if err != nil {
 		helpers.WriteError(w, err)
 		return

diff --git a/api/router.go b/api/router.go
@@ -137,6 +137,7 @@ func Route() *mux.Router {
 	projectUserAPI.Path("/templates").HandlerFunc(projects.AddTemplate).Methods("POST")
 
 	projectUserAPI.Path("/schedules").HandlerFunc(projects.AddSchedule).Methods("POST")
+	projectUserAPI.Path("/schedules/validate").HandlerFunc(projects.ValidateScheduleCronFormat).Methods("POST")
 
 	projectAdminAPI := authenticatedAPI.Path("/project/{project_id}").Subrouter()
 	projectAdminAPI.Use(projects.ProjectMiddleware, projects.MustBeAdmin)

diff --git a/web2/src/components/ItemFormBase.js b/web2/src/components/ItemFormBase.js
@@ -65,6 +65,7 @@ export default {
   methods: {
     async reset() {
       this.item = null;
+      this.formError = null;
       if (this.$refs.form) {
         this.$refs.form.resetValidation();
       }
@@ -79,6 +80,10 @@ export default {
       throw new Error('Not implemented'); // must me implemented in template
     },
 
+    beforeSave() {
+
+    },
+
     afterSave() {
 
     },
@@ -139,6 +144,8 @@ export default {
       let item;
 
       try {
+        await this.beforeSave();
+
         item = (await axios({
           method: this.isNew ? 'post' : 'put',
           url: this.isNew

diff --git a/web2/src/components/TemplateForm.vue b/web2/src/components/TemplateForm.vue
@@ -235,6 +235,21 @@ export default {
       return `/api/project/${this.projectId}/templates/${this.itemId}`;
     },
 
+    async beforeSave() {
+      if (this.cronFormat === '') {
+        return;
+      }
+
+      await axios({
+        method: 'post',
+        url: `/api/project/${this.projectId}/schedules/validate`,
+        responseType: 'json',
+        data: {
+          cron_format: this.cronFormat,
+        },
+      });
+    },
+
     async afterSave(newItem) {
       if (newItem || this.schedules.length === 0) {
         if (this.cronFormat != null && this.cronFormat !== '') {