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

package/dist/overmap-core.umd.cjs

@@ -5232,23 +5232,17 @@ var __publicField = (obj, key, value) => {
   }
   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: []
@@ -5572,28 +5566,28 @@ var __publicField = (obj, key, value) => {
       });
       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) {
@@ -5961,23 +5955,23 @@ var __publicField = (obj, key, value) => {
         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) {
@@ -6083,22 +6077,22 @@ var __publicField = (obj, key, value) => {
       });
       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;
@@ -6476,9 +6470,7 @@ var __publicField = (obj, key, value) => {
         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));
@@ -6490,9 +6482,7 @@ var __publicField = (obj, key, value) => {
         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));
@@ -6504,9 +6494,7 @@ var __publicField = (obj, key, value) => {
         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));
@@ -6518,9 +6506,7 @@ var __publicField = (obj, key, value) => {
         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));
@@ -6534,7 +6520,7 @@ var __publicField = (obj, key, value) => {
         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"]
@@ -6548,9 +6534,7 @@ var __publicField = (obj, key, value) => {
         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));
@@ -6991,21 +6975,21 @@ var __publicField = (obj, key, value) => {
       });
       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));
@@ -7235,20 +7219,20 @@ var __publicField = (obj, key, value) => {
       });
       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));