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

package/dist/overmap-core.umd.cjs

@@ -1520,13 +1520,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
@@ -1541,8 +1534,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectAccessReducer = projectAccessSlice.reducer;
   const initialState$m = {
-    projects: {},
-    activeProjectId: null
+    projects: {}
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
@@ -1556,19 +1548,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];
       },
@@ -1578,52 +1560,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 = toolkit.createSelector(
-    [selectProjectMapping, selectActiveProjectId],
-    (projectsMapping, activeprojectId) => {
-      if (activeprojectId === null) {
-        return null;
-      }
-      return projectsMapping[activeprojectId] ?? null;
-    }
-  );
   const selectProjectById = (id) => (state) => {
     return state.projectReducer.projects[id];
   };
@@ -1798,39 +1740,26 @@ var __publicField = (obj, key, value) => {
   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 = toolkit.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;
       },
@@ -1839,55 +1768,46 @@ var __publicField = (obj, key, value) => {
         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 = 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 selectProjectFileMapping = (state) => state.projectFileReducer.instances;
+  const selectProjectFiles = toolkit.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;
@@ -4757,7 +4677,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,
@@ -4774,7 +4693,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];
@@ -4890,7 +4808,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)
@@ -4911,7 +4828,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;
@@ -5070,7 +4986,7 @@ var __publicField = (obj, key, value) => {
         blocks: [file.offline_id]
       });
       void promise.then((result) => {
-        this.dispatch(addOrReplaceProjectFile(result));
+        this.dispatch(updateProjectFile(result));
       });
       return promise;
     }
@@ -5082,7 +4998,7 @@ var __publicField = (obj, key, value) => {
       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");
       }
@@ -5121,7 +5037,7 @@ var __publicField = (obj, key, value) => {
         return this.enqueueRequest(requestDetails2);
       });
       void promise.then((result) => {
-        this.dispatch(addOrReplaceProjectFile(result));
+        this.dispatch(updateProjectFile(result));
       });
       this.dispatch(saveActiveProjectFileBounds);
       this.dispatch(setActiveProjectFileId(null));
@@ -5129,7 +5045,7 @@ var __publicField = (obj, key, value) => {
       return [activeProjectFile, promise];
     }
     delete(projectFileId) {
-      this.dispatch(removeProjectFile(projectFileId));
+      this.dispatch(deleteProjectFile(projectFileId));
       return this.enqueueRequest({
         method: HttpMethod.DELETE,
         url: `/projects/files/${projectFileId}`,
@@ -5145,8 +5061,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      this.dispatch(addOrReplaceProjectFiles([]));
-      this.dispatch(addOrReplaceProjectFiles(result));
+      this.dispatch(initializeProjectFiles(result));
     }
   }
   class ProjectAttachmentService extends BaseAttachmentService {
@@ -5202,7 +5117,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,
@@ -5224,7 +5139,7 @@ var __publicField = (obj, key, value) => {
         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);
@@ -5247,7 +5162,7 @@ var __publicField = (obj, key, value) => {
       } 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) {
@@ -5742,12 +5657,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];
     }
@@ -5914,7 +5827,6 @@ var __publicField = (obj, key, value) => {
       }
       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({
@@ -5925,7 +5837,6 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        this.dispatch(addActiveProjectFormSubmissionsCount(1));
         this.dispatch(addFormSubmission(submissionToBeDeleted));
         this.dispatch(addFormSubmissionAttachments(submissionAttachments));
         throw e;
@@ -6802,15 +6713,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"]
@@ -6819,21 +6729,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"],
@@ -7336,8 +7239,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;
@@ -7380,11 +7281,10 @@ var __publicField = (obj, key, value) => {
   exports2.addIssueUpdates = addIssueUpdates;
   exports2.addIssues = addIssues;
   exports2.addLicenses = addLicenses;
-  exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
-  exports2.addOrReplaceProjectFiles = addOrReplaceProjectFiles;
-  exports2.addOrReplaceProjects = addOrReplaceProjects;
   exports2.addProjectAttachment = addProjectAttachment;
   exports2.addProjectAttachments = addProjectAttachments;
+  exports2.addProjectFile = addProjectFile;
+  exports2.addProjectFiles = addProjectFiles;
   exports2.addTeam = addTeam;
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
@@ -7458,6 +7358,8 @@ var __publicField = (obj, key, value) => {
   exports2.deleteProjectAccesses = deleteProjectAccesses;
   exports2.deleteProjectAttachment = deleteProjectAttachment;
   exports2.deleteProjectAttachments = deleteProjectAttachments;
+  exports2.deleteProjectFile = deleteProjectFile;
+  exports2.deleteProjectFiles = deleteProjectFiles;
   exports2.deleteTeam = deleteTeam;
   exports2.deleteWorkspace = deleteWorkspace;
   exports2.dequeue = dequeue;
@@ -7525,6 +7427,7 @@ var __publicField = (obj, key, value) => {
   exports2.initializeOrganizationAccesses = initializeOrganizationAccesses;
   exports2.initializeProjectAccesses = initializeProjectAccesses;
   exports2.initializeProjectAttachments = initializeProjectAttachments;
+  exports2.initializeProjectFiles = initializeProjectFiles;
   exports2.initializeTeams = initializeTeams;
   exports2.initializeWorkspaces = initializeWorkspaces;
   exports2.isToday = isToday;
@@ -7573,8 +7476,6 @@ var __publicField = (obj, key, value) => {
   exports2.rehydratedSlice = rehydratedSlice;
   exports2.removeDocuments = removeDocuments;
   exports2.removeIssueType = removeIssueType;
-  exports2.removeProjectFile = removeProjectFile;
-  exports2.removeProjectFilesOfProject = removeProjectFilesOfProject;
   exports2.removeUser = removeUser;
   exports2.resetProjectFileObjectUrls = resetProjectFileObjectUrls;
   exports2.resetStore = resetStore;
@@ -7582,10 +7483,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;
@@ -7758,7 +7656,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;
@@ -7798,6 +7695,8 @@ var __publicField = (obj, key, value) => {
   exports2.setProfilePicture = setProfilePicture;
   exports2.setProjectAttachment = setProjectAttachment;
   exports2.setProjectAttachments = setProjectAttachments;
+  exports2.setProjectFile = setProjectFile;
+  exports2.setProjectFiles = setProjectFiles;
   exports2.setProjects = setProjects;
   exports2.setRehydrated = setRehydrated;
   exports2.setTeam = setTeam;
@@ -7847,11 +7746,13 @@ 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;
+  exports2.updateProjectFile = updateProjectFile;
+  exports2.updateProjectFiles = updateProjectFiles;
   exports2.updateTeam = updateTeam;
   exports2.updateWorkspace = updateWorkspace;
   exports2.userReducer = userReducer;