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

package/dist/overmap-core.js

@@ -631,15 +631,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$p = {
+const initialState$n = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = 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;
@@ -804,19 +804,6 @@ function downloadInMemoryFile(filename, text) {
   element.click();
   document.body.removeChild(element);
 }
-const constructUploadedFilePayloads = async (files) => {
-  const filePayloads = {};
-  for (const file of files) {
-    const sha1 = await hashFile(file);
-    filePayloads[sha1] = {
-      sha1,
-      extension: file.name.split(".").pop() || "",
-      file_type: file.type,
-      size: file.size
-    };
-  }
-  return Object.values(filePayloads);
-};
 const fileToBlob = async (dataUrl) => {
   return (await fetch(dataUrl)).blob();
 };
@@ -1383,7 +1370,7 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$o = {
+const initialState$m = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1393,8 +1380,8 @@ const initialState$o = {
 };
 const categorySlice = 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))
@@ -1563,14 +1550,14 @@ function removeAttachments(state, action) {
     delete state.attachments[attachmentId];
   }
 }
-const initialState$n = {
+const initialState$l = {
   components: {},
   attachments: {}
 };
 const componentSlice = 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 +1670,6 @@ const selectAllComponentAttachments = createSelector(
   [selectComponentAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
-const selectComponentAttachment = (attachmentId) => (state) => {
-  return state.componentReducer.attachments[attachmentId];
-};
 const selectAttachmentsOfComponent = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentAttachments, (_state, componentId) => componentId],
@@ -1726,13 +1710,13 @@ const {
   removeAllComponentsOfType
 } = componentSlice.actions;
 const componentReducer = componentSlice.reducer;
-const initialState$m = {
+const initialState$k = {
   completionsByComponentId: {}
 };
 const componentStageCompletionSlice = 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 +1767,13 @@ const selectCompletedStageIdsForComponent = (component) => (state) => {
   return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
 };
 const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-const initialState$l = {
+const initialState$j = {
   stages: {}
 };
 const componentStageSlice = 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 +1883,15 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
 const componentStageReducer = componentStageSlice.reducer;
-const initialState$k = {
+const initialState$i = {
   componentTypes: {},
   hiddenComponentTypeIds: {},
   attachments: {}
 };
 const componentTypeSlice = 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 +1959,6 @@ const selectAllComponentTypeAttachments = createSelector(
   [selectComponentTypeAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
-const selectComponentTypeAttachment = (attachmentId) => (state) => {
-  return state.componentTypeReducer.attachments[attachmentId];
-};
 const selectAttachmentsOfComponentType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllComponentTypeAttachments, (_state, componentTypeId) => componentTypeId],
@@ -2018,13 +1999,13 @@ const {
   deleteComponentType
 } = componentTypeSlice.actions;
 const componentTypeReducer = componentTypeSlice.reducer;
-const initialState$j = {
+const initialState$h = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = 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 +2062,7 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$i = {
+const initialState$g = {
   issues: {},
   attachments: {},
   comments: {},
@@ -2093,9 +2074,9 @@ const initialState$i = {
 };
 const issueSlice = 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) => {
@@ -2372,9 +2353,6 @@ const selectAttachmentsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectIssueAttachment = (attachmentId) => (root) => {
-  return root.issueReducer.attachments[attachmentId];
-};
 const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectIssueAttachments, (_state, issueId) => issueId],
@@ -2503,15 +2481,15 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$h = {
+const initialState$f = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = 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;
@@ -2538,7 +2516,7 @@ const selectUploadUrl = (sha1) => (state) => {
   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,
@@ -2546,8 +2524,8 @@ const initialState$g = {
 };
 const mapSlice = 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;
@@ -2616,7 +2594,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$f = {
+const initialState$d = {
   users: {},
   currentUser: {
     id: 0,
@@ -2627,8 +2605,8 @@ const initialState$f = {
 };
 const userSlice = 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 = {};
@@ -2690,13 +2668,13 @@ const selectUser = (userId) => (state) => {
 const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
-const initialState$e = {
+const initialState$c = {
   organizationAccesses: {}
 };
 const organizationAccessSlice = 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))
@@ -2759,13 +2737,13 @@ const selectOrganizationAccessUserMapping = (state) => {
   return organizationAccesses;
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
-const initialState$d = {
+const initialState$b = {
   licenses: {}
 };
 const licenseSlice = 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))
@@ -2810,13 +2788,13 @@ const selectLicensesForProjectsMapping = createSelector(
   (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
 );
 const licenseReducer = licenseSlice.reducer;
-const initialState$c = {
+const initialState$a = {
   projectAccesses: {}
 };
 const projectAccessSlice = 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))
@@ -2884,7 +2862,7 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$b = {
+const initialState$9 = {
   projects: {},
   activeProjectId: null,
   recentProjectIds: [],
@@ -2894,7 +2872,7 @@ const initialState$b = {
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$b,
+  initialState: initialState$9,
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -3081,14 +3059,14 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
     }
   )
 );
-const initialState$a = {
+const initialState$8 = {
   organizations: {},
   activeOrganizationId: null
 };
 const organizationSlice = 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) {
@@ -3207,14 +3185,14 @@ const createOfflineAction = (request2, baseUrl) => {
     }
   };
 };
-const initialState$9 = {
+const initialState$7 = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = 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
@@ -3246,7 +3224,7 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$8 = {
+const initialState$6 = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false,
@@ -3254,8 +3232,8 @@ const initialState$8 = {
 };
 const projectFileSlice = 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) {
@@ -3356,12 +3334,12 @@ const selectProjectFiles = createSelector(
 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 = createSlice({
   name: "rehydrated",
-  initialState: initialState$7,
+  initialState: initialState$5,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -3371,7 +3349,7 @@ const rehydratedSlice = createSlice({
 });
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$6 = {
+const initialState$4 = {
   useIssueTemplate: false,
   placementMode: false,
   enableClustering: false,
@@ -3388,8 +3366,8 @@ const initialState$6 = {
 };
 const settingSlice = 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;
@@ -3435,248 +3413,146 @@ const selectAppearance = (state) => state.settingReducer.appearance;
 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 = 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 = 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];
-      }
-    }
-  }
-});
-const {
-  setFormRevision,
-  setFormRevisions,
-  addFormRevision,
-  addFormRevisions,
-  deleteFormRevision,
-  deleteFormRevisions,
-  setFormRevisionAttachments,
-  addFormRevisionAttachment,
-  addFormRevisionAttachments,
-  deleteFormRevisionAttachment,
-  deleteFormRevisionAttachments
-} = formRevisionsSlice.actions;
-const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
-const selectFormRevisions = createSelector(
-  [selectFormRevisionMapping],
-  (formRevisions) => Object.values(formRevisions)
-);
-const selectFormRevision = (formRevisionId) => (state) => {
-  return state.formRevisionReducer.formRevisions[formRevisionId];
-};
-const _selectLatestFormRevision = (formRevisions, formId2) => {
-  let ret = null;
-  for (const candidate of Object.values(formRevisions)) {
-    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
-      ret = candidate;
-    }
-  }
-  if (!ret) {
-    throw new Error("No form revision found for form " + formId2);
-  }
-  return ret;
-};
-const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
-  createSelector([selectFormRevisionMapping, (_state, formId2) => formId2], (revisions, formId2) => {
-    if (!formId2) {
-      throw new Error("formId is required");
-    }
-    return _selectLatestFormRevision(revisions, formId2);
-  })
-);
-const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
-  createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
-    return revisions.filter((revision) => {
-      return revision.form === formId2;
-    });
-  })
-);
-const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      (state) => state.formReducer.forms,
-      selectFormRevisionMapping,
-      (_state, componentTypeIds) => componentTypeIds
-    ],
-    (userForms, revisions, componentTypeIds) => {
-      const componentTypeIdsSet = new Set(componentTypeIds);
-      const ret = {};
-      for (const form of Object.values(userForms)) {
-        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
-          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
-        }
+    deleteUserFormSubmissions: (state, action) => {
+      for (const userFormSubmission of action.payload) {
+        delete state.submissions[userFormSubmission.offline_id];
       }
-      return ret;
-    }
-  )
-);
-const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping], (revisions) => {
-  const latestRevisions = {};
-  for (const revision of Object.values(revisions)) {
-    const formId2 = revision.form;
-    const currentLatestRevision = latestRevisions[formId2];
-    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
-      latestRevisions[formId2] = revision;
-    }
-  }
-  return latestRevisions;
-});
-const selectUserFormRevisionAttachmentsMapping = (state) => {
-  return state.formRevisionReducer.attachments;
-};
-const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
-    (attachments, revisionId) => {
-      return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
-    }
-  )
-);
-const formRevisionReducer = formRevisionsSlice.reducer;
-const initialState$4 = {
-  forms: {}
-};
-const formSlice = createSlice({
-  name: "forms",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
-  reducers: {
-    setForms: (state, action) => {
-      state.forms = {};
-      action.payload.forEach((userForm) => {
-        state.forms[userForm.offline_id] = userForm;
-      });
     },
-    addForm: (state, action) => {
-      state.forms[action.payload.offline_id] = action.payload;
+    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);
       }
@@ -3684,23 +3560,48 @@ const formSlice = createSlice({
     },
     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(
   createSelector(
     [
-      (state) => state.formReducer.forms,
-      (state) => state.formRevisionReducer.formRevisions,
+      (state) => state.userFormReducer.userForms,
+      (state) => state.userFormReducer.revisions,
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
@@ -3734,188 +3635,63 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual$1 } }
   )
 );
-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(
   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 = createSelector([selectFormMapping], (userForms) => {
-  return Object.keys(userForms).length;
-});
-const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
-  return Object.values(userForms).filter((form) => !form.component_type).length;
-});
-const formReducer = formSlice.reducer;
-const initialState$3 = {
-  formSubmissions: {},
-  attachments: {}
-};
-const formSubmissionSlice = createSlice({
-  name: "formSubmissions",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
-  reducers: {
-    setFormSubmission: (state, action) => {
-      state.formSubmissions[action.payload.offline_id] = action.payload;
-    },
-    setFormSubmissions: (state, action) => {
-      state.formSubmissions = {};
-      for (const submission of action.payload) {
-        state.formSubmissions[submission.offline_id] = submission;
-      }
-    },
-    addFormSubmission: (state, action) => {
-      if (state.formSubmissions[action.payload.offline_id] !== void 0) {
-        throw new Error(`Submission with offline_id ${action.payload.offline_id} already exists`);
-      }
-      state.formSubmissions[action.payload.offline_id] = action.payload;
-    },
-    addFormSubmissions: (state, action) => {
-      for (const submission of action.payload) {
-        if (state.formSubmissions[submission.offline_id] !== void 0) {
-          throw new Error(`Submission with offline_id ${submission.offline_id} already exists`);
-        }
-      }
-      for (const submission of action.payload) {
-        state.formSubmissions[submission.offline_id] = submission;
-      }
-    },
-    updateFormSubmission: (state, action) => {
-      if (state.formSubmissions[action.payload.offline_id] === void 0) {
-        throw new Error(`Submission with offline_id ${action.payload.offline_id} does not exist`);
-      }
-      state.formSubmissions[action.payload.offline_id] = action.payload;
-    },
-    updateFormSubmissions: (state, action) => {
-      for (const submission of action.payload) {
-        if (state.formSubmissions[submission.offline_id] === void 0) {
-          throw new Error(`Submission with offline_id ${submission.offline_id} does not exist`);
-        }
-      }
-      for (const submission of action.payload) {
-        state.formSubmissions[submission.offline_id] = submission;
-      }
-    },
-    deleteFormSubmission: (state, action) => {
-      if (state.formSubmissions[action.payload] === void 0) {
-        throw new Error(`Submission with offline_id ${action.payload} does not exist`);
-      }
-      delete state.formSubmissions[action.payload];
-    },
-    deleteFormSubmissions: (state, action) => {
-      for (const offlineId of action.payload) {
-        if (state.formSubmissions[offlineId] === void 0) {
-          throw new Error(`Submission with offline_id ${offlineId} does not exist`);
-        }
-        delete state.formSubmissions[offlineId];
-      }
-      for (const offlineId of action.payload) {
-        delete state.formSubmissions[offlineId];
-      }
-    },
-    // Attachments
-    addFormSubmissionAttachment: (state, action) => {
-      if (state.attachments[action.payload.offline_id] !== void 0) {
-        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
-      }
-      state.attachments[action.payload.offline_id] = action.payload;
-    },
-    addFormSubmissionAttachments: (state, action) => {
-      for (const attachment of action.payload) {
-        if (state.attachments[attachment.offline_id] !== void 0) {
-          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
-        }
-      }
-      for (const attachment of action.payload) {
-        state.attachments[attachment.offline_id] = attachment;
-      }
-    },
-    // We only need a multi set for attachments because they are not updated, only added and deleted
-    setFormSubmissionAttachments: (state, action) => {
-      state.attachments = {};
-      for (const attachment of action.payload) {
-        state.attachments[attachment.offline_id] = attachment;
-      }
-    },
-    updateFormSubmissionAttachments: (state, action) => {
-      for (const attachment of action.payload) {
-        if (state.attachments[attachment.offline_id] === void 0) {
-          throw new Error(`Attachment with offline_id ${attachment.offline_id} does not exist`);
-        }
-      }
-      for (const attachment of action.payload) {
-        state.attachments[attachment.offline_id] = attachment;
-      }
-    },
-    // The delete actions for UserFormSubmissionAttachments are not used in the app, but are included for completeness
-    // Could be used if editing a submission is ever supported, will be applicable for supporting tip tap content in submissions
-    deleteFormSubmissionAttachment: (state, action) => {
-      if (state.attachments[action.payload] === void 0) {
-        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
-      }
-      delete state.attachments[action.payload];
-    },
-    deleteFormSubmissionAttachments: (state, action) => {
-      for (const offlineId of action.payload) {
-        if (state.attachments[offlineId] === void 0) {
-          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
-        }
-        delete state.attachments[offlineId];
-      }
-    }
-  }
-});
-const {
-  setFormSubmission,
-  setFormSubmissions,
-  addFormSubmission,
-  addFormSubmissions,
-  updateFormSubmission,
-  updateFormSubmissions,
-  deleteFormSubmission,
-  deleteFormSubmissions,
-  addFormSubmissionAttachment,
-  addFormSubmissionAttachments,
-  setFormSubmissionAttachments,
-  updateFormSubmissionAttachments,
-  deleteFormSubmissionAttachment,
-  deleteFormSubmissionAttachments
-} = formSubmissionSlice.actions;
-const selectFormSubmissionsMapping = (state) => {
-  return state.formSubmissionReducer.formSubmissions;
-};
-const selectFormSubmissions = createSelector(
-  [selectFormSubmissionsMapping],
-  (submissions) => {
-    return Object.values(submissions);
-  }
+const selectUserForm = (formId2) => (state) => {
+  return state.userFormReducer.userForms[formId2];
+};
+const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
+const selectUserFormSubmission = (submissionId) => (state) => {
+  return state.userFormReducer.submissions[submissionId];
+};
+const selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
+const selectRevisionMapping = (state) => state.userFormReducer.revisions;
+const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
+const selectRevisionsForForm = restructureCreateSelectorWithArgs(
+  createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+    return revisions.filter((revision) => {
+      return revision.form === formId2;
+    });
+  })
 );
-const selectFormSubmission = (submissionId) => (state) => {
-  return state.formSubmissionReducer.formSubmissions[submissionId];
-};
-const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
+const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
   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(
   createSelector(
-    [selectFormSubmissions, (_state, issueId) => issueId],
+    [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
     (submissions, issueId) => {
       return Object.values(submissions).filter((submission) => {
         return submission.issue === issueId;
@@ -3923,9 +3699,9 @@ const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
+const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectFormSubmissions, (_state, componentId) => componentId],
+    [selectSubmissions, (_state, componentId) => componentId],
     (submissions, componentId) => {
       return submissions.filter((submission) => {
         return submission.component === componentId;
@@ -3933,8 +3709,8 @@ const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectFormSubmissionsByComponents = createSelector(
-  [selectFormSubmissionsMapping, selectComponentsMapping],
+const selectComponentSubmissionMapping = createSelector(
+  [selectSubmissionMapping, selectComponentsMapping],
   (submissions, components) => {
     var _a2;
     const componentSubmissionMapping = {};
@@ -3950,18 +3726,54 @@ const selectFormSubmissionsByComponents = createSelector(
     return componentSubmissionMapping;
   }
 );
-const selectFormSubmissionAttachmentsMapping = (state) => {
-  return state.formSubmissionReducer.attachments;
+const selectUserFormMapping = (state) => {
+  return state.userFormReducer.userForms;
 };
-const selectAttachmentsOfFormSubmission = restructureCreateSelectorWithArgs(
+const selectComponentTypeForm = restructureCreateSelectorWithArgs(
   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 selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      selectUserFormMapping,
+      selectRevisionMapping,
+      (_state, componentTypeIds) => componentTypeIds
+    ],
+    (userForms, revisions, componentTypeIds) => {
+      const componentTypeIdsSet = new Set(componentTypeIds);
+      const ret = {};
+      for (const form of Object.values(userForms)) {
+        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
+          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
+        }
+      }
+      return ret;
     }
   )
 );
-const formSubmissionReducer = formSubmissionSlice.reducer;
+const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (revisions) => {
+  const latestRevisions = {};
+  for (const revision of Object.values(revisions)) {
+    const formId2 = revision.form;
+    const currentLatestRevision = latestRevisions[formId2];
+    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
+      latestRevisions[formId2] = revision;
+    }
+  }
+  return latestRevisions;
+});
+const selectNumberOfUserForms = createSelector([selectUserFormMapping], (userForms) => {
+  return Object.keys(userForms).length;
+});
+const selectNumberOfGeneralUserForms = createSelector([selectUserFormMapping], (userForms) => {
+  return Object.values(userForms).filter((form) => !form.component_type).length;
+});
+const userFormReducer = userFormSlice.reducer;
 const initialState$2 = {
   emailDomains: {}
 };
@@ -4189,9 +4001,6 @@ const selectAllDocumentAttachments = createSelector(
   [selectDocumentAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
-const selectDocumentAttachment = (attachmentId) => (state) => {
-  return state.documentsReducer.attachments[attachmentId];
-};
 const selectAttachmentsOfDocument = restructureCreateSelectorWithArgs(
   createSelector(
     [selectAllDocumentAttachments, (_state, documentId) => documentId],
@@ -4259,9 +4068,7 @@ const overmapReducers = {
   projectFileReducer,
   rehydratedReducer,
   settingReducer,
-  formReducer,
-  formRevisionReducer,
-  formSubmissionReducer,
+  userFormReducer,
   userReducer,
   workspaceReducer,
   emailDomainsReducer,
@@ -4314,7 +4121,9 @@ function handleWorkspaceRemoval(draft, action) {
       throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
     }
   }
-  const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
+  const indexedForms = Object.values(draft.userFormReducer.userForms).filter(
+    (form) => form.index_workspace === workspaceId
+  );
   for (const form of indexedForms) {
     form.index_workspace = mainWorkspace.offline_id;
   }
@@ -6951,7 +6760,7 @@ class UserFormService extends BaseApiService {
           ...revisionAttachmentPayload,
           file: URL.createObjectURL(image)
         };
-        store.dispatch(addFormRevisionAttachment(offlinePayload));
+        store.dispatch(addUserFormRevisionAttachment(offlinePayload));
         return attach;
       });
     });
@@ -6985,8 +6794,8 @@ class UserFormService extends BaseApiService {
       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,
@@ -7004,8 +6813,8 @@ class UserFormService extends BaseApiService {
     });
     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);
@@ -7047,7 +6856,7 @@ class UserFormService extends BaseApiService {
       revision: "Pending",
       form: formId2
     };
-    store.dispatch(addFormRevision(fullRevision));
+    store.dispatch(addUserFormRevision(fullRevision));
     const promise = this.enqueueRequest({
       description: "Create form revision",
       method: HttpMethod.PATCH,
@@ -7061,9 +6870,9 @@ class UserFormService extends BaseApiService {
     });
     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];
@@ -7105,19 +6914,19 @@ class UserFormService extends BaseApiService {
   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",
@@ -7127,12 +6936,12 @@ class UserFormService extends BaseApiService {
         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;
     }
@@ -7146,15 +6955,16 @@ class UserFormService extends BaseApiService {
       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) {
@@ -7169,13 +6979,17 @@ const separateFilesFromValues = (values) => {
       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 = [];
@@ -7185,27 +6999,24 @@ class UserFormSubmissionService extends BaseApiService {
           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;
@@ -7219,165 +7030,70 @@ class UserFormSubmissionService extends BaseApiService {
     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]
+      blocks: [fullResult.offline_id]
     });
-    promise.then((createdSubmission) => {
-      store.dispatch(setFormSubmission(createdSubmission));
-    }).catch(() => {
-      store.dispatch(setFormSubmission(submissionToBeUpdated));
-    });
-    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({
@@ -7388,8 +7104,10 @@ class UserFormSubmissionService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      store.dispatch(addActiveProjectFormSubmissionsCount(1));
-      store.dispatch(addFormSubmission(submission));
+      if (submission) {
+        store.dispatch(addActiveProjectFormSubmissionsCount(1));
+        store.dispatch(updateOrCreateUserFormSubmission(submission));
+      }
       throw e;
     }
   }
@@ -7403,7 +7121,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setFormSubmissions(submissions));
+    store.dispatch(setUserFormSubmissions(submissions));
     const attachments = await this.enqueueRequest({
       description: "Fetch form attachments",
       method: HttpMethod.GET,
@@ -7411,7 +7129,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setFormSubmissionAttachments(attachments));
+    store.dispatch(setUserFormSubmissionAttachments(attachments));
   }
 }
 class WorkspaceService extends BaseApiService {
@@ -14270,7 +13988,7 @@ const initialFormValues = (fields, values) => {
 };
 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 useMemo(() => {
     if (!revision || !attachments)
       return revision;
@@ -14367,7 +14085,7 @@ const FormSubmissionViewer = memo(
       return formRevisionToSchema(revisionWithImages, { readonly: true });
     }, [revisionWithImages]);
     const submissionValuesWithAttachments = 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);
@@ -14417,8 +14135,8 @@ const FormBrowser = memo(
       }
       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
@@ -14451,7 +14169,7 @@ const FormBrowser = memo(
     const handleChange = 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__ */ jsxs(Flex$1, { ref, direction: "column", gap: "2", children: [
@@ -14545,13 +14263,16 @@ const FormSubmissionBrowserEntry = memo((props) => {
   const { submission, onSubmissionClick, compact, labelType, rowDecorator } = props;
   const currentUser = useAppSelector(selectCurrentUser);
   const createdBy = useAppSelector(selectUser("created_by" in submission ? submission.created_by : currentUser.id));
-  const dateToUse = 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
@@ -14582,6 +14303,10 @@ const FormSubmissionBrowserEntry = memo((props) => {
   return row;
 });
 FormSubmissionBrowserEntry.displayName = "FormSubmissionBrowserEntry";
+const getCreatedAtOrSubmittedAtDate = (submission) => {
+  const date = "created_at" in submission ? submission.created_at : submission.submitted_at;
+  return new Date(date);
+};
 const FormSubmissionBrowser = memo((props) => {
   const {
     formId: formId2,
@@ -14595,10 +14320,10 @@ const FormSubmissionBrowser = memo((props) => {
   if (!!formId2 === !!propSubmissions) {
     throw new Error("Either formId or submissions must be provided, but not both.");
   }
-  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectFormSubmissionsOfForm(formId2));
+  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectSubmissionsForForm(formId2));
   const sortedSubmissions = 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]
   );
@@ -15916,7 +15641,6 @@ export {
   VerificationCodeType,
   WorkspaceService,
   YELLOW,
-  _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
   addActiveProjectFormSubmissionsCount,
@@ -15934,16 +15658,6 @@ export {
   addDocuments,
   addEmailDomain,
   addFavouriteProjectId,
-  addForm,
-  addFormRevision,
-  addFormRevisionAttachment,
-  addFormRevisionAttachments,
-  addFormRevisions,
-  addFormSubmission,
-  addFormSubmissionAttachment,
-  addFormSubmissionAttachments,
-  addFormSubmissions,
-  addForms,
   addIssue,
   addIssueAttachment,
   addIssueAttachments,
@@ -15964,6 +15678,13 @@ export {
   addStageCompletions,
   addStages,
   addToRecentIssues,
+  addUserForm,
+  addUserFormRevision,
+  addUserFormRevisionAttachment,
+  addUserFormRevisions,
+  addUserFormSubmissionAttachment,
+  addUserFormSubmissions,
+  addUserForms,
   addUsers,
   addWorkspace,
   areArraysEqual,
@@ -15984,7 +15705,6 @@ export {
   componentStageSlice,
   componentTypeReducer,
   componentTypeSlice,
-  constructUploadedFilePayloads,
   coordinatesAreEqual,
   coordinatesToLiteral,
   coordinatesToPointGeometry,
@@ -15995,16 +15715,12 @@ export {
   defaultBadgeColor,
   defaultStore,
   deleteComponentType,
-  deleteForm,
-  deleteFormRevision,
-  deleteFormRevisionAttachment,
-  deleteFormRevisionAttachments,
-  deleteFormRevisions,
-  deleteFormSubmission,
-  deleteFormSubmissionAttachment,
-  deleteFormSubmissionAttachments,
-  deleteFormSubmissions,
   deleteProject,
+  deleteUserForm,
+  deleteUserFormRevision,
+  deleteUserFormRevisions,
+  deleteUserFormSubmission,
+  deleteUserFormSubmissions,
   dequeue,
   deserialize,
   deserializeField,
@@ -16033,13 +15749,7 @@ export {
   fileSlice,
   fileToBlob,
   flipCoordinates,
-  formReducer,
-  formRevisionReducer,
   formRevisionToSchema,
-  formRevisionsSlice,
-  formSlice,
-  formSubmissionReducer,
-  formSubmissionSlice,
   index as forms,
   fullComponentMarkerSize,
   generateBadgeColors,
@@ -16167,8 +15877,6 @@ export {
   selectAttachmentsOfComponentTypeByType,
   selectAttachmentsOfDocument,
   selectAttachmentsOfDocumentByType,
-  selectAttachmentsOfFormRevision,
-  selectAttachmentsOfFormSubmission,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
   selectAttachmentsOfProject,
@@ -16184,11 +15892,11 @@ export {
   selectCompletedStageIdsForComponent,
   selectCompletedStages,
   selectComponent,
-  selectComponentAttachment,
   selectComponentAttachmentMapping,
+  selectComponentSubmissionMapping,
   selectComponentType,
-  selectComponentTypeAttachment,
   selectComponentTypeAttachmentMapping,
+  selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
   selectComponentTypeStagesMapping,
@@ -16204,7 +15912,6 @@ export {
   selectCurrentUser,
   selectDeletedRequests,
   selectDocument,
-  selectDocumentAttachment,
   selectDocumentAttachmentMapping,
   selectDocuments,
   selectDocumentsMapping,
@@ -16218,24 +15925,8 @@ export {
   selectExpandedSections,
   selectFavouriteProjects,
   selectFileAttachmentsOfIssue,
-  selectFilteredForms,
-  selectForm,
-  selectFormMapping,
-  selectFormOfComponentType,
+  selectFilteredUserForms,
   selectFormRevision,
-  selectFormRevisionMapping,
-  selectFormRevisions,
-  selectFormRevisionsOfForm,
-  selectFormSubmission,
-  selectFormSubmissionAttachmentsMapping,
-  selectFormSubmissions,
-  selectFormSubmissionsByComponents,
-  selectFormSubmissionsMapping,
-  selectFormSubmissionsOfComponent,
-  selectFormSubmissionsOfForm,
-  selectFormSubmissionsOfIssue,
-  selectFormsCount,
-  selectGeneralFormCount,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -16243,17 +15934,16 @@ export {
   selectIsLoading,
   selectIsLoggedIn,
   selectIssue,
-  selectIssueAttachment,
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueMapping,
   selectIssueUpdateMapping,
   selectIssueUpdatesOfIssue,
   selectIssues,
-  selectLatestFormRevisionByForm,
-  selectLatestFormRevisionOfForm,
-  selectLatestFormRevisionsOfComponentTypes,
+  selectLatestFormRevision,
   selectLatestRetryTime,
+  selectLatestRevisionByFormId,
+  selectLatestRevisionsFromComponentTypeIds,
   selectLicense,
   selectLicenseForProject,
   selectLicenses,
@@ -16262,6 +15952,8 @@ export {
   selectMapStyle,
   selectNumberOfComponentTypesMatchingCaseInsensitiveName,
   selectNumberOfComponentsOfComponentType,
+  selectNumberOfGeneralUserForms,
+  selectNumberOfUserForms,
   selectOrganization,
   selectOrganizationAccess,
   selectOrganizationAccessForUser,
@@ -16289,6 +15981,8 @@ export {
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,
   selectRehydrated,
+  selectRevisionAttachments,
+  selectRevisionsForForm,
   selectRootDocuments,
   selectShowTooltips,
   selectSortedEmailDomains,
@@ -16303,10 +15997,16 @@ export {
   selectStagesFromComponentType,
   selectStagesFromComponentTypeIds,
   selectStagesFromStageIds,
+  selectSubmissionAttachments,
+  selectSubmissionsForComponent,
+  selectSubmissionsForForm,
+  selectSubmissionsForIssue,
   selectUploadUrl,
   selectUsedColors,
   selectUser,
-  selectUserFormRevisionAttachmentsMapping,
+  selectUserForm,
+  selectUserFormMapping,
+  selectUserFormSubmission,
   selectUsersAsMapping,
   selectVisibleStatuses,
   selectVisibleUserIds,
@@ -16333,13 +16033,6 @@ export {
   setEnableClustering,
   setEnableDuplicateIssues,
   setEnablePlacementMode,
-  setFormRevision,
-  setFormRevisionAttachments,
-  setFormRevisions,
-  setFormSubmission,
-  setFormSubmissionAttachments,
-  setFormSubmissions,
-  setForms,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
   setIsLoading,
@@ -16364,6 +16057,9 @@ export {
   setTokens,
   setTourStep,
   setUploadUrl,
+  setUserFormRevisionAttachments,
+  setUserFormSubmissionAttachments,
+  setUserFormSubmissions,
   setUsers,
   setVisibleStatuses,
   setVisibleUserIds,
@@ -16388,13 +16084,11 @@ export {
   updateComponentTypeAttachment,
   updateDocumentAttachment,
   updateDocuments,
-  updateFormSubmission,
-  updateFormSubmissionAttachments,
-  updateFormSubmissions,
   updateIssue,
   updateIssueAttachment,
   updateLicense,
   updateOrCreateProject,
+  updateOrCreateUserFormSubmission,
   updateOrganizationAccess,
   updateProjectAccess,
   updateProjectAttachment,
@@ -16408,6 +16102,8 @@ export {
   useFormikInput,
   useMemoCompare,
   useSDK,
+  userFormReducer,
+  userFormSlice,
   userReducer,
   userSlice,
   valueIsFile,