@overmap-ai/core 1.0.51-add-submitted-at-to-form-revisions.1 → 1.0.51-attachment-creation-flows.0

package/dist/overmap-core.umd.cjs

@@ -668,15 +668,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$n = {
+  const initialState$p = {
     accessToken: "",
     refreshToken: "",
     isLoggedIn: false
   };
   const authSlice = toolkit.createSlice({
     name: "auth",
-    initialState: initialState$n,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+    initialState: initialState$p,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
     reducers: {
       setTokens: (state, action) => {
         state.accessToken = action.payload.accessToken;
@@ -841,6 +841,19 @@ 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();
   };
@@ -1407,7 +1420,7 @@ var __publicField = (obj, key, value) => {
       return getLocalDateString(date);
     return relative.format(days, "days");
   });
-  const initialState$m = {
+  const initialState$o = {
     categories: {},
     usedCategoryColors: [],
     categoryVisibility: {
@@ -1417,8 +1430,8 @@ var __publicField = (obj, key, value) => {
   };
   const categorySlice = toolkit.createSlice({
     name: "categories",
-    initialState: initialState$m,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+    initialState: initialState$o,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
     reducers: {
       setCategories: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -1551,6 +1564,9 @@ var __publicField = (obj, key, value) => {
     return hiddenCategoryCount;
   };
   const categoryReducer = categorySlice.reducer;
+  function setAttachment(state, action) {
+    state.attachments[action.payload.offline_id] = action.payload;
+  }
   function setAttachments(state, action) {
     state.attachments = {};
     for (const attachment of action.payload) {
@@ -1575,6 +1591,15 @@ 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];
@@ -1587,14 +1612,14 @@ var __publicField = (obj, key, value) => {
       delete state.attachments[attachmentId];
     }
   }
-  const initialState$l = {
+  const initialState$n = {
     components: {},
     attachments: {}
   };
   const componentSlice = toolkit.createSlice({
     name: "components",
-    initialState: initialState$l,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+    initialState: initialState$n,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
     reducers: {
       addComponent: (state, action) => {
         state.components[action.payload.offline_id] = action.payload;
@@ -1608,12 +1633,6 @@ var __publicField = (obj, key, value) => {
         state.components = toOfflineIdRecord(action.payload);
         prevComponents = null;
       },
-      setComponentAttachments: setAttachments,
-      addComponentAttachment: addAttachment,
-      addComponentAttachments: addAttachments,
-      updateComponentAttachment: updateAttachment,
-      removeComponentAttachment: removeAttachment,
-      removeComponentAttachments: removeAttachments,
       updateComponent: (state, action) => {
         if (action.payload.offline_id in state.components) {
           state.components[action.payload.offline_id] = action.payload;
@@ -1638,9 +1657,35 @@ var __publicField = (obj, key, value) => {
           }
         }
         prevComponents = null;
-      }
+      },
+      // Attachments
+      setComponentAttachment: setAttachment,
+      setComponentAttachments: setAttachments,
+      addComponentAttachment: addAttachment,
+      addComponentAttachments: addAttachments,
+      updateComponentAttachment: updateAttachment,
+      updateComponentAttachments: updateAttachments,
+      removeComponentAttachment: removeAttachment,
+      removeComponentAttachments: removeAttachments
     }
   });
+  const {
+    addComponent,
+    updateComponent,
+    removeComponent,
+    addComponentsInBatches,
+    setComponents,
+    removeAllComponentsOfType,
+    // Attachments
+    setComponentAttachment,
+    setComponentAttachments,
+    addComponentAttachment,
+    addComponentAttachments,
+    updateComponentAttachment,
+    updateComponentAttachments,
+    removeComponentAttachment,
+    removeComponentAttachments
+  } = componentSlice.actions;
   let prevComponents = null;
   const selectComponents = (state) => {
     if (!prevComponents) {
@@ -1735,28 +1780,14 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const {
-    addComponent,
-    updateComponent,
-    removeComponent,
-    addComponentsInBatches,
-    setComponents,
-    setComponentAttachments,
-    addComponentAttachment,
-    addComponentAttachments,
-    updateComponentAttachment,
-    removeComponentAttachment,
-    removeComponentAttachments,
-    removeAllComponentsOfType
-  } = componentSlice.actions;
   const componentReducer = componentSlice.reducer;
-  const initialState$k = {
+  const initialState$m = {
     completionsByComponentId: {}
   };
   const componentStageCompletionSlice = toolkit.createSlice({
     name: "componentStageCompletions",
-    initialState: initialState$k,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+    initialState: initialState$m,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
     reducers: {
       addStageCompletion: (state, action) => {
         let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1807,13 +1838,13 @@ var __publicField = (obj, key, value) => {
     return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
   };
   const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-  const initialState$j = {
+  const initialState$l = {
     stages: {}
   };
   const componentStageSlice = toolkit.createSlice({
     name: "componentStages",
-    initialState: initialState$j,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+    initialState: initialState$l,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
     reducers: {
       addStages: (state, action) => {
         Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1923,15 +1954,15 @@ var __publicField = (obj, key, value) => {
   );
   const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
   const componentStageReducer = componentStageSlice.reducer;
-  const initialState$i = {
+  const initialState$k = {
     componentTypes: {},
     hiddenComponentTypeIds: {},
     attachments: {}
   };
   const componentTypeSlice = toolkit.createSlice({
     name: "componentTypes",
-    initialState: initialState$i,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+    initialState: initialState$k,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
     reducers: {
       addComponentType: (state, action) => {
         state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1939,20 +1970,38 @@ var __publicField = (obj, key, value) => {
       setComponentTypes: (state, action) => {
         state.componentTypes = toOfflineIdRecord(action.payload);
       },
-      setComponentTypeAttachments: setAttachments,
-      addComponentTypeAttachment: addAttachment,
-      addComponentTypeAttachments: addAttachments,
-      updateComponentTypeAttachment: updateAttachment,
-      removeComponentTypeAttachment: removeAttachment,
-      removeComponentTypeAttachments: removeAttachments,
       toggleComponentTypeVisibility: (state, action) => {
         state.hiddenComponentTypeIds[action.payload] = !state.hiddenComponentTypeIds[action.payload];
       },
       deleteComponentType: (state, action) => {
         delete state.componentTypes[action.payload];
-      }
+      },
+      // Attachments
+      setComponentTypeAttachment: setAttachment,
+      setComponentTypeAttachments: setAttachments,
+      addComponentTypeAttachment: addAttachment,
+      addComponentTypeAttachments: addAttachments,
+      updateComponentTypeAttachment: updateAttachment,
+      updateComponentTypeAttachments: updateAttachments,
+      removeComponentTypeAttachment: removeAttachment,
+      removeComponentTypeAttachments: removeAttachments
     }
   });
+  const {
+    addComponentType,
+    setComponentTypes,
+    toggleComponentTypeVisibility,
+    deleteComponentType,
+    // Attachmet
+    setComponentTypeAttachment,
+    setComponentTypeAttachments,
+    addComponentTypeAttachment,
+    addComponentTypeAttachments,
+    updateComponentTypeAttachment,
+    updateComponentTypeAttachments,
+    removeComponentTypeAttachment,
+    removeComponentTypeAttachments
+  } = componentTypeSlice.actions;
   const selectComponentTypesMapping = (state) => state.componentTypeReducer.componentTypes;
   const selectComponentTypes = toolkit.createSelector(
     [selectComponentTypesMapping],
@@ -2029,26 +2078,14 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const {
-    addComponentType,
-    setComponentTypes,
-    setComponentTypeAttachments,
-    addComponentTypeAttachment,
-    addComponentTypeAttachments,
-    updateComponentTypeAttachment,
-    removeComponentTypeAttachment,
-    removeComponentTypeAttachments,
-    toggleComponentTypeVisibility,
-    deleteComponentType
-  } = componentTypeSlice.actions;
   const componentTypeReducer = componentTypeSlice.reducer;
-  const initialState$h = {
+  const initialState$j = {
     workspaces: {},
     activeWorkspaceId: null
   };
   const workspaceSlice = toolkit.createSlice({
     name: "workspace",
-    initialState: initialState$h,
+    initialState: initialState$j,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setWorkspaces: (state, action) => {
@@ -2105,7 +2142,7 @@ var __publicField = (obj, key, value) => {
   );
   const workspaceReducer = workspaceSlice.reducer;
   const maxRecentIssues = 10;
-  const initialState$g = {
+  const initialState$i = {
     issues: {},
     attachments: {},
     comments: {},
@@ -2117,9 +2154,9 @@ var __publicField = (obj, key, value) => {
   };
   const issueSlice = toolkit.createSlice({
     name: "issues",
-    initialState: initialState$g,
+    initialState: initialState$i,
     extraReducers: (builder) => builder.addCase("RESET", (state) => {
-      Object.assign(state, initialState$g);
+      Object.assign(state, initialState$i);
     }),
     reducers: {
       setIssues: (state, action) => {
@@ -2130,7 +2167,6 @@ var __publicField = (obj, key, value) => {
           state.issues[issue.offline_id] = issue;
         });
       },
-      setIssueAttachments: setAttachments,
       setIssueUpdates: (state, action) => {
         if (action.payload.filter(onlyUniqueOfflineIds).length !== action.payload.length) {
           throw new Error("Tried to use setIssues reducer with duplicate ID's");
@@ -2150,8 +2186,6 @@ var __publicField = (obj, key, value) => {
         }
         state.issues[action.payload.offline_id] = action.payload;
       },
-      addIssueAttachment: addAttachment,
-      addIssueAttachments: addAttachments,
       addIssueUpdate: (state, action) => {
         if (action.payload.offline_id in state.updates) {
           throw new Error(`Tried to add duplicate issue update with offline_id: ${action.payload.offline_id}`);
@@ -2173,7 +2207,6 @@ var __publicField = (obj, key, value) => {
           throw new Error(`Tried to update issue with ID that doesn't exist: ${action.payload.offline_id}`);
         }
       },
-      updateIssueAttachment: updateAttachment,
       removeIssue: (state, action) => {
         if (action.payload in state.issues) {
           delete state.issues[action.payload];
@@ -2181,7 +2214,6 @@ var __publicField = (obj, key, value) => {
           throw new Error(`Failed to remove issue because ID doesn't exist: ${action.payload}`);
         }
       },
-      removeIssueAttachment: removeAttachment,
       removeIssueUpdate: (state, action) => {
         if (action.payload in state.updates) {
           delete state.updates[action.payload];
@@ -2278,19 +2310,25 @@ var __publicField = (obj, key, value) => {
         if (indexToRemove !== -1) {
           state.recentIssueIds.splice(indexToRemove, 1);
         }
-      }
+      },
+      // Attachments
+      setIssueAttachment: setAttachment,
+      setIssueAttachments: setAttachments,
+      addIssueAttachment: addAttachment,
+      addIssueAttachments: addAttachments,
+      updateIssueAttachment: updateAttachment,
+      updateIssueAttachments: updateAttachments,
+      removeIssueAttachment: removeAttachment,
+      removeIssueAttachments: removeAttachments
     }
   });
   const {
-    addIssueAttachment,
-    addIssueAttachments,
     addIssue,
     addIssueUpdate,
     addIssueUpdates,
     addOrReplaceIssueComment,
     addToRecentIssues,
     cleanRecentIssues,
-    removeIssueAttachment,
     removeAttachmentsOfIssue,
     removeIssue,
     removeIssueUpdate,
@@ -2298,13 +2336,20 @@ var __publicField = (obj, key, value) => {
     removeRecentIssue,
     resetRecentIssues,
     setActiveIssueId,
-    setIssueAttachments,
     setIssueUpdates,
     setIssues,
     setVisibleStatuses,
     setVisibleUserIds,
-    updateIssueAttachment,
     updateIssue,
+    // Attachments
+    setIssueAttachment,
+    setIssueAttachments,
+    addIssueAttachment,
+    addIssueAttachments,
+    updateIssueAttachment,
+    updateIssueAttachments,
+    removeIssueAttachment,
+    removeIssueAttachments,
     // Commments
     addIssueComment,
     addIssueComments,
@@ -2527,15 +2572,15 @@ var __publicField = (obj, key, value) => {
     }
   );
   const issueReducer = issueSlice.reducer;
-  const initialState$f = {
+  const initialState$h = {
     s3Urls: {}
   };
   const msPerHour = 1e3 * 60 * 60;
   const msPerWeek = msPerHour * 24 * 7;
   const fileSlice = toolkit.createSlice({
     name: "file",
-    initialState: initialState$f,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+    initialState: initialState$h,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
     reducers: {
       setUploadUrl: (state, action) => {
         const { url, fields, sha1 } = action.payload;
@@ -2562,7 +2607,7 @@ var __publicField = (obj, key, value) => {
     return url;
   };
   const fileReducer = fileSlice.reducer;
-  const initialState$e = {
+  const initialState$g = {
     // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
     mapStyle: MapStyle.SATELLITE,
     showTooltips: false,
@@ -2570,8 +2615,8 @@ var __publicField = (obj, key, value) => {
   };
   const mapSlice = toolkit.createSlice({
     name: "map",
-    initialState: initialState$e,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+    initialState: initialState$g,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
     reducers: {
       setMapStyle: (state, action) => {
         state.mapStyle = action.payload;
@@ -2599,6 +2644,14 @@ var __publicField = (obj, key, value) => {
     OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
     return OrganizationAccessLevel2;
   })(OrganizationAccessLevel || {});
+  var AttachmentModel = /* @__PURE__ */ ((AttachmentModel2) => {
+    AttachmentModel2["Issue"] = "issue";
+    AttachmentModel2["Component"] = "component";
+    AttachmentModel2["ComponentType"] = "component_type";
+    AttachmentModel2["Project"] = "project";
+    AttachmentModel2["Document"] = "document";
+    return AttachmentModel2;
+  })(AttachmentModel || {});
   var IssueUpdateChange = /* @__PURE__ */ ((IssueUpdateChange2) => {
     IssueUpdateChange2["STATUS"] = "status";
     IssueUpdateChange2["PRIORITY"] = "priority";
@@ -2640,7 +2693,7 @@ var __publicField = (obj, key, value) => {
     LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
     return LicenseStatus2;
   })(LicenseStatus || {});
-  const initialState$d = {
+  const initialState$f = {
     users: {},
     currentUser: {
       id: 0,
@@ -2651,8 +2704,8 @@ var __publicField = (obj, key, value) => {
   };
   const userSlice = toolkit.createSlice({
     name: "users",
-    initialState: initialState$d,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+    initialState: initialState$f,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
     reducers: {
       setUsers: (state, action) => {
         const usersMapping = {};
@@ -2714,13 +2767,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$c = {
+  const initialState$e = {
     organizationAccesses: {}
   };
   const organizationAccessSlice = toolkit.createSlice({
     name: "organizationAccess",
-    initialState: initialState$c,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+    initialState: initialState$e,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
     reducers: {
       setOrganizationAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2783,13 +2836,13 @@ var __publicField = (obj, key, value) => {
     return organizationAccesses;
   };
   const organizationAccessReducer = organizationAccessSlice.reducer;
-  const initialState$b = {
+  const initialState$d = {
     licenses: {}
   };
   const licenseSlice = toolkit.createSlice({
     name: "license",
-    initialState: initialState$b,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+    initialState: initialState$d,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
     reducers: {
       setLicenses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2834,13 +2887,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$a = {
+  const initialState$c = {
     projectAccesses: {}
   };
   const projectAccessSlice = toolkit.createSlice({
     name: "projectAccess",
-    initialState: initialState$a,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+    initialState: initialState$c,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
     reducers: {
       setProjectAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2908,7 +2961,7 @@ var __publicField = (obj, key, value) => {
     return projectAccesses;
   };
   const projectAccessReducer = projectAccessSlice.reducer;
-  const initialState$9 = {
+  const initialState$b = {
     projects: {},
     activeProjectId: null,
     recentProjectIds: [],
@@ -2918,7 +2971,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
-    initialState: initialState$9,
+    initialState: initialState$b,
     reducers: {
       setProjects: (state, action) => {
         const projectsMap = {};
@@ -2986,11 +3039,13 @@ var __publicField = (obj, key, value) => {
           throw new Error("Update form submissions count: no active project");
         }
       },
-      // Attachment related
+      // Attachments
+      setProjectAttachment: setAttachment,
       setProjectAttachments: setAttachments,
       addProjectAttachment: addAttachment,
       addProjectAttachments: addAttachments,
       updateProjectAttachment: updateAttachment,
+      updateProjectAttachments: updateAttachments,
       removeProjectAttachment: removeAttachment,
       removeProjectAttachments: removeAttachments
     }
@@ -3005,11 +3060,13 @@ var __publicField = (obj, key, value) => {
     acceptProjectInvite,
     addActiveProjectIssuesCount,
     addActiveProjectFormSubmissionsCount,
-    // Attachment related
+    // Attachments
+    setProjectAttachment,
     setProjectAttachments,
     addProjectAttachment,
     addProjectAttachments,
     updateProjectAttachment,
+    updateProjectAttachments,
     removeProjectAttachment,
     removeProjectAttachments
   } = projectSlice.actions;
@@ -3080,6 +3137,9 @@ var __publicField = (obj, key, value) => {
     [selectProjectAttachmentMapping],
     (mapping) => Object.values(mapping)
   );
+  const selectProjectAttachment = (attachmentId) => (state) => {
+    return state.projectReducer.attachments[attachmentId];
+  };
   const selectAttachmentsOfProject = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectAllProjectAttachments, (_state, projectId) => projectId],
@@ -3105,14 +3165,14 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const initialState$8 = {
+  const initialState$a = {
     organizations: {},
     activeOrganizationId: null
   };
   const organizationSlice = toolkit.createSlice({
     name: "organizations",
-    initialState: initialState$8,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+    initialState: initialState$a,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
     reducers: {
       setOrganizations: (state, action) => {
         for (const org of action.payload) {
@@ -3231,14 +3291,14 @@ var __publicField = (obj, key, value) => {
       }
     };
   };
-  const initialState$7 = {
+  const initialState$9 = {
     deletedRequests: [],
     latestRetryTime: 0
   };
   const outboxSlice = toolkit.createSlice({
     name: "outbox",
-    initialState: initialState$7,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+    initialState: initialState$9,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
     reducers: {
       // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
       // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -3270,7 +3330,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$6 = {
+  const initialState$8 = {
     projectFiles: {},
     activeProjectFileId: null,
     isImportingProjectFile: false,
@@ -3278,8 +3338,8 @@ var __publicField = (obj, key, value) => {
   };
   const projectFileSlice = toolkit.createSlice({
     name: "projectFiles",
-    initialState: initialState$6,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+    initialState: initialState$8,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
     reducers: {
       addOrReplaceProjectFiles: (state, action) => {
         for (let fileObj of action.payload) {
@@ -3380,12 +3440,12 @@ var __publicField = (obj, key, value) => {
   const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
   const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const projectFileReducer = projectFileSlice.reducer;
-  const initialState$5 = {
+  const initialState$7 = {
     isRehydrated: false
   };
   const rehydratedSlice = toolkit.createSlice({
     name: "rehydrated",
-    initialState: initialState$5,
+    initialState: initialState$7,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setRehydrated: (state, action) => {
@@ -3395,7 +3455,7 @@ var __publicField = (obj, key, value) => {
   });
   const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
   const rehydratedReducer = rehydratedSlice.reducer;
-  const initialState$4 = {
+  const initialState$6 = {
     useIssueTemplate: false,
     placementMode: false,
     enableClustering: false,
@@ -3412,8 +3472,8 @@ var __publicField = (obj, key, value) => {
   };
   const settingSlice = toolkit.createSlice({
     name: "settings",
-    initialState: initialState$4,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+    initialState: initialState$6,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
     reducers: {
       setEnableDuplicateIssues: (state, action) => {
         state.useIssueTemplate = action.payload;
@@ -3459,146 +3519,231 @@ var __publicField = (obj, key, value) => {
   const settingReducer = settingSlice.reducer;
   const selectIsFetchingInitialData = (state) => state.settingReducer.isFetchingInitialData;
   const selectIsLoading = (state) => state.settingReducer.isLoading;
-  const LATEST_REVISION_CACHE = {};
-  function considerCachingRevision(revision, formId2, preferPending = false) {
-    var _a2;
-    if (!revision) {
-      if (!formId2) {
-        throw new Error("If revision is null, formId is required.");
-      }
-      const currentLatestRevision = getLatestRevisionFromCache(formId2);
-      if (currentLatestRevision)
-        return;
-      LATEST_REVISION_CACHE[formId2] = null;
-      return;
-    }
-    if (revision.revision === "Pending") {
-      if (preferPending) {
-        LATEST_REVISION_CACHE[revision.form] = revision;
-      }
-      return;
-    }
-    const cachedRevision = (_a2 = LATEST_REVISION_CACHE[revision.form]) == null ? void 0 : _a2.revision;
-    if (revision.revision > (typeof cachedRevision === "number" ? cachedRevision : -1)) {
-      LATEST_REVISION_CACHE[revision.form] = revision;
+  const formRevisionSortFn = (formRevisionA, formRevisionB) => {
+    const revisionA = formRevisionA.revision;
+    const revisionB = formRevisionB.revision;
+    if (revisionA === "Pending" && revisionB === "Pending") {
+      return formRevisionA.submitted_at < formRevisionB.submitted_at ? -1 : 1;
+    } else if (revisionA === "Pending") {
+      return 1;
+    } else if (revisionB === "Pending") {
+      return -1;
+    } else {
+      return revisionA < revisionB ? -1 : 1;
     }
-  }
-  function getLatestRevisionFromCache(formId2) {
-    return LATEST_REVISION_CACHE[formId2];
-  }
-  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)),
+  };
+  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)),
     reducers: {
-      setUserForms: (state, action) => {
-        state.userForms = {};
-        action.payload.forEach((userForm) => {
-          state.userForms[userForm.offline_id] = userForm;
-        });
+      // revision related actions
+      setFormRevision: (state, action) => {
+        state.formRevisions[action.payload.offline_id] = action.payload;
       },
-      addUserForm: (state, action) => {
-        state.userForms[action.payload.offline_id] = action.payload;
-      },
-      addUserForms: (state, action) => {
-        action.payload.forEach((userForm) => {
-          state.userForms[userForm.offline_id] = userForm;
-        });
-      },
-      addUserFormRevisions: (state, action) => {
-        action.payload.forEach((userFormRevision) => {
-          state.revisions[userFormRevision.offline_id] = userFormRevision;
-          considerCachingRevision(userFormRevision);
-        });
-      },
-      addUserFormRevision: (state, action) => {
-        state.revisions[action.payload.offline_id] = action.payload;
-        considerCachingRevision(action.payload);
+      setFormRevisions: (state, action) => {
+        state.formRevisions = {};
+        for (const revision of action.payload) {
+          state.formRevisions[revision.offline_id] = revision;
+        }
       },
-      deleteUserFormRevision: (state, action) => {
-        delete state.revisions[action.payload];
-        delete LATEST_REVISION_CACHE[action.payload];
+      addFormRevision: (state, action) => {
+        if (state.formRevisions[action.payload.offline_id] !== void 0) {
+          throw new Error(`Revision with offline_id ${action.payload.offline_id} already exists`);
+        }
+        state.formRevisions[action.payload.offline_id] = action.payload;
       },
-      deleteUserFormRevisions: (state, action) => {
+      addFormRevisions: (state, action) => {
         for (const userFormRevision of action.payload) {
-          delete state.revisions[userFormRevision.offline_id];
-          delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
+          if (state.formRevisions[userFormRevision.offline_id] !== void 0) {
+            throw new Error(`Revision with offline_id ${userFormRevision.offline_id} already exists`);
+          }
         }
-      },
-      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];
+        for (const userFormRevision of action.payload) {
+          state.formRevisions[userFormRevision.offline_id] = userFormRevision;
         }
       },
-      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];
+      // 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];
       },
-      setUserFormSubmissionAttachments: (state, action) => {
-        state.submissionAttachments = {};
-        for (const attachment of action.payload) {
-          const submissionId = attachment.submission;
-          const submissionAttachments = state.submissionAttachments[submissionId];
-          if (submissionAttachments) {
-            submissionAttachments.push(attachment);
-          } else {
-            state.submissionAttachments[submissionId] = [attachment];
+      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];
+        }
       },
-      setUserFormRevisionAttachments: (state, action) => {
-        state.revisionAttachments = {};
+      // attachment related actions
+      setFormRevisionAttachments: (state, action) => {
+        state.attachments = {};
         for (const attachment of action.payload) {
-          const revisionId = attachment.revision;
-          const revisionAttachments = state.revisionAttachments[revisionId];
-          if (revisionAttachments) {
-            revisionAttachments.push(attachment);
-          } else {
-            state.revisionAttachments[revisionId] = [attachment];
-          }
+          state.attachments[attachment.offline_id] = attachment;
         }
       },
-      deleteUserFormSubmission: (state, action) => {
-        delete state.submissions[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`);
+        }
+        state.attachments[action.payload.offline_id] = action.payload;
       },
-      deleteUserFormSubmissions: (state, action) => {
-        for (const userFormSubmission of action.payload) {
-          delete state.submissions[userFormSubmission.offline_id];
+      addFormRevisionAttachments: (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;
         }
       },
-      addUserFormSubmissions: (state, action) => {
-        for (const submission of action.payload) {
-          state.submissions[submission.offline_id] = submission;
+      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];
       },
-      setUserFormSubmissions: (state, action) => {
-        state.submissions = {};
-        action.payload.forEach((submission) => {
-          state.submissions[submission.offline_id] = submission;
+      deleteFormRevisionAttachments: (state, action) => {
+        for (const offlineId of action.payload) {
+          if (state.attachments[offlineId] === void 0) {
+            throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+          }
+        }
+        for (const offlineId of action.payload) {
+          delete state.attachments[offlineId];
+        }
+      }
+    }
+  });
+  const {
+    setFormRevision,
+    setFormRevisions,
+    addFormRevision,
+    addFormRevisions,
+    deleteFormRevision,
+    deleteFormRevisions,
+    setFormRevisionAttachments,
+    addFormRevisionAttachment,
+    addFormRevisionAttachments,
+    deleteFormRevisionAttachment,
+    deleteFormRevisionAttachments
+  } = formRevisionsSlice.actions;
+  const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
+  const selectFormRevisions = 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([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+      return revisions.filter((revision) => revision.form === formId2).sort(formRevisionSortFn).pop();
+    })
+  );
+  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 formsOfComponentTypes = {};
+        const ret = {};
+        for (const form of Object.values(userForms)) {
+          if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
+            formsOfComponentTypes[form.offline_id] = form;
+          }
+        }
+        for (const revision of Object.values(revisions)) {
+          const form = formsOfComponentTypes[revision.form];
+          if (!form || !form.component_type || ret[form.component_type] && formRevisionSortFn(ret[form.component_type], revision) > 0)
+            continue;
+          ret[form.component_type] = revision;
+        }
+        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;
+      },
+      addForms: (state, action) => {
+        for (const userForm of action.payload) {
+          state.forms[userForm.offline_id] = userForm;
+        }
+      },
       favoriteForm: (state, action) => {
         const { formId: formId2 } = action.payload;
-        const form = state.userForms[formId2];
+        const form = state.forms[formId2];
         if (!form) {
           throw new Error("No form exists with the id " + formId2);
         }
@@ -3606,48 +3751,23 @@ var __publicField = (obj, key, value) => {
       },
       unfavoriteForm: (state, action) => {
         const { formId: formId2 } = action.payload;
-        const form = state.userForms[formId2];
+        const form = state.forms[formId2];
         if (!form) {
           throw new Error("No form exists with the id " + formId2);
         }
         form.favorite = false;
       },
-      deleteUserForm: (state, action) => {
-        delete state.userForms[action.payload];
+      deleteForm: (state, action) => {
+        delete state.forms[action.payload];
       }
     }
   });
-  const {
-    addUserForm,
-    addUserForms,
-    addUserFormRevisions,
-    updateOrCreateUserFormSubmission,
-    addUserFormSubmissions,
-    deleteUserFormSubmission,
-    deleteUserFormSubmissions,
-    favoriteForm,
-    unfavoriteForm,
-    deleteUserForm,
-    deleteUserFormRevision,
-    deleteUserFormRevisions,
-    setUserFormSubmissions,
-    addUserFormRevision,
-    addUserFormSubmissionAttachment,
-    addUserFormRevisionAttachment,
-    setUserFormSubmissionAttachments,
-    setUserFormRevisionAttachments
-  } = userFormSlice.actions;
-  const selectSubmissionAttachments = (submissionId) => (state) => {
-    return state.userFormReducer.submissionAttachments[submissionId] || [];
-  };
-  const selectRevisionAttachments = (revisionId) => (state) => {
-    return state.userFormReducer.revisionAttachments[revisionId] || [];
-  };
-  const selectFilteredUserForms = restructureCreateSelectorWithArgs(
+  const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = formSlice.actions;
+  const selectFilteredForms = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [
-        (state) => state.userFormReducer.userForms,
-        (state) => state.userFormReducer.revisions,
+        (state) => state.formReducer.forms,
+        (state) => state.formRevisionReducer.formRevisions,
         (_state, search) => search
       ],
       (userForms, revisions, search) => {
@@ -3674,70 +3794,195 @@ var __publicField = (obj, key, value) => {
             break;
           }
         }
-        const maxRegularMatches = maxResults - favoriteMatches.length;
-        return [...favoriteMatches, ...regularMatches.slice(0, maxRegularMatches)];
+        const maxRegularMatches = maxResults - favoriteMatches.length;
+        return [...favoriteMatches, ...regularMatches.slice(0, maxRegularMatches)];
+      },
+      // as the argument is an object, we check the first level of properties for equality
+      { memoizeOptions: { equalityCheck: reactRedux.shallowEqual } }
+    )
+  );
+  const selectForm = (formId2) => (state) => {
+    return state.formReducer.forms[formId2];
+  };
+  const selectFormMapping = (state) => {
+    return state.formReducer.forms;
+  };
+  const selectFormOfComponentType = restructureCreateSelectorWithArgs(
+    toolkit.createSelector(
+      [selectFormMapping, (_state, componentTypeId) => componentTypeId],
+      (userForms, componentTypeId) => {
+        return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
+      }
+    )
+  );
+  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 (action.payload.offline_id in state.formSubmissions) {
+          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;
+        }
       },
-      // as the argument is an object, we check the first level of properties for equality
-      { memoizeOptions: { equalityCheck: reactRedux.shallowEqual } }
-    )
-  );
-  const selectFormRevision = (revisionId) => (state) => {
-    return state.userFormReducer.revisions[revisionId];
-  };
-  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;
+      // 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];
+        }
       }
     }
-    if (!ret) {
-      throw new Error("No revision found for form " + formId2);
-    }
-    return ret;
+  });
+  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 selectLatestFormRevision = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [(state) => state.userFormReducer.revisions, (_state, formId2) => formId2],
-      (revisions, formId2) => {
-        if (!formId2) {
-          throw new Error("formId is required");
-        }
-        return _selectLatestFormRevision(revisions, formId2);
-      }
-    )
-  );
-  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 selectFormSubmissions = toolkit.createSelector(
+    [selectFormSubmissionsMapping],
+    (submissions) => {
+      return Object.values(submissions);
+    }
   );
-  const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
+  const selectFormSubmission = (submissionId) => (state) => {
+    return state.formSubmissionReducer.formSubmissions[submissionId];
+  };
+  const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectSubmissions, selectRevisionMapping, (_state, formId2) => formId2],
+      [selectFormSubmissions, selectFormRevisionMapping, (_state, formId2) => formId2],
       (submissions, revisionMapping, formId2) => {
-        return Object.values(submissions).filter((submission) => {
+        return submissions.filter((submission) => {
           const revision = revisionMapping[submission.form_revision];
           return (revision == null ? void 0 : revision.form) === formId2;
         });
       }
     )
   );
-  const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
+  const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
+      [selectFormSubmissions, (_state, issueId) => issueId],
       (submissions, issueId) => {
         return Object.values(submissions).filter((submission) => {
           return submission.issue === issueId;
@@ -3745,9 +3990,9 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
+  const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectSubmissions, (_state, componentId) => componentId],
+      [selectFormSubmissions, (_state, componentId) => componentId],
       (submissions, componentId) => {
         return submissions.filter((submission) => {
           return submission.component === componentId;
@@ -3755,8 +4000,8 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectComponentSubmissionMapping = toolkit.createSelector(
-    [selectSubmissionMapping, selectComponentsMapping],
+  const selectFormSubmissionsByComponents = toolkit.createSelector(
+    [selectFormSubmissionsMapping, selectComponentsMapping],
     (submissions, components) => {
       var _a2;
       const componentSubmissionMapping = {};
@@ -3772,54 +4017,18 @@ var __publicField = (obj, key, value) => {
       return componentSubmissionMapping;
     }
   );
-  const selectUserFormMapping = (state) => {
-    return state.userFormReducer.userForms;
+  const selectFormSubmissionAttachmentsMapping = (state) => {
+    return state.formSubmissionReducer.attachments;
   };
-  const selectComponentTypeForm = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
-      (userForms, componentTypeId) => {
-        return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
-      }
-    )
-  );
-  const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithArgs(
+  const selectAttachmentsOfFormSubmission = 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;
+      [selectFormSubmissionAttachmentsMapping, (_state, submissionId) => submissionId],
+      (attachmentsMapping, submissionId) => {
+        return Object.values(attachmentsMapping).filter((attachment) => attachment.submission === submissionId);
       }
     )
   );
-  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 formSubmissionReducer = formSubmissionSlice.reducer;
   const initialState$2 = {
     emailDomains: {}
   };
@@ -3992,10 +4201,13 @@ var __publicField = (obj, key, value) => {
           delete state.documents[documentId];
         }
       },
+      // Attachments
+      setDocumentAttachment: setAttachment,
       setDocumentAttachments: setAttachments,
       addDocumentAttachment: addAttachment,
       addDocumentAttachments: addAttachments,
       updateDocumentAttachment: updateAttachment,
+      updateDocumentAttachments: updateAttachments,
       removeDocumentAttachment: removeAttachment,
       removeDocumentAttachments: removeAttachments
     }
@@ -4006,10 +4218,13 @@ var __publicField = (obj, key, value) => {
     updateDocuments,
     moveDocument,
     removeDocuments,
+    // Attachments
+    setDocumentAttachment,
     setDocumentAttachments,
     addDocumentAttachment,
     addDocumentAttachments,
     updateDocumentAttachment,
+    updateDocumentAttachments,
     removeDocumentAttachment,
     removeDocumentAttachments
   } = documentSlice.actions;
@@ -4117,7 +4332,9 @@ var __publicField = (obj, key, value) => {
     projectFileReducer,
     rehydratedReducer,
     settingReducer,
-    userFormReducer,
+    formReducer,
+    formRevisionReducer,
+    formSubmissionReducer,
     userReducer,
     workspaceReducer,
     emailDomainsReducer,
@@ -4170,9 +4387,7 @@ 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.userFormReducer.userForms).filter(
-      (form) => form.index_workspace === workspaceId
-    );
+    const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
     for (const form of indexedForms) {
       form.index_workspace = mainWorkspace.offline_id;
     }
@@ -5879,6 +6094,221 @@ var __publicField = (obj, key, value) => {
       store.dispatch(addStages(result));
     }
   }
+  const AttachmentModelMeta = {
+    [AttachmentModel.Issue]: {
+      name: "issue",
+      attachUrlPrefix: "/issues",
+      deleteUrlPrefix: "/issues",
+      fetchUrlPostfix: "/issue-attachments"
+    },
+    [AttachmentModel.Component]: {
+      name: "component",
+      attachUrlPrefix: "/components",
+      deleteUrlPrefix: "/components",
+      fetchUrlPostfix: "/component-attachments"
+    },
+    [AttachmentModel.ComponentType]: {
+      name: "component type",
+      attachUrlPrefix: "/components/types",
+      deleteUrlPrefix: "/components/types",
+      fetchUrlPostfix: "/component-type-attachments"
+    },
+    [AttachmentModel.Project]: {
+      name: "component project",
+      attachUrlPrefix: "/projects",
+      deleteUrlPrefix: "/projects",
+      fetchUrlPostfix: "/attachments"
+    },
+    [AttachmentModel.Document]: {
+      name: "document",
+      attachUrlPrefix: "/documents",
+      deleteUrlPrefix: "/documents",
+      fetchUrlPostfix: "/document-attachments"
+    }
+  };
+  class BaseAttachmentService extends BaseApiService {
+    getNumberOfAttachmentsWithSha1(sha1) {
+      const {
+        issueReducer: issueReducer2,
+        componentReducer: componentReducer2,
+        componentTypeReducer: componentTypeReducer2,
+        documentsReducer: documentsReducer2,
+        projectReducer: projectReducer2,
+        formSubmissionReducer: formSubmissionReducer2,
+        formRevisionReducer: formRevisionReducer2
+      } = this.client.store.getState();
+      const objectsWithSha1 = [].concat(
+        Object.values(issueReducer2.attachments),
+        Object.values(componentReducer2.attachments),
+        Object.values(componentTypeReducer2.attachments),
+        Object.values(documentsReducer2.attachments),
+        Object.values(projectReducer2.attachments),
+        Object.values(formRevisionReducer2.attachments),
+        Object.values(formSubmissionReducer2.attachments)
+      );
+      return objectsWithSha1.filter((object) => object.file_sha1 === sha1).length;
+    }
+    processPresignedUrls(presignedUrls) {
+      for (const [sha1, presignedUrl] of Object.entries(presignedUrls)) {
+        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
+        });
+      }
+    }
+    // Note that currently the fetching of attachments for all models dependds on the active projectId. This may change in the future. And
+    //  so for some attachment model services, this method will have to be overridden.
+    async getAttachments(actions) {
+      const { store } = this.client;
+      const activeProjectId = store.getState().projectReducer.activeProjectId;
+      const meta = AttachmentModelMeta[this.attachmentModel];
+      const result = await this.enqueueRequest({
+        description: `Get ${meta.name} attachments`,
+        method: HttpMethod.GET,
+        url: `/projects/${activeProjectId}${meta.fetchUrlPostfix}/`,
+        blocks: [],
+        blockers: []
+      });
+      store.dispatch(actions.setAttachments(result));
+    }
+    async attachFiles(files, modelId, buildOfflineAttachment, actions) {
+      const { store } = this.client;
+      const currentUser = store.getState().userReducer.currentUser;
+      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const offlineAttachments = [];
+      const attachmentPayloads = [];
+      const filePayloads = {};
+      for (const file of files) {
+        const sha1 = await hashFile(file);
+        if (!(sha1 in filePayloads)) {
+          filePayloads[sha1] = {
+            sha1,
+            file_type: file.type,
+            extension: file.name.split(".").pop(),
+            size: file.size
+          };
+          await this.client.files.addCache(file, sha1);
+        }
+        const offlineAttachment = buildOfflineAttachment({
+          file,
+          sha1,
+          submittedAt,
+          createdBy: currentUser.id,
+          description: "",
+          modelId
+        });
+        offlineAttachments.push(offlineAttachment);
+        attachmentPayloads.push({
+          offline_id: offlineAttachment.offline_id,
+          name: offlineAttachment.file_name,
+          sha1: offlineAttachment.file_sha1,
+          description: offlineAttachment.description
+        });
+      }
+      store.dispatch(actions.addAttachments(offlineAttachments));
+      const meta = AttachmentModelMeta[this.attachmentModel];
+      const promise = this.enqueueRequest({
+        description: `Attach files to ${meta.name}`,
+        method: HttpMethod.POST,
+        url: `${meta.attachUrlPrefix}/${modelId}/attach/`,
+        payload: {
+          submitted_at: submittedAt,
+          attachments: attachmentPayloads,
+          files: Object.values(filePayloads)
+        },
+        blocks: offlineAttachments.map((attachment) => attachment.offline_id),
+        blockers: offlineAttachments.map((attachment) => attachment.file_sha1)
+      });
+      promise.then(({ attachments, presigned_urls }) => {
+        store.dispatch(actions.updateAttachments(attachments));
+        this.processPresignedUrls(presigned_urls);
+      }).catch(() => {
+        store.dispatch(actions.removeAttachments(offlineAttachments.map((attachment) => attachment.offline_id)));
+      });
+      return [offlineAttachments, promise.then(({ attachments }) => attachments)];
+    }
+    async deleteAttachment(attachmendId, actions, selectors) {
+      const { store } = this.client;
+      const attachment = selectors.selectAttachment(attachmendId)(store.getState());
+      if (!attachment) {
+        throw new Error(
+          `Attempting to delete attachment with offline_id ${attachmendId} that does not exist in the store`
+        );
+      }
+      store.dispatch(actions.removeAttachment(attachment.offline_id));
+      const meta = AttachmentModelMeta[this.attachmentModel];
+      const promise = this.enqueueRequest({
+        description: "Delete attachment",
+        method: HttpMethod.DELETE,
+        url: `${meta.deleteUrlPrefix}/attachments/${attachmendId}/`,
+        blockers: [attachmendId],
+        blocks: []
+      });
+      promise.then(() => {
+        if (this.getNumberOfAttachmentsWithSha1(attachment.file_sha1) === 0) {
+          void this.client.files.removeCache(attachment.file_sha1);
+        }
+      }).catch(() => {
+        store.dispatch(actions.setAttachment(attachment));
+      });
+      return promise;
+    }
+  }
+  class ComponentAttachmentService extends BaseAttachmentService {
+    constructor() {
+      super(...arguments);
+      __publicField(this, "attachmentModel", AttachmentModel.Component);
+    }
+    buildOfflineAttachment(data) {
+      return offline({
+        file: URL.createObjectURL(data.file),
+        file_sha1: data.sha1,
+        created_by: data.createdBy,
+        file_name: data.file.name,
+        file_type: data.file.type,
+        submitted_at: data.submittedAt,
+        description: data.description,
+        component: data.modelId
+      });
+    }
+    async attachFilesToComponent(files, componentId) {
+      return this.attachFiles(
+        files,
+        componentId,
+        this.buildOfflineAttachment.bind(this),
+        {
+          addAttachments: addComponentAttachments,
+          updateAttachments: updateComponentAttachments,
+          removeAttachments: removeComponentAttachments
+        }
+      );
+    }
+    deleteComponentAttachment(attachmentId) {
+      return this.deleteAttachment(
+        attachmentId,
+        {
+          setAttachment: setComponentAttachment,
+          removeAttachment: removeComponentAttachment
+        },
+        {
+          selectAttachment: selectComponentAttachment
+        }
+      );
+    }
+    async refreshStore() {
+      return this.getAttachments({
+        setAttachments: setComponentAttachments
+      });
+    }
+  }
   class ComponentTypeService extends BaseApiService {
     add(componentType) {
       const offlineComponentType = offline(componentType);
@@ -5951,6 +6381,53 @@ var __publicField = (obj, key, value) => {
       store.dispatch(setComponentTypes(result));
     }
   }
+  class ComponentTypeAttachmentService extends BaseAttachmentService {
+    constructor() {
+      super(...arguments);
+      __publicField(this, "attachmentModel", AttachmentModel.ComponentType);
+    }
+    buildOfflineAttachment(data) {
+      return offline({
+        file: URL.createObjectURL(data.file),
+        file_sha1: data.sha1,
+        created_by: data.createdBy,
+        file_name: data.file.name,
+        file_type: data.file.type,
+        submitted_at: data.submittedAt,
+        description: data.description,
+        component_type: data.modelId
+      });
+    }
+    async attachFilesToComponentType(files, componentTypeId) {
+      return this.attachFiles(
+        files,
+        componentTypeId,
+        this.buildOfflineAttachment.bind(this),
+        {
+          addAttachments: addComponentTypeAttachments,
+          updateAttachments: updateComponentTypeAttachments,
+          removeAttachments: removeComponentTypeAttachments
+        }
+      );
+    }
+    deleteComponentTypeAttachment(attachmentId) {
+      return this.deleteAttachment(
+        attachmentId,
+        {
+          setAttachment: setComponentTypeAttachment,
+          removeAttachment: removeComponentTypeAttachment
+        },
+        {
+          selectAttachment: selectComponentTypeAttachment
+        }
+      );
+    }
+    async refreshStore() {
+      return this.getAttachments({
+        setAttachments: setComponentTypeAttachments
+      });
+    }
+  }
   class IssueCommentService extends BaseApiService {
     // Omit author and submitted_at since these will always be set internally
     add(comment) {
@@ -6047,6 +6524,48 @@ var __publicField = (obj, key, value) => {
       store.dispatch(setIssueUpdates(filteredResult));
     }
   }
+  class IssueAttachmentService extends BaseAttachmentService {
+    constructor() {
+      super(...arguments);
+      __publicField(this, "attachmentModel", AttachmentModel.Issue);
+    }
+    buildOfflineAttachment(data) {
+      return offline({
+        file: URL.createObjectURL(data.file),
+        file_sha1: data.sha1,
+        created_by: data.createdBy,
+        file_name: data.file.name,
+        file_type: data.file.type,
+        submitted_at: data.submittedAt,
+        description: data.description,
+        issue: data.modelId
+      });
+    }
+    async attachFilesToIssue(files, issueId) {
+      return this.attachFiles(files, issueId, this.buildOfflineAttachment.bind(this), {
+        addAttachments: addIssueAttachments,
+        updateAttachments: updateIssueAttachments,
+        removeAttachments: removeIssueAttachments
+      });
+    }
+    deleteIssueAttachment(attachmentId) {
+      return this.deleteAttachment(
+        attachmentId,
+        {
+          setAttachment: setIssueAttachment,
+          removeAttachment: removeIssueAttachment
+        },
+        {
+          selectAttachment: selectIssueAttachment
+        }
+      );
+    }
+    async refreshStore() {
+      return this.getAttachments({
+        setAttachments: setIssueAttachments
+      });
+    }
+  }
   class IssueService extends BaseApiService {
     // Basic CRUD functions
     // TODO: Once all models are represented in `Created<TModel>`, use `Created` in `OptimisticModelResult`, so we don't
@@ -6392,6 +6911,7 @@ var __publicField = (obj, key, value) => {
         const usersResult = await usersResultPromise;
         await projectAccessRefreshPromise;
         store.dispatch(addUsers(usersResult));
+        void this.client.projectAttachments.refreshStore();
       }
       let currentWorkspaceId;
       const oldWorkspaceId = this.client.store.getState().workspaceReducer.activeWorkspaceId;
@@ -6404,38 +6924,30 @@ var __publicField = (obj, key, value) => {
         store.dispatch(setActiveWorkspaceId(currentWorkspaceId));
         void this.client.categories.refreshStore().then(() => {
           void this.client.issues.refreshStore().then(() => {
+            void this.client.issueAttachments.refreshStore().then();
             void this.client.issueComments.refreshStore().then();
+            void this.client.issueUpdates.refreshStore().then();
           });
         });
         void this.client.projectFiles.refreshStore().then();
         void this.client.componentTypes.refreshStore().then(() => {
-          void this.client.componentStages.refreshStore().then(() => {
-            void this.client.components.refreshStore(overwrite).then();
+          void this.client.componentTypeAttachments.refreshStore().then(() => {
+            void this.client.componentStages.refreshStore().then(() => {
+              void this.client.components.refreshStore(overwrite).then(() => {
+                void this.client.componentAttachments.refreshStore().then();
+              });
+            });
+            void this.client.componentStageCompletions.refreshStore().then();
           });
-          void this.client.componentStageCompletions.refreshStore().then();
         });
         void this.client.userForms.refreshStore().then(() => {
           void this.client.userFormSubmissions.refreshStore().then();
         });
       }
       if (currentProjectId) {
-        const [_offlineAttachments, promise] = this.client.attachments.fetchAll(currentProjectId);
-        void promise.then((result) => {
-          const {
-            issue_attachments,
-            component_type_attachments,
-            component_attachments,
-            project_attachments,
-            document_attachments
-          } = result;
-          store.dispatch(setIssueAttachments(issue_attachments));
-          store.dispatch(setComponentAttachments(component_attachments));
-          store.dispatch(setComponentTypeAttachments(component_type_attachments));
-          store.dispatch(setProjectAttachments(project_attachments));
-          store.dispatch(setDocumentAttachments(document_attachments));
+        void this.client.documents.refreshStore().then(() => {
+          void this.client.documentAttachments.refreshStore().then();
         });
-        void this.client.documents.refreshStore();
-        void this.client.issueUpdates.refreshStore();
       }
       store.dispatch(setIsFetchingInitialData(false));
       if (overwrite) {
@@ -6599,6 +7111,48 @@ var __publicField = (obj, key, value) => {
       });
     }
   }
+  class ProjectAttachmentService extends BaseAttachmentService {
+    constructor() {
+      super(...arguments);
+      __publicField(this, "attachmentModel", AttachmentModel.Project);
+    }
+    buildOfflineAttachment(data) {
+      return offline({
+        file: URL.createObjectURL(data.file),
+        file_sha1: data.sha1,
+        created_by: data.createdBy,
+        file_name: data.file.name,
+        file_type: data.file.type,
+        submitted_at: data.submittedAt,
+        description: data.description,
+        project: data.modelId
+      });
+    }
+    async attachFilesToProject(files, projectId) {
+      return this.attachFiles(files, projectId, this.buildOfflineAttachment.bind(this), {
+        addAttachments: addProjectAttachments,
+        updateAttachments: updateProjectAttachments,
+        removeAttachments: removeProjectAttachments
+      });
+    }
+    deleteProjectAttachment(attachmentId) {
+      return this.deleteAttachment(
+        attachmentId,
+        {
+          setAttachment: setProjectAttachment,
+          removeAttachment: removeProjectAttachment
+        },
+        {
+          selectAttachment: selectProjectAttachment
+        }
+      );
+    }
+    async refreshStore() {
+      return this.getAttachments({
+        setAttachments: setProjectAttachments
+      });
+    }
+  }
   class ProjectService extends BaseApiService {
     /**
      * Creates a new project. Due to the nature of project creation,
@@ -6800,7 +7354,7 @@ var __publicField = (obj, key, value) => {
             ...revisionAttachmentPayload,
             file: URL.createObjectURL(image)
           };
-          store.dispatch(addUserFormRevisionAttachment(offlinePayload));
+          store.dispatch(addFormRevisionAttachment(offlinePayload));
           return attach;
         });
       });
@@ -6836,8 +7390,8 @@ var __publicField = (obj, key, value) => {
         submitted_at: submittedAt
       };
       const { store } = this.client;
-      store.dispatch(addUserForm(retForm));
-      store.dispatch(addUserFormRevision(retRevision));
+      store.dispatch(addForm(retForm));
+      store.dispatch(addFormRevision(retRevision));
       const formPromise = this.enqueueRequest({
         description: "Create form",
         method: HttpMethod.POST,
@@ -6855,8 +7409,8 @@ var __publicField = (obj, key, value) => {
       });
       const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
       void formPromise.catch((e) => {
-        store.dispatch(deleteUserForm(retForm.offline_id));
-        store.dispatch(deleteUserFormRevision(retRevision.offline_id));
+        store.dispatch(deleteForm(retForm.offline_id));
+        store.dispatch(deleteFormRevision(retRevision.offline_id));
         throw e;
       });
       const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
@@ -6899,7 +7453,7 @@ var __publicField = (obj, key, value) => {
         form: formId2,
         submitted_at: (/* @__PURE__ */ new Date()).toISOString()
       };
-      store.dispatch(addUserFormRevision(fullRevision));
+      store.dispatch(addFormRevision(fullRevision));
       const promise = this.enqueueRequest({
         description: "Create form revision",
         method: HttpMethod.PATCH,
@@ -6913,9 +7467,9 @@ var __publicField = (obj, key, value) => {
       });
       const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
       void promise.then((result) => {
-        store.dispatch(addUserFormRevision(result));
+        store.dispatch(setFormRevision(result));
       }).catch(() => {
-        store.dispatch(deleteUserFormRevision(fullRevision.offline_id));
+        store.dispatch(deleteFormRevision(fullRevision.offline_id));
       });
       const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
       return [fullRevision, settledPromise];
@@ -6957,19 +7511,19 @@ var __publicField = (obj, key, value) => {
     async delete(formId2) {
       const { store } = this.client;
       const state = store.getState();
-      const userForm = selectUserForm(formId2)(state);
+      const userForm = selectForm(formId2)(state);
       if (!userForm) {
         throw new Error("Expected userForm to exist");
       }
-      const userFormSubmissions = selectSubmissionsForForm(formId2)(state);
+      const userFormSubmissions = selectFormSubmissionsOfForm(formId2)(state);
       if (userFormSubmissions && userFormSubmissions.length > 0) {
-        store.dispatch(deleteUserFormSubmissions(userFormSubmissions));
+        store.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
       }
-      const userFormRevisions = selectRevisionsForForm(formId2)(state);
+      const userFormRevisions = selectFormRevisionsOfForm(formId2)(state);
       if (userFormRevisions && userFormRevisions.length > 0) {
-        store.dispatch(deleteUserFormRevisions(userFormRevisions));
+        store.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
       }
-      store.dispatch(deleteUserForm(formId2));
+      store.dispatch(deleteForm(formId2));
       try {
         return await this.enqueueRequest({
           description: "Delete form",
@@ -6979,12 +7533,12 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        store.dispatch(addUserForm(userForm));
+        store.dispatch(addForm(userForm));
         if (userFormRevisions && userFormRevisions.length > 0) {
-          store.dispatch(addUserFormRevisions(userFormRevisions));
+          store.dispatch(addFormRevisions(userFormRevisions));
         }
         if (userFormSubmissions && userFormSubmissions.length > 0) {
-          store.dispatch(addUserFormSubmissions(userFormSubmissions));
+          store.dispatch(addFormSubmissions(userFormSubmissions));
         }
         throw e;
       }
@@ -6998,16 +7552,15 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(addUserForms(Object.values(result.forms)));
-      store.dispatch(addUserFormRevisions(Object.values(result.revisions)));
-      store.dispatch(setUserFormRevisionAttachments(Object.values(result.attachments)));
+      store.dispatch(setForms(Object.values(result.forms)));
+      store.dispatch(setFormRevisions(Object.values(result.revisions)));
+      store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
     }
   }
   const isArrayOfFiles = (value) => {
     return Array.isArray(value) && value[0] instanceof File;
   };
-  const separateFilesFromValues = (payload) => {
-    const { values } = payload;
+  const separateFilesFromValues = (values) => {
     const files = {};
     const newValues = {};
     for (const key in values) {
@@ -7022,17 +7575,13 @@ var __publicField = (obj, key, value) => {
         newValues[key] = value;
       }
     }
-    const payloadWithoutFiles = {
-      ...payload,
-      values: newValues
-    };
-    return { payloadWithoutFiles, files };
+    return { values: newValues, files };
   };
   class UserFormSubmissionService extends BaseApiService {
     constructor() {
       super(...arguments);
       // Attach files to submission, after uploading them to S3
-      __publicField(this, "getAttachFilesPromises", (files, payload) => {
+      __publicField(this, "getAttachFilesPromises", (files, submission) => {
         const { store } = this.client;
         return Object.entries(files).map(async ([key, fileArray]) => {
           const attachResults = [];
@@ -7042,24 +7591,27 @@ var __publicField = (obj, key, value) => {
             const [fileProps] = await this.client.files.uploadFileToS3(sha1);
             const submissionAttachmentPayload = offline({
               ...fileProps,
-              submission: payload.offline_id,
+              submission: submission.offline_id,
               field_identifier: key
             });
             const attach = await this.enqueueRequest({
               description: "Attach file to form submission",
               method: HttpMethod.POST,
-              url: `/forms/submission/${payload.offline_id}/attachments/`,
+              url: `/forms/submission/${submission.offline_id}/attachments/`,
               payload: submissionAttachmentPayload,
-              blockers: [payload.component, payload.component_stage, payload.issue, payload.form_revision].filter(
-                (x) => x !== void 0
-              ),
+              blockers: [
+                submission.component,
+                submission.component_stage,
+                submission.issue,
+                submission.form_revision
+              ].filter((x) => x !== void 0),
               blocks: [submissionAttachmentPayload.offline_id]
             });
             const offlinePayload = {
               ...submissionAttachmentPayload,
               file: URL.createObjectURL(file)
             };
-            store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
+            store.dispatch(addFormSubmissionAttachment(offlinePayload));
             attachResults.push(attach);
           }
           return attachResults;
@@ -7073,71 +7625,168 @@ var __publicField = (obj, key, value) => {
       if (!activeProjectId) {
         throw new Error("Expected an active project");
       }
-      const { payloadWithoutFiles, files } = separateFilesFromValues(payload);
+      const { values, files } = separateFilesFromValues(payload.values);
+      const offlineSubmission = {
+        ...payload,
+        values,
+        created_by: state.userReducer.currentUser.id,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+      };
       const promise = this.enqueueRequest({
         description: "Respond to form",
         method: HttpMethod.POST,
         url: `/forms/revisions/${payload.form_revision}/respond/`,
-        payload: { ...payloadWithoutFiles, project: activeProjectId },
+        payload: { ...offlineSubmission, project: activeProjectId },
         blockers: [payload.issue, payload.component, payload.component_stage, "add-form-entry"].filter(
           (x) => x !== void 0
         ),
         blocks: [payload.offline_id]
       });
-      const attachFilesPromises = this.getAttachFilesPromises(files, payload);
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      const fullOfflineResult = {
-        ...payload,
-        created_by: state.userReducer.currentUser.id,
-        created_at: now,
-        updated_at: now
-      };
-      const offlineResultWithoutFiles = {
-        ...fullOfflineResult,
-        ...payloadWithoutFiles
-      };
-      store.dispatch(updateOrCreateUserFormSubmission(offlineResultWithoutFiles));
+      const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
+      store.dispatch(addFormSubmission(offlineSubmission));
       void promise.then((result) => {
         store.dispatch(addActiveProjectFormSubmissionsCount(1));
-        store.dispatch(updateOrCreateUserFormSubmission(result));
+        store.dispatch(setFormSubmission(result));
         return result;
       }).catch(() => {
-        store.dispatch(deleteUserFormSubmission(payload.offline_id));
+        store.dispatch(deleteFormSubmission(payload.offline_id));
         store.dispatch(addActiveProjectFormSubmissionsCount(-1));
       });
       const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-      return [fullOfflineResult, settledPromise];
+      return [offlineSubmission, settledPromise];
     }
-    update(submission) {
+    // Note currently the bulkAdd method is specific to form submissions for components
+    // TODO: adapt the support bulk adding to any model type
+    async bulkAdd(args) {
+      const { formRevision, values: argsValues, componentOfflineIds } = args;
       const { store } = this.client;
-      const { payloadWithoutFiles, files } = separateFilesFromValues(submission);
-      if (!("created_by" in payloadWithoutFiles) || !("created_at" in payloadWithoutFiles)) {
-        throw new Error("Expected payloadWithoutFiles to have created_by and created_at fields.");
+      const offlineSubmissions = [];
+      const offlineAttachments = [];
+      const submissionOfflineIds = [];
+      const submissionsPayload = [];
+      const attachmentsPayload = [];
+      const { values, files } = separateFilesFromValues(argsValues);
+      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const createdBy = store.getState().userReducer.currentUser.id;
+      for (const component_id of componentOfflineIds) {
+        const submission = offline({
+          form_revision: formRevision,
+          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/${formRevision}/bulk-respond/`,
+        payload: {
+          form_data: values,
+          submitted_at: submittedAt,
+          submissions: submissionsPayload,
+          attachments: attachmentsPayload,
+          files: Object.values(filesRecord)
+        },
+        blockers: componentOfflineIds,
+        blocks: submissionOfflineIds
+      });
+      promise.then(({ submissions, attachments, presigned_urls }) => {
+        store.dispatch(updateFormSubmissions(submissions));
+        store.dispatch(updateFormSubmissionAttachments(attachments));
+        for (const [sha1, presigned_url] of Object.entries(presigned_urls)) {
+          const file = filesRecord[sha1];
+          if (!file)
+            continue;
+          void this.enqueueRequest({
+            url: presigned_url.url,
+            description: "Upload file",
+            method: HttpMethod.POST,
+            isExternalUrl: true,
+            isAuthNeeded: false,
+            attachmentHash: sha1,
+            blockers: [`s3-${file.sha1}.${file.extension}`],
+            blocks: [sha1],
+            s3url: presigned_url
+          });
+        }
+      }).catch(() => {
+        store.dispatch(deleteFormSubmissions(submissionOfflineIds));
+        store.dispatch(deleteFormSubmissionAttachments(offlineAttachments.map((x) => x.offline_id)));
+      });
+      return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
+    }
+    update(submission) {
+      const { store } = this.client;
+      const { values, files } = separateFilesFromValues(submission.values);
       const attachFilesPromises = this.getAttachFilesPromises(files, submission);
-      const fullResult = {
-        ...payloadWithoutFiles,
-        updated_at: (/* @__PURE__ */ new Date()).toISOString()
+      const offlineSubmission = {
+        ...submission,
+        values
       };
-      store.dispatch(updateOrCreateUserFormSubmission(fullResult));
+      const submissionToBeUpdated = store.getState().formSubmissionReducer.formSubmissions[submission.offline_id];
+      store.dispatch(updateFormSubmission(offlineSubmission));
       const promise = this.enqueueRequest({
         description: "Patch form submission",
         method: HttpMethod.PATCH,
         url: `/forms/submissions/${submission.offline_id}/`,
-        payload: fullResult,
-        blockers: [fullResult.issue, fullResult.component, fullResult.component_stage].filter(
+        payload: offlineSubmission,
+        blockers: [offlineSubmission.issue, offlineSubmission.component, offlineSubmission.component_stage].filter(
           (x) => x !== void 0
         ),
-        blocks: [fullResult.offline_id]
+        blocks: [offlineSubmission.offline_id]
+      });
+      promise.then((createdSubmission) => {
+        store.dispatch(setFormSubmission(createdSubmission));
+      }).catch(() => {
+        store.dispatch(setFormSubmission(submissionToBeUpdated));
       });
-      return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+      return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
     }
     async delete(submissionId) {
       const { store } = this.client;
       const state = store.getState();
-      const submission = state.userFormReducer.submissions[submissionId];
-      store.dispatch(deleteUserFormSubmission(submissionId));
+      const submission = state.formSubmissionReducer.formSubmissions[submissionId];
+      const submissionAttachments = selectAttachmentsOfFormSubmission(submissionId)(state);
+      store.dispatch(deleteFormSubmission(submissionId));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
+      store.dispatch(deleteFormSubmissionAttachments(submissionAttachments.map((x) => x.offline_id)));
       try {
         return await this.enqueueRequest({
           description: "Delete user form submissions",
@@ -7147,10 +7796,9 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        if (submission) {
-          store.dispatch(addActiveProjectFormSubmissionsCount(1));
-          store.dispatch(updateOrCreateUserFormSubmission(submission));
-        }
+        store.dispatch(addActiveProjectFormSubmissionsCount(1));
+        store.dispatch(addFormSubmission(submission));
+        store.dispatch(addFormSubmissionAttachments(submissionAttachments));
         throw e;
       }
     }
@@ -7164,7 +7812,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(setUserFormSubmissions(submissions));
+      store.dispatch(setFormSubmissions(submissions));
       const attachments = await this.enqueueRequest({
         description: "Fetch form attachments",
         method: HttpMethod.GET,
@@ -7172,7 +7820,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      store.dispatch(setUserFormSubmissionAttachments(attachments));
+      store.dispatch(setFormSubmissionAttachments(attachments));
     }
   }
   class WorkspaceService extends BaseApiService {
@@ -7864,6 +8512,48 @@ var __publicField = (obj, key, value) => {
       store.dispatch(setDocuments(result));
     }
   }
+  class DocumentAttachmentService extends BaseAttachmentService {
+    constructor() {
+      super(...arguments);
+      __publicField(this, "attachmentModel", AttachmentModel.Document);
+    }
+    buildOfflineAttachment(data) {
+      return offline({
+        file: URL.createObjectURL(data.file),
+        file_sha1: data.sha1,
+        created_by: data.createdBy,
+        file_name: data.file.name,
+        file_type: data.file.type,
+        submitted_at: data.submittedAt,
+        description: data.description,
+        document: data.modelId
+      });
+    }
+    async attachFilesToDocument(files, documentId) {
+      return this.attachFiles(files, documentId, this.buildOfflineAttachment.bind(this), {
+        addAttachments: addDocumentAttachments,
+        updateAttachments: updateDocumentAttachments,
+        removeAttachments: removeDocumentAttachments
+      });
+    }
+    deleteDocumentAttachment(attachmentId) {
+      return this.deleteAttachment(
+        attachmentId,
+        {
+          setAttachment: setDocumentAttachment,
+          removeAttachment: removeDocumentAttachment
+        },
+        {
+          selectAttachment: selectDocumentAttachment
+        }
+      );
+    }
+    async refreshStore() {
+      return this.getAttachments({
+        setAttachments: setDocumentAttachments
+      });
+    }
+  }
   class AgentService extends BaseApiService {
     /**
      * Prompt the agent with a message.
@@ -7911,20 +8601,25 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "issues", new IssueService(this));
       __publicField(this, "issueComments", new IssueCommentService(this));
       __publicField(this, "issueUpdates", new IssueUpdateService(this));
+      __publicField(this, "issueAttachments", new IssueAttachmentService(this));
       __publicField(this, "workspaces", new WorkspaceService(this));
       __publicField(this, "main", new MainService(this));
       __publicField(this, "components", new ComponentService(this));
+      __publicField(this, "componentAttachments", new ComponentAttachmentService(this));
       __publicField(this, "componentTypes", new ComponentTypeService(this));
+      __publicField(this, "componentTypeAttachments", new ComponentTypeAttachmentService(this));
       __publicField(this, "componentStages", new ComponentStageService(this));
       __publicField(this, "componentStageCompletions", new ComponentStageCompletionService(this));
       __publicField(this, "userForms", new UserFormService(this));
       __publicField(this, "userFormSubmissions", new UserFormSubmissionService(this));
       __publicField(this, "projects", new ProjectService(this));
       __publicField(this, "projectFiles", new ProjectFileService(this));
+      __publicField(this, "projectAttachments", new ProjectAttachmentService(this));
       __publicField(this, "emailVerification", new EmailVerificationService(this));
       __publicField(this, "emailDomains", new EmailDomainsService(this));
       __publicField(this, "licenses", new LicenseService(this));
       __publicField(this, "documents", new DocumentService(this));
+      __publicField(this, "documentAttachments", new DocumentAttachmentService(this));
       this.API_URL = apiUrl;
       this.store = store;
     }
@@ -14030,7 +14725,7 @@ var __publicField = (obj, key, value) => {
   };
   const useAttachImagesToFormRevisionFields = (revision) => {
     const { sdk } = useSDK();
-    const attachments = useAppSelector(selectRevisionAttachments((revision == null ? void 0 : revision.offline_id) ?? ""));
+    const attachments = useAppSelector(selectAttachmentsOfFormRevision((revision == null ? void 0 : revision.offline_id) ?? ""));
     return React.useMemo(() => {
       if (!revision || !attachments)
         return revision;
@@ -14127,7 +14822,7 @@ var __publicField = (obj, key, value) => {
         return formRevisionToSchema(revisionWithImages, { readonly: true });
       }, [revisionWithImages]);
       const submissionValuesWithAttachments = React.useMemo(() => {
-        const attachments = selectSubmissionAttachments(submission.offline_id)(sdk.store.getState()) ?? [];
+        const attachments = selectAttachmentsOfFormSubmission(submission.offline_id)(sdk.store.getState()) ?? [];
         const downloadedAttachments = {};
         for (const attachment of attachments) {
           const promise = sdk.files.fetchFileFromUrl(attachment.file, attachment.file_sha1, attachment.file_name);
@@ -14177,8 +14872,8 @@ var __publicField = (obj, key, value) => {
         }
         return ret;
       }, [filter, maxResults, ownerFilter]);
-      const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
-      const userFormMapping = useAppSelector(selectUserFormMapping);
+      const userForms = useAppSelector(selectFilteredForms(ownerFilterOptions)) ?? [];
+      const userFormMapping = useAppSelector(selectFormMapping);
       const attachableUserForms = userForms.filter((form) => !form.component_type);
       const attachableUserFormMapping = Object.values(userFormMapping).filter(
         (form) => !form.component_type
@@ -14211,7 +14906,7 @@ var __publicField = (obj, key, value) => {
       const handleChange = React.useCallback((e) => {
         setFilter(e.currentTarget.value);
       }, []);
-      const numberOfForms = useAppSelector(selectNumberOfGeneralUserForms) || 0;
+      const numberOfForms = useAppSelector(selectGeneralFormCount) || 0;
       const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
       const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
       return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { ref, direction: "column", gap: "2", children: [
@@ -14305,16 +15000,13 @@ 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 = getCreatedAtOrSubmittedAtDate(submission);
-    const formattedDateTime = isToday(dateToUse) ? dateToUse.toLocaleTimeString([], {
-      hour: "2-digit",
-      minute: "2-digit"
-    }) : getLocalDateString(dateToUse);
+    const dateToUse = submission.submitted_at;
+    const formattedDateTime = getLocalDateString(dateToUse);
     const revision = useAppSelector(selectFormRevision(submission.form_revision));
     if (!revision) {
       throw new Error(`Could not find revision ${submission.form_revision} for submission ${submission.offline_id}.`);
     }
-    const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevision(revision.form))) == null ? void 0 : _a2.revision;
+    const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevisionOfForm(revision.form))) == null ? void 0 : _a2.revision;
     const creatorProfileSrc = useFileSrc({
       file: (createdBy == null ? void 0 : createdBy.profile.file) ?? null,
       fileSha1: (createdBy == null ? void 0 : createdBy.profile.file_sha1) ?? null
@@ -14345,10 +15037,6 @@ 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,
@@ -14362,10 +15050,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 : selectSubmissionsForForm(formId2));
+    const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectFormSubmissionsOfForm(formId2));
     const sortedSubmissions = React.useMemo(
       () => submissions == null ? void 0 : submissions.sort((a, b) => {
-        return getCreatedAtOrSubmittedAtDate(b).getTime() - getCreatedAtOrSubmittedAtDate(a).getTime();
+        return a.submitted_at.localeCompare(b.submitted_at);
       }),
       [submissions]
     );
@@ -15588,6 +16276,7 @@ var __publicField = (obj, key, value) => {
   }, Symbol.toStringTag, { value: "Module" }));
   exports2.APIError = APIError;
   exports2.AgentService = AgentService;
+  exports2.AttachmentModel = AttachmentModel;
   exports2.AttachmentService = AttachmentService;
   exports2.AuthService = AuthService;
   exports2.BaseApiService = BaseApiService;
@@ -15599,15 +16288,18 @@ var __publicField = (obj, key, value) => {
   exports2.ColorPicker = ColorPicker;
   exports2.Colors = Colors;
   exports2.ColorsToString = ColorsToString;
+  exports2.ComponentAttachmentService = ComponentAttachmentService;
   exports2.ComponentService = ComponentService;
   exports2.ComponentStageColors = ComponentStageColors;
   exports2.ComponentStageCompletionService = ComponentStageCompletionService;
   exports2.ComponentStageService = ComponentStageService;
+  exports2.ComponentTypeAttachmentService = ComponentTypeAttachmentService;
   exports2.ComponentTypeService = ComponentTypeService;
   exports2.DEFAULT_ISSUE_PRIORITY = DEFAULT_ISSUE_PRIORITY;
   exports2.DEFAULT_ISSUE_STATUS = DEFAULT_ISSUE_STATUS;
   exports2.DateField = DateField;
   exports2.DateInput = DateInput;
+  exports2.DocumentAttachmentService = DocumentAttachmentService;
   exports2.DocumentService = DocumentService;
   exports2.EmailDomainsService = EmailDomainsService;
   exports2.EmailVerificationService = EmailVerificationService;
@@ -15631,6 +16323,7 @@ var __publicField = (obj, key, value) => {
   exports2.InputWithHelpText = InputWithHelpText;
   exports2.InputWithLabel = InputWithLabel;
   exports2.InputWithLabelAndHelpText = InputWithLabelAndHelpText;
+  exports2.IssueAttachmentService = IssueAttachmentService;
   exports2.IssueCommentService = IssueCommentService;
   exports2.IssuePriority = IssuePriority;
   exports2.IssueService = IssueService;
@@ -15662,6 +16355,7 @@ var __publicField = (obj, key, value) => {
   exports2.PatchFormProvider = PatchFormProvider;
   exports2.ProjectAccessLevel = ProjectAccessLevel;
   exports2.ProjectAccessService = ProjectAccessService;
+  exports2.ProjectAttachmentService = ProjectAttachmentService;
   exports2.ProjectFileService = ProjectFileService;
   exports2.ProjectService = ProjectService;
   exports2.ProjectType = ProjectType;
@@ -15682,6 +16376,7 @@ 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;
@@ -15699,6 +16394,16 @@ 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;
@@ -15719,13 +16424,6 @@ 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;
@@ -15746,6 +16444,7 @@ 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;
@@ -15756,12 +16455,16 @@ 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;
@@ -15790,7 +16493,13 @@ 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;
@@ -15866,6 +16575,7 @@ 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;
@@ -15918,6 +16628,8 @@ 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;
@@ -15935,11 +16647,9 @@ var __publicField = (obj, key, value) => {
   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;
@@ -15969,8 +16679,24 @@ var __publicField = (obj, key, value) => {
   exports2.selectExpandedSections = selectExpandedSections;
   exports2.selectFavouriteProjects = selectFavouriteProjects;
   exports2.selectFileAttachmentsOfIssue = selectFileAttachmentsOfIssue;
-  exports2.selectFilteredUserForms = selectFilteredUserForms;
+  exports2.selectFilteredForms = selectFilteredForms;
+  exports2.selectForm = selectForm;
+  exports2.selectFormMapping = selectFormMapping;
+  exports2.selectFormOfComponentType = selectFormOfComponentType;
   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;
@@ -15985,10 +16711,10 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssueUpdateMapping = selectIssueUpdateMapping;
   exports2.selectIssueUpdatesOfIssue = selectIssueUpdatesOfIssue;
   exports2.selectIssues = selectIssues;
-  exports2.selectLatestFormRevision = selectLatestFormRevision;
+  exports2.selectLatestFormRevisionByForm = selectLatestFormRevisionByForm;
+  exports2.selectLatestFormRevisionOfForm = selectLatestFormRevisionOfForm;
+  exports2.selectLatestFormRevisionsOfComponentTypes = selectLatestFormRevisionsOfComponentTypes;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
-  exports2.selectLatestRevisionByFormId = selectLatestRevisionByFormId;
-  exports2.selectLatestRevisionsFromComponentTypeIds = selectLatestRevisionsFromComponentTypeIds;
   exports2.selectLicense = selectLicense;
   exports2.selectLicenseForProject = selectLicenseForProject;
   exports2.selectLicenses = selectLicenses;
@@ -15997,8 +16723,6 @@ 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;
@@ -16015,6 +16739,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectProjectAccessForUser = selectProjectAccessForUser;
   exports2.selectProjectAccessUserMapping = selectProjectAccessUserMapping;
   exports2.selectProjectAccesses = selectProjectAccesses;
+  exports2.selectProjectAttachment = selectProjectAttachment;
   exports2.selectProjectAttachmentMapping = selectProjectAttachmentMapping;
   exports2.selectProjectFileVisibility = selectProjectFileVisibility;
   exports2.selectProjectFiles = selectProjectFiles;
@@ -16026,8 +16751,6 @@ 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;
@@ -16042,16 +16765,10 @@ 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.selectUserForm = selectUserForm;
-  exports2.selectUserFormMapping = selectUserFormMapping;
-  exports2.selectUserFormSubmission = selectUserFormSubmission;
+  exports2.selectUserFormRevisionAttachmentsMapping = selectUserFormRevisionAttachmentsMapping;
   exports2.selectUsersAsMapping = selectUsersAsMapping;
   exports2.selectVisibleStatuses = selectVisibleStatuses;
   exports2.selectVisibleUserIds = selectVisibleUserIds;
@@ -16066,21 +16783,32 @@ var __publicField = (obj, key, value) => {
   exports2.setAppearance = setAppearance;
   exports2.setCategories = setCategories;
   exports2.setCenterMapToProject = setCenterMapToProject;
+  exports2.setComponentAttachment = setComponentAttachment;
   exports2.setComponentAttachments = setComponentAttachments;
+  exports2.setComponentTypeAttachment = setComponentTypeAttachment;
   exports2.setComponentTypeAttachments = setComponentTypeAttachments;
   exports2.setComponentTypes = setComponentTypes;
   exports2.setComponents = setComponents;
   exports2.setCreateProjectType = setCreateProjectType;
   exports2.setCurrentUser = setCurrentUser;
+  exports2.setDocumentAttachment = setDocumentAttachment;
   exports2.setDocumentAttachments = setDocumentAttachments;
   exports2.setDocuments = setDocuments;
   exports2.setEmailDomains = setEmailDomains;
   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;
+  exports2.setIssueAttachment = setIssueAttachment;
   exports2.setIssueAttachments = setIssueAttachments;
   exports2.setIssueComment = setIssueComment;
   exports2.setIssueComments = setIssueComments;
@@ -16093,6 +16821,7 @@ var __publicField = (obj, key, value) => {
   exports2.setOrganizations = setOrganizations;
   exports2.setProfilePicture = setProfilePicture;
   exports2.setProjectAccesses = setProjectAccesses;
+  exports2.setProjectAttachment = setProjectAttachment;
   exports2.setProjectAttachments = setProjectAttachments;
   exports2.setProjectFileVisible = setProjectFileVisible;
   exports2.setProjects = setProjects;
@@ -16102,9 +16831,6 @@ 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;
@@ -16126,17 +16852,24 @@ var __publicField = (obj, key, value) => {
   exports2.updateActiveOrganization = updateActiveOrganization;
   exports2.updateComponent = updateComponent;
   exports2.updateComponentAttachment = updateComponentAttachment;
+  exports2.updateComponentAttachments = updateComponentAttachments;
   exports2.updateComponentTypeAttachment = updateComponentTypeAttachment;
+  exports2.updateComponentTypeAttachments = updateComponentTypeAttachments;
   exports2.updateDocumentAttachment = updateDocumentAttachment;
+  exports2.updateDocumentAttachments = updateDocumentAttachments;
   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;
+  exports2.updateProjectAttachments = updateProjectAttachments;
   exports2.updateStages = updateStages;
   exports2.useAppDispatch = useAppDispatch;
   exports2.useAppSelector = useAppSelector;
@@ -16147,8 +16880,6 @@ 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;