@overmap-ai/core 1.0.63-form-submission-fix.4 → 1.0.63-org-projs-only.1

package/dist/overmap-core.js

@@ -2594,10 +2594,8 @@ const selectAttachedFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     ],
     (issues, forms, formRevisions, submissions, issueId) => {
       const issue = issues[issueId];
-      if (!issue)
+      if (!issue || !issue.issue_type) {
         return [];
-      if (!issue.issue_type) {
-        return Object.values(submissions).filter((submission) => submission.issue === issueId);
       }
       const issueTypeForms = new Set(
         Object.keys(forms).filter((formId) => forms[formId].issue_type === issue.issue_type)
@@ -2652,10 +2650,8 @@ const selectAttachedFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
     ],
     (assets, forms, formRevisions, submissions, assetId) => {
       const asset = assets[assetId];
-      if (!asset)
+      if (!asset || !asset.asset_type) {
         return [];
-      if (!asset.asset_type) {
-        return Object.values(submissions).filter((submission) => submission.asset === assetId);
       }
       const issueTypeForms = new Set(
         Object.keys(forms).filter((formId) => forms[formId].asset_type === asset.asset_type)
@@ -5364,23 +5360,17 @@ class ProjectService extends BaseApiService {
    * @throws An APIError if the server returns an error, or any other error that may occur.
    */
   async add(project) {
-    if (!project.organization_owner && !project.user_owner) {
-      throw new Error("Project type was not chosen when trying to create a project");
-    }
     if (!project.bounds && !project.canvas_bounds) {
       throw new Error("Project must either have bounds or canvas_bounds set");
     }
-    const isOrganizationProject = !!project.organization_owner;
-    const url = isOrganizationProject ? `/organizations/${project.organization_owner}/projects/` : "/projects/";
-    const projectType = isOrganizationProject ? { organization_owner: project.organization_owner } : { user_owner: project.user_owner };
     return await this.enqueueRequest({
       description: "Create project",
       method: HttpMethod.POST,
-      url,
+      url: "/projects/",
       payload: {
         name: project.name,
         bounds: project.bounds,
-        ...projectType
+        organization_owner: project.organization_owner
       },
       blockers: [],
       blocks: []
@@ -5507,67 +5497,36 @@ const separateImageFromFields = async (fields) => {
   }
   return { fields: newFields, images };
 };
-class FormService extends BaseUploadService {
-  async bulkAddRevisionAttachments(revisionId, files) {
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = this.client.store.getState().userReducer.currentUser.id;
-    const filePayloads = {};
-    const offlineFormRevisionAttachments = [];
-    const attachmentPayloads = [];
-    for (const [fieldIdentifier, file] of Object.entries(files)) {
-      const sha1 = await hashFile(file);
-      if (!(sha1 in filePayloads)) {
-        filePayloads[sha1] = {
-          sha1,
-          file_type: file.type,
-          extension: file.name.split(".").pop(),
-          size: file.size
+class FormService extends BaseApiService {
+  constructor() {
+    super(...arguments);
+    // Attach images to revision, after uploading them to S3
+    __publicField(this, "getAttachImagePromises", (images, offlineRevisionId) => {
+      return Object.entries(images).map(async ([key, image]) => {
+        const sha1 = await hashFile(image);
+        await this.client.files.addCache(image, sha1);
+        const [fileProps] = await this.client.files.uploadFileToS3(sha1);
+        const revisionAttachmentPayload = offline({
+          ...fileProps,
+          revision: offlineRevisionId,
+          field_identifier: key
+        });
+        const attach = await this.enqueueRequest({
+          description: "Attach image to form revision field",
+          method: HttpMethod.POST,
+          url: `/forms/revisions/${offlineRevisionId}/attachments/`,
+          payload: revisionAttachmentPayload,
+          blockers: [revisionAttachmentPayload.revision],
+          blocks: [revisionAttachmentPayload.offline_id]
+        });
+        const offlinePayload = {
+          ...revisionAttachmentPayload,
+          file: URL.createObjectURL(image)
         };
-        await this.client.files.addCache(file, sha1);
-      }
-      const offlineFormRevisionAttachment = offline({
-        file: URL.createObjectURL(file),
-        file_type: file.type,
-        file_name: file.name,
-        file_sha1: sha1,
-        created_by: createdBy,
-        revision: revisionId,
-        submitted_at: submittedAt,
-        field_identifier: fieldIdentifier
+        this.dispatch(addFormRevisionAttachment(offlinePayload));
+        return attach;
       });
-      offlineFormRevisionAttachments.push(offlineFormRevisionAttachment);
-      const attachmentPayload = {
-        offline_id: offlineFormRevisionAttachment.offline_id,
-        name: file.name,
-        field_identifier: fieldIdentifier,
-        sha1
-      };
-      attachmentPayloads.push(attachmentPayload);
-    }
-    this.dispatch(addFormRevisionAttachments(offlineFormRevisionAttachments));
-    const promise = this.enqueueRequest({
-      description: "Attach files to form revision",
-      method: HttpMethod.POST,
-      url: `/forms/revisions/${revisionId}/attachments/bulk/`,
-      payload: {
-        submitted_at: submittedAt,
-        attachments: attachmentPayloads,
-        files: Object.values(filePayloads)
-      },
-      blockers: [revisionId],
-      blocks: offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
     });
-    promise.then((result) => {
-      this.processPresignedUrls(result.presigned_urls);
-      this.dispatch(updateFormRevisionAttachments(result.attachments));
-    }).catch(() => {
-      this.dispatch(
-        deleteFormRevisionAttachments(
-          offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
-        )
-      );
-    });
-    return [offlineFormRevisionAttachments, promise.then(({ attachments }) => attachments)];
   }
   async add(ownerId, form, initialRevision, urlPrefix) {
     const { fields, images } = await separateImageFromFields(initialRevision.fields);
@@ -5600,16 +5559,14 @@ class FormService extends BaseUploadService {
       blockers: [ownerId],
       blocks: [form.offline_id, offlineFormRevision.offline_id]
     });
-    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
-      offlineFormRevision.offline_id,
-      images
-    );
+    const attachImagesPromises = this.getAttachImagePromises(images, offlineFormRevision.offline_id);
     void formPromise.catch((e) => {
       this.dispatch(deleteForm(form.offline_id));
       this.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
       throw e;
     });
-    return [form, offlineFormRevision, offlineFormRevisionAttachments, formPromise, attachmentsPromise];
+    const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
+    return [form, offlineFormRevision, formPromise, settledPromise];
   }
   addForOrganization(organizationId, initialRevision) {
     const state = this.client.store.getState();
@@ -5691,16 +5648,14 @@ class FormService extends BaseUploadService {
       blockers: [formId],
       blocks: [offlineRevision.offline_id]
     });
-    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
-      fullRevision.offline_id,
-      images
-    );
+    const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
     void promise.then((result) => {
       this.dispatch(setFormRevision(result));
     }).catch(() => {
       this.dispatch(deleteFormRevision(fullRevision.offline_id));
     });
-    return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
+    const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
+    return [fullRevision, settledPromise];
   }
   async favorite(formId) {
     const { store } = this.client;
@@ -5863,71 +5818,46 @@ const separateFilesFromValues = (values) => {
   return { values: newValues, files };
 };
 class FormSubmissionService extends BaseUploadService {
-  async bulkAddSubmissionAttachments(submissionId, files) {
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = this.client.store.getState().userReducer.currentUser.id;
-    const filePayloads = {};
-    const offlineFormSubmissionAttachments = [];
-    const attachmentPayloads = [];
-    for (const [fieldIdentifier, filesArray] of Object.entries(files)) {
-      for (const file of filesArray) {
-        const sha1 = await hashFile(file);
-        if (!(sha1 in filePayloads)) {
-          filePayloads[sha1] = {
-            sha1,
-            file_type: file.type,
-            extension: file.name.split(".").pop(),
-            size: file.size
-          };
+  constructor() {
+    super(...arguments);
+    // Attach files to submission, after uploading them to S3
+    __publicField(this, "getAttachFilesPromises", (files, submission) => {
+      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: submission.offline_id,
+            field_identifier: key
+          });
+          const attach = await this.enqueueRequest({
+            description: "Attach file to form submission",
+            method: HttpMethod.POST,
+            url: `/forms/submission/${submission.offline_id}/attachments/`,
+            payload: submissionAttachmentPayload,
+            blockers: [
+              submission.asset,
+              submission.asset_stage,
+              submission.issue,
+              submission.form_revision
+            ].filter((x) => x !== void 0),
+            blocks: [submissionAttachmentPayload.offline_id]
+          });
+          const offlinePayload = {
+            ...submissionAttachmentPayload,
+            file: URL.createObjectURL(file)
+          };
+          this.dispatch(addFormSubmissionAttachment(offlinePayload));
+          attachResults.push(attach);
         }
-        const offlineFormSubmissionAttachment = offline({
-          file: URL.createObjectURL(file),
-          file_type: file.type,
-          file_name: file.name,
-          file_sha1: sha1,
-          created_by: createdBy,
-          submission: submissionId,
-          submitted_at: submittedAt,
-          field_identifier: fieldIdentifier
-        });
-        offlineFormSubmissionAttachments.push(offlineFormSubmissionAttachment);
-        const attachmentPayload = {
-          offline_id: offlineFormSubmissionAttachment.offline_id,
-          name: file.name,
-          sha1,
-          field_identifier: fieldIdentifier
-        };
-        attachmentPayloads.push(attachmentPayload);
-      }
-    }
-    this.dispatch(addFormSubmissionAttachments(offlineFormSubmissionAttachments));
-    const promise = this.enqueueRequest({
-      description: "Attach files to form submission",
-      method: HttpMethod.POST,
-      url: `/forms/submissions/${submissionId}/attachments/bulk/`,
-      payload: {
-        submitted_at: submittedAt,
-        attachments: attachmentPayloads,
-        files: Object.values(filePayloads)
-      },
-      blockers: [submissionId],
-      blocks: offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
-    });
-    promise.then((result) => {
-      this.processPresignedUrls(result.presigned_urls);
-      this.dispatch(updateFormSubmissionAttachments(result.attachments));
-    }).catch(() => {
-      this.dispatch(
-        deleteFormSubmissionAttachments(
-          offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
-        )
-      );
+        return attachResults;
+      });
     });
-    return [offlineFormSubmissionAttachments, promise.then(({ attachments }) => attachments)];
   }
-  // Outer promise is for hashing and caching files for submission attachments
-  async add(payload) {
+  add(payload) {
     const { store } = this.client;
     const state = store.getState();
     const activeProjectId = state.projectReducer.activeProjectId;
@@ -5935,12 +5865,12 @@ class FormSubmissionService extends BaseUploadService {
       throw new Error("Expected an active project");
     }
     const { values, files } = separateFilesFromValues(payload.values);
-    const offlineSubmission = offline({
+    const offlineSubmission = {
       ...payload,
       values,
       created_by: state.userReducer.currentUser.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
-    });
+    };
     const promise = this.enqueueRequest({
       description: "Respond to form",
       method: HttpMethod.POST,
@@ -5949,22 +5879,20 @@ class FormSubmissionService extends BaseUploadService {
       blockers: [payload.issue, payload.asset, payload.asset_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
-      blocks: [offlineSubmission.offline_id]
+      blocks: [payload.offline_id]
     });
+    const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
     this.dispatch(addFormSubmission(offlineSubmission));
-    const [offlineFormSubmissionAttachments, attachmentsPromise] = await this.bulkAddSubmissionAttachments(
-      offlineSubmission.offline_id,
-      files
-    );
-    promise.then((result) => {
+    void promise.then((result) => {
       this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
-      this.dispatch(deleteFormSubmission(offlineSubmission.offline_id));
+      this.dispatch(deleteFormSubmission(payload.offline_id));
       this.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
-    return [offlineSubmission, offlineFormSubmissionAttachments, promise, attachmentsPromise];
+    const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+    return [offlineSubmission, settledPromise];
   }
   // Note currently the bulkAdd method is specific to form submissions for assets
   // TODO: adapt the support bulk adding to any model type
@@ -6065,6 +5993,36 @@ class FormSubmissionService extends BaseUploadService {
     });
     return batchPromises;
   }
+  update(submission) {
+    const { store } = this.client;
+    const { values, files } = separateFilesFromValues(submission.values);
+    const attachFilesPromises = this.getAttachFilesPromises(files, submission);
+    const offlineSubmission = {
+      ...submission,
+      values
+    };
+    const submissionToBeUpdated = selectFormSubmission(submission.offline_id)(store.getState());
+    if (!submissionToBeUpdated) {
+      throw new Error(`Expected submission with offline_id ${submission.offline_id} to exist`);
+    }
+    this.dispatch(updateFormSubmission(offlineSubmission));
+    const promise = this.enqueueRequest({
+      description: "Patch form submission",
+      method: HttpMethod.PATCH,
+      url: `/forms/submissions/${submission.offline_id}/`,
+      payload: offlineSubmission,
+      blockers: [offlineSubmission.issue, offlineSubmission.asset, offlineSubmission.asset_stage].filter(
+        (x) => x !== void 0
+      ),
+      blocks: [offlineSubmission.offline_id]
+    });
+    promise.then((createdSubmission) => {
+      this.dispatch(setFormSubmission(createdSubmission));
+    }).catch(() => {
+      this.dispatch(setFormSubmission(submissionToBeUpdated));
+    });
+    return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
+  }
   async delete(submissionId) {
     const { store } = this.client;
     const state = store.getState();
@@ -6535,9 +6493,7 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.GET,
       url: `/billing/${license.offline_id}/`,
       isAuthNeeded: true,
-      blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-      ],
+      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6549,9 +6505,7 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/suspend/`,
       isAuthNeeded: true,
-      blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-      ],
+      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6563,9 +6517,7 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.PATCH,
       url: `/billing/${license.offline_id}/suspend/`,
       isAuthNeeded: true,
-      blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-      ],
+      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6577,9 +6529,7 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/`,
       isAuthNeeded: true,
-      blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-      ],
+      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6593,7 +6543,7 @@ class LicenseService extends BaseApiService {
       isAuthNeeded: true,
       payload: { project: project.id },
       blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : "",
+        license.organization_owner ? license.organization_owner.toString() : "",
         project.id ? project.id.toString() : ""
       ],
       blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
@@ -6607,9 +6557,7 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/project/`,
       isAuthNeeded: true,
-      blockers: [
-        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-      ],
+      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
       blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
     });
     this.dispatch(updateLicense(result));