@overmap-ai/core 1.0.62-store-clear-fixes.0 → 1.0.62-store-clear-fixes.2

package/dist/overmap-core.js

@@ -2522,11 +2522,16 @@ const selectFormSubmission = (submissionId) => (state) => {
 };
 const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectFormSubmissions, selectFormRevisionMapping, (_state, formId) => formId],
+    [
+      selectFormSubmissionsMapping,
+      selectFormRevisionMapping,
+      (_state, formId) => formId
+    ],
     (submissions, revisionMapping, formId) => {
-      return submissions.filter((submission) => {
-        const revision = revisionMapping[submission.form_revision];
-        return (revision == null ? void 0 : revision.form) === formId;
+      const revisionsOfForm = Object.values(revisionMapping).filter((revision) => revision.form === formId);
+      const revisionIds = new Set(revisionsOfForm.map((revision) => revision.offline_id));
+      return Object.values(submissions).filter((submission) => {
+        return revisionIds.has(submission.form_revision);
       });
     }
   )
@@ -4090,10 +4095,15 @@ class AssetService extends BaseApiService {
     if (!assetToBeDeleted)
       throw new Error(`No asset with id ${assetId} found in the store`);
     const attachmentsOfAssets = selectAttachmentsOfAsset(assetId)(store.getState());
-    store.dispatch(deleteAsset(assetId));
+    const formSubmissionsOfAssets = selectFormSubmissionsOfAsset(assetId)(store.getState());
+    this.dispatch(deleteAsset(assetId));
     if (attachmentsOfAssets.length > 0) {
       const attachmentsOfAssetIds = attachmentsOfAssets.map(({ offline_id }) => offline_id);
-      store.dispatch(deleteAssetAttachments(attachmentsOfAssetIds));
+      this.dispatch(deleteAssetAttachments(attachmentsOfAssetIds));
+    }
+    if (formSubmissionsOfAssets.length > 0) {
+      const formSubmissionsOfAssetIds = formSubmissionsOfAssets.map(({ offline_id }) => offline_id);
+      this.dispatch(deleteFormSubmissions(formSubmissionsOfAssetIds));
     }
     return this.enqueueRequest({
       description: "Delete asset",
@@ -4102,8 +4112,9 @@ class AssetService extends BaseApiService {
       blockers: [assetId],
       blocks: []
     }).catch((err) => {
-      store.dispatch(addAsset(assetToBeDeleted));
-      store.dispatch(addAssetAttachments(attachmentsOfAssets));
+      this.dispatch(addAsset(assetToBeDeleted));
+      this.dispatch(addAssetAttachments(attachmentsOfAssets));
+      this.dispatch(addFormSubmissions(formSubmissionsOfAssets));
       throw err;
     });
   }
@@ -4978,12 +4989,15 @@ class IssueService extends BaseApiService {
     }
     const attachmentsOfIssue = selectAttachmentsOfIssue(id)(state);
     const updatesOfIssue = selectIssueUpdatesOfIssue(id)(state);
+    const formSubmissionsOfIssue = selectFormSubmissionsOfIssue(id)(state);
     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)
       this.dispatch(deleteIssueUpdates(updatesOfIssue.map(({ offline_id }) => offline_id)));
+    if (formSubmissionsOfIssue.length > 0)
+      this.dispatch(deleteFormSubmissions(formSubmissionsOfIssue.map(({ offline_id }) => offline_id)));
     try {
       return await this.enqueueRequest({
         description: "Delete issue",
@@ -4997,6 +5011,7 @@ class IssueService extends BaseApiService {
       this.dispatch(addIssueAttachments(attachmentsOfIssue));
       this.dispatch(addIssueUpdates(updatesOfIssue));
       this.dispatch(addActiveProjectIssuesCount(1));
+      this.dispatch(addFormSubmissions(formSubmissionsOfIssue));
       throw e;
     }
   }