@overmap-ai/core 1.0.50-bulk-form-submission.2 → 1.0.50-document-attachments.0

package/dist/overmap-core.umd.cjs

@@ -622,15 +622,15 @@ var __publicField = (obj, key, value) => {
   };
   const migrations = [initialVersioning, signOut, signOut, createOutboxState];
   const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-  const initialState$p = {
+  const initialState$n = {
     accessToken: "",
     refreshToken: "",
     isLoggedIn: false
   };
   const authSlice = toolkit.createSlice({
     name: "auth",
-    initialState: initialState$p,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
+    initialState: initialState$n,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
     reducers: {
       setTokens: (state, action) => {
         state.accessToken = action.payload.accessToken;
@@ -795,19 +795,6 @@ var __publicField = (obj, key, value) => {
     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();
   };
@@ -1374,7 +1361,7 @@ var __publicField = (obj, key, value) => {
       return getLocalDateString(date);
     return relative.format(days, "days");
   });
-  const initialState$o = {
+  const initialState$m = {
     categories: {},
     usedCategoryColors: [],
     categoryVisibility: {
@@ -1384,8 +1371,8 @@ var __publicField = (obj, key, value) => {
   };
   const categorySlice = toolkit.createSlice({
     name: "categories",
-    initialState: initialState$o,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
+    initialState: initialState$m,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
     reducers: {
       setCategories: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -1542,15 +1529,6 @@ var __publicField = (obj, key, value) => {
       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];
@@ -1563,14 +1541,14 @@ var __publicField = (obj, key, value) => {
       delete state.attachments[attachmentId];
     }
   }
-  const initialState$n = {
+  const initialState$l = {
     components: {},
     attachments: {}
   };
   const componentSlice = toolkit.createSlice({
     name: "components",
-    initialState: initialState$n,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+    initialState: initialState$l,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
     reducers: {
       addComponent: (state, action) => {
         state.components[action.payload.offline_id] = action.payload;
@@ -1683,9 +1661,6 @@ var __publicField = (obj, key, value) => {
     [selectComponentAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
-  const selectComponentAttachment = (attachmentId) => (state) => {
-    return state.componentReducer.attachments[attachmentId];
-  };
   const selectAttachmentsOfComponent = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllComponentAttachments, (_state, componentId) => componentId],
@@ -1726,13 +1701,13 @@ var __publicField = (obj, key, value) => {
     removeAllComponentsOfType
   } = componentSlice.actions;
   const componentReducer = componentSlice.reducer;
-  const initialState$m = {
+  const initialState$k = {
     completionsByComponentId: {}
   };
   const componentStageCompletionSlice = toolkit.createSlice({
     name: "componentStageCompletions",
-    initialState: initialState$m,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+    initialState: initialState$k,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
     reducers: {
       addStageCompletion: (state, action) => {
         let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1783,13 +1758,13 @@ var __publicField = (obj, key, value) => {
     return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
   };
   const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-  const initialState$l = {
+  const initialState$j = {
     stages: {}
   };
   const componentStageSlice = toolkit.createSlice({
     name: "componentStages",
-    initialState: initialState$l,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+    initialState: initialState$j,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
     reducers: {
       addStages: (state, action) => {
         Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1899,15 +1874,15 @@ var __publicField = (obj, key, value) => {
   );
   const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
   const componentStageReducer = componentStageSlice.reducer;
-  const initialState$k = {
+  const initialState$i = {
     componentTypes: {},
     hiddenComponentTypeIds: {},
     attachments: {}
   };
   const componentTypeSlice = toolkit.createSlice({
     name: "componentTypes",
-    initialState: initialState$k,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+    initialState: initialState$i,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
     reducers: {
       addComponentType: (state, action) => {
         state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1975,9 +1950,6 @@ var __publicField = (obj, key, value) => {
     [selectComponentTypeAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
-  const selectComponentTypeAttachment = (attachmentId) => (state) => {
-    return state.componentTypeReducer.attachments[attachmentId];
-  };
   const selectAttachmentsOfComponentType = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllComponentTypeAttachments, (_state, componentTypeId) => componentTypeId],
@@ -2018,13 +1990,13 @@ var __publicField = (obj, key, value) => {
     deleteComponentType
   } = componentTypeSlice.actions;
   const componentTypeReducer = componentTypeSlice.reducer;
-  const initialState$j = {
+  const initialState$h = {
     workspaces: {},
     activeWorkspaceId: null
   };
   const workspaceSlice = toolkit.createSlice({
     name: "workspace",
-    initialState: initialState$j,
+    initialState: initialState$h,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setWorkspaces: (state, action) => {
@@ -2081,7 +2053,7 @@ var __publicField = (obj, key, value) => {
   );
   const workspaceReducer = workspaceSlice.reducer;
   const maxRecentIssues = 10;
-  const initialState$i = {
+  const initialState$g = {
     issues: {},
     attachments: {},
     comments: {},
@@ -2093,9 +2065,9 @@ var __publicField = (obj, key, value) => {
   };
   const issueSlice = toolkit.createSlice({
     name: "issues",
-    initialState: initialState$i,
+    initialState: initialState$g,
     extraReducers: (builder) => builder.addCase("RESET", (state) => {
-      Object.assign(state, initialState$i);
+      Object.assign(state, initialState$g);
     }),
     reducers: {
       setIssues: (state, action) => {
@@ -2150,7 +2122,6 @@ var __publicField = (obj, key, value) => {
         }
       },
       updateIssueAttachment: updateAttachment,
-      updateIssueAttachments: updateAttachments,
       removeIssue: (state, action) => {
         if (action.payload in state.issues) {
           delete state.issues[action.payload];
@@ -2159,7 +2130,6 @@ var __publicField = (obj, key, value) => {
         }
       },
       removeIssueAttachment: removeAttachment,
-      removeIssueAttachments: removeAttachments,
       removeIssueUpdate: (state, action) => {
         if (action.payload in state.updates) {
           delete state.updates[action.payload];
@@ -2269,7 +2239,6 @@ var __publicField = (obj, key, value) => {
     addToRecentIssues,
     cleanRecentIssues,
     removeIssueAttachment,
-    removeIssueAttachments,
     removeAttachmentsOfIssue,
     removeIssue,
     removeIssueUpdate,
@@ -2283,7 +2252,6 @@ var __publicField = (obj, key, value) => {
     setVisibleStatuses,
     setVisibleUserIds,
     updateIssueAttachment,
-    updateIssueAttachments,
     updateIssue,
     // Commments
     addIssueComment,
@@ -2376,9 +2344,6 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectIssueAttachment = (attachmentId) => (root) => {
-    return root.issueReducer.attachments[attachmentId];
-  };
   const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectIssueAttachments, (_state, issueId) => issueId],
@@ -2507,15 +2472,15 @@ var __publicField = (obj, key, value) => {
     }
   );
   const issueReducer = issueSlice.reducer;
-  const initialState$h = {
+  const initialState$f = {
     s3Urls: {}
   };
   const msPerHour = 1e3 * 60 * 60;
   const msPerWeek = msPerHour * 24 * 7;
   const fileSlice = toolkit.createSlice({
     name: "file",
-    initialState: initialState$h,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
+    initialState: initialState$f,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
     reducers: {
       setUploadUrl: (state, action) => {
         const { url, fields, sha1 } = action.payload;
@@ -2542,7 +2507,7 @@ var __publicField = (obj, key, value) => {
     return url;
   };
   const fileReducer = fileSlice.reducer;
-  const initialState$g = {
+  const initialState$e = {
     // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
     mapStyle: MapStyle.SATELLITE,
     showTooltips: false,
@@ -2550,8 +2515,8 @@ var __publicField = (obj, key, value) => {
   };
   const mapSlice = toolkit.createSlice({
     name: "map",
-    initialState: initialState$g,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
+    initialState: initialState$e,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
     reducers: {
       setMapStyle: (state, action) => {
         state.mapStyle = action.payload;
@@ -2620,7 +2585,7 @@ var __publicField = (obj, key, value) => {
     LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
     return LicenseStatus2;
   })(LicenseStatus || {});
-  const initialState$f = {
+  const initialState$d = {
     users: {},
     currentUser: {
       id: 0,
@@ -2631,8 +2596,8 @@ var __publicField = (obj, key, value) => {
   };
   const userSlice = toolkit.createSlice({
     name: "users",
-    initialState: initialState$f,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+    initialState: initialState$d,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
     reducers: {
       setUsers: (state, action) => {
         const usersMapping = {};
@@ -2694,13 +2659,13 @@ var __publicField = (obj, key, value) => {
   const selectUsersAsMapping = (state) => state.userReducer.users;
   const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
   const userReducer = userSlice.reducer;
-  const initialState$e = {
+  const initialState$c = {
     organizationAccesses: {}
   };
   const organizationAccessSlice = toolkit.createSlice({
     name: "organizationAccess",
-    initialState: initialState$e,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+    initialState: initialState$c,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
     reducers: {
       setOrganizationAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2763,13 +2728,13 @@ var __publicField = (obj, key, value) => {
     return organizationAccesses;
   };
   const organizationAccessReducer = organizationAccessSlice.reducer;
-  const initialState$d = {
+  const initialState$b = {
     licenses: {}
   };
   const licenseSlice = toolkit.createSlice({
     name: "license",
-    initialState: initialState$d,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+    initialState: initialState$b,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
     reducers: {
       setLicenses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2814,13 +2779,13 @@ var __publicField = (obj, key, value) => {
     (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
   );
   const licenseReducer = licenseSlice.reducer;
-  const initialState$c = {
+  const initialState$a = {
     projectAccesses: {}
   };
   const projectAccessSlice = toolkit.createSlice({
     name: "projectAccess",
-    initialState: initialState$c,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+    initialState: initialState$a,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
     reducers: {
       setProjectAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2888,7 +2853,7 @@ var __publicField = (obj, key, value) => {
     return projectAccesses;
   };
   const projectAccessReducer = projectAccessSlice.reducer;
-  const initialState$b = {
+  const initialState$9 = {
     projects: {},
     activeProjectId: null,
     recentProjectIds: [],
@@ -2898,7 +2863,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
-    initialState: initialState$b,
+    initialState: initialState$9,
     reducers: {
       setProjects: (state, action) => {
         const projectsMap = {};
@@ -3085,14 +3050,14 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const initialState$a = {
+  const initialState$8 = {
     organizations: {},
     activeOrganizationId: null
   };
   const organizationSlice = toolkit.createSlice({
     name: "organizations",
-    initialState: initialState$a,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+    initialState: initialState$8,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
     reducers: {
       setOrganizations: (state, action) => {
         for (const org of action.payload) {
@@ -3211,14 +3176,14 @@ var __publicField = (obj, key, value) => {
       }
     };
   };
-  const initialState$9 = {
+  const initialState$7 = {
     deletedRequests: [],
     latestRetryTime: 0
   };
   const outboxSlice = toolkit.createSlice({
     name: "outbox",
-    initialState: initialState$9,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
+    initialState: initialState$7,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
     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
@@ -3250,7 +3215,7 @@ var __publicField = (obj, key, value) => {
   const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
   const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
   const outboxReducer = outboxSlice.reducer;
-  const initialState$8 = {
+  const initialState$6 = {
     projectFiles: {},
     activeProjectFileId: null,
     isImportingProjectFile: false,
@@ -3258,8 +3223,8 @@ var __publicField = (obj, key, value) => {
   };
   const projectFileSlice = toolkit.createSlice({
     name: "projectFiles",
-    initialState: initialState$8,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+    initialState: initialState$6,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
     reducers: {
       addOrReplaceProjectFiles: (state, action) => {
         for (let fileObj of action.payload) {
@@ -3360,12 +3325,12 @@ var __publicField = (obj, key, value) => {
   const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
   const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const projectFileReducer = projectFileSlice.reducer;
-  const initialState$7 = {
+  const initialState$5 = {
     isRehydrated: false
   };
   const rehydratedSlice = toolkit.createSlice({
     name: "rehydrated",
-    initialState: initialState$7,
+    initialState: initialState$5,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setRehydrated: (state, action) => {
@@ -3375,7 +3340,7 @@ var __publicField = (obj, key, value) => {
   });
   const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
   const rehydratedReducer = rehydratedSlice.reducer;
-  const initialState$6 = {
+  const initialState$4 = {
     useIssueTemplate: false,
     placementMode: false,
     enableClustering: false,
@@ -3392,8 +3357,8 @@ var __publicField = (obj, key, value) => {
   };
   const settingSlice = toolkit.createSlice({
     name: "settings",
-    initialState: initialState$6,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+    initialState: initialState$4,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
     reducers: {
       setEnableDuplicateIssues: (state, action) => {
         state.useIssueTemplate = action.payload;
@@ -3439,248 +3404,146 @@ var __publicField = (obj, key, value) => {
   const settingReducer = settingSlice.reducer;
   const selectIsFetchingInitialData = (state) => state.settingReducer.isFetchingInitialData;
   const selectIsLoading = (state) => state.settingReducer.isLoading;
-  const LATEST_FORM_REVISION_CACHE = {};
-  function considerCachingFormRevision(formRevision, formId2, preferPending = false) {
+  const LATEST_REVISION_CACHE = {};
+  function considerCachingRevision(revision, formId2, preferPending = false) {
     var _a2;
-    if (!formRevision) {
+    if (!revision) {
       if (!formId2) {
-        throw new Error("If form revision is null, formId is required.");
+        throw new Error("If revision is null, formId is required.");
       }
-      const currentLatestFormRevision = getLatestFormRevisionFromCache(formId2);
-      if (currentLatestFormRevision)
+      const currentLatestRevision = getLatestRevisionFromCache(formId2);
+      if (currentLatestRevision)
         return;
-      LATEST_FORM_REVISION_CACHE[formId2] = null;
+      LATEST_REVISION_CACHE[formId2] = null;
       return;
     }
-    if (formRevision.revision === "Pending") {
+    if (revision.revision === "Pending") {
       if (preferPending) {
-        LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
+        LATEST_REVISION_CACHE[revision.form] = revision;
       }
       return;
     }
-    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;
+    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;
     }
   }
-  function getLatestFormRevisionFromCache(formId2) {
-    return LATEST_FORM_REVISION_CACHE[formId2];
+  function getLatestRevisionFromCache(formId2) {
+    return LATEST_REVISION_CACHE[formId2];
   }
-  const initialState$5 = {
-    formRevisions: {},
-    attachments: {}
-  };
-  const formRevisionsSlice = toolkit.createSlice({
-    name: "formRevisions",
-    initialState: initialState$5,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
+  const initialState$3 = {
+    userForms: {},
+    revisions: {},
+    submissions: {},
+    submissionAttachments: {},
+    revisionAttachments: {}
+  };
+  const userFormSlice = toolkit.createSlice({
+    name: "userForms",
+    initialState: initialState$3,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
     reducers: {
-      // revision related actions
-      setFormRevision: (state, action) => {
-        state.formRevisions[action.payload.offline_id] = action.payload;
-        considerCachingFormRevision(action.payload);
+      setUserForms: (state, action) => {
+        state.userForms = {};
+        action.payload.forEach((userForm) => {
+          state.userForms[userForm.offline_id] = userForm;
+        });
       },
-      setFormRevisions: (state, action) => {
-        state.formRevisions = {};
-        for (const revision of action.payload) {
-          state.formRevisions[revision.offline_id] = revision;
-          considerCachingFormRevision(revision);
-        }
+      addUserForm: (state, action) => {
+        state.userForms[action.payload.offline_id] = 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);
+      addUserForms: (state, action) => {
+        action.payload.forEach((userForm) => {
+          state.userForms[userForm.offline_id] = userForm;
+        });
       },
-      // TODO: @Audiopolis / Magnus - do we want to standardize using PayloadAction?
-      addFormRevisions: (state, action) => {
-        for (const userFormRevision of action.payload) {
-          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);
-        }
+      addUserFormRevisions: (state, action) => {
+        action.payload.forEach((userFormRevision) => {
+          state.revisions[userFormRevision.offline_id] = userFormRevision;
+          considerCachingRevision(userFormRevision);
+        });
       },
-      // 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];
+      addUserFormRevision: (state, action) => {
+        state.revisions[action.payload.offline_id] = action.payload;
+        considerCachingRevision(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];
+      deleteUserFormRevision: (state, action) => {
+        delete state.revisions[action.payload];
+        delete LATEST_REVISION_CACHE[action.payload];
+      },
+      deleteUserFormRevisions: (state, action) => {
+        for (const userFormRevision of action.payload) {
+          delete state.revisions[userFormRevision.offline_id];
+          delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
         }
       },
-      // attachment related actions
-      setFormRevisionAttachments: (state, action) => {
-        state.attachments = {};
-        for (const attachment of action.payload) {
-          state.attachments[attachment.offline_id] = attachment;
+      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];
         }
       },
-      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`);
+      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];
         }
-        state.attachments[action.payload.offline_id] = action.payload;
       },
-      addFormRevisionAttachments: (state, action) => {
+      setUserFormSubmissionAttachments: (state, action) => {
+        state.submissionAttachments = {};
         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`);
+          const submissionId = attachment.submission;
+          const submissionAttachments = state.submissionAttachments[submissionId];
+          if (submissionAttachments) {
+            submissionAttachments.push(attachment);
+          } else {
+            state.submissionAttachments[submissionId] = [attachment];
           }
         }
+      },
+      setUserFormRevisionAttachments: (state, action) => {
+        state.revisionAttachments = {};
         for (const attachment of action.payload) {
-          state.attachments[attachment.offline_id] = attachment;
+          const revisionId = attachment.revision;
+          const revisionAttachments = state.revisionAttachments[revisionId];
+          if (revisionAttachments) {
+            revisionAttachments.push(attachment);
+          } else {
+            state.revisionAttachments[revisionId] = [attachment];
+          }
         }
       },
-      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];
+      deleteUserFormSubmission: (state, action) => {
+        delete state.submissions[action.payload];
       },
-      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];
+      deleteUserFormSubmissions: (state, action) => {
+        for (const userFormSubmission of action.payload) {
+          delete state.submissions[userFormSubmission.offline_id];
         }
-      }
-    }
-  });
-  const {
-    setFormRevision,
-    setFormRevisions,
-    addFormRevision,
-    addFormRevisions,
-    deleteFormRevision,
-    deleteFormRevisions,
-    setFormRevisionAttachments,
-    addFormRevisionAttachment,
-    addFormRevisionAttachments,
-    deleteFormRevisionAttachment,
-    deleteFormRevisionAttachments
-  } = formRevisionsSlice.actions;
-  const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
-  const selectFormRevisions = toolkit.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(
-    toolkit.createSelector([selectFormRevisionMapping, (_state, formId2) => formId2], (revisions, formId2) => {
-      if (!formId2) {
-        throw new Error("formId is required");
-      }
-      return _selectLatestFormRevision(revisions, formId2);
-    })
-  );
-  const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
-    toolkit.createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
-      return revisions.filter((revision) => {
-        return revision.form === formId2;
-      });
-    })
-  );
-  const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
-    toolkit.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 = toolkit.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(
-    toolkit.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 = toolkit.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;
+      addUserFormSubmissions: (state, action) => {
+        for (const submission of action.payload) {
+          state.submissions[submission.offline_id] = submission;
+        }
       },
-      addForms: (state, action) => {
-        action.payload.forEach((userForm) => {
-          state.forms[userForm.offline_id] = userForm;
+      setUserFormSubmissions: (state, action) => {
+        state.submissions = {};
+        action.payload.forEach((submission) => {
+          state.submissions[submission.offline_id] = submission;
         });
       },
       favoriteForm: (state, action) => {
         const { formId: formId2 } = action.payload;
-        const form = state.forms[formId2];
+        const form = state.userForms[formId2];
         if (!form) {
           throw new Error("No form exists with the id " + formId2);
         }
@@ -3688,23 +3551,48 @@ var __publicField = (obj, key, value) => {
       },
       unfavoriteForm: (state, action) => {
         const { formId: formId2 } = action.payload;
-        const form = state.forms[formId2];
+        const form = state.userForms[formId2];
         if (!form) {
           throw new Error("No form exists with the id " + formId2);
         }
         form.favorite = false;
       },
-      deleteForm: (state, action) => {
-        delete state.forms[action.payload];
+      deleteUserForm: (state, action) => {
+        delete state.userForms[action.payload];
       }
     }
   });
-  const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = formSlice.actions;
-  const selectFilteredForms = restructureCreateSelectorWithArgs(
+  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(
     toolkit.createSelector(
       [
-        (state) => state.formReducer.forms,
-        (state) => state.formRevisionReducer.formRevisions,
+        (state) => state.userFormReducer.userForms,
+        (state) => state.userFormReducer.revisions,
         (_state, search) => search
       ],
       (userForms, revisions, search) => {
@@ -3738,188 +3626,63 @@ var __publicField = (obj, key, value) => {
       { memoizeOptions: { equalityCheck: reactRedux.shallowEqual } }
     )
   );
-  const selectForm = (formId2) => (state) => {
-    return state.formReducer.forms[formId2];
+  const selectFormRevision = (revisionId) => (state) => {
+    return state.userFormReducer.revisions[revisionId];
   };
-  const selectFormMapping = (state) => {
-    return state.formReducer.forms;
+  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 selectFormOfComponentType = restructureCreateSelectorWithArgs(
+  const selectLatestFormRevision = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectFormMapping, (_state, componentTypeId) => componentTypeId],
-      (userForms, componentTypeId) => {
-        return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
+      [(state) => state.userFormReducer.revisions, (_state, formId2) => formId2],
+      (revisions, formId2) => {
+        if (!formId2) {
+          throw new Error("formId is required");
+        }
+        return _selectLatestFormRevision(revisions, formId2);
       }
     )
   );
-  const selectFormsCount = toolkit.createSelector([selectFormMapping], (userForms) => {
-    return Object.keys(userForms).length;
-  });
-  const selectGeneralFormCount = toolkit.createSelector([selectFormMapping], (userForms) => {
-    return Object.values(userForms).filter((form) => !form.component_type).length;
-  });
-  const formReducer = formSlice.reducer;
-  const initialState$3 = {
-    formSubmissions: {},
-    attachments: {}
-  };
-  const formSubmissionSlice = toolkit.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 = toolkit.createSelector(
-    [selectFormSubmissionsMapping],
-    (submissions) => {
-      return Object.values(submissions);
-    }
+  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 = toolkit.createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
+  const selectRevisionMapping = (state) => state.userFormReducer.revisions;
+  const selectRevisions = toolkit.createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
+  const selectRevisionsForForm = restructureCreateSelectorWithArgs(
+    toolkit.createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+      return revisions.filter((revision) => {
+        return revision.form === formId2;
+      });
+    })
   );
-  const selectFormSubmission = (submissionId) => (state) => {
-    return state.formSubmissionReducer.formSubmissions[submissionId];
-  };
-  const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
+  const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectFormSubmissions, selectFormRevisionMapping, (_state, formId2) => formId2],
+      [selectSubmissions, selectRevisionMapping, (_state, formId2) => formId2],
       (submissions, revisionMapping, formId2) => {
-        return submissions.filter((submission) => {
+        return Object.values(submissions).filter((submission) => {
           const revision = revisionMapping[submission.form_revision];
           return (revision == null ? void 0 : revision.form) === formId2;
         });
       }
     )
   );
-  const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
+  const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectFormSubmissions, (_state, issueId) => issueId],
+      [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
       (submissions, issueId) => {
         return Object.values(submissions).filter((submission) => {
           return submission.issue === issueId;
@@ -3927,9 +3690,9 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
+  const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectFormSubmissions, (_state, componentId) => componentId],
+      [selectSubmissions, (_state, componentId) => componentId],
       (submissions, componentId) => {
         return submissions.filter((submission) => {
           return submission.component === componentId;
@@ -3937,8 +3700,8 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectFormSubmissionsByComponents = toolkit.createSelector(
-    [selectFormSubmissionsMapping, selectComponentsMapping],
+  const selectComponentSubmissionMapping = toolkit.createSelector(
+    [selectSubmissionMapping, selectComponentsMapping],
     (submissions, components) => {
       var _a2;
       const componentSubmissionMapping = {};
@@ -3954,18 +3717,54 @@ var __publicField = (obj, key, value) => {
       return componentSubmissionMapping;
     }
   );
-  const selectFormSubmissionAttachmentsMapping = (state) => {
-    return state.formSubmissionReducer.attachments;
+  const selectUserFormMapping = (state) => {
+    return state.userFormReducer.userForms;
   };
-  const selectAttachmentsOfFormSubmission = restructureCreateSelectorWithArgs(
+  const selectComponentTypeForm = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectFormSubmissionAttachmentsMapping, (_state, submissionId) => submissionId],
-      (attachmentsMapping, submissionId) => {
-        return Object.values(attachmentsMapping).filter((attachment) => attachment.submission === submissionId);
+      [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
+      (userForms, componentTypeId) => {
+        return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
       }
     )
   );
-  const formSubmissionReducer = formSubmissionSlice.reducer;
+  const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithArgs(
+    toolkit.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;
+      }
+    )
+  );
+  const selectLatestRevisionByFormId = toolkit.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 = toolkit.createSelector([selectUserFormMapping], (userForms) => {
+    return Object.keys(userForms).length;
+  });
+  const selectNumberOfGeneralUserForms = toolkit.createSelector([selectUserFormMapping], (userForms) => {
+    return Object.values(userForms).filter((form) => !form.component_type).length;
+  });
+  const userFormReducer = userFormSlice.reducer;
   const initialState$2 = {
     emailDomains: {}
   };
@@ -4193,9 +3992,6 @@ var __publicField = (obj, key, value) => {
     [selectDocumentAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
-  const selectDocumentAttachment = (attachmentId) => (state) => {
-    return state.documentsReducer.attachments[attachmentId];
-  };
   const selectAttachmentsOfDocument = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllDocumentAttachments, (_state, documentId) => documentId],
@@ -4263,9 +4059,7 @@ var __publicField = (obj, key, value) => {
     projectFileReducer,
     rehydratedReducer,
     settingReducer,
-    formReducer,
-    formRevisionReducer,
-    formSubmissionReducer,
+    userFormReducer,
     userReducer,
     workspaceReducer,
     emailDomainsReducer,
@@ -4318,7 +4112,9 @@ var __publicField = (obj, key, value) => {
         throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
       }
     }
-    const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
+    const indexedForms = Object.values(draft.userFormReducer.userForms).filter(
+      (form) => form.index_workspace === workspaceId
+    );
     for (const form of indexedForms) {
       form.index_workspace = mainWorkspace.offline_id;
     }
@@ -4796,23 +4592,6 @@ var __publicField = (obj, key, value) => {
     }
   }
   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-${presignedUrl.fields.key}`],
-          blocks: [sha1],
-          s3url: presignedUrl
-        });
-      }
-    }
     fetchAll(projectId) {
       const promise = this.enqueueRequest({
         description: "Fetch attachments",
@@ -4839,7 +4618,6 @@ var __publicField = (obj, key, value) => {
       }
       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,
@@ -4873,7 +4651,6 @@ var __publicField = (obj, key, value) => {
       }
       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,
@@ -4907,7 +4684,6 @@ var __publicField = (obj, key, value) => {
       }
       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,
@@ -4973,54 +4749,26 @@ var __publicField = (obj, key, value) => {
     /** 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. */
-    // 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)));
+    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);
       });
-      return [offlineAttachments, promise.then(({ attachments }) => attachments)];
     }
     attachFilesToComponent(filesToSubmit, componentId) {
       return filesToSubmit.map((file) => {
@@ -7003,7 +6751,7 @@ var __publicField = (obj, key, value) => {
             ...revisionAttachmentPayload,
             file: URL.createObjectURL(image)
           };
-          store.dispatch(addFormRevisionAttachment(offlinePayload));
+          store.dispatch(addUserFormRevisionAttachment(offlinePayload));
           return attach;
         });
       });
@@ -7037,8 +6785,8 @@ var __publicField = (obj, key, value) => {
         revision: 0
       };
       const { store } = this.client;
-      store.dispatch(addForm(retForm));
-      store.dispatch(addFormRevision(retRevision));
+      store.dispatch(addUserForm(retForm));
+      store.dispatch(addUserFormRevision(retRevision));
       const formPromise = this.enqueueRequest({
         description: "Create form",
         method: HttpMethod.POST,
@@ -7056,8 +6804,8 @@ var __publicField = (obj, key, value) => {
       });
       const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
       void formPromise.catch((e) => {
-        store.dispatch(deleteForm(retForm.offline_id));
-        store.dispatch(deleteFormRevision(retRevision.offline_id));
+        store.dispatch(deleteUserForm(retForm.offline_id));
+        store.dispatch(deleteUserFormRevision(retRevision.offline_id));
         throw e;
       });
       const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
@@ -7099,7 +6847,7 @@ var __publicField = (obj, key, value) => {
         revision: "Pending",
         form: formId2
       };
-      store.dispatch(addFormRevision(fullRevision));
+      store.dispatch(addUserFormRevision(fullRevision));
       const promise = this.enqueueRequest({
         description: "Create form revision",
         method: HttpMethod.PATCH,
@@ -7113,9 +6861,9 @@ var __publicField = (obj, key, value) => {
       });
       const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
       void promise.then((result) => {
-        store.dispatch(setFormRevision(result));
+        store.dispatch(addUserFormRevision(result));
       }).catch(() => {
-        store.dispatch(deleteFormRevision(fullRevision.offline_id));
+        store.dispatch(deleteUserFormRevision(fullRevision.offline_id));
       });
       const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
       return [fullRevision, settledPromise];
@@ -7157,19 +6905,19 @@ var __publicField = (obj, key, value) => {
     async delete(formId2) {
       const { store } = this.client;
       const state = store.getState();
-      const userForm = selectForm(formId2)(state);
+      const userForm = selectUserForm(formId2)(state);
       if (!userForm) {
         throw new Error("Expected userForm to exist");
       }
-      const userFormSubmissions = selectFormSubmissionsOfForm(formId2)(state);
+      const userFormSubmissions = selectSubmissionsForForm(formId2)(state);
       if (userFormSubmissions && userFormSubmissions.length > 0) {
-        store.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
+        store.dispatch(deleteUserFormSubmissions(userFormSubmissions));
       }
-      const userFormRevisions = selectFormRevisionsOfForm(formId2)(state);
+      const userFormRevisions = selectRevisionsForForm(formId2)(state);
       if (userFormRevisions && userFormRevisions.length > 0) {
-        store.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
+        store.dispatch(deleteUserFormRevisions(userFormRevisions));
       }
-      store.dispatch(deleteForm(formId2));
+      store.dispatch(deleteUserForm(formId2));
       try {
         return await this.enqueueRequest({
           description: "Delete form",
@@ -7179,12 +6927,12 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        store.dispatch(addForm(userForm));
+        store.dispatch(addUserForm(userForm));
         if (userFormRevisions && userFormRevisions.length > 0) {
-          store.dispatch(addFormRevisions(userFormRevisions));
+          store.dispatch(addUserFormRevisions(userFormRevisions));
         }
         if (userFormSubmissions && userFormSubmissions.length > 0) {
-          store.dispatch(addFormSubmissions(userFormSubmissions));
+          store.dispatch(addUserFormSubmissions(userFormSubmissions));
         }
         throw e;
       }
@@ -7198,15 +6946,16 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(setForms(Object.values(result.forms)));
-      store.dispatch(setFormRevisions(Object.values(result.revisions)));
-      store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
+      store.dispatch(addUserForms(Object.values(result.forms)));
+      store.dispatch(addUserFormRevisions(Object.values(result.revisions)));
+      store.dispatch(setUserFormRevisionAttachments(Object.values(result.attachments)));
     }
   }
   const isArrayOfFiles = (value) => {
     return Array.isArray(value) && value[0] instanceof File;
   };
-  const separateFilesFromValues = (values) => {
+  const separateFilesFromValues = (payload) => {
+    const { values } = payload;
     const files = {};
     const newValues = {};
     for (const key in values) {
@@ -7221,13 +6970,17 @@ var __publicField = (obj, key, value) => {
         newValues[key] = value;
       }
     }
-    return { values: newValues, files };
+    const payloadWithoutFiles = {
+      ...payload,
+      values: newValues
+    };
+    return { payloadWithoutFiles, files };
   };
   class UserFormSubmissionService extends BaseApiService {
     constructor() {
       super(...arguments);
       // Attach files to submission, after uploading them to S3
-      __publicField(this, "getAttachFilesPromises", (files, submission) => {
+      __publicField(this, "getAttachFilesPromises", (files, payload) => {
         const { store } = this.client;
         return Object.entries(files).map(async ([key, fileArray]) => {
           const attachResults = [];
@@ -7237,27 +6990,24 @@ var __publicField = (obj, key, value) => {
             const [fileProps] = await this.client.files.uploadFileToS3(sha1);
             const submissionAttachmentPayload = offline({
               ...fileProps,
-              submission: submission.offline_id,
+              submission: payload.offline_id,
               field_identifier: key
             });
             const attach = await this.enqueueRequest({
               description: "Attach file to form submission",
               method: HttpMethod.POST,
-              url: `/forms/submission/${submission.offline_id}/attachments/`,
+              url: `/forms/submission/${payload.offline_id}/attachments/`,
               payload: submissionAttachmentPayload,
-              blockers: [
-                submission.component,
-                submission.component_stage,
-                submission.issue,
-                submission.form_revision
-              ].filter((x) => x !== void 0),
+              blockers: [payload.component, payload.component_stage, payload.issue, payload.form_revision].filter(
+                (x) => x !== void 0
+              ),
               blocks: [submissionAttachmentPayload.offline_id]
             });
             const offlinePayload = {
               ...submissionAttachmentPayload,
               file: URL.createObjectURL(file)
             };
-            store.dispatch(addFormSubmissionAttachment(offlinePayload));
+            store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
             attachResults.push(attach);
           }
           return attachResults;
@@ -7271,165 +7021,70 @@ var __publicField = (obj, key, value) => {
       if (!activeProjectId) {
         throw new Error("Expected an active project");
       }
-      const { values, files } = separateFilesFromValues(payload.values);
-      const offlineSubmission = {
-        ...payload,
-        values,
-        created_by: state.userReducer.currentUser.id,
-        submitted_at: (/* @__PURE__ */ new Date()).toISOString()
-      };
+      const { payloadWithoutFiles, files } = separateFilesFromValues(payload);
       const promise = this.enqueueRequest({
         description: "Respond to form",
         method: HttpMethod.POST,
         url: `/forms/revisions/${payload.form_revision}/respond/`,
-        payload: { ...offlineSubmission, project: activeProjectId },
+        payload: { ...payloadWithoutFiles, 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, offlineSubmission);
-      store.dispatch(addFormSubmission(offlineSubmission));
+      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));
       void promise.then((result) => {
         store.dispatch(addActiveProjectFormSubmissionsCount(1));
-        store.dispatch(setFormSubmission(result));
+        store.dispatch(updateOrCreateUserFormSubmission(result));
         return result;
       }).catch(() => {
-        store.dispatch(deleteFormSubmission(payload.offline_id));
+        store.dispatch(deleteUserFormSubmission(payload.offline_id));
         store.dispatch(addActiveProjectFormSubmissionsCount(-1));
       });
       const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-      return [offlineSubmission, settledPromise];
-    }
-    // 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 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)];
+      return [fullOfflineResult, settledPromise];
     }
     update(submission) {
       const { store } = this.client;
-      const { values, files } = separateFilesFromValues(submission.values);
+      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 attachFilesPromises = this.getAttachFilesPromises(files, submission);
-      const offlineSubmission = {
-        ...submission,
-        values
+      const fullResult = {
+        ...payloadWithoutFiles,
+        updated_at: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const submissionToBeUpdated = store.getState().formSubmissionReducer.formSubmissions[submission.offline_id];
-      store.dispatch(updateFormSubmission(offlineSubmission));
+      store.dispatch(updateOrCreateUserFormSubmission(fullResult));
       const promise = this.enqueueRequest({
         description: "Patch form submission",
         method: HttpMethod.PATCH,
         url: `/forms/submissions/${submission.offline_id}/`,
-        payload: offlineSubmission,
-        blockers: [offlineSubmission.issue, offlineSubmission.component, offlineSubmission.component_stage].filter(
+        payload: fullResult,
+        blockers: [fullResult.issue, fullResult.component, fullResult.component_stage].filter(
           (x) => x !== void 0
         ),
-        blocks: [offlineSubmission.offline_id]
-      });
-      promise.then((createdSubmission) => {
-        store.dispatch(setFormSubmission(createdSubmission));
-      }).catch(() => {
-        store.dispatch(setFormSubmission(submissionToBeUpdated));
+        blocks: [fullResult.offline_id]
       });
-      return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
+      return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
     }
     async delete(submissionId) {
       const { store } = this.client;
       const state = store.getState();
-      const submission = state.formSubmissionReducer.formSubmissions[submissionId];
-      store.dispatch(deleteFormSubmission(submissionId));
+      const submission = state.userFormReducer.submissions[submissionId];
+      store.dispatch(deleteUserFormSubmission(submissionId));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
       try {
         return await this.enqueueRequest({
@@ -7440,8 +7095,10 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        store.dispatch(addActiveProjectFormSubmissionsCount(1));
-        store.dispatch(addFormSubmission(submission));
+        if (submission) {
+          store.dispatch(addActiveProjectFormSubmissionsCount(1));
+          store.dispatch(updateOrCreateUserFormSubmission(submission));
+        }
         throw e;
       }
     }
@@ -7455,7 +7112,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(setFormSubmissions(submissions));
+      store.dispatch(setUserFormSubmissions(submissions));
       const attachments = await this.enqueueRequest({
         description: "Fetch form attachments",
         method: HttpMethod.GET,
@@ -7463,7 +7120,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(setFormSubmissionAttachments(attachments));
+      store.dispatch(setUserFormSubmissionAttachments(attachments));
     }
   }
   class WorkspaceService extends BaseApiService {
@@ -14322,7 +13979,7 @@ var __publicField = (obj, key, value) => {
   };
   const useAttachImagesToFormRevisionFields = (revision) => {
     const { sdk } = useSDK();
-    const attachments = useAppSelector(selectAttachmentsOfFormRevision((revision == null ? void 0 : revision.offline_id) ?? ""));
+    const attachments = useAppSelector(selectRevisionAttachments((revision == null ? void 0 : revision.offline_id) ?? ""));
     return React.useMemo(() => {
       if (!revision || !attachments)
         return revision;
@@ -14419,7 +14076,7 @@ var __publicField = (obj, key, value) => {
         return formRevisionToSchema(revisionWithImages, { readonly: true });
       }, [revisionWithImages]);
       const submissionValuesWithAttachments = React.useMemo(() => {
-        const attachments = selectAttachmentsOfFormSubmission(submission.offline_id)(sdk.store.getState()) ?? [];
+        const attachments = selectSubmissionAttachments(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);
@@ -14469,8 +14126,8 @@ var __publicField = (obj, key, value) => {
         }
         return ret;
       }, [filter, maxResults, ownerFilter]);
-      const userForms = useAppSelector(selectFilteredForms(ownerFilterOptions)) ?? [];
-      const userFormMapping = useAppSelector(selectFormMapping);
+      const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
+      const userFormMapping = useAppSelector(selectUserFormMapping);
       const attachableUserForms = userForms.filter((form) => !form.component_type);
       const attachableUserFormMapping = Object.values(userFormMapping).filter(
         (form) => !form.component_type
@@ -14503,7 +14160,7 @@ var __publicField = (obj, key, value) => {
       const handleChange = React.useCallback((e) => {
         setFilter(e.currentTarget.value);
       }, []);
-      const numberOfForms = useAppSelector(selectGeneralFormCount) || 0;
+      const numberOfForms = useAppSelector(selectNumberOfGeneralUserForms) || 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__ */ jsxRuntime.jsxs(blocks.Flex, { ref, direction: "column", gap: "2", children: [
@@ -14597,13 +14254,16 @@ var __publicField = (obj, key, value) => {
     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 = submission.submitted_at;
-    const formattedDateTime = getLocalDateString(dateToUse);
+    const dateToUse = getCreatedAtOrSubmittedAtDate(submission);
+    const formattedDateTime = isToday(dateToUse) ? dateToUse.toLocaleTimeString([], {
+      hour: "2-digit",
+      minute: "2-digit"
+    }) : 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(selectLatestFormRevisionOfForm(revision.form))) == null ? void 0 : _a2.revision;
+    const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevision(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
@@ -14634,6 +14294,10 @@ var __publicField = (obj, key, value) => {
     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 = React.memo((props) => {
     const {
       formId: formId2,
@@ -14647,10 +14311,10 @@ var __publicField = (obj, key, value) => {
     if (!!formId2 === !!propSubmissions) {
       throw new Error("Either formId or submissions must be provided, but not both.");
     }
-    const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectFormSubmissionsOfForm(formId2));
+    const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectSubmissionsForForm(formId2));
     const sortedSubmissions = React.useMemo(
       () => submissions == null ? void 0 : submissions.sort((a, b) => {
-        return a.submitted_at.localeCompare(b.submitted_at);
+        return getCreatedAtOrSubmittedAtDate(b).getTime() - getCreatedAtOrSubmittedAtDate(a).getTime();
       }),
       [submissions]
     );
@@ -15967,7 +15631,6 @@ var __publicField = (obj, key, value) => {
   exports2.VerificationCodeType = VerificationCodeType;
   exports2.WorkspaceService = WorkspaceService;
   exports2.YELLOW = YELLOW;
-  exports2._selectLatestFormRevision = _selectLatestFormRevision;
   exports2._setLatestRetryTime = _setLatestRetryTime;
   exports2.acceptProjectInvite = acceptProjectInvite;
   exports2.addActiveProjectFormSubmissionsCount = addActiveProjectFormSubmissionsCount;
@@ -15985,16 +15648,6 @@ var __publicField = (obj, key, value) => {
   exports2.addDocuments = addDocuments;
   exports2.addEmailDomain = addEmailDomain;
   exports2.addFavouriteProjectId = addFavouriteProjectId;
-  exports2.addForm = addForm;
-  exports2.addFormRevision = addFormRevision;
-  exports2.addFormRevisionAttachment = addFormRevisionAttachment;
-  exports2.addFormRevisionAttachments = addFormRevisionAttachments;
-  exports2.addFormRevisions = addFormRevisions;
-  exports2.addFormSubmission = addFormSubmission;
-  exports2.addFormSubmissionAttachment = addFormSubmissionAttachment;
-  exports2.addFormSubmissionAttachments = addFormSubmissionAttachments;
-  exports2.addFormSubmissions = addFormSubmissions;
-  exports2.addForms = addForms;
   exports2.addIssue = addIssue;
   exports2.addIssueAttachment = addIssueAttachment;
   exports2.addIssueAttachments = addIssueAttachments;
@@ -16015,6 +15668,13 @@ var __publicField = (obj, key, value) => {
   exports2.addStageCompletions = addStageCompletions;
   exports2.addStages = addStages;
   exports2.addToRecentIssues = addToRecentIssues;
+  exports2.addUserForm = addUserForm;
+  exports2.addUserFormRevision = addUserFormRevision;
+  exports2.addUserFormRevisionAttachment = addUserFormRevisionAttachment;
+  exports2.addUserFormRevisions = addUserFormRevisions;
+  exports2.addUserFormSubmissionAttachment = addUserFormSubmissionAttachment;
+  exports2.addUserFormSubmissions = addUserFormSubmissions;
+  exports2.addUserForms = addUserForms;
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
   exports2.areArraysEqual = areArraysEqual;
@@ -16035,7 +15695,6 @@ var __publicField = (obj, key, value) => {
   exports2.componentStageSlice = componentStageSlice;
   exports2.componentTypeReducer = componentTypeReducer;
   exports2.componentTypeSlice = componentTypeSlice;
-  exports2.constructUploadedFilePayloads = constructUploadedFilePayloads;
   exports2.coordinatesAreEqual = coordinatesAreEqual;
   exports2.coordinatesToLiteral = coordinatesToLiteral;
   exports2.coordinatesToPointGeometry = coordinatesToPointGeometry;
@@ -16046,16 +15705,12 @@ var __publicField = (obj, key, value) => {
   exports2.defaultBadgeColor = defaultBadgeColor;
   exports2.defaultStore = defaultStore;
   exports2.deleteComponentType = deleteComponentType;
-  exports2.deleteForm = deleteForm;
-  exports2.deleteFormRevision = deleteFormRevision;
-  exports2.deleteFormRevisionAttachment = deleteFormRevisionAttachment;
-  exports2.deleteFormRevisionAttachments = deleteFormRevisionAttachments;
-  exports2.deleteFormRevisions = deleteFormRevisions;
-  exports2.deleteFormSubmission = deleteFormSubmission;
-  exports2.deleteFormSubmissionAttachment = deleteFormSubmissionAttachment;
-  exports2.deleteFormSubmissionAttachments = deleteFormSubmissionAttachments;
-  exports2.deleteFormSubmissions = deleteFormSubmissions;
   exports2.deleteProject = deleteProject;
+  exports2.deleteUserForm = deleteUserForm;
+  exports2.deleteUserFormRevision = deleteUserFormRevision;
+  exports2.deleteUserFormRevisions = deleteUserFormRevisions;
+  exports2.deleteUserFormSubmission = deleteUserFormSubmission;
+  exports2.deleteUserFormSubmissions = deleteUserFormSubmissions;
   exports2.dequeue = dequeue;
   exports2.deserialize = deserialize;
   exports2.deserializeField = deserializeField;
@@ -16084,13 +15739,7 @@ var __publicField = (obj, key, value) => {
   exports2.fileSlice = fileSlice;
   exports2.fileToBlob = fileToBlob;
   exports2.flipCoordinates = flipCoordinates;
-  exports2.formReducer = formReducer;
-  exports2.formRevisionReducer = formRevisionReducer;
   exports2.formRevisionToSchema = formRevisionToSchema;
-  exports2.formRevisionsSlice = formRevisionsSlice;
-  exports2.formSlice = formSlice;
-  exports2.formSubmissionReducer = formSubmissionReducer;
-  exports2.formSubmissionSlice = formSubmissionSlice;
   exports2.forms = index;
   exports2.fullComponentMarkerSize = fullComponentMarkerSize;
   exports2.generateBadgeColors = generateBadgeColors;
@@ -16166,7 +15815,6 @@ var __publicField = (obj, key, value) => {
   exports2.removeFavouriteProjectId = removeFavouriteProjectId;
   exports2.removeIssue = removeIssue;
   exports2.removeIssueAttachment = removeIssueAttachment;
-  exports2.removeIssueAttachments = removeIssueAttachments;
   exports2.removeIssueComment = removeIssueComment;
   exports2.removeIssueComments = removeIssueComments;
   exports2.removeIssueUpdate = removeIssueUpdate;
@@ -16219,8 +15867,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectAttachmentsOfComponentTypeByType = selectAttachmentsOfComponentTypeByType;
   exports2.selectAttachmentsOfDocument = selectAttachmentsOfDocument;
   exports2.selectAttachmentsOfDocumentByType = selectAttachmentsOfDocumentByType;
-  exports2.selectAttachmentsOfFormRevision = selectAttachmentsOfFormRevision;
-  exports2.selectAttachmentsOfFormSubmission = selectAttachmentsOfFormSubmission;
   exports2.selectAttachmentsOfIssue = selectAttachmentsOfIssue;
   exports2.selectAttachmentsOfIssueByType = selectAttachmentsOfIssueByType;
   exports2.selectAttachmentsOfProject = selectAttachmentsOfProject;
@@ -16236,11 +15882,11 @@ var __publicField = (obj, key, value) => {
   exports2.selectCompletedStageIdsForComponent = selectCompletedStageIdsForComponent;
   exports2.selectCompletedStages = selectCompletedStages;
   exports2.selectComponent = selectComponent;
-  exports2.selectComponentAttachment = selectComponentAttachment;
   exports2.selectComponentAttachmentMapping = selectComponentAttachmentMapping;
+  exports2.selectComponentSubmissionMapping = selectComponentSubmissionMapping;
   exports2.selectComponentType = selectComponentType;
-  exports2.selectComponentTypeAttachment = selectComponentTypeAttachment;
   exports2.selectComponentTypeAttachmentMapping = selectComponentTypeAttachmentMapping;
+  exports2.selectComponentTypeForm = selectComponentTypeForm;
   exports2.selectComponentTypeFromComponent = selectComponentTypeFromComponent;
   exports2.selectComponentTypeFromComponents = selectComponentTypeFromComponents;
   exports2.selectComponentTypeStagesMapping = selectComponentTypeStagesMapping;
@@ -16256,7 +15902,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectCurrentUser = selectCurrentUser;
   exports2.selectDeletedRequests = selectDeletedRequests;
   exports2.selectDocument = selectDocument;
-  exports2.selectDocumentAttachment = selectDocumentAttachment;
   exports2.selectDocumentAttachmentMapping = selectDocumentAttachmentMapping;
   exports2.selectDocuments = selectDocuments;
   exports2.selectDocumentsMapping = selectDocumentsMapping;
@@ -16270,24 +15915,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectExpandedSections = selectExpandedSections;
   exports2.selectFavouriteProjects = selectFavouriteProjects;
   exports2.selectFileAttachmentsOfIssue = selectFileAttachmentsOfIssue;
-  exports2.selectFilteredForms = selectFilteredForms;
-  exports2.selectForm = selectForm;
-  exports2.selectFormMapping = selectFormMapping;
-  exports2.selectFormOfComponentType = selectFormOfComponentType;
+  exports2.selectFilteredUserForms = selectFilteredUserForms;
   exports2.selectFormRevision = selectFormRevision;
-  exports2.selectFormRevisionMapping = selectFormRevisionMapping;
-  exports2.selectFormRevisions = selectFormRevisions;
-  exports2.selectFormRevisionsOfForm = selectFormRevisionsOfForm;
-  exports2.selectFormSubmission = selectFormSubmission;
-  exports2.selectFormSubmissionAttachmentsMapping = selectFormSubmissionAttachmentsMapping;
-  exports2.selectFormSubmissions = selectFormSubmissions;
-  exports2.selectFormSubmissionsByComponents = selectFormSubmissionsByComponents;
-  exports2.selectFormSubmissionsMapping = selectFormSubmissionsMapping;
-  exports2.selectFormSubmissionsOfComponent = selectFormSubmissionsOfComponent;
-  exports2.selectFormSubmissionsOfForm = selectFormSubmissionsOfForm;
-  exports2.selectFormSubmissionsOfIssue = selectFormSubmissionsOfIssue;
-  exports2.selectFormsCount = selectFormsCount;
-  exports2.selectGeneralFormCount = selectGeneralFormCount;
   exports2.selectHiddenCategoryCount = selectHiddenCategoryCount;
   exports2.selectHiddenComponentTypeIds = selectHiddenComponentTypeIds;
   exports2.selectIsFetchingInitialData = selectIsFetchingInitialData;
@@ -16295,17 +15924,16 @@ var __publicField = (obj, key, value) => {
   exports2.selectIsLoading = selectIsLoading;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
   exports2.selectIssue = selectIssue;
-  exports2.selectIssueAttachment = selectIssueAttachment;
   exports2.selectIssueAttachmentMapping = selectIssueAttachmentMapping;
   exports2.selectIssueAttachments = selectIssueAttachments;
   exports2.selectIssueMapping = selectIssueMapping;
   exports2.selectIssueUpdateMapping = selectIssueUpdateMapping;
   exports2.selectIssueUpdatesOfIssue = selectIssueUpdatesOfIssue;
   exports2.selectIssues = selectIssues;
-  exports2.selectLatestFormRevisionByForm = selectLatestFormRevisionByForm;
-  exports2.selectLatestFormRevisionOfForm = selectLatestFormRevisionOfForm;
-  exports2.selectLatestFormRevisionsOfComponentTypes = selectLatestFormRevisionsOfComponentTypes;
+  exports2.selectLatestFormRevision = selectLatestFormRevision;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
+  exports2.selectLatestRevisionByFormId = selectLatestRevisionByFormId;
+  exports2.selectLatestRevisionsFromComponentTypeIds = selectLatestRevisionsFromComponentTypeIds;
   exports2.selectLicense = selectLicense;
   exports2.selectLicenseForProject = selectLicenseForProject;
   exports2.selectLicenses = selectLicenses;
@@ -16314,6 +15942,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectMapStyle = selectMapStyle;
   exports2.selectNumberOfComponentTypesMatchingCaseInsensitiveName = selectNumberOfComponentTypesMatchingCaseInsensitiveName;
   exports2.selectNumberOfComponentsOfComponentType = selectNumberOfComponentsOfComponentType;
+  exports2.selectNumberOfGeneralUserForms = selectNumberOfGeneralUserForms;
+  exports2.selectNumberOfUserForms = selectNumberOfUserForms;
   exports2.selectOrganization = selectOrganization;
   exports2.selectOrganizationAccess = selectOrganizationAccess;
   exports2.selectOrganizationAccessForUser = selectOrganizationAccessForUser;
@@ -16341,6 +15971,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectRecentIssuesAsSearchResults = selectRecentIssuesAsSearchResults;
   exports2.selectRecentProjects = selectRecentProjects;
   exports2.selectRehydrated = selectRehydrated;
+  exports2.selectRevisionAttachments = selectRevisionAttachments;
+  exports2.selectRevisionsForForm = selectRevisionsForForm;
   exports2.selectRootDocuments = selectRootDocuments;
   exports2.selectShowTooltips = selectShowTooltips;
   exports2.selectSortedEmailDomains = selectSortedEmailDomains;
@@ -16355,10 +15987,16 @@ var __publicField = (obj, key, value) => {
   exports2.selectStagesFromComponentType = selectStagesFromComponentType;
   exports2.selectStagesFromComponentTypeIds = selectStagesFromComponentTypeIds;
   exports2.selectStagesFromStageIds = selectStagesFromStageIds;
+  exports2.selectSubmissionAttachments = selectSubmissionAttachments;
+  exports2.selectSubmissionsForComponent = selectSubmissionsForComponent;
+  exports2.selectSubmissionsForForm = selectSubmissionsForForm;
+  exports2.selectSubmissionsForIssue = selectSubmissionsForIssue;
   exports2.selectUploadUrl = selectUploadUrl;
   exports2.selectUsedColors = selectUsedColors;
   exports2.selectUser = selectUser;
-  exports2.selectUserFormRevisionAttachmentsMapping = selectUserFormRevisionAttachmentsMapping;
+  exports2.selectUserForm = selectUserForm;
+  exports2.selectUserFormMapping = selectUserFormMapping;
+  exports2.selectUserFormSubmission = selectUserFormSubmission;
   exports2.selectUsersAsMapping = selectUsersAsMapping;
   exports2.selectVisibleStatuses = selectVisibleStatuses;
   exports2.selectVisibleUserIds = selectVisibleUserIds;
@@ -16385,13 +16023,6 @@ var __publicField = (obj, key, value) => {
   exports2.setEnableClustering = setEnableClustering;
   exports2.setEnableDuplicateIssues = setEnableDuplicateIssues;
   exports2.setEnablePlacementMode = setEnablePlacementMode;
-  exports2.setFormRevision = setFormRevision;
-  exports2.setFormRevisionAttachments = setFormRevisionAttachments;
-  exports2.setFormRevisions = setFormRevisions;
-  exports2.setFormSubmission = setFormSubmission;
-  exports2.setFormSubmissionAttachments = setFormSubmissionAttachments;
-  exports2.setFormSubmissions = setFormSubmissions;
-  exports2.setForms = setForms;
   exports2.setIsFetchingInitialData = setIsFetchingInitialData;
   exports2.setIsImportingProjectFile = setIsImportingProjectFile;
   exports2.setIsLoading = setIsLoading;
@@ -16416,6 +16047,9 @@ var __publicField = (obj, key, value) => {
   exports2.setTokens = setTokens;
   exports2.setTourStep = setTourStep;
   exports2.setUploadUrl = setUploadUrl;
+  exports2.setUserFormRevisionAttachments = setUserFormRevisionAttachments;
+  exports2.setUserFormSubmissionAttachments = setUserFormSubmissionAttachments;
+  exports2.setUserFormSubmissions = setUserFormSubmissions;
   exports2.setUsers = setUsers;
   exports2.setVisibleStatuses = setVisibleStatuses;
   exports2.setVisibleUserIds = setVisibleUserIds;
@@ -16440,14 +16074,11 @@ var __publicField = (obj, key, value) => {
   exports2.updateComponentTypeAttachment = updateComponentTypeAttachment;
   exports2.updateDocumentAttachment = updateDocumentAttachment;
   exports2.updateDocuments = updateDocuments;
-  exports2.updateFormSubmission = updateFormSubmission;
-  exports2.updateFormSubmissionAttachments = updateFormSubmissionAttachments;
-  exports2.updateFormSubmissions = updateFormSubmissions;
   exports2.updateIssue = updateIssue;
   exports2.updateIssueAttachment = updateIssueAttachment;
-  exports2.updateIssueAttachments = updateIssueAttachments;
   exports2.updateLicense = updateLicense;
   exports2.updateOrCreateProject = updateOrCreateProject;
+  exports2.updateOrCreateUserFormSubmission = updateOrCreateUserFormSubmission;
   exports2.updateOrganizationAccess = updateOrganizationAccess;
   exports2.updateProjectAccess = updateProjectAccess;
   exports2.updateProjectAttachment = updateProjectAttachment;
@@ -16461,6 +16092,8 @@ var __publicField = (obj, key, value) => {
   exports2.useFormikInput = useFormikInput;
   exports2.useMemoCompare = useMemoCompare;
   exports2.useSDK = useSDK;
+  exports2.userFormReducer = userFormReducer;
+  exports2.userFormSlice = userFormSlice;
   exports2.userReducer = userReducer;
   exports2.userSlice = userSlice;
   exports2.valueIsFile = valueIsFile;