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

package/dist/overmap-core.umd.cjs

@@ -1552,6 +1552,7 @@ var __publicField = (obj, key, value) => {
   };
   const categoryReducer = categorySlice.reducer;
   function setAttachments(state, action) {
+    state.attachments = {};
     for (const attachment of action.payload) {
       state.attachments[attachment.offline_id] = attachment;
     }
@@ -1706,6 +1707,9 @@ var __publicField = (obj, key, value) => {
     [selectComponentAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
+  const selectComponentAttachment = (attachmentId) => (state) => {
+    return state.componentReducer.attachments[attachmentId];
+  };
   const selectAttachmentsOfComponent = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllComponentAttachments, (_state, componentId) => componentId],
@@ -1995,6 +1999,9 @@ var __publicField = (obj, key, value) => {
     [selectComponentTypeAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
+  const selectComponentTypeAttachment = (attachmentId) => (state) => {
+    return state.componentTypeReducer.attachments[attachmentId];
+  };
   const selectAttachmentsOfComponentType = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllComponentTypeAttachments, (_state, componentTypeId) => componentTypeId],
@@ -2389,6 +2396,9 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  const selectIssueAttachment = (attachmentId) => (root) => {
+    return root.issueReducer.attachments[attachmentId];
+  };
   const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectIssueAttachments, (_state, issueId) => issueId],
@@ -3843,7 +3853,8 @@ var __publicField = (obj, key, value) => {
   );
   const emailDomainsReducer = emailDomainsSlice.reducer;
   const initialState$1 = {
-    documents: {}
+    documents: {},
+    attachments: {}
   };
   const documentSlice = toolkit.createSlice({
     name: "documents",
@@ -3980,10 +3991,28 @@ var __publicField = (obj, key, value) => {
           }
           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 = toolkit.createSelector(
     [selectDocumentsMapping],
@@ -4013,6 +4042,39 @@ var __publicField = (obj, key, value) => {
     [selectDocuments],
     (documents) => documents.filter((document2) => !document2.parent_document)
   );
+  const selectDocumentAttachmentMapping = (state) => state.documentsReducer.attachments;
+  const selectAllDocumentAttachments = toolkit.createSelector(
+    [selectDocumentAttachmentMapping],
+    (mapping) => Object.values(mapping)
+  );
+  const selectDocumentAttachment = (attachmentId) => (state) => {
+    return state.documentsReducer.attachments[attachmentId];
+  };
+  const selectAttachmentsOfDocument = restructureCreateSelectorWithArgs(
+    toolkit.createSelector(
+      [selectAllDocumentAttachments, (_state, documentId) => documentId],
+      (attachments, documentId) => {
+        return attachments.filter(({ document: document2 }) => documentId === document2);
+      }
+    )
+  );
+  const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
+    toolkit.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
@@ -4593,7 +4655,8 @@ var __publicField = (obj, key, value) => {
         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];
     }
@@ -4697,8 +4760,8 @@ var __publicField = (obj, key, value) => {
       });
       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.");
       }
@@ -4711,24 +4774,24 @@ var __publicField = (obj, key, value) => {
         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];
@@ -4799,7 +4862,7 @@ var __publicField = (obj, key, value) => {
         return photoAttachmentPromise(file);
       });
     }
-    attachFilesToProject(filesToSubmit, projectId) {
+    attachFilesToDocument(filesToSubmit, documentId) {
       return filesToSubmit.map((file) => {
         if (!(file instanceof File)) {
           throw new Error("Expected a File instance.");
@@ -4810,12 +4873,12 @@ var __publicField = (obj, key, value) => {
             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);
       });
@@ -4995,9 +5058,9 @@ var __publicField = (obj, key, value) => {
       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;
@@ -5011,7 +5074,7 @@ var __publicField = (obj, key, value) => {
           throw new Error(`newFile["objectURL"] is unexpectedly ${newFile.objectURL}`);
         }
         store.dispatch(
-          updateProjectAttachment({
+          updateDocumentAttachment({
             ...attachment,
             file_sha1: newSha1,
             file: URL.createObjectURL(newFile)
@@ -5019,13 +5082,13 @@ var __publicField = (obj, key, value) => {
         );
         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],
@@ -5038,7 +5101,7 @@ var __publicField = (obj, key, value) => {
         } catch (e) {
           if (oldFile) {
             store.dispatch(
-              updateProjectAttachment({
+              updateDocumentAttachment({
                 ...attachment,
                 file_sha1: attachment.file_sha1,
                 file: URL.createObjectURL(oldFile)
@@ -5108,20 +5171,20 @@ var __publicField = (obj, key, value) => {
         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]
       });
     }
   }
@@ -6358,11 +6421,18 @@ var __publicField = (obj, key, value) => {
       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();
@@ -6761,7 +6831,8 @@ var __publicField = (obj, key, value) => {
         ...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));
@@ -6824,7 +6895,8 @@ var __publicField = (obj, key, value) => {
         ...payloadWithoutImage,
         created_by: currentUserId,
         revision: "Pending",
-        form: formId2
+        form: formId2,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString()
       };
       store.dispatch(addUserFormRevision(fullRevision));
       const promise = this.enqueueRequest({
@@ -15621,6 +15693,8 @@ var __publicField = (obj, key, value) => {
   exports2.addComponentTypeAttachment = addComponentTypeAttachment;
   exports2.addComponentTypeAttachments = addComponentTypeAttachments;
   exports2.addComponentsInBatches = addComponentsInBatches;
+  exports2.addDocumentAttachment = addDocumentAttachment;
+  exports2.addDocumentAttachments = addDocumentAttachments;
   exports2.addDocuments = addDocuments;
   exports2.addEmailDomain = addEmailDomain;
   exports2.addFavouriteProjectId = addFavouriteProjectId;
@@ -15784,6 +15858,8 @@ var __publicField = (obj, key, value) => {
   exports2.removeComponentAttachments = removeComponentAttachments;
   exports2.removeComponentTypeAttachment = removeComponentTypeAttachment;
   exports2.removeComponentTypeAttachments = removeComponentTypeAttachments;
+  exports2.removeDocumentAttachment = removeDocumentAttachment;
+  exports2.removeDocumentAttachments = removeDocumentAttachments;
   exports2.removeDocuments = removeDocuments;
   exports2.removeEmailDomain = removeEmailDomain;
   exports2.removeFavouriteProjectId = removeFavouriteProjectId;
@@ -15831,6 +15907,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectAllAttachments = selectAllAttachments;
   exports2.selectAllComponentAttachments = selectAllComponentAttachments;
   exports2.selectAllComponentTypeAttachments = selectAllComponentTypeAttachments;
+  exports2.selectAllDocumentAttachments = selectAllDocumentAttachments;
   exports2.selectAllProjectAttachments = selectAllProjectAttachments;
   exports2.selectAncestorIdsOfDocument = selectAncestorIdsOfDocument;
   exports2.selectAppearance = selectAppearance;
@@ -15838,6 +15915,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectAttachmentsOfComponentByType = selectAttachmentsOfComponentByType;
   exports2.selectAttachmentsOfComponentType = selectAttachmentsOfComponentType;
   exports2.selectAttachmentsOfComponentTypeByType = selectAttachmentsOfComponentTypeByType;
+  exports2.selectAttachmentsOfDocument = selectAttachmentsOfDocument;
+  exports2.selectAttachmentsOfDocumentByType = selectAttachmentsOfDocumentByType;
   exports2.selectAttachmentsOfIssue = selectAttachmentsOfIssue;
   exports2.selectAttachmentsOfIssueByType = selectAttachmentsOfIssueByType;
   exports2.selectAttachmentsOfProject = selectAttachmentsOfProject;
@@ -15853,9 +15932,11 @@ var __publicField = (obj, key, value) => {
   exports2.selectCompletedStageIdsForComponent = selectCompletedStageIdsForComponent;
   exports2.selectCompletedStages = selectCompletedStages;
   exports2.selectComponent = selectComponent;
+  exports2.selectComponentAttachment = selectComponentAttachment;
   exports2.selectComponentAttachmentMapping = selectComponentAttachmentMapping;
   exports2.selectComponentSubmissionMapping = selectComponentSubmissionMapping;
   exports2.selectComponentType = selectComponentType;
+  exports2.selectComponentTypeAttachment = selectComponentTypeAttachment;
   exports2.selectComponentTypeAttachmentMapping = selectComponentTypeAttachmentMapping;
   exports2.selectComponentTypeForm = selectComponentTypeForm;
   exports2.selectComponentTypeFromComponent = selectComponentTypeFromComponent;
@@ -15873,6 +15954,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectCurrentUser = selectCurrentUser;
   exports2.selectDeletedRequests = selectDeletedRequests;
   exports2.selectDocument = selectDocument;
+  exports2.selectDocumentAttachment = selectDocumentAttachment;
+  exports2.selectDocumentAttachmentMapping = selectDocumentAttachmentMapping;
   exports2.selectDocuments = selectDocuments;
   exports2.selectDocumentsMapping = selectDocumentsMapping;
   exports2.selectEmailDomainsAsMapping = selectEmailDomainsAsMapping;
@@ -15894,6 +15977,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectIsLoading = selectIsLoading;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
   exports2.selectIssue = selectIssue;
+  exports2.selectIssueAttachment = selectIssueAttachment;
   exports2.selectIssueAttachmentMapping = selectIssueAttachmentMapping;
   exports2.selectIssueAttachments = selectIssueAttachments;
   exports2.selectIssueMapping = selectIssueMapping;
@@ -15987,6 +16071,7 @@ var __publicField = (obj, key, value) => {
   exports2.setComponents = setComponents;
   exports2.setCreateProjectType = setCreateProjectType;
   exports2.setCurrentUser = setCurrentUser;
+  exports2.setDocumentAttachments = setDocumentAttachments;
   exports2.setDocuments = setDocuments;
   exports2.setEmailDomains = setEmailDomains;
   exports2.setEnableClustering = setEnableClustering;
@@ -16041,6 +16126,7 @@ var __publicField = (obj, key, value) => {
   exports2.updateComponent = updateComponent;
   exports2.updateComponentAttachment = updateComponentAttachment;
   exports2.updateComponentTypeAttachment = updateComponentTypeAttachment;
+  exports2.updateDocumentAttachment = updateDocumentAttachment;
   exports2.updateDocuments = updateDocuments;
   exports2.updateIssue = updateIssue;
   exports2.updateIssueAttachment = updateIssueAttachment;