@overmap-ai/core 1.0.71-mapbox.3 → 1.0.71-mapbox.5

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];
 };
@@ -1809,39 +1751,26 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$j = {
-  projectFiles: {},
+const projectFileModelAdapter = createModelAdapter((projectFile) => projectFile.offline_id);
+const initialState$j = projectFileModelAdapter.getInitialState({
   activeProjectFileId: null,
   isImportingProjectFile: false
-};
+});
 const projectFileSlice = createSlice({
   name: "projectFiles",
   initialState: initialState$j,
   extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
   reducers: {
-    addOrReplaceProjectFiles: (state, action) => {
-      for (let fileObj of action.payload) {
-        let file = fileObj.file;
-        if (file.includes("+")) {
-          console.warn("Attempting to apply fix for image URL with '+' character:", file);
-          const parts = file.split("/");
-          if (parts.length < 2) {
-            throw new Error("Invalid URL: " + file);
-          }
-          const lastPart = encodeURIComponent(parts[parts.length - 1]);
-          file = parts.slice(0, -1).join("/") + "/" + lastPart;
-          console.warn("Fixed URL:", file);
-          fileObj = { ...fileObj, file };
-        }
-        state.projectFiles[fileObj.offline_id] = fileObj;
-      }
-    },
-    addOrReplaceProjectFile: (state, action) => {
-      if (!action.payload.project) {
-        throw new Error("ProjectFile has no project. A project must be set before storing.");
-      }
-      state.projectFiles[action.payload.offline_id] = action.payload;
-    },
+    initializeProjectFiles: projectFileModelAdapter.initialize,
+    setProjectFile: projectFileModelAdapter.setOne,
+    setProjectFiles: projectFileModelAdapter.setMany,
+    addProjectFile: projectFileModelAdapter.addOne,
+    addProjectFiles: projectFileModelAdapter.addMany,
+    updateProjectFile: projectFileModelAdapter.updateOne,
+    updateProjectFiles: projectFileModelAdapter.updateMany,
+    deleteProjectFile: projectFileModelAdapter.deleteOne,
+    deleteProjectFiles: projectFileModelAdapter.deleteMany,
+    // TODO: move following to /web
     setIsImportingProjectFile: (state, action) => {
       state.isImportingProjectFile = action.payload;
     },
@@ -1850,55 +1779,46 @@ const projectFileSlice = createSlice({
       if (!activeProjectFileId) {
         throw new Error("Tried to save bounds for active project file, but no active project file was set.");
       }
-      if (!state.projectFiles[activeProjectFileId]) {
+      if (!state.instances[activeProjectFileId]) {
         throw new Error(
           `Tried to save bounds for active project file, but project file with ID ${activeProjectFileId} 
 					doesn't exist.`
         );
       }
-      state.projectFiles[activeProjectFileId].bounds = action.payload;
+      state.instances[activeProjectFileId].bounds = action.payload;
     },
-    // TODO: Move to MapContext. Should not be persisted.
     setActiveProjectFileId: (state, action) => {
       state.activeProjectFileId = action.payload;
     },
-    removeProjectFile: (state, action) => {
-      delete state.projectFiles[action.payload];
-    },
-    removeProjectFilesOfProject: (state, action) => {
-      const filesToDelete = Object.values(state.projectFiles).filter((file) => file.project === action.payload);
-      for (const file of filesToDelete) {
-        delete state.projectFiles[file.offline_id];
-      }
-    },
     resetProjectFileObjectUrls: (state, ..._args) => {
-      for (const key in state.projectFiles) {
-        delete state.projectFiles[key].objectURL;
+      for (const key in state.instances) {
+        delete state.instances[key].objectURL;
       }
     }
   }
 });
 const {
-  addOrReplaceProjectFiles,
-  addOrReplaceProjectFile,
+  initializeProjectFiles,
+  setProjectFile,
+  setProjectFiles,
+  addProjectFile,
+  addProjectFiles,
+  updateProjectFile,
+  updateProjectFiles,
+  deleteProjectFile,
+  deleteProjectFiles,
+  // TODO: move following to /web
   setIsImportingProjectFile,
   setActiveProjectFileId,
   saveActiveProjectFileBounds,
-  removeProjectFile,
-  removeProjectFilesOfProject,
   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 selectProjectFileMapping = (state) => state.projectFileReducer.instances;
+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];
+  return state.projectFileReducer.instances[id];
 };
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
@@ -4768,7 +4688,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 +4704,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 +4819,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 +4839,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;
@@ -5081,7 +4997,7 @@ class ProjectFileService extends BaseApiService {
       blocks: [file.offline_id]
     });
     void promise.then((result) => {
-      this.dispatch(addOrReplaceProjectFile(result));
+      this.dispatch(updateProjectFile(result));
     });
     return promise;
   }
@@ -5093,7 +5009,7 @@ class ProjectFileService extends BaseApiService {
     if (!activeProjectFileId) {
       throw new Error("No active project file");
     }
-    const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
+    const activeProjectFile = state.projectFileReducer.instances[activeProjectFileId];
     if (!activeProjectFile) {
       throw new Error("No active project file");
     }
@@ -5132,7 +5048,7 @@ class ProjectFileService extends BaseApiService {
       return this.enqueueRequest(requestDetails2);
     });
     void promise.then((result) => {
-      this.dispatch(addOrReplaceProjectFile(result));
+      this.dispatch(updateProjectFile(result));
     });
     this.dispatch(saveActiveProjectFileBounds);
     this.dispatch(setActiveProjectFileId(null));
@@ -5140,7 +5056,7 @@ class ProjectFileService extends BaseApiService {
     return [activeProjectFile, promise];
   }
   delete(projectFileId) {
-    this.dispatch(removeProjectFile(projectFileId));
+    this.dispatch(deleteProjectFile(projectFileId));
     return this.enqueueRequest({
       method: HttpMethod.DELETE,
       url: `/projects/files/${projectFileId}`,
@@ -5156,8 +5072,7 @@ class ProjectFileService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    this.dispatch(addOrReplaceProjectFiles([]));
-    this.dispatch(addOrReplaceProjectFiles(result));
+    this.dispatch(initializeProjectFiles(result));
   }
 }
 class ProjectAttachmentService extends BaseAttachmentService {
@@ -5213,7 +5128,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,
@@ -5235,7 +5150,7 @@ class ProjectService extends BaseApiService {
       throw new Error("Expected project to exist");
     }
     const filesToDelete = selectProjectFiles(state).filter((file) => file.project === projectId);
-    this.dispatch(removeProjectFilesOfProject(project.id));
+    this.dispatch(deleteProjectFiles(filesToDelete.map(({ offline_id }) => offline_id)));
     const attachmentsOfProject = selectAttachmentsOfProject(project.id)(state);
     this.dispatch(deleteProjectAttachments(attachmentsOfProject.map(({ offline_id }) => offline_id)));
     const projectAccesses = selectProjectAccesses(state);
@@ -5258,7 +5173,7 @@ class ProjectService extends BaseApiService {
     } catch (e) {
       this.dispatch(setProjects(Object.values(projects)));
       this.dispatch(initializeProjectAccesses(Object.values(projectAccesses)));
-      this.dispatch(addOrReplaceProjectFiles(filesToDelete));
+      this.dispatch(addProjectFiles(filesToDelete));
       this.dispatch(setProjectAttachments(attachmentsOfProject));
       this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
       if (license) {
@@ -5753,12 +5668,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];
   }
@@ -5925,7 +5838,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({
@@ -5936,7 +5848,6 @@ class FormSubmissionService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(addFormSubmission(submissionToBeDeleted));
       this.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
@@ -6813,15 +6724,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"]
@@ -6830,21 +6740,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"],
@@ -7348,8 +7251,6 @@ export {
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
-  addActiveProjectFormSubmissionsCount,
-  addActiveProjectIssuesCount,
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
@@ -7392,11 +7293,10 @@ export {
   addIssueUpdates,
   addIssues,
   addLicenses,
-  addOrReplaceProjectFile,
-  addOrReplaceProjectFiles,
-  addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
+  addProjectFile,
+  addProjectFiles,
   addTeam,
   addUsers,
   addWorkspace,
@@ -7470,6 +7370,8 @@ export {
   deleteProjectAccesses,
   deleteProjectAttachment,
   deleteProjectAttachments,
+  deleteProjectFile,
+  deleteProjectFiles,
   deleteTeam,
   deleteWorkspace,
   dequeue,
@@ -7537,6 +7439,7 @@ export {
   initializeOrganizationAccesses,
   initializeProjectAccesses,
   initializeProjectAttachments,
+  initializeProjectFiles,
   initializeTeams,
   initializeWorkspaces,
   isToday,
@@ -7585,8 +7488,6 @@ export {
   rehydratedSlice,
   removeDocuments,
   removeIssueType,
-  removeProjectFile,
-  removeProjectFilesOfProject,
   removeUser,
   resetProjectFileObjectUrls,
   resetStore,
@@ -7594,10 +7495,7 @@ export {
   saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
-  selectActiveProject,
-  selectActiveProjectAccess,
   selectActiveProjectFileId,
-  selectActiveProjectId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
@@ -7770,7 +7668,6 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveProjectFileId,
-  setActiveProjectId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -7810,6 +7707,8 @@ export {
   setProfilePicture,
   setProjectAttachment,
   setProjectAttachments,
+  setProjectFile,
+  setProjectFiles,
   setProjects,
   setRehydrated,
   setTeam,
@@ -7859,11 +7758,13 @@ export {
   updateIssueAttachments,
   updateIssueType,
   updateLicense,
-  updateOrCreateProject,
   updateOrganizationAccess,
+  updateProject,
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,
+  updateProjectFile,
+  updateProjectFiles,
   updateTeam,
   updateWorkspace,
   userReducer,