#7

Author: spelkey-ucd

services/client/controllers/api/routes/form-entry.js

@@ -14,7 +14,7 @@ router.post('/:idOrName', json(), validate(schema.formIdOrNameSchema, {reqParts:
     }
     form = form.res;
 
-    const entrySchema = schema.formEntry?.[form.name]?.create;
+    const entrySchema = schema.formEntry?.[form.name]?.[req.body?.original_form_entry_id ? 'update' : 'create'];
     if ( !entrySchema ) {
       throw new Error(`No form entry schema found for form: ${form.name}`);
     }
@@ -26,6 +26,7 @@ router.post('/:idOrName', json(), validate(schema.formIdOrNameSchema, {reqParts:
     logger.info('Form entry validated', req.context.logSignal, { formId: form.form_id});
     delete validated.data._formId;
 
+    // todo: if new versioning is added, check if same user as og
     const r = await models.formEntry.create(form.form_id, validated.data);
     if ( r.error ) {
       throw r.error;

services/client/controllers/api/utils/validation/schemas/form-entry.js

@@ -26,19 +26,43 @@ function srPicklistItemsExist(field){
   }
 } 
 
+const srOriginalFormEntryExists = async (data, ctx) => {
+  if ( !data.original_form_entry_id ) return;
+  const existing = await models.formEntry.get(data.original_form_entry_id, data._formId);
+  if (existing.error) {
+    logger.error('Database error validating original form entry existence', { error: existing.error });
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: 'A database error occurred',
+      fatal: true
+    });
+    return;
+  }
+  if ( !existing.res) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: 'Original form entry not found or does not belong to this form',
+      path: ['original_form_entry_id']
+    });
+  }
+}
+
 const instructionStatsBase = z.object({
   '_formId': z.string(),
   'participant-count': requiredNumber(),
-  'instructor-session-type': requiredString().superRefine(srPicklistItemsExist('instructor-session-type'))
+  'instructor-session-type': requiredString().superRefine(srPicklistItemsExist('instructor-session-type')),
+  'department': requiredArray().superRefine(srPicklistItemsExist('department'))
 });
 
-const instructionStatsCreate = instructionStatsBase.extend({
-  'department': requiredArray().superRefine(srPicklistItemsExist('department')),
-});
+
+const instructionStatsUpdate = instructionStatsBase.partial().extend({
+  'original_form_entry_id': z.uuid()
+}).superRefine(srOriginalFormEntryExists);
 
 export default {
 
   'instruction-statistics': {
-    'create': instructionStatsCreate
+    'create': instructionStatsBase,
+    'update': instructionStatsUpdate
   }
 };

services/client/dev/controllers/FormEntryController.js

@@ -201,7 +201,11 @@ export default class FormEntryController {
         return html`<p>Form Not Found!</p>`;
       }
 
-      return template.render.call(this.host, this);
+      return [
+        this._renderFormVersionWarning(),
+        this._renderFormEntrySummary(),
+        template.render.call(this.host, this)
+      ];
     }
 
     if ( this.hostIsField ) {
@@ -215,6 +219,25 @@ export default class FormEntryController {
     return html``;
   }
 
+  _renderFormEntrySummary(){
+    if ( !this.formEntry ) return html``;
+    return html`
+      <div class="alert">
+        <div><span class="bold primary">Submitted:</span><span> ${new Date(this.formEntry.created_at).toLocaleString()}</span></div>
+        <div><span class="bold primary">Edited:</span><span> ${this.formEntry.form_entry_id !== this.formEntry.original_form_entry_id ? 'Yes' : 'No'}</span></div>
+      </div>
+    `;
+  }
+
+  _renderFormVersionWarning(){
+    if ( !this.formEntry || this.formEntry.is_latest_version ) return html``;
+    return html`
+      <div class="alert">
+        There is a <a href="/form/${this.formNameOrId}/${this.formEntry.versions[this.formEntry.versions.length - 1]}">newer version</a> of this submission available.
+      </div>
+    `
+  }
+
   renderActionButtons(){
     if ( this.form?.is_archived ) return html``;
     return html`
@@ -231,20 +254,29 @@ export default class FormEntryController {
   }
 
   async submit(){
-    const r = await this.models.FormEntryModel.create(this.form.name, this.payload);
+    const r = await this.models.FormEntryModel.create(this.form.name, {...this.payload, ...(this.formEntry ? { original_form_entry_id: this.formEntry?.original_form_entry_id } : {})});
     if ( r.state !== 'loaded' ) return;
-    this.models.AppStateModel.showToast({text: 'Submission successful', type: 'success'});
-    this.models.AppStateModel.refresh();
+    if ( this.formEntry ){
+      this.models.AppStateModel.showToast({text: 'Update successful', type: 'success'});
+      this.models.AppStateModel.setLocation(`/form/${this.formNameOrId}/${r.payload.form_entry_id}`);
+    } else {
+      this.models.AppStateModel.showToast({text: 'Submission successful', type: 'success'});
+      this.models.AppStateModel.refresh();
+    }
   }
 
   _onReset(){
-    this.setPayload({});
+    if ( this.formEntry?.fields ) {
+      this.setPayload({...this.formEntry.fields});
+    } else {
+      this.setPayload({});
+    }
   }
 
   async _onAppStateUpdate(e) {
     await this.update(e);
     if ( this.formEntry?.fields ) {
-      this.setPayload(this.formEntry.fields);
+      this.setPayload({...this.formEntry.fields});
     } else {
       this.setPayload({});
     }

services/lib/cork/models/AppStateModel.js

@@ -99,6 +99,7 @@ class AppStateModelImpl extends AppStateModel {
   addErrorRequest(req) {
     if ( req.errorSettings?.suppressError ) return;
     if ( req?.payload?.error?.response?.status == 422 && !req?.errorSettings?.showValidationErrors ) return; // validation errors handled by form
+    this.errorRequests = this.errorRequests.filter(r => r.payload.id !== req.payload.id);
     this.errorRequests.push(req);
     if ( this._errorVisible || this._showErrorTimer ) return;
 

services/lib/models/form-entry.js

@@ -21,9 +21,10 @@ class FormEntry {
     try {
       await client.query('BEGIN');
 
-      const d = pgClient.prepareObjectForInsert({ form_id: formId});
+      const d = pgClient.prepareObjectForInsert({ form_id: formId, original_form_entry_id: data.original_form_entry_id || null });
+      delete data.original_form_entry_id;
       const sql = `INSERT INTO ${config.db.tables.formEntry} (${d.keysString}) VALUES (${d.placeholdersString}) RETURNING form_entry_id;`;
-      let result = await client.query(sql, d.values);
+      const result = await client.query(sql, d.values);
       const formEntryId = result.rows[0].form_entry_id;
 
       for ( const [fieldName, fieldValue] of Object.entries(data) ) {