@overmap-ai/core 1.0.51-bulk-form-submission.0 → 1.0.51-bulk-form-submission.2

package/dist/overmap-core.umd.cjs

@@ -3472,33 +3472,19 @@ var __publicField = (obj, key, value) => {
   const settingReducer = settingSlice.reducer;
   const selectIsFetchingInitialData = (state) => state.settingReducer.isFetchingInitialData;
   const selectIsLoading = (state) => state.settingReducer.isLoading;
-  const LATEST_FORM_REVISION_CACHE = {};
-  function considerCachingFormRevision(formRevision, formId2, preferPending = false) {
-    var _a2;
-    if (!formRevision) {
-      if (!formId2) {
-        throw new Error("If form revision is null, formId is required.");
-      }
-      const currentLatestFormRevision = getLatestFormRevisionFromCache(formId2);
-      if (currentLatestFormRevision)
-        return;
-      LATEST_FORM_REVISION_CACHE[formId2] = null;
-      return;
-    }
-    if (formRevision.revision === "Pending") {
-      if (preferPending) {
-        LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
-      }
-      return;
-    }
-    const cachedFormRevision = (_a2 = LATEST_FORM_REVISION_CACHE[formRevision.form]) == null ? void 0 : _a2.revision;
-    if (formRevision.revision > (typeof cachedFormRevision === "number" ? cachedFormRevision : -1)) {
-      LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
+  const formRevisionSortFn = (formRevisionA, formRevisionB) => {
+    const revisionA = formRevisionA.revision;
+    const revisionB = formRevisionB.revision;
+    if (revisionA === "Pending" && revisionB === "Pending") {
+      return formRevisionA.submitted_at < formRevisionB.submitted_at ? -1 : 1;
+    } else if (revisionA === "Pending") {
+      return 1;
+    } else if (revisionB === "Pending") {
+      return -1;
+    } else {
+      return revisionA < revisionB ? -1 : 1;
     }
-  }
-  function getLatestFormRevisionFromCache(formId2) {
-    return LATEST_FORM_REVISION_CACHE[formId2];
-  }
+  };
   const initialState$5 = {
     formRevisions: {},
     attachments: {}
@@ -3511,13 +3497,11 @@ var __publicField = (obj, key, value) => {
       // revision related actions
       setFormRevision: (state, action) => {
         state.formRevisions[action.payload.offline_id] = action.payload;
-        considerCachingFormRevision(action.payload);
       },
       setFormRevisions: (state, action) => {
         state.formRevisions = {};
         for (const revision of action.payload) {
           state.formRevisions[revision.offline_id] = revision;
-          considerCachingFormRevision(revision);
         }
       },
       addFormRevision: (state, action) => {
@@ -3525,9 +3509,7 @@ var __publicField = (obj, key, value) => {
           throw new Error(`Revision with offline_id ${action.payload.offline_id} already exists`);
         }
         state.formRevisions[action.payload.offline_id] = action.payload;
-        considerCachingFormRevision(action.payload);
       },
-      // TODO: @Audiopolis / Magnus - do we want to standardize using PayloadAction?
       addFormRevisions: (state, action) => {
         for (const userFormRevision of action.payload) {
           if (state.formRevisions[userFormRevision.offline_id] !== void 0) {
@@ -3536,7 +3518,6 @@ var __publicField = (obj, key, value) => {
         }
         for (const userFormRevision of action.payload) {
           state.formRevisions[userFormRevision.offline_id] = userFormRevision;
-          considerCachingFormRevision(userFormRevision);
         }
       },
       // UserFormRevisions do not get updated
@@ -3545,7 +3526,6 @@ var __publicField = (obj, key, value) => {
           throw new Error(`Revision with offline_id ${action.payload} does not exist`);
         }
         delete state.formRevisions[action.payload];
-        delete LATEST_FORM_REVISION_CACHE[action.payload];
       },
       deleteFormRevisions: (state, action) => {
         for (const offlineId of action.payload) {
@@ -3555,7 +3535,6 @@ var __publicField = (obj, key, value) => {
         }
         for (const offlineId of action.payload) {
           delete state.formRevisions[offlineId];
-          delete LATEST_FORM_REVISION_CACHE[offlineId];
         }
       },
       // attachment related actions
@@ -3633,11 +3612,8 @@ var __publicField = (obj, key, value) => {
     return ret;
   };
   const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
-    toolkit.createSelector([selectFormRevisionMapping, (_state, formId2) => formId2], (revisions, formId2) => {
-      if (!formId2) {
-        throw new Error("formId is required");
-      }
-      return _selectLatestFormRevision(revisions, formId2);
+    toolkit.createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+      return revisions.filter((revision) => revision.form === formId2).sort(formRevisionSortFn).pop();
     })
   );
   const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
@@ -3656,12 +3632,19 @@ var __publicField = (obj, key, value) => {
       ],
       (userForms, revisions, componentTypeIds) => {
         const componentTypeIdsSet = new Set(componentTypeIds);
+        const formsOfComponentTypes = {};
         const ret = {};
         for (const form of Object.values(userForms)) {
           if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
-            ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
+            formsOfComponentTypes[form.component_type] = form;
           }
         }
+        for (const revision of Object.values(revisions)) {
+          const form = formsOfComponentTypes[revision.form];
+          if (!form || !form.component_type || !ret[form.component_type] || formRevisionSortFn(ret[form.component_type], revision) < 0)
+            continue;
+          ret[form.component_type] = revision;
+        }
         return ret;
       }
     )
@@ -3707,9 +3690,9 @@ var __publicField = (obj, key, value) => {
         state.forms[action.payload.offline_id] = action.payload;
       },
       addForms: (state, action) => {
-        action.payload.forEach((userForm) => {
+        for (const userForm of action.payload) {
           state.forms[userForm.offline_id] = userForm;
-        });
+        }
       },
       favoriteForm: (state, action) => {
         const { formId: formId2 } = action.payload;
@@ -3811,7 +3794,7 @@ var __publicField = (obj, key, value) => {
         }
       },
       addFormSubmission: (state, action) => {
-        if (state.formSubmissions[action.payload.offline_id] !== void 0) {
+        if (action.payload.offline_id in state.formSubmissions) {
           throw new Error(`Submission with offline_id ${action.payload.offline_id} already exists`);
         }
         state.formSubmissions[action.payload.offline_id] = action.payload;
@@ -6994,13 +6977,14 @@ var __publicField = (obj, key, value) => {
       };
       const currentUser = state.userReducer.currentUser;
       const activeWorkspaceId = state.workspaceReducer.activeWorkspaceId;
+      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const offlineFormPayload = offline({});
-      const offlineRevisionPayload = offline(initialRevision);
+      const offlineRevisionPayload = offline({ ...initialRevision, submitted_at: submittedAt });
       const retForm = {
         ...offlineFormPayload,
         index_workspace: activeWorkspaceId,
         favorite: true,
-        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        submitted_at: submittedAt,
         created_by: currentUser.id,
         ...componentTypeId && { component_type: componentTypeId },
         ...ownerAttrs
@@ -7010,7 +6994,8 @@ var __publicField = (obj, key, value) => {
         ...payloadWithoutImage,
         created_by: currentUser.id,
         form: retForm.offline_id,
-        revision: 0
+        revision: 0,
+        submitted_at: submittedAt
       };
       const { store } = this.client;
       store.dispatch(addForm(retForm));
@@ -7073,7 +7058,8 @@ var __publicField = (obj, key, value) => {
         ...payloadWithoutImage,
         created_by: currentUserId,
         revision: "Pending",
-        form: formId2
+        form: formId2,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString()
       };
       store.dispatch(addFormRevision(fullRevision));
       const promise = this.enqueueRequest({
@@ -7280,7 +7266,7 @@ var __publicField = (obj, key, value) => {
     // Note currently the bulkAdd method is specific to form submissions for components
     // TODO: adapt the support bulk adding to any model type
     async bulkAdd(args) {
-      const { form_revision, values: argsValues, componentOfflineIds } = args;
+      const { formRevision, values: argsValues, componentOfflineIds } = args;
       const { store } = this.client;
       const offlineSubmissions = [];
       const offlineAttachments = [];
@@ -7292,7 +7278,7 @@ var __publicField = (obj, key, value) => {
       const createdBy = store.getState().userReducer.currentUser.id;
       for (const component_id of componentOfflineIds) {
         const submission = offline({
-          form_revision,
+          form_revision: formRevision,
           values,
           created_by: createdBy,
           submitted_at: submittedAt,
@@ -7338,7 +7324,7 @@ var __publicField = (obj, key, value) => {
       const promise = this.enqueueRequest({
         description: "Bulk add form submissions",
         method: HttpMethod.POST,
-        url: `/forms/revisions/${form_revision}/bulk-respond/`,
+        url: `/forms/revisions/${formRevision}/bulk-respond/`,
         payload: {
           form_data: values,
           submitted_at: submittedAt,
@@ -7405,8 +7391,10 @@ var __publicField = (obj, key, value) => {
       const { store } = this.client;
       const state = store.getState();
       const submission = state.formSubmissionReducer.formSubmissions[submissionId];
+      const submissionAttachments = selectAttachmentsOfFormSubmission(submissionId)(state);
       store.dispatch(deleteFormSubmission(submissionId));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
+      store.dispatch(deleteFormSubmissionAttachments(submissionAttachments.map((x) => x.offline_id)));
       try {
         return await this.enqueueRequest({
           description: "Delete user form submissions",
@@ -7418,6 +7406,7 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         store.dispatch(addActiveProjectFormSubmissionsCount(1));
         store.dispatch(addFormSubmission(submission));
+        store.dispatch(addFormSubmissionAttachments(submissionAttachments));
         throw e;
       }
     }