@overmap-ai/core 1.0.48-bulk-form-submission.2 → 1.0.48-bulk-form-submission.4

package/dist/overmap-core.umd.cjs

@@ -795,6 +795,19 @@ var __publicField = (obj, key, value) => {
     element.click();
     document.body.removeChild(element);
   }
+  const constructUploadedFilePayloads = async (files) => {
+    const filePayloads = {};
+    for (const file of files) {
+      const sha1 = await hashFile(file);
+      filePayloads[sha1] = {
+        sha1,
+        extension: file.name.split(".").pop() || "",
+        file_type: file.type,
+        size: file.size
+      };
+    }
+    return Object.values(filePayloads);
+  };
   const fileToBlob = async (dataUrl) => {
     return (await fetch(dataUrl)).blob();
   };
@@ -1528,6 +1541,15 @@ var __publicField = (obj, key, value) => {
       throw new Error(`Attachment ${action.payload.offline_id} does not exist.`);
     }
   }
+  function updateAttachments(state, action) {
+    for (const attachment of action.payload) {
+      if (attachment.offline_id in state.attachments) {
+        state.attachments[attachment.offline_id] = attachment;
+      } else {
+        throw new Error(`Attachment ${attachment.offline_id} does not exist.`);
+      }
+    }
+  }
   function removeAttachment(state, action) {
     if (action.payload in state.attachments) {
       delete state.attachments[action.payload];
@@ -2121,6 +2143,7 @@ var __publicField = (obj, key, value) => {
         }
       },
       updateIssueAttachment: updateAttachment,
+      updateIssueAttachments: updateAttachments,
       removeIssue: (state, action) => {
         if (action.payload in state.issues) {
           delete state.issues[action.payload];
@@ -2129,6 +2152,7 @@ var __publicField = (obj, key, value) => {
         }
       },
       removeIssueAttachment: removeAttachment,
+      removeIssueAttachments: removeAttachments,
       removeIssueUpdate: (state, action) => {
         if (action.payload in state.updates) {
           delete state.updates[action.payload];
@@ -2238,6 +2262,7 @@ var __publicField = (obj, key, value) => {
     addToRecentIssues,
     cleanRecentIssues,
     removeIssueAttachment,
+    removeIssueAttachments,
     removeAttachmentsOfIssue,
     removeIssue,
     removeIssueUpdate,
@@ -2251,6 +2276,7 @@ var __publicField = (obj, key, value) => {
     setVisibleStatuses,
     setVisibleUserIds,
     updateIssueAttachment,
+    updateIssueAttachments,
     updateIssue,
     // Commments
     addIssueComment,
@@ -3814,6 +3840,16 @@ var __publicField = (obj, key, value) => {
           state.attachments[attachment.offline_id] = attachment;
         }
       },
+      updateFormSubmissionAttachments: (state, action) => {
+        for (const attachment of action.payload) {
+          if (state.attachments[attachment.offline_id] === void 0) {
+            throw new Error(`Attachment with offline_id ${attachment.offline_id} does not exist`);
+          }
+        }
+        for (const attachment of action.payload) {
+          state.attachments[attachment.offline_id] = attachment;
+        }
+      },
       // The delete actions for UserFormSubmissionAttachments are not used in the app, but are included for completeness
       // Could be used if editing a submission is ever supported, will be applicable for supporting tip tap content in submissions
       deleteFormSubmissionAttachment: (state, action) => {
@@ -3844,6 +3880,7 @@ var __publicField = (obj, key, value) => {
     addFormSubmissionAttachment,
     addFormSubmissionAttachments,
     setFormSubmissionAttachments,
+    updateFormSubmissionAttachments,
     deleteFormSubmissionAttachment,
     deleteFormSubmissionAttachments
   } = formSubmissionSlice.actions;
@@ -4697,6 +4734,22 @@ var __publicField = (obj, key, value) => {
     }
   }
   class AttachmentService extends BaseApiService {
+    processPresignedUrls(presignedUrls) {
+      for (const [sha1, presignedUrl] of Object.entries(presignedUrls)) {
+        void this.enqueueRequest({
+          url: presignedUrl.url,
+          description: "Upload file",
+          method: HttpMethod.POST,
+          isExternalUrl: true,
+          isAuthNeeded: false,
+          attachmentHash: sha1,
+          // TODO: can we use the sha1 as the blocker?
+          blockers: [`s3-${sha1}`],
+          blocks: [sha1],
+          s3url: presignedUrl
+        });
+      }
+    }
     fetchAll(projectId) {
       const promise = this.enqueueRequest({
         description: "Fetch attachments",
@@ -4722,6 +4775,7 @@ var __publicField = (obj, key, value) => {
       }
       const offlineAttachment = {
         ...attachmentPayload,
+        // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
         file: attachmentPayload.file.objectURL,
         file_name: attachmentPayload.file.name,
         file_type: attachmentPayload.file.type,
@@ -4755,6 +4809,7 @@ var __publicField = (obj, key, value) => {
       }
       const offlineAttachment = {
         ...attachmentPayload,
+        // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
         file: attachmentPayload.file.objectURL,
         file_name: attachmentPayload.file.name,
         file_type: attachmentPayload.file.type,
@@ -4788,6 +4843,7 @@ var __publicField = (obj, key, value) => {
       }
       const offlineAttachment = {
         ...attachmentPayload,
+        // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
         file: attachmentPayload.file.objectURL,
         file_name: attachmentPayload.file.name,
         file_type: attachmentPayload.file.type,
@@ -4840,7 +4896,7 @@ var __publicField = (obj, key, value) => {
           offline_id,
           project,
           description: description2 ?? "",
-          submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
           ...fileProps
         }
       });
@@ -4853,26 +4909,54 @@ var __publicField = (obj, key, value) => {
     /** the outer Promise is needed to await the hashing of each file, which is required before offline use. If wanting to
      * attach promise handlers to the request to add the attachment in the backend, apply it on the promise returned from the
      * OptimisticModelResult. */
-    attachFilesToIssue(filesToSubmit, issueId) {
-      return filesToSubmit.map((file) => {
-        if (!(file instanceof File)) {
-          throw new Error("Expected a File instance.");
-        }
-        const photoAttachmentPromise = async (file2) => {
-          const hash = await hashFile(file2);
-          const attachment = offline({
-            file: file2,
-            file_name: file2.name,
-            file_type: file2.type,
-            issue: issueId,
-            file_sha1: hash,
-            submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-            created_by: this.client.store.getState().userReducer.currentUser.id
-          });
-          return this.addIssueAttachment(attachment);
-        };
-        return photoAttachmentPromise(file);
+    // note the method is only marked as async since files needs to be hashed
+    async attachFilesToIssue(files, issueId) {
+      const { store } = this.client;
+      const offlineAttachments = [];
+      const attachmentsPayload = [];
+      const currentUser = store.getState().userReducer.currentUser;
+      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+      for (const file of files) {
+        const attachment = offline({
+          file: URL.createObjectURL(file),
+          file_name: file.name,
+          file_type: file.type,
+          file_sha1: await hashFile(file),
+          description: "",
+          submitted_at: submittedAt,
+          created_by: currentUser.id,
+          issue: issueId
+        });
+        attachmentsPayload.push({
+          offline_id: attachment.offline_id,
+          name: attachment.file_name,
+          sha1: attachment.file_sha1,
+          description: attachment.description,
+          created_by: attachment.created_by,
+          issue_id: attachment.issue
+        });
+        offlineAttachments.push(attachment);
+      }
+      store.dispatch(addIssueAttachments(offlineAttachments));
+      const promise = this.enqueueRequest({
+        description: "Attach files to issue",
+        method: HttpMethod.POST,
+        url: `/issues/${issueId}/attach/`,
+        payload: {
+          submitted_at: submittedAt,
+          attachments: attachmentsPayload,
+          files: await constructUploadedFilePayloads(files)
+        },
+        blocks: offlineAttachments.map((attachment) => attachment.offline_id),
+        blockers: offlineAttachments.map((attachment) => attachment.file_sha1)
+      });
+      promise.then(({ attachments, presigned_urls }) => {
+        store.dispatch(updateIssueAttachments(attachments));
+        this.processPresignedUrls(presigned_urls);
+      }).catch(() => {
+        store.dispatch(removeIssueAttachments(offlineAttachments.map((attachment) => attachment.offline_id)));
       });
+      return [offlineAttachments, promise.then(({ attachments }) => attachments)];
     }
     attachFilesToComponent(filesToSubmit, componentId) {
       return filesToSubmit.map((file) => {
@@ -7148,17 +7232,18 @@ var __publicField = (obj, key, value) => {
     }
     // Note currently the bulkAdd method is specific to form submissions for components
     // TODO: adapt the support bulk adding to any model type
-    bulkAdd(args) {
-      const { form_revision, values: argsValues, component_offline_ids } = args;
+    async bulkAdd(args) {
+      const { form_revision, values: argsValues, componentOfflineIds } = args;
       const { store } = this.client;
-      const submissions = [];
+      const offlineSubmissions = [];
+      const offlineAttachments = [];
       const submissionOfflineIds = [];
-      const offline_ids_to_component_ids = [];
-      let attachFilesPromises = [];
+      const submissionsPayload = [];
+      const attachmentsPayload = [];
       const { values, files } = separateFilesFromValues(argsValues);
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const createdBy = store.getState().userReducer.currentUser.id;
-      for (const component_id of component_offline_ids) {
+      for (const component_id of componentOfflineIds) {
         const submission = offline({
           form_revision,
           values,
@@ -7166,12 +7251,43 @@ var __publicField = (obj, key, value) => {
           submitted_at: submittedAt,
           component: component_id
         });
-        attachFilesPromises = attachFilesPromises.concat(this.getAttachFilesPromises(files, submission));
         submissionOfflineIds.push(submission.offline_id);
-        offline_ids_to_component_ids.push([submission.offline_id, component_id]);
-        submissions.push(submission);
+        submissionsPayload.push({ offline_id: submission.offline_id, component_id });
+        offlineSubmissions.push(submission);
+        for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
+          for (const file of fileArray) {
+            const sha1 = await hashFile(file);
+            await this.client.files.addCache(file, sha1);
+            const offlineAttachment = offline({
+              file_name: file.name,
+              file_sha1: sha1,
+              file: URL.createObjectURL(file),
+              submission: submission.offline_id,
+              field_identifier: fieldIdentifier
+            });
+            offlineAttachments.push(offlineAttachment);
+            attachmentsPayload.push({
+              offline_id: offlineAttachment.offline_id,
+              submission_id: submission.offline_id,
+              sha1,
+              name: file.name,
+              field_identifier: fieldIdentifier
+            });
+          }
+        }
+      }
+      const filesRecord = {};
+      for (const file of Object.values(files).flat()) {
+        const sha1 = await hashFile(file);
+        filesRecord[sha1] = {
+          sha1,
+          extension: file.name.split(".").pop() || "",
+          file_type: file.type,
+          size: file.size
+        };
       }
-      store.dispatch(addFormSubmissions(submissions));
+      store.dispatch(addFormSubmissions(offlineSubmissions));
+      store.dispatch(addFormSubmissionAttachments(offlineAttachments));
       const promise = this.enqueueRequest({
         description: "Bulk add form submissions",
         method: HttpMethod.POST,
@@ -7179,17 +7295,37 @@ var __publicField = (obj, key, value) => {
         payload: {
           form_data: values,
           submitted_at: submittedAt,
-          offline_ids_to_component_ids
+          submissions: submissionsPayload,
+          attachments: attachmentsPayload,
+          files: Object.values(filesRecord)
         },
-        blockers: component_offline_ids,
+        blockers: componentOfflineIds,
         blocks: submissionOfflineIds
       });
-      promise.then((createdSubmissions) => {
-        store.dispatch(updateFormSubmissions(createdSubmissions));
+      promise.then(({ submissions, attachments, presigned_urls }) => {
+        store.dispatch(updateFormSubmissions(submissions));
+        store.dispatch(updateFormSubmissionAttachments(attachments));
+        for (const [sha1, presigned_url] of Object.entries(presigned_urls)) {
+          const file = filesRecord[sha1];
+          if (!file)
+            continue;
+          void this.enqueueRequest({
+            url: presigned_url.url,
+            description: "Upload file",
+            method: HttpMethod.POST,
+            isExternalUrl: true,
+            isAuthNeeded: false,
+            attachmentHash: sha1,
+            blockers: [`s3-${file.sha1}.${file.extension}`],
+            blocks: [sha1],
+            s3url: presigned_url
+          });
+        }
       }).catch(() => {
         store.dispatch(deleteFormSubmissions(submissionOfflineIds));
+        store.dispatch(deleteFormSubmissionAttachments(offlineAttachments.map((x) => x.offline_id)));
       });
-      return [submissions, promise.then(() => Promise.all(attachFilesPromises).then(() => promise))];
+      return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
     }
     update(submission) {
       const { store } = this.client;
@@ -15821,6 +15957,7 @@ var __publicField = (obj, key, value) => {
   exports2.componentStageSlice = componentStageSlice;
   exports2.componentTypeReducer = componentTypeReducer;
   exports2.componentTypeSlice = componentTypeSlice;
+  exports2.constructUploadedFilePayloads = constructUploadedFilePayloads;
   exports2.coordinatesAreEqual = coordinatesAreEqual;
   exports2.coordinatesToLiteral = coordinatesToLiteral;
   exports2.coordinatesToPointGeometry = coordinatesToPointGeometry;
@@ -15949,6 +16086,7 @@ var __publicField = (obj, key, value) => {
   exports2.removeFavouriteProjectId = removeFavouriteProjectId;
   exports2.removeIssue = removeIssue;
   exports2.removeIssueAttachment = removeIssueAttachment;
+  exports2.removeIssueAttachments = removeIssueAttachments;
   exports2.removeIssueComment = removeIssueComment;
   exports2.removeIssueComments = removeIssueComments;
   exports2.removeIssueUpdate = removeIssueUpdate;
@@ -16213,9 +16351,11 @@ var __publicField = (obj, key, value) => {
   exports2.updateComponentTypeAttachment = updateComponentTypeAttachment;
   exports2.updateDocuments = updateDocuments;
   exports2.updateFormSubmission = updateFormSubmission;
+  exports2.updateFormSubmissionAttachments = updateFormSubmissionAttachments;
   exports2.updateFormSubmissions = updateFormSubmissions;
   exports2.updateIssue = updateIssue;
   exports2.updateIssueAttachment = updateIssueAttachment;
+  exports2.updateIssueAttachments = updateIssueAttachments;
   exports2.updateLicense = updateLicense;
   exports2.updateOrCreateProject = updateOrCreateProject;
   exports2.updateOrganizationAccess = updateOrganizationAccess;