@overmap-ai/core 1.0.71-mapbox.2 → 1.0.71-mapbox.4

package/dist/overmap-core.js

@@ -1531,13 +1531,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
@@ -1552,8 +1545,7 @@ const selectProjectAccessUserMapping = (state) => {
 };
 const projectAccessReducer = projectAccessSlice.reducer;
 const initialState$m = {
-  projects: {},
-  activeProjectId: null
+  projects: {}
 };
 const projectSlice = createSlice({
   name: "projects",
@@ -1567,19 +1559,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];
     },
@@ -1589,52 +1571,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 = createSelector(
-  [selectProjectMapping, selectActiveProjectId],
-  (projectsMapping, activeprojectId) => {
-    if (activeprojectId === null) {
-      return null;
-    }
-    return projectsMapping[activeprojectId] ?? null;
-  }
-);
 const selectProjectById = (id) => (state) => {
   return state.projectReducer.projects[id];
 };
@@ -1889,14 +1831,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 selectProjectFileById = (id) => (state) => {
   return state.projectFileReducer.projectFiles[id];
 };
@@ -4768,7 +4705,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,
@@ -4785,7 +4721,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];
@@ -4901,7 +4836,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)
@@ -4922,7 +4856,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;
@@ -5090,13 +5023,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");
@@ -5121,7 +5050,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
@@ -5217,7 +5146,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,
@@ -5757,12 +5686,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];
   }
@@ -5929,7 +5856,6 @@ class FormSubmissionService extends BaseUploadService {
     }
     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({
@@ -5940,7 +5866,6 @@ class FormSubmissionService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(addFormSubmission(submissionToBeDeleted));
       this.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
@@ -6817,15 +6742,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"]
@@ -6834,21 +6758,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"],
@@ -7352,8 +7269,6 @@ export {
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
-  addActiveProjectFormSubmissionsCount,
-  addActiveProjectIssuesCount,
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
@@ -7398,7 +7313,6 @@ export {
   addLicenses,
   addOrReplaceProjectFile,
   addOrReplaceProjectFiles,
-  addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
   addTeam,
@@ -7598,10 +7512,7 @@ export {
   saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
-  selectActiveProject,
-  selectActiveProjectAccess,
   selectActiveProjectFileId,
-  selectActiveProjectId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
@@ -7774,7 +7685,6 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveProjectFileId,
-  setActiveProjectId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -7863,8 +7773,8 @@ export {
   updateIssueAttachments,
   updateIssueType,
   updateLicense,
-  updateOrCreateProject,
   updateOrganizationAccess,
+  updateProject,
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,