@overmap-ai/core 1.0.60-forms-removal.6 → 1.0.60-forms-removal.8

package/dist/overmap-core.js

@@ -2613,6 +2613,9 @@ const formSlice = createSlice({
   }
 });
 const { setForms, setForm, addForm, addForms, updateForm, deleteForm } = formSlice.actions;
+const selectFormsMapping = (state) => {
+  return state.formReducer.instances;
+};
 const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
@@ -2649,9 +2652,11 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectForm = (formId) => (state) => {
-  return state.formReducer.instances[formId];
-};
+const selectForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormsMapping, (_, formId) => formId], (userForms, formId) => {
+    return userForms[formId];
+  })
+);
 const selectFormMapping = (state) => {
   return state.formReducer.instances;
 };
@@ -4199,6 +4204,9 @@ function chunkArray(arr, chunkSize) {
 class AssetService extends BaseApiService {
   // Basic CRUD functions
   add(asset, workspaceId) {
+    if (!asset.canvas_marker && !asset.geo_marker) {
+      throw new Error("Asset must have either a canvas_marker or geo_marker");
+    }
     const offlineAsset = offline(asset);
     this.dispatch(addAsset(offlineAsset));
     const promise = this.enqueueRequest({
@@ -4215,6 +4223,9 @@ class AssetService extends BaseApiService {
     return [offlineAsset, promise];
   }
   update(asset, workspaceId) {
+    if (!asset.canvas_marker && !asset.geo_marker) {
+      throw new Error("Asset must have either a canvas_marker or geo_marker");
+    }
     this.client.store.dispatch(updateAsset(asset));
     const promise = this.enqueueRequest({
       description: "Edit asset",
@@ -5339,6 +5350,9 @@ class ProjectFileService extends BaseApiService {
     if (!activeProjectFile) {
       throw new Error("No active project file");
     }
+    if (!activeProjectFile.bounds && !activeProjectFile.canvas_bounds) {
+      throw new Error("Project file must either have bounds or canvas_bounds set");
+    }
     let requestDetails;
     const existing = typeof activeProjectFile.file === "string" && !activeProjectFile.file.startsWith("blob:");
     if (existing) {
@@ -5359,7 +5373,6 @@ class ProjectFileService extends BaseApiService {
             url: `/projects/${activeProjectId}/files/`,
             payload: {
               ...activeProjectFile,
-              bounds: JSON.stringify(activeProjectFile.bounds),
               ...fileProps
             },
             blockers: [activeProjectFileId],
@@ -5431,6 +5444,9 @@ class ProjectService extends BaseApiService {
     if (!project.owner_organization && !project.owner_user) {
       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.owner_organization;
     const url = isOrganizationProject ? `/organizations/${project.owner_organization}/projects/` : "/projects/";
     const projectType = isOrganizationProject ? { organization_owner: project.owner_organization } : { user_owner: project.owner_user };
@@ -5449,6 +5465,9 @@ class ProjectService extends BaseApiService {
     return result;
   }
   async update(project) {
+    if (!project.bounds || !project.canvas_bounds) {
+      throw new Error("Project must either have bounds or canvas_bounds set");
+    }
     this.dispatch(updateOrCreateProject(project));
     return await this.enqueueRequest({
       description: "Update project",
@@ -7513,6 +7532,7 @@ export {
   selectFormSubmissionsOfForm,
   selectFormSubmissionsOfIssue,
   selectFormsCount,
+  selectFormsMapping,
   selectGeneralFormCount,
   selectHiddenAssetTypeIds,
   selectHiddenCategoryCount,