@overmap-ai/core 1.0.58-export-overmap-reducer.0 → 1.0.58-export-overmap-reducer.3

package/dist/overmap-core.umd.cjs

@@ -1452,6 +1452,16 @@ var __publicField = (obj, key, value) => {
         }
         prevAssets = null;
       },
+      updateAssets: (state, action) => {
+        for (const asset of action.payload) {
+          if (asset.offline_id in state.assets) {
+            state.assets[asset.offline_id] = asset;
+          } else {
+            throw new Error(`Tried to update asset with ID that doesn't exist: ${asset.offline_id}`);
+          }
+        }
+        prevAssets = null;
+      },
       removeAsset: (state, action) => {
         if (action.payload in state.assets) {
           delete state.assets[action.payload];
@@ -1460,6 +1470,16 @@ var __publicField = (obj, key, value) => {
         }
         prevAssets = null;
       },
+      removeAssets: (state, action) => {
+        for (const assetId of action.payload) {
+          if (assetId in state.assets) {
+            delete state.assets[assetId];
+          } else {
+            throw new Error(`Failed to remove asset because ID doesn't exist: ${assetId}`);
+          }
+        }
+        prevAssets = null;
+      },
       removeAllAssetsOfType: (state, action) => {
         var _a2;
         for (const componentId in state.assets) {
@@ -1483,7 +1503,9 @@ var __publicField = (obj, key, value) => {
   const {
     addAsset,
     updateAsset,
+    updateAssets,
     removeAsset,
+    removeAssets,
     addAssetsInBatches,
     setAssets,
     removeAllAssetsOfType,
@@ -5100,6 +5122,15 @@ var __publicField = (obj, key, value) => {
       store.dispatch(setCategories(result));
     }
   }
+  function chunkArray(arr, chunkSize) {
+    const chunks = [];
+    let index2 = 0;
+    const arrLength = arr.length;
+    while (index2 < arrLength) {
+      chunks.push(arr.slice(index2, index2 += chunkSize));
+    }
+    return chunks;
+  }
   class AssetService extends BaseApiService {
     // Basic CRUD functions
     add(asset, workspaceId) {
@@ -5176,36 +5207,55 @@ var __publicField = (obj, key, value) => {
         throw err;
       });
     }
-    async addBatch(assetsToCreate, workspaceId, assetTypeId) {
-      const fullAssets = assetsToCreate.map((asset) => {
-        return { ...offline(asset), submitted_at: (/* @__PURE__ */ new Date()).toISOString() };
-      });
+    // TODO: payload does not require asset_type
+    bulkAdd(assetsToCreate, workspaceId, assetTypeId, batchSize) {
       const { store } = this.client;
-      store.dispatch(addAssetsInBatches(fullAssets));
-      const promise = this.client.enqueueRequest({
-        description: "Batch create assets",
-        method: HttpMethod.POST,
-        url: `/assets/types/${assetTypeId}/add-assets/`,
-        queryParams: {
-          workspace_id: workspaceId.toString()
-        },
-        payload: {
-          assets: fullAssets
-        },
-        blockers: [assetTypeId],
-        blocks: fullAssets.map((c) => c.offline_id)
+      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const transactionId = uuid.v4();
+      const assetBatches = chunkArray(assetsToCreate, batchSize).map((assetBatch) => {
+        const assetPayloads = assetBatch.map((assetPayload) => {
+          return offline({
+            ...assetPayload,
+            submitted_at: submittedAt
+          });
+        });
+        return {
+          batchId: uuid.v4(),
+          payload: {
+            transaction_id: transactionId,
+            assets: assetPayloads
+          }
+        };
       });
-      void promise.then((result) => {
-        for (const assets of Object.values(result)) {
-          store.dispatch(updateAsset(assets));
-        }
-      }).catch((e) => {
-        for (const asset of fullAssets) {
-          store.dispatch(removeAsset(asset.offline_id));
-        }
-        throw e;
+      const batchPromises = [];
+      let prevBatchId = null;
+      for (const assetBatch of assetBatches) {
+        const { batchId, payload } = assetBatch;
+        const batchAssetOfflineIds = payload.assets.map((c) => c.offline_id);
+        const blockers = [assetTypeId];
+        if (prevBatchId)
+          blockers.push(prevBatchId);
+        const blocks2 = batchAssetOfflineIds;
+        blocks2.push(batchId);
+        const promise = this.client.enqueueRequest({
+          description: "Batch create assets",
+          method: HttpMethod.POST,
+          url: `/assets/types/${assetTypeId}/add-assets/`,
+          queryParams: {
+            workspace_id: workspaceId.toString()
+          },
+          payload,
+          blockers,
+          blocks: blocks2
+        });
+        prevBatchId = assetBatch.batchId;
+        batchPromises.push(promise);
+      }
+      void Promise.all(batchPromises).then((result) => {
+        const allCreatedAssets = result.flat();
+        store.dispatch(addAssetsInBatches(allCreatedAssets));
       });
-      return promise;
+      return batchPromises;
     }
     async refreshStore() {
       const { store } = this.client;
@@ -7071,100 +7121,120 @@ var __publicField = (obj, key, value) => {
     }
     // 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;
+    async bulkAdd(args, batchSize) {
       const { store } = this.client;
-      const offlineSubmissions = [];
-      const offlineAttachments = [];
-      const submissionOfflineIds = [];
-      const submissionsPayload = [];
-      const attachmentsPayload = [];
-      const { values, files } = separateFilesFromValues(argsValues);
+      const { formRevision, commonFieldValues, fieldValuesByAsset } = args;
+      const allFilesRecord = {};
+      const { values: fileSeperatedCommonFieldValues, files: commonFiles } = separateFilesFromValues(commonFieldValues);
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-      const createdBy = store.getState().userReducer.currentUser.id;
-      for (const assetId of assetOfflineIds) {
-        const submission = offline({
-          form_revision: formRevision,
-          values,
-          created_by: createdBy,
-          submitted_at: submittedAt,
-          asset: assetId
-        });
-        submissionOfflineIds.push(submission.offline_id);
-        submissionsPayload.push({ offline_id: submission.offline_id, asset_id: assetId });
-        offlineSubmissions.push(submission);
-        for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
-          for (const file of fileArray) {
-            const sha1 = await hashFile(file);
-            await this.client.files.addCache(file, sha1);
-            const offlineAttachment = offline({
-              file_name: file.name,
-              file_sha1: sha1,
-              file: URL.createObjectURL(file),
-              submission: submission.offline_id,
-              field_identifier: fieldIdentifier
+      const transactionId = uuid.v4();
+      const assetIdBatches = chunkArray(Object.keys(fieldValuesByAsset), batchSize);
+      const bulkAddBatches = await Promise.all(
+        assetIdBatches.map(async (assetIdBatch) => {
+          const batchId = uuid.v4();
+          const submissionPayloads = [];
+          const attachmentPayloads = [];
+          const files = { ...commonFiles };
+          for (const assetId of assetIdBatch) {
+            const { values: fileSeperatedSubmissionSpecificValues, files: submissionSpecificFiles } = separateFilesFromValues(fieldValuesByAsset[assetId] ?? {});
+            Object.assign(files, submissionSpecificFiles);
+            const submissionPayload = offline({
+              asset_id: assetId,
+              form_data: fileSeperatedSubmissionSpecificValues
             });
-            offlineAttachments.push(offlineAttachment);
-            attachmentsPayload.push({
-              offline_id: offlineAttachment.offline_id,
-              submission_id: submission.offline_id,
+            submissionPayloads.push(submissionPayload);
+            for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
+              for (const file of fileArray) {
+                const sha1 = await hashFile(file);
+                await this.client.files.addCache(file, sha1);
+                const attachmentPayload = offline({
+                  submission_id: submissionPayload.offline_id,
+                  sha1,
+                  name: file.name,
+                  field_identifier: fieldIdentifier
+                });
+                attachmentPayloads.push(attachmentPayload);
+              }
+            }
+          }
+          const filePaylods = [];
+          for (const file of Object.values(files).flat()) {
+            const sha1 = await hashFile(file);
+            const filePayload = {
               sha1,
-              name: file.name,
-              field_identifier: fieldIdentifier
+              extension: file.name.split(".").pop() || "",
+              file_type: file.type,
+              size: file.size
+            };
+            allFilesRecord[sha1] = filePayload;
+            filePaylods.push(filePayload);
+          }
+          return {
+            batchId,
+            payload: {
+              transaction_id: transactionId,
+              form_data: fileSeperatedCommonFieldValues,
+              submitted_at: submittedAt,
+              submissions: submissionPayloads,
+              attachments: attachmentPayloads,
+              files: filePaylods
+            }
+          };
+        })
+      );
+      const batchPromises = [];
+      let prevBatchId = null;
+      for (const batch of bulkAddBatches) {
+        const { payload, batchId } = batch;
+        const batchAssetIds = payload.submissions.map((x) => x.asset_id);
+        const batchSubmissionOfflineIds = payload.submissions.map((x) => x.offline_id);
+        const batchAttachmentsOfflineIds = payload.attachments.map((x) => x.offline_id);
+        const blockers = batchAssetIds;
+        if (prevBatchId)
+          blockers.push(prevBatchId);
+        const blocks2 = [...batchSubmissionOfflineIds, ...batchAttachmentsOfflineIds, batchId];
+        const promise = this.client.enqueueRequest({
+          description: "Bulk add form submissions",
+          method: HttpMethod.POST,
+          url: `/forms/revisions/${formRevision}/bulk-respond/`,
+          payload,
+          blockers,
+          blocks: blocks2
+        });
+        void promise.then(({ presigned_urls }) => {
+          for (const [sha1, presignedUrl] of Object.entries(presigned_urls)) {
+            const file = allFilesRecord[sha1];
+            if (!file)
+              continue;
+            void this.client.enqueueRequest({
+              url: presignedUrl.url,
+              description: "Upload file",
+              method: HttpMethod.POST,
+              isExternalUrl: true,
+              isAuthNeeded: false,
+              attachmentHash: sha1,
+              blockers: [`s3-${file.sha1}.${file.extension}`],
+              blocks: [sha1],
+              s3url: presignedUrl
             });
           }
-        }
-      }
-      const filesRecord = {};
-      for (const file of Object.values(files).flat()) {
-        const sha1 = await hashFile(file);
-        filesRecord[sha1] = {
-          sha1,
-          extension: file.name.split(".").pop() || "",
-          file_type: file.type,
-          size: file.size
-        };
-      }
-      store.dispatch(addFormSubmissions(offlineSubmissions));
-      store.dispatch(addFormSubmissionAttachments(offlineAttachments));
-      const promise = this.client.enqueueRequest({
-        description: "Bulk add form submissions",
-        method: HttpMethod.POST,
-        url: `/forms/revisions/${formRevision}/bulk-respond/`,
-        payload: {
-          form_data: values,
-          submitted_at: submittedAt,
-          submissions: submissionsPayload,
-          attachments: attachmentsPayload,
-          files: Object.values(filesRecord)
-        },
-        blockers: assetOfflineIds,
-        blocks: submissionOfflineIds
-      });
-      promise.then(({ submissions, attachments, presigned_urls }) => {
-        store.dispatch(updateFormSubmissions(submissions));
-        store.dispatch(updateFormSubmissionAttachments(attachments));
-        for (const [sha1, presigned_url] of Object.entries(presigned_urls)) {
-          const file = filesRecord[sha1];
-          if (!file)
-            continue;
-          void this.client.enqueueRequest({
-            url: presigned_url.url,
-            description: "Upload file",
-            method: HttpMethod.POST,
-            isExternalUrl: true,
-            isAuthNeeded: false,
-            attachmentHash: sha1,
-            blockers: [`s3-${file.sha1}.${file.extension}`],
-            blocks: [sha1],
-            s3url: presigned_url
-          });
-        }
-      }).catch(() => {
-        store.dispatch(deleteFormSubmissions(submissionOfflineIds));
-        store.dispatch(deleteFormSubmissionAttachments(offlineAttachments.map((x) => x.offline_id)));
+        });
+        prevBatchId = batchId;
+        batchPromises.push(promise);
+      }
+      void Promise.all(batchPromises).then((results) => {
+        const createdSubmissions = [];
+        const createdAttachments = [];
+        for (const result of results) {
+          for (const createdSubmission of result.submissions)
+            createdSubmissions.push(createdSubmission);
+          for (const createdAttachment of result.attachments)
+            createdAttachments.push(createdAttachment);
+        }
+        store.dispatch(addFormSubmissions(createdSubmissions));
+        store.dispatch(addFormSubmissionAttachments(createdAttachments));
       });
-      return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
+      return batchPromises;
     }
     update(submission) {
       const { store } = this.client;
@@ -8519,6 +8589,12 @@ var __publicField = (obj, key, value) => {
     getFormValidators() {
       return [...this.formValidators];
     }
+    encodeValueToJson(value) {
+      return JSON.stringify(value);
+    }
+    decodeJsonToValue(json) {
+      return JSON.parse(json);
+    }
   }
   __publicField(BaseField, "fieldTypeName");
   __publicField(BaseField, "fieldTypeDescription");
@@ -16932,10 +17008,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
     const color = blocks.useSeverityColor(severity);
-    const value = React.useMemo(
-      () => Array.isArray(fieldProps.value) ? fieldProps.value : [],
-      [fieldProps.value]
-    );
+    const value = React.useMemo(() => Array.isArray(fieldProps.value) ? fieldProps.value : [], [fieldProps.value]);
     const { onChange, onBlur } = fieldProps;
     const droppableId = `${inputId}-droppable`;
     const { disabled } = rest;
@@ -16952,7 +17025,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
     );
     const handleChange = React.useCallback(
       (e) => {
-        if (value.findIndex((option) => option.value === e.target.value.trim()) >= 0) {
+        if (value.findIndex((option) => option === e.target.value.trim()) >= 0) {
           setInternalError("All options must be unique");
         } else if (!e.target.value) {
           setInternalError("Option cannot be empty");
@@ -16971,7 +17044,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
         return;
       }
       const trimmedValue = intermediateValue.trim();
-      setValueAndTouched([...value, { value: trimmedValue, label: trimmedValue }]);
+      setValueAndTouched([...value, trimmedValue]);
       setIntermediateValue("");
     }, [intermediateValue, internalError, setValueAndTouched, value]);
     const handleKeyDown = React.useCallback(
@@ -17041,7 +17114,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
         value.map((option, index2) => /* @__PURE__ */ jsxRuntime.jsx(
           dnd.Draggable,
           {
-            draggableId: `${option.value}-draggable`,
+            draggableId: `${option}-draggable`,
             index: index2,
             isDragDisabled: disabled,
             children: ({ draggableProps, dragHandleProps, innerRef }) => /* @__PURE__ */ jsxRuntime.jsx(
@@ -17056,7 +17129,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
                 mb: "1",
                 asChild: true,
                 children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Badge, { color: "gray", size: "2", children: [
-                  /* @__PURE__ */ jsxRuntime.jsx("span", { children: option.label }),
+                  /* @__PURE__ */ jsxRuntime.jsx("span", { children: option }),
                   /* @__PURE__ */ jsxRuntime.jsx(
                     blocks.IconButton,
                     {
@@ -17076,7 +17149,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
               }
             )
           },
-          option.value
+          option
         )),
         droppableProvided.placeholder
       ] }) })
@@ -18744,6 +18817,44 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
       meta: { readonly }
     };
   }
+  function flattenFields(schema) {
+    const allFields = [];
+    for (const field of schema.fields) {
+      if (field instanceof FieldSection) {
+        for (const subField of field.fields) {
+          allFields.push(subField);
+        }
+      } else {
+        if (!(field instanceof BaseField)) {
+          throw new Error(`Invalid field type: ${field.type}`);
+        }
+        allFields.push(field);
+      }
+    }
+    return allFields;
+  }
+  function decodeFormValues(schema, values) {
+    const allFields = flattenFields(schema);
+    const result = {};
+    for (const field of allFields) {
+      const value = values[field.identifier] ?? null;
+      if (value !== null) {
+        result[field.identifier] = field.decodeJsonToValue(value);
+      } else {
+        result[field.identifier] = value;
+      }
+    }
+    return result;
+  }
+  function encodeFormValues(schema, values) {
+    const allFields = flattenFields(schema);
+    const result = {};
+    for (const field of allFields) {
+      const value = values[field.identifier];
+      result[field.identifier] = field.encodeValueToJson(value);
+    }
+    return result;
+  }
   function valueIsFile(v) {
     return Array.isArray(v) && v.some((v2) => v2 instanceof File || v2 instanceof Promise);
   }
@@ -20423,6 +20534,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
     StringInput,
     TextField,
     TextInput,
+    decodeFormValues,
     deserialize,
     deserializeField,
     emptyBaseField,
@@ -20435,11 +20547,15 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
     emptySelectField,
     emptyStringField,
     emptyTextField,
+    encodeFormValues,
+    flattenFields,
     formRevisionToSchema,
+    initialFormValues,
     isConditionMet,
     useFieldInput,
     useFieldInputs,
     useFormikInput,
+    validateForm,
     valueIsFile
   }, Symbol.toStringTag, { value: "Module" }));
   exports2.APIError = APIError;
@@ -20630,6 +20746,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.coordinatesToUrlText = coordinatesToUrlText;
   exports2.createOfflineAction = createOfflineAction;
   exports2.createPointMarker = createPointMarker;
+  exports2.decodeFormValues = decodeFormValues;
   exports2.defaultBadgeColor = defaultBadgeColor;
   exports2.deleteAssetType = deleteAssetType;
   exports2.deleteForm = deleteForm;
@@ -20664,6 +20781,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.emptySelectField = emptySelectField;
   exports2.emptyStringField = emptyStringField;
   exports2.emptyTextField = emptyTextField;
+  exports2.encodeFormValues = encodeFormValues;
   exports2.enqueue = enqueue;
   exports2.enqueueRequest = enqueueRequest;
   exports2.errorColor = errorColor;
@@ -20671,6 +20789,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.fileReducer = fileReducer;
   exports2.fileSlice = fileSlice;
   exports2.fileToBlob = fileToBlob;
+  exports2.flattenFields = flattenFields;
   exports2.flipCoordinates = flipCoordinates;
   exports2.formReducer = formReducer;
   exports2.formRevisionReducer = formRevisionReducer;
@@ -20694,6 +20813,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.hashFile = hashFile;
   exports2.hideAllCategories = hideAllCategories;
   exports2.hideCategory = hideCategory;
+  exports2.initialFormValues = initialFormValues;
   exports2.isConditionMet = isConditionMet;
   exports2.isToday = isToday;
   exports2.issueReducer = issueReducer;
@@ -20747,6 +20867,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.removeAssetAttachments = removeAssetAttachments;
   exports2.removeAssetTypeAttachment = removeAssetTypeAttachment;
   exports2.removeAssetTypeAttachments = removeAssetTypeAttachments;
+  exports2.removeAssets = removeAssets;
   exports2.removeAttachmentsOfIssue = removeAttachmentsOfIssue;
   exports2.removeCategory = removeCategory;
   exports2.removeColor = removeColor;
@@ -21066,6 +21187,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.updateAssetAttachments = updateAssetAttachments;
   exports2.updateAssetTypeAttachment = updateAssetTypeAttachment;
   exports2.updateAssetTypeAttachments = updateAssetTypeAttachments;
+  exports2.updateAssets = updateAssets;
   exports2.updateConversation = updateConversation;
   exports2.updateDocumentAttachment = updateDocumentAttachment;
   exports2.updateDocumentAttachments = updateDocumentAttachments;
@@ -21094,6 +21216,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   exports2.useSDK = useSDK;
   exports2.userReducer = userReducer;
   exports2.userSlice = userSlice;
+  exports2.validateForm = validateForm;
   exports2.valueIsFile = valueIsFile;
   exports2.warningColor = warningColor;
   exports2.workspaceReducer = workspaceReducer;