@overmap-ai/core 1.0.48-add-agent-response-rating.2 → 1.0.48-bulk-form-submission.0

package/dist/overmap-core.js

@@ -8,7 +8,7 @@ var _a;
 import * as React from "react";
 import React__default, { useState, useEffect, useRef, memo, useMemo, useCallback, createContext, createElement, useContext, forwardRef, Children, isValidElement, cloneElement, Fragment as Fragment$1, useLayoutEffect, useReducer, lazy, Suspense } from "react";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { unsafeShowToast, AlertDialogProvider, ToastProvider, DefaultTheme, Flex as Flex$1, IconButton, RiIcon, Text as Text$1, useSeverityColor, Checkbox, TextArea, Select, useToast, Badge, MultiSelect, useViewportSize, Overlay, ButtonGroup, Spinner, IconColorUtility, Tooltip, Popover, useSize, ToggleButton, Separator, OvermapItem, Button, ButtonList, divButtonProps, DropdownItemMenu, Input, useAlertDialog } from "@overmap-ai/blocks";
+import { unsafeShowToast, AlertDialogProvider, ToastProvider, DefaultTheme, Flex as Flex$1, IconButton, RiIcon, Text as Text$1, useSeverityColor, Checkbox, TextArea, Select, useToast, Badge, MultiSelect, useViewportSize, Overlay, ButtonGroup, Spinner, IconColorUtility, Tooltip, Popover, useSize, ToggleButton, Separator, OvermapItem, Button, ButtonList, divButtonProps, OvermapDropdownMenu, Input, useAlertDialog } from "@overmap-ai/blocks";
 import { DepGraph } from "dependency-graph";
 import { offline as offline$1 } from "@redux-offline/redux-offline";
 import offlineConfig from "@redux-offline/redux-offline/lib/defaults";
@@ -631,15 +631,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$n = {
+const initialState$p = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -1370,7 +1370,7 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$m = {
+const initialState$o = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1380,8 +1380,8 @@ const initialState$m = {
 };
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$m,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     setCategories: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -1549,14 +1549,14 @@ function removeAttachments(state, action) {
     delete state.attachments[attachmentId];
   }
 }
-const initialState$l = {
+const initialState$n = {
   components: {},
   attachments: {}
 };
 const componentSlice = createSlice({
   name: "components",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     addComponent: (state, action) => {
       state.components[action.payload.offline_id] = action.payload;
@@ -1610,6 +1610,7 @@ const selectComponents = (state) => {
   }
   return prevComponents;
 };
+const selectComponentsMapping = (state) => state.componentReducer.components;
 const selectComponentsFromComponentType = (componentTypeId) => (state) => {
   if (!componentTypeId)
     return [];
@@ -1640,16 +1641,14 @@ const selectComponentTypeFromComponents = (state) => {
   }
   return ret;
 };
-const selectComponentsByType = (componentTypeId) => (state) => {
-  const components = state.componentReducer.components;
-  const componentsOfType = [];
-  for (const component of Object.values(components)) {
-    if (component.component_type === componentTypeId) {
-      componentsOfType.push(component);
+const selectComponentsByType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectComponents, (_state, componentTypeId) => componentTypeId],
+    (components, componentTypeId) => {
+      return components.filter((component) => component.component_type === componentTypeId);
     }
-  }
-  return componentsOfType;
-};
+  )
+);
 const selectNumberOfComponentsOfComponentType = (componentTypeId) => (state) => {
   var _a2;
   if (!componentTypeId)
@@ -1710,13 +1709,13 @@ const {
   removeAllComponentsOfType
 } = componentSlice.actions;
 const componentReducer = componentSlice.reducer;
-const initialState$k = {
+const initialState$m = {
   completionsByComponentId: {}
 };
 const componentStageCompletionSlice = createSlice({
   name: "componentStageCompletions",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1767,13 +1766,13 @@ const selectCompletedStageIdsForComponent = (component) => (state) => {
   return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
 };
 const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-const initialState$j = {
+const initialState$l = {
   stages: {}
 };
 const componentStageSlice = createSlice({
   name: "componentStages",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     addStages: (state, action) => {
       Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1807,6 +1806,11 @@ const componentStageSlice = createSlice({
   }
 });
 const selectStageMapping = (state) => state.componentStageReducer.stages;
+const selectStage = restructureCreateSelectorWithArgs(
+  createSelector([selectStageMapping, (_state, stageId) => stageId], (stageMapping, stageId) => {
+    return stageMapping[stageId];
+  })
+);
 const selectStages = createSelector(
   [selectStageMapping],
   (stageMapping) => {
@@ -1834,6 +1838,20 @@ const selectStagesFromComponentTypeIds = restructureCreateSelectorWithArgs(
     }
   )
 );
+const selectComponentTypeStagesMapping = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectStageMapping, (_state, componentTypeId) => componentTypeId],
+    (stagesMapping, componentTypeId) => {
+      const componentTypeStagesMapping = {};
+      for (const [stageId, stage] of Object.entries(stagesMapping)) {
+        if (stage.component_type === componentTypeId) {
+          componentTypeStagesMapping[stageId] = stage;
+        }
+      }
+      return componentTypeStagesMapping;
+    }
+  )
+);
 const selectStagesFromComponentType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectStages, (_state, componentTypeId) => componentTypeId],
@@ -1864,15 +1882,15 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
 const componentStageReducer = componentStageSlice.reducer;
-const initialState$i = {
+const initialState$k = {
   componentTypes: {},
   hiddenComponentTypeIds: {},
   attachments: {}
 };
 const componentTypeSlice = createSlice({
   name: "componentTypes",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     addComponentType: (state, action) => {
       state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1980,13 +1998,13 @@ const {
   deleteComponentType
 } = componentTypeSlice.actions;
 const componentTypeReducer = componentTypeSlice.reducer;
-const initialState$h = {
+const initialState$j = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$h,
+  initialState: initialState$j,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setWorkspaces: (state, action) => {
@@ -2043,10 +2061,11 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$g = {
+const initialState$i = {
   issues: {},
   attachments: {},
   comments: {},
+  updates: {},
   visibleStatuses: [IssueStatus.BACKLOG, IssueStatus.SELECTED],
   visibleUserIds: null,
   recentIssueIds: [],
@@ -2054,9 +2073,9 @@ const initialState$g = {
 };
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$g,
+  initialState: initialState$i,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$g);
+    Object.assign(state, initialState$i);
   }),
   reducers: {
     setIssues: (state, action) => {
@@ -2068,6 +2087,16 @@ const issueSlice = createSlice({
       });
     },
     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");
+      }
+      const newUpdates = {};
+      for (const update of action.payload) {
+        newUpdates[update.offline_id] = update;
+      }
+      state.updates = newUpdates;
+    },
     setActiveIssueId: (state, action) => {
       state.activeIssueId = action.payload;
     },
@@ -2079,6 +2108,17 @@ const issueSlice = createSlice({
     },
     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}`);
+      }
+      state.updates[action.payload.offline_id] = action.payload;
+    },
+    addIssueUpdates: (state, action) => {
+      for (const update of action.payload) {
+        state.updates[update.offline_id] = update;
+      }
+    },
     updateIssue: (state, action) => {
       if (action.payload.offline_id in state.issues) {
         state.issues[action.payload.offline_id] = {
@@ -2098,6 +2138,18 @@ const issueSlice = createSlice({
       }
     },
     removeIssueAttachment: removeAttachment,
+    removeIssueUpdate: (state, action) => {
+      if (action.payload in state.updates) {
+        delete state.updates[action.payload];
+      } else {
+        throw new Error(`Failed to remove issue update because offline_id doesn't exist: ${action.payload}`);
+      }
+    },
+    removeIssueUpdates: (state, action) => {
+      for (const updateId of action.payload) {
+        delete state.updates[updateId];
+      }
+    },
     removeAttachmentsOfIssue: (state, action) => {
       const attachments = Object.values(state.attachments).filter((a) => a.issue === action.payload);
       for (const attachment of attachments) {
@@ -2110,20 +2162,55 @@ const issueSlice = createSlice({
     setVisibleUserIds: (state, action) => {
       state.visibleUserIds = [...new Set(action.payload)];
     },
-    setIssueComments: (state, action) => {
+    // Comments
+    addIssueComment: (state, action) => {
+      if (action.payload.offline_id in state.comments) {
+        throw new Error(
+          `Tried to add issue comment with offline_id: ${action.payload.offline_id} that already exists`
+        );
+      }
+      state.comments[action.payload.offline_id] = action.payload;
+    },
+    addIssueComments: (state, action) => {
+      for (const comment of action.payload) {
+        if (comment.offline_id in state.comments) {
+          throw new Error(
+            `Tried to add issue comment with offline_id: ${comment.offline_id} that already exists`
+          );
+        }
+      }
       for (const comment of action.payload) {
         state.comments[comment.offline_id] = comment;
       }
     },
+    setIssueComment: (state, action) => {
+      state.comments[action.payload.offline_id] = action.payload;
+    },
+    setIssueComments: (state, action) => {
+      const newComments = {};
+      for (const comment of action.payload) {
+        newComments[comment.offline_id] = comment;
+      }
+      state.comments = newComments;
+    },
     addOrReplaceIssueComment: (state, action) => {
       state.comments[action.payload.offline_id] = action.payload;
     },
     removeIssueComment: (state, action) => {
-      if (action.payload in state.comments) {
-        delete state.comments[action.payload];
-      } else {
+      if (!(action.payload in state.comments)) {
         throw new Error(`Failed to remove issue comment because ID doesn't exist: ${action.payload}`);
       }
+      delete state.comments[action.payload];
+    },
+    removeIssueComments: (state, action) => {
+      for (const commentId of action.payload) {
+        if (!(commentId in state.comments)) {
+          throw new Error(`Failed to remove issue comment because ID doesn't exist: ${commentId}`);
+        }
+      }
+      for (const commentId of action.payload) {
+        delete state.comments[commentId];
+      }
     },
     cleanRecentIssues: (state) => {
       state.recentIssueIds = state.recentIssueIds.filter((recentIssue) => state.issues[recentIssue.offlineId]);
@@ -2154,23 +2241,33 @@ const {
   addIssueAttachment,
   addIssueAttachments,
   addIssue,
+  addIssueUpdate,
+  addIssueUpdates,
   addOrReplaceIssueComment,
   addToRecentIssues,
   cleanRecentIssues,
   removeIssueAttachment,
   removeAttachmentsOfIssue,
   removeIssue,
-  removeIssueComment,
+  removeIssueUpdate,
+  removeIssueUpdates,
   removeRecentIssue,
   resetRecentIssues,
   setActiveIssueId,
   setIssueAttachments,
-  setIssueComments,
+  setIssueUpdates,
   setIssues,
   setVisibleStatuses,
   setVisibleUserIds,
   updateIssueAttachment,
-  updateIssue
+  updateIssue,
+  // Commments
+  addIssueComment,
+  addIssueComments,
+  setIssueComment,
+  setIssueComments,
+  removeIssueComment,
+  removeIssueComments
 } = issueSlice.actions;
 const selectIssueMapping = (state) => state.issueReducer.issues;
 const selectRecentIssueIds = (state) => state.issueReducer.recentIssueIds;
@@ -2241,6 +2338,12 @@ const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
     return Object.values(commentMapping).filter((comment) => comment.issue === issueId);
   })
 );
+const selectIssueUpdateMapping = (state) => state.issueReducer.updates;
+const selectIssueUpdatesOfIssue = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueUpdateMapping, (_state, issueId) => issueId], (updates, issueId) => {
+    return Object.values(updates).filter((update) => update.issue === issueId);
+  })
+);
 const selectAttachmentsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
     [selectIssueAttachments, (_state, issueId) => issueId],
@@ -2377,15 +2480,15 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$f = {
+const initialState$h = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$h,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -2412,7 +2515,7 @@ const selectUploadUrl = (sha1) => (state) => {
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$e = {
+const initialState$g = {
   // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
   mapStyle: MapStyle.SATELLITE,
   showTooltips: false,
@@ -2420,8 +2523,8 @@ const initialState$e = {
 };
 const mapSlice = createSlice({
   name: "map",
-  initialState: initialState$e,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     setMapStyle: (state, action) => {
       state.mapStyle = action.payload;
@@ -2449,6 +2552,16 @@ var OrganizationAccessLevel = /* @__PURE__ */ ((OrganizationAccessLevel2) => {
   OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
   return OrganizationAccessLevel2;
 })(OrganizationAccessLevel || {});
+var IssueUpdateChange = /* @__PURE__ */ ((IssueUpdateChange2) => {
+  IssueUpdateChange2["STATUS"] = "status";
+  IssueUpdateChange2["PRIORITY"] = "priority";
+  IssueUpdateChange2["CATEGORY"] = "category";
+  IssueUpdateChange2["DESCRIPTION"] = "description";
+  IssueUpdateChange2["TITLE"] = "title";
+  IssueUpdateChange2["ASSIGNED_TO"] = "assigned_to";
+  IssueUpdateChange2["DUE_DATE"] = "due_date";
+  return IssueUpdateChange2;
+})(IssueUpdateChange || {});
 var ProjectType = /* @__PURE__ */ ((ProjectType2) => {
   ProjectType2[ProjectType2["PERSONAL"] = 0] = "PERSONAL";
   ProjectType2[ProjectType2["ORGANIZATION"] = 2] = "ORGANIZATION";
@@ -2480,7 +2593,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$d = {
+const initialState$f = {
   users: {},
   currentUser: {
     id: 0,
@@ -2491,8 +2604,8 @@ const initialState$d = {
 };
 const userSlice = createSlice({
   name: "users",
-  initialState: initialState$d,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -2554,13 +2667,13 @@ const selectUser = (userId) => (state) => {
 const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
-const initialState$c = {
+const initialState$e = {
   organizationAccesses: {}
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     setOrganizationAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2623,13 +2736,13 @@ const selectOrganizationAccessUserMapping = (state) => {
   return organizationAccesses;
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
-const initialState$b = {
+const initialState$d = {
   licenses: {}
 };
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     setLicenses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2674,13 +2787,13 @@ const selectLicensesForProjectsMapping = createSelector(
   (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
 );
 const licenseReducer = licenseSlice.reducer;
-const initialState$a = {
+const initialState$c = {
   projectAccesses: {}
 };
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$a,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     setProjectAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2748,7 +2861,7 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$9 = {
+const initialState$b = {
   projects: {},
   activeProjectId: null,
   recentProjectIds: [],
@@ -2758,7 +2871,7 @@ const initialState$9 = {
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$9,
+  initialState: initialState$b,
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -2945,14 +3058,14 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
     }
   )
 );
-const initialState$8 = {
+const initialState$a = {
   organizations: {},
   activeOrganizationId: null
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$8,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  initialState: initialState$a,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -3071,14 +3184,14 @@ const createOfflineAction = (request2, baseUrl) => {
     }
   };
 };
-const initialState$7 = {
+const initialState$9 = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  initialState: initialState$9,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
   reducers: {
     // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
     // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -3110,7 +3223,7 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$6 = {
+const initialState$8 = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false,
@@ -3118,8 +3231,8 @@ const initialState$6 = {
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$8,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -3220,12 +3333,12 @@ const selectProjectFiles = createSelector(
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
 const projectFileReducer = projectFileSlice.reducer;
-const initialState$5 = {
+const initialState$7 = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$5,
+  initialState: initialState$7,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -3235,7 +3348,7 @@ const rehydratedSlice = createSlice({
 });
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$4 = {
+const initialState$6 = {
   useIssueTemplate: false,
   placementMode: false,
   enableClustering: false,
@@ -3252,8 +3365,8 @@ const initialState$4 = {
 };
 const settingSlice = createSlice({
   name: "settings",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
   reducers: {
     setEnableDuplicateIssues: (state, action) => {
       state.useIssueTemplate = action.payload;
@@ -3299,146 +3412,248 @@ const selectAppearance = (state) => state.settingReducer.appearance;
 const settingReducer = settingSlice.reducer;
 const selectIsFetchingInitialData = (state) => state.settingReducer.isFetchingInitialData;
 const selectIsLoading = (state) => state.settingReducer.isLoading;
-const LATEST_REVISION_CACHE = {};
-function considerCachingRevision(revision, formId2, preferPending = false) {
+const LATEST_FORM_REVISION_CACHE = {};
+function considerCachingFormRevision(formRevision, formId2, preferPending = false) {
   var _a2;
-  if (!revision) {
+  if (!formRevision) {
     if (!formId2) {
-      throw new Error("If revision is null, formId is required.");
+      throw new Error("If form revision is null, formId is required.");
     }
-    const currentLatestRevision = getLatestRevisionFromCache(formId2);
-    if (currentLatestRevision)
+    const currentLatestFormRevision = getLatestFormRevisionFromCache(formId2);
+    if (currentLatestFormRevision)
       return;
-    LATEST_REVISION_CACHE[formId2] = null;
+    LATEST_FORM_REVISION_CACHE[formId2] = null;
     return;
   }
-  if (revision.revision === "Pending") {
+  if (formRevision.revision === "Pending") {
     if (preferPending) {
-      LATEST_REVISION_CACHE[revision.form] = revision;
+      LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
     }
     return;
   }
-  const cachedRevision = (_a2 = LATEST_REVISION_CACHE[revision.form]) == null ? void 0 : _a2.revision;
-  if (revision.revision > (typeof cachedRevision === "number" ? cachedRevision : -1)) {
-    LATEST_REVISION_CACHE[revision.form] = revision;
+  const cachedFormRevision = (_a2 = LATEST_FORM_REVISION_CACHE[formRevision.form]) == null ? void 0 : _a2.revision;
+  if (formRevision.revision > (typeof cachedFormRevision === "number" ? cachedFormRevision : -1)) {
+    LATEST_FORM_REVISION_CACHE[formRevision.form] = formRevision;
   }
 }
-function getLatestRevisionFromCache(formId2) {
-  return LATEST_REVISION_CACHE[formId2];
+function getLatestFormRevisionFromCache(formId2) {
+  return LATEST_FORM_REVISION_CACHE[formId2];
 }
-const initialState$3 = {
-  userForms: {},
-  revisions: {},
-  submissions: {},
-  submissionAttachments: {},
-  revisionAttachments: {}
+const initialState$5 = {
+  formRevisions: {},
+  attachments: {}
 };
-const userFormSlice = createSlice({
-  name: "userForms",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+const formRevisionsSlice = createSlice({
+  name: "formRevisions",
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
   reducers: {
-    setUserForms: (state, action) => {
-      state.userForms = {};
-      action.payload.forEach((userForm) => {
-        state.userForms[userForm.offline_id] = userForm;
-      });
-    },
-    addUserForm: (state, action) => {
-      state.userForms[action.payload.offline_id] = action.payload;
-    },
-    addUserForms: (state, action) => {
-      action.payload.forEach((userForm) => {
-        state.userForms[userForm.offline_id] = userForm;
-      });
-    },
-    addUserFormRevisions: (state, action) => {
-      action.payload.forEach((userFormRevision) => {
-        state.revisions[userFormRevision.offline_id] = userFormRevision;
-        considerCachingRevision(userFormRevision);
-      });
+    // revision related actions
+    setFormRevision: (state, action) => {
+      state.formRevisions[action.payload.offline_id] = action.payload;
+      considerCachingFormRevision(action.payload);
     },
-    addUserFormRevision: (state, action) => {
-      state.revisions[action.payload.offline_id] = action.payload;
-      considerCachingRevision(action.payload);
+    setFormRevisions: (state, action) => {
+      state.formRevisions = {};
+      for (const revision of action.payload) {
+        state.formRevisions[revision.offline_id] = revision;
+        considerCachingFormRevision(revision);
+      }
     },
-    deleteUserFormRevision: (state, action) => {
-      delete state.revisions[action.payload];
-      delete LATEST_REVISION_CACHE[action.payload];
+    addFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload.offline_id] !== void 0) {
+        throw new Error(`Revision with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formRevisions[action.payload.offline_id] = action.payload;
+      considerCachingFormRevision(action.payload);
     },
-    deleteUserFormRevisions: (state, action) => {
+    // TODO: @Audiopolis / Magnus - do we want to standardize using PayloadAction?
+    addFormRevisions: (state, action) => {
       for (const userFormRevision of action.payload) {
-        delete state.revisions[userFormRevision.offline_id];
-        delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
+        if (state.formRevisions[userFormRevision.offline_id] !== void 0) {
+          throw new Error(`Revision with offline_id ${userFormRevision.offline_id} already exists`);
+        }
+      }
+      for (const userFormRevision of action.payload) {
+        state.formRevisions[userFormRevision.offline_id] = userFormRevision;
+        considerCachingFormRevision(userFormRevision);
       }
     },
-    updateOrCreateUserFormSubmission: (state, action) => {
-      state.submissions[action.payload.offline_id] = action.payload;
-    },
-    addUserFormSubmissionAttachment: (state, action) => {
-      const submissionId = action.payload.submission;
-      const submissionAttachments = state.submissionAttachments[submissionId];
-      if (submissionAttachments) {
-        submissionAttachments.push(action.payload);
-      } else {
-        state.submissionAttachments[submissionId] = [action.payload];
+    // UserFormRevisions do not get updated
+    deleteFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload] === void 0) {
+        throw new Error(`Revision with offline_id ${action.payload} does not exist`);
       }
+      delete state.formRevisions[action.payload];
+      delete LATEST_FORM_REVISION_CACHE[action.payload];
     },
-    addUserFormRevisionAttachment: (state, action) => {
-      const revisionId = action.payload.revision;
-      const revisionAttachments = state.revisionAttachments[revisionId];
-      if (revisionAttachments) {
-        revisionAttachments.push(action.payload);
-      } else {
-        state.revisionAttachments[revisionId] = [action.payload];
+    deleteFormRevisions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formRevisions[offlineId] === void 0) {
+          throw new Error(`Revision with offline_id ${offlineId} does not exist`);
+        }
+      }
+      for (const offlineId of action.payload) {
+        delete state.formRevisions[offlineId];
+        delete LATEST_FORM_REVISION_CACHE[offlineId];
       }
     },
-    setUserFormSubmissionAttachments: (state, action) => {
-      state.submissionAttachments = {};
+    // attachment related actions
+    setFormRevisionAttachments: (state, action) => {
+      state.attachments = {};
       for (const attachment of action.payload) {
-        const submissionId = attachment.submission;
-        const submissionAttachments = state.submissionAttachments[submissionId];
-        if (submissionAttachments) {
-          submissionAttachments.push(attachment);
-        } else {
-          state.submissionAttachments[submissionId] = [attachment];
-        }
+        state.attachments[attachment.offline_id] = attachment;
       }
     },
-    setUserFormRevisionAttachments: (state, action) => {
-      state.revisionAttachments = {};
+    addFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
+    },
+    addFormRevisionAttachments: (state, action) => {
       for (const attachment of action.payload) {
-        const revisionId = attachment.revision;
-        const revisionAttachments = state.revisionAttachments[revisionId];
-        if (revisionAttachments) {
-          revisionAttachments.push(attachment);
-        } else {
-          state.revisionAttachments[revisionId] = [attachment];
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
         }
       }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
     },
-    deleteUserFormSubmission: (state, action) => {
-      delete state.submissions[action.payload];
-    },
-    deleteUserFormSubmissions: (state, action) => {
-      for (const userFormSubmission of action.payload) {
-        delete state.submissions[userFormSubmission.offline_id];
+    deleteFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload] === void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
       }
+      delete state.attachments[action.payload];
     },
-    addUserFormSubmissions: (state, action) => {
-      for (const submission of action.payload) {
-        state.submissions[submission.offline_id] = submission;
+    deleteFormRevisionAttachments: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.attachments[offlineId] === void 0) {
+          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+        }
+      }
+      for (const offlineId of action.payload) {
+        delete state.attachments[offlineId];
+      }
+    }
+  }
+});
+const {
+  setFormRevision,
+  setFormRevisions,
+  addFormRevision,
+  addFormRevisions,
+  deleteFormRevision,
+  deleteFormRevisions,
+  setFormRevisionAttachments,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments
+} = formRevisionsSlice.actions;
+const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
+const selectFormRevisions = createSelector(
+  [selectFormRevisionMapping],
+  (formRevisions) => Object.values(formRevisions)
+);
+const selectUserFormRevision = (formRevisionId) => (state) => {
+  return state.formRevisionReducer.formRevisions[formRevisionId];
+};
+const _selectLatestFormRevision = (formRevisions, formId2) => {
+  let ret = null;
+  for (const candidate of Object.values(formRevisions)) {
+    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
+      ret = candidate;
+    }
+  }
+  if (!ret) {
+    throw new Error("No form revision found for form " + formId2);
+  }
+  return ret;
+};
+const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisionMapping, (_state, formId2) => formId2], (revisions, formId2) => {
+    if (!formId2) {
+      throw new Error("formId is required");
+    }
+    return _selectLatestFormRevision(revisions, formId2);
+  })
+);
+const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+    return revisions.filter((revision) => {
+      return revision.form === formId2;
+    });
+  })
+);
+const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      selectUserFormMapping,
+      selectFormRevisionMapping,
+      (_state, componentTypeIds) => componentTypeIds
+    ],
+    (userForms, revisions, componentTypeIds) => {
+      const componentTypeIdsSet = new Set(componentTypeIds);
+      const ret = {};
+      for (const form of Object.values(userForms)) {
+        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
+          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
+        }
       }
+      return ret;
+    }
+  )
+);
+const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping], (revisions) => {
+  const latestRevisions = {};
+  for (const revision of Object.values(revisions)) {
+    const formId2 = revision.form;
+    const currentLatestRevision = latestRevisions[formId2];
+    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
+      latestRevisions[formId2] = revision;
+    }
+  }
+  return latestRevisions;
+});
+const selectUserFormRevisionAttachmentsMapping = (state) => {
+  return state.formRevisionReducer.attachments;
+};
+const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
+    (attachments, revisionId) => {
+      return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
+    }
+  )
+);
+const formRevisionReducer = formRevisionsSlice.reducer;
+const initialState$4 = {
+  forms: {}
+};
+const userFormSlice = createSlice({
+  name: "userForms",
+  initialState: initialState$4,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  reducers: {
+    setForms: (state, action) => {
+      state.forms = {};
+      action.payload.forEach((userForm) => {
+        state.forms[userForm.offline_id] = userForm;
+      });
+    },
+    addForm: (state, action) => {
+      state.forms[action.payload.offline_id] = action.payload;
     },
-    setUserFormSubmissions: (state, action) => {
-      state.submissions = {};
-      action.payload.forEach((submission) => {
-        state.submissions[submission.offline_id] = submission;
+    addForms: (state, action) => {
+      action.payload.forEach((userForm) => {
+        state.forms[userForm.offline_id] = userForm;
       });
     },
     favoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
@@ -3446,48 +3661,23 @@ const userFormSlice = createSlice({
     },
     unfavoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
       form.favorite = false;
     },
-    deleteUserForm: (state, action) => {
-      delete state.userForms[action.payload];
+    deleteForm: (state, action) => {
+      delete state.forms[action.payload];
     }
   }
 });
-const {
-  addUserForm,
-  addUserForms,
-  addUserFormRevisions,
-  updateOrCreateUserFormSubmission,
-  addUserFormSubmissions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
-  favoriteForm,
-  unfavoriteForm,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  setUserFormSubmissions,
-  addUserFormRevision,
-  addUserFormSubmissionAttachment,
-  addUserFormRevisionAttachment,
-  setUserFormSubmissionAttachments,
-  setUserFormRevisionAttachments
-} = userFormSlice.actions;
-const selectSubmissionAttachments = (submissionId) => (state) => {
-  return state.userFormReducer.submissionAttachments[submissionId] || [];
-};
-const selectRevisionAttachments = (revisionId) => (state) => {
-  return state.userFormReducer.revisionAttachments[revisionId] || [];
-};
+const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = userFormSlice.actions;
 const selectFilteredUserForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
-      (state) => state.userFormReducer.userForms,
-      (state) => state.userFormReducer.revisions,
+      (state) => state.userFormReducer.forms,
+      (state) => state.formRevisionReducer.formRevisions,
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
@@ -3510,71 +3700,188 @@ const selectFilteredUserForms = restructureCreateSelectorWithArgs(
             regularMatches.push({ ...userForm, latestRevision });
           }
         }
-        if (favoriteMatches.length >= maxResults) {
-          break;
+        if (favoriteMatches.length >= maxResults) {
+          break;
+        }
+      }
+      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: shallowEqual$1 } }
+  )
+);
+const selectUserForm = (formId2) => (state) => {
+  return state.userFormReducer.forms[formId2];
+};
+const selectUserFormMapping = (state) => {
+  return state.userFormReducer.forms;
+};
+const selectComponentTypeForm = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
+    (userForms, componentTypeId) => {
+      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
+    }
+  )
+);
+const selectNumberOfUserForms = createSelector([selectUserFormMapping], (userForms) => {
+  return Object.keys(userForms).length;
+});
+const selectNumberOfGeneralUserForms = createSelector([selectUserFormMapping], (userForms) => {
+  return Object.values(userForms).filter((form) => !form.component_type).length;
+});
+const userFormReducer = userFormSlice.reducer;
+const initialState$3 = {
+  formSubmissions: {},
+  attachments: {}
+};
+const formSubmissionSlice = createSlice({
+  name: "formSubmissions",
+  initialState: initialState$3,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  reducers: {
+    setFormSubmission: (state, action) => {
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    setFormSubmissions: (state, action) => {
+      state.formSubmissions = {};
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    addFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload.offline_id] !== void 0) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] !== void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} already exists`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    updateFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload.offline_id] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} does not exist`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    updateFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] === void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} does not exist`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    deleteFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload} does not exist`);
+      }
+      delete state.formSubmissions[action.payload];
+    },
+    deleteFormSubmissions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formSubmissions[offlineId] === void 0) {
+          throw new Error(`Submission with offline_id ${offlineId} does not exist`);
+        }
+        delete state.formSubmissions[offlineId];
+      }
+      for (const offlineId of action.payload) {
+        delete state.formSubmissions[offlineId];
+      }
+    },
+    // Attachments
+    addFormSubmissionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
         }
       }
-      const maxRegularMatches = maxResults - favoriteMatches.length;
-      return [...favoriteMatches, ...regularMatches.slice(0, maxRegularMatches)];
+      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: shallowEqual$1 } }
-  )
-);
-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;
+    // 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;
+      }
+    },
+    // 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);
+});
+const {
+  setFormSubmission,
+  setFormSubmissions,
+  addFormSubmission,
+  addFormSubmissions,
+  updateFormSubmission,
+  updateFormSubmissions,
+  deleteFormSubmission,
+  deleteFormSubmissions,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  setFormSubmissionAttachments,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments
+} = formSubmissionSlice.actions;
+const selectFormSubmissionsMapping = (state) => {
+  return state.formSubmissionReducer.formSubmissions;
+};
+const selectFormSubmissions = createSelector(
+  [selectFormSubmissionsMapping],
+  (submissions) => {
+    return Object.values(submissions);
   }
-  return ret;
-};
-const selectLatestFormRevision = restructureCreateSelectorWithArgs(
-  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 selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
-const selectRevisionMapping = (state) => state.userFormReducer.revisions;
-const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
-const selectRevisionsForForm = restructureCreateSelectorWithArgs(
-  createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
-    return revisions.filter((revision) => {
-      return revision.form === formId2;
-    });
-  })
-);
-const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
+const selectFormSubmission = (submissionId) => (state) => {
+  return state.formSubmissionReducer.formSubmissions[submissionId];
+};
+const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectSubmissions, selectRevisionMapping, (_state, formId2) => formId2],
+    [selectFormSubmissions, selectFormRevisionMapping, (_state, formId2) => formId2],
     (submissions, revisionMapping, formId2) => {
-      return Object.values(submissions).filter((submission) => {
+      return submissions.filter((submission) => {
         const revision = revisionMapping[submission.form_revision];
         return (revision == null ? void 0 : revision.form) === formId2;
       });
     }
   )
 );
-const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
+const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
-    [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
+    [selectFormSubmissions, (_state, issueId) => issueId],
     (submissions, issueId) => {
       return Object.values(submissions).filter((submission) => {
         return submission.issue === issueId;
@@ -3582,9 +3889,9 @@ const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
+const selectFormSubmissionsOfComponent = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectSubmissions, (_state, componentId) => componentId],
+    [selectFormSubmissions, (_state, componentId) => componentId],
     (submissions, componentId) => {
       return submissions.filter((submission) => {
         return submission.component === componentId;
@@ -3592,54 +3899,35 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectUserFormMapping = (state) => {
-  return state.userFormReducer.userForms;
-};
-const selectComponentTypeForm = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
-    (userForms, componentTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
+const selectFormSubmissionsByComponents = createSelector(
+  [selectFormSubmissionsMapping, selectComponentsMapping],
+  (submissions, components) => {
+    var _a2;
+    const componentSubmissionMapping = {};
+    for (const componentId in components) {
+      componentSubmissionMapping[componentId] = [];
     }
-  )
+    for (const submissionId in submissions) {
+      const submission = submissions[submissionId];
+      if (submission.component) {
+        (_a2 = componentSubmissionMapping[submission.component]) == null ? void 0 : _a2.push(submission);
+      }
+    }
+    return componentSubmissionMapping;
+  }
 );
-const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithArgs(
+const selectFormSubmissionAttachmentsMapping = (state) => {
+  return state.formSubmissionReducer.attachments;
+};
+const selectAttachmentsOfFormSubmission = restructureCreateSelectorWithArgs(
   createSelector(
-    [
-      selectUserFormMapping,
-      selectRevisionMapping,
-      (_state, componentTypeIds) => componentTypeIds
-    ],
-    (userForms, revisions, componentTypeIds) => {
-      const componentTypeIdsSet = new Set(componentTypeIds);
-      const ret = {};
-      for (const form of Object.values(userForms)) {
-        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
-          ret[form.component_type] = _selectLatestFormRevision(revisions, form.offline_id);
-        }
-      }
-      return ret;
+    [selectFormSubmissionAttachmentsMapping, (_state, submissionId) => submissionId],
+    (attachmentsMapping, submissionId) => {
+      return Object.values(attachmentsMapping).filter((attachment) => attachment.submission === submissionId);
     }
   )
 );
-const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (revisions) => {
-  const latestRevisions = {};
-  for (const revision of Object.values(revisions)) {
-    const formId2 = revision.form;
-    const currentLatestRevision = latestRevisions[formId2];
-    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
-      latestRevisions[formId2] = revision;
-    }
-  }
-  return latestRevisions;
-});
-const selectNumberOfUserForms = createSelector([selectUserFormMapping], (userForms) => {
-  return Object.keys(userForms).length;
-});
-const selectNumberOfGeneralUserForms = createSelector([selectUserFormMapping], (userForms) => {
-  return Object.values(userForms).filter((form) => !form.component_type).length;
-});
-const userFormReducer = userFormSlice.reducer;
+const formSubmissionReducer = formSubmissionSlice.reducer;
 const initialState$2 = {
   emailDomains: {}
 };
@@ -3886,6 +4174,8 @@ const overmapReducers = {
   rehydratedReducer,
   settingReducer,
   userFormReducer,
+  formRevisionReducer,
+  formSubmissionReducer,
   userReducer,
   workspaceReducer,
   emailDomainsReducer,
@@ -3938,7 +4228,7 @@ function handleWorkspaceRemoval(draft, action) {
       throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
     }
   }
-  const indexedForms = Object.values(draft.userFormReducer.userForms).filter(
+  const indexedForms = Object.values(draft.userFormReducer.forms).filter(
     (form) => form.index_workspace === workspaceId
   );
   for (const form of indexedForms) {
@@ -4437,7 +4727,7 @@ class AttachmentService extends BaseApiService {
   }
   // Attachments aren't models, so we use the OptimisticGenericResult type instead
   async addIssueAttachment(attachmentPayload) {
-    const { description: description2, issue, file_sha1, offline_id } = attachmentPayload;
+    const { issue, file_sha1, offline_id } = attachmentPayload;
     if (!attachmentPayload.file.objectURL) {
       throw new Error("Expected attachmentPayload.file.objectURL to be defined.");
     }
@@ -4445,7 +4735,9 @@ class AttachmentService extends BaseApiService {
       ...attachmentPayload,
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
-      file_type: attachmentPayload.file.type
+      file_type: attachmentPayload.file.type,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
     this.client.store.dispatch(addIssueAttachment(offlineAttachment));
@@ -4457,10 +4749,7 @@ class AttachmentService extends BaseApiService {
       blocks: [offline_id, issue],
       blockers: [file_sha1],
       payload: {
-        offline_id,
-        issue,
-        description: description2 ?? "",
-        submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+        ...offlineAttachment,
         ...fileProps
       }
     });
@@ -4471,7 +4760,7 @@ class AttachmentService extends BaseApiService {
     return [offlineAttachment, promise];
   }
   async addComponentAttachment(attachmentPayload) {
-    const { description: description2, component, file_sha1, offline_id } = attachmentPayload;
+    const { component, file_sha1, offline_id } = attachmentPayload;
     if (!attachmentPayload.file.objectURL) {
       throw new Error("Expected attachmentPayload.file.objectURL to be defined.");
     }
@@ -4479,7 +4768,9 @@ class AttachmentService extends BaseApiService {
       ...attachmentPayload,
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
-      file_type: attachmentPayload.file.type
+      file_type: attachmentPayload.file.type,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
     this.client.store.dispatch(addComponentAttachment(offlineAttachment));
@@ -4491,10 +4782,7 @@ class AttachmentService extends BaseApiService {
       blocks: [offline_id, component],
       blockers: [file_sha1],
       payload: {
-        offline_id,
-        component,
-        description: description2 ?? "",
-        submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+        ...offlineAttachment,
         ...fileProps
       }
     });
@@ -4505,7 +4793,7 @@ class AttachmentService extends BaseApiService {
     return [offlineAttachment, promise];
   }
   async addComponentTypeAttachment(attachmentPayload) {
-    const { description: description2, component_type, file_sha1, offline_id } = attachmentPayload;
+    const { component_type, file_sha1, offline_id } = attachmentPayload;
     if (!attachmentPayload.file.objectURL) {
       throw new Error("Expected attachmentPayload.file.objectURL to be defined.");
     }
@@ -4513,7 +4801,9 @@ class AttachmentService extends BaseApiService {
       ...attachmentPayload,
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
-      file_type: attachmentPayload.file.type
+      file_type: attachmentPayload.file.type,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
     this.client.store.dispatch(addComponentTypeAttachment(offlineAttachment));
@@ -4525,10 +4815,7 @@ class AttachmentService extends BaseApiService {
       blocks: [offline_id, component_type],
       blockers: [file_sha1],
       payload: {
-        offline_id,
-        component_type,
-        description: description2 ?? "",
-        submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3,
+        ...offlineAttachment,
         ...fileProps
       }
     });
@@ -4547,7 +4834,9 @@ class AttachmentService extends BaseApiService {
       ...attachmentPayload,
       file: attachmentPayload.file.objectURL,
       file_name: attachmentPayload.file.name,
-      file_type: attachmentPayload.file.type
+      file_type: attachmentPayload.file.type,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      created_by: this.client.store.getState().userReducer.currentUser.id
     };
     await this.client.files.addCache(attachmentPayload.file, file_sha1);
     this.client.store.dispatch(addProjectAttachment(offlineAttachment));
@@ -4587,7 +4876,9 @@ class AttachmentService extends BaseApiService {
           file_name: file2.name,
           file_type: file2.type,
           issue: issueId,
-          file_sha1: hash
+          file_sha1: hash,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+          created_by: this.client.store.getState().userReducer.currentUser.id
         });
         return this.addIssueAttachment(attachment);
       };
@@ -4606,7 +4897,9 @@ class AttachmentService extends BaseApiService {
           file_name: file2.name,
           file_type: file2.type,
           component: componentId,
-          file_sha1: hash
+          file_sha1: hash,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+          created_by: this.client.store.getState().userReducer.currentUser.id
         });
         return this.addComponentAttachment(attachment);
       };
@@ -4625,7 +4918,9 @@ class AttachmentService extends BaseApiService {
           file_name: file2.name,
           file_type: file2.type,
           component_type: componentTypeId,
-          file_sha1: hash
+          file_sha1: hash,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+          created_by: this.client.store.getState().userReducer.currentUser.id
         });
         return this.addComponentTypeAttachment(attachment);
       };
@@ -4644,7 +4939,9 @@ class AttachmentService extends BaseApiService {
           file_name: file2.name,
           file_type: file2.type,
           project: projectId,
-          file_sha1: hash
+          file_sha1: hash,
+          submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+          created_by: this.client.store.getState().userReducer.currentUser.id
         });
         return this.addProjectAttachment(attachment);
       };
@@ -5721,49 +6018,35 @@ class ComponentTypeService extends BaseApiService {
   }
 }
 class IssueCommentService extends BaseApiService {
+  // Omit author and submitted_at since these will always be set internally
   add(comment) {
-    const offlinePayload = offline(comment);
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const { store } = this.client;
-    const offlineComment = {
-      ...offlinePayload,
+    const offlineComment = offline({
+      ...comment,
       author: store.getState().userReducer.currentUser.id,
-      created_at: submittedAt
-    };
-    store.dispatch(addOrReplaceIssueComment(offlineComment));
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    store.dispatch(addIssueComment(offlineComment));
     const promise = this.enqueueRequest({
       description: `${truncate(comment.content, 80)}`,
       method: HttpMethod.POST,
       url: `/issues/${comment.issue}/comment/`,
-      payload: { ...offlinePayload, submitted_at: submittedAt },
+      payload: offlineComment,
       blockers: [comment.issue],
-      blocks: [offlinePayload.offline_id]
+      blocks: [offlineComment.offline_id]
+    });
+    promise.catch(() => {
+      store.dispatch(removeIssueComment(offlineComment.offline_id));
     });
     return [offlineComment, promise];
   }
-  async refreshStore() {
+  update(comment) {
     const { store } = this.client;
-    const result = await this.enqueueRequest({
-      description: "Get comments",
-      method: HttpMethod.GET,
-      // TODO: Choose between /issues/comments/in-project/${projectId}/ and /projects/${projectId}/issue-comments/
-      url: `/projects/${store.getState().projectReducer.activeProjectId}/comments/`,
-      blockers: [],
-      blocks: []
-    });
-    let filteredResult = result.filter(onlyUniqueOfflineIds);
-    filteredResult = filteredResult.map((comment) => {
-      return { ...comment };
-    });
-    if (result.length !== filteredResult.length) {
-      console.error(
-        `Received duplicate comments from the API (new length ${filteredResult.length}); filtered in browser.`
-      );
+    const commentToUpdate = store.getState().issueReducer.comments[comment.offline_id];
+    if (!commentToUpdate) {
+      throw new Error(`Comment with offline_id ${comment.offline_id} not found in store`);
     }
-    store.dispatch(setIssueComments(filteredResult));
-  }
-  update(comment) {
-    this.client.store.dispatch(addOrReplaceIssueComment(comment));
+    store.dispatch(setIssueComment(comment));
     const promise = this.enqueueRequest({
       description: `Edit comment: ${truncate(comment.content, 80)}`,
       method: HttpMethod.PATCH,
@@ -5772,17 +6055,62 @@ class IssueCommentService extends BaseApiService {
       blockers: [comment.issue],
       blocks: [comment.offline_id]
     });
+    promise.catch(() => {
+      store.dispatch(setIssueComment(commentToUpdate));
+    });
     return [comment, promise];
   }
   remove(offline_id) {
+    const commentToRemove = this.client.store.getState().issueReducer.comments[offline_id];
+    if (!commentToRemove) {
+      throw new Error(`Comment with offline_id ${offline_id} not found in store`);
+    }
     this.client.store.dispatch(removeIssueComment(offline_id));
-    return this.enqueueRequest({
+    const promise = this.enqueueRequest({
       description: "Delete comment",
       method: HttpMethod.DELETE,
       url: `/issues/comments/${offline_id}/`,
       blockers: [offline_id],
       blocks: []
     });
+    promise.catch(() => {
+      this.client.store.dispatch(addIssueComment(commentToRemove));
+    });
+    return promise;
+  }
+  async refreshStore() {
+    const { store } = this.client;
+    const result = await this.enqueueRequest({
+      description: "Get comments",
+      method: HttpMethod.GET,
+      // TODO: Choose between /issues/comments/in-project/${projectId}/ and /projects/${projectId}/issue-comments/
+      url: `/projects/${store.getState().projectReducer.activeProjectId}/comments/`,
+      blockers: [],
+      blocks: []
+    });
+    store.dispatch(setIssueComments(result));
+  }
+}
+class IssueUpdateService extends BaseApiService {
+  async refreshStore() {
+    const { store } = this.client;
+    const result = await this.enqueueRequest({
+      description: "Get issue updates",
+      method: HttpMethod.GET,
+      url: `/projects/${store.getState().projectReducer.activeProjectId}/issues/updates/`,
+      blockers: [],
+      blocks: []
+    });
+    let filteredResult = result.filter(onlyUniqueOfflineIds);
+    filteredResult = filteredResult.map((comment) => {
+      return { ...comment };
+    });
+    if (result.length !== filteredResult.length) {
+      console.error(
+        `Received duplicate comments from the API (new length ${filteredResult.length}); filtered in browser.`
+      );
+    }
+    store.dispatch(setIssueUpdates(filteredResult));
   }
 }
 class IssueService extends BaseApiService {
@@ -5863,7 +6191,83 @@ class IssueService extends BaseApiService {
     return [offlineIssues, promise];
   }
   update(issue) {
+    const state = this.client.store.getState();
+    const issueToBeUpdated = state.issueReducer.issues[issue.offline_id];
+    if (!issueToBeUpdated) {
+      throw new Error(
+        `Attempting to update an issue with offline_id ${issue.offline_id} that doesn't exist in the store`
+      );
+    }
     this.client.store.dispatch(updateIssue(issue));
+    const changes = {};
+    for (const issueUpdateChange of [
+      IssueUpdateChange.TITLE,
+      IssueUpdateChange.DESCRIPTION,
+      IssueUpdateChange.STATUS,
+      IssueUpdateChange.CATEGORY,
+      IssueUpdateChange.PRIORITY,
+      IssueUpdateChange.ASSIGNED_TO,
+      IssueUpdateChange.DUE_DATE
+    ]) {
+      if (issueUpdateChange in issue && issue[issueUpdateChange] !== issueToBeUpdated[issueUpdateChange]) {
+        switch (issueUpdateChange) {
+          case "category": {
+            let categoryOrNull = null;
+            const categoryIdOrNull = issue[issueUpdateChange];
+            if (categoryIdOrNull) {
+              categoryOrNull = state.categoryReducer.categories[categoryIdOrNull] ?? null;
+              if (!categoryOrNull)
+                throw new Error(
+                  `Trying to update issue category to ${categoryIdOrNull} which does not exist in store`
+                );
+            }
+            changes[issueUpdateChange] = categoryOrNull ? {
+              name: categoryOrNull.name,
+              color: categoryOrNull.color,
+              offline_id: categoryOrNull.offline_id
+            } : null;
+            break;
+          }
+          case "assigned_to": {
+            let userOrNull = null;
+            const userIdOrNull = issue[issueUpdateChange];
+            if (userIdOrNull) {
+              userOrNull = state.userReducer.users[userIdOrNull] ?? null;
+              if (!userOrNull)
+                throw new Error(
+                  `Trying to update issue assigned_to to ${userIdOrNull} which does not exist in store`
+                );
+            }
+            changes[issueUpdateChange] = userOrNull ? {
+              full_name: userOrNull.username,
+              id: userOrNull.id
+            } : null;
+            break;
+          }
+          case "description":
+            changes[issueUpdateChange] = issue[issueUpdateChange] ?? null;
+            break;
+          case "title":
+            changes[issueUpdateChange] = issue[issueUpdateChange] ?? null;
+            break;
+          case "priority":
+            changes[issueUpdateChange] = issue[issueUpdateChange];
+            break;
+          case "status":
+            changes[issueUpdateChange] = issue[issueUpdateChange];
+            break;
+          case "due_date":
+            changes[issueUpdateChange] = issue[issueUpdateChange] ? issue[issueUpdateChange] : null;
+        }
+      }
+    }
+    const offlineIssueUpdate = offline({
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      issue: issueToBeUpdated.offline_id,
+      changes
+    });
+    this.client.store.dispatch(addIssueUpdate(offlineIssueUpdate));
     const promise = this.enqueueRequest({
       description: "Edit issue",
       method: HttpMethod.PATCH,
@@ -5872,23 +6276,30 @@ class IssueService extends BaseApiService {
       blockers: [issue.offline_id],
       blocks: [issue.offline_id]
     });
+    promise.catch(() => {
+      this.client.store.dispatch(updateIssue(issueToBeUpdated));
+      this.client.store.dispatch(removeIssueUpdate(offlineIssueUpdate.offline_id));
+    });
     const fullIssue = this.client.store.getState().issueReducer.issues[issue.offline_id];
     return [fullIssue, promise];
   }
   async remove(id) {
     const { store } = this.client;
     const state = store.getState();
+    const dispatch = store.dispatch;
     const backup = state.issueReducer.issues[id];
     if (!backup) {
       throw new Error(`No issue with id ${id} found in the store`);
     }
     const attachments = Object.values(state.issueReducer.attachments).filter((a) => a.issue === id);
     const attachmentsOfIssue = selectAttachmentsOfIssue(id)(state);
-    this.client.store.dispatch(removeIssue(id));
-    store.dispatch(addActiveProjectIssuesCount(-1));
-    if (attachmentsOfIssue.length > 0) {
-      this.client.store.dispatch(removeAttachmentsOfIssue(id));
-    }
+    const updatesOfIssue = selectIssueUpdatesOfIssue(id)(state);
+    dispatch(removeIssue(id));
+    dispatch(addActiveProjectIssuesCount(-1));
+    if (attachmentsOfIssue.length > 0)
+      dispatch(removeAttachmentsOfIssue(id));
+    if (updatesOfIssue.length > 0)
+      dispatch(removeIssueUpdates(updatesOfIssue.map(({ offline_id }) => offline_id)));
     try {
       return await this.enqueueRequest({
         description: "Delete issue",
@@ -5898,9 +6309,10 @@ class IssueService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      this.client.store.dispatch(addIssue(backup));
-      this.client.store.dispatch(addIssueAttachments(attachments));
-      store.dispatch(addActiveProjectIssuesCount(1));
+      dispatch(addIssue(backup));
+      dispatch(addIssueAttachments(attachments));
+      dispatch(addIssueUpdates(updatesOfIssue));
+      dispatch(addActiveProjectIssuesCount(1));
       throw e;
     }
   }
@@ -6082,6 +6494,7 @@ class MainService extends BaseApiService {
         store.dispatch(setProjectAttachments(project_attachments));
       });
       void this.client.documents.refreshStore();
+      void this.client.issueUpdates.refreshStore();
     }
     store.dispatch(setIsFetchingInitialData(false));
     if (overwrite) {
@@ -6446,7 +6859,7 @@ class UserFormService extends BaseApiService {
           ...revisionAttachmentPayload,
           file: URL.createObjectURL(image)
         };
-        store.dispatch(addUserFormRevisionAttachment(offlinePayload));
+        store.dispatch(addFormRevisionAttachment(offlinePayload));
         return attach;
       });
     });
@@ -6480,8 +6893,8 @@ class UserFormService extends BaseApiService {
       revision: 0
     };
     const { store } = this.client;
-    store.dispatch(addUserForm(retForm));
-    store.dispatch(addUserFormRevision(retRevision));
+    store.dispatch(addForm(retForm));
+    store.dispatch(addFormRevision(retRevision));
     const formPromise = this.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
@@ -6499,8 +6912,8 @@ class UserFormService extends BaseApiService {
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
     void formPromise.catch((e) => {
-      store.dispatch(deleteUserForm(retForm.offline_id));
-      store.dispatch(deleteUserFormRevision(retRevision.offline_id));
+      store.dispatch(deleteForm(retForm.offline_id));
+      store.dispatch(deleteFormRevision(retRevision.offline_id));
       throw e;
     });
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
@@ -6542,7 +6955,7 @@ class UserFormService extends BaseApiService {
       revision: "Pending",
       form: formId2
     };
-    store.dispatch(addUserFormRevision(fullRevision));
+    store.dispatch(addFormRevision(fullRevision));
     const promise = this.enqueueRequest({
       description: "Create form revision",
       method: HttpMethod.PATCH,
@@ -6556,9 +6969,9 @@ class UserFormService extends BaseApiService {
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
     void promise.then((result) => {
-      store.dispatch(addUserFormRevision(result));
+      store.dispatch(setFormRevision(result));
     }).catch(() => {
-      store.dispatch(deleteUserFormRevision(fullRevision.offline_id));
+      store.dispatch(deleteFormRevision(fullRevision.offline_id));
     });
     const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
     return [fullRevision, settledPromise];
@@ -6604,15 +7017,15 @@ class UserFormService extends BaseApiService {
     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",
@@ -6622,12 +7035,12 @@ class UserFormService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      store.dispatch(addUserForm(userForm));
+      store.dispatch(addForm(userForm));
       if (userFormRevisions && userFormRevisions.length > 0) {
-        store.dispatch(addUserFormRevisions(userFormRevisions));
+        store.dispatch(addFormRevisions(userFormRevisions));
       }
       if (userFormSubmissions && userFormSubmissions.length > 0) {
-        store.dispatch(addUserFormSubmissions(userFormSubmissions));
+        store.dispatch(addFormSubmissions(userFormSubmissions));
       }
       throw e;
     }
@@ -6641,16 +7054,15 @@ class UserFormService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(addUserForms(Object.values(result.forms)));
-    store.dispatch(addUserFormRevisions(Object.values(result.revisions)));
-    store.dispatch(setUserFormRevisionAttachments(Object.values(result.attachments)));
+    store.dispatch(setForms(Object.values(result.forms)));
+    store.dispatch(setFormRevisions(Object.values(result.revisions)));
+    store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
   }
 }
 const isArrayOfFiles = (value) => {
   return Array.isArray(value) && value[0] instanceof File;
 };
-const separateFilesFromValues = (payload) => {
-  const { values } = payload;
+const separateFilesFromValues = (values) => {
   const files = {};
   const newValues = {};
   for (const key in values) {
@@ -6665,17 +7077,13 @@ const separateFilesFromValues = (payload) => {
       newValues[key] = value;
     }
   }
-  const payloadWithoutFiles = {
-    ...payload,
-    values: newValues
-  };
-  return { payloadWithoutFiles, files };
+  return { values: newValues, files };
 };
 class UserFormSubmissionService extends BaseApiService {
   constructor() {
     super(...arguments);
     // Attach files to submission, after uploading them to S3
-    __publicField(this, "getAttachFilesPromises", (files, payload) => {
+    __publicField(this, "getAttachFilesPromises", (files, submission) => {
       const { store } = this.client;
       return Object.entries(files).map(async ([key, fileArray]) => {
         const attachResults = [];
@@ -6685,24 +7093,27 @@ class UserFormSubmissionService extends BaseApiService {
           const [fileProps] = await this.client.files.uploadFileToS3(sha1);
           const submissionAttachmentPayload = offline({
             ...fileProps,
-            submission: payload.offline_id,
+            submission: submission.offline_id,
             field_identifier: key
           });
           const attach = await this.enqueueRequest({
             description: "Attach file to form submission",
             method: HttpMethod.POST,
-            url: `/forms/submission/${payload.offline_id}/attachments/`,
+            url: `/forms/submission/${submission.offline_id}/attachments/`,
             payload: submissionAttachmentPayload,
-            blockers: [payload.component, payload.component_stage, payload.issue, payload.form_revision].filter(
-              (x) => x !== void 0
-            ),
+            blockers: [
+              submission.component,
+              submission.component_stage,
+              submission.issue,
+              submission.form_revision
+            ].filter((x) => x !== void 0),
             blocks: [submissionAttachmentPayload.offline_id]
           });
           const offlinePayload = {
             ...submissionAttachmentPayload,
             file: URL.createObjectURL(file)
           };
-          store.dispatch(addUserFormSubmissionAttachment(offlinePayload));
+          store.dispatch(addFormSubmissionAttachment(offlinePayload));
           attachResults.push(attach);
         }
         return attachResults;
@@ -6716,70 +7127,113 @@ class UserFormSubmissionService extends BaseApiService {
     if (!activeProjectId) {
       throw new Error("Expected an active project");
     }
-    const { payloadWithoutFiles, files } = separateFilesFromValues(payload);
+    const { values, files } = separateFilesFromValues(payload.values);
+    const offlineSubmission = {
+      ...payload,
+      values,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    };
     const promise = this.enqueueRequest({
       description: "Respond to form",
       method: HttpMethod.POST,
       url: `/forms/revisions/${payload.form_revision}/respond/`,
-      payload: { ...payloadWithoutFiles, project: activeProjectId },
+      payload: { ...offlineSubmission, project: activeProjectId },
       blockers: [payload.issue, payload.component, payload.component_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
       blocks: [payload.offline_id]
     });
-    const attachFilesPromises = this.getAttachFilesPromises(files, payload);
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const fullOfflineResult = {
-      ...payload,
-      created_by: state.userReducer.currentUser.id,
-      created_at: now,
-      updated_at: now
-    };
-    const offlineResultWithoutFiles = {
-      ...fullOfflineResult,
-      ...payloadWithoutFiles
-    };
-    store.dispatch(updateOrCreateUserFormSubmission(offlineResultWithoutFiles));
+    const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
+    store.dispatch(addFormSubmission(offlineSubmission));
     void promise.then((result) => {
       store.dispatch(addActiveProjectFormSubmissionsCount(1));
-      store.dispatch(updateOrCreateUserFormSubmission(result));
+      store.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
-      store.dispatch(deleteUserFormSubmission(payload.offline_id));
+      store.dispatch(deleteFormSubmission(payload.offline_id));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
     const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-    return [fullOfflineResult, settledPromise];
+    return [offlineSubmission, settledPromise];
   }
-  update(submission) {
+  // Note currently the bulkAdd method is specific to form submissions for components
+  // TODO: adapt the support bulk adding to any model type
+  bulkAdd(args) {
+    const { form_revision, values: argsValues, component_offline_ids } = 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 submissions = [];
+    const submissionOfflineIds = [];
+    const offline_ids_to_component_ids = [];
+    let attachFilesPromises = [];
+    const { values, files } = separateFilesFromValues(argsValues);
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = store.getState().userReducer.currentUser.id;
+    for (const component_id of component_offline_ids) {
+      const submission = offline({
+        form_revision,
+        values,
+        created_by: createdBy,
+        submitted_at: submittedAt,
+        component: component_id
+      });
+      attachFilesPromises = attachFilesPromises.concat(this.getAttachFilesPromises(files, submission));
+      submissionOfflineIds.push(submission.offline_id);
+      offline_ids_to_component_ids.push([submission.offline_id, component_id]);
+      submissions.push(submission);
     }
+    store.dispatch(addFormSubmissions(submissions));
+    const promise = this.enqueueRequest({
+      description: "Bulk add form submissions",
+      method: HttpMethod.POST,
+      url: `/forms/revisions/${form_revision}/bulk-respond/`,
+      payload: {
+        form_data: values,
+        submitted_at: submittedAt,
+        offline_ids_to_component_ids
+      },
+      blockers: component_offline_ids,
+      blocks: submissionOfflineIds
+    });
+    promise.then((createdSubmissions) => {
+      store.dispatch(updateFormSubmissions(createdSubmissions));
+    }).catch(() => {
+      store.dispatch(deleteFormSubmissions(submissionOfflineIds));
+    });
+    return [submissions, promise.then(() => Promise.all(attachFilesPromises).then(() => promise))];
+  }
+  update(submission) {
+    const { store } = this.client;
+    const { values, files } = separateFilesFromValues(submission.values);
     const attachFilesPromises = this.getAttachFilesPromises(files, submission);
-    const fullResult = {
-      ...payloadWithoutFiles,
-      updated_at: (/* @__PURE__ */ new Date()).toISOString()
+    const offlineSubmission = {
+      ...submission,
+      values
     };
-    store.dispatch(updateOrCreateUserFormSubmission(fullResult));
+    const submissionToBeUpdated = store.getState().formSubmissionReducer.formSubmissions[submission.offline_id];
+    store.dispatch(updateFormSubmission(offlineSubmission));
     const promise = this.enqueueRequest({
       description: "Patch form submission",
       method: HttpMethod.PATCH,
       url: `/forms/submissions/${submission.offline_id}/`,
-      payload: fullResult,
-      blockers: [fullResult.issue, fullResult.component, fullResult.component_stage].filter(
+      payload: offlineSubmission,
+      blockers: [offlineSubmission.issue, offlineSubmission.component, offlineSubmission.component_stage].filter(
         (x) => x !== void 0
       ),
-      blocks: [fullResult.offline_id]
+      blocks: [offlineSubmission.offline_id]
+    });
+    promise.then((createdSubmission) => {
+      store.dispatch(setFormSubmission(createdSubmission));
+    }).catch(() => {
+      store.dispatch(setFormSubmission(submissionToBeUpdated));
     });
-    return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+    return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
   }
   async delete(submissionId) {
     const { store } = this.client;
     const state = store.getState();
-    const submission = state.userFormReducer.submissions[submissionId];
-    store.dispatch(deleteUserFormSubmission(submissionId));
+    const submission = state.formSubmissionReducer.formSubmissions[submissionId];
+    store.dispatch(deleteFormSubmission(submissionId));
     store.dispatch(addActiveProjectFormSubmissionsCount(-1));
     try {
       return await this.enqueueRequest({
@@ -6790,10 +7244,8 @@ class UserFormSubmissionService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      if (submission) {
-        store.dispatch(addActiveProjectFormSubmissionsCount(1));
-        store.dispatch(updateOrCreateUserFormSubmission(submission));
-      }
+      store.dispatch(addActiveProjectFormSubmissionsCount(1));
+      store.dispatch(addFormSubmission(submission));
       throw e;
     }
   }
@@ -6807,7 +7259,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setUserFormSubmissions(submissions));
+    store.dispatch(setFormSubmissions(submissions));
     const attachments = await this.enqueueRequest({
       description: "Fetch form attachments",
       method: HttpMethod.GET,
@@ -6815,7 +7267,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setUserFormSubmissionAttachments(attachments));
+    store.dispatch(setFormSubmissionAttachments(attachments));
   }
 }
 class WorkspaceService extends BaseApiService {
@@ -7549,6 +8001,7 @@ class OvermapSDK {
     __publicField(this, "organizationAccess", new OrganizationAccessService(this));
     __publicField(this, "issues", new IssueService(this));
     __publicField(this, "issueComments", new IssueCommentService(this));
+    __publicField(this, "issueUpdates", new IssueUpdateService(this));
     __publicField(this, "workspaces", new WorkspaceService(this));
     __publicField(this, "main", new MainService(this));
     __publicField(this, "components", new ComponentService(this));
@@ -13022,52 +13475,54 @@ const styles$4 = {
   Footer,
   Loading
 };
-const ImageCard = memo((props) => {
-  const { file, alt, error: error2, size, rightSlot, className, truncateLength, ...rest } = props;
-  const fileCardRef = useRef(null);
-  const imageInsetRef = useRef(null);
-  const fileCardSize = useSize(fileCardRef);
-  useLayoutEffect(() => {
-    if (!imageInsetRef.current || !fileCardSize)
-      return;
-    imageInsetRef.current.style.height = `${fileCardSize.height * 4}px`;
-  }, [fileCardSize]);
-  const fileName2 = useMemo(() => {
-    if (!file)
-      return;
-    return truncateLength !== void 0 ? truncate(file.name, truncateLength) : file.name;
-  }, [file, truncateLength]);
-  return /* @__PURE__ */ jsxs(
-    Flex,
-    {
-      className: classNames$1(className, styles$4.ImageCard),
-      width: "100%",
-      direction: "column",
-      position: "relative",
-      height: "max-content",
-      gap: "0",
-      ...rest,
-      children: [
-        !file && !error2 && /* @__PURE__ */ jsx(Flex, { width: "100%", height: "100%", align: "center", justify: "center", position: "absolute", children: /* @__PURE__ */ jsx(Spinner, {}) }),
-        /* @__PURE__ */ jsx(Inset, { className: styles$4.ImageInset, ref: imageInsetRef, clip: "padding-box", side: "y", pb: "0", children: file && !error2 && /* @__PURE__ */ jsx("img", { className: styles$4.Image, src: URL.createObjectURL(file), alt: alt ?? file.name }) }),
-        /* @__PURE__ */ jsx(
-          OvermapItem,
-          {
-            className: classNames$1(styles$4.Footer, {
-              [styles$4.Loading]: !file
-            }),
-            size,
-            ref: fileCardRef,
-            leftSlot: error2 ? /* @__PURE__ */ jsx(RiIcon, { icon: "RiFileWarningLine" }) : file && /* @__PURE__ */ jsx(FileIcon, { fileType: file.type }),
-            rightSlot,
-            children: error2 ?? fileName2
-          }
-        )
-      ]
-    }
-  );
-});
-ImageCard.displayName = "ImageCard";
+const ImageCard = memo(
+  forwardRef((props, forwardedRef) => {
+    const { file, alt, error: error2, size, rightSlot, className, truncateLength, ...rest } = props;
+    const fileCardRef = useRef(null);
+    const imageInsetRef = useRef(null);
+    const fileCardSize = useSize(fileCardRef);
+    useLayoutEffect(() => {
+      if (!imageInsetRef.current || !fileCardSize)
+        return;
+      imageInsetRef.current.style.height = `${fileCardSize.height * 4}px`;
+    }, [fileCardSize]);
+    const fileName2 = useMemo(() => {
+      if (!file)
+        return;
+      return truncateLength !== void 0 ? truncate(file.name, truncateLength) : file.name;
+    }, [file, truncateLength]);
+    return /* @__PURE__ */ jsxs(
+      Flex,
+      {
+        className: classNames$1(className, styles$4.ImageCard),
+        width: "100%",
+        direction: "column",
+        position: "relative",
+        height: "max-content",
+        gap: "0",
+        ref: forwardedRef,
+        ...rest,
+        children: [
+          !file && !error2 && /* @__PURE__ */ jsx(Flex, { width: "100%", height: "100%", align: "center", justify: "center", position: "absolute", children: /* @__PURE__ */ jsx(Spinner, {}) }),
+          /* @__PURE__ */ jsx(Inset, { className: styles$4.ImageInset, ref: imageInsetRef, clip: "padding-box", side: "y", pb: "0", children: file && !error2 && /* @__PURE__ */ jsx("img", { className: styles$4.Image, src: URL.createObjectURL(file), alt: alt ?? file.name }) }),
+          /* @__PURE__ */ jsx(
+            OvermapItem,
+            {
+              className: classNames$1(styles$4.Footer, {
+                [styles$4.Loading]: !file
+              }),
+              size,
+              ref: fileCardRef,
+              leftSlot: error2 ? /* @__PURE__ */ jsx(RiIcon, { icon: "RiFileWarningLine" }) : file && /* @__PURE__ */ jsx(FileIcon, { fileType: file.type }),
+              rightSlot,
+              children: error2 ?? fileName2
+            }
+          )
+        ]
+      }
+    );
+  })
+);
 const UploadInput = memo((props) => {
   var _a2;
   const [{ inputId, labelId, size, severity, helpText, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
@@ -13666,7 +14121,7 @@ const initialFormValues = (fields, values) => {
 };
 const useAttachImagesToFormRevisionFields = (revision) => {
   const { sdk } = useSDK();
-  const attachments = useAppSelector(selectRevisionAttachments((revision == null ? void 0 : revision.offline_id) ?? ""));
+  const attachments = useAppSelector(selectAttachmentsOfFormRevision((revision == null ? void 0 : revision.offline_id) ?? ""));
   return useMemo(() => {
     if (!revision || !attachments)
       return revision;
@@ -13748,7 +14203,7 @@ const FormRenderer = memo(
 const FormSubmissionViewer = memo(
   forwardRef((props, ref) => {
     const { submission, showFormDescription = false, showFormTitle = true } = props;
-    const revision = useAppSelector(selectFormRevision(submission.form_revision));
+    const revision = useAppSelector(selectUserFormRevision(submission.form_revision));
     const { sdk } = useSDK();
     if (!revision) {
       throw new Error(
@@ -13763,7 +14218,7 @@ const FormSubmissionViewer = memo(
       return formRevisionToSchema(revisionWithImages, { readonly: true });
     }, [revisionWithImages]);
     const submissionValuesWithAttachments = useMemo(() => {
-      const attachments = selectSubmissionAttachments(submission.offline_id)(sdk.store.getState()) ?? [];
+      const attachments = selectAttachmentsOfFormSubmission(submission.offline_id)(sdk.store.getState()) ?? [];
       const downloadedAttachments = {};
       for (const attachment of attachments) {
         const promise = sdk.files.fetchFileFromUrl(attachment.file, attachment.file_sha1, attachment.file_name);
@@ -13941,16 +14396,13 @@ const FormSubmissionBrowserEntry = memo((props) => {
   const { submission, onSubmissionClick, compact, labelType, rowDecorator } = props;
   const currentUser = useAppSelector(selectCurrentUser);
   const createdBy = useAppSelector(selectUser("created_by" in submission ? submission.created_by : currentUser.id));
-  const dateToUse = getCreatedAtOrSubmittedAtDate(submission);
-  const formattedDateTime = isToday(dateToUse) ? dateToUse.toLocaleTimeString([], {
-    hour: "2-digit",
-    minute: "2-digit"
-  }) : getLocalDateString(dateToUse);
-  const revision = useAppSelector(selectFormRevision(submission.form_revision));
+  const dateToUse = submission.submitted_at;
+  const formattedDateTime = getLocalDateString(dateToUse);
+  const revision = useAppSelector(selectUserFormRevision(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
@@ -13981,10 +14433,6 @@ const FormSubmissionBrowserEntry = memo((props) => {
   return row;
 });
 FormSubmissionBrowserEntry.displayName = "FormSubmissionBrowserEntry";
-const getCreatedAtOrSubmittedAtDate = (submission) => {
-  const date = "created_at" in submission ? submission.created_at : submission.submitted_at;
-  return new Date(date);
-};
 const FormSubmissionBrowser = memo((props) => {
   const {
     formId: formId2,
@@ -13998,10 +14446,10 @@ const FormSubmissionBrowser = memo((props) => {
   if (!!formId2 === !!propSubmissions) {
     throw new Error("Either formId or submissions must be provided, but not both.");
   }
-  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectSubmissionsForForm(formId2));
+  const submissions = useAppSelector(propSubmissions ? () => propSubmissions : selectFormSubmissionsOfForm(formId2));
   const sortedSubmissions = useMemo(
     () => submissions == null ? void 0 : submissions.sort((a, b) => {
-      return getCreatedAtOrSubmittedAtDate(b).getTime() - getCreatedAtOrSubmittedAtDate(a).getTime();
+      return a.submitted_at.localeCompare(b.submitted_at);
     }),
     [submissions]
   );
@@ -14204,17 +14652,15 @@ const FieldActions = memo((props) => {
       Action.key
     )) }),
     /* @__PURE__ */ jsx(Box, { display: forMobile(true, "block"), children: /* @__PURE__ */ jsx(
-      DropdownItemMenu,
+      OvermapDropdownMenu,
       {
         trigger: /* @__PURE__ */ jsx(IconButton, { variant: "ghost", "aria-label": "Actions menu", children: /* @__PURE__ */ jsx(RiIcon, { icon: "RiMore2Line" }) }),
         items: actions.map((Action) => {
           var _a2;
           return {
-            content: /* @__PURE__ */ jsxs(Flex$1, { gap: "2", align: "center", children: [
-              /* @__PURE__ */ jsx(Action.Icon, {}),
-              Action.text
-            ] }, Action.key),
-            onSelect: (_a2 = Action.buttonProps) == null ? void 0 : _a2.onClick
+            leftSlot: /* @__PURE__ */ jsx(Action.Icon, {}),
+            children: Action.text,
+            onClick: (_a2 = Action.buttonProps) == null ? void 0 : _a2.onClick
           };
         })
       }
@@ -14272,10 +14718,8 @@ const useFieldTypeItems = (onSelect = () => null) => {
         const field = FieldTypeToClsMapping[identifier];
         const Icon = field.Icon;
         return {
-          content: /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
-            /* @__PURE__ */ jsx(Icon, {}),
-            /* @__PURE__ */ jsx(Text$1, { children: field.fieldTypeName })
-          ] }, identifier),
+          children: field.fieldTypeName,
+          leftSlot: /* @__PURE__ */ jsx(Icon, {}),
           value: identifier,
           onSelect: () => {
             onSelect(identifier);
@@ -14479,7 +14923,7 @@ const FieldBuilder = memo((props) => {
           }
         ),
         /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "3", children: [
-          /* @__PURE__ */ jsx(Badge, { className: styles.typeBadge, children: (_f = fieldTypeItems.flat().find((item) => item.value === type)) == null ? void 0 : _f.content }),
+          /* @__PURE__ */ jsx(Badge, { className: styles.typeBadge, children: (_f = fieldTypeItems.flat().find((item) => item.value === type)) == null ? void 0 : _f.children }),
           showPopoverInputs && /* @__PURE__ */ jsx(FieldSettingsPopover, { popoverInputs, hasError: popoverHasErrors })
         ] }),
         resolvedImage && /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -14840,7 +15284,7 @@ const FieldSectionWithActions = memo((props) => {
                       )),
                       droppableProvided.placeholder,
                       /* @__PURE__ */ jsx(
-                        DropdownItemMenu,
+                        OvermapDropdownMenu,
                         {
                           trigger: /* @__PURE__ */ jsxs(Button, { type: "button", variant: "soft", children: [
                             /* @__PURE__ */ jsx(RiIcon, { icon: "RiAddLine" }),
@@ -15276,6 +15720,8 @@ export {
   IssuePriority,
   IssueService,
   IssueStatus,
+  IssueUpdateChange,
+  IssueUpdateService,
   LicenseLevel,
   LicenseService,
   LicenseStatus,
@@ -15321,6 +15767,7 @@ export {
   VerificationCodeType,
   WorkspaceService,
   YELLOW,
+  _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
   addActiveProjectFormSubmissionsCount,
@@ -15336,9 +15783,23 @@ export {
   addDocuments,
   addEmailDomain,
   addFavouriteProjectId,
+  addForm,
+  addFormRevision,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  addFormRevisions,
+  addFormSubmission,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  addFormSubmissions,
+  addForms,
   addIssue,
   addIssueAttachment,
   addIssueAttachments,
+  addIssueComment,
+  addIssueComments,
+  addIssueUpdate,
+  addIssueUpdates,
   addLicenses,
   addOrReplaceCategories,
   addOrReplaceIssueComment,
@@ -15352,13 +15813,6 @@ export {
   addStageCompletions,
   addStages,
   addToRecentIssues,
-  addUserForm,
-  addUserFormRevision,
-  addUserFormRevisionAttachment,
-  addUserFormRevisions,
-  addUserFormSubmissionAttachment,
-  addUserFormSubmissions,
-  addUserForms,
   addUsers,
   addWorkspace,
   areArraysEqual,
@@ -15389,12 +15843,16 @@ export {
   defaultBadgeColor,
   defaultStore,
   deleteComponentType,
+  deleteForm,
+  deleteFormRevision,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments,
+  deleteFormRevisions,
+  deleteFormSubmission,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments,
+  deleteFormSubmissions,
   deleteProject,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
   dequeue,
   deserialize,
   deserializeField,
@@ -15423,7 +15881,11 @@ export {
   fileSlice,
   fileToBlob,
   flipCoordinates,
+  formRevisionReducer,
   formRevisionToSchema,
+  formRevisionsSlice,
+  formSubmissionReducer,
+  formSubmissionSlice,
   index as forms,
   fullComponentMarkerSize,
   generateBadgeColors,
@@ -15498,6 +15960,9 @@ export {
   removeIssue,
   removeIssueAttachment,
   removeIssueComment,
+  removeIssueComments,
+  removeIssueUpdate,
+  removeIssueUpdates,
   removeOrganizationAccess,
   removeProjectAccess,
   removeProjectAccessesOfProject,
@@ -15543,6 +16008,8 @@ export {
   selectAttachmentsOfComponentByType,
   selectAttachmentsOfComponentType,
   selectAttachmentsOfComponentTypeByType,
+  selectAttachmentsOfFormRevision,
+  selectAttachmentsOfFormSubmission,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
   selectAttachmentsOfProject,
@@ -15564,6 +16031,7 @@ export {
   selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
+  selectComponentTypeStagesMapping,
   selectComponentTypes,
   selectComponentTypesByName,
   selectComponentTypesFromIds,
@@ -15571,6 +16039,7 @@ export {
   selectComponents,
   selectComponentsByType,
   selectComponentsFromComponentType,
+  selectComponentsMapping,
   selectCreateProjectType,
   selectCurrentUser,
   selectDeletedRequests,
@@ -15588,7 +16057,17 @@ export {
   selectFavouriteProjects,
   selectFileAttachmentsOfIssue,
   selectFilteredUserForms,
-  selectFormRevision,
+  selectFormRevisionMapping,
+  selectFormRevisions,
+  selectFormRevisionsOfForm,
+  selectFormSubmission,
+  selectFormSubmissionAttachmentsMapping,
+  selectFormSubmissions,
+  selectFormSubmissionsByComponents,
+  selectFormSubmissionsMapping,
+  selectFormSubmissionsOfComponent,
+  selectFormSubmissionsOfForm,
+  selectFormSubmissionsOfIssue,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -15599,11 +16078,13 @@ export {
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueMapping,
+  selectIssueUpdateMapping,
+  selectIssueUpdatesOfIssue,
   selectIssues,
-  selectLatestFormRevision,
+  selectLatestFormRevisionByForm,
+  selectLatestFormRevisionOfForm,
+  selectLatestFormRevisionsOfComponentTypes,
   selectLatestRetryTime,
-  selectLatestRevisionByFormId,
-  selectLatestRevisionsFromComponentTypeIds,
   selectLicense,
   selectLicenseForProject,
   selectLicenses,
@@ -15641,8 +16122,6 @@ export {
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,
   selectRehydrated,
-  selectRevisionAttachments,
-  selectRevisionsForForm,
   selectRootDocuments,
   selectShowTooltips,
   selectSortedEmailDomains,
@@ -15650,21 +16129,20 @@ export {
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
   selectSortedProjects,
+  selectStage,
   selectStageFormIdsFromStageIds,
   selectStageMapping,
   selectStages,
   selectStagesFromComponentType,
   selectStagesFromComponentTypeIds,
   selectStagesFromStageIds,
-  selectSubmissionAttachments,
-  selectSubmissionsForComponent,
-  selectSubmissionsForForm,
-  selectSubmissionsForIssue,
   selectUploadUrl,
   selectUsedColors,
   selectUser,
   selectUserForm,
   selectUserFormMapping,
+  selectUserFormRevision,
+  selectUserFormRevisionAttachmentsMapping,
   selectUsersAsMapping,
   selectVisibleStatuses,
   selectVisibleUserIds,
@@ -15690,11 +16168,20 @@ export {
   setEnableClustering,
   setEnableDuplicateIssues,
   setEnablePlacementMode,
+  setFormRevision,
+  setFormRevisionAttachments,
+  setFormRevisions,
+  setFormSubmission,
+  setFormSubmissionAttachments,
+  setFormSubmissions,
+  setForms,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
   setIsLoading,
   setIssueAttachments,
+  setIssueComment,
   setIssueComments,
+  setIssueUpdates,
   setIssues,
   setLicenses,
   setLoggedIn,
@@ -15712,9 +16199,6 @@ export {
   setTokens,
   setTourStep,
   setUploadUrl,
-  setUserFormRevisionAttachments,
-  setUserFormSubmissionAttachments,
-  setUserFormSubmissions,
   setUsers,
   setVisibleStatuses,
   setVisibleUserIds,
@@ -15738,11 +16222,12 @@ export {
   updateComponentAttachment,
   updateComponentTypeAttachment,
   updateDocuments,
+  updateFormSubmission,
+  updateFormSubmissions,
   updateIssue,
   updateIssueAttachment,
   updateLicense,
   updateOrCreateProject,
-  updateOrCreateUserFormSubmission,
   updateOrganizationAccess,
   updateProjectAccess,
   updateProjectAttachment,