@overmap-ai/core 1.0.50-fix-error-messaging.0 → 1.0.51-add-submitted-at-to-form-revisions.0

package/README.md

@@ -1,4 +1,4 @@
-# @overmap-ai/core
-
-The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
-packages.
+# @overmap-ai/core
+
+The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
+packages.

package/dist/overmap-core.js

@@ -1561,6 +1561,7 @@ const selectHiddenCategoryCount = (state) => {
 };
 const categoryReducer = categorySlice.reducer;
 function setAttachments(state, action) {
+  state.attachments = {};
   for (const attachment of action.payload) {
     state.attachments[attachment.offline_id] = attachment;
   }
@@ -1715,6 +1716,9 @@ const selectAllComponentAttachments = createSelector(
   [selectComponentAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
+const selectComponentAttachment = (attachmentId) => (state) => {
+  return state.componentReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfComponent = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentAttachments, (_state, componentId) => componentId],
@@ -2004,6 +2008,9 @@ const selectAllComponentTypeAttachments = createSelector(
   [selectComponentTypeAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
+const selectComponentTypeAttachment = (attachmentId) => (state) => {
+  return state.componentTypeReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfComponentType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentTypeAttachments, (_state, componentTypeId) => componentTypeId],
@@ -2398,6 +2405,9 @@ const selectAttachmentsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
+const selectIssueAttachment = (attachmentId) => (root) => {
+  return root.issueReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectIssueAttachments, (_state, issueId) => issueId],
@@ -3852,7 +3862,8 @@ const selectSortedEmailDomains = (state) => Object.values(state.emailDomainsRedu
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
 const initialState$1 = {
-  documents: {}
+  documents: {},
+  attachments: {}
 };
 const documentSlice = createSlice({
   name: "documents",
@@ -3989,10 +4000,28 @@ const documentSlice = createSlice({
         }
         delete state.documents[documentId];
       }
-    }
+    },
+    setDocumentAttachments: setAttachments,
+    addDocumentAttachment: addAttachment,
+    addDocumentAttachments: addAttachments,
+    updateDocumentAttachment: updateAttachment,
+    removeDocumentAttachment: removeAttachment,
+    removeDocumentAttachments: removeAttachments
   }
 });
-const { setDocuments, addDocuments, updateDocuments, moveDocument, removeDocuments } = documentSlice.actions;
+const {
+  setDocuments,
+  addDocuments,
+  updateDocuments,
+  moveDocument,
+  removeDocuments,
+  setDocumentAttachments,
+  addDocumentAttachment,
+  addDocumentAttachments,
+  updateDocumentAttachment,
+  removeDocumentAttachment,
+  removeDocumentAttachments
+} = documentSlice.actions;
 const selectDocumentsMapping = (state) => state.documentsReducer.documents;
 const selectDocuments = createSelector(
   [selectDocumentsMapping],
@@ -4022,6 +4051,39 @@ const selectRootDocuments = createSelector(
   [selectDocuments],
   (documents) => documents.filter((document2) => !document2.parent_document)
 );
+const selectDocumentAttachmentMapping = (state) => state.documentsReducer.attachments;
+const selectAllDocumentAttachments = createSelector(
+  [selectDocumentAttachmentMapping],
+  (mapping) => Object.values(mapping)
+);
+const selectDocumentAttachment = (attachmentId) => (state) => {
+  return state.documentsReducer.attachments[attachmentId];
+};
+const selectAttachmentsOfDocument = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAllDocumentAttachments, (_state, documentId) => documentId],
+    (attachments, documentId) => {
+      return attachments.filter(({ document: document2 }) => documentId === document2);
+    }
+  )
+);
+const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAllDocumentAttachments, (_state, documentId) => documentId],
+    (attachments, documentId) => {
+      const attachmentsOfProject = attachments.filter(({ document: document2 }) => documentId === document2);
+      const fileAttachments = attachmentsOfProject.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+      );
+      const imageAttachments = attachmentsOfProject.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => file_type && file_type.startsWith("image/")
+      );
+      return { fileAttachments, imageAttachments };
+    }
+  )
+);
 const documentsReducer = documentSlice.reducer;
 const initialState = {
   version: 0
@@ -4602,7 +4664,8 @@ class AttachmentService extends BaseApiService {
       issue_attachments: Object.values(state.issueReducer.attachments),
       component_attachments: Object.values(state.componentReducer.attachments),
       component_type_attachments: Object.values(state.componentTypeReducer.attachments),
-      project_attachments: Object.values(state.projectReducer.attachments)
+      project_attachments: Object.values(state.projectReducer.attachments),
+      document_attachments: Object.values(state.documentsReducer.attachments)
     };
     return [allAttachments, promise];
   }
@@ -4706,8 +4769,8 @@ class AttachmentService extends BaseApiService {
     });
     return [offlineAttachment, promise];
   }
-  async addProjectAttachment(attachmentPayload) {
-    const { description: description2, project, file_sha1, offline_id } = attachmentPayload;
+  async addDocumentAttachment(attachmentPayload) {
+    const { description: description2, document: document2, file_sha1, offline_id } = attachmentPayload;
     if (!attachmentPayload.file.objectURL) {
       throw new Error("Expected attachmentPayload.file.objectURL to be defined.");
     }
@@ -4720,24 +4783,24 @@ class AttachmentService extends BaseApiService {
       created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
-    this.client.store.dispatch(addProjectAttachment(offlineAttachment));
+    this.client.store.dispatch(addDocumentAttachment(offlineAttachment));
     const [fileProps] = await this.client.files.uploadFileToS3(file_sha1);
     const promise = this.enqueueRequest({
       description: "Create attachment",
       method: HttpMethod.POST,
-      url: `/projects/${project}/attach/`,
-      blocks: [offline_id, project.toString()],
+      url: `/documents/${document2}/attach/`,
+      blocks: [offline_id, document2],
       blockers: [file_sha1],
       payload: {
         offline_id,
-        project,
+        document: document2,
         description: description2 ?? "",
         submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
         ...fileProps
       }
     });
     promise.catch((error2) => {
-      this.client.store.dispatch(removeProjectAttachment(offlineAttachment.offline_id));
+      this.client.store.dispatch(removeDocumentAttachment(offlineAttachment.offline_id));
       throw error2;
     });
     return [offlineAttachment, promise];
@@ -4808,7 +4871,7 @@ class AttachmentService extends BaseApiService {
       return photoAttachmentPromise(file);
     });
   }
-  attachFilesToProject(filesToSubmit, projectId) {
+  attachFilesToDocument(filesToSubmit, documentId) {
     return filesToSubmit.map((file) => {
       if (!(file instanceof File)) {
         throw new Error("Expected a File instance.");
@@ -4819,12 +4882,12 @@ class AttachmentService extends BaseApiService {
           file: file2,
           file_name: file2.name,
           file_type: file2.type,
-          project: projectId,
+          document: documentId,
           file_sha1: hash,
           submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
           created_by: this.client.store.getState().userReducer.currentUser.id
         });
-        return this.addProjectAttachment(attachment);
+        return this.addDocumentAttachment(attachment);
       };
       return photoAttachmentPromise(file);
     });
@@ -5004,9 +5067,9 @@ class AttachmentService extends BaseApiService {
     const promise = performRequest2();
     return [offlineAttachment, promise];
   }
-  async replaceProjectAttachmentFile(attachmentId, newFile) {
+  async replaceDocumentAttachmentFile(attachmentId, newFile) {
     const { store } = this.client;
-    const attachment = store.getState().projectReducer.attachments[attachmentId];
+    const attachment = store.getState().documentsReducer.attachments[attachmentId];
     if (!attachment)
       throw new Error(`Attachment ${attachmentId} not found`);
     let oldFile = void 0;
@@ -5020,7 +5083,7 @@ class AttachmentService extends BaseApiService {
         throw new Error(`newFile["objectURL"] is unexpectedly ${newFile.objectURL}`);
       }
       store.dispatch(
-        updateProjectAttachment({
+        updateDocumentAttachment({
           ...attachment,
           file_sha1: newSha1,
           file: URL.createObjectURL(newFile)
@@ -5028,13 +5091,13 @@ class AttachmentService extends BaseApiService {
       );
       await this.client.files.addCache(newFile, newSha1);
       const [fileProps] = await this.client.files.uploadFileToS3(newSha1).catch((e) => {
-        store.dispatch(updateProjectAttachment(attachment));
+        store.dispatch(updateDocumentAttachment(attachment));
         throw e;
       });
       const promise2 = this.enqueueRequest({
         description: "Edit attachment",
         method: HttpMethod.PATCH,
-        url: `/attachments/projects/${attachment.offline_id}/`,
+        url: `/attachments/documents/${attachment.offline_id}/`,
         isResponseBlob: false,
         payload: fileProps,
         blockers: [attachmentId, newSha1],
@@ -5047,7 +5110,7 @@ class AttachmentService extends BaseApiService {
       } catch (e) {
         if (oldFile) {
           store.dispatch(
-            updateProjectAttachment({
+            updateDocumentAttachment({
               ...attachment,
               file_sha1: attachment.file_sha1,
               file: URL.createObjectURL(oldFile)
@@ -5117,20 +5180,20 @@ class AttachmentService extends BaseApiService {
       blocks: [componentTypeAttachmentId]
     });
   }
-  deleteProjectAttachment(projectAttachmentId) {
+  deleteDocumentAttachment(documentAttachmentId) {
     const { store } = this.client;
-    const attachment = selectProjectAttachmentMapping(store.getState())[projectAttachmentId];
+    const attachment = store.getState().documentsReducer.attachments[documentAttachmentId];
     if (!attachment) {
-      throw new Error(`Attachment ${projectAttachmentId} not found`);
+      throw new Error(`Attachment ${documentAttachmentId} not found`);
     }
-    store.dispatch(removeProjectAttachment(projectAttachmentId));
+    store.dispatch(removeDocumentAttachment(documentAttachmentId));
     void this.client.files.removeCache(attachment.file_sha1);
     return this.enqueueRequest({
-      description: "Delete attachment",
+      description: "Delete document attachment",
       method: HttpMethod.DELETE,
-      url: `/attachments/projects/${projectAttachmentId}/`,
-      blockers: [projectAttachmentId],
-      blocks: [projectAttachmentId]
+      url: `/attachments/documents/${documentAttachmentId}/`,
+      blockers: [documentAttachmentId],
+      blocks: [documentAttachmentId]
     });
   }
 }
@@ -6367,11 +6430,18 @@ class MainService extends BaseApiService {
     if (currentProjectId) {
       const [_offlineAttachments, promise] = this.client.attachments.fetchAll(currentProjectId);
       void promise.then((result) => {
-        const { issue_attachments, component_type_attachments, component_attachments, project_attachments } = result;
+        const {
+          issue_attachments,
+          component_type_attachments,
+          component_attachments,
+          project_attachments,
+          document_attachments
+        } = result;
         store.dispatch(setIssueAttachments(issue_attachments));
         store.dispatch(setComponentAttachments(component_attachments));
         store.dispatch(setComponentTypeAttachments(component_type_attachments));
         store.dispatch(setProjectAttachments(project_attachments));
+        store.dispatch(setDocumentAttachments(document_attachments));
       });
       void this.client.documents.refreshStore();
       void this.client.issueUpdates.refreshStore();
@@ -6770,7 +6840,8 @@ class UserFormService extends BaseApiService {
       ...payloadWithoutImage,
       created_by: currentUser.id,
       form: retForm.offline_id,
-      revision: 0
+      revision: 0,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     };
     const { store } = this.client;
     store.dispatch(addUserForm(retForm));
@@ -6833,7 +6904,8 @@ class UserFormService extends BaseApiService {
       ...payloadWithoutImage,
       created_by: currentUserId,
       revision: "Pending",
-      form: formId2
+      form: formId2,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     };
     store.dispatch(addUserFormRevision(fullRevision));
     const promise = this.enqueueRequest({
@@ -15631,6 +15703,8 @@ export {
   addComponentTypeAttachment,
   addComponentTypeAttachments,
   addComponentsInBatches,
+  addDocumentAttachment,
+  addDocumentAttachments,
   addDocuments,
   addEmailDomain,
   addFavouriteProjectId,
@@ -15794,6 +15868,8 @@ export {
   removeComponentAttachments,
   removeComponentTypeAttachment,
   removeComponentTypeAttachments,
+  removeDocumentAttachment,
+  removeDocumentAttachments,
   removeDocuments,
   removeEmailDomain,
   removeFavouriteProjectId,
@@ -15841,6 +15917,7 @@ export {
   selectAllAttachments,
   selectAllComponentAttachments,
   selectAllComponentTypeAttachments,
+  selectAllDocumentAttachments,
   selectAllProjectAttachments,
   selectAncestorIdsOfDocument,
   selectAppearance,
@@ -15848,6 +15925,8 @@ export {
   selectAttachmentsOfComponentByType,
   selectAttachmentsOfComponentType,
   selectAttachmentsOfComponentTypeByType,
+  selectAttachmentsOfDocument,
+  selectAttachmentsOfDocumentByType,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
   selectAttachmentsOfProject,
@@ -15863,9 +15942,11 @@ export {
   selectCompletedStageIdsForComponent,
   selectCompletedStages,
   selectComponent,
+  selectComponentAttachment,
   selectComponentAttachmentMapping,
   selectComponentSubmissionMapping,
   selectComponentType,
+  selectComponentTypeAttachment,
   selectComponentTypeAttachmentMapping,
   selectComponentTypeForm,
   selectComponentTypeFromComponent,
@@ -15883,6 +15964,8 @@ export {
   selectCurrentUser,
   selectDeletedRequests,
   selectDocument,
+  selectDocumentAttachment,
+  selectDocumentAttachmentMapping,
   selectDocuments,
   selectDocumentsMapping,
   selectEmailDomainsAsMapping,
@@ -15904,6 +15987,7 @@ export {
   selectIsLoading,
   selectIsLoggedIn,
   selectIssue,
+  selectIssueAttachment,
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueMapping,
@@ -15997,6 +16081,7 @@ export {
   setComponents,
   setCreateProjectType,
   setCurrentUser,
+  setDocumentAttachments,
   setDocuments,
   setEmailDomains,
   setEnableClustering,
@@ -16051,6 +16136,7 @@ export {
   updateComponent,
   updateComponentAttachment,
   updateComponentTypeAttachment,
+  updateDocumentAttachment,
   updateDocuments,
   updateIssue,
   updateIssueAttachment,