@overmap-ai/core 1.0.71-fields.13 → 1.0.71-fields.2

package/dist/overmap-core.umd.cjs

@@ -2093,6 +2093,17 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  const selectLatestFormRevisionByForm = toolkit.createSelector([selectFormRevisionMapping], (revisions) => {
+    const latestRevisions = {};
+    for (const revision of Object.values(revisions)) {
+      const formId = revision.form;
+      const currentLatestRevision = latestRevisions[formId];
+      if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
+        latestRevisions[formId] = revision;
+      }
+    }
+    return latestRevisions;
+  });
   const formRevisionReducer = formRevisionsSlice.reducer;
   const formAdapter = createModelAdapter((form) => form.offline_id);
   const initialState$n = formAdapter.getInitialState({});
@@ -2117,9 +2128,6 @@ var __publicField = (obj, key, value) => {
   const selectForms = toolkit.createSelector([selectFormMapping], (formsMapping) => {
     return Object.values(formsMapping);
   });
-  const selectFormById = (formId) => (state) => {
-    return state.formReducer.instances[formId];
-  };
   const selectFilteredForms = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [
@@ -2145,6 +2153,15 @@ var __publicField = (obj, key, value) => {
       { memoizeOptions: { equalityCheck: shallowEqual } }
     )
   );
+  const selectFormById = (formId) => (state) => {
+    return state.formReducer.instances[formId];
+  };
+  const selectFormsCount = toolkit.createSelector([selectFormMapping], (formsMapping) => {
+    return Object.keys(formsMapping).length;
+  });
+  const selectGeneralFormCount = toolkit.createSelector([selectFormMapping], (formsMapping) => {
+    return Object.values(formsMapping).length;
+  });
   const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
   const initialState$m = submissionAdapter.getInitialState({});
   const formSubmissionSlice = toolkit.createSlice({
@@ -2206,6 +2223,43 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  const selectFormSubmissionsByFormRevisions = toolkit.createSelector([selectFormRevisionMapping, selectFormSubmissions], (revisions, submissions) => {
+    var _a2;
+    const submissionMapping = {};
+    for (const revisionId in revisions) {
+      submissionMapping[revisionId] = [];
+    }
+    for (const submission of submissions) {
+      (_a2 = submissionMapping[submission.form_revision]) == null ? void 0 : _a2.push(submission);
+    }
+    return submissionMapping;
+  });
+  const selectSortedFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
+    toolkit.createSelector(
+      [
+        selectFormRevisionMapping,
+        selectFormSubmissionsByFormRevisions,
+        (_state, formId) => formId
+      ],
+      (revisionsMapping, submissionsByRevision, formId) => {
+        const submissionsByFormRevisions = {};
+        for (const revisionId in revisionsMapping) {
+          const revision = revisionsMapping[revisionId];
+          const submissionsOfRevision = submissionsByRevision[revisionId];
+          if (revision && submissionsOfRevision && revision.form === formId) {
+            submissionsByFormRevisions[revisionId] = submissionsOfRevision.sort(
+              (a, b) => a.submitted_at < b.submitted_at ? -1 : 1
+            );
+          }
+        }
+        return Object.entries(submissionsByFormRevisions).sort((a, b) => {
+          const aRevision = revisionsMapping[a[0]];
+          const bRevision = revisionsMapping[b[0]];
+          return formRevisionSortFn(aRevision, bRevision);
+        }).map(([_revisionId, submissions]) => submissions).flat();
+      }
+    )
+  );
   const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectFormSubmissions, (_state, issueId) => issueId],
@@ -2973,56 +3027,12 @@ var __publicField = (obj, key, value) => {
     )
   );
   const issueAssociationReducer = issueAssociationSlice.reducer;
-  const issueTypeFieldValuesAdapter = createModelAdapter(
-    (fieldValues) => fieldValues.offline_id
-  );
-  const initialState$7 = issueTypeFieldValuesAdapter.getInitialState({});
-  const issueTypeFieldValuesSlice = toolkit.createSlice({
-    name: "issueTypeFieldValues",
-    initialState: initialState$7,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
-    reducers: {
-      initializeIssueTypeFieldValues: issueTypeFieldValuesAdapter.initialize,
-      addIssueTypeFieldValues: issueTypeFieldValuesAdapter.addOne,
-      addIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.addMany,
-      setIssueTypeFieldValues: issueTypeFieldValuesAdapter.setOne,
-      setIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.setMany,
-      updateIssueTypeFieldValues: issueTypeFieldValuesAdapter.updateOne,
-      updateIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.updateMany,
-      deleteIssueTypeFieldValues: issueTypeFieldValuesAdapter.deleteOne,
-      deleteIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.deleteMany
-    }
-  });
-  const {
-    initializeIssueTypeFieldValues,
-    addIssueTypeFieldValues,
-    addIssueTypeFieldValuesMany,
-    setIssueTypeFieldValues,
-    setIssueTypeFieldValuesMany,
-    updateIssueTypeFieldValues,
-    updateIssueTypeFieldValuesMany,
-    deleteIssueTypeFieldValues,
-    deleteIssueTypeFieldValuesMany
-  } = issueTypeFieldValuesSlice.actions;
-  const selectIssueTypeFieldValuesMapping = (state) => state.issueTypeFieldValuesReducer.instances;
-  const selectIssueTypeFieldValues = toolkit.createSelector([selectIssueTypeFieldValuesMapping], (fieldValuesMapping) => {
-    return Object.values(fieldValuesMapping);
-  });
-  const selectIssueTypeFieldValuesOfIssue = restructureCreateSelectorWithArgs(
-    toolkit.createSelector([selectIssueTypeFieldValues, (_state, issueId) => issueId], (fieldValues, issueId) => {
-      return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.issue === issueId));
-    })
-  );
-  const selectIssueTypeFieldValuesById = (fieldValuesId) => (state) => {
-    return state.issueTypeFieldValuesReducer.instances[fieldValuesId];
-  };
-  const issueTypeFieldValuesReducer = issueTypeFieldValuesSlice.reducer;
   const issueTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
-  const initialState$6 = issueTypeFieldsAdapter.getInitialState({});
+  const initialState$7 = issueTypeFieldsAdapter.getInitialState({});
   const issueTypeFieldsSlice = toolkit.createSlice({
     name: "issueTypeFields",
-    initialState: initialState$6,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+    initialState: initialState$7,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
     reducers: {
       initializeIssueTypeFields: issueTypeFieldsAdapter.initialize,
       addIssueTypeFields: issueTypeFieldsAdapter.addOne,
@@ -3055,26 +3065,59 @@ var __publicField = (obj, key, value) => {
       return fallbackToEmptyArray(fields.filter((field) => field.issue_type === issueTypeId));
     })
   );
-  const selectLatestIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
+  const selectLatestIssueTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectIssueTypeFields, (_state, id) => id], (fields, id) => {
-      return fields.filter((field) => field.issue_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+      return fields.filter((field) => field.issue_type === id).sort((a, b) => a.submitted_at < b.submitted_at ? -1 : 1)[0];
     })
   );
-  const selectIssueTypeValuesOfIssueType = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectIssueTypeFields, selectIssueTypeFieldValues, (_state, id) => id],
-      (fields, fieldValues, id) => {
-        const fieldsIds = new Set(
-          fields.filter((field) => field.issue_type === id).map((field) => field.offline_id)
-        );
-        return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
-      }
-    )
-  );
   const selectIssueTypeFieldsById = (fieldsId) => (state) => {
     return state.issueTypeFieldsReducer.instances[fieldsId];
   };
   const issueTypeFieldsReducer = issueTypeFieldsSlice.reducer;
+  const issueTypeFieldValuesAdapter = createModelAdapter(
+    (fieldValues) => fieldValues.offline_id
+  );
+  const initialState$6 = issueTypeFieldValuesAdapter.getInitialState({});
+  const issueTypeFieldValuesSlice = toolkit.createSlice({
+    name: "issueTypeFieldValues",
+    initialState: initialState$6,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+    reducers: {
+      initializeIssueTypeFieldValues: issueTypeFieldValuesAdapter.initialize,
+      addIssueTypeFieldValues: issueTypeFieldValuesAdapter.addOne,
+      addIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.addMany,
+      setIssueTypeFieldValues: issueTypeFieldValuesAdapter.setOne,
+      setIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.setMany,
+      updateIssueTypeFieldValues: issueTypeFieldValuesAdapter.updateOne,
+      updateIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.updateMany,
+      deleteIssueTypeFieldValues: issueTypeFieldValuesAdapter.deleteOne,
+      deleteIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.deleteMany
+    }
+  });
+  const {
+    initializeIssueTypeFieldValues,
+    addIssueTypeFieldValues,
+    addIssueTypeFieldValuesMany,
+    setIssueTypeFieldValues,
+    setIssueTypeFieldValuesMany,
+    updateIssueTypeFieldValues,
+    updateIssueTypeFieldValuesMany,
+    deleteIssueTypeFieldValues,
+    deleteIssueTypeFieldValuesMany
+  } = issueTypeFieldValuesSlice.actions;
+  const selectIssueTypeFieldValuesMapping = (state) => state.issueTypeFieldValuesReducer.instances;
+  const selectIssueTypeFieldValues = toolkit.createSelector([selectIssueTypeFieldValuesMapping], (fieldValuesMapping) => {
+    return Object.values(fieldValuesMapping);
+  });
+  const selectIssueTypeFieldValuesOfIssue = restructureCreateSelectorWithArgs(
+    toolkit.createSelector([selectIssueTypeFieldValues, (_state, issueId) => issueId], (fieldValues, issueId) => {
+      return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.issue === issueId));
+    })
+  );
+  const selectIssueTypeFieldValuesById = (fieldValuesId) => (state) => {
+    return state.issueTypeFieldValuesReducer.instances[fieldValuesId];
+  };
+  const issueTypeFieldValuesReducer = issueTypeFieldValuesSlice.reducer;
   const issueTypeFieldsAttachmentAdapter = createModelAdapter(
     (attachment) => attachment.offline_id
   );
@@ -3165,20 +3208,6 @@ var __publicField = (obj, key, value) => {
       return Object.values(attachmentsMapping);
     }
   );
-  const selectIssueTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
-    return state.issueTypeFieldValuesAttachmentReducer.instances[attachmentId];
-  };
-  const selectIssueTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
-    toolkit.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(
     toolkit.createSelector(
       [selectIssueTypeFieldValuesAttachments, (_state, fieldValuesId) => fieldValuesId],
@@ -3187,6 +3216,9 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
+  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({});
@@ -3228,7 +3260,7 @@ var __publicField = (obj, key, value) => {
   );
   const selectLatestAssetTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectAssetTypeFields, (_state, id) => id], (fields, id) => {
-      return fields.filter((field) => field.asset_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+      return fields.filter((field) => field.asset_type === id).sort((a, b) => a.submitted_at < b.submitted_at ? -1 : 1)[0];
     })
   );
   const selectAssetTypeFieldsById = (fieldsId) => (state) => {
@@ -3275,17 +3307,6 @@ var __publicField = (obj, key, value) => {
       return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.asset === assetId));
     })
   );
-  const selectAssetTypeValuesOfAssetType = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectAssetTypeFields, selectAssetTypeFieldValues, (_state, id) => id],
-      (fields, fieldValues, id) => {
-        const fieldsIds = new Set(
-          fields.filter((field) => field.asset_type === id).map((field) => field.offline_id)
-        );
-        return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
-      }
-    )
-  );
   const selectAssetTypeFieldValuesById = (fieldValuesId) => (state) => {
     return state.assetTypeFieldValuesReducer.instances[fieldValuesId];
   };
@@ -3375,25 +3396,14 @@ var __publicField = (obj, key, value) => {
       return Object.values(attachmentsMapping);
     }
   );
-  const selectAssetTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
-    return state.assetTypeFieldValuesAttachmentReducer.instances[attachmentId];
-  };
-  const selectAssetTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
-    toolkit.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(
     toolkit.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) {
@@ -5288,7 +5298,15 @@ var __publicField = (obj, key, value) => {
       const promise = this.enqueueRequest({
         method: HttpMethod.POST,
         url: "/issue-types/",
-        payload: offlineIssueType,
+        // Sending only whats needed here
+        payload: {
+          offline_id: offlineIssueType.offline_id,
+          submitted_at: offlineIssueType.submitted_at,
+          icon: offlineIssueType.icon,
+          color: offlineIssueType.color,
+          name: offlineIssueType.name,
+          description: offlineIssueType.description
+        },
         blockers: [],
         blocks: [offlineIssueType.offline_id]
       });
@@ -5708,7 +5726,9 @@ var __publicField = (obj, key, value) => {
         method: HttpMethod.POST,
         url: "/forms/",
         payload: {
-          ...offlineForm,
+          // Sending exactly what is currently needed for the endpoint
+          offline_id: offlineForm.offline_id,
+          submitted_at: offlineForm.submitted_at,
           initial_revision: {
             offline_id: offlineFormRevision.offline_id,
             submitted_at: offlineFormRevision.submitted_at,
@@ -5717,7 +5737,10 @@ var __publicField = (obj, key, value) => {
             fields: offlineFormRevision.fields
           }
         },
-        blockers: [],
+        blockers: [
+          ...payload.project ? [payload.project.toString()] : [],
+          ...payload.organization ? [payload.organization.toString()] : []
+        ],
         blocks: [offlineForm.offline_id, offlineFormRevision.offline_id]
       });
       void formPromise.catch((e) => {
@@ -6671,8 +6694,7 @@ var __publicField = (obj, key, value) => {
           file_name: offlineAttachment.file_name,
           file_sha1: offlineAttachment.file_sha1,
           file_extension: filePayload.extension,
-          description: offlineAttachment.description,
-          document: documentId
+          description: offlineAttachment.description
         });
         sha1ToAttachmentIds[filePayload.sha1].push(offlineAttachment.offline_id);
       }
@@ -7571,39 +7593,24 @@ var __publicField = (obj, key, value) => {
       return [offlineAssetTypeFieldValues, promise];
     }
     bulkAdd(payload, batchSize) {
-      var _a2;
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const { values } = separateFilesFromValues(payload.values);
-      const offlineAssetTypeFieldValuesMany = [];
-      const batches = chunkArray(payload.payloads, batchSize ?? payload.payloads.length);
-      const batchPayloads = [];
-      for (const batch of batches) {
-        const assetTypeFieldValuesPayloads = [];
-        for (const payload2 of batch) {
-          const offlineAssetTypeFieldValues = offline({
-            ...payload2,
-            values: separateFilesFromValues(payload2.values).values,
-            created_by: (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id,
-            submitted_at: submittedAt
-          });
-          offlineAssetTypeFieldValuesMany.push(offlineAssetTypeFieldValues);
-          assetTypeFieldValuesPayloads.push({
-            offline_id: offlineAssetTypeFieldValues.offline_id,
-            asset: payload2.asset,
-            fields_revision: payload2.fields_revision,
-            published_at: payload2.published_at,
-            values: offlineAssetTypeFieldValues.values
-          });
-        }
-        batchPayloads.push({
+      const payloadsBatches = chunkArray(payload.payloads, batchSize);
+      const bulkAddPayloads = payloadsBatches.map((batch) => {
+        return {
           submitted_at: submittedAt,
           values,
-          field_values: assetTypeFieldValuesPayloads
-        });
-      }
-      this.dispatch(addAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany));
+          field_values: batch.map((payload2) => {
+            const { values: values2 } = separateFilesFromValues(payload2.values);
+            return offline({
+              ...payload2,
+              values: values2
+            });
+          })
+        };
+      });
       const promises = [];
-      for (const payload2 of batchPayloads) {
+      for (const payload2 of bulkAddPayloads) {
         const assetIds = payload2.field_values.map((x) => x.asset);
         const assetTypeFieldsIds = payload2.field_values.map((x) => x.fields_revision);
         const assetTypeFieldValuesIds = payload2.field_values.map((x) => x.offline_id);
@@ -7618,11 +7625,9 @@ var __publicField = (obj, key, value) => {
         promises.push(promise);
       }
       void Promise.all(promises).then((results) => {
-        this.dispatch(updateAssetTypeFieldValuesMany(results.flat()));
-      }).catch(() => {
-        this.dispatch(deleteAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany.map((x) => x.offline_id)));
+        this.dispatch(addAssetTypeFieldValuesMany(results.flat()));
       });
-      return [offlineAssetTypeFieldValuesMany, promises];
+      return promises;
     }
     update(payload) {
       const { store } = this.client;
@@ -7646,13 +7651,7 @@ var __publicField = (obj, key, value) => {
         description: "Delete asset type field values",
         method: HttpMethod.PATCH,
         url: `/asset-type-field-values/${payload.offline_id}/`,
-        payload: {
-          ...payload,
-          values: {
-            ...assetTypeFieldValues.values,
-            ...values
-          }
-        },
+        payload,
         blockers: [
           updatedAssetTypeFieldValues.offline_id,
           updatedAssetTypeFieldValues.fields_revision,
@@ -7706,63 +7705,54 @@ var __publicField = (obj, key, value) => {
     }
   }
   class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
-    async bulkAdd(payloads, batchSize) {
+    async bulkAdd(payloads) {
       var _a2;
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-      const batches = chunkArray(payloads, batchSize ?? payloads.length);
+      const filePayloads = {};
       const offlineAssetTypeFieldValuesAttachments = [];
-      const batchPayloads = [];
-      for (const batch of batches) {
-        const filePayloads = {};
-        const attachmentPayloads = [];
-        for (const payload of batch) {
-          const { fieldValuesId, fieldIdentifier, file } = payload;
-          const filePayload = await this.getFilePayload(file);
-          if (!(filePayload.sha1 in filePayloads))
-            filePayloads[filePayload.sha1] = filePayload;
-          const offlineAssetTypeFieldValuesAttachment = offline({
-            file: URL.createObjectURL(file),
-            file_type: file.type,
-            file_name: file.name,
-            file_sha1: filePayload.sha1,
-            created_by: createdBy,
-            field_values: fieldValuesId,
-            submitted_at: submittedAt,
-            field_identifier: fieldIdentifier
-          });
-          offlineAssetTypeFieldValuesAttachments.push(offlineAssetTypeFieldValuesAttachment);
-          const attachmentPayload = {
-            offline_id: offlineAssetTypeFieldValuesAttachment.offline_id,
-            file_name: file.name,
-            file_sha1: filePayload.sha1,
-            file_extension: filePayload.extension,
-            field_identifier: fieldIdentifier,
-            field_values: fieldValuesId
-          };
-          attachmentPayloads.push(attachmentPayload);
-        }
-        batchPayloads.push({
+      const attachmentPayloads = [];
+      for (const payload of payloads) {
+        const { fieldValuesId, fieldIdentifier, file } = payload;
+        const filePayload = await this.getFilePayload(file);
+        if (!(filePayload.sha1 in filePayloads))
+          filePayloads[filePayload.sha1] = filePayload;
+        const offlineAssetTypeFieldValuesAttachment = offline({
+          file: URL.createObjectURL(file),
+          file_type: file.type,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          created_by: createdBy,
+          field_values: fieldValuesId,
           submitted_at: submittedAt,
-          attachments: attachmentPayloads,
-          files: Object.values(filePayloads)
+          field_identifier: fieldIdentifier
         });
+        offlineAssetTypeFieldValuesAttachments.push(offlineAssetTypeFieldValuesAttachment);
+        const attachmentPayload = {
+          offline_id: offlineAssetTypeFieldValuesAttachment.offline_id,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          file_extension: filePayload.extension,
+          field_identifier: fieldIdentifier,
+          field_values: fieldValuesId
+        };
+        attachmentPayloads.push(attachmentPayload);
       }
       this.dispatch(addAssetTypeFieldValuesAttachments(offlineAssetTypeFieldValuesAttachments));
-      const promises = batchPayloads.map((payload) => {
-        return this.enqueueRequest({
-          description: "Add asset type field values attachments",
-          method: HttpMethod.POST,
-          url: "/asset-type-field-values-attachments/bulk/",
-          payload,
-          blockers: payload.attachments.map((payload2) => payload2.field_values),
-          blocks: payload.attachments.map((payload2) => payload2.offline_id)
-        });
+      const promise = this.enqueueRequest({
+        description: "Add asset type field values attachments",
+        method: HttpMethod.POST,
+        url: "/asset-type-field-values-attachments/bulk/",
+        payload: {
+          submitted_at: submittedAt,
+          attachments: attachmentPayloads,
+          files: Object.values(filePayloads)
+        },
+        blockers: offlineAssetTypeFieldValuesAttachments.map((attachment) => attachment.field_values),
+        blocks: offlineAssetTypeFieldValuesAttachments.map((attachment) => attachment.offline_id)
       });
-      Promise.all(promises).then((result) => {
-        for (const res of result)
-          this.processPresignedUrls(res.presigned_urls);
-        const attachments = result.flatMap((res) => res.attachments);
+      promise.then(({ presigned_urls, attachments }) => {
+        this.processPresignedUrls(presigned_urls);
         this.dispatch(updateAssetTypeFieldValuesAttachments(attachments));
       }).catch((error) => {
         this.dispatch(
@@ -7772,16 +7762,13 @@ var __publicField = (obj, key, value) => {
         );
         throw error;
       });
-      return [
-        offlineAssetTypeFieldValuesAttachments,
-        promises.map((promise) => promise.then(({ attachments }) => attachments))
-      ];
+      return [offlineAssetTypeFieldValuesAttachments, promise.then(({ attachments }) => attachments)];
     }
     async bulkDelete(ids) {
       const { store } = this.client;
       const state = store.getState();
-      const attachments = selectAssetTypeFieldValuesAttachmentsByIds(ids)(state);
-      this.dispatch(deleteAssetTypeFieldValuesAttachments(ids));
+      const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(ids)(state);
+      this.dispatch(deleteFormSubmissionAttachments(ids));
       try {
         await this.enqueueRequest({
           description: "Delete asset type field values attachments",
@@ -7792,13 +7779,13 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        this.dispatch(addAssetTypeFieldValuesAttachments(attachments));
+        this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
         throw e;
       }
     }
     async refreshStore(projectId) {
       const result = await this.enqueueRequest({
-        description: "Get asset type field values attachments",
+        description: "Gfet asset type field values attachments",
         method: HttpMethod.GET,
         url: "/asset-type-field-values-attachments/",
         queryParams: {
@@ -7988,8 +7975,8 @@ var __publicField = (obj, key, value) => {
     async bulkDelete(attachmentsIds) {
       const { store } = this.client;
       const state = store.getState();
-      const attachments = selectIssueTypeFieldValuesAttachmentsByIds(attachmentsIds)(state);
-      this.dispatch(deleteIssueTypeFieldValuesAttachments(attachmentsIds));
+      const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(attachmentsIds)(state);
+      this.dispatch(deleteFormSubmissionAttachments(attachmentsIds));
       try {
         await this.enqueueRequest({
           description: "Delete issue type field values attachments",
@@ -8000,7 +7987,7 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        this.dispatch(addIssueTypeFieldValuesAttachments(attachments));
+        this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
         throw e;
       }
     }
@@ -8069,13 +8056,7 @@ var __publicField = (obj, key, value) => {
         description: "Update issue type field values",
         method: HttpMethod.PATCH,
         url: `/issue-type-field-values/${payload.offline_id}/`,
-        payload: {
-          ...payload,
-          values: {
-            ...issueTypeFieldValues.values,
-            ...values
-          }
-        },
+        payload,
         blockers: [
           updatedIssueTypeFieldValues.offline_id,
           updatedIssueTypeFieldValues.fields_revision,
@@ -8544,7 +8525,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectAssetTypeFieldValues = selectAssetTypeFieldValues;
   exports2.selectAssetTypeFieldValuesAttachmentById = selectAssetTypeFieldValuesAttachmentById;
   exports2.selectAssetTypeFieldValuesAttachments = selectAssetTypeFieldValuesAttachments;
-  exports2.selectAssetTypeFieldValuesAttachmentsByIds = selectAssetTypeFieldValuesAttachmentsByIds;
   exports2.selectAssetTypeFieldValuesAttachmentsMapping = selectAssetTypeFieldValuesAttachmentsMapping;
   exports2.selectAssetTypeFieldValuesById = selectAssetTypeFieldValuesById;
   exports2.selectAssetTypeFieldValuesMapping = selectAssetTypeFieldValuesMapping;
@@ -8557,7 +8537,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectAssetTypeFieldsMapping = selectAssetTypeFieldsMapping;
   exports2.selectAssetTypeFieldsOfAssetType = selectAssetTypeFieldsOfAssetType;
   exports2.selectAssetTypeStagesMapping = selectAssetTypeStagesMapping;
-  exports2.selectAssetTypeValuesOfAssetType = selectAssetTypeValuesOfAssetType;
   exports2.selectAssetTypes = selectAssetTypes;
   exports2.selectAssetTypesByIds = selectAssetTypesByIds;
   exports2.selectAssetTypesMapping = selectAssetTypesMapping;
@@ -8615,11 +8594,14 @@ var __publicField = (obj, key, value) => {
   exports2.selectFormSubmissionAttachmentsMapping = selectFormSubmissionAttachmentsMapping;
   exports2.selectFormSubmissionById = selectFormSubmissionById;
   exports2.selectFormSubmissions = selectFormSubmissions;
+  exports2.selectFormSubmissionsByFormRevisions = selectFormSubmissionsByFormRevisions;
   exports2.selectFormSubmissionsMapping = selectFormSubmissionsMapping;
   exports2.selectFormSubmissionsOfAsset = selectFormSubmissionsOfAsset;
   exports2.selectFormSubmissionsOfForm = selectFormSubmissionsOfForm;
   exports2.selectFormSubmissionsOfIssue = selectFormSubmissionsOfIssue;
   exports2.selectForms = selectForms;
+  exports2.selectFormsCount = selectFormsCount;
+  exports2.selectGeneralFormCount = selectGeneralFormCount;
   exports2.selectGeoImageById = selectGeoImageById;
   exports2.selectGeoImageMapping = selectGeoImageMapping;
   exports2.selectGeoImages = selectGeoImages;
@@ -8644,7 +8626,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssueTypeFieldValues = selectIssueTypeFieldValues;
   exports2.selectIssueTypeFieldValuesAttachmentById = selectIssueTypeFieldValuesAttachmentById;
   exports2.selectIssueTypeFieldValuesAttachments = selectIssueTypeFieldValuesAttachments;
-  exports2.selectIssueTypeFieldValuesAttachmentsByIds = selectIssueTypeFieldValuesAttachmentsByIds;
   exports2.selectIssueTypeFieldValuesAttachmentsMapping = selectIssueTypeFieldValuesAttachmentsMapping;
   exports2.selectIssueTypeFieldValuesById = selectIssueTypeFieldValuesById;
   exports2.selectIssueTypeFieldValuesMapping = selectIssueTypeFieldValuesMapping;
@@ -8657,7 +8638,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssueTypeFieldsMapping = selectIssueTypeFieldsMapping;
   exports2.selectIssueTypeFieldsOfIssueType = selectIssueTypeFieldsOfIssueType;
   exports2.selectIssueTypeMapping = selectIssueTypeMapping;
-  exports2.selectIssueTypeValuesOfIssueType = selectIssueTypeValuesOfIssueType;
   exports2.selectIssueTypes = selectIssueTypes;
   exports2.selectIssueTypesByIds = selectIssueTypesByIds;
   exports2.selectIssueTypesOfOrganization = selectIssueTypesOfOrganization;
@@ -8667,8 +8647,9 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssuesOfIssueType = selectIssuesOfIssueType;
   exports2.selectIssuesOfIssueTypeCount = selectIssuesOfIssueTypeCount;
   exports2.selectLatestAssetTypeFieldsOfAssetType = selectLatestAssetTypeFieldsOfAssetType;
+  exports2.selectLatestFormRevisionByForm = selectLatestFormRevisionByForm;
   exports2.selectLatestFormRevisionOfForm = selectLatestFormRevisionOfForm;
-  exports2.selectLatestIssueTypeFieldsOfIssueType = selectLatestIssueTypeFieldsOfIssueType;
+  exports2.selectLatestIssueTypeFieldsOfAssetType = selectLatestIssueTypeFieldsOfAssetType;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
   exports2.selectLicense = selectLicense;
   exports2.selectLicenseForProject = selectLicenseForProject;
@@ -8705,6 +8686,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectProjectsOfOrganization = selectProjectsOfOrganization;
   exports2.selectRehydrated = selectRehydrated;
   exports2.selectRootDocuments = selectRootDocuments;
+  exports2.selectSortedFormSubmissionsOfForm = selectSortedFormSubmissionsOfForm;
   exports2.selectSortedOrganizationUsers = selectSortedOrganizationUsers;
   exports2.selectSortedProjectUsers = selectSortedProjectUsers;
   exports2.selectStageFormIdsFromStageIds = selectStageFormIdsFromStageIds;