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

package/dist/overmap-core.umd.cjs

@@ -1576,13 +1576,6 @@ var __publicField = (obj, key, value) => {
   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
@@ -1597,8 +1590,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectAccessReducer = projectAccessSlice.reducer;
   const initialState$m = {
-    projects: {},
-    activeProjectId: null
+    projects: {}
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
@@ -1612,19 +1604,9 @@ var __publicField = (obj, key, value) => {
         });
         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];
       },
@@ -1634,50 +1616,12 @@ var __publicField = (obj, key, value) => {
         } 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];
   };
@@ -1926,14 +1870,9 @@ var __publicField = (obj, key, value) => {
     resetProjectFileObjectUrls
   } = projectFileSlice.actions;
   const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
-  const selectProjectFiles = toolkit.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 = toolkit.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) => {
@@ -4803,7 +4742,6 @@ var __publicField = (obj, key, value) => {
         created_by: createdBy
       });
       this.dispatch(addIssue(offlineIssue));
-      this.dispatch(addActiveProjectIssuesCount(1));
       const promise = this.enqueueRequest({
         description: "Create issue",
         method: HttpMethod.POST,
@@ -4820,7 +4758,6 @@ var __publicField = (obj, key, value) => {
         this.dispatch(updateIssue(result));
       }).catch((error) => {
         this.dispatch(deleteIssue(offlineIssue.offline_id));
-        this.dispatch(addActiveProjectIssuesCount(-1));
         throw error;
       });
       return [offlineIssue, promise];
@@ -4936,7 +4873,6 @@ var __publicField = (obj, key, value) => {
         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)
@@ -4957,7 +4893,6 @@ var __publicField = (obj, key, value) => {
         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;
@@ -5125,13 +5060,9 @@ var __publicField = (obj, key, value) => {
       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");
@@ -5156,7 +5087,7 @@ var __publicField = (obj, key, value) => {
           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
@@ -5232,23 +5163,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: []
@@ -5258,7 +5183,7 @@ var __publicField = (obj, key, value) => {
       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,
@@ -5572,28 +5497,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) {
@@ -5798,12 +5723,10 @@ var __publicField = (obj, key, value) => {
         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];
     }
@@ -5961,27 +5884,25 @@ 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));
-      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;
@@ -6083,22 +6004,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 +6397,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 +6409,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 +6421,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 +6433,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 +6447,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 +6461,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));
@@ -6868,15 +6779,14 @@ var __publicField = (obj, key, value) => {
     }
   }
   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"]
@@ -6885,21 +6795,14 @@ var __publicField = (obj, key, value) => {
         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"],
@@ -6991,21 +6894,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 +7138,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));
@@ -7401,8 +7304,6 @@ var __publicField = (obj, key, value) => {
   exports2._selectLatestFormRevision = _selectLatestFormRevision;
   exports2._setLatestRetryTime = _setLatestRetryTime;
   exports2.acceptProjectInvite = acceptProjectInvite;
-  exports2.addActiveProjectFormSubmissionsCount = addActiveProjectFormSubmissionsCount;
-  exports2.addActiveProjectIssuesCount = addActiveProjectIssuesCount;
   exports2.addAsset = addAsset;
   exports2.addAssetAttachment = addAssetAttachment;
   exports2.addAssetAttachments = addAssetAttachments;
@@ -7447,7 +7348,6 @@ var __publicField = (obj, key, value) => {
   exports2.addLicenses = addLicenses;
   exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
   exports2.addOrReplaceProjectFiles = addOrReplaceProjectFiles;
-  exports2.addOrReplaceProjects = addOrReplaceProjects;
   exports2.addProjectAttachment = addProjectAttachment;
   exports2.addProjectAttachments = addProjectAttachments;
   exports2.addTeam = addTeam;
@@ -7656,10 +7556,7 @@ var __publicField = (obj, key, value) => {
   exports2.saveActiveProjectFileBounds = saveActiveProjectFileBounds;
   exports2.selectAccessToken = selectAccessToken;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
-  exports2.selectActiveProject = selectActiveProject;
-  exports2.selectActiveProjectAccess = selectActiveProjectAccess;
   exports2.selectActiveProjectFileId = selectActiveProjectFileId;
-  exports2.selectActiveProjectId = selectActiveProjectId;
   exports2.selectActiveStatusLicenses = selectActiveStatusLicenses;
   exports2.selectAllDocumentAttachments = selectAllDocumentAttachments;
   exports2.selectAllProjectAttachments = selectAllProjectAttachments;
@@ -7834,7 +7731,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectWorkspaceMapping = selectWorkspaceMapping;
   exports2.selectWorkspaces = selectWorkspaces;
   exports2.setActiveProjectFileId = setActiveProjectFileId;
-  exports2.setActiveProjectId = setActiveProjectId;
   exports2.setAsset = setAsset;
   exports2.setAssetAttachment = setAssetAttachment;
   exports2.setAssetAttachments = setAssetAttachments;
@@ -7923,8 +7819,8 @@ var __publicField = (obj, key, value) => {
   exports2.updateIssueAttachments = updateIssueAttachments;
   exports2.updateIssueType = updateIssueType;
   exports2.updateLicense = updateLicense;
-  exports2.updateOrCreateProject = updateOrCreateProject;
   exports2.updateOrganizationAccess = updateOrganizationAccess;
+  exports2.updateProject = updateProject;
   exports2.updateProjectAccess = updateProjectAccess;
   exports2.updateProjectAttachment = updateProjectAttachment;
   exports2.updateProjectAttachments = updateProjectAttachments;