@overmap-ai/core 1.0.48-tanstack-table.1 → 1.0.49-fix-error-messaging.0

package/README.md

@@ -1,4 +1,4 @@
-# @overmap-ai/core
-
-The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
-packages.
+# @overmap-ai/core
+
+The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
+packages.

package/dist/overmap-core.js

@@ -217,18 +217,54 @@ class OutboxCoordinator {
     this.requestAttemptCounter[uuid] = (this.requestAttemptCounter[uuid] || 0) + 1;
   }
 }
+function extractErrorMessage(errorRes, err) {
+  if (errorRes == null ? void 0 : errorRes.body) {
+    if (typeof errorRes.body === "object") {
+      if (typeof errorRes.body.error === "string")
+        return errorRes.body.error;
+      if (typeof errorRes.body.message === "string")
+        return errorRes.body.message;
+      try {
+        return Object.entries(errorRes.body).map(([key, value]) => {
+          if (typeof value === "string") {
+            if (key === "non_field_errors")
+              return value;
+            return `${key}: ${value}`;
+          }
+          if (Array.isArray(value)) {
+            if (key === "non_field_errors")
+              return value.join("\n");
+            return value.map((v) => `${key}: ${v}`).join("\n");
+          }
+          return `${key}: ${JSON.stringify(value)}`;
+        }).join("\n");
+      } catch (e) {
+        console.error("Failed to extract error message from response body", e);
+      }
+    } else if (typeof errorRes.body === "string")
+      return errorRes.body;
+  } else if (errorRes == null ? void 0 : errorRes.text) {
+    return errorRes.text;
+  } else if (err instanceof Error) {
+    return err.message;
+  }
+  return void 0;
+}
 class APIError extends Error {
-  constructor(message, response, options) {
-    super(response == null ? void 0 : response.text);
+  constructor(options) {
+    const unknownMessage = "An unknown error occurred";
+    super(unknownMessage);
     // NOTE: Needs to conform to NetworkError in @redux-offline/redux-offline, which has `status` and `response`.
     __publicField(this, "status");
-    __publicField(this, "message");
     __publicField(this, "response");
+    __publicField(this, "message");
     __publicField(this, "options");
-    this.message = message;
+    const { response, innerError } = options;
+    this.message = options.message ?? extractErrorMessage(response, innerError) ?? unknownMessage;
     this.status = (response == null ? void 0 : response.status) ?? 0;
     this.response = response;
-    this.options = options ?? { discard: false };
+    options.discard = options.discard ?? false;
+    this.options = options;
   }
 }
 class DeferredPromise {
@@ -1610,6 +1646,7 @@ const selectComponents = (state) => {
   }
   return prevComponents;
 };
+const selectComponentsMapping = (state) => state.componentReducer.components;
 const selectComponentsFromComponentType = (componentTypeId) => (state) => {
   if (!componentTypeId)
     return [];
@@ -1640,16 +1677,14 @@ const selectComponentTypeFromComponents = (state) => {
   }
   return ret;
 };
-const selectComponentsByType = (componentTypeId) => (state) => {
-  const components = state.componentReducer.components;
-  const componentsOfType = [];
-  for (const component of Object.values(components)) {
-    if (component.component_type === componentTypeId) {
-      componentsOfType.push(component);
+const selectComponentsByType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectComponents, (_state, componentTypeId) => componentTypeId],
+    (components, componentTypeId) => {
+      return components.filter((component) => component.component_type === componentTypeId);
     }
-  }
-  return componentsOfType;
-};
+  )
+);
 const selectNumberOfComponentsOfComponentType = (componentTypeId) => (state) => {
   var _a2;
   if (!componentTypeId)
@@ -1839,6 +1874,20 @@ const selectStagesFromComponentTypeIds = restructureCreateSelectorWithArgs(
     }
   )
 );
+const selectComponentTypeStagesMapping = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectStageMapping, (_state, componentTypeId) => componentTypeId],
+    (stagesMapping, componentTypeId) => {
+      const componentTypeStagesMapping = {};
+      for (const [stageId, stage] of Object.entries(stagesMapping)) {
+        if (stage.component_type === componentTypeId) {
+          componentTypeStagesMapping[stageId] = stage;
+        }
+      }
+      return componentTypeStagesMapping;
+    }
+  )
+);
 const selectStagesFromComponentType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectStages, (_state, componentTypeId) => componentTypeId],
@@ -3651,6 +3700,9 @@ const selectUserForm = (formId2) => (state) => {
   return state.userFormReducer.userForms[formId2];
 };
 const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
+const selectUserFormSubmission = (submissionId) => (state) => {
+  return state.userFormReducer.submissions[submissionId];
+};
 const selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
 const selectRevisionMapping = (state) => state.userFormReducer.revisions;
 const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
@@ -3692,6 +3744,23 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
     }
   )
 );
+const selectComponentSubmissionMapping = createSelector(
+  [selectSubmissionMapping, selectComponentsMapping],
+  (submissions, components) => {
+    var _a2;
+    const componentSubmissionMapping = {};
+    for (const componentId in components) {
+      componentSubmissionMapping[componentId] = [];
+    }
+    for (const submissionId in submissions) {
+      const submission = submissions[submissionId];
+      if (submission.component) {
+        (_a2 = componentSubmissionMapping[submission.component]) == null ? void 0 : _a2.push(submission);
+      }
+    }
+    return componentSubmissionMapping;
+  }
+);
 const selectUserFormMapping = (state) => {
   return state.userFormReducer.userForms;
 };
@@ -4144,35 +4213,6 @@ function extractResponseFromError(error2) {
   }
   return void 0;
 }
-function extractErrorMessage(errorRes, err) {
-  if (errorRes == null ? void 0 : errorRes.body) {
-    if (typeof errorRes.body === "object") {
-      if (typeof errorRes.body.error === "string")
-        return errorRes.body.error;
-      if (typeof errorRes.body.message === "string")
-        return errorRes.body.message;
-      try {
-        return Object.entries(errorRes.body).map(([key, value]) => {
-          if (typeof value === "string") {
-            return `${key}: ${value}`;
-          }
-          if (Array.isArray(value)) {
-            return value.map((v) => `${key}: ${v}`).join("\n");
-          }
-          return `${key}: ${JSON.stringify(value)}`;
-        }).join("\n");
-      } catch (e) {
-        console.error("Failed to extract error message from response body", e);
-      }
-    } else if (typeof errorRes.body === "string")
-      return errorRes.body;
-  } else if (errorRes == null ? void 0 : errorRes.text) {
-    return errorRes.text;
-  } else if (err instanceof Error) {
-    return err.message;
-  }
-  return void 0;
-}
 async function performRequest(action, client) {
   async function checkToken() {
     if (client.auth.tokenIsExpiringSoon()) {
@@ -4275,8 +4315,11 @@ async function performRequest(action, client) {
           console.warn("No signed-in user to sign out.");
         }
         await client.auth.logout();
-        throw new APIError("You have been signed out due to inactivity.", errorResponse, {
-          discard: true
+        throw new APIError({
+          message: "You have been signed out due to inactivity.",
+          response: errorResponse,
+          discard: true,
+          innerError: error2
         });
       }
       console.debug("Forbidden; renewing tokens and retrying.");
@@ -4284,10 +4327,7 @@ async function performRequest(action, client) {
       console.debug("Successfully renewed tokens; retrying request.");
       return requestToSend.query(queryParams);
     }
-    const apiErrorMessage = extractErrorMessage(errorResponse, error2) || "An unexpected error occurred.";
-    throw new APIError(apiErrorMessage, errorResponse, {
-      discard: discardStatuses.includes(status)
-    });
+    throw new APIError({ response: errorResponse, innerError: error2, discard: discardStatuses.includes(status) });
   }
 }
 class MiddlewareChainerPrivate {
@@ -4498,13 +4538,11 @@ class BaseApiService {
         if (response) {
           promise.resolve(response.body);
         } else {
-          const error2 = new APIError(
-            "Could not get a response from the server.",
+          const error2 = new APIError({
+            message: "Could not get a response from the server.",
             response,
-            {
-              discard: true
-            }
-          );
+            discard: true
+          });
           promise.reject(error2);
         }
       };
@@ -4661,7 +4699,7 @@ class AttachmentService extends BaseApiService {
         offline_id,
         project,
         description: description2 ?? "",
-        submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
         ...fileProps
       }
     });
@@ -7136,8 +7174,7 @@ class OrganizationAccessService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    const organizationAccesses = result;
-    store.dispatch(setOrganizationAccesses(organizationAccesses));
+    store.dispatch(setOrganizationAccesses(result));
   }
 }
 const cachedRequestPromises = {};
@@ -15790,11 +15827,13 @@ export {
   selectCompletedStages,
   selectComponent,
   selectComponentAttachmentMapping,
+  selectComponentSubmissionMapping,
   selectComponentType,
   selectComponentTypeAttachmentMapping,
   selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
+  selectComponentTypeStagesMapping,
   selectComponentTypes,
   selectComponentTypesByName,
   selectComponentTypesFromIds,
@@ -15802,6 +15841,7 @@ export {
   selectComponents,
   selectComponentsByType,
   selectComponentsFromComponentType,
+  selectComponentsMapping,
   selectCreateProjectType,
   selectCurrentUser,
   selectDeletedRequests,
@@ -15899,6 +15939,7 @@ export {
   selectUser,
   selectUserForm,
   selectUserFormMapping,
+  selectUserFormSubmission,
   selectUsersAsMapping,
   selectVisibleStatuses,
   selectVisibleUserIds,