@overmap-ai/core 1.0.71-fields.12 → 1.0.71-fields.14

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$u = {
-  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) => {
@@ -3176,6 +3115,20 @@ const selectIssueTypeFieldValuesAttachments = createSelector(
     return Object.values(attachmentsMapping);
   }
 );
+const selectIssueTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
+  return state.issueTypeFieldValuesAttachmentReducer.instances[attachmentId];
+};
+const selectIssueTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFieldValuesAttachmentsMapping, (_, attachmentIds) => attachmentIds],
+    (mapping, attachmentIds) => {
+      const attachmentIdsSet = new Set(attachmentIds);
+      return fallbackToEmptyArray(
+        Object.values(mapping).filter((attachment) => attachmentIdsSet.has(attachment.offline_id))
+      );
+    }
+  )
+);
 const selectAttachmentsOfIssueTypeFieldValues = restructureCreateSelectorWithArgs(
   createSelector(
     [selectIssueTypeFieldValuesAttachments, (_state, fieldValuesId) => fieldValuesId],
@@ -3184,9 +3137,6 @@ const selectAttachmentsOfIssueTypeFieldValues = restructureCreateSelectorWithArg
     }
   )
 );
-const selectIssueTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
-  return state.issueTypeFieldValuesAttachmentReducer.instances[attachmentId];
-};
 const issueTypeFieldValuesAttachmentReducer = issueTypeFieldValuesAttachmentSlice.reducer;
 const assetTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
 const initialState$3 = assetTypeFieldsAdapter.getInitialState({});
@@ -3375,14 +3325,25 @@ const selectAssetTypeFieldValuesAttachments = createSelector(
     return Object.values(attachmentsMapping);
   }
 );
+const selectAssetTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
+  return state.assetTypeFieldValuesAttachmentReducer.instances[attachmentId];
+};
+const selectAssetTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAssetTypeFieldValuesAttachmentsMapping, (_, attachmentIds) => attachmentIds],
+    (mapping, attachmentIds) => {
+      const attachmentIdsSet = new Set(attachmentIds);
+      return fallbackToEmptyArray(
+        Object.values(mapping).filter((attachment) => attachmentIdsSet.has(attachment.offline_id))
+      );
+    }
+  )
+);
 const selectAttachmentsOfAssetTypeFieldValues = restructureCreateSelectorWithArgs(
   createSelector([selectAssetTypeFieldValuesAttachments, (_state, id) => id], (attachments, id) => {
     return fallbackToEmptyArray(attachments.filter((attachment) => attachment.field_values === id));
   })
 );
-const selectAssetTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
-  return state.assetTypeFieldValuesAttachmentReducer.instances[attachmentId];
-};
 const assetTypeFieldValuesAttachmentReducer = assetTypeFieldValuesAttachmentSlice.reducer;
 let clientStore;
 function setClientStore(store) {
@@ -5093,7 +5054,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,
@@ -5106,7 +5066,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];
@@ -5222,7 +5181,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)
@@ -5243,7 +5201,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;
@@ -5409,13 +5366,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");
@@ -5440,7 +5393,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
@@ -5555,7 +5508,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,
@@ -5820,12 +5773,10 @@ class FormSubmissionService extends BaseUploadService {
     });
     this.dispatch(addFormSubmission(offlineSubmission));
     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, promise];
   }
@@ -5872,7 +5823,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({
@@ -5883,7 +5833,6 @@ class FormSubmissionService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(addFormSubmission(submissionToBeDeleted));
       this.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
@@ -6730,15 +6679,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"]
@@ -6747,21 +6695,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"],
@@ -7769,8 +7710,8 @@ class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
   async bulkDelete(ids) {
     const { store } = this.client;
     const state = store.getState();
-    const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(ids)(state);
-    this.dispatch(deleteFormSubmissionAttachments(ids));
+    const attachments = selectAssetTypeFieldValuesAttachmentsByIds(ids)(state);
+    this.dispatch(deleteAssetTypeFieldValuesAttachments(ids));
     try {
       await this.enqueueRequest({
         description: "Delete asset type field values attachments",
@@ -7781,7 +7722,7 @@ class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
+      this.dispatch(addAssetTypeFieldValuesAttachments(attachments));
       throw e;
     }
   }
@@ -7977,8 +7918,8 @@ class IssueTypeFieldValuesAttachmentService extends BaseUploadService {
   async bulkDelete(attachmentsIds) {
     const { store } = this.client;
     const state = store.getState();
-    const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(attachmentsIds)(state);
-    this.dispatch(deleteFormSubmissionAttachments(attachmentsIds));
+    const attachments = selectIssueTypeFieldValuesAttachmentsByIds(attachmentsIds)(state);
+    this.dispatch(deleteIssueTypeFieldValuesAttachments(attachmentsIds));
     try {
       await this.enqueueRequest({
         description: "Delete issue type field values attachments",
@@ -7989,7 +7930,7 @@ class IssueTypeFieldValuesAttachmentService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
+      this.dispatch(addIssueTypeFieldValuesAttachments(attachments));
       throw e;
     }
   }
@@ -8198,8 +8139,6 @@ export {
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
-  addActiveProjectFormSubmissionsCount,
-  addActiveProjectIssuesCount,
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
@@ -8260,7 +8199,6 @@ export {
   addLicenses,
   addOrReplaceProjectFile,
   addOrReplaceProjectFiles,
-  addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
   addTeam,
@@ -8509,10 +8447,7 @@ export {
   saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
-  selectActiveProject,
-  selectActiveProjectAccess,
   selectActiveProjectFileId,
-  selectActiveProjectId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
@@ -8534,6 +8469,7 @@ export {
   selectAssetTypeFieldValues,
   selectAssetTypeFieldValuesAttachmentById,
   selectAssetTypeFieldValuesAttachments,
+  selectAssetTypeFieldValuesAttachmentsByIds,
   selectAssetTypeFieldValuesAttachmentsMapping,
   selectAssetTypeFieldValuesById,
   selectAssetTypeFieldValuesMapping,
@@ -8633,6 +8569,7 @@ export {
   selectIssueTypeFieldValues,
   selectIssueTypeFieldValuesAttachmentById,
   selectIssueTypeFieldValuesAttachments,
+  selectIssueTypeFieldValuesAttachmentsByIds,
   selectIssueTypeFieldValuesAttachmentsMapping,
   selectIssueTypeFieldValuesById,
   selectIssueTypeFieldValuesMapping,
@@ -8714,7 +8651,6 @@ export {
   separateFilesFromValues,
   separateImageFromFields,
   setActiveProjectFileId,
-  setActiveProjectId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -8835,8 +8771,8 @@ export {
   updateIssueTypeFieldsAttachments,
   updateIssueTypeFieldsMany,
   updateLicense,
-  updateOrCreateProject,
   updateOrganizationAccess,
+  updateProject,
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,