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

package/dist/overmap-core.umd.cjs

@@ -208,18 +208,54 @@ var __publicField = (obj, key, value) => {
       this.requestAttemptCounter[uuid2] = (this.requestAttemptCounter[uuid2] || 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 {
@@ -1601,6 +1637,7 @@ var __publicField = (obj, key, value) => {
     }
     return prevComponents;
   };
+  const selectComponentsMapping = (state) => state.componentReducer.components;
   const selectComponentsFromComponentType = (componentTypeId) => (state) => {
     if (!componentTypeId)
       return [];
@@ -1631,16 +1668,14 @@ var __publicField = (obj, key, value) => {
     }
     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(
+    toolkit.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)
@@ -1830,6 +1865,20 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  const selectComponentTypeStagesMapping = restructureCreateSelectorWithArgs(
+    toolkit.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(
     toolkit.createSelector(
       [selectStages, (_state, componentTypeId) => componentTypeId],
@@ -3642,6 +3691,9 @@ var __publicField = (obj, key, value) => {
     return state.userFormReducer.userForms[formId2];
   };
   const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
+  const selectUserFormSubmission = (submissionId) => (state) => {
+    return state.userFormReducer.submissions[submissionId];
+  };
   const selectSubmissions = toolkit.createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
   const selectRevisionMapping = (state) => state.userFormReducer.revisions;
   const selectRevisions = toolkit.createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
@@ -3683,6 +3735,23 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  const selectComponentSubmissionMapping = toolkit.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;
   };
@@ -4135,35 +4204,6 @@ var __publicField = (obj, key, value) => {
     }
     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()) {
@@ -4266,8 +4306,11 @@ var __publicField = (obj, key, value) => {
             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.");
@@ -4275,10 +4318,7 @@ var __publicField = (obj, key, value) => {
         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 {
@@ -4489,13 +4529,11 @@ var __publicField = (obj, key, value) => {
           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);
           }
         };
@@ -4652,7 +4690,7 @@ var __publicField = (obj, key, value) => {
           offline_id,
           project,
           description: description2 ?? "",
-          submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
           ...fileProps
         }
       });
@@ -7127,8 +7165,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      const organizationAccesses = result;
-      store.dispatch(setOrganizationAccesses(organizationAccesses));
+      store.dispatch(setOrganizationAccesses(result));
     }
   }
   const cachedRequestPromises = {};
@@ -15780,11 +15817,13 @@ var __publicField = (obj, key, value) => {
   exports2.selectCompletedStages = selectCompletedStages;
   exports2.selectComponent = selectComponent;
   exports2.selectComponentAttachmentMapping = selectComponentAttachmentMapping;
+  exports2.selectComponentSubmissionMapping = selectComponentSubmissionMapping;
   exports2.selectComponentType = selectComponentType;
   exports2.selectComponentTypeAttachmentMapping = selectComponentTypeAttachmentMapping;
   exports2.selectComponentTypeForm = selectComponentTypeForm;
   exports2.selectComponentTypeFromComponent = selectComponentTypeFromComponent;
   exports2.selectComponentTypeFromComponents = selectComponentTypeFromComponents;
+  exports2.selectComponentTypeStagesMapping = selectComponentTypeStagesMapping;
   exports2.selectComponentTypes = selectComponentTypes;
   exports2.selectComponentTypesByName = selectComponentTypesByName;
   exports2.selectComponentTypesFromIds = selectComponentTypesFromIds;
@@ -15792,6 +15831,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectComponents = selectComponents;
   exports2.selectComponentsByType = selectComponentsByType;
   exports2.selectComponentsFromComponentType = selectComponentsFromComponentType;
+  exports2.selectComponentsMapping = selectComponentsMapping;
   exports2.selectCreateProjectType = selectCreateProjectType;
   exports2.selectCurrentUser = selectCurrentUser;
   exports2.selectDeletedRequests = selectDeletedRequests;
@@ -15889,6 +15929,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectUser = selectUser;
   exports2.selectUserForm = selectUserForm;
   exports2.selectUserFormMapping = selectUserFormMapping;
+  exports2.selectUserFormSubmission = selectUserFormSubmission;
   exports2.selectUsersAsMapping = selectUsersAsMapping;
   exports2.selectVisibleStatuses = selectVisibleStatuses;
   exports2.selectVisibleUserIds = selectVisibleUserIds;