@overmap-ai/core 1.0.65-bulk-form-submit.0 → 1.0.65-error-message-fix.1

package/dist/constants/offline.d.ts

@@ -1 +1 @@
-export declare const OUTBOX_RETRY_DELAY = 5000;
+export declare const OUTBOX_RETRY_DELAY = 60000;

package/dist/overmap-core.js

@@ -229,13 +229,16 @@ const UNKNOWN_ERROR_MESSAGE = "An unknown error occurred";
 const MAX_ERROR_MESSAGE_LENGTH = 500;
 const _SPECIAL_KEYS = ["non_field_errors", "detail"];
 function extractErrorMessage(errorRes, err) {
+  console.debug("extracting error message from response", errorRes, err);
   let ret;
   if (errorRes == null ? void 0 : errorRes.body) {
     if (typeof errorRes.body === "object") {
       const responseBody = errorRes.body;
       if (typeof responseBody.error === "string") {
+        console.debug("body.error is string", responseBody.error);
         ret = responseBody.error;
       } else if (typeof responseBody.message === "string") {
+        console.debug("body.message is string", responseBody.message);
         ret = responseBody.message;
       } else if (responseBody.body) {
         try {
@@ -252,16 +255,20 @@ function extractErrorMessage(errorRes, err) {
             }
             return `${key}: ${JSON.stringify(value)}`;
           }).join("\n");
+          console.debug("parsing error body", ret);
         } catch (e) {
           console.error("Failed to extract error message from response body", e);
         }
       }
     } else if (typeof errorRes.body === "string") {
+      console.debug("error body is string", errorRes.body);
       ret = errorRes.body;
     }
   } else if (errorRes == null ? void 0 : errorRes.text) {
+    console.debug("error.text", errorRes.text);
     ret = errorRes.text;
   } else if (err instanceof Error) {
+    console.debug("instance of Error", err.message);
     ret = err.message;
   }
   if (!ret || ret.length > MAX_ERROR_MESSAGE_LENGTH) {
@@ -657,7 +664,7 @@ const emailRegex = /^.+@.+\..+$/;
 const fullAssetMarkerSize = 45;
 const DEFAULT_ISSUE_STATUS = IssueStatus.BACKLOG;
 const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
-const OUTBOX_RETRY_DELAY = 5e3;
+const OUTBOX_RETRY_DELAY = 6e4;
 const EMPTY_ARRAY = Object.freeze([]);
 let debug = false;
 const REACT_APP_DEBUG_MEMOIZATION = {}.REACT_APP_DEBUG_MEMOIZATION || "";
@@ -6223,22 +6230,50 @@ class FormSubmissionService extends BaseUploadService {
     }
   }
   async refreshStore(projectId) {
-    const submissions = await this.enqueueRequest({
-      description: "Fetch form submissions",
+    const formSubmissions = {};
+    const modelSubmissions = await this.enqueueRequest({
+      description: "Fetch model submissions",
       method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/submissions/`,
+      url: `/forms/in-project/${projectId}/submissions/model/latest/`,
       blockers: [],
       blocks: []
     });
-    this.dispatch(initializeFormSubmissions(submissions));
-    const attachments = await this.enqueueRequest({
-      description: "Fetch form attachments",
+    for (const modelSubmission of modelSubmissions) {
+      formSubmissions[modelSubmission.offline_id] = modelSubmission;
+    }
+    const standaloneSubmissions = await this.enqueueRequest({
+      description: "Fetch standalone submissions",
+      method: HttpMethod.GET,
+      url: `/forms/in-project/${projectId}/submissions/standalone/`,
+      blockers: [],
+      blocks: []
+    });
+    for (const standaloneSubmission of standaloneSubmissions) {
+      formSubmissions[standaloneSubmission.offline_id] = standaloneSubmission;
+    }
+    this.dispatch(initializeFormSubmissions(Object.values(formSubmissions)));
+    const attachments = {};
+    const modelAttachments = await this.enqueueRequest({
+      description: "Fetch model submission attachments",
       method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/attachments/`,
+      url: `/forms/in-project/${projectId}/attachments/model/latest/`,
       blockers: [],
       blocks: []
     });
-    this.dispatch(initializeFormSubmissionAttachments(attachments));
+    for (const modelAttachment of modelAttachments) {
+      attachments[modelAttachment.offline_id] = modelAttachment;
+    }
+    const standaloneAttachments = await this.enqueueRequest({
+      description: "Fetch standalone submission attachments",
+      method: HttpMethod.GET,
+      url: `/forms/in-project/${projectId}/attachments/standalone/`,
+      blockers: [],
+      blocks: []
+    });
+    for (const standaloneAttachent of standaloneAttachments) {
+      attachments[standaloneAttachent.offline_id] = standaloneAttachent;
+    }
+    this.dispatch(initializeFormSubmissionAttachments(Object.values(attachments)));
   }
 }
 class WorkspaceService extends BaseApiService {