@overmap-ai/core 1.0.38-component-fields.16 → 1.0.38-component-fields.17

package/dist/overmap-core.umd.cjs

@@ -3013,7 +3013,7 @@ var __publicField = (obj, key, value) => {
           delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
         }
       },
-      addUserFormSubmission: (state, action) => {
+      updateOrCreateUserFormSubmission: (state, action) => {
         state.submissions[action.payload.offline_id] = action.payload;
       },
       addUserFormSubmissionAttachment: (state, action) => {
@@ -3102,7 +3102,7 @@ var __publicField = (obj, key, value) => {
     addUserForm,
     addUserForms,
     addUserFormRevisions,
-    addUserFormSubmission,
+    updateOrCreateUserFormSubmission,
     addUserFormSubmissions,
     deleteUserFormSubmission,
     deleteUserFormSubmissions,
@@ -5705,6 +5705,43 @@ var __publicField = (obj, key, value) => {
     return { payloadWithoutFiles, files };
   };
   class UserFormSubmissionService extends BaseApiService {
+    constructor() {
+      super(...arguments);
+      // Attach files to submission, after uploading them to S3
+      __publicField(this, "getAttachFilesPromises", (files, payload) => {
+        const { store } = this.client;
+        return Object.entries(files).map(async ([key, fileArray]) => {
+          const attachResults = [];
+          for (const file of fileArray) {
+            const sha1 = await hashFile(file);
+            await this.client.files.addCache(file, sha1);
+            const [fileProps] = await this.client.files.uploadFileToS3(sha1);
+            const submissionAttachmentPayload = offline({
+              ...fileProps,
+              submission: payload.offline_id,
+              field_identifier: key
+            });
+            const attach = await this.enqueueRequest({
+              description: "Attach file to form submission",
+              method: HttpMethod.POST,
+              url: `/forms/submission/${payload.offline_id}/attachments/`,
+              payload: submissionAttachmentPayload,
+              blockers: [payload.component, payload.issue, payload.form_revision].filter(
+                (x) => x !== void 0
+              ),
+              blocks: [submissionAttachmentPayload.offline_id]
+            });
+            const offlinePayload = {
+              ...submissionAttachmentPayload,
+              file: URL.createObjectURL(file)
+            };
+            store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
+            attachResults.push(attach);
+          }
+          return attachResults;
+        });
+      });
+    }
     add(payload) {
       const { store } = this.client;
       const state = store.getState();
@@ -5721,36 +5758,7 @@ var __publicField = (obj, key, value) => {
         blockers: [payload.issue, payload.component].filter((x) => x !== void 0),
         blocks: [payload.offline_id]
       });
-      const attachFilesPromises = Object.entries(files).map(async ([key, fileArray]) => {
-        const attachResults = [];
-        for (const file of fileArray) {
-          const sha1 = await hashFile(file);
-          await this.client.files.addCache(file, sha1);
-          const [fileProps] = await this.client.files.uploadFileToS3(sha1);
-          const submissionAttachmentPayload = offline({
-            ...fileProps,
-            submission: payload.offline_id,
-            field_identifier: key
-          });
-          const attach = await this.enqueueRequest({
-            description: "Attach file to form submission",
-            method: HttpMethod.POST,
-            url: `/forms/submission/${payload.offline_id}/attachments/`,
-            payload: submissionAttachmentPayload,
-            blockers: [payload.component, payload.issue, payload.form_revision].filter(
-              (x) => x !== void 0
-            ),
-            blocks: [submissionAttachmentPayload.offline_id]
-          });
-          const offlinePayload = {
-            ...submissionAttachmentPayload,
-            file: URL.createObjectURL(file)
-          };
-          store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
-          attachResults.push(attach);
-        }
-        return attachResults;
-      });
+      const attachFilesPromises = this.getAttachFilesPromises(files, payload);
       const fullOfflineResult = {
         ...payload,
         created_by: state.userReducer.currentUser.id,
@@ -5760,9 +5768,9 @@ var __publicField = (obj, key, value) => {
         ...fullOfflineResult,
         ...payloadWithoutFiles
       };
-      store.dispatch(addUserFormSubmission(offlineResultWithoutFiles));
+      store.dispatch(updateOrCreateUserFormSubmission(offlineResultWithoutFiles));
       void promise.then((result) => {
-        store.dispatch(addUserFormSubmission(result));
+        store.dispatch(updateOrCreateUserFormSubmission(result));
         return result;
       }).catch(() => {
         store.dispatch(deleteUserFormSubmission(payload.offline_id));
@@ -5770,6 +5778,26 @@ var __publicField = (obj, key, value) => {
       const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
       return [fullOfflineResult, settledPromise];
     }
+    update(submission) {
+      const { store } = this.client;
+      const { payloadWithoutFiles, files } = separateFilesFromValues(submission);
+      if (!("created_by" in payloadWithoutFiles) || !("created_at" in payloadWithoutFiles)) {
+        throw new Error("Expected payloadWithoutFiles to have created_by and created_at fields.");
+      }
+      const attachFilesPromises = this.getAttachFilesPromises(files, submission);
+      store.dispatch(updateOrCreateUserFormSubmission(payloadWithoutFiles));
+      const promise = this.enqueueRequest({
+        description: "Patch form submission",
+        method: HttpMethod.PATCH,
+        url: `/submissions/${submission.offline_id}/`,
+        payload: payloadWithoutFiles,
+        blockers: [payloadWithoutFiles.issue, payloadWithoutFiles.component].filter(
+          (x) => x !== void 0
+        ),
+        blocks: [payloadWithoutFiles.offline_id]
+      });
+      return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+    }
     async delete(submissionId) {
       const { store } = this.client;
       const state = store.getState();
@@ -5785,7 +5813,7 @@ var __publicField = (obj, key, value) => {
         });
       } catch (e) {
         if (submission) {
-          store.dispatch(addUserFormSubmission(submission));
+          store.dispatch(updateOrCreateUserFormSubmission(submission));
         }
         throw e;
       }
@@ -11910,7 +11938,6 @@ var __publicField = (obj, key, value) => {
   exports2.addUserFormRevision = addUserFormRevision;
   exports2.addUserFormRevisionAttachment = addUserFormRevisionAttachment;
   exports2.addUserFormRevisions = addUserFormRevisions;
-  exports2.addUserFormSubmission = addUserFormSubmission;
   exports2.addUserFormSubmissionAttachment = addUserFormSubmissionAttachment;
   exports2.addUserFormSubmissions = addUserFormSubmissions;
   exports2.addUserForms = addUserForms;
@@ -12244,6 +12271,7 @@ var __publicField = (obj, key, value) => {
   exports2.updateComponent = updateComponent;
   exports2.updateIssue = updateIssue;
   exports2.updateOrCreateProject = updateOrCreateProject;
+  exports2.updateOrCreateUserFormSubmission = updateOrCreateUserFormSubmission;
   exports2.updateOrganizationAccess = updateOrganizationAccess;
   exports2.updateProjectAccess = updateProjectAccess;
   exports2.updateStages = updateStages;