@overmap-ai/core 1.0.58-asset-description.8 → 1.0.58-no-hardcoding-api-urls.0

package/dist/overmap-core.umd.cjs

@@ -1728,16 +1728,6 @@ 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];
@@ -1746,16 +1736,6 @@ 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) {
@@ -1779,9 +1759,7 @@ var __publicField = (obj, key, value) => {
   const {
     addAsset,
     updateAsset,
-    updateAssets,
     removeAsset,
-    removeAssets,
     addAssetsInBatches,
     setAssets,
     removeAllAssetsOfType,
@@ -5390,16 +5368,6 @@ 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;
-  }
-  const BULK_ADD_ASSET_BATCH_SIZE = 1e3;
   class AssetService extends BaseApiService {
     // Basic CRUD functions
     add(asset, workspaceId) {
@@ -5476,45 +5444,36 @@ var __publicField = (obj, key, value) => {
         throw err;
       });
     }
-    addBulk(assetsToCreate, workspaceId, assetTypeId) {
-      const { store } = this.client;
+    async addBatch(assetsToCreate, workspaceId, assetTypeId) {
       const fullAssets = assetsToCreate.map((asset) => {
         return { ...offline(asset), submitted_at: (/* @__PURE__ */ new Date()).toISOString() };
       });
-      const assetBatches = chunkArray(fullAssets, BULK_ADD_ASSET_BATCH_SIZE).map((assetBatch) => {
-        return {
-          batchId: uuid.v4(),
-          payload: {
-            assets: assetBatch
-          }
-        };
-      });
+      const { store } = this.client;
       store.dispatch(addAssetsInBatches(fullAssets));
-      let prevBatchId = null;
-      const batchPromises = Promise.all(
-        assetBatches.map((assetBatch) => {
-          const { batchId, payload } = assetBatch;
-          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: prevBatchId ? [assetTypeId, prevBatchId] : [assetTypeId],
-            blocks: assetBatch.payload.assets.map((c) => c.offline_id).concat([batchId])
-          });
-          promise.then((result) => {
-            store.dispatch(updateAssets(Object.values(result)));
-          }).catch(() => {
-            store.dispatch(removeAssets(assetBatch.payload.assets.map((c) => c.offline_id)));
-          });
-          prevBatchId = assetBatch.batchId;
-          return promise;
-        })
-      );
-      return [fullAssets, batchPromises.then((result) => result)];
+      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)
+      });
+      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;
+      });
+      return promise;
     }
     async refreshStore() {
       const { store } = this.client;
@@ -7300,7 +7259,6 @@ var __publicField = (obj, key, value) => {
     }
     return { values: newValues, files };
   };
-  const MAX_BULK_ADD_SUBMISSIONS = 1e3;
   class UserFormSubmissionService extends BaseApiService {
     constructor() {
       super(...arguments);
@@ -7382,134 +7340,99 @@ 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, commonFieldValues, fieldValuesByAsset } = args;
+      const { formRevision, values: argsValues, assetOfflineIds } = args;
       const { store } = this.client;
       const offlineSubmissions = [];
       const offlineAttachments = [];
       const submissionOfflineIds = [];
-      const allFilesRecord = {};
-      const { values: fileSeperatedCommonFieldValues, files: commonFiles } = separateFilesFromValues(commonFieldValues);
+      const submissionsPayload = [];
+      const attachmentsPayload = [];
+      const { values, files } = separateFilesFromValues(argsValues);
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const createdBy = store.getState().userReducer.currentUser.id;
-      const assetIdBatches = chunkArray(Object.keys(fieldValuesByAsset), MAX_BULK_ADD_SUBMISSIONS);
-      const bulkAddBatches = await Promise.all(
-        assetIdBatches.map(async (assetIdBatch) => {
-          const batchId = uuid.v4();
-          const submissionsPayload = [];
-          const attachmentsPayload = [];
-          let files = { ...commonFiles };
-          for (const assetId of assetIdBatch) {
-            const { values: fileSeperatedSubmissionSpecificValues, files: submissionSpecificFiles } = separateFilesFromValues(fieldValuesByAsset[assetId] ?? {});
-            files = Object.assign(files, submissionSpecificFiles);
-            const submissionValues = {
-              ...fileSeperatedCommonFieldValues,
-              ...fileSeperatedSubmissionSpecificValues
-            };
-            const submission = offline({
-              form_revision: formRevision,
-              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,
-              form_data: fileSeperatedSubmissionSpecificValues
-            });
-            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
-                });
-                offlineAttachments.push(offlineAttachment);
-                attachmentsPayload.push({
-                  offline_id: offlineAttachment.offline_id,
-                  submission_id: submission.offline_id,
-                  sha1,
-                  name: file.name,
-                  field_identifier: fieldIdentifier
-                });
-              }
-            }
-          }
-          const filePaylods = [];
-          for (const file of Object.values(files).flat()) {
+      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);
-            const filePayload = {
+            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
+            });
+            offlineAttachments.push(offlineAttachment);
+            attachmentsPayload.push({
+              offline_id: offlineAttachment.offline_id,
+              submission_id: submission.offline_id,
               sha1,
-              extension: file.name.split(".").pop() || "",
-              file_type: file.type,
-              size: file.size
-            };
-            allFilesRecord[sha1] = filePayload;
-            filePaylods.push(filePayload);
+              name: file.name,
+              field_identifier: fieldIdentifier
+            });
           }
-          return {
-            batchId,
-            payload: {
-              form_data: fileSeperatedCommonFieldValues,
-              submitted_at: submittedAt,
-              submissions: submissionsPayload,
-              attachments: attachmentsPayload,
-              files: filePaylods
-            }
-          };
-        })
-      );
+        }
+      }
+      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));
-      let prevBatchId = null;
-      const batchPromises = Promise.all(
-        bulkAddBatches.map((batch) => {
-          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 promise = this.client.enqueueRequest({
-            description: "Bulk add form submissions",
+      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,
-            url: `/forms/revisions/${formRevision}/bulk-respond/`,
-            payload,
-            blockers: prevBatchId ? batchAssetIds.concat([prevBatchId]) : batchAssetIds,
-            blocks: batchSubmissionOfflineIds.concat([batchId])
-          });
-          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 = allFilesRecord[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(batchSubmissionOfflineIds));
-            store.dispatch(deleteFormSubmissionAttachments(batchAttachmentsOfflineIds));
+            isExternalUrl: true,
+            isAuthNeeded: false,
+            attachmentHash: sha1,
+            blockers: [`s3-${file.sha1}.${file.extension}`],
+            blocks: [sha1],
+            s3url: presigned_url
           });
-          prevBatchId = batchId;
-          return promise;
-        })
-      );
-      return [offlineSubmissions, batchPromises.then((results) => results.map(({ submissions }) => submissions))];
+        }
+      }).catch(() => {
+        store.dispatch(deleteFormSubmissions(submissionOfflineIds));
+        store.dispatch(deleteFormSubmissionAttachments(offlineAttachments.map((x) => x.offline_id)));
+      });
+      return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
     }
     update(submission) {
       const { store } = this.client;
@@ -8719,8 +8642,8 @@ var __publicField = (obj, key, value) => {
   }
   const makeClient = (apiUrl, store) => new OvermapSDK(apiUrl, store);
   const SDKContext = React.createContext({});
-  const SDKProvider = React.memo(({ children, API_URL, store }) => {
-    const client = React.useMemo(() => makeClient(API_URL, store), [API_URL, store]);
+  const SDKProvider = React.memo(({ children, apiUrl, store }) => {
+    const client = React.useMemo(() => makeClient(apiUrl, store), [apiUrl, store]);
     React.useEffect(() => {
       setClientStore(store);
     }, [store]);
@@ -8731,11 +8654,9 @@ var __publicField = (obj, key, value) => {
     return React.useContext(SDKContext);
   };
   const OvermapContext = React.createContext(null);
-  const PRODUCTION_URL = "https://api.wordn.io";
-  const STAGING_URL = "https://test-api.hemora.ca";
   const OvermapProvider = (props) => {
-    const { children, production, disableDefaultTheme = false, store } = props;
-    let ret = /* @__PURE__ */ jsxRuntime.jsx(blocks.AlertDialogProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(blocks.ToastProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(SDKProvider, { API_URL: production ? PRODUCTION_URL : STAGING_URL, store, children }) }) });
+    const { children, disableDefaultTheme = false, store, apiUrl } = props;
+    let ret = /* @__PURE__ */ jsxRuntime.jsx(blocks.AlertDialogProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(blocks.ToastProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(SDKProvider, { store, apiUrl, children }) }) });
     if (!disableDefaultTheme) {
       ret = /* @__PURE__ */ jsxRuntime.jsx(blocks.DefaultTheme, { children: ret });
     }
@@ -8864,12 +8785,6 @@ 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");
@@ -13143,7 +13058,7 @@ var __publicField = (obj, key, value) => {
     );
     const handleChange = React.useCallback(
       (e) => {
-        if (value.findIndex((option) => option === e.target.value.trim()) >= 0) {
+        if (value.findIndex((option) => option.value === e.target.value.trim()) >= 0) {
           setInternalError("All options must be unique");
         } else if (!e.target.value) {
           setInternalError("Option cannot be empty");
@@ -13162,7 +13077,7 @@ var __publicField = (obj, key, value) => {
         return;
       }
       const trimmedValue = intermediateValue.trim();
-      setValueAndTouched([...value, trimmedValue]);
+      setValueAndTouched([...value, { value: trimmedValue, label: trimmedValue }]);
       setIntermediateValue("");
     }, [intermediateValue, internalError, setValueAndTouched, value]);
     const handleKeyDown = React.useCallback(
@@ -13232,7 +13147,7 @@ var __publicField = (obj, key, value) => {
         value.map((option, index2) => /* @__PURE__ */ jsxRuntime.jsx(
           dnd.Draggable,
           {
-            draggableId: `${option}-draggable`,
+            draggableId: `${option.value}-draggable`,
             index: index2,
             isDragDisabled: disabled,
             children: ({ draggableProps, dragHandleProps, innerRef }) => /* @__PURE__ */ jsxRuntime.jsx(
@@ -13247,7 +13162,7 @@ var __publicField = (obj, key, value) => {
                 mb: "1",
                 asChild: true,
                 children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Badge, { color: "gray", size: "2", children: [
-                  /* @__PURE__ */ jsxRuntime.jsx("span", { children: option }),
+                  /* @__PURE__ */ jsxRuntime.jsx("span", { children: option.label }),
                   /* @__PURE__ */ jsxRuntime.jsx(
                     blocks.IconButton,
                     {
@@ -13267,7 +13182,7 @@ var __publicField = (obj, key, value) => {
               }
             )
           },
-          option
+          option.value
         )),
         droppableProvided.placeholder
       ] }) })
@@ -14942,46 +14857,6 @@ var __publicField = (obj, key, value) => {
       meta: { readonly }
     };
   }
-  function decodeFormValues(schema, values) {
-    let allFields = [];
-    for (const field of schema.fields) {
-      if (field instanceof FieldSection) {
-        allFields = allFields.concat(field.fields);
-      } else {
-        if (!(field instanceof BaseField)) {
-          throw new Error("Invalid field type");
-        }
-        allFields.push(field);
-      }
-    }
-    const result = {};
-    for (const field of allFields) {
-      if (!(field.identifier in values))
-        ;
-      const value = values[field.identifier];
-      result[field.identifier] = field.decodeJsonToValue(value);
-    }
-    return result;
-  }
-  function encodeFormValues(schema, values) {
-    let allFields = [];
-    for (const field of schema.fields) {
-      if (field instanceof FieldSection) {
-        allFields = allFields.concat(field.fields);
-      } else {
-        if (!(field instanceof BaseField)) {
-          throw new Error("Invalid field type");
-        }
-        allFields.push(field);
-      }
-    }
-    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);
   }
@@ -16763,7 +16638,6 @@ var __publicField = (obj, key, value) => {
     StringInput,
     TextField,
     TextInput,
-    decodeFormValues,
     deserialize,
     deserializeField,
     emptyBaseField,
@@ -16776,14 +16650,11 @@ var __publicField = (obj, key, value) => {
     emptySelectField,
     emptyStringField,
     emptyTextField,
-    encodeFormValues,
     formRevisionToSchema,
-    initialFormValues,
     isConditionMet,
     useFieldInput,
     useFieldInputs,
     useFormikInput,
-    validateForm,
     valueIsFile
   }, Symbol.toStringTag, { value: "Module" }));
   exports2.APIError = APIError;
@@ -16974,7 +16845,6 @@ var __publicField = (obj, key, value) => {
   exports2.coordinatesToUrlText = coordinatesToUrlText;
   exports2.createOfflineAction = createOfflineAction;
   exports2.createPointMarker = createPointMarker;
-  exports2.decodeFormValues = decodeFormValues;
   exports2.defaultBadgeColor = defaultBadgeColor;
   exports2.defaultStore = defaultStore;
   exports2.deleteAssetType = deleteAssetType;
@@ -17010,7 +16880,6 @@ var __publicField = (obj, key, value) => {
   exports2.emptySelectField = emptySelectField;
   exports2.emptyStringField = emptyStringField;
   exports2.emptyTextField = emptyTextField;
-  exports2.encodeFormValues = encodeFormValues;
   exports2.enqueue = enqueue;
   exports2.enqueueRequest = enqueueRequest;
   exports2.errorColor = errorColor;
@@ -17041,7 +16910,6 @@ var __publicField = (obj, key, value) => {
   exports2.hashFile = hashFile;
   exports2.hideAllCategories = hideAllCategories;
   exports2.hideCategory = hideCategory;
-  exports2.initialFormValues = initialFormValues;
   exports2.isConditionMet = isConditionMet;
   exports2.isToday = isToday;
   exports2.issueReducer = issueReducer;
@@ -17095,7 +16963,6 @@ var __publicField = (obj, key, value) => {
   exports2.removeAssetAttachments = removeAssetAttachments;
   exports2.removeAssetTypeAttachment = removeAssetTypeAttachment;
   exports2.removeAssetTypeAttachments = removeAssetTypeAttachments;
-  exports2.removeAssets = removeAssets;
   exports2.removeAttachmentsOfIssue = removeAttachmentsOfIssue;
   exports2.removeCategory = removeCategory;
   exports2.removeColor = removeColor;
@@ -17413,7 +17280,6 @@ var __publicField = (obj, key, value) => {
   exports2.updateAssetAttachments = updateAssetAttachments;
   exports2.updateAssetTypeAttachment = updateAssetTypeAttachment;
   exports2.updateAssetTypeAttachments = updateAssetTypeAttachments;
-  exports2.updateAssets = updateAssets;
   exports2.updateConversation = updateConversation;
   exports2.updateDocumentAttachment = updateDocumentAttachment;
   exports2.updateDocumentAttachments = updateDocumentAttachments;
@@ -17444,7 +17310,6 @@ var __publicField = (obj, key, value) => {
   exports2.useSDK = useSDK;
   exports2.userReducer = userReducer;
   exports2.userSlice = userSlice;
-  exports2.validateForm = validateForm;
   exports2.valueIsFile = valueIsFile;
   exports2.warningColor = warningColor;
   exports2.workspaceReducer = workspaceReducer;