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

package/dist/overmap-core.js

@@ -3017,7 +3017,7 @@ const userFormSlice = createSlice({
         delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
       }
     },
-    addUserFormSubmission: (state, action) => {
+    updateOrCreateUserFormSubmission: (state, action) => {
       state.submissions[action.payload.offline_id] = action.payload;
     },
     addUserFormSubmissionAttachment: (state, action) => {
@@ -3106,7 +3106,7 @@ const {
   addUserForm,
   addUserForms,
   addUserFormRevisions,
-  addUserFormSubmission,
+  updateOrCreateUserFormSubmission,
   addUserFormSubmissions,
   deleteUserFormSubmission,
   deleteUserFormSubmissions,
@@ -5709,6 +5709,43 @@ const separateFilesFromValues = (payload) => {
   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();
@@ -5725,36 +5762,7 @@ class UserFormSubmissionService extends BaseApiService {
       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,
@@ -5764,9 +5772,9 @@ class UserFormSubmissionService extends BaseApiService {
       ...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));
@@ -5774,6 +5782,26 @@ class UserFormSubmissionService extends BaseApiService {
     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: `/forms/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();
@@ -5789,7 +5817,7 @@ class UserFormSubmissionService extends BaseApiService {
       });
     } catch (e) {
       if (submission) {
-        store.dispatch(addUserFormSubmission(submission));
+        store.dispatch(updateOrCreateUserFormSubmission(submission));
       }
       throw e;
     }
@@ -10336,7 +10364,7 @@ const FormRenderer = memo(
       ] }) }),
       inputs,
       !readonly && /* @__PURE__ */ jsxs(Flex, { className: styles$6.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
-        cancelText && /* @__PURE__ */ jsx(Button, { type: "button", variant: "solid", onClick: onCancel, children: cancelText }),
+        cancelText && /* @__PURE__ */ jsx(Button, { type: "button", variant: "solid", severity: "info", onClick: onCancel, children: cancelText }),
         /* @__PURE__ */ jsx(Button, { type: "submit", disabled: !formik.isValid, children: submitText })
       ] })
     ] }) }) });
@@ -11915,7 +11943,6 @@ export {
   addUserFormRevision,
   addUserFormRevisionAttachment,
   addUserFormRevisions,
-  addUserFormSubmission,
   addUserFormSubmissionAttachment,
   addUserFormSubmissions,
   addUserForms,
@@ -12249,6 +12276,7 @@ export {
   updateComponent,
   updateIssue,
   updateOrCreateProject,
+  updateOrCreateUserFormSubmission,
   updateOrganizationAccess,
   updateProjectAccess,
   updateStages,