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

package/dist/overmap-core.umd.cjs

@@ -1542,15 +1542,6 @@ 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];
@@ -2150,7 +2141,6 @@ var __publicField = (obj, key, value) => {
         }
       },
       updateIssueAttachment: updateAttachment,
-      updateIssueAttachments: updateAttachments,
       removeIssue: (state, action) => {
         if (action.payload in state.issues) {
           delete state.issues[action.payload];
@@ -2159,7 +2149,6 @@ var __publicField = (obj, key, value) => {
         }
       },
       removeIssueAttachment: removeAttachment,
-      removeIssueAttachments: removeAttachments,
       removeIssueUpdate: (state, action) => {
         if (action.payload in state.updates) {
           delete state.updates[action.payload];
@@ -2269,7 +2258,6 @@ var __publicField = (obj, key, value) => {
     addToRecentIssues,
     cleanRecentIssues,
     removeIssueAttachment,
-    removeIssueAttachments,
     removeAttachmentsOfIssue,
     removeIssue,
     removeIssueUpdate,
@@ -2283,7 +2271,6 @@ var __publicField = (obj, key, value) => {
     setVisibleStatuses,
     setVisibleUserIds,
     updateIssueAttachment,
-    updateIssueAttachments,
     updateIssue,
     // Commments
     addIssueComment,
@@ -4796,23 +4783,6 @@ var __publicField = (obj, key, value) => {
     }
   }
   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",
@@ -4839,7 +4809,6 @@ 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,
@@ -4873,7 +4842,6 @@ 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,
@@ -4907,7 +4875,6 @@ 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,
@@ -4973,54 +4940,26 @@ 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. */
-    // 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) => {
@@ -16166,7 +16105,6 @@ 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;
@@ -16445,7 +16383,6 @@ var __publicField = (obj, key, value) => {
   exports2.updateFormSubmissions = updateFormSubmissions;
   exports2.updateIssue = updateIssue;
   exports2.updateIssueAttachment = updateIssueAttachment;
-  exports2.updateIssueAttachments = updateIssueAttachments;
   exports2.updateLicense = updateLicense;
   exports2.updateOrCreateProject = updateOrCreateProject;
   exports2.updateOrganizationAccess = updateOrganizationAccess;