@overmap-ai/core 1.0.70-depend-on-forms.0 → 1.0.71-depend-on-forms.0

package/dist/overmap-core.js

@@ -5243,23 +5243,17 @@ class ProjectAttachmentService extends BaseAttachmentService {
 }
 class ProjectService extends BaseApiService {
   async add(payload) {
-    if (!payload.organization_owner && !payload.user_owner) {
-      throw new Error("Project type was not chosen when trying to create a project");
-    }
     if (!payload.bounds && !payload.canvas_bounds) {
       throw new Error("Project must either have bounds or canvas_bounds set");
     }
-    const isOrganizationProject = !!payload.organization_owner;
-    const url = isOrganizationProject ? `/organizations/${payload.organization_owner}/projects/` : "/projects/";
-    const projectType = isOrganizationProject ? { organization_owner: payload.organization_owner } : { user_owner: payload.user_owner };
     return await this.enqueueRequest({
       description: "Create project",
       method: HttpMethod.POST,
-      url,
+      url: "/projects/",
       payload: {
         name: payload.name,
         bounds: payload.bounds,
-        ...projectType
+        organization_owner: payload.organization_owner
       },
       blockers: [],
       blocks: []
@@ -5583,28 +5577,28 @@ class FormService extends BaseUploadService {
     });
     return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
   }
-  async delete(formId) {
+  async delete(id) {
     const { store } = this.client;
     const state = store.getState();
-    const form = selectFormById(formId)(state);
+    const form = selectFormById(id)(state);
     if (!form) {
       throw new Error("Expected form to exist");
     }
-    const formSubmissions = selectFormSubmissionsOfForm(formId)(state);
+    const formSubmissions = selectFormSubmissionsOfForm(id)(state);
     if (formSubmissions.length > 0) {
       this.dispatch(deleteFormSubmissions(formSubmissions.map(({ offline_id }) => offline_id)));
     }
-    const formRevisions = selectFormRevisionsOfForm(formId)(state);
+    const formRevisions = selectFormRevisionsOfForm(id)(state);
     if (formRevisions.length > 0) {
       this.dispatch(deleteFormRevisions(formRevisions.map(({ offline_id }) => offline_id)));
     }
-    this.dispatch(deleteForm(formId));
+    this.dispatch(deleteForm(id));
     try {
       return await this.enqueueRequest({
         description: "Delete form",
         method: HttpMethod.DELETE,
-        url: `/forms/${formId}/`,
-        blockers: [formId],
+        url: `/forms/${id}/`,
+        blockers: [id],
         blocks: []
       });
     } catch (e) {
@@ -5972,23 +5966,23 @@ class FormSubmissionService extends BaseUploadService {
       deleteAttachmentsPromise
     ];
   }
-  async delete(submissionId) {
+  async delete(id) {
     const { store } = this.client;
     const state = store.getState();
-    const submissionToBeDeleted = selectFormSubmissionById(submissionId)(state);
+    const submissionToBeDeleted = selectFormSubmissionById(id)(state);
     if (!submissionToBeDeleted) {
-      throw new Error(`Expected submission with offline_id ${submissionId} to exist`);
+      throw new Error(`Expected submission with offline_id ${id} to exist`);
     }
-    const submissionAttachments = selectAttachmentsOfFormSubmission(submissionId)(state);
-    this.dispatch(deleteFormSubmission(submissionId));
+    const submissionAttachments = selectAttachmentsOfFormSubmission(id)(state);
+    this.dispatch(deleteFormSubmission(id));
     this.dispatch(addActiveProjectFormSubmissionsCount(-1));
     this.dispatch(deleteFormSubmissionAttachments(submissionAttachments.map((x) => x.offline_id)));
     try {
       return await this.enqueueRequest({
         description: "Delete user form submissions",
         method: HttpMethod.DELETE,
-        url: `/forms/submissions/${submissionId}/`,
-        blockers: [submissionId],
+        url: `/forms/submissions/${id}/`,
+        blockers: [id],
         blocks: []
       });
     } catch (e) {
@@ -6094,22 +6088,22 @@ class WorkspaceService extends BaseApiService {
     });
     return [workspace, promise];
   }
-  delete(workspaceId) {
+  delete(id) {
     const { store } = this.client;
-    const originalWorkspace = selectWorkspaceById(workspaceId)(store.getState());
-    this.dispatch(deleteWorkspace(workspaceId));
+    const originalWorkspace = selectWorkspaceById(id)(store.getState());
+    if (!originalWorkspace) {
+      throw new Error(`Expected an existing workspace with id ${id}`);
+    }
+    this.dispatch(deleteWorkspace(id));
     const promise = this.enqueueRequest({
       description: "Delete Workspace",
       method: HttpMethod.DELETE,
-      url: `/workspaces/${workspaceId}/`,
-      blockers: [workspaceId],
+      url: `/workspaces/${id}/`,
+      blockers: [id],
       blocks: []
     });
-    void promise.then(() => {
-    }).catch((reason) => {
-      if (originalWorkspace) {
-        this.dispatch(addWorkspace(originalWorkspace));
-      }
+    void promise.catch((reason) => {
+      this.dispatch(addWorkspace(originalWorkspace));
       throw reason;
     });
     return promise;
@@ -6487,9 +6481,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));
@@ -6501,9 +6493,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));
@@ -6515,9 +6505,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));
@@ -6529,9 +6517,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));
@@ -6545,7 +6531,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"]
@@ -6559,9 +6545,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));
@@ -7002,21 +6986,21 @@ class TeamService extends BaseApiService {
     });
     return [offlineUpdatedTeam, promise];
   }
-  async delete(teamId) {
+  async delete(id) {
     const { store } = this.client;
     const state = store.getState();
-    const team = selectTeamById(teamId)(state);
+    const team = selectTeamById(id)(state);
     if (!team) {
-      throw new Error(`Expected team with id ${teamId} to exist`);
+      throw new Error(`Expected team with id ${id} to exist`);
     }
-    this.dispatch(deleteTeam(teamId));
+    this.dispatch(deleteTeam(id));
     try {
       return await this.enqueueRequest({
         description: "Delete team",
         method: HttpMethod.DELETE,
-        url: `/organizations/teams/${teamId}/`,
-        blockers: [teamId],
-        blocks: [teamId]
+        url: `/organizations/teams/${id}/`,
+        blockers: [id],
+        blocks: [id]
       });
     } catch (e) {
       this.dispatch(setTeam(team));
@@ -7246,20 +7230,20 @@ class GeoImageService extends BaseUploadService {
     });
     return [updatedGeoImage, promise];
   }
-  async delete(geoImageId) {
+  async delete(id) {
     const { store } = this.client;
     const state = store.getState();
-    const geoImageToDelete = selectGeoImageById(geoImageId)(state);
+    const geoImageToDelete = selectGeoImageById(id)(state);
     if (!geoImageToDelete) {
-      throw new Error(`Map image with offline_id ${geoImageId} does not exist in the store`);
+      throw new Error(`Map image with offline_id ${id} does not exist in the store`);
     }
-    this.dispatch(deleteGeoImage(geoImageId));
+    this.dispatch(deleteGeoImage(id));
     const promise = this.enqueueRequest({
       description: "Delete geo image",
       method: HttpMethod.DELETE,
-      url: `/geo-images/${geoImageId}/`,
-      blocks: [geoImageId],
-      blockers: [geoImageId]
+      url: `/geo-images/${id}/`,
+      blocks: [id],
+      blockers: [id]
     });
     promise.catch(() => {
       this.dispatch(setGeoImage(geoImageToDelete));