@overmap-ai/core 1.0.69 → 1.0.71-active-project-state.0

package/dist/overmap-core.js

@@ -1587,13 +1587,6 @@ const selectProjectAccesses = createSelector(
 const selectProjectAccessById = (id) => (state) => {
   return state.projectAccessReducer.instances[id];
 };
-const selectActiveProjectAccess = (state) => {
-  const currentUser = state.userReducer.currentUser;
-  const activeProjectId = state.projectReducer.activeProjectId;
-  return Object.values(state.projectAccessReducer.instances).find((projectAccess) => {
-    return projectAccess.user === (currentUser == null ? void 0 : currentUser.id) && projectAccess.project === activeProjectId;
-  }) ?? null;
-};
 const selectProjectAccessForUser = (user) => (state) => {
   return Object.values(state.projectAccessReducer.instances).find(
     (projectAccess) => projectAccess.user === user.id
@@ -1608,8 +1601,7 @@ const selectProjectAccessUserMapping = (state) => {
 };
 const projectAccessReducer = projectAccessSlice.reducer;
 const initialState$m = {
-  projects: {},
-  activeProjectId: null
+  projects: {}
 };
 const projectSlice = createSlice({
   name: "projects",
@@ -1623,19 +1615,9 @@ const projectSlice = createSlice({
       });
       state.projects = projectsMap;
     },
-    setActiveProjectId: (state, action) => {
-      state.activeProjectId = action.payload;
-    },
-    updateOrCreateProject: (state, action) => {
+    updateProject: (state, action) => {
       state.projects[action.payload.id] = action.payload;
     },
-    // Takes a list of Projects and updates existing ones to match the payload, or adds them
-    // to the store if they are not already present
-    updateOrCreateProjects: (state, action) => {
-      action.payload.forEach((project) => {
-        state.projects[project.id] = project;
-      });
-    },
     deleteProject: (state, action) => {
       delete state.projects[action.payload.id];
     },
@@ -1645,50 +1627,12 @@ const projectSlice = createSlice({
       } else {
         throw new Error("Accept project invite: user is not in this project");
       }
-    },
-    addActiveProjectIssuesCount: (state, action) => {
-      if (!state.activeProjectId || !(state.activeProjectId in state.projects)) {
-        throw new Error("Update issues count: no active project");
-      }
-      if (!state.projects[state.activeProjectId].issues_count) {
-        state.projects[state.activeProjectId].issues_count = action.payload;
-      } else {
-        state.projects[state.activeProjectId].issues_count += action.payload;
-      }
-    },
-    addActiveProjectFormSubmissionsCount: (state, action) => {
-      if (state.activeProjectId && state.activeProjectId in state.projects) {
-        if (!state.projects[state.activeProjectId].form_submissions_count) {
-          state.projects[state.activeProjectId].form_submissions_count = action.payload;
-        } else {
-          state.projects[state.activeProjectId].form_submissions_count += action.payload;
-        }
-      } else {
-        throw new Error("Update form submissions count: no active project");
-      }
     }
   }
 });
-const {
-  setProjects,
-  updateOrCreateProject,
-  updateOrCreateProjects: addOrReplaceProjects,
-  setActiveProjectId,
-  deleteProject,
-  acceptProjectInvite,
-  addActiveProjectIssuesCount,
-  addActiveProjectFormSubmissionsCount
-} = projectSlice.actions;
+const { setProjects, updateProject, deleteProject, acceptProjectInvite } = projectSlice.actions;
 const projectReducer = projectSlice.reducer;
 const selectProjectMapping = (state) => state.projectReducer.projects;
-const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
-const selectActiveProject = (state) => {
-  const activeProjectId = selectActiveProjectId(state);
-  if (!activeProjectId) {
-    return null;
-  }
-  return state.projectReducer.projects[activeProjectId] ?? null;
-};
 const selectProjectById = (id) => (state) => {
   return state.projectReducer.projects[id];
 };
@@ -1937,14 +1881,9 @@ const {
   resetProjectFileObjectUrls
 } = projectFileSlice.actions;
 const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
-const selectProjectFiles = createSelector(
-  [selectProjectFileMapping, selectActiveProjectId],
-  (mapping, activeProjectId) => {
-    return fallbackToEmptyArray(
-      Object.values(mapping).filter((file) => file.project === activeProjectId).sort((a, b) => a.z_index - b.z_index)
-    );
-  }
-);
+const selectProjectFiles = createSelector([selectProjectFileMapping], (mapping) => {
+  return fallbackToEmptyArray(Object.values(mapping).sort((a, b) => a.z_index - b.z_index));
+});
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
 const selectProjectFileById = (id) => (state) => {
@@ -4814,7 +4753,6 @@ class IssueService extends BaseApiService {
       created_by: createdBy
     });
     this.dispatch(addIssue(offlineIssue));
-    this.dispatch(addActiveProjectIssuesCount(1));
     const promise = this.enqueueRequest({
       description: "Create issue",
       method: HttpMethod.POST,
@@ -4831,7 +4769,6 @@ class IssueService extends BaseApiService {
       this.dispatch(updateIssue(result));
     }).catch((error) => {
       this.dispatch(deleteIssue(offlineIssue.offline_id));
-      this.dispatch(addActiveProjectIssuesCount(-1));
       throw error;
     });
     return [offlineIssue, promise];
@@ -4947,7 +4884,6 @@ class IssueService extends BaseApiService {
       issueAssociationsRecord[issueAssociation.offline_id] = issueAssociation;
     const issueAssociations = Object.values(issueAssociationsRecord);
     this.dispatch(deleteIssue(id));
-    this.dispatch(addActiveProjectIssuesCount(-1));
     if (attachmentsOfIssue.length > 0)
       this.dispatch(deleteIssueAttachments(attachmentsOfIssue.map(({ offline_id }) => offline_id)));
     if (updatesOfIssue.length > 0)
@@ -4968,7 +4904,6 @@ class IssueService extends BaseApiService {
       this.dispatch(addIssue(backup));
       this.dispatch(addIssueAttachments(attachmentsOfIssue));
       this.dispatch(addIssueUpdates(updatesOfIssue));
-      this.dispatch(addActiveProjectIssuesCount(1));
       this.dispatch(addFormSubmissions(formSubmissionsOfIssue));
       this.dispatch(addIssueAssociations(issueAssociations));
       throw e;
@@ -5136,13 +5071,9 @@ class ProjectFileService extends BaseApiService {
     const { store } = this.client;
     const state = store.getState();
     const activeProjectFileId = state.projectFileReducer.activeProjectFileId;
-    const activeProjectId = state.projectReducer.activeProjectId;
     if (!activeProjectFileId) {
       throw new Error("No active project file");
     }
-    if (!activeProjectId) {
-      throw new Error("No active project");
-    }
     const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
     if (!activeProjectFile) {
       throw new Error("No active project file");
@@ -5167,7 +5098,7 @@ class ProjectFileService extends BaseApiService {
         this.client.files.uploadFileToS3(activeProjectFile.file_sha1).then(([fileProps]) => {
           resolve({
             method: HttpMethod.POST,
-            url: `/projects/${activeProjectId}/files/`,
+            url: `/projects/${activeProjectFile.project}/files/`,
             payload: {
               ...activeProjectFile,
               ...fileProps
@@ -5243,23 +5174,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: []
@@ -5269,7 +5194,7 @@ class ProjectService extends BaseApiService {
     if (!project.bounds && !project.canvas_bounds) {
       throw new Error("Project must either have bounds or canvas_bounds set");
     }
-    this.dispatch(updateOrCreateProject(project));
+    this.dispatch(updateProject(project));
     return await this.enqueueRequest({
       description: "Update project",
       method: HttpMethod.PATCH,
@@ -5583,28 +5508,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) {
@@ -5809,12 +5734,10 @@ class FormSubmissionService extends BaseUploadService {
       files
     );
     promise.then((result) => {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
       this.dispatch(deleteFormSubmission(offlineSubmission.offline_id));
-      this.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
     return [offlineSubmission, offlineFormSubmissionAttachments, promise, attachmentsPromise];
   }
@@ -5972,27 +5895,25 @@ 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));
-    this.dispatch(addActiveProjectFormSubmissionsCount(-1));
+    const submissionAttachments = selectAttachmentsOfFormSubmission(id)(state);
+    this.dispatch(deleteFormSubmission(id));
     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) {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(addFormSubmission(submissionToBeDeleted));
       this.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
@@ -6094,22 +6015,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 +6408,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 +6420,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 +6432,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 +6444,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 +6458,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 +6472,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));
@@ -6879,15 +6790,14 @@ class DocumentAttachmentService extends BaseAttachmentService {
   }
 }
 class AgentService extends BaseApiService {
-  async startConversation(prompt) {
-    const activeProjectId = this.client.store.getState().projectReducer.activeProjectId;
+  async startConversation(prompt, projectId) {
     return this.enqueueRequest({
       description: "Start agent conversation",
       method: HttpMethod.POST,
       url: "/agents/prompt/",
       payload: {
         prompt,
-        active_project: activeProjectId
+        active_project: projectId
       },
       blockers: ["prompt"],
       blocks: ["prompt"]
@@ -6896,21 +6806,14 @@ class AgentService extends BaseApiService {
       return response;
     });
   }
-  /**
-   * Prompt the agent with a message.
-   * @param prompt The message to prompt the agent with.
-   * @param conversationId If continuing an existing message, the UUID of that conversation.
-   */
-  async continueConversation(prompt, conversationId) {
-    const { store } = this.client;
-    const activeProjectId = store.getState().projectReducer.activeProjectId;
+  async continueConversation(prompt, conversationId, projectId) {
     return this.enqueueRequest({
       description: "Prompt agent",
       method: HttpMethod.POST,
       url: "/agents/prompt/",
       payload: {
         prompt,
-        active_project: activeProjectId
+        active_project: projectId
       },
       blockers: ["prompt"],
       blocks: ["prompt"],
@@ -7002,21 +6905,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 +7149,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));
@@ -7413,8 +7316,6 @@ export {
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
-  addActiveProjectFormSubmissionsCount,
-  addActiveProjectIssuesCount,
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
@@ -7459,7 +7360,6 @@ export {
   addLicenses,
   addOrReplaceProjectFile,
   addOrReplaceProjectFiles,
-  addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
   addTeam,
@@ -7668,10 +7568,7 @@ export {
   saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
-  selectActiveProject,
-  selectActiveProjectAccess,
   selectActiveProjectFileId,
-  selectActiveProjectId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
@@ -7846,7 +7743,6 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveProjectFileId,
-  setActiveProjectId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -7935,8 +7831,8 @@ export {
   updateIssueAttachments,
   updateIssueType,
   updateLicense,
-  updateOrCreateProject,
   updateOrganizationAccess,
+  updateProject,
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,