@overmap-ai/core 1.0.58-no-hardcoding-api-urls.0 → 1.0.58-sign-up-hotfix.0

package/dist/overmap-core.js

@@ -1738,6 +1738,16 @@ const assetSlice = createSlice({
       }
       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,6 +1756,16 @@ const assetSlice = createSlice({
       }
       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) {
@@ -1769,7 +1789,9 @@ const assetSlice = createSlice({
 const {
   addAsset,
   updateAsset,
+  updateAssets,
   removeAsset,
+  removeAssets,
   addAssetsInBatches,
   setAssets,
   removeAllAssetsOfType,
@@ -3810,17 +3832,15 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
-      const { searchTerm, maxResults, favorites, owner_organization, owner_user } = search;
+      const { searchTerm, maxResults, favorites, organization } = search;
       const favoriteMatches = [];
       const regularMatches = [];
       for (const [userFormId, userForm] of Object.entries(userForms)) {
         if (favorites !== void 0 && userForm.favorite != favorites)
           continue;
-        if (Number.isInteger(owner_organization) && owner_organization !== userForm.owner_organization) {
+        if (Number.isInteger(organization) && organization !== userForm.organization) {
           continue;
         }
-        if (Number.isInteger(owner_user) && owner_user !== userForm.owner_user)
-          continue;
         const latestRevision = _selectLatestFormRevision(revisions, userFormId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
           if (userForm.favorite) {
@@ -4605,10 +4625,6 @@ function handleWorkspaceRemoval(draft, action) {
       throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
     }
   }
-  const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
-  for (const form of indexedForms) {
-    form.index_workspace = mainWorkspace.offline_id;
-  }
 }
 const rootReducer = (state, action) => {
   if (action.type === "auth/setLoggedIn" && !action.payload) {
@@ -5378,6 +5394,15 @@ class CategoryService extends BaseApiService {
     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) {
@@ -5454,36 +5479,55 @@ class AssetService extends BaseApiService {
       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 = v4();
+    const assetBatches = chunkArray(assetsToCreate, batchSize).map((assetBatch) => {
+      const assetPayloads = assetBatch.map((assetPayload) => {
+        return offline({
+          ...assetPayload,
+          submitted_at: submittedAt
+        });
+      });
+      return {
+        batchId: 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 blocks = batchAssetOfflineIds;
+      blocks.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
+      });
+      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;
@@ -6617,6 +6661,7 @@ class MainService extends BaseApiService {
       store.dispatch(addOrReplaceProjects(projects));
       store.dispatch(addOrReplaceWorkspaces(workspaces));
     }
+    console.debug("currentProjectId", currentProjectId);
     if (!currentProjectId) {
       store.dispatch(setIsFetchingInitialData(false));
     } else {
@@ -6975,8 +7020,7 @@ class ProjectService extends BaseApiService {
     });
   }
 }
-const separateImageFromFields = async (payload) => {
-  const { fields } = payload;
+const separateImageFromFields = async (fields) => {
   const images = {};
   const newFields = [];
   for (const section of fields) {
@@ -7002,11 +7046,7 @@ const separateImageFromFields = async (payload) => {
     }
     newFields.push({ ...section, fields: newSectionFields });
   }
-  const payloadWithoutImage = {
-    ...payload,
-    fields: newFields
-  };
-  return { payloadWithoutImage, images };
+  return { fields: newFields, images };
 };
 class UserFormService extends BaseApiService {
   constructor() {
@@ -7040,93 +7080,90 @@ class UserFormService extends BaseApiService {
       });
     });
   }
-  async add(state, initialRevision, url, ownerUser, ownerOrganization, assetTypeId, issueTypeId) {
-    if (!!ownerUser === !!ownerOrganization) {
-      throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
-    }
-    const ownerAttrs = {
-      owner_user: ownerUser,
-      owner_organization: ownerOrganization
-    };
-    const currentUser = state.userReducer.currentUser;
-    const activeWorkspaceId = state.workspaceReducer.activeWorkspaceId;
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const offlineFormPayload = offline({ ...ownerAttrs });
-    const offlineRevisionPayload = offline({ ...initialRevision, submitted_at: submittedAt });
-    const retForm = {
-      ...offlineFormPayload,
-      index_workspace: activeWorkspaceId,
-      favorite: true,
-      submitted_at: submittedAt,
-      created_by: currentUser.id,
-      ...assetTypeId && { asset_type: assetTypeId },
-      ...issueTypeId && { issue_type: issueTypeId },
-      ...ownerAttrs
-    };
-    const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
-    const retRevision = {
-      ...payloadWithoutImage,
-      created_by: currentUser.id,
-      form: retForm.offline_id,
-      revision: 0,
-      submitted_at: submittedAt
-    };
+  async add(ownerId, form, initialRevision, urlPrefix) {
     const { store } = this.client;
-    store.dispatch(addForm(retForm));
-    store.dispatch(addFormRevision(retRevision));
+    const { fields, images } = await separateImageFromFields(initialRevision.fields);
+    const offlineFormRevision = offline({
+      ...initialRevision,
+      fields,
+      created_by: form.created_by,
+      form: form.offline_id,
+      submitted_at: form.submitted_at,
+      revision: "Pending"
+    });
+    store.dispatch(addForm(form));
+    store.dispatch(addFormRevision(offlineFormRevision));
     const formPromise = this.client.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
-      url,
-      queryParams: activeWorkspaceId ? {
-        workspace_id: activeWorkspaceId
-      } : void 0,
+      url: urlPrefix,
       payload: {
-        ...offlineFormPayload,
-        ...assetTypeId && { asset_type: assetTypeId },
-        ...issueTypeId && { issue_type: issueTypeId },
-        initial_revision: payloadWithoutImage
+        // Sending exactly what is currently needed for the endpoint
+        offline_id: form.offline_id,
+        initial_revision: {
+          offline_id: offlineFormRevision.offline_id,
+          submitted_at: offlineFormRevision.submitted_at,
+          title: offlineFormRevision.title,
+          description: offlineFormRevision.description,
+          fields: offlineFormRevision.fields
+        }
       },
-      blockers: assetTypeId ? [assetTypeId] : issueTypeId ? [issueTypeId] : [],
-      blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
+      blockers: [ownerId],
+      blocks: [form.offline_id, offlineFormRevision.offline_id]
     });
-    const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
+    const attachImagesPromises = this.getAttachImagePromises(images, offlineFormRevision.offline_id);
     void formPromise.catch((e) => {
-      store.dispatch(deleteForm(retForm.offline_id));
-      store.dispatch(deleteFormRevision(retRevision.offline_id));
+      store.dispatch(deleteForm(form.offline_id));
+      store.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
       throw e;
     });
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
-    return [retForm, retRevision, formPromise, settledPromise];
+    return [form, offlineFormRevision, formPromise, settledPromise];
   }
-  async addForOrganization(initialRevision, attachedTo) {
+  addForOrganization(organizationId, initialRevision) {
     const state = this.client.store.getState();
-    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error("Cannot add forms for organization when there is no active organization.");
-    }
-    return await this.add(
-      state,
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      organization: organizationId
+    });
+    return this.add(
+      organizationId.toString(),
+      offlineForm,
       initialRevision,
-      `/forms/in-organization/${activeOrganizationId}/`,
-      void 0,
-      activeOrganizationId,
-      attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-      attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
+      `/organizations/${organizationId}/create-form/`
     );
   }
-  async addForCurrentUser(initialRevision, attachedTo) {
+  addForProject(projectId, initialRevision) {
     const state = this.client.store.getState();
-    const currentUser = state.userReducer.currentUser;
-    return await this.add(
-      state,
-      initialRevision,
-      "/forms/my-forms/",
-      currentUser.id,
-      void 0,
-      attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-      attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
-    );
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      project: projectId
+    });
+    return this.add(projectId.toString(), offlineForm, initialRevision, `/projects/${projectId}/create-form/`);
+  }
+  addForIssueType(issueTypeId, initialRevision) {
+    const state = this.client.store.getState();
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      issue_type: issueTypeId
+    });
+    return this.add(issueTypeId, offlineForm, initialRevision, `/issues/types/${issueTypeId}/create-form/`);
+  }
+  addForAssetType(assetTypeId, initialRevision) {
+    const state = this.client.store.getState();
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      asset_type: assetTypeId
+    });
+    return this.add(assetTypeId, offlineForm, initialRevision, `/assets/types/${assetTypeId}/create-form/`);
   }
   async createRevision(formId2, revision) {
     const offlineRevision = offline(revision);
@@ -7137,9 +7174,10 @@ class UserFormService extends BaseApiService {
       throw new Error("Cannot create form revision when there is no active project.");
     }
     const currentUserId = state.userReducer.currentUser.id;
-    const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevision);
+    const { fields, images } = await separateImageFromFields(offlineRevision.fields);
     const fullRevision = {
-      ...payloadWithoutImage,
+      ...offlineRevision,
+      fields,
       created_by: currentUserId,
       revision: "Pending",
       form: formId2,
@@ -7150,9 +7188,14 @@ class UserFormService extends BaseApiService {
       description: "Create form revision",
       method: HttpMethod.PATCH,
       url: `/forms/${formId2}/`,
-      payload: { initial_revision: payloadWithoutImage },
-      queryParams: {
-        project_id: activeProjectId.toString()
+      payload: {
+        initial_revision: {
+          offline_id: fullRevision.offline_id,
+          submitted_at: fullRevision.submitted_at,
+          title: fullRevision.title,
+          description: fullRevision.description,
+          fields: fullRevision.fields
+        }
       },
       blockers: [formId2],
       blocks: [offlineRevision.offline_id]
@@ -7237,16 +7280,68 @@ class UserFormService extends BaseApiService {
   }
   async refreshStore() {
     const { store } = this.client;
-    const result = await this.client.enqueueRequest({
-      description: "Fetch user forms",
+    const activeProjectId = store.getState().projectReducer.activeProjectId;
+    if (!activeProjectId) {
+      throw new Error("No active project");
+    }
+    const forms = [];
+    const revisions = [];
+    const attachments = [];
+    const projectFormsResult = await this.client.enqueueRequest({
+      description: "Fetch project forms",
       method: HttpMethod.GET,
-      url: `/forms/in-project/${store.getState().projectReducer.activeProjectId}/forms/`,
-      blockers: [],
+      url: `/projects/${activeProjectId}/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of projectFormsResult.forms)
+      forms.push(form);
+    for (const revision of projectFormsResult.revisions)
+      revisions.push(revision);
+    for (const attachment of projectFormsResult.attachments)
+      attachments.push(attachment);
+    const organizationFormsResult = await this.client.enqueueRequest({
+      description: "Fetch organization forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/organizations/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of organizationFormsResult.forms)
+      forms.push(form);
+    for (const revision of organizationFormsResult.revisions)
+      revisions.push(revision);
+    for (const attachment of organizationFormsResult.attachments)
+      attachments.push(attachment);
+    const assetTypeFormsResult = await this.client.enqueueRequest({
+      description: "Fetch asset type forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/asset-types/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of assetTypeFormsResult.forms)
+      forms.push(form);
+    for (const revision of assetTypeFormsResult.latest_revisions)
+      revisions.push(revision);
+    for (const attachment of assetTypeFormsResult.attachments)
+      attachments.push(attachment);
+    const issueTypeFormsResult = await this.client.enqueueRequest({
+      description: "Fetch issue type forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/issue-types/forms/`,
+      blockers: [activeProjectId.toString()],
       blocks: []
     });
-    store.dispatch(setForms(Object.values(result.forms)));
-    store.dispatch(setFormRevisions(Object.values(result.revisions)));
-    store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
+    for (const form of issueTypeFormsResult.forms)
+      forms.push(form);
+    for (const revision of issueTypeFormsResult.latest_revisions)
+      revisions.push(revision);
+    for (const attachment of issueTypeFormsResult.attachments)
+      attachments.push(attachment);
+    store.dispatch(setForms(forms));
+    store.dispatch(setFormRevisions(revisions));
+    store.dispatch(setFormRevisionAttachments(attachments));
   }
 }
 const isArrayOfFiles = (value) => {
@@ -7349,100 +7444,120 @@ 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;
+  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 = v4();
+    const assetIdBatches = chunkArray(Object.keys(fieldValuesByAsset), batchSize);
+    const bulkAddBatches = await Promise.all(
+      assetIdBatches.map(async (assetIdBatch) => {
+        const batchId = 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 blocks = [...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
+      });
+      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;
@@ -8652,8 +8767,8 @@ class OvermapSDK {
 }
 const makeClient = (apiUrl, store) => new OvermapSDK(apiUrl, store);
 const SDKContext = React__default.createContext({});
-const SDKProvider = memo(({ children, apiUrl, store }) => {
-  const client = useMemo(() => makeClient(apiUrl, store), [apiUrl, store]);
+const SDKProvider = memo(({ children, API_URL, store }) => {
+  const client = useMemo(() => makeClient(API_URL, store), [API_URL, store]);
   useEffect(() => {
     setClientStore(store);
   }, [store]);
@@ -8664,9 +8779,11 @@ const useSDK = () => {
   return React__default.useContext(SDKContext);
 };
 const OvermapContext = React__default.createContext(null);
+const PRODUCTION_URL = "https://api.wordn.io";
+const STAGING_URL = "https://test-api.hemora.ca";
 const OvermapProvider = (props) => {
-  const { children, disableDefaultTheme = false, store, apiUrl } = props;
-  let ret = /* @__PURE__ */ jsx(AlertDialogProvider, { children: /* @__PURE__ */ jsx(ToastProvider, { children: /* @__PURE__ */ jsx(SDKProvider, { store, apiUrl, children }) }) });
+  const { children, production, disableDefaultTheme = false, store } = props;
+  let ret = /* @__PURE__ */ jsx(AlertDialogProvider, { children: /* @__PURE__ */ jsx(ToastProvider, { children: /* @__PURE__ */ jsx(SDKProvider, { API_URL: production ? PRODUCTION_URL : STAGING_URL, store, children }) }) });
   if (!disableDefaultTheme) {
     ret = /* @__PURE__ */ jsx(DefaultTheme, { children: ret });
   }
@@ -8795,6 +8912,12 @@ class BaseField extends BaseFormElement {
   getFormValidators() {
     return [...this.formValidators];
   }
+  encodeValueToJson(value) {
+    return JSON.stringify(value);
+  }
+  decodeJsonToValue(json) {
+    return JSON.parse(json);
+  }
 }
 __publicField(BaseField, "fieldTypeName");
 __publicField(BaseField, "fieldTypeDescription");
@@ -13048,10 +13171,7 @@ const MultiStringInput = memo((props) => {
   helpText = showInputOnly ? null : helpText;
   label = showInputOnly ? "" : label;
   const color = useSeverityColor(severity);
-  const value = useMemo(
-    () => Array.isArray(fieldProps.value) ? fieldProps.value : [],
-    [fieldProps.value]
-  );
+  const value = useMemo(() => Array.isArray(fieldProps.value) ? fieldProps.value : [], [fieldProps.value]);
   const { onChange, onBlur } = fieldProps;
   const droppableId = `${inputId}-droppable`;
   const { disabled } = rest;
@@ -13068,7 +13188,7 @@ const MultiStringInput = memo((props) => {
   );
   const handleChange = 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");
@@ -13087,7 +13207,7 @@ const MultiStringInput = memo((props) => {
       return;
     }
     const trimmedValue = intermediateValue.trim();
-    setValueAndTouched([...value, { value: trimmedValue, label: trimmedValue }]);
+    setValueAndTouched([...value, trimmedValue]);
     setIntermediateValue("");
   }, [intermediateValue, internalError, setValueAndTouched, value]);
   const handleKeyDown = useCallback(
@@ -13157,7 +13277,7 @@ const MultiStringInput = memo((props) => {
       value.map((option, index2) => /* @__PURE__ */ jsx(
         Draggable,
         {
-          draggableId: `${option.value}-draggable`,
+          draggableId: `${option}-draggable`,
           index: index2,
           isDragDisabled: disabled,
           children: ({ draggableProps, dragHandleProps, innerRef }) => /* @__PURE__ */ jsx(
@@ -13172,7 +13292,10 @@ const MultiStringInput = memo((props) => {
               mb: "1",
               asChild: true,
               children: /* @__PURE__ */ jsxs(Badge, { color: "gray", size: "2", children: [
-                /* @__PURE__ */ jsx("span", { children: option.label }),
+                /* @__PURE__ */ jsx("span", {
+                  // TODO: remove this, its just a saftey check for old compatibility of what was acceptable as a value for multi string
+                  children: typeof option === "object" && "label" in option ? option.label : option
+                }),
                 /* @__PURE__ */ jsx(
                   IconButton,
                   {
@@ -13192,7 +13315,7 @@ const MultiStringInput = memo((props) => {
             }
           )
         },
-        option.value
+        option
       )),
       droppableProvided.placeholder
     ] }) })
@@ -14867,6 +14990,44 @@ function formRevisionToSchema(formRevision, meta = {}) {
     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);
 }
@@ -15243,7 +15404,6 @@ const styles$3 = {
   regularIcon
 };
 const orgOptionPrefix = "organization:";
-const userOptionPrefix = "user:";
 const FormBrowser = memo(
   forwardRef((props, ref) => {
     const { maxResults = 20, ...entryProps } = props;
@@ -15254,9 +15414,7 @@ const FormBrowser = memo(
       const ret = { maxResults, searchTerm: filter };
       if (ownerFilter) {
         if (ownerFilter.startsWith(orgOptionPrefix)) {
-          ret.owner_organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
-        } else if (ownerFilter.startsWith(userOptionPrefix)) {
-          ret.owner_user = parseInt(ownerFilter.slice(userOptionPrefix.length));
+          ret.organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
         }
       }
       return ret;
@@ -15281,14 +15439,10 @@ const FormBrowser = memo(
       const state = sdk.store.getState();
       const accumulator = {};
       for (const form of attachableUserFormMapping) {
-        const organization = selectOrganization(form.owner_organization || -1)(state);
+        const organization = selectOrganization(form.organization || -1)(state);
         if (organization) {
           accumulator[`${orgOptionPrefix}${organization.id}`] = organization.name;
         }
-        const user = selectUser(form.owner_user || -1)(state);
-        if (user) {
-          accumulator[`${userOptionPrefix}${user.id}`] = user.username;
-        }
       }
       return Object.entries(accumulator).map(([value, label]) => ({ itemContent: label, value }));
     }, [sdk.store, attachableUserFormMapping]);
@@ -15330,11 +15484,7 @@ const FormBrowser = memo(
 const FormBrowserEntry = (props) => {
   var _a2;
   const { form, onSelectForm, isFavoriteEditable, handleToggleFavorite } = props;
-  const ownerOrganization = (_a2 = useAppSelector(selectOrganization(form.owner_organization || -1))) == null ? void 0 : _a2.name;
-  const ownerUser = useAppSelector(selectUser(form.owner_user || -1));
-  const currentUserId = useAppSelector(selectCurrentUser).id;
-  const ownedByCurrentUser = !!ownerUser && ownerUser.id === currentUserId;
-  const owner = ownerOrganization ?? (ownedByCurrentUser ? "You" : ownerUser == null ? void 0 : ownerUser.username) ?? "Unknown";
+  const ownerOrganization = (_a2 = useAppSelector(selectOrganization(form.organization || -1))) == null ? void 0 : _a2.name;
   const handleFavoriteClick = useCallback(
     (e) => {
       e.stopPropagation();
@@ -15365,10 +15515,10 @@ const FormBrowserEntry = (props) => {
           /* @__PURE__ */ jsx(Text$1, { noWrap: true, children: form.latestRevision.title }),
           form.latestRevision.description && /* @__PURE__ */ jsx(RiIcon, { icon: "RiQuestionLine" })
         ] }),
-        owner && /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
+        ownerOrganization && /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
           /* @__PURE__ */ jsx(RiIcon, { icon: "RiUserLine" }),
           " ",
-          owner
+          ownerOrganization
         ] })
       ] })
     }
@@ -16648,6 +16798,7 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   StringInput,
   TextField,
   TextInput,
+  decodeFormValues,
   deserialize,
   deserializeField,
   emptyBaseField,
@@ -16660,11 +16811,15 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   emptySelectField,
   emptyStringField,
   emptyTextField,
+  encodeFormValues,
+  flattenFields,
   formRevisionToSchema,
+  initialFormValues,
   isConditionMet,
   useFieldInput,
   useFieldInputs,
   useFormikInput,
+  validateForm,
   valueIsFile
 }, Symbol.toStringTag, { value: "Module" }));
 export {
@@ -16856,6 +17011,7 @@ export {
   coordinatesToUrlText,
   createOfflineAction,
   createPointMarker,
+  decodeFormValues,
   defaultBadgeColor,
   defaultStore,
   deleteAssetType,
@@ -16891,6 +17047,7 @@ export {
   emptySelectField,
   emptyStringField,
   emptyTextField,
+  encodeFormValues,
   enqueue,
   enqueueRequest,
   errorColor,
@@ -16898,6 +17055,7 @@ export {
   fileReducer,
   fileSlice,
   fileToBlob,
+  flattenFields,
   flipCoordinates,
   formReducer,
   formRevisionReducer,
@@ -16921,6 +17079,7 @@ export {
   hashFile,
   hideAllCategories,
   hideCategory,
+  initialFormValues,
   isConditionMet,
   isToday,
   issueReducer,
@@ -16974,6 +17133,7 @@ export {
   removeAssetAttachments,
   removeAssetTypeAttachment,
   removeAssetTypeAttachments,
+  removeAssets,
   removeAttachmentsOfIssue,
   removeCategory,
   removeColor,
@@ -17291,6 +17451,7 @@ export {
   updateAssetAttachments,
   updateAssetTypeAttachment,
   updateAssetTypeAttachments,
+  updateAssets,
   updateConversation,
   updateDocumentAttachment,
   updateDocumentAttachments,
@@ -17321,6 +17482,7 @@ export {
   useSDK,
   userReducer,
   userSlice,
+  validateForm,
   valueIsFile,
   warningColor,
   workspaceReducer,