@overmap-ai/core 1.0.50-bulk-form-submission.1 → 1.0.50-bulk-form-submission.3

package/dist/overmap-core.js

@@ -1551,15 +1551,6 @@ function updateAttachment(state, action) {
     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];
@@ -2159,7 +2150,6 @@ const issueSlice = createSlice({
       }
     },
     updateIssueAttachment: updateAttachment,
-    updateIssueAttachments: updateAttachments,
     removeIssue: (state, action) => {
       if (action.payload in state.issues) {
         delete state.issues[action.payload];
@@ -2168,7 +2158,6 @@ const issueSlice = createSlice({
       }
     },
     removeIssueAttachment: removeAttachment,
-    removeIssueAttachments: removeAttachments,
     removeIssueUpdate: (state, action) => {
       if (action.payload in state.updates) {
         delete state.updates[action.payload];
@@ -2278,7 +2267,6 @@ const {
   addToRecentIssues,
   cleanRecentIssues,
   removeIssueAttachment,
-  removeIssueAttachments,
   removeAttachmentsOfIssue,
   removeIssue,
   removeIssueUpdate,
@@ -2292,7 +2280,6 @@ const {
   setVisibleStatuses,
   setVisibleUserIds,
   updateIssueAttachment,
-  updateIssueAttachments,
   updateIssue,
   // Commments
   addIssueComment,
@@ -4805,23 +4792,6 @@ class BaseApiService {
   }
 }
 class AttachmentService extends BaseApiService {
-  processPresignedUrls(presignedUrls) {
-    for (const [sha1, presignedUrl] of Object.entries(presignedUrls)) {
-      console.debug(sha1, presignedUrl);
-      void this.enqueueRequest({
-        url: presignedUrl.url,
-        description: "Upload file to S3",
-        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",
@@ -4848,7 +4818,6 @@ class AttachmentService extends BaseApiService {
     }
     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,
@@ -4882,7 +4851,6 @@ class AttachmentService extends BaseApiService {
     }
     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,
@@ -4916,7 +4884,6 @@ class AttachmentService extends BaseApiService {
     }
     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,
@@ -4982,54 +4949,26 @@ class AttachmentService extends BaseApiService {
   /** 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. */
-  // 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)));
+  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);
     });
-    return [offlineAttachments, promise.then(({ attachments }) => attachments)];
   }
   attachFilesToComponent(filesToSubmit, componentId) {
     return filesToSubmit.map((file) => {
@@ -16176,7 +16115,6 @@ export {
   removeFavouriteProjectId,
   removeIssue,
   removeIssueAttachment,
-  removeIssueAttachments,
   removeIssueComment,
   removeIssueComments,
   removeIssueUpdate,
@@ -16455,7 +16393,6 @@ export {
   updateFormSubmissions,
   updateIssue,
   updateIssueAttachment,
-  updateIssueAttachments,
   updateLicense,
   updateOrCreateProject,
   updateOrganizationAccess,