@overmap-ai/core 1.0.49 → 1.0.50-bulk-form-submission.1

package/dist/overmap-core.js

@@ -631,15 +631,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$n = {
+const initialState$p = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -804,6 +804,19 @@ function downloadInMemoryFile(filename, text) {
   element.click();
   document.body.removeChild(element);
 }
+const constructUploadedFilePayloads = async (files) => {
+  const filePayloads = {};
+  for (const file of files) {
+    const sha1 = await hashFile(file);
+    filePayloads[sha1] = {
+      sha1,
+      extension: file.name.split(".").pop() || "",
+      file_type: file.type,
+      size: file.size
+    };
+  }
+  return Object.values(filePayloads);
+};
 const fileToBlob = async (dataUrl) => {
   return (await fetch(dataUrl)).blob();
 };
@@ -1370,7 +1383,7 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$m = {
+const initialState$o = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1380,8 +1393,8 @@ const initialState$m = {
 };
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$m,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     setCategories: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -1515,6 +1528,7 @@ const selectHiddenCategoryCount = (state) => {
 };
 const categoryReducer = categorySlice.reducer;
 function setAttachments(state, action) {
+  state.attachments = {};
   for (const attachment of action.payload) {
     state.attachments[attachment.offline_id] = attachment;
   }
@@ -1537,6 +1551,15 @@ function updateAttachment(state, action) {
     throw new Error(`Attachment ${action.payload.offline_id} does not exist.`);
   }
 }
+function updateAttachments(state, action) {
+  for (const attachment of action.payload) {
+    if (attachment.offline_id in state.attachments) {
+      state.attachments[attachment.offline_id] = attachment;
+    } else {
+      throw new Error(`Attachment ${attachment.offline_id} does not exist.`);
+    }
+  }
+}
 function removeAttachment(state, action) {
   if (action.payload in state.attachments) {
     delete state.attachments[action.payload];
@@ -1549,14 +1572,14 @@ function removeAttachments(state, action) {
     delete state.attachments[attachmentId];
   }
 }
-const initialState$l = {
+const initialState$n = {
   components: {},
   attachments: {}
 };
 const componentSlice = createSlice({
   name: "components",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     addComponent: (state, action) => {
       state.components[action.payload.offline_id] = action.payload;
@@ -1669,6 +1692,9 @@ const selectAllComponentAttachments = createSelector(
   [selectComponentAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
+const selectComponentAttachment = (attachmentId) => (state) => {
+  return state.componentReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfComponent = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentAttachments, (_state, componentId) => componentId],
@@ -1709,13 +1735,13 @@ const {
   removeAllComponentsOfType
 } = componentSlice.actions;
 const componentReducer = componentSlice.reducer;
-const initialState$k = {
+const initialState$m = {
   completionsByComponentId: {}
 };
 const componentStageCompletionSlice = createSlice({
   name: "componentStageCompletions",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1766,13 +1792,13 @@ const selectCompletedStageIdsForComponent = (component) => (state) => {
   return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
 };
 const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-const initialState$j = {
+const initialState$l = {
   stages: {}
 };
 const componentStageSlice = createSlice({
   name: "componentStages",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     addStages: (state, action) => {
       Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1882,15 +1908,15 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
 const componentStageReducer = componentStageSlice.reducer;
-const initialState$i = {
+const initialState$k = {
   componentTypes: {},
   hiddenComponentTypeIds: {},
   attachments: {}
 };
 const componentTypeSlice = createSlice({
   name: "componentTypes",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     addComponentType: (state, action) => {
       state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1958,6 +1984,9 @@ const selectAllComponentTypeAttachments = createSelector(
   [selectComponentTypeAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
+const selectComponentTypeAttachment = (attachmentId) => (state) => {
+  return state.componentTypeReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfComponentType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentTypeAttachments, (_state, componentTypeId) => componentTypeId],
@@ -1998,13 +2027,13 @@ const {
   deleteComponentType
 } = componentTypeSlice.actions;
 const componentTypeReducer = componentTypeSlice.reducer;
-const initialState$h = {
+const initialState$j = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$h,
+  initialState: initialState$j,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setWorkspaces: (state, action) => {
@@ -2061,7 +2090,7 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$g = {
+const initialState$i = {
   issues: {},
   attachments: {},
   comments: {},
@@ -2073,9 +2102,9 @@ const initialState$g = {
 };
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$g,
+  initialState: initialState$i,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$g);
+    Object.assign(state, initialState$i);
   }),
   reducers: {
     setIssues: (state, action) => {
@@ -2130,6 +2159,7 @@ const issueSlice = createSlice({
       }
     },
     updateIssueAttachment: updateAttachment,
+    updateIssueAttachments: updateAttachments,
     removeIssue: (state, action) => {
       if (action.payload in state.issues) {
         delete state.issues[action.payload];
@@ -2138,6 +2168,7 @@ const issueSlice = createSlice({
       }
     },
     removeIssueAttachment: removeAttachment,
+    removeIssueAttachments: removeAttachments,
     removeIssueUpdate: (state, action) => {
       if (action.payload in state.updates) {
         delete state.updates[action.payload];
@@ -2247,6 +2278,7 @@ const {
   addToRecentIssues,
   cleanRecentIssues,
   removeIssueAttachment,
+  removeIssueAttachments,
   removeAttachmentsOfIssue,
   removeIssue,
   removeIssueUpdate,
@@ -2260,6 +2292,7 @@ const {
   setVisibleStatuses,
   setVisibleUserIds,
   updateIssueAttachment,
+  updateIssueAttachments,
   updateIssue,
   // Commments
   addIssueComment,
@@ -2352,6 +2385,9 @@ const selectAttachmentsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
+const selectIssueAttachment = (attachmentId) => (root) => {
+  return root.issueReducer.attachments[attachmentId];
+};
 const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectIssueAttachments, (_state, issueId) => issueId],
@@ -2480,15 +2516,15 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$f = {
+const initialState$h = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$h,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -2515,7 +2551,7 @@ const selectUploadUrl = (sha1) => (state) => {
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$e = {
+const initialState$g = {
   // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
   mapStyle: MapStyle.SATELLITE,
   showTooltips: false,
@@ -2523,8 +2559,8 @@ const initialState$e = {
 };
 const mapSlice = createSlice({
   name: "map",
-  initialState: initialState$e,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     setMapStyle: (state, action) => {
       state.mapStyle = action.payload;
@@ -2593,7 +2629,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$d = {
+const initialState$f = {
   users: {},
   currentUser: {
     id: 0,
@@ -2604,8 +2640,8 @@ const initialState$d = {
 };
 const userSlice = createSlice({
   name: "users",
-  initialState: initialState$d,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -2667,13 +2703,13 @@ const selectUser = (userId) => (state) => {
 const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
-const initialState$c = {
+const initialState$e = {
   organizationAccesses: {}
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     setOrganizationAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2736,13 +2772,13 @@ const selectOrganizationAccessUserMapping = (state) => {
   return organizationAccesses;
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
-const initialState$b = {
+const initialState$d = {
   licenses: {}
 };
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     setLicenses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2787,13 +2823,13 @@ const selectLicensesForProjectsMapping = createSelector(
   (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
 );
 const licenseReducer = licenseSlice.reducer;
-const initialState$a = {
+const initialState$c = {
   projectAccesses: {}
 };
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$a,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     setProjectAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2861,7 +2897,7 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$9 = {
+const initialState$b = {
   projects: {},
   activeProjectId: null,
   recentProjectIds: [],
@@ -2871,7 +2907,7 @@ const initialState$9 = {
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$9,
+  initialState: initialState$b,
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -3058,14 +3094,14 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
     }
   )
 );
-const initialState$8 = {
+const initialState$a = {
   organizations: {},
   activeOrganizationId: null
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$8,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  initialState: initialState$a,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -3184,14 +3220,14 @@ const createOfflineAction = (request2, baseUrl) => {
     }
   };
 };
-const initialState$7 = {
+const initialState$9 = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  initialState: initialState$9,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
   reducers: {
     // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
     // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -3223,7 +3259,7 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$6 = {
+const initialState$8 = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false,
@@ -3231,8 +3267,8 @@ const initialState$6 = {
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$8,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -3333,12 +3369,12 @@ const selectProjectFiles = createSelector(
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
 const projectFileReducer = projectFileSlice.reducer;
-const initialState$5 = {
+const initialState$7 = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$5,
+  initialState: initialState$7,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -3348,7 +3384,7 @@ const rehydratedSlice = createSlice({
 });
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$4 = {
+const initialState$6 = {
   useIssueTemplate: false,
   placementMode: false,
   enableClustering: false,
@@ -3365,8 +3401,8 @@ const initialState$4 = {
 };
 const settingSlice = createSlice({
   name: "settings",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
   reducers: {
     setEnableDuplicateIssues: (state, action) => {
       state.useIssueTemplate = action.payload;
@@ -3412,146 +3448,248 @@ const selectAppearance = (state) => state.settingReducer.appearance;
 const settingReducer = settingSlice.reducer;
 const selectIsFetchingInitialData = (state) => state.settingReducer.isFetchingInitialData;
 const selectIsLoading = (state) => state.settingReducer.isLoading;
-const LATEST_REVISION_CACHE = {};
-function considerCachingRevision(revision, formId2, preferPending = false) {
+const LATEST_FORM_REVISION_CACHE = {};
+function considerCachingFormRevision(formRevision, formId2, preferPending = false) {
   var _a2;
-  if (!revision) {
+  if (!formRevision) {
     if (!formId2) {
-      throw new Error("If revision is null, formId is required.");
+      throw new Error("If form revision is null, formId is required.");
     }
-    const currentLatestRevision = getLatestRevisionFromCache(formId2);
-    if (currentLatestRevision)
+    const currentLatestFormRevision = getLatestFormRevisionFromCache(formId2);
+    if (currentLatestFormRevision)
       return;
-    LATEST_REVISION_CACHE[formId2] = null;
+    LATEST_FORM_REVISION_CACHE[formId2] = null;
     return;
   }
-  if (revision.revision === "Pending") {
+  if (formRevision.revision === "Pending") {
     if (preferPending) {
-      LATEST_REVISION_CACHE[revision.form] = revision;
+      LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
     }
     return;
   }
-  const cachedRevision = (_a2 = LATEST_REVISION_CACHE[revision.form]) == null ? void 0 : _a2.revision;
-  if (revision.revision > (typeof cachedRevision === "number" ? cachedRevision : -1)) {
-    LATEST_REVISION_CACHE[revision.form] = revision;
+  const cachedFormRevision = (_a2 = LATEST_FORM_REVISION_CACHE[formRevision.form]) == null ? void 0 : _a2.revision;
+  if (formRevision.revision > (typeof cachedFormRevision === "number" ? cachedFormRevision : -1)) {
+    LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
   }
 }
-function getLatestRevisionFromCache(formId2) {
-  return LATEST_REVISION_CACHE[formId2];
+function getLatestFormRevisionFromCache(formId2) {
+  return LATEST_FORM_REVISION_CACHE[formId2];
 }
-const initialState$3 = {
-  userForms: {},
-  revisions: {},
-  submissions: {},
-  submissionAttachments: {},
-  revisionAttachments: {}
-};
-const userFormSlice = createSlice({
-  name: "userForms",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+const initialState$5 = {
+  formRevisions: {},
+  attachments: {}
+};
+const formRevisionsSlice = createSlice({
+  name: "formRevisions",
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
   reducers: {
-    setUserForms: (state, action) => {
-      state.userForms = {};
-      action.payload.forEach((userForm) => {
-        state.userForms[userForm.offline_id] = userForm;
-      });
-    },
-    addUserForm: (state, action) => {
-      state.userForms[action.payload.offline_id] = action.payload;
-    },
-    addUserForms: (state, action) => {
-      action.payload.forEach((userForm) => {
-        state.userForms[userForm.offline_id] = userForm;
-      });
+    // revision related actions
+    setFormRevision: (state, action) => {
+      state.formRevisions[action.payload.offline_id] = action.payload;
+      considerCachingFormRevision(action.payload);
     },
-    addUserFormRevisions: (state, action) => {
-      action.payload.forEach((userFormRevision) => {
-        state.revisions[userFormRevision.offline_id] = userFormRevision;
-        considerCachingRevision(userFormRevision);
-      });
-    },
-    addUserFormRevision: (state, action) => {
-      state.revisions[action.payload.offline_id] = action.payload;
-      considerCachingRevision(action.payload);
+    setFormRevisions: (state, action) => {
+      state.formRevisions = {};
+      for (const revision of action.payload) {
+        state.formRevisions[revision.offline_id] = revision;
+        considerCachingFormRevision(revision);
+      }
     },
-    deleteUserFormRevision: (state, action) => {
-      delete state.revisions[action.payload];
-      delete LATEST_REVISION_CACHE[action.payload];
+    addFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload.offline_id] !== void 0) {
+        throw new Error(`Revision with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formRevisions[action.payload.offline_id] = action.payload;
+      considerCachingFormRevision(action.payload);
     },
-    deleteUserFormRevisions: (state, action) => {
+    // TODO: @Audiopolis / Magnus - do we want to standardize using PayloadAction?
+    addFormRevisions: (state, action) => {
       for (const userFormRevision of action.payload) {
-        delete state.revisions[userFormRevision.offline_id];
-        delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
+        if (state.formRevisions[userFormRevision.offline_id] !== void 0) {
+          throw new Error(`Revision with offline_id ${userFormRevision.offline_id} already exists`);
+        }
+      }
+      for (const userFormRevision of action.payload) {
+        state.formRevisions[userFormRevision.offline_id] = userFormRevision;
+        considerCachingFormRevision(userFormRevision);
       }
     },
-    updateOrCreateUserFormSubmission: (state, action) => {
-      state.submissions[action.payload.offline_id] = action.payload;
-    },
-    addUserFormSubmissionAttachment: (state, action) => {
-      const submissionId = action.payload.submission;
-      const submissionAttachments = state.submissionAttachments[submissionId];
-      if (submissionAttachments) {
-        submissionAttachments.push(action.payload);
-      } else {
-        state.submissionAttachments[submissionId] = [action.payload];
+    // UserFormRevisions do not get updated
+    deleteFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload] === void 0) {
+        throw new Error(`Revision with offline_id ${action.payload} does not exist`);
       }
+      delete state.formRevisions[action.payload];
+      delete LATEST_FORM_REVISION_CACHE[action.payload];
     },
-    addUserFormRevisionAttachment: (state, action) => {
-      const revisionId = action.payload.revision;
-      const revisionAttachments = state.revisionAttachments[revisionId];
-      if (revisionAttachments) {
-        revisionAttachments.push(action.payload);
-      } else {
-        state.revisionAttachments[revisionId] = [action.payload];
+    deleteFormRevisions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formRevisions[offlineId] === void 0) {
+          throw new Error(`Revision with offline_id ${offlineId} does not exist`);
+        }
+      }
+      for (const offlineId of action.payload) {
+        delete state.formRevisions[offlineId];
+        delete LATEST_FORM_REVISION_CACHE[offlineId];
       }
     },
-    setUserFormSubmissionAttachments: (state, action) => {
-      state.submissionAttachments = {};
+    // attachment related actions
+    setFormRevisionAttachments: (state, action) => {
+      state.attachments = {};
       for (const attachment of action.payload) {
-        const submissionId = attachment.submission;
-        const submissionAttachments = state.submissionAttachments[submissionId];
-        if (submissionAttachments) {
-          submissionAttachments.push(attachment);
-        } else {
-          state.submissionAttachments[submissionId] = [attachment];
-        }
+        state.attachments[attachment.offline_id] = attachment;
       }
     },
-    setUserFormRevisionAttachments: (state, action) => {
-      state.revisionAttachments = {};
+    addFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
+    },
+    addFormRevisionAttachments: (state, action) => {
       for (const attachment of action.payload) {
-        const revisionId = attachment.revision;
-        const revisionAttachments = state.revisionAttachments[revisionId];
-        if (revisionAttachments) {
-          revisionAttachments.push(attachment);
-        } else {
-          state.revisionAttachments[revisionId] = [attachment];
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
         }
       }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
     },
-    deleteUserFormSubmission: (state, action) => {
-      delete state.submissions[action.payload];
-    },
-    deleteUserFormSubmissions: (state, action) => {
-      for (const userFormSubmission of action.payload) {
-        delete state.submissions[userFormSubmission.offline_id];
+    deleteFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload] === void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
       }
+      delete state.attachments[action.payload];
     },
-    addUserFormSubmissions: (state, action) => {
-      for (const submission of action.payload) {
-        state.submissions[submission.offline_id] = submission;
+    deleteFormRevisionAttachments: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.attachments[offlineId] === void 0) {
+          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+        }
+      }
+      for (const offlineId of action.payload) {
+        delete state.attachments[offlineId];
       }
+    }
+  }
+});
+const {
+  setFormRevision,
+  setFormRevisions,
+  addFormRevision,
+  addFormRevisions,
+  deleteFormRevision,
+  deleteFormRevisions,
+  setFormRevisionAttachments,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments
+} = formRevisionsSlice.actions;
+const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
+const selectFormRevisions = createSelector(
+  [selectFormRevisionMapping],
+  (formRevisions) => Object.values(formRevisions)
+);
+const selectFormRevision = (formRevisionId) => (state) => {
+  return state.formRevisionReducer.formRevisions[formRevisionId];
+};
+const _selectLatestFormRevision = (formRevisions, formId2) => {
+  let ret = null;
+  for (const candidate of Object.values(formRevisions)) {
+    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
+      ret = candidate;
+    }
+  }
+  if (!ret) {
+    throw new Error("No form revision found for form " + formId2);
+  }
+  return ret;
+};
+const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisionMapping, (_state, formId2) => formId2], (revisions, formId2) => {
+    if (!formId2) {
+      throw new Error("formId is required");
+    }
+    return _selectLatestFormRevision(revisions, formId2);
+  })
+);
+const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+    return revisions.filter((revision) => {
+      return revision.form === formId2;
+    });
+  })
+);
+const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      (state) => state.formReducer.forms,
+      selectFormRevisionMapping,
+      (_state, componentTypeIds) => componentTypeIds
+    ],
+    (userForms, revisions, componentTypeIds) => {
+      const componentTypeIdsSet = new Set(componentTypeIds);
+      const ret = {};
+      for (const form of Object.values(userForms)) {
+        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
+          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
+        }
+      }
+      return ret;
+    }
+  )
+);
+const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping], (revisions) => {
+  const latestRevisions = {};
+  for (const revision of Object.values(revisions)) {
+    const formId2 = revision.form;
+    const currentLatestRevision = latestRevisions[formId2];
+    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
+      latestRevisions[formId2] = revision;
+    }
+  }
+  return latestRevisions;
+});
+const selectUserFormRevisionAttachmentsMapping = (state) => {
+  return state.formRevisionReducer.attachments;
+};
+const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
+    (attachments, revisionId) => {
+      return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
+    }
+  )
+);
+const formRevisionReducer = formRevisionsSlice.reducer;
+const initialState$4 = {
+  forms: {}
+};
+const formSlice = createSlice({
+  name: "forms",
+  initialState: initialState$4,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  reducers: {
+    setForms: (state, action) => {
+      state.forms = {};
+      action.payload.forEach((userForm) => {
+        state.forms[userForm.offline_id] = userForm;
+      });
+    },
+    addForm: (state, action) => {
+      state.forms[action.payload.offline_id] = action.payload;
     },
-    setUserFormSubmissions: (state, action) => {
-      state.submissions = {};
-      action.payload.forEach((submission) => {
-        state.submissions[submission.offline_id] = submission;
+    addForms: (state, action) => {
+      action.payload.forEach((userForm) => {
+        state.forms[userForm.offline_id] = userForm;
       });
     },
     favoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
@@ -3559,48 +3697,23 @@ const userFormSlice = createSlice({
     },
     unfavoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
       form.favorite = false;
     },
-    deleteUserForm: (state, action) => {
-      delete state.userForms[action.payload];
+    deleteForm: (state, action) => {
+      delete state.forms[action.payload];
     }
   }
 });
-const {
-  addUserForm,
-  addUserForms,
-  addUserFormRevisions,
-  updateOrCreateUserFormSubmission,
-  addUserFormSubmissions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
-  favoriteForm,
-  unfavoriteForm,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  setUserFormSubmissions,
-  addUserFormRevision,
-  addUserFormSubmissionAttachment,
-  addUserFormRevisionAttachment,
-  setUserFormSubmissionAttachments,
-  setUserFormRevisionAttachments
-} = userFormSlice.actions;
-const selectSubmissionAttachments = (submissionId) => (state) => {
-  return state.userFormReducer.submissionAttachments[submissionId] || [];
-};
-const selectRevisionAttachments = (revisionId) => (state) => {
-  return state.userFormReducer.revisionAttachments[revisionId] || [];
-};
-const selectFilteredUserForms = restructureCreateSelectorWithArgs(
+const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = formSlice.actions;
+const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
-      (state) => state.userFormReducer.userForms,
-      (state) => state.userFormReducer.revisions,
+      (state) => state.formReducer.forms,
+      (state) => state.formRevisionReducer.formRevisions,
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
@@ -3634,63 +3747,188 @@ const selectFilteredUserForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual$1 } }
   )
 );
-const selectFormRevision = (revisionId) => (state) => {
-  return state.userFormReducer.revisions[revisionId];
+const selectForm = (formId2) => (state) => {
+  return state.formReducer.forms[formId2];
 };
-const _selectLatestFormRevision = (revisions, formId2) => {
-  let ret = null;
-  for (const candidate of Object.values(revisions)) {
-    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
-      ret = candidate;
-    }
-  }
-  if (!ret) {
-    throw new Error("No revision found for form " + formId2);
-  }
-  return ret;
+const selectFormMapping = (state) => {
+  return state.formReducer.forms;
 };
-const selectLatestFormRevision = restructureCreateSelectorWithArgs(
+const selectFormOfComponentType = restructureCreateSelectorWithArgs(
   createSelector(
-    [(state) => state.userFormReducer.revisions, (_state, formId2) => formId2],
-    (revisions, formId2) => {
-      if (!formId2) {
-        throw new Error("formId is required");
-      }
-      return _selectLatestFormRevision(revisions, formId2);
+    [selectFormMapping, (_state, componentTypeId) => componentTypeId],
+    (userForms, componentTypeId) => {
+      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
     }
   )
 );
-const selectUserForm = (formId2) => (state) => {
-  return state.userFormReducer.userForms[formId2];
-};
-const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
-const selectUserFormSubmission = (submissionId) => (state) => {
-  return state.userFormReducer.submissions[submissionId];
-};
-const selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
-const selectRevisionMapping = (state) => state.userFormReducer.revisions;
-const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
-const selectRevisionsForForm = restructureCreateSelectorWithArgs(
-  createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
-    return revisions.filter((revision) => {
-      return revision.form === formId2;
-    });
-  })
+const selectFormsCount = createSelector([selectFormMapping], (userForms) => {
+  return Object.keys(userForms).length;
+});
+const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
+  return Object.values(userForms).filter((form) => !form.component_type).length;
+});
+const formReducer = formSlice.reducer;
+const initialState$3 = {
+  formSubmissions: {},
+  attachments: {}
+};
+const formSubmissionSlice = createSlice({
+  name: "formSubmissions",
+  initialState: initialState$3,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  reducers: {
+    setFormSubmission: (state, action) => {
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    setFormSubmissions: (state, action) => {
+      state.formSubmissions = {};
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    addFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload.offline_id] !== void 0) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] !== void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} already exists`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    updateFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload.offline_id] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} does not exist`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    updateFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] === void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} does not exist`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    deleteFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload} does not exist`);
+      }
+      delete state.formSubmissions[action.payload];
+    },
+    deleteFormSubmissions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formSubmissions[offlineId] === void 0) {
+          throw new Error(`Submission with offline_id ${offlineId} does not exist`);
+        }
+        delete state.formSubmissions[offlineId];
+      }
+      for (const offlineId of action.payload) {
+        delete state.formSubmissions[offlineId];
+      }
+    },
+    // Attachments
+    addFormSubmissionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
+        }
+      }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    // We only need a multi set for attachments because they are not updated, only added and deleted
+    setFormSubmissionAttachments: (state, action) => {
+      state.attachments = {};
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    updateFormSubmissionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] === void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} does not exist`);
+        }
+      }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    // The delete actions for UserFormSubmissionAttachments are not used in the app, but are included for completeness
+    // Could be used if editing a submission is ever supported, will be applicable for supporting tip tap content in submissions
+    deleteFormSubmissionAttachment: (state, action) => {
+      if (state.attachments[action.payload] === void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
+      }
+      delete state.attachments[action.payload];
+    },
+    deleteFormSubmissionAttachments: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.attachments[offlineId] === void 0) {
+          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+        }
+        delete state.attachments[offlineId];
+      }
+    }
+  }
+});
+const {
+  setFormSubmission,
+  setFormSubmissions,
+  addFormSubmission,
+  addFormSubmissions,
+  updateFormSubmission,
+  updateFormSubmissions,
+  deleteFormSubmission,
+  deleteFormSubmissions,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  setFormSubmissionAttachments,
+  updateFormSubmissionAttachments,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments
+} = formSubmissionSlice.actions;
+const selectFormSubmissionsMapping = (state) => {
+  return state.formSubmissionReducer.formSubmissions;
+};
+const selectFormSubmissions = createSelector(
+  [selectFormSubmissionsMapping],
+  (submissions) => {
+    return Object.values(submissions);
+  }
 );
-const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
+const selectFormSubmission = (submissionId) => (state) => {
+  return state.formSubmissionReducer.formSubmissions[submissionId];
+};
+const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectSubmissions, selectRevisionMapping, (_state, formId2) => formId2],
+    [selectFormSubmissions, selectFormRevisionMapping, (_state, formId2) => formId2],
     (submissions, revisionMapping, formId2) => {
-      return Object.values(submissions).filter((submission) => {
+      return submissions.filter((submission) => {
         const revision = revisionMapping[submission.form_revision];
         return (revision == null ? void 0 : revision.form) === formId2;
       });
     }
   )
 );
-const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
+const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
-    [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
+    [selectFormSubmissions, (_state, issueId) => issueId],
     (submissions, issueId) => {
       return Object.values(submissions).filter((submission) => {
         return submission.issue === issueId;
@@ -3698,9 +3936,9 @@ const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
+const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectSubmissions, (_state, componentId) => componentId],
+    [selectFormSubmissions, (_state, componentId) => componentId],
     (submissions, componentId) => {
       return submissions.filter((submission) => {
         return submission.component === componentId;
@@ -3708,8 +3946,8 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectComponentSubmissionMapping = createSelector(
-  [selectSubmissionMapping, selectComponentsMapping],
+const selectFormSubmissionsByComponents = createSelector(
+  [selectFormSubmissionsMapping, selectComponentsMapping],
   (submissions, components) => {
     var _a2;
     const componentSubmissionMapping = {};
@@ -3725,54 +3963,18 @@ const selectComponentSubmissionMapping = createSelector(
     return componentSubmissionMapping;
   }
 );
-const selectUserFormMapping = (state) => {
-  return state.userFormReducer.userForms;
+const selectFormSubmissionAttachmentsMapping = (state) => {
+  return state.formSubmissionReducer.attachments;
 };
-const selectComponentTypeForm = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
-    (userForms, componentTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
-    }
-  )
-);
-const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithArgs(
+const selectAttachmentsOfFormSubmission = restructureCreateSelectorWithArgs(
   createSelector(
-    [
-      selectUserFormMapping,
-      selectRevisionMapping,
-      (_state, componentTypeIds) => componentTypeIds
-    ],
-    (userForms, revisions, componentTypeIds) => {
-      const componentTypeIdsSet = new Set(componentTypeIds);
-      const ret = {};
-      for (const form of Object.values(userForms)) {
-        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
-          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
-        }
-      }
-      return ret;
+    [selectFormSubmissionAttachmentsMapping, (_state, submissionId) => submissionId],
+    (attachmentsMapping, submissionId) => {
+      return Object.values(attachmentsMapping).filter((attachment) => attachment.submission === submissionId);
     }
   )
 );
-const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (revisions) => {
-  const latestRevisions = {};
-  for (const revision of Object.values(revisions)) {
-    const formId2 = revision.form;
-    const currentLatestRevision = latestRevisions[formId2];
-    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
-      latestRevisions[formId2] = revision;
-    }
-  }
-  return latestRevisions;
-});
-const selectNumberOfUserForms = createSelector([selectUserFormMapping], (userForms) => {
-  return Object.keys(userForms).length;
-});
-const selectNumberOfGeneralUserForms = createSelector([selectUserFormMapping], (userForms) => {
-  return Object.values(userForms).filter((form) => !form.component_type).length;
-});
-const userFormReducer = userFormSlice.reducer;
+const formSubmissionReducer = formSubmissionSlice.reducer;
 const initialState$2 = {
   emailDomains: {}
 };
@@ -3806,7 +4008,8 @@ const selectSortedEmailDomains = (state) => Object.values(state.emailDomainsRedu
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
 const initialState$1 = {
-  documents: {}
+  documents: {},
+  attachments: {}
 };
 const documentSlice = createSlice({
   name: "documents",
@@ -3943,10 +4146,28 @@ const documentSlice = createSlice({
         }
         delete state.documents[documentId];
       }
-    }
+    },
+    setDocumentAttachments: setAttachments,
+    addDocumentAttachment: addAttachment,
+    addDocumentAttachments: addAttachments,
+    updateDocumentAttachment: updateAttachment,
+    removeDocumentAttachment: removeAttachment,
+    removeDocumentAttachments: removeAttachments
   }
 });
-const { setDocuments, addDocuments, updateDocuments, moveDocument, removeDocuments } = documentSlice.actions;
+const {
+  setDocuments,
+  addDocuments,
+  updateDocuments,
+  moveDocument,
+  removeDocuments,
+  setDocumentAttachments,
+  addDocumentAttachment,
+  addDocumentAttachments,
+  updateDocumentAttachment,
+  removeDocumentAttachment,
+  removeDocumentAttachments
+} = documentSlice.actions;
 const selectDocumentsMapping = (state) => state.documentsReducer.documents;
 const selectDocuments = createSelector(
   [selectDocumentsMapping],
@@ -3976,6 +4197,39 @@ const selectRootDocuments = createSelector(
   [selectDocuments],
   (documents) => documents.filter((document2) => !document2.parent_document)
 );
+const selectDocumentAttachmentMapping = (state) => state.documentsReducer.attachments;
+const selectAllDocumentAttachments = createSelector(
+  [selectDocumentAttachmentMapping],
+  (mapping) => Object.values(mapping)
+);
+const selectDocumentAttachment = (attachmentId) => (state) => {
+  return state.documentsReducer.attachments[attachmentId];
+};
+const selectAttachmentsOfDocument = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAllDocumentAttachments, (_state, documentId) => documentId],
+    (attachments, documentId) => {
+      return attachments.filter(({ document: document2 }) => documentId === document2);
+    }
+  )
+);
+const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAllDocumentAttachments, (_state, documentId) => documentId],
+    (attachments, documentId) => {
+      const attachmentsOfProject = attachments.filter(({ document: document2 }) => documentId === document2);
+      const fileAttachments = attachmentsOfProject.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+      );
+      const imageAttachments = attachmentsOfProject.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => file_type && file_type.startsWith("image/")
+      );
+      return { fileAttachments, imageAttachments };
+    }
+  )
+);
 const documentsReducer = documentSlice.reducer;
 const initialState = {
   version: 0
@@ -4018,7 +4272,9 @@ const overmapReducers = {
   projectFileReducer,
   rehydratedReducer,
   settingReducer,
-  userFormReducer,
+  formReducer,
+  formRevisionReducer,
+  formSubmissionReducer,
   userReducer,
   workspaceReducer,
   emailDomainsReducer,
@@ -4071,9 +4327,7 @@ 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.userFormReducer.userForms).filter(
-    (form) => form.index_workspace === workspaceId
-  );
+  const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
   for (const form of indexedForms) {
     form.index_workspace = mainWorkspace.offline_id;
   }
@@ -4551,6 +4805,23 @@ class BaseApiService {
   }
 }
 class AttachmentService extends BaseApiService {
+  processPresignedUrls(presignedUrls) {
+    for (const [sha1, presignedUrl] of Object.entries(presignedUrls)) {
+      console.debug(sha1, presignedUrl);
+      void this.enqueueRequest({
+        url: presignedUrl.url,
+        description: "Upload file to S3",
+        method: HttpMethod.POST,
+        isExternalUrl: true,
+        isAuthNeeded: false,
+        attachmentHash: sha1,
+        // TODO: can we use the sha1 as the blocker?
+        blockers: [`s3-${sha1}`],
+        blocks: [sha1],
+        s3url: presignedUrl
+      });
+    }
+  }
   fetchAll(projectId) {
     const promise = this.enqueueRequest({
       description: "Fetch attachments",
@@ -4564,7 +4835,8 @@ class AttachmentService extends BaseApiService {
       issue_attachments: Object.values(state.issueReducer.attachments),
       component_attachments: Object.values(state.componentReducer.attachments),
       component_type_attachments: Object.values(state.componentTypeReducer.attachments),
-      project_attachments: Object.values(state.projectReducer.attachments)
+      project_attachments: Object.values(state.projectReducer.attachments),
+      document_attachments: Object.values(state.documentsReducer.attachments)
     };
     return [allAttachments, promise];
   }
@@ -4576,6 +4848,7 @@ class AttachmentService extends BaseApiService {
     }
     const offlineAttachment = {
       ...attachmentPayload,
+      // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
       file_type: attachmentPayload.file.type,
@@ -4609,6 +4882,7 @@ class AttachmentService extends BaseApiService {
     }
     const offlineAttachment = {
       ...attachmentPayload,
+      // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
       file_type: attachmentPayload.file.type,
@@ -4642,6 +4916,7 @@ class AttachmentService extends BaseApiService {
     }
     const offlineAttachment = {
       ...attachmentPayload,
+      // TODO: just handle creating the objectURL in here, then the front end doesn't need to worry about it
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
       file_type: attachmentPayload.file.type,
@@ -4668,8 +4943,8 @@ class AttachmentService extends BaseApiService {
     });
     return [offlineAttachment, promise];
   }
-  async addProjectAttachment(attachmentPayload) {
-    const { description: description2, project, file_sha1, offline_id } = attachmentPayload;
+  async addDocumentAttachment(attachmentPayload) {
+    const { description: description2, document: document2, file_sha1, offline_id } = attachmentPayload;
     if (!attachmentPayload.file.objectURL) {
       throw new Error("Expected attachmentPayload.file.objectURL to be defined.");
     }
@@ -4682,24 +4957,24 @@ class AttachmentService extends BaseApiService {
       created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
-    this.client.store.dispatch(addProjectAttachment(offlineAttachment));
+    this.client.store.dispatch(addDocumentAttachment(offlineAttachment));
     const [fileProps] = await this.client.files.uploadFileToS3(file_sha1);
     const promise = this.enqueueRequest({
       description: "Create attachment",
       method: HttpMethod.POST,
-      url: `/projects/${project}/attach/`,
-      blocks: [offline_id, project.toString()],
+      url: `/documents/${document2}/attach/`,
+      blocks: [offline_id, document2],
       blockers: [file_sha1],
       payload: {
         offline_id,
-        project,
+        document: document2,
         description: description2 ?? "",
         submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
         ...fileProps
       }
     });
     promise.catch((error2) => {
-      this.client.store.dispatch(removeProjectAttachment(offlineAttachment.offline_id));
+      this.client.store.dispatch(removeDocumentAttachment(offlineAttachment.offline_id));
       throw error2;
     });
     return [offlineAttachment, promise];
@@ -4707,26 +4982,54 @@ class AttachmentService extends BaseApiService {
   /** the outer Promise is needed to await the hashing of each file, which is required before offline use. If wanting to
    * attach promise handlers to the request to add the attachment in the backend, apply it on the promise returned from the
    * OptimisticModelResult. */
-  attachFilesToIssue(filesToSubmit, issueId) {
-    return filesToSubmit.map((file) => {
-      if (!(file instanceof File)) {
-        throw new Error("Expected a File instance.");
-      }
-      const photoAttachmentPromise = async (file2) => {
-        const hash = await hashFile(file2);
-        const attachment = offline({
-          file: file2,
-          file_name: file2.name,
-          file_type: file2.type,
-          issue: issueId,
-          file_sha1: hash,
-          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-          created_by: this.client.store.getState().userReducer.currentUser.id
-        });
-        return this.addIssueAttachment(attachment);
-      };
-      return photoAttachmentPromise(file);
+  // note the method is only marked as async since files needs to be hashed
+  async attachFilesToIssue(files, issueId) {
+    const { store } = this.client;
+    const offlineAttachments = [];
+    const attachmentsPayload = [];
+    const currentUser = store.getState().userReducer.currentUser;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    for (const file of files) {
+      const attachment = offline({
+        file: URL.createObjectURL(file),
+        file_name: file.name,
+        file_type: file.type,
+        file_sha1: await hashFile(file),
+        description: "",
+        submitted_at: submittedAt,
+        created_by: currentUser.id,
+        issue: issueId
+      });
+      attachmentsPayload.push({
+        offline_id: attachment.offline_id,
+        name: attachment.file_name,
+        sha1: attachment.file_sha1,
+        description: attachment.description,
+        created_by: attachment.created_by,
+        issue_id: attachment.issue
+      });
+      offlineAttachments.push(attachment);
+    }
+    store.dispatch(addIssueAttachments(offlineAttachments));
+    const promise = this.enqueueRequest({
+      description: "Attach files to issue",
+      method: HttpMethod.POST,
+      url: `/issues/${issueId}/attach/`,
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentsPayload,
+        files: await constructUploadedFilePayloads(files)
+      },
+      blocks: offlineAttachments.map((attachment) => attachment.offline_id),
+      blockers: offlineAttachments.map((attachment) => attachment.file_sha1)
+    });
+    promise.then(({ attachments, presigned_urls }) => {
+      store.dispatch(updateIssueAttachments(attachments));
+      this.processPresignedUrls(presigned_urls);
+    }).catch(() => {
+      store.dispatch(removeIssueAttachments(offlineAttachments.map((attachment) => attachment.offline_id)));
     });
+    return [offlineAttachments, promise.then(({ attachments }) => attachments)];
   }
   attachFilesToComponent(filesToSubmit, componentId) {
     return filesToSubmit.map((file) => {
@@ -4770,7 +5073,7 @@ class AttachmentService extends BaseApiService {
       return photoAttachmentPromise(file);
     });
   }
-  attachFilesToProject(filesToSubmit, projectId) {
+  attachFilesToDocument(filesToSubmit, documentId) {
     return filesToSubmit.map((file) => {
       if (!(file instanceof File)) {
         throw new Error("Expected a File instance.");
@@ -4781,12 +5084,12 @@ class AttachmentService extends BaseApiService {
           file: file2,
           file_name: file2.name,
           file_type: file2.type,
-          project: projectId,
+          document: documentId,
           file_sha1: hash,
           submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
           created_by: this.client.store.getState().userReducer.currentUser.id
         });
-        return this.addProjectAttachment(attachment);
+        return this.addDocumentAttachment(attachment);
       };
       return photoAttachmentPromise(file);
     });
@@ -4966,9 +5269,9 @@ class AttachmentService extends BaseApiService {
     const promise = performRequest2();
     return [offlineAttachment, promise];
   }
-  async replaceProjectAttachmentFile(attachmentId, newFile) {
+  async replaceDocumentAttachmentFile(attachmentId, newFile) {
     const { store } = this.client;
-    const attachment = store.getState().projectReducer.attachments[attachmentId];
+    const attachment = store.getState().documentsReducer.attachments[attachmentId];
     if (!attachment)
       throw new Error(`Attachment ${attachmentId} not found`);
     let oldFile = void 0;
@@ -4982,7 +5285,7 @@ class AttachmentService extends BaseApiService {
         throw new Error(`newFile["objectURL"] is unexpectedly ${newFile.objectURL}`);
       }
       store.dispatch(
-        updateProjectAttachment({
+        updateDocumentAttachment({
           ...attachment,
           file_sha1: newSha1,
           file: URL.createObjectURL(newFile)
@@ -4990,13 +5293,13 @@ class AttachmentService extends BaseApiService {
       );
       await this.client.files.addCache(newFile, newSha1);
       const [fileProps] = await this.client.files.uploadFileToS3(newSha1).catch((e) => {
-        store.dispatch(updateProjectAttachment(attachment));
+        store.dispatch(updateDocumentAttachment(attachment));
         throw e;
       });
       const promise2 = this.enqueueRequest({
         description: "Edit attachment",
         method: HttpMethod.PATCH,
-        url: `/attachments/projects/${attachment.offline_id}/`,
+        url: `/attachments/documents/${attachment.offline_id}/`,
         isResponseBlob: false,
         payload: fileProps,
         blockers: [attachmentId, newSha1],
@@ -5009,7 +5312,7 @@ class AttachmentService extends BaseApiService {
       } catch (e) {
         if (oldFile) {
           store.dispatch(
-            updateProjectAttachment({
+            updateDocumentAttachment({
               ...attachment,
               file_sha1: attachment.file_sha1,
               file: URL.createObjectURL(oldFile)
@@ -5079,20 +5382,20 @@ class AttachmentService extends BaseApiService {
       blocks: [componentTypeAttachmentId]
     });
   }
-  deleteProjectAttachment(projectAttachmentId) {
+  deleteDocumentAttachment(documentAttachmentId) {
     const { store } = this.client;
-    const attachment = selectProjectAttachmentMapping(store.getState())[projectAttachmentId];
+    const attachment = store.getState().documentsReducer.attachments[documentAttachmentId];
     if (!attachment) {
-      throw new Error(`Attachment ${projectAttachmentId} not found`);
+      throw new Error(`Attachment ${documentAttachmentId} not found`);
     }
-    store.dispatch(removeProjectAttachment(projectAttachmentId));
+    store.dispatch(removeDocumentAttachment(documentAttachmentId));
     void this.client.files.removeCache(attachment.file_sha1);
     return this.enqueueRequest({
-      description: "Delete attachment",
+      description: "Delete document attachment",
       method: HttpMethod.DELETE,
-      url: `/attachments/projects/${projectAttachmentId}/`,
-      blockers: [projectAttachmentId],
-      blocks: [projectAttachmentId]
+      url: `/attachments/documents/${documentAttachmentId}/`,
+      blockers: [documentAttachmentId],
+      blocks: [documentAttachmentId]
     });
   }
 }
@@ -6330,11 +6633,18 @@ class MainService extends BaseApiService {
     if (currentProjectId) {
       const [_offlineAttachments, promise] = this.client.attachments.fetchAll(currentProjectId);
       void promise.then((result) => {
-        const { issue_attachments, component_type_attachments, component_attachments, project_attachments } = result;
+        const {
+          issue_attachments,
+          component_type_attachments,
+          component_attachments,
+          project_attachments,
+          document_attachments
+        } = result;
         store.dispatch(setIssueAttachments(issue_attachments));
         store.dispatch(setComponentAttachments(component_attachments));
         store.dispatch(setComponentTypeAttachments(component_type_attachments));
         store.dispatch(setProjectAttachments(project_attachments));
+        store.dispatch(setDocumentAttachments(document_attachments));
       });
       void this.client.documents.refreshStore();
       void this.client.issueUpdates.refreshStore();
@@ -6702,7 +7012,7 @@ class UserFormService extends BaseApiService {
           ...revisionAttachmentPayload,
           file: URL.createObjectURL(image)
         };
-        store.dispatch(addUserFormRevisionAttachment(offlinePayload));
+        store.dispatch(addFormRevisionAttachment(offlinePayload));
         return attach;
       });
     });
@@ -6736,8 +7046,8 @@ class UserFormService extends BaseApiService {
       revision: 0
     };
     const { store } = this.client;
-    store.dispatch(addUserForm(retForm));
-    store.dispatch(addUserFormRevision(retRevision));
+    store.dispatch(addForm(retForm));
+    store.dispatch(addFormRevision(retRevision));
     const formPromise = this.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
@@ -6755,8 +7065,8 @@ class UserFormService extends BaseApiService {
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
     void formPromise.catch((e) => {
-      store.dispatch(deleteUserForm(retForm.offline_id));
-      store.dispatch(deleteUserFormRevision(retRevision.offline_id));
+      store.dispatch(deleteForm(retForm.offline_id));
+      store.dispatch(deleteFormRevision(retRevision.offline_id));
       throw e;
     });
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
@@ -6798,7 +7108,7 @@ class UserFormService extends BaseApiService {
       revision: "Pending",
       form: formId2
     };
-    store.dispatch(addUserFormRevision(fullRevision));
+    store.dispatch(addFormRevision(fullRevision));
     const promise = this.enqueueRequest({
       description: "Create form revision",
       method: HttpMethod.PATCH,
@@ -6812,9 +7122,9 @@ class UserFormService extends BaseApiService {
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
     void promise.then((result) => {
-      store.dispatch(addUserFormRevision(result));
+      store.dispatch(setFormRevision(result));
     }).catch(() => {
-      store.dispatch(deleteUserFormRevision(fullRevision.offline_id));
+      store.dispatch(deleteFormRevision(fullRevision.offline_id));
     });
     const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
     return [fullRevision, settledPromise];
@@ -6856,19 +7166,19 @@ class UserFormService extends BaseApiService {
   async delete(formId2) {
     const { store } = this.client;
     const state = store.getState();
-    const userForm = selectUserForm(formId2)(state);
+    const userForm = selectForm(formId2)(state);
     if (!userForm) {
       throw new Error("Expected userForm to exist");
     }
-    const userFormSubmissions = selectSubmissionsForForm(formId2)(state);
+    const userFormSubmissions = selectFormSubmissionsOfForm(formId2)(state);
     if (userFormSubmissions && userFormSubmissions.length > 0) {
-      store.dispatch(deleteUserFormSubmissions(userFormSubmissions));
+      store.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
     }
-    const userFormRevisions = selectRevisionsForForm(formId2)(state);
+    const userFormRevisions = selectFormRevisionsOfForm(formId2)(state);
     if (userFormRevisions && userFormRevisions.length > 0) {
-      store.dispatch(deleteUserFormRevisions(userFormRevisions));
+      store.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
     }
-    store.dispatch(deleteUserForm(formId2));
+    store.dispatch(deleteForm(formId2));
     try {
       return await this.enqueueRequest({
         description: "Delete form",
@@ -6878,12 +7188,12 @@ class UserFormService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      store.dispatch(addUserForm(userForm));
+      store.dispatch(addForm(userForm));
       if (userFormRevisions && userFormRevisions.length > 0) {
-        store.dispatch(addUserFormRevisions(userFormRevisions));
+        store.dispatch(addFormRevisions(userFormRevisions));
       }
       if (userFormSubmissions && userFormSubmissions.length > 0) {
-        store.dispatch(addUserFormSubmissions(userFormSubmissions));
+        store.dispatch(addFormSubmissions(userFormSubmissions));
       }
       throw e;
     }
@@ -6897,16 +7207,15 @@ class UserFormService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(addUserForms(Object.values(result.forms)));
-    store.dispatch(addUserFormRevisions(Object.values(result.revisions)));
-    store.dispatch(setUserFormRevisionAttachments(Object.values(result.attachments)));
+    store.dispatch(setForms(Object.values(result.forms)));
+    store.dispatch(setFormRevisions(Object.values(result.revisions)));
+    store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
   }
 }
 const isArrayOfFiles = (value) => {
   return Array.isArray(value) && value[0] instanceof File;
 };
-const separateFilesFromValues = (payload) => {
-  const { values } = payload;
+const separateFilesFromValues = (values) => {
   const files = {};
   const newValues = {};
   for (const key in values) {
@@ -6921,17 +7230,13 @@ const separateFilesFromValues = (payload) => {
       newValues[key] = value;
     }
   }
-  const payloadWithoutFiles = {
-    ...payload,
-    values: newValues
-  };
-  return { payloadWithoutFiles, files };
+  return { values: newValues, files };
 };
 class UserFormSubmissionService extends BaseApiService {
   constructor() {
     super(...arguments);
     // Attach files to submission, after uploading them to S3
-    __publicField(this, "getAttachFilesPromises", (files, payload) => {
+    __publicField(this, "getAttachFilesPromises", (files, submission) => {
       const { store } = this.client;
       return Object.entries(files).map(async ([key, fileArray]) => {
         const attachResults = [];
@@ -6941,24 +7246,27 @@ class UserFormSubmissionService extends BaseApiService {
           const [fileProps] = await this.client.files.uploadFileToS3(sha1);
           const submissionAttachmentPayload = offline({
             ...fileProps,
-            submission: payload.offline_id,
+            submission: submission.offline_id,
             field_identifier: key
           });
           const attach = await this.enqueueRequest({
             description: "Attach file to form submission",
             method: HttpMethod.POST,
-            url: `/forms/submission/${payload.offline_id}/attachments/`,
+            url: `/forms/submission/${submission.offline_id}/attachments/`,
             payload: submissionAttachmentPayload,
-            blockers: [payload.component, payload.component_stage, payload.issue, payload.form_revision].filter(
-              (x) => x !== void 0
-            ),
+            blockers: [
+              submission.component,
+              submission.component_stage,
+              submission.issue,
+              submission.form_revision
+            ].filter((x) => x !== void 0),
             blocks: [submissionAttachmentPayload.offline_id]
           });
           const offlinePayload = {
             ...submissionAttachmentPayload,
             file: URL.createObjectURL(file)
           };
-          store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
+          store.dispatch(addFormSubmissionAttachment(offlinePayload));
           attachResults.push(attach);
         }
         return attachResults;
@@ -6972,70 +7280,165 @@ class UserFormSubmissionService extends BaseApiService {
     if (!activeProjectId) {
       throw new Error("Expected an active project");
     }
-    const { payloadWithoutFiles, files } = separateFilesFromValues(payload);
+    const { values, files } = separateFilesFromValues(payload.values);
+    const offlineSubmission = {
+      ...payload,
+      values,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    };
     const promise = this.enqueueRequest({
       description: "Respond to form",
       method: HttpMethod.POST,
       url: `/forms/revisions/${payload.form_revision}/respond/`,
-      payload: { ...payloadWithoutFiles, project: activeProjectId },
+      payload: { ...offlineSubmission, project: activeProjectId },
       blockers: [payload.issue, payload.component, payload.component_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
       blocks: [payload.offline_id]
     });
-    const attachFilesPromises = this.getAttachFilesPromises(files, payload);
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const fullOfflineResult = {
-      ...payload,
-      created_by: state.userReducer.currentUser.id,
-      created_at: now,
-      updated_at: now
-    };
-    const offlineResultWithoutFiles = {
-      ...fullOfflineResult,
-      ...payloadWithoutFiles
-    };
-    store.dispatch(updateOrCreateUserFormSubmission(offlineResultWithoutFiles));
+    const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
+    store.dispatch(addFormSubmission(offlineSubmission));
     void promise.then((result) => {
       store.dispatch(addActiveProjectFormSubmissionsCount(1));
-      store.dispatch(updateOrCreateUserFormSubmission(result));
+      store.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
-      store.dispatch(deleteUserFormSubmission(payload.offline_id));
+      store.dispatch(deleteFormSubmission(payload.offline_id));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
     const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-    return [fullOfflineResult, settledPromise];
+    return [offlineSubmission, settledPromise];
   }
-  update(submission) {
+  // Note currently the bulkAdd method is specific to form submissions for components
+  // TODO: adapt the support bulk adding to any model type
+  async bulkAdd(args) {
+    const { form_revision, values: argsValues, componentOfflineIds } = args;
     const { store } = this.client;
-    const { payloadWithoutFiles, files } = separateFilesFromValues(submission);
-    if (!("created_by" in payloadWithoutFiles) || !("created_at" in payloadWithoutFiles)) {
-      throw new Error("Expected payloadWithoutFiles to have created_by and created_at fields.");
+    const offlineSubmissions = [];
+    const offlineAttachments = [];
+    const submissionOfflineIds = [];
+    const submissionsPayload = [];
+    const attachmentsPayload = [];
+    const { values, files } = separateFilesFromValues(argsValues);
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = store.getState().userReducer.currentUser.id;
+    for (const component_id of componentOfflineIds) {
+      const submission = offline({
+        form_revision,
+        values,
+        created_by: createdBy,
+        submitted_at: submittedAt,
+        component: component_id
+      });
+      submissionOfflineIds.push(submission.offline_id);
+      submissionsPayload.push({ offline_id: submission.offline_id, component_id });
+      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 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.enqueueRequest({
+      description: "Bulk add form submissions",
+      method: HttpMethod.POST,
+      url: `/forms/revisions/${form_revision}/bulk-respond/`,
+      payload: {
+        form_data: values,
+        submitted_at: submittedAt,
+        submissions: submissionsPayload,
+        attachments: attachmentsPayload,
+        files: Object.values(filesRecord)
+      },
+      blockers: componentOfflineIds,
+      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.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)));
+    });
+    return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
+  }
+  update(submission) {
+    const { store } = this.client;
+    const { values, files } = separateFilesFromValues(submission.values);
     const attachFilesPromises = this.getAttachFilesPromises(files, submission);
-    const fullResult = {
-      ...payloadWithoutFiles,
-      updated_at: (/* @__PURE__ */ new Date()).toISOString()
+    const offlineSubmission = {
+      ...submission,
+      values
     };
-    store.dispatch(updateOrCreateUserFormSubmission(fullResult));
+    const submissionToBeUpdated = store.getState().formSubmissionReducer.formSubmissions[submission.offline_id];
+    store.dispatch(updateFormSubmission(offlineSubmission));
     const promise = this.enqueueRequest({
       description: "Patch form submission",
       method: HttpMethod.PATCH,
       url: `/forms/submissions/${submission.offline_id}/`,
-      payload: fullResult,
-      blockers: [fullResult.issue, fullResult.component, fullResult.component_stage].filter(
+      payload: offlineSubmission,
+      blockers: [offlineSubmission.issue, offlineSubmission.component, offlineSubmission.component_stage].filter(
         (x) => x !== void 0
       ),
-      blocks: [fullResult.offline_id]
+      blocks: [offlineSubmission.offline_id]
+    });
+    promise.then((createdSubmission) => {
+      store.dispatch(setFormSubmission(createdSubmission));
+    }).catch(() => {
+      store.dispatch(setFormSubmission(submissionToBeUpdated));
     });
-    return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+    return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
   }
   async delete(submissionId) {
     const { store } = this.client;
     const state = store.getState();
-    const submission = state.userFormReducer.submissions[submissionId];
-    store.dispatch(deleteUserFormSubmission(submissionId));
+    const submission = state.formSubmissionReducer.formSubmissions[submissionId];
+    store.dispatch(deleteFormSubmission(submissionId));
     store.dispatch(addActiveProjectFormSubmissionsCount(-1));
     try {
       return await this.enqueueRequest({
@@ -7046,10 +7449,8 @@ class UserFormSubmissionService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      if (submission) {
-        store.dispatch(addActiveProjectFormSubmissionsCount(1));
-        store.dispatch(updateOrCreateUserFormSubmission(submission));
-      }
+      store.dispatch(addActiveProjectFormSubmissionsCount(1));
+      store.dispatch(addFormSubmission(submission));
       throw e;
     }
   }
@@ -7063,7 +7464,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setUserFormSubmissions(submissions));
+    store.dispatch(setFormSubmissions(submissions));
     const attachments = await this.enqueueRequest({
       description: "Fetch form attachments",
       method: HttpMethod.GET,
@@ -7071,7 +7472,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setUserFormSubmissionAttachments(attachments));
+    store.dispatch(setFormSubmissionAttachments(attachments));
   }
 }
 class WorkspaceService extends BaseApiService {
@@ -13930,7 +14331,7 @@ const initialFormValues = (fields, values) => {
 };
 const useAttachImagesToFormRevisionFields = (revision) => {
   const { sdk } = useSDK();
-  const attachments = useAppSelector(selectRevisionAttachments((revision == null ? void 0 : revision.offline_id) ?? ""));
+  const attachments = useAppSelector(selectAttachmentsOfFormRevision((revision == null ? void 0 : revision.offline_id) ?? ""));
   return useMemo(() => {
     if (!revision || !attachments)
       return revision;
@@ -14027,7 +14428,7 @@ const FormSubmissionViewer = memo(
       return formRevisionToSchema(revisionWithImages, { readonly: true });
     }, [revisionWithImages]);
     const submissionValuesWithAttachments = useMemo(() => {
-      const attachments = selectSubmissionAttachments(submission.offline_id)(sdk.store.getState()) ?? [];
+      const attachments = selectAttachmentsOfFormSubmission(submission.offline_id)(sdk.store.getState()) ?? [];
       const downloadedAttachments = {};
       for (const attachment of attachments) {
         const promise = sdk.files.fetchFileFromUrl(attachment.file, attachment.file_sha1, attachment.file_name);
@@ -14077,8 +14478,8 @@ const FormBrowser = memo(
       }
       return ret;
     }, [filter, maxResults, ownerFilter]);
-    const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
-    const userFormMapping = useAppSelector(selectUserFormMapping);
+    const userForms = useAppSelector(selectFilteredForms(ownerFilterOptions)) ?? [];
+    const userFormMapping = useAppSelector(selectFormMapping);
     const attachableUserForms = userForms.filter((form) => !form.component_type);
     const attachableUserFormMapping = Object.values(userFormMapping).filter(
       (form) => !form.component_type
@@ -14111,7 +14512,7 @@ const FormBrowser = memo(
     const handleChange = useCallback((e) => {
       setFilter(e.currentTarget.value);
     }, []);
-    const numberOfForms = useAppSelector(selectNumberOfGeneralUserForms) || 0;
+    const numberOfForms = useAppSelector(selectGeneralFormCount) || 0;
     const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
     const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
     return /* @__PURE__ */ jsxs(Flex$1, { ref, direction: "column", gap: "2", children: [
@@ -14205,16 +14606,13 @@ const FormSubmissionBrowserEntry = memo((props) => {
   const { submission, onSubmissionClick, compact, labelType, rowDecorator } = props;
   const currentUser = useAppSelector(selectCurrentUser);
   const createdBy = useAppSelector(selectUser("created_by" in submission ? submission.created_by : currentUser.id));
-  const dateToUse = getCreatedAtOrSubmittedAtDate(submission);
-  const formattedDateTime = isToday(dateToUse) ? dateToUse.toLocaleTimeString([], {
-    hour: "2-digit",
-    minute: "2-digit"
-  }) : getLocalDateString(dateToUse);
+  const dateToUse = submission.submitted_at;
+  const formattedDateTime = getLocalDateString(dateToUse);
   const revision = useAppSelector(selectFormRevision(submission.form_revision));
   if (!revision) {
     throw new Error(`Could not find revision ${submission.form_revision} for submission ${submission.offline_id}.`);
   }
-  const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevision(revision.form))) == null ? void 0 : _a2.revision;
+  const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevisionOfForm(revision.form))) == null ? void 0 : _a2.revision;
   const creatorProfileSrc = useFileSrc({
     file: (createdBy == null ? void 0 : createdBy.profile.file) ?? null,
     fileSha1: (createdBy == null ? void 0 : createdBy.profile.file_sha1) ?? null
@@ -14245,10 +14643,6 @@ const FormSubmissionBrowserEntry = memo((props) => {
   return row;
 });
 FormSubmissionBrowserEntry.displayName = "FormSubmissionBrowserEntry";
-const getCreatedAtOrSubmittedAtDate = (submission) => {
-  const date = "created_at" in submission ? submission.created_at : submission.submitted_at;
-  return new Date(date);
-};
 const FormSubmissionBrowser = memo((props) => {
   const {
     formId: formId2,
@@ -14262,10 +14656,10 @@ const FormSubmissionBrowser = memo((props) => {
   if (!!formId2 === !!propSubmissions) {
     throw new Error("Either formId or submissions must be provided, but not both.");
   }
-  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectSubmissionsForForm(formId2));
+  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectFormSubmissionsOfForm(formId2));
   const sortedSubmissions = useMemo(
     () => submissions == null ? void 0 : submissions.sort((a, b) => {
-      return getCreatedAtOrSubmittedAtDate(b).getTime() - getCreatedAtOrSubmittedAtDate(a).getTime();
+      return a.submitted_at.localeCompare(b.submitted_at);
     }),
     [submissions]
   );
@@ -15583,6 +15977,7 @@ export {
   VerificationCodeType,
   WorkspaceService,
   YELLOW,
+  _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
   addActiveProjectFormSubmissionsCount,
@@ -15595,9 +15990,21 @@ export {
   addComponentTypeAttachment,
   addComponentTypeAttachments,
   addComponentsInBatches,
+  addDocumentAttachment,
+  addDocumentAttachments,
   addDocuments,
   addEmailDomain,
   addFavouriteProjectId,
+  addForm,
+  addFormRevision,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  addFormRevisions,
+  addFormSubmission,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  addFormSubmissions,
+  addForms,
   addIssue,
   addIssueAttachment,
   addIssueAttachments,
@@ -15618,13 +16025,6 @@ export {
   addStageCompletions,
   addStages,
   addToRecentIssues,
-  addUserForm,
-  addUserFormRevision,
-  addUserFormRevisionAttachment,
-  addUserFormRevisions,
-  addUserFormSubmissionAttachment,
-  addUserFormSubmissions,
-  addUserForms,
   addUsers,
   addWorkspace,
   areArraysEqual,
@@ -15645,6 +16045,7 @@ export {
   componentStageSlice,
   componentTypeReducer,
   componentTypeSlice,
+  constructUploadedFilePayloads,
   coordinatesAreEqual,
   coordinatesToLiteral,
   coordinatesToPointGeometry,
@@ -15655,12 +16056,16 @@ export {
   defaultBadgeColor,
   defaultStore,
   deleteComponentType,
+  deleteForm,
+  deleteFormRevision,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments,
+  deleteFormRevisions,
+  deleteFormSubmission,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments,
+  deleteFormSubmissions,
   deleteProject,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
   dequeue,
   deserialize,
   deserializeField,
@@ -15689,7 +16094,13 @@ export {
   fileSlice,
   fileToBlob,
   flipCoordinates,
+  formReducer,
+  formRevisionReducer,
   formRevisionToSchema,
+  formRevisionsSlice,
+  formSlice,
+  formSubmissionReducer,
+  formSubmissionSlice,
   index as forms,
   fullComponentMarkerSize,
   generateBadgeColors,
@@ -15758,11 +16169,14 @@ export {
   removeComponentAttachments,
   removeComponentTypeAttachment,
   removeComponentTypeAttachments,
+  removeDocumentAttachment,
+  removeDocumentAttachments,
   removeDocuments,
   removeEmailDomain,
   removeFavouriteProjectId,
   removeIssue,
   removeIssueAttachment,
+  removeIssueAttachments,
   removeIssueComment,
   removeIssueComments,
   removeIssueUpdate,
@@ -15805,6 +16219,7 @@ export {
   selectAllAttachments,
   selectAllComponentAttachments,
   selectAllComponentTypeAttachments,
+  selectAllDocumentAttachments,
   selectAllProjectAttachments,
   selectAncestorIdsOfDocument,
   selectAppearance,
@@ -15812,6 +16227,10 @@ export {
   selectAttachmentsOfComponentByType,
   selectAttachmentsOfComponentType,
   selectAttachmentsOfComponentTypeByType,
+  selectAttachmentsOfDocument,
+  selectAttachmentsOfDocumentByType,
+  selectAttachmentsOfFormRevision,
+  selectAttachmentsOfFormSubmission,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
   selectAttachmentsOfProject,
@@ -15827,11 +16246,11 @@ export {
   selectCompletedStageIdsForComponent,
   selectCompletedStages,
   selectComponent,
+  selectComponentAttachment,
   selectComponentAttachmentMapping,
-  selectComponentSubmissionMapping,
   selectComponentType,
+  selectComponentTypeAttachment,
   selectComponentTypeAttachmentMapping,
-  selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
   selectComponentTypeStagesMapping,
@@ -15847,6 +16266,8 @@ export {
   selectCurrentUser,
   selectDeletedRequests,
   selectDocument,
+  selectDocumentAttachment,
+  selectDocumentAttachmentMapping,
   selectDocuments,
   selectDocumentsMapping,
   selectEmailDomainsAsMapping,
@@ -15859,8 +16280,24 @@ export {
   selectExpandedSections,
   selectFavouriteProjects,
   selectFileAttachmentsOfIssue,
-  selectFilteredUserForms,
+  selectFilteredForms,
+  selectForm,
+  selectFormMapping,
+  selectFormOfComponentType,
   selectFormRevision,
+  selectFormRevisionMapping,
+  selectFormRevisions,
+  selectFormRevisionsOfForm,
+  selectFormSubmission,
+  selectFormSubmissionAttachmentsMapping,
+  selectFormSubmissions,
+  selectFormSubmissionsByComponents,
+  selectFormSubmissionsMapping,
+  selectFormSubmissionsOfComponent,
+  selectFormSubmissionsOfForm,
+  selectFormSubmissionsOfIssue,
+  selectFormsCount,
+  selectGeneralFormCount,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -15868,16 +16305,17 @@ export {
   selectIsLoading,
   selectIsLoggedIn,
   selectIssue,
+  selectIssueAttachment,
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueMapping,
   selectIssueUpdateMapping,
   selectIssueUpdatesOfIssue,
   selectIssues,
-  selectLatestFormRevision,
+  selectLatestFormRevisionByForm,
+  selectLatestFormRevisionOfForm,
+  selectLatestFormRevisionsOfComponentTypes,
   selectLatestRetryTime,
-  selectLatestRevisionByFormId,
-  selectLatestRevisionsFromComponentTypeIds,
   selectLicense,
   selectLicenseForProject,
   selectLicenses,
@@ -15886,8 +16324,6 @@ export {
   selectMapStyle,
   selectNumberOfComponentTypesMatchingCaseInsensitiveName,
   selectNumberOfComponentsOfComponentType,
-  selectNumberOfGeneralUserForms,
-  selectNumberOfUserForms,
   selectOrganization,
   selectOrganizationAccess,
   selectOrganizationAccessForUser,
@@ -15915,8 +16351,6 @@ export {
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,
   selectRehydrated,
-  selectRevisionAttachments,
-  selectRevisionsForForm,
   selectRootDocuments,
   selectShowTooltips,
   selectSortedEmailDomains,
@@ -15931,16 +16365,10 @@ export {
   selectStagesFromComponentType,
   selectStagesFromComponentTypeIds,
   selectStagesFromStageIds,
-  selectSubmissionAttachments,
-  selectSubmissionsForComponent,
-  selectSubmissionsForForm,
-  selectSubmissionsForIssue,
   selectUploadUrl,
   selectUsedColors,
   selectUser,
-  selectUserForm,
-  selectUserFormMapping,
-  selectUserFormSubmission,
+  selectUserFormRevisionAttachmentsMapping,
   selectUsersAsMapping,
   selectVisibleStatuses,
   selectVisibleUserIds,
@@ -15961,11 +16389,19 @@ export {
   setComponents,
   setCreateProjectType,
   setCurrentUser,
+  setDocumentAttachments,
   setDocuments,
   setEmailDomains,
   setEnableClustering,
   setEnableDuplicateIssues,
   setEnablePlacementMode,
+  setFormRevision,
+  setFormRevisionAttachments,
+  setFormRevisions,
+  setFormSubmission,
+  setFormSubmissionAttachments,
+  setFormSubmissions,
+  setForms,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
   setIsLoading,
@@ -15990,9 +16426,6 @@ export {
   setTokens,
   setTourStep,
   setUploadUrl,
-  setUserFormRevisionAttachments,
-  setUserFormSubmissionAttachments,
-  setUserFormSubmissions,
   setUsers,
   setVisibleStatuses,
   setVisibleUserIds,
@@ -16015,12 +16448,16 @@ export {
   updateComponent,
   updateComponentAttachment,
   updateComponentTypeAttachment,
+  updateDocumentAttachment,
   updateDocuments,
+  updateFormSubmission,
+  updateFormSubmissionAttachments,
+  updateFormSubmissions,
   updateIssue,
   updateIssueAttachment,
+  updateIssueAttachments,
   updateLicense,
   updateOrCreateProject,
-  updateOrCreateUserFormSubmission,
   updateOrganizationAccess,
   updateProjectAccess,
   updateProjectAttachment,
@@ -16034,8 +16471,6 @@ export {
   useFormikInput,
   useMemoCompare,
   useSDK,
-  userFormReducer,
-  userFormSlice,
   userReducer,
   userSlice,
   valueIsFile,