@overmap-ai/core 1.0.58-asset-description.3 → 1.0.58-asset-description.5

package/dist/forms/index.d.ts

@@ -2,4 +2,4 @@ export * from "./typings";
 export * from "./builder";
 export * from "./fields";
 export * from "./renderer";
-export { validateForm } from "./utils";
+export { validateForm, initialFormValues } from "./utils";

package/dist/overmap-core.js

@@ -7350,26 +7350,35 @@ class UserFormSubmissionService extends BaseApiService {
   // Note currently the bulkAdd method is specific to form submissions for assets
   // TODO: adapt the support bulk adding to any model type
   async bulkAdd(args) {
-    const { formRevision, values: argsValues, assetOfflineIds } = args;
+    const { formRevision, commonFieldValues, fieldValuesByAsset } = args;
     const { store } = this.client;
     const offlineSubmissions = [];
     const offlineAttachments = [];
     const submissionOfflineIds = [];
     const submissionsPayload = [];
     const attachmentsPayload = [];
-    const { values, files } = separateFilesFromValues(argsValues);
+    let files = {};
+    const { values: fileSeperatedCommonFieldValues, files: commonFiles } = separateFilesFromValues(commonFieldValues);
+    files = commonFiles;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const createdBy = store.getState().userReducer.currentUser.id;
-    for (const assetId of assetOfflineIds) {
+    for (const assetId in fieldValuesByAsset) {
+      const { values: fileSeperatedSubmissionSpecificValues, files: submissionSpecificFiles } = separateFilesFromValues(fieldValuesByAsset[assetId] ?? {});
+      files = Object.assign(files, submissionSpecificFiles);
+      const submissionValues = { ...fileSeperatedCommonFieldValues, ...fileSeperatedSubmissionSpecificValues };
       const submission = offline({
         form_revision: formRevision,
-        values,
+        values: submissionValues,
         created_by: createdBy,
         submitted_at: submittedAt,
         asset: assetId
       });
       submissionOfflineIds.push(submission.offline_id);
-      submissionsPayload.push({ offline_id: submission.offline_id, asset_id: assetId });
+      submissionsPayload.push({
+        offline_id: submission.offline_id,
+        asset_id: assetId,
+        form_data: fileSeperatedSubmissionSpecificValues
+      });
       offlineSubmissions.push(submission);
       for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
         for (const file of fileArray) {
@@ -7410,13 +7419,13 @@ class UserFormSubmissionService extends BaseApiService {
       method: HttpMethod.POST,
       url: `/forms/revisions/${formRevision}/bulk-respond/`,
       payload: {
-        form_data: values,
+        form_data: fileSeperatedCommonFieldValues,
         submitted_at: submittedAt,
         submissions: submissionsPayload,
         attachments: attachmentsPayload,
         files: Object.values(filesRecord)
       },
-      blockers: assetOfflineIds,
+      blockers: Object.keys(fieldValuesByAsset),
       blocks: submissionOfflineIds
     });
     promise.then(({ submissions, attachments, presigned_urls }) => {
@@ -16711,6 +16720,7 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   emptyTextField,
   encodeFormValues,
   formRevisionToSchema,
+  initialFormValues,
   isConditionMet,
   useFieldInput,
   useFieldInputs,
@@ -16974,6 +16984,7 @@ export {
   hashFile,
   hideAllCategories,
   hideCategory,
+  initialFormValues,
   isConditionMet,
   isToday,
   issueReducer,