@overmap-ai/core 1.0.51-add-submitted-at-to-form-revisions.0 → 1.0.51-add-teams.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, OvermapDropdownMenu, 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, Overlay, Button, Spinner, useViewportSize, ButtonGroup, IconColorUtility, Tooltip, Popover, useSize, ToggleButton, Separator, OvermapItem, 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";
@@ -27,6 +27,7 @@ import { useField, useFormikContext, useFormik, FormikProvider } from "formik";
 import get from "lodash.get";
 import Linkify from "linkify-react";
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
+import QrScannerAPI from "qr-scanner";
 import { read, utils } from "xlsx";
 import { pdfjs, Document, Page } from "react-pdf";
 import "react-pdf/dist/Page/AnnotationLayer.css";
@@ -677,15 +678,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$q = {
   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$q,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -850,6 +851,19 @@ function downloadInMemoryFile(filename, text) {
   element.click();
   document.body.removeChild(element);
 }
+const constructUploadedFilePayloads = async (files) => {
+  const filePayloads = {};
+  for (const file of files) {
+    const sha1 = await hashFile(file);
+    filePayloads[sha1] = {
+      sha1,
+      extension: file.name.split(".").pop() || "",
+      file_type: file.type,
+      size: file.size
+    };
+  }
+  return Object.values(filePayloads);
+};
 const fileToBlob = async (dataUrl) => {
   return (await fetch(dataUrl)).blob();
 };
@@ -1416,7 +1430,7 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$m = {
+const initialState$p = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1426,8 +1440,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$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     setCategories: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -1596,14 +1610,14 @@ function removeAttachments(state, action) {
     delete state.attachments[attachmentId];
   }
 }
-const initialState$l = {
+const initialState$o = {
   components: {},
   attachments: {}
 };
 const componentSlice = createSlice({
   name: "components",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     addComponent: (state, action) => {
       state.components[action.payload.offline_id] = action.payload;
@@ -1759,13 +1773,13 @@ const {
   removeAllComponentsOfType
 } = componentSlice.actions;
 const componentReducer = componentSlice.reducer;
-const initialState$k = {
+const initialState$n = {
   completionsByComponentId: {}
 };
 const componentStageCompletionSlice = createSlice({
   name: "componentStageCompletions",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1816,13 +1830,13 @@ const selectCompletedStageIdsForComponent = (component) => (state) => {
   return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
 };
 const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-const initialState$j = {
+const initialState$m = {
   stages: {}
 };
 const componentStageSlice = createSlice({
   name: "componentStages",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     addStages: (state, action) => {
       Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1932,15 +1946,15 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
 const componentStageReducer = componentStageSlice.reducer;
-const initialState$i = {
+const initialState$l = {
   componentTypes: {},
   hiddenComponentTypeIds: {},
   attachments: {}
 };
 const componentTypeSlice = createSlice({
   name: "componentTypes",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     addComponentType: (state, action) => {
       state.componentTypes[action.payload.offline_id] = action.payload;
@@ -2051,13 +2065,13 @@ const {
   deleteComponentType
 } = componentTypeSlice.actions;
 const componentTypeReducer = componentTypeSlice.reducer;
-const initialState$h = {
+const initialState$k = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$h,
+  initialState: initialState$k,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setWorkspaces: (state, action) => {
@@ -2114,7 +2128,7 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$g = {
+const initialState$j = {
   issues: {},
   attachments: {},
   comments: {},
@@ -2126,9 +2140,9 @@ const initialState$g = {
 };
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$g,
+  initialState: initialState$j,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$g);
+    Object.assign(state, initialState$j);
   }),
   reducers: {
     setIssues: (state, action) => {
@@ -2536,15 +2550,15 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$f = {
+const initialState$i = {
   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$i,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -2571,7 +2585,7 @@ const selectUploadUrl = (sha1) => (state) => {
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$e = {
+const initialState$h = {
   // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
   mapStyle: MapStyle.SATELLITE,
   showTooltips: false,
@@ -2579,8 +2593,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$h,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
   reducers: {
     setMapStyle: (state, action) => {
       state.mapStyle = action.payload;
@@ -2649,7 +2663,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$d = {
+const initialState$g = {
   users: {},
   currentUser: {
     id: 0,
@@ -2660,8 +2674,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$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -2723,13 +2737,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$f = {
   organizationAccesses: {}
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     setOrganizationAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2792,13 +2806,13 @@ const selectOrganizationAccessUserMapping = (state) => {
   return organizationAccesses;
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
-const initialState$b = {
+const initialState$e = {
   licenses: {}
 };
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     setLicenses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2843,13 +2857,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$d = {
   projectAccesses: {}
 };
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$a,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     setProjectAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2917,7 +2931,7 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$9 = {
+const initialState$c = {
   projects: {},
   activeProjectId: null,
   recentProjectIds: [],
@@ -2927,7 +2941,7 @@ const initialState$9 = {
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$9,
+  initialState: initialState$c,
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -3114,14 +3128,14 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
     }
   )
 );
-const initialState$8 = {
+const initialState$b = {
   organizations: {},
   activeOrganizationId: null
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$8,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  initialState: initialState$b,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -3240,14 +3254,14 @@ const createOfflineAction = (request2, baseUrl) => {
     }
   };
 };
-const initialState$7 = {
+const initialState$a = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  initialState: initialState$a,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
   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
@@ -3279,7 +3293,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$9 = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false,
@@ -3287,8 +3301,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$9,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -3389,12 +3403,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$8 = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$5,
+  initialState: initialState$8,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -3404,7 +3418,7 @@ const rehydratedSlice = createSlice({
 });
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$4 = {
+const initialState$7 = {
   useIssueTemplate: false,
   placementMode: false,
   enableClustering: false,
@@ -3421,8 +3435,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$7,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
   reducers: {
     setEnableDuplicateIssues: (state, action) => {
       state.useIssueTemplate = action.payload;
@@ -3468,146 +3482,231 @@ 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) {
-  var _a2;
-  if (!revision) {
-    if (!formId2) {
-      throw new Error("If revision is null, formId is required.");
-    }
-    const currentLatestRevision = getLatestRevisionFromCache(formId2);
-    if (currentLatestRevision)
-      return;
-    LATEST_REVISION_CACHE[formId2] = null;
-    return;
-  }
-  if (revision.revision === "Pending") {
-    if (preferPending) {
-      LATEST_REVISION_CACHE[revision.form] = revision;
-    }
-    return;
-  }
-  const cachedRevision = (_a2 = LATEST_REVISION_CACHE[revision.form]) == null ? void 0 : _a2.revision;
-  if (revision.revision > (typeof cachedRevision === "number" ? cachedRevision : -1)) {
-    LATEST_REVISION_CACHE[revision.form] = revision;
+const formRevisionSortFn = (formRevisionA, formRevisionB) => {
+  const revisionA = formRevisionA.revision;
+  const revisionB = formRevisionB.revision;
+  if (revisionA === "Pending" && revisionB === "Pending") {
+    return formRevisionA.submitted_at < formRevisionB.submitted_at ? -1 : 1;
+  } else if (revisionA === "Pending") {
+    return 1;
+  } else if (revisionB === "Pending") {
+    return -1;
+  } else {
+    return revisionA < revisionB ? -1 : 1;
   }
-}
-function getLatestRevisionFromCache(formId2) {
-  return LATEST_REVISION_CACHE[formId2];
-}
-const initialState$3 = {
-  userForms: {},
-  revisions: {},
-  submissions: {},
-  submissionAttachments: {},
-  revisionAttachments: {}
-};
-const userFormSlice = createSlice({
-  name: "userForms",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+};
+const initialState$6 = {
+  formRevisions: {},
+  attachments: {}
+};
+const formRevisionsSlice = createSlice({
+  name: "formRevisions",
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
   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;
+    // revision related actions
+    setFormRevision: (state, action) => {
+      state.formRevisions[action.payload.offline_id] = action.payload;
     },
-    addUserForms: (state, action) => {
-      action.payload.forEach((userForm) => {
-        state.userForms[userForm.offline_id] = userForm;
-      });
-    },
-    addUserFormRevisions: (state, action) => {
-      action.payload.forEach((userFormRevision) => {
-        state.revisions[userFormRevision.offline_id] = userFormRevision;
-        considerCachingRevision(userFormRevision);
-      });
-    },
-    addUserFormRevision: (state, action) => {
-      state.revisions[action.payload.offline_id] = action.payload;
-      considerCachingRevision(action.payload);
+    setFormRevisions: (state, action) => {
+      state.formRevisions = {};
+      for (const revision of action.payload) {
+        state.formRevisions[revision.offline_id] = revision;
+      }
     },
-    deleteUserFormRevision: (state, action) => {
-      delete state.revisions[action.payload];
-      delete LATEST_REVISION_CACHE[action.payload];
+    addFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload.offline_id] !== void 0) {
+        throw new Error(`Revision with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formRevisions[action.payload.offline_id] = action.payload;
     },
-    deleteUserFormRevisions: (state, action) => {
+    addFormRevisions: (state, action) => {
       for (const userFormRevision of action.payload) {
-        delete state.revisions[userFormRevision.offline_id];
-        delete LATEST_REVISION_CACHE[userFormRevision.offline_id];
+        if (state.formRevisions[userFormRevision.offline_id] !== void 0) {
+          throw new Error(`Revision with offline_id ${userFormRevision.offline_id} already exists`);
+        }
       }
-    },
-    updateOrCreateUserFormSubmission: (state, action) => {
-      state.submissions[action.payload.offline_id] = action.payload;
-    },
-    addUserFormSubmissionAttachment: (state, action) => {
-      const submissionId = action.payload.submission;
-      const submissionAttachments = state.submissionAttachments[submissionId];
-      if (submissionAttachments) {
-        submissionAttachments.push(action.payload);
-      } else {
-        state.submissionAttachments[submissionId] = [action.payload];
+      for (const userFormRevision of action.payload) {
+        state.formRevisions[userFormRevision.offline_id] = userFormRevision;
       }
     },
-    addUserFormRevisionAttachment: (state, action) => {
-      const revisionId = action.payload.revision;
-      const revisionAttachments = state.revisionAttachments[revisionId];
-      if (revisionAttachments) {
-        revisionAttachments.push(action.payload);
-      } else {
-        state.revisionAttachments[revisionId] = [action.payload];
+    // UserFormRevisions do not get updated
+    deleteFormRevision: (state, action) => {
+      if (state.formRevisions[action.payload] === void 0) {
+        throw new Error(`Revision with offline_id ${action.payload} does not exist`);
       }
+      delete state.formRevisions[action.payload];
     },
-    setUserFormSubmissionAttachments: (state, action) => {
-      state.submissionAttachments = {};
-      for (const attachment of action.payload) {
-        const submissionId = attachment.submission;
-        const submissionAttachments = state.submissionAttachments[submissionId];
-        if (submissionAttachments) {
-          submissionAttachments.push(attachment);
-        } else {
-          state.submissionAttachments[submissionId] = [attachment];
+    deleteFormRevisions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formRevisions[offlineId] === void 0) {
+          throw new Error(`Revision with offline_id ${offlineId} does not exist`);
         }
       }
+      for (const offlineId of action.payload) {
+        delete state.formRevisions[offlineId];
+      }
     },
-    setUserFormRevisionAttachments: (state, action) => {
-      state.revisionAttachments = {};
+    // attachment related actions
+    setFormRevisionAttachments: (state, action) => {
+      state.attachments = {};
       for (const attachment of action.payload) {
-        const revisionId = attachment.revision;
-        const revisionAttachments = state.revisionAttachments[revisionId];
-        if (revisionAttachments) {
-          revisionAttachments.push(attachment);
-        } else {
-          state.revisionAttachments[revisionId] = [attachment];
-        }
+        state.attachments[attachment.offline_id] = attachment;
       }
     },
-    deleteUserFormSubmission: (state, action) => {
-      delete state.submissions[action.payload];
+    addFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
     },
-    deleteUserFormSubmissions: (state, action) => {
-      for (const userFormSubmission of action.payload) {
-        delete state.submissions[userFormSubmission.offline_id];
+    addFormRevisionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
+        }
+      }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
       }
     },
-    addUserFormSubmissions: (state, action) => {
-      for (const submission of action.payload) {
-        state.submissions[submission.offline_id] = submission;
+    deleteFormRevisionAttachment: (state, action) => {
+      if (state.attachments[action.payload] === void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
       }
+      delete state.attachments[action.payload];
     },
-    setUserFormSubmissions: (state, action) => {
-      state.submissions = {};
-      action.payload.forEach((submission) => {
-        state.submissions[submission.offline_id] = submission;
+    deleteFormRevisionAttachments: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.attachments[offlineId] === void 0) {
+          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+        }
+      }
+      for (const offlineId of action.payload) {
+        delete state.attachments[offlineId];
+      }
+    }
+  }
+});
+const {
+  setFormRevision,
+  setFormRevisions,
+  addFormRevision,
+  addFormRevisions,
+  deleteFormRevision,
+  deleteFormRevisions,
+  setFormRevisionAttachments,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments
+} = formRevisionsSlice.actions;
+const selectFormRevisionMapping = (state) => state.formRevisionReducer.formRevisions;
+const selectFormRevisions = createSelector(
+  [selectFormRevisionMapping],
+  (formRevisions) => Object.values(formRevisions)
+);
+const selectFormRevision = (formRevisionId) => (state) => {
+  return state.formRevisionReducer.formRevisions[formRevisionId];
+};
+const _selectLatestFormRevision = (formRevisions, formId2) => {
+  let ret = null;
+  for (const candidate of Object.values(formRevisions)) {
+    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
+      ret = candidate;
+    }
+  }
+  if (!ret) {
+    throw new Error("No form revision found for form " + formId2);
+  }
+  return ret;
+};
+const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+    return revisions.filter((revision) => revision.form === formId2).sort(formRevisionSortFn).pop();
+  })
+);
+const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
+  createSelector([selectFormRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
+    return revisions.filter((revision) => {
+      return revision.form === formId2;
+    });
+  })
+);
+const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      (state) => state.formReducer.forms,
+      selectFormRevisionMapping,
+      (_state, componentTypeIds) => componentTypeIds
+    ],
+    (userForms, revisions, componentTypeIds) => {
+      const componentTypeIdsSet = new Set(componentTypeIds);
+      const formsOfComponentTypes = {};
+      const ret = {};
+      for (const form of Object.values(userForms)) {
+        if (form.component_type && componentTypeIdsSet.has(form.component_type)) {
+          formsOfComponentTypes[form.offline_id] = form;
+        }
+      }
+      for (const revision of Object.values(revisions)) {
+        const form = formsOfComponentTypes[revision.form];
+        if (!form || !form.component_type || ret[form.component_type] && formRevisionSortFn(ret[form.component_type], revision) > 0)
+          continue;
+        ret[form.component_type] = revision;
+      }
+      return ret;
+    }
+  )
+);
+const selectLatestFormRevisionByForm = 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$5 = {
+  forms: {}
+};
+const formSlice = createSlice({
+  name: "forms",
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
+  reducers: {
+    setForms: (state, action) => {
+      state.forms = {};
+      action.payload.forEach((userForm) => {
+        state.forms[userForm.offline_id] = userForm;
       });
     },
+    addForm: (state, action) => {
+      state.forms[action.payload.offline_id] = action.payload;
+    },
+    addForms: (state, action) => {
+      for (const userForm of action.payload) {
+        state.forms[userForm.offline_id] = userForm;
+      }
+    },
     favoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
@@ -3615,48 +3714,23 @@ const userFormSlice = createSlice({
     },
     unfavoriteForm: (state, action) => {
       const { formId: formId2 } = action.payload;
-      const form = state.userForms[formId2];
+      const form = state.forms[formId2];
       if (!form) {
         throw new Error("No form exists with the id " + formId2);
       }
       form.favorite = false;
     },
-    deleteUserForm: (state, action) => {
-      delete state.userForms[action.payload];
+    deleteForm: (state, action) => {
+      delete state.forms[action.payload];
     }
   }
 });
-const {
-  addUserForm,
-  addUserForms,
-  addUserFormRevisions,
-  updateOrCreateUserFormSubmission,
-  addUserFormSubmissions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
-  favoriteForm,
-  unfavoriteForm,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  setUserFormSubmissions,
-  addUserFormRevision,
-  addUserFormSubmissionAttachment,
-  addUserFormRevisionAttachment,
-  setUserFormSubmissionAttachments,
-  setUserFormRevisionAttachments
-} = userFormSlice.actions;
-const selectSubmissionAttachments = (submissionId) => (state) => {
-  return state.userFormReducer.submissionAttachments[submissionId] || [];
-};
-const selectRevisionAttachments = (revisionId) => (state) => {
-  return state.userFormReducer.revisionAttachments[revisionId] || [];
-};
-const selectFilteredUserForms = restructureCreateSelectorWithArgs(
+const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = formSlice.actions;
+const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
-      (state) => state.userFormReducer.userForms,
-      (state) => state.userFormReducer.revisions,
+      (state) => state.formReducer.forms,
+      (state) => state.formRevisionReducer.formRevisions,
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
@@ -3690,63 +3764,188 @@ const selectFilteredUserForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual$1 } }
   )
 );
-const selectFormRevision = (revisionId) => (state) => {
-  return state.userFormReducer.revisions[revisionId];
+const selectForm = (formId2) => (state) => {
+  return state.formReducer.forms[formId2];
 };
-const _selectLatestFormRevision = (revisions, formId2) => {
-  let ret = null;
-  for (const candidate of Object.values(revisions)) {
-    if (candidate.form === formId2 && (!ret || ret.revision < candidate.revision)) {
-      ret = candidate;
-    }
-  }
-  if (!ret) {
-    throw new Error("No revision found for form " + formId2);
-  }
-  return ret;
+const selectFormMapping = (state) => {
+  return state.formReducer.forms;
 };
-const selectLatestFormRevision = restructureCreateSelectorWithArgs(
+const selectFormOfComponentType = restructureCreateSelectorWithArgs(
   createSelector(
-    [(state) => state.userFormReducer.revisions, (_state, formId2) => formId2],
-    (revisions, formId2) => {
-      if (!formId2) {
-        throw new Error("formId is required");
-      }
-      return _selectLatestFormRevision(revisions, formId2);
+    [selectFormMapping, (_state, componentTypeId) => componentTypeId],
+    (userForms, componentTypeId) => {
+      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
     }
   )
 );
-const selectUserForm = (formId2) => (state) => {
-  return state.userFormReducer.userForms[formId2];
-};
-const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
-const selectUserFormSubmission = (submissionId) => (state) => {
-  return state.userFormReducer.submissions[submissionId];
-};
-const selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
-const selectRevisionMapping = (state) => state.userFormReducer.revisions;
-const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
-const selectRevisionsForForm = restructureCreateSelectorWithArgs(
-  createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
-    return revisions.filter((revision) => {
-      return revision.form === formId2;
-    });
-  })
+const selectFormsCount = createSelector([selectFormMapping], (userForms) => {
+  return Object.keys(userForms).length;
+});
+const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
+  return Object.values(userForms).filter((form) => !form.component_type).length;
+});
+const formReducer = formSlice.reducer;
+const initialState$4 = {
+  formSubmissions: {},
+  attachments: {}
+};
+const formSubmissionSlice = createSlice({
+  name: "formSubmissions",
+  initialState: initialState$4,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  reducers: {
+    setFormSubmission: (state, action) => {
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    setFormSubmissions: (state, action) => {
+      state.formSubmissions = {};
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    addFormSubmission: (state, action) => {
+      if (action.payload.offline_id in state.formSubmissions) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] !== void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} already exists`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    updateFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload.offline_id] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload.offline_id} does not exist`);
+      }
+      state.formSubmissions[action.payload.offline_id] = action.payload;
+    },
+    updateFormSubmissions: (state, action) => {
+      for (const submission of action.payload) {
+        if (state.formSubmissions[submission.offline_id] === void 0) {
+          throw new Error(`Submission with offline_id ${submission.offline_id} does not exist`);
+        }
+      }
+      for (const submission of action.payload) {
+        state.formSubmissions[submission.offline_id] = submission;
+      }
+    },
+    deleteFormSubmission: (state, action) => {
+      if (state.formSubmissions[action.payload] === void 0) {
+        throw new Error(`Submission with offline_id ${action.payload} does not exist`);
+      }
+      delete state.formSubmissions[action.payload];
+    },
+    deleteFormSubmissions: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.formSubmissions[offlineId] === void 0) {
+          throw new Error(`Submission with offline_id ${offlineId} does not exist`);
+        }
+        delete state.formSubmissions[offlineId];
+      }
+      for (const offlineId of action.payload) {
+        delete state.formSubmissions[offlineId];
+      }
+    },
+    // Attachments
+    addFormSubmissionAttachment: (state, action) => {
+      if (state.attachments[action.payload.offline_id] !== void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.attachments[action.payload.offline_id] = action.payload;
+    },
+    addFormSubmissionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] !== void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} already exists`);
+        }
+      }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    // We only need a multi set for attachments because they are not updated, only added and deleted
+    setFormSubmissionAttachments: (state, action) => {
+      state.attachments = {};
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    updateFormSubmissionAttachments: (state, action) => {
+      for (const attachment of action.payload) {
+        if (state.attachments[attachment.offline_id] === void 0) {
+          throw new Error(`Attachment with offline_id ${attachment.offline_id} does not exist`);
+        }
+      }
+      for (const attachment of action.payload) {
+        state.attachments[attachment.offline_id] = attachment;
+      }
+    },
+    // The delete actions for UserFormSubmissionAttachments are not used in the app, but are included for completeness
+    // Could be used if editing a submission is ever supported, will be applicable for supporting tip tap content in submissions
+    deleteFormSubmissionAttachment: (state, action) => {
+      if (state.attachments[action.payload] === void 0) {
+        throw new Error(`Attachment with offline_id ${action.payload} does not exist`);
+      }
+      delete state.attachments[action.payload];
+    },
+    deleteFormSubmissionAttachments: (state, action) => {
+      for (const offlineId of action.payload) {
+        if (state.attachments[offlineId] === void 0) {
+          throw new Error(`Attachment with offline_id ${offlineId} does not exist`);
+        }
+        delete state.attachments[offlineId];
+      }
+    }
+  }
+});
+const {
+  setFormSubmission,
+  setFormSubmissions,
+  addFormSubmission,
+  addFormSubmissions,
+  updateFormSubmission,
+  updateFormSubmissions,
+  deleteFormSubmission,
+  deleteFormSubmissions,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  setFormSubmissionAttachments,
+  updateFormSubmissionAttachments,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments
+} = formSubmissionSlice.actions;
+const selectFormSubmissionsMapping = (state) => {
+  return state.formSubmissionReducer.formSubmissions;
+};
+const selectFormSubmissions = createSelector(
+  [selectFormSubmissionsMapping],
+  (submissions) => {
+    return Object.values(submissions);
+  }
 );
-const selectSubmissionsForForm = restructureCreateSelectorWithArgs(
+const selectFormSubmission = (submissionId) => (state) => {
+  return state.formSubmissionReducer.formSubmissions[submissionId];
+};
+const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectSubmissions, selectRevisionMapping, (_state, formId2) => formId2],
+    [selectFormSubmissions, selectFormRevisionMapping, (_state, formId2) => formId2],
     (submissions, revisionMapping, formId2) => {
-      return Object.values(submissions).filter((submission) => {
+      return submissions.filter((submission) => {
         const revision = revisionMapping[submission.form_revision];
         return (revision == null ? void 0 : revision.form) === formId2;
       });
     }
   )
 );
-const selectSubmissionsForIssue = restructureCreateSelectorWithArgs(
+const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
-    [(state) => state.userFormReducer.submissions, (_state, issueId) => issueId],
+    [selectFormSubmissions, (_state, issueId) => issueId],
     (submissions, issueId) => {
       return Object.values(submissions).filter((submission) => {
         return submission.issue === issueId;
@@ -3754,9 +3953,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;
@@ -3764,8 +3963,8 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectComponentSubmissionMapping = createSelector(
-  [selectSubmissionMapping, selectComponentsMapping],
+const selectFormSubmissionsByComponents = createSelector(
+  [selectFormSubmissionsMapping, selectComponentsMapping],
   (submissions, components) => {
     var _a2;
     const componentSubmissionMapping = {};
@@ -3781,60 +3980,24 @@ const selectComponentSubmissionMapping = createSelector(
     return componentSubmissionMapping;
   }
 );
-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 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 initialState$2 = {
+const formSubmissionReducer = formSubmissionSlice.reducer;
+const initialState$3 = {
   emailDomains: {}
 };
 const emailDomainsSlice = createSlice({
   name: "emailDomains",
-  initialState: initialState$2,
+  initialState: initialState$3,
   reducers: {
     setEmailDomains: (state, action) => {
       const emailDomains = {};
@@ -3861,15 +4024,15 @@ const selectSortedEmailDomains = (state) => Object.values(state.emailDomainsRedu
   (ed1, ed2) => ed1.domain.localeCompare(ed2.domain)
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
-const initialState$1 = {
+const initialState$2 = {
   documents: {},
   attachments: {}
 };
 const documentSlice = createSlice({
   name: "documents",
-  initialState: initialState$1,
+  initialState: initialState$2,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$1);
+    Object.assign(state, initialState$2);
   }),
   reducers: {
     setDocuments: (state, action) => {
@@ -4085,6 +4248,62 @@ const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
   )
 );
 const documentsReducer = documentSlice.reducer;
+const initialState$1 = {
+  teams: {}
+};
+const teamSlice = createSlice({
+  name: "teams",
+  initialState: initialState$1,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$1)),
+  reducers: {
+    setTeam: (state, action) => {
+      state.teams[action.payload.offline_id] = action.payload;
+    },
+    setTeams: (state, action) => {
+      state.teams = {};
+      for (const team of action.payload) {
+        state.teams[team.offline_id] = team;
+      }
+    },
+    addTeam: (state, action) => {
+      if (state.teams[action.payload.offline_id]) {
+        throw new Error(`Team with offline_id ${action.payload.offline_id} already exists`);
+      }
+      state.teams[action.payload.offline_id] = action.payload;
+    },
+    updateTeam: (state, action) => {
+      if (!state.teams[action.payload.offline_id]) {
+        throw new Error(`Team with offline_id ${action.payload.offline_id} does not exist`);
+      }
+      state.teams[action.payload.offline_id] = action.payload;
+    },
+    deleteTeam: (state, action) => {
+      delete state.teams[action.payload];
+    }
+  }
+});
+const { setTeam, setTeams, addTeam, updateTeam, deleteTeam } = teamSlice.actions;
+const selectTeamsMapping = (state) => state.teamReducer.teams;
+const selectTeams = createSelector([selectTeamsMapping], (teams) => {
+  return Object.values(teams);
+});
+const selectTeam = (teamId) => (state) => {
+  return state.teamReducer.teams[teamId];
+};
+const selectTeamsOfOrganization = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectTeams, (_state, organizationId) => organizationId],
+    (teams, organizationId) => {
+      return teams.filter((team) => team.organization === organizationId);
+    }
+  )
+);
+const selectTeamsOfUser = restructureCreateSelectorWithArgs(
+  createSelector([selectTeams, (_state, userId) => userId], (teams, userId) => {
+    return teams.filter((team) => team.members.includes(userId));
+  })
+);
+const teamReducer = teamSlice.reducer;
 const initialState = {
   version: 0
 };
@@ -4126,12 +4345,15 @@ const overmapReducers = {
   projectFileReducer,
   rehydratedReducer,
   settingReducer,
-  userFormReducer,
+  formReducer,
+  formRevisionReducer,
+  formSubmissionReducer,
   userReducer,
   workspaceReducer,
   emailDomainsReducer,
   licenseReducer,
-  documentsReducer
+  documentsReducer,
+  teamReducer
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
@@ -4179,9 +4401,7 @@ function handleWorkspaceRemoval(draft, action) {
       throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
     }
   }
-  const indexedForms = Object.values(draft.userFormReducer.userForms).filter(
-    (form) => form.index_workspace === workspaceId
-  );
+  const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
   for (const form of indexedForms) {
     form.index_workspace = mainWorkspace.offline_id;
   }
@@ -6372,6 +6592,7 @@ class MainService extends BaseApiService {
     }
     if (currentOrgId) {
       await this.client.organizations.fetchInitialOrganizationData(currentOrgId, false);
+      void this.client.teams.refreshStore();
     }
     if (!isProjectIdValid) {
       if (validProjects.length !== 0) {
@@ -6809,7 +7030,7 @@ class UserFormService extends BaseApiService {
           ...revisionAttachmentPayload,
           file: URL.createObjectURL(image)
         };
-        store.dispatch(addUserFormRevisionAttachment(offlinePayload));
+        store.dispatch(addFormRevisionAttachment(offlinePayload));
         return attach;
       });
     });
@@ -6824,13 +7045,14 @@ class UserFormService extends BaseApiService {
     };
     const currentUser = state.userReducer.currentUser;
     const activeWorkspaceId = state.workspaceReducer.activeWorkspaceId;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const offlineFormPayload = offline({});
-    const offlineRevisionPayload = offline(initialRevision);
+    const offlineRevisionPayload = offline({ ...initialRevision, submitted_at: submittedAt });
     const retForm = {
       ...offlineFormPayload,
       index_workspace: activeWorkspaceId,
       favorite: true,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      submitted_at: submittedAt,
       created_by: currentUser.id,
       ...componentTypeId && { component_type: componentTypeId },
       ...ownerAttrs
@@ -6841,11 +7063,11 @@ class UserFormService extends BaseApiService {
       created_by: currentUser.id,
       form: retForm.offline_id,
       revision: 0,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+      submitted_at: submittedAt
     };
     const { store } = this.client;
-    store.dispatch(addUserForm(retForm));
-    store.dispatch(addUserFormRevision(retRevision));
+    store.dispatch(addForm(retForm));
+    store.dispatch(addFormRevision(retRevision));
     const formPromise = this.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
@@ -6863,8 +7085,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);
@@ -6907,7 +7129,7 @@ class UserFormService extends BaseApiService {
       form: formId2,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     };
-    store.dispatch(addUserFormRevision(fullRevision));
+    store.dispatch(addFormRevision(fullRevision));
     const promise = this.enqueueRequest({
       description: "Create form revision",
       method: HttpMethod.PATCH,
@@ -6921,9 +7143,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];
@@ -6965,19 +7187,19 @@ class UserFormService extends BaseApiService {
   async delete(formId2) {
     const { store } = this.client;
     const state = store.getState();
-    const userForm = selectUserForm(formId2)(state);
+    const userForm = selectForm(formId2)(state);
     if (!userForm) {
       throw new Error("Expected userForm to exist");
     }
-    const userFormSubmissions = selectSubmissionsForForm(formId2)(state);
+    const userFormSubmissions = selectFormSubmissionsOfForm(formId2)(state);
     if (userFormSubmissions && userFormSubmissions.length > 0) {
-      store.dispatch(deleteUserFormSubmissions(userFormSubmissions));
+      store.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
     }
-    const userFormRevisions = selectRevisionsForForm(formId2)(state);
+    const userFormRevisions = selectFormRevisionsOfForm(formId2)(state);
     if (userFormRevisions && userFormRevisions.length > 0) {
-      store.dispatch(deleteUserFormRevisions(userFormRevisions));
+      store.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
     }
-    store.dispatch(deleteUserForm(formId2));
+    store.dispatch(deleteForm(formId2));
     try {
       return await this.enqueueRequest({
         description: "Delete form",
@@ -6987,12 +7209,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;
     }
@@ -7006,16 +7228,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) {
@@ -7030,17 +7251,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 = [];
@@ -7050,24 +7267,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;
@@ -7081,71 +7301,168 @@ class UserFormSubmissionService extends BaseApiService {
     if (!activeProjectId) {
       throw new Error("Expected an active project");
     }
-    const { payloadWithoutFiles, files } = separateFilesFromValues(payload);
+    const { values, files } = separateFilesFromValues(payload.values);
+    const offlineSubmission = {
+      ...payload,
+      values,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    };
     const promise = this.enqueueRequest({
       description: "Respond to form",
       method: HttpMethod.POST,
       url: `/forms/revisions/${payload.form_revision}/respond/`,
-      payload: { ...payloadWithoutFiles, project: activeProjectId },
+      payload: { ...offlineSubmission, project: activeProjectId },
       blockers: [payload.issue, payload.component, payload.component_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
       blocks: [payload.offline_id]
     });
-    const attachFilesPromises = this.getAttachFilesPromises(files, payload);
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const fullOfflineResult = {
-      ...payload,
-      created_by: state.userReducer.currentUser.id,
-      created_at: now,
-      updated_at: now
-    };
-    const offlineResultWithoutFiles = {
-      ...fullOfflineResult,
-      ...payloadWithoutFiles
-    };
-    store.dispatch(updateOrCreateUserFormSubmission(offlineResultWithoutFiles));
+    const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
+    store.dispatch(addFormSubmission(offlineSubmission));
     void promise.then((result) => {
       store.dispatch(addActiveProjectFormSubmissionsCount(1));
-      store.dispatch(updateOrCreateUserFormSubmission(result));
+      store.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
-      store.dispatch(deleteUserFormSubmission(payload.offline_id));
+      store.dispatch(deleteFormSubmission(payload.offline_id));
       store.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
     const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-    return [fullOfflineResult, settledPromise];
+    return [offlineSubmission, settledPromise];
   }
-  update(submission) {
+  // Note currently the bulkAdd method is specific to form submissions for components
+  // TODO: adapt the support bulk adding to any model type
+  async bulkAdd(args) {
+    const { formRevision, values: argsValues, componentOfflineIds } = args;
     const { store } = this.client;
-    const { payloadWithoutFiles, files } = separateFilesFromValues(submission);
-    if (!("created_by" in payloadWithoutFiles) || !("created_at" in payloadWithoutFiles)) {
-      throw new Error("Expected payloadWithoutFiles to have created_by and created_at fields.");
+    const offlineSubmissions = [];
+    const offlineAttachments = [];
+    const submissionOfflineIds = [];
+    const submissionsPayload = [];
+    const attachmentsPayload = [];
+    const { values, files } = separateFilesFromValues(argsValues);
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = store.getState().userReducer.currentUser.id;
+    for (const component_id of componentOfflineIds) {
+      const submission = offline({
+        form_revision: formRevision,
+        values,
+        created_by: createdBy,
+        submitted_at: submittedAt,
+        component: component_id
+      });
+      submissionOfflineIds.push(submission.offline_id);
+      submissionsPayload.push({ offline_id: submission.offline_id, component_id });
+      offlineSubmissions.push(submission);
+      for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
+        for (const file of fileArray) {
+          const sha1 = await hashFile(file);
+          await this.client.files.addCache(file, sha1);
+          const offlineAttachment = offline({
+            file_name: file.name,
+            file_sha1: sha1,
+            file: URL.createObjectURL(file),
+            submission: submission.offline_id,
+            field_identifier: fieldIdentifier
+          });
+          offlineAttachments.push(offlineAttachment);
+          attachmentsPayload.push({
+            offline_id: offlineAttachment.offline_id,
+            submission_id: submission.offline_id,
+            sha1,
+            name: file.name,
+            field_identifier: fieldIdentifier
+          });
+        }
+      }
+    }
+    const filesRecord = {};
+    for (const file of Object.values(files).flat()) {
+      const sha1 = await hashFile(file);
+      filesRecord[sha1] = {
+        sha1,
+        extension: file.name.split(".").pop() || "",
+        file_type: file.type,
+        size: file.size
+      };
     }
+    store.dispatch(addFormSubmissions(offlineSubmissions));
+    store.dispatch(addFormSubmissionAttachments(offlineAttachments));
+    const promise = this.enqueueRequest({
+      description: "Bulk add form submissions",
+      method: HttpMethod.POST,
+      url: `/forms/revisions/${formRevision}/bulk-respond/`,
+      payload: {
+        form_data: values,
+        submitted_at: submittedAt,
+        submissions: submissionsPayload,
+        attachments: attachmentsPayload,
+        files: Object.values(filesRecord)
+      },
+      blockers: componentOfflineIds,
+      blocks: submissionOfflineIds
+    });
+    promise.then(({ submissions, attachments, presigned_urls }) => {
+      store.dispatch(updateFormSubmissions(submissions));
+      store.dispatch(updateFormSubmissionAttachments(attachments));
+      for (const [sha1, presigned_url] of Object.entries(presigned_urls)) {
+        const file = filesRecord[sha1];
+        if (!file)
+          continue;
+        void this.enqueueRequest({
+          url: presigned_url.url,
+          description: "Upload file",
+          method: HttpMethod.POST,
+          isExternalUrl: true,
+          isAuthNeeded: false,
+          attachmentHash: sha1,
+          blockers: [`s3-${file.sha1}.${file.extension}`],
+          blocks: [sha1],
+          s3url: presigned_url
+        });
+      }
+    }).catch(() => {
+      store.dispatch(deleteFormSubmissions(submissionOfflineIds));
+      store.dispatch(deleteFormSubmissionAttachments(offlineAttachments.map((x) => x.offline_id)));
+    });
+    return [offlineSubmissions, promise.then(({ submissions }) => submissions)];
+  }
+  update(submission) {
+    const { store } = this.client;
+    const { values, files } = separateFilesFromValues(submission.values);
     const attachFilesPromises = this.getAttachFilesPromises(files, submission);
-    const fullResult = {
-      ...payloadWithoutFiles,
-      updated_at: (/* @__PURE__ */ new Date()).toISOString()
+    const offlineSubmission = {
+      ...submission,
+      values
     };
-    store.dispatch(updateOrCreateUserFormSubmission(fullResult));
+    const submissionToBeUpdated = store.getState().formSubmissionReducer.formSubmissions[submission.offline_id];
+    store.dispatch(updateFormSubmission(offlineSubmission));
     const promise = this.enqueueRequest({
       description: "Patch form submission",
       method: HttpMethod.PATCH,
       url: `/forms/submissions/${submission.offline_id}/`,
-      payload: fullResult,
-      blockers: [fullResult.issue, fullResult.component, fullResult.component_stage].filter(
+      payload: offlineSubmission,
+      blockers: [offlineSubmission.issue, offlineSubmission.component, offlineSubmission.component_stage].filter(
         (x) => x !== void 0
       ),
-      blocks: [fullResult.offline_id]
+      blocks: [offlineSubmission.offline_id]
+    });
+    promise.then((createdSubmission) => {
+      store.dispatch(setFormSubmission(createdSubmission));
+    }).catch(() => {
+      store.dispatch(setFormSubmission(submissionToBeUpdated));
     });
-    return Promise.all([promise, ...attachFilesPromises]).then(() => promise);
+    return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
   }
   async delete(submissionId) {
     const { store } = this.client;
     const state = store.getState();
-    const submission = state.userFormReducer.submissions[submissionId];
-    store.dispatch(deleteUserFormSubmission(submissionId));
+    const submission = state.formSubmissionReducer.formSubmissions[submissionId];
+    const submissionAttachments = selectAttachmentsOfFormSubmission(submissionId)(state);
+    store.dispatch(deleteFormSubmission(submissionId));
     store.dispatch(addActiveProjectFormSubmissionsCount(-1));
+    store.dispatch(deleteFormSubmissionAttachments(submissionAttachments.map((x) => x.offline_id)));
     try {
       return await this.enqueueRequest({
         description: "Delete user form submissions",
@@ -7155,10 +7472,9 @@ 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));
+      store.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
     }
   }
@@ -7172,7 +7488,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,
@@ -7180,7 +7496,7 @@ class UserFormSubmissionService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    store.dispatch(setUserFormSubmissionAttachments(attachments));
+    store.dispatch(setFormSubmissionAttachments(attachments));
   }
 }
 class WorkspaceService extends BaseApiService {
@@ -7904,6 +8220,142 @@ class AgentService extends BaseApiService {
     });
   }
 }
+class TeamService extends BaseApiService {
+  add(teamPayload) {
+    const { store } = this.client;
+    const state = store.getState();
+    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
+    if (!activeOrganizationId) {
+      throw new Error(`Expected active organization to be set, got ${activeOrganizationId}`);
+    }
+    const offlineTeam = offline({
+      ...teamPayload,
+      organization: activeOrganizationId,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+      // TODO: uncomment once supported
+      // created_by: state.userReducer.currentUser.id,
+    });
+    store.dispatch(addTeam(offlineTeam));
+    const promise = this.enqueueRequest({
+      description: "Create team",
+      method: HttpMethod.POST,
+      url: `/organizations/${activeOrganizationId}/teams/`,
+      payload: offlineTeam,
+      // No blocks since users and organizations are not offline
+      blockers: [],
+      blocks: [offlineTeam.offline_id]
+    });
+    promise.then((createdTeam) => {
+      store.dispatch(setTeam(createdTeam));
+    }).catch(() => {
+      store.dispatch(deleteTeam(offlineTeam.offline_id));
+    });
+    return [offlineTeam, promise];
+  }
+  // TODO: @Audiopolis / Magnus - should we pass a offline_id as one arg and a UpdatedTeamProps as a second arg instead of this set up?
+  update(team) {
+    const { store } = this.client;
+    const teamToBeUpdated = store.getState().teamReducer.teams[team.offline_id];
+    const offlineUpdatedTeam = {
+      ...teamToBeUpdated,
+      ...team
+    };
+    store.dispatch(updateTeam(offlineUpdatedTeam));
+    const promise = this.enqueueRequest({
+      description: "Update team",
+      method: HttpMethod.PATCH,
+      url: `/organizations/teams/${team.offline_id}/`,
+      payload: offlineUpdatedTeam,
+      blockers: [team.offline_id],
+      blocks: [team.offline_id]
+    });
+    promise.then((updatedTeam) => {
+      store.dispatch(setTeam(updatedTeam));
+    }).catch(() => {
+      store.dispatch(setTeam(teamToBeUpdated));
+    });
+    return [offlineUpdatedTeam, promise];
+  }
+  async delete(teamId) {
+    const { store } = this.client;
+    const state = store.getState();
+    const team = state.teamReducer.teams[teamId];
+    if (!team) {
+      throw new Error(`Expected team with id ${teamId} to exist`);
+    }
+    store.dispatch(deleteTeam(teamId));
+    try {
+      return await this.enqueueRequest({
+        description: "Delete team",
+        method: HttpMethod.DELETE,
+        url: `/organizations/teams/${teamId}/`,
+        blockers: [teamId],
+        blocks: [teamId]
+      });
+    } catch (e) {
+      store.dispatch(setTeam(team));
+      throw e;
+    }
+  }
+  async setMembers(teamId, members) {
+    const { store } = this.client;
+    const team = store.getState().teamReducer.teams[teamId];
+    if (!team) {
+      throw new Error(`Expected team with id ${teamId} to exist`);
+    }
+    if (members.length !== new Set(members).size) {
+      throw new Error("Duplicate members found in the list");
+    }
+    store.dispatch(updateTeam({ ...team, members }));
+    const promise = this.enqueueRequest({
+      description: "Set team members",
+      method: HttpMethod.PUT,
+      url: `/organizations/teams/${teamId}/set-members/`,
+      payload: {
+        users: members
+      },
+      blockers: [teamId],
+      blocks: [teamId]
+    });
+    promise.catch(() => {
+      store.dispatch(setTeam(team));
+    });
+    return promise;
+  }
+  async addMembers(teamId, members) {
+    const { store } = this.client;
+    const team = store.getState().teamReducer.teams[teamId];
+    if (!team) {
+      throw new Error(`Expected team with id ${teamId} to exist`);
+    }
+    const newMembers = [...team.members, ...members];
+    return this.setMembers(teamId, newMembers);
+  }
+  async removeMembers(teamId, members) {
+    const { store } = this.client;
+    const team = store.getState().teamReducer.teams[teamId];
+    if (!team) {
+      throw new Error(`Expected team with id ${teamId} to exist`);
+    }
+    const newMembers = team.members.filter((member) => !members.includes(member));
+    return this.setMembers(teamId, newMembers);
+  }
+  async refreshStore() {
+    const { store } = this.client;
+    const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
+    if (!activeOrganizationId) {
+      throw new Error(`Expected active organization to be set, got ${activeOrganizationId}`);
+    }
+    const result = await this.enqueueRequest({
+      description: "Fetch teams",
+      method: HttpMethod.GET,
+      url: `/organizations/${activeOrganizationId}/teams/`,
+      blockers: [],
+      blocks: []
+    });
+    store.dispatch(setTeams(result));
+  }
+}
 class OvermapSDK {
   constructor(apiUrl, store) {
     __publicField(this, "API_URL");
@@ -7933,6 +8385,7 @@ class OvermapSDK {
     __publicField(this, "emailDomains", new EmailDomainsService(this));
     __publicField(this, "licenses", new LicenseService(this));
     __publicField(this, "documents", new DocumentService(this));
+    __publicField(this, "teams", new TeamService(this));
     this.API_URL = apiUrl;
     this.store = store;
   }
@@ -7974,7 +8427,7 @@ const tabTrigger = "_tabTrigger_1w0fq_69";
 const patchfieldBorder = "_patchfieldBorder_1w0fq_73";
 const title = "_title_1w0fq_73";
 const error = "_error_1w0fq_89";
-const styles$c = {
+const styles$d = {
   description: description$2,
   floatingButtonContainer: floatingButtonContainer$2,
   FullScreenImageContainer: FullScreenImageContainer$2,
@@ -8095,7 +8548,7 @@ const fileName$1 = "_fileName_10o76_31";
 const longIconButton$1 = "_longIconButton_10o76_36";
 const previewImage$1 = "_previewImage_10o76_42";
 const FullScreenImage$1 = "_FullScreenImage_10o76_12";
-const styles$b = {
+const styles$c = {
   description: description$1,
   floatingButtonContainer: floatingButtonContainer$1,
   FullScreenImageContainer: FullScreenImageContainer$1,
@@ -8119,7 +8572,7 @@ const FullScreenImagePreview = memo((props) => {
     /* @__PURE__ */ jsx(
       "button",
       {
-        className: styles$b.FullScreenImageContainer,
+        className: styles$c.FullScreenImageContainer,
         type: "button",
         onClick: () => {
           setShowPreview(false);
@@ -8127,7 +8580,7 @@ const FullScreenImagePreview = memo((props) => {
         children: /* @__PURE__ */ jsx(
           "img",
           {
-            className: styles$b.FullScreenImage,
+            className: styles$c.FullScreenImage,
             src: url,
             alt: name,
             onClick: (e) => {
@@ -8137,11 +8590,11 @@ const FullScreenImagePreview = memo((props) => {
         )
       }
     ),
-    /* @__PURE__ */ jsxs(Flex$1, { className: styles$b.TopBarContainer, align: "center", children: [
+    /* @__PURE__ */ jsxs(Flex$1, { className: styles$c.TopBarContainer, align: "center", children: [
       /* @__PURE__ */ jsx(
         IconButton,
         {
-          className: styles$b.longIconButton,
+          className: styles$c.longIconButton,
           variant: "soft",
           "aria-label": "Exit preview",
           onClick: () => {
@@ -8150,11 +8603,11 @@ const FullScreenImagePreview = memo((props) => {
           children: /* @__PURE__ */ jsx(RiIcon, { icon: "RiArrowLeftLine" })
         }
       ),
-      /* @__PURE__ */ jsx(Text$1, { className: styles$b.fileName, children: name }),
+      /* @__PURE__ */ jsx(Text$1, { className: styles$c.fileName, children: name }),
       /* @__PURE__ */ jsx(
         IconButton,
         {
-          className: styles$b.longIconButton,
+          className: styles$c.longIconButton,
           variant: "soft",
           "aria-label": `Download ${name}`,
           onClick: handleDownload,
@@ -8182,7 +8635,7 @@ const InputWithLabel = (props) => {
       /* @__PURE__ */ jsx(
         "img",
         {
-          className: styles$b.previewImage,
+          className: styles$c.previewImage,
           src: resolvedImageURL,
           alt: resolvedImage.name,
           onClick: () => {
@@ -8210,7 +8663,7 @@ const InputWithHelpText = (props) => {
   const { helpText, children, severity } = props;
   return /* @__PURE__ */ jsxs(Flex$1, { direction: "column", gap: "1", children: [
     children,
-    /* @__PURE__ */ jsx(Flex$1, { direction: "column", children: /* @__PURE__ */ jsx(Text$1, { size: "1", severity, className: styles$b.description, children: helpText }) })
+    /* @__PURE__ */ jsx(Flex$1, { direction: "column", children: /* @__PURE__ */ jsx(Text$1, { size: "1", severity, className: styles$c.description, children: helpText }) })
   ] });
 };
 const InputWithLabelAndHelpText = (props) => {
@@ -8444,6 +8897,9 @@ function RiArrowUpLine(props) {
 function RiCalendarLine(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 24 24", "fill": "currentColor" }, "child": [{ "tag": "path", "attr": { "d": "M9 1V3H15V1H17V3H21C21.5523 3 22 3.44772 22 4V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H7V1H9ZM20 11H4V19H20V11ZM7 5H4V9H20V5H17V7H15V5H9V7H7V5Z" }, "child": [] }] })(props);
 }
+function RiQrCodeLine(props) {
+  return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 24 24", "fill": "currentColor" }, "child": [{ "tag": "path", "attr": { "d": "M16 17V16H13V13H16V15H18V17H17V19H15V21H13V18H15V17H16ZM21 21H17V19H19V17H21V21ZM3 3H11V11H3V3ZM5 5V9H9V5H5ZM13 3H21V11H13V3ZM15 5V9H19V5H15ZM3 13H11V21H3V13ZM5 15V19H9V15H5ZM18 13H21V15H18V13ZM6 6H8V8H6V6ZM6 16H8V18H6V16ZM16 6H18V8H16V6Z" }, "child": [] }] })(props);
+}
 function RiFileCopyLine(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 24 24", "fill": "currentColor" }, "child": [{ "tag": "path", "attr": { "d": "M6.9998 6V3C6.9998 2.44772 7.44752 2 7.9998 2H19.9998C20.5521 2 20.9998 2.44772 20.9998 3V17C20.9998 17.5523 20.5521 18 19.9998 18H16.9998V20.9991C16.9998 21.5519 16.5499 22 15.993 22H4.00666C3.45059 22 3 21.5554 3 20.9991L3.0026 7.00087C3.0027 6.44811 3.45264 6 4.00942 6H6.9998ZM5.00242 8L5.00019 20H14.9998V8H5.00242ZM8.9998 6H16.9998V16H18.9998V4H8.9998V6Z" }, "child": [] }] })(props);
 }
@@ -9347,9 +9803,9 @@ const Inset = React.forwardRef((props, forwardedRef) => {
   return React.createElement("div", { ...insetProps, ref: forwardedRef, className: classNames("rt-Inset", className, withBreakpoints(side, "rt-r-side"), withBreakpoints(clip, "rt-r-clip"), withBreakpoints(p, "rt-r-p"), withBreakpoints(px, "rt-r-px"), withBreakpoints(py, "rt-r-py"), withBreakpoints(pt, "rt-r-pt"), withBreakpoints(pr, "rt-r-pr"), withBreakpoints(pb, "rt-r-pb"), withBreakpoints(pl, "rt-r-pl"), withMarginProps(marginProps)) });
 });
 Inset.displayName = "Inset";
-const sizes$7 = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
+const sizes$8 = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
 const headingPropDefs = {
-  size: { type: "enum", values: sizes$7, default: "6", responsive: true },
+  size: { type: "enum", values: sizes$8, default: "6", responsive: true },
   weight: { ...weightProp, default: "bold" },
   align: alignProp,
   trim: trimProp,
@@ -9362,9 +9818,9 @@ const Heading = React.forwardRef((props, forwardedRef) => {
   return React.createElement($5e63c961fc1ce211$export$8c6ed5c666ac1360, { "data-accent-color": color, ...headingProps, ref: forwardedRef, className: classNames("rt-Heading", className, withBreakpoints(size, "rt-r-size"), withBreakpoints(weight, "rt-r-weight"), withBreakpoints(align, "rt-r-ta"), withBreakpoints(trim, "rt-r-lt"), { "rt-high-contrast": highContrast }, withMarginProps(marginProps)) }, asChild ? children : React.createElement(Tag, null, children));
 });
 Heading.displayName = "Heading";
-const sizes$6 = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
+const sizes$7 = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
 const textPropDefs = {
-  size: { type: "enum", values: sizes$6, default: void 0, responsive: true },
+  size: { type: "enum", values: sizes$7, default: void 0, responsive: true },
   weight: weightProp,
   align: alignProp,
   trim: trimProp,
@@ -9377,6 +9833,21 @@ const Text = React.forwardRef((props, forwardedRef) => {
   return React.createElement($5e63c961fc1ce211$export$8c6ed5c666ac1360, { "data-accent-color": color, ...textProps, ref: forwardedRef, className: classNames("rt-Text", className, withBreakpoints(size, "rt-r-size"), withBreakpoints(weight, "rt-r-weight"), withBreakpoints(align, "rt-r-ta"), withBreakpoints(trim, "rt-r-lt"), { "rt-high-contrast": highContrast }, withMarginProps(marginProps)) }, asChild ? children : React.createElement(Tag, null, children));
 });
 Text.displayName = "Text";
+const sizes$6 = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];
+const variants$4 = ["solid", "soft", "outline", "ghost"];
+const codePropDefs = {
+  size: { type: "enum", values: sizes$6, default: void 0, responsive: true },
+  variant: { type: "enum", values: variants$4, default: "soft" },
+  weight: weightProp,
+  color: colorProp,
+  highContrast: highContrastProp
+};
+const Code = React.forwardRef((props, forwardedRef) => {
+  const { rest: marginRest, ...marginProps } = extractMarginProps(props);
+  const { className, size = codePropDefs.size.default, variant = codePropDefs.variant.default, weight = codePropDefs.weight.default, color = codePropDefs.color.default, highContrast = codePropDefs.highContrast.default, ...codeProps } = marginRest;
+  return React.createElement("code", { "data-accent-color": color, ...codeProps, ref: forwardedRef, className: classNames("rt-Code", className, withBreakpoints(size, "rt-r-size"), `rt-variant-${variant}`, withBreakpoints(weight, "rt-r-weight"), { "rt-high-contrast": highContrast }, withMarginProps(marginProps)) });
+});
+Code.displayName = "Code";
 const Em = React.forwardRef((props, forwardedRef) => React.createElement("em", { ...props, ref: forwardedRef, className: classNames("rt-Em", props.className) }));
 Em.displayName = "Em";
 const Strong = React.forwardRef((props, forwardedRef) => React.createElement("strong", { ...props, ref: forwardedRef, className: classNames("rt-Strong", props.className) }));
@@ -11767,7 +12238,7 @@ __publicField(StringOrTextField, "_validateMax", (path) => (value, allValues) =>
 });
 const clickableLinkContainer = "_clickableLinkContainer_1ace7_1";
 const TextFieldInputCopy = "_TextFieldInputCopy_1ace7_5";
-const styles$a = {
+const styles$b = {
   clickableLinkContainer,
   TextFieldInputCopy
 };
@@ -11796,13 +12267,13 @@ const StringInput = memo((props) => {
           placeholder: field.placeholder,
           color
         }
-      ) : /* @__PURE__ */ jsxs(TextField$1.Root, { className: styles$a.clickableLinkContainer, children: [
+      ) : /* @__PURE__ */ jsxs(TextField$1.Root, { className: styles$b.clickableLinkContainer, children: [
         /* @__PURE__ */ jsx(
           "div",
           {
             className: classNames$1(
               "rt-TextFieldInput rt-r-size-2 rt-variant-surface",
-              styles$a.TextFieldInputCopy
+              styles$b.TextFieldInputCopy
             ),
             children: /* @__PURE__ */ jsx(
               Linkify,
@@ -12374,8 +12845,7 @@ class BaseSelectField extends BaseField {
           description: "List possible options for the user to select from.",
           required: true,
           identifier: `${path}options`,
-          minimum_length: 2,
-          maximum_length: 20
+          minimum_length: 2
         }),
         showDirectly: true
       }
@@ -12494,6 +12964,158 @@ __publicField(_MultiSelectField, "fieldTypeName", "Multi-select");
 __publicField(_MultiSelectField, "fieldTypeDescription", "Allows the user to select a multiple options from a list of options.");
 __publicField(_MultiSelectField, "Icon", RiCheckboxLine);
 let MultiSelectField = _MultiSelectField;
+const QrScannerWrapper = "_QrScannerWrapper_1puz3_1";
+const styles$a = {
+  QrScannerWrapper
+};
+const QrInput = memo((props) => {
+  const [{ inputId, labelId, label, helpText, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
+  const [showQrScanner, setShowQrScanner] = useState(false);
+  const value = fieldProps.value;
+  const handleQrScan = useCallback(
+    (data) => {
+      fieldProps.onChange({ target: { value: data } });
+      setShowQrScanner(false);
+    },
+    [fieldProps]
+  );
+  const handleClearScanResult = useCallback(() => {
+    fieldProps.onChange({ target: { value: "" } });
+  }, [fieldProps]);
+  const handleScanButtonClicked = useCallback(() => {
+    setShowQrScanner(true);
+  }, []);
+  const handleQrScannerClose = useCallback(() => {
+    setShowQrScanner(false);
+  }, []);
+  return /* @__PURE__ */ jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxs(
+    InputWithLabel,
+    {
+      size,
+      severity,
+      inputId,
+      labelId,
+      label: showInputOnly ? label : "",
+      image: showInputOnly ? void 0 : field.image,
+      flexProps: { direction: "column", justify: "start", align: "start", gap: "1" },
+      children: [
+        /* @__PURE__ */ jsx(
+          Overlay,
+          {
+            open: showQrScanner,
+            content: () => /* @__PURE__ */ jsx(QrScanner, { onQrScan: handleQrScan, onClose: handleQrScannerClose }),
+            onOpenChange: setShowQrScanner
+          }
+        ),
+        /* @__PURE__ */ jsxs(Flex, { width: "max-content", gap: "1", align: "center", children: [
+          /* @__PURE__ */ jsxs(Button, { ...rest, variant: "soft", onClick: handleScanButtonClicked, children: [
+            /* @__PURE__ */ jsx(RiIcon, { icon: "RiQrCodeLine" }),
+            "Scan"
+          ] }),
+          value && /* @__PURE__ */ jsx(Text, { color: "jade", size: "1", children: /* @__PURE__ */ jsx(RiIcon, { icon: "RiCheckLine", style: { verticalAlign: "bottom" } }) })
+        ] }),
+        value && /* @__PURE__ */ jsx(Card, { children: /* @__PURE__ */ jsxs(Flex, { width: "max-content", gap: "2", align: "center", children: [
+          /* @__PURE__ */ jsx(Code, { color: "gray", highContrast: true, children: value }),
+          /* @__PURE__ */ jsx(
+            IconButton,
+            {
+              severity: "info",
+              variant: "ghost",
+              "aria-label": "delete",
+              size: "small",
+              onClick: handleClearScanResult,
+              children: /* @__PURE__ */ jsx(RiIcon, { icon: "RiCloseLine" })
+            }
+          )
+        ] }) })
+      ]
+    }
+  ) });
+});
+QrInput.displayName = "QrInput";
+const QrScanner = memo((props) => {
+  const { onQrScan, onClose } = props;
+  const videoRef = useRef(null);
+  const [isScannerLoading, setIsScannerLoading] = useState(false);
+  useEffect(() => {
+    if (!videoRef.current)
+      return;
+    const qrScanner = new QrScannerAPI(
+      videoRef.current,
+      (result) => {
+        const data = result.data;
+        onQrScan(data);
+        qrScanner.destroy();
+      },
+      {
+        highlightCodeOutline: true,
+        highlightScanRegion: true,
+        maxScansPerSecond: 1
+      }
+    );
+    setIsScannerLoading(true);
+    qrScanner.start().then(() => {
+      setIsScannerLoading(false);
+    }).catch(() => {
+      setIsScannerLoading(false);
+    });
+  }, [onQrScan]);
+  return /* @__PURE__ */ jsxs(
+    Flex,
+    {
+      className: styles$a.QrScannerWrapper,
+      width: "100%",
+      height: "100%",
+      direction: "column",
+      gap: "2",
+      justify: "center",
+      position: "relative",
+      children: [
+        /* @__PURE__ */ jsx(Flex, { width: "100%", position: "absolute", top: "0", p: "2", children: /* @__PURE__ */ jsx(IconButton, { "aria-label": "close", variant: "soft", severity: "info", highContrast: true, onClick: onClose, children: /* @__PURE__ */ jsx(RiIcon, { icon: "RiCloseLine" }) }) }),
+        /* @__PURE__ */ jsxs(Box, { style: { maxWidth: "100%", maxHeight: "100%" }, position: "relative", children: [
+          /* @__PURE__ */ jsx("video", { ref: videoRef, style: { width: "100%", height: "100%" } }),
+          isScannerLoading && /* @__PURE__ */ jsx(
+            Flex,
+            {
+              position: "absolute",
+              inset: "0",
+              style: { background: "var(--color-background)" },
+              justify: "center",
+              align: "center",
+              children: /* @__PURE__ */ jsx(Spinner, {})
+            }
+          )
+        ] })
+      ]
+    }
+  );
+});
+QrScanner.displayName = "QrScanner";
+const emptyQrField = {
+  ...emptyBaseField,
+  type: "qr"
+};
+const _QrField = class _QrField extends BaseField {
+  constructor(options) {
+    super({ ...options, type: "qr" });
+    __publicField(this, "onlyValidateAfterTouched", false);
+  }
+  serialize() {
+    return super._serialize();
+  }
+  static deserialize(data) {
+    if (data.type !== "qr")
+      throw new Error("Type mismatch.");
+    return new _QrField(data);
+  }
+  getInput(props) {
+    return /* @__PURE__ */ jsx(QrInput, { ...props, field: this });
+  }
+};
+__publicField(_QrField, "fieldTypeName", "QR");
+__publicField(_QrField, "fieldTypeDescription", "Used for scanning/reading QR codes.");
+__publicField(_QrField, "Icon", RiQrCodeLine);
+let QrField = _QrField;
 const FieldInputCloner = memo((props) => {
   const { field, ...rest } = props;
   const [{ value: identifier }] = useField(field.options.clonedFieldIdentifier);
@@ -13751,6 +14373,7 @@ const FieldTypeToClsMapping = {
   text: TextField,
   custom: CustomField,
   upload: UploadField,
+  qr: QrField,
   // TODO: Underscore
   "multi-string": MultiStringField,
   "multi-select": MultiSelectField
@@ -13764,6 +14387,7 @@ const FieldTypeToEmptyFieldMapping = {
   text: emptyTextField,
   custom: emptyCustomField,
   upload: emptyUploadField,
+  qr: emptyQrField,
   // TODO: Underscore
   "multi-string": emptyMultiStringField,
   "multi-select": emptyMultiSelectField
@@ -13851,7 +14475,7 @@ const FieldSectionLayout = memo((props) => {
   return /* @__PURE__ */ jsx(Card, { children: /* @__PURE__ */ jsxs(Flex$1, { direction: "column", gap: "3", children: [
     /* @__PURE__ */ jsxs(Flex$1, { direction: "column", children: [
       /* @__PURE__ */ jsx(Heading, { as: "h3", size: "3", children: label }),
-      /* @__PURE__ */ jsx(Text$1, { className: styles$b.description, children: description2 })
+      /* @__PURE__ */ jsx(Text$1, { className: styles$c.description, children: description2 })
     ] }),
     inputs
   ] }) });
@@ -14038,7 +14662,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;
@@ -14094,7 +14718,7 @@ const FormRenderer = memo(
       [schema.title]
     );
     const Description = useMemo(
-      () => typeof schema.description === "string" ? /* @__PURE__ */ jsx(Text$1, { className: styles$b.description, children: schema.description }) : schema.description,
+      () => typeof schema.description === "string" ? /* @__PURE__ */ jsx(Text$1, { className: styles$c.description, children: schema.description }) : schema.description,
       [schema.description]
     );
     const inputs = useFieldInputs(schema.fields, { formId: formId2, disabled: readonly });
@@ -14110,7 +14734,7 @@ const FormRenderer = memo(
         !hideDescription && Description
       ] }) }),
       inputs,
-      !readonly && /* @__PURE__ */ jsxs(Flex$1, { className: styles$b.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
+      !readonly && /* @__PURE__ */ jsxs(Flex$1, { className: styles$c.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
         cancelText && /* @__PURE__ */ jsx(Button, { severity: "info", ...buttonProps, type: "button", onClick: onCancel, children: cancelText }),
         /* @__PURE__ */ jsx(Button, { ...buttonProps, type: "submit", disabled: !formik.isValid, children: submitText })
       ] })
@@ -14135,7 +14759,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);
@@ -14185,8 +14809,8 @@ const FormBrowser = memo(
       }
       return ret;
     }, [filter, maxResults, ownerFilter]);
-    const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
-    const userFormMapping = useAppSelector(selectUserFormMapping);
+    const userForms = useAppSelector(selectFilteredForms(ownerFilterOptions)) ?? [];
+    const userFormMapping = useAppSelector(selectFormMapping);
     const attachableUserForms = userForms.filter((form) => !form.component_type);
     const attachableUserFormMapping = Object.values(userFormMapping).filter(
       (form) => !form.component_type
@@ -14219,7 +14843,7 @@ const FormBrowser = memo(
     const handleChange = useCallback((e) => {
       setFilter(e.currentTarget.value);
     }, []);
-    const numberOfForms = useAppSelector(selectNumberOfGeneralUserForms) || 0;
+    const numberOfForms = useAppSelector(selectGeneralFormCount) || 0;
     const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
     const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
     return /* @__PURE__ */ jsxs(Flex$1, { ref, direction: "column", gap: "2", children: [
@@ -14313,16 +14937,13 @@ const FormSubmissionBrowserEntry = memo((props) => {
   const { submission, onSubmissionClick, compact, labelType, rowDecorator } = props;
   const currentUser = useAppSelector(selectCurrentUser);
   const createdBy = useAppSelector(selectUser("created_by" in submission ? submission.created_by : currentUser.id));
-  const dateToUse = getCreatedAtOrSubmittedAtDate(submission);
-  const formattedDateTime = isToday(dateToUse) ? dateToUse.toLocaleTimeString([], {
-    hour: "2-digit",
-    minute: "2-digit"
-  }) : getLocalDateString(dateToUse);
+  const dateToUse = submission.submitted_at;
+  const formattedDateTime = getLocalDateString(dateToUse);
   const revision = useAppSelector(selectFormRevision(submission.form_revision));
   if (!revision) {
     throw new Error(`Could not find revision ${submission.form_revision} for submission ${submission.offline_id}.`);
   }
-  const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevision(revision.form))) == null ? void 0 : _a2.revision;
+  const latestRevisionNumber = (_a2 = useAppSelector(selectLatestFormRevisionOfForm(revision.form))) == null ? void 0 : _a2.revision;
   const creatorProfileSrc = useFileSrc({
     file: (createdBy == null ? void 0 : createdBy.profile.file) ?? null,
     fileSha1: (createdBy == null ? void 0 : createdBy.profile.file_sha1) ?? null
@@ -14353,10 +14974,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,
@@ -14370,10 +14987,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]
   );
@@ -15465,12 +16082,12 @@ const FormBuilder = memo(
     });
     const previewSchema = useMemo(() => formRevisionToSchema(formik.values), [formik.values]);
     return /* @__PURE__ */ jsx(Tabs.Root, { ref, defaultValue: "edit", children: /* @__PURE__ */ jsxs(Flex$1, { direction: "column", gap: "2", children: [
-      showTabs && /* @__PURE__ */ jsxs(Tabs.List, { className: classNames$1(styles$c.tabsList, tabsListClassName), children: [
-        /* @__PURE__ */ jsx(Tabs.Trigger, { className: styles$c.tabTrigger, value: "edit", children: /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
+      showTabs && /* @__PURE__ */ jsxs(Tabs.List, { className: classNames$1(styles$d.tabsList, tabsListClassName), children: [
+        /* @__PURE__ */ jsx(Tabs.Trigger, { className: styles$d.tabTrigger, value: "edit", children: /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
           /* @__PURE__ */ jsx(RiIcon, { icon: "RiPencilLine" }),
           "Edit"
         ] }) }),
-        /* @__PURE__ */ jsx(Tabs.Trigger, { className: styles$c.tabTrigger, value: "preview", children: /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
+        /* @__PURE__ */ jsx(Tabs.Trigger, { className: styles$d.tabTrigger, value: "preview", children: /* @__PURE__ */ jsxs(Flex$1, { align: "center", gap: "2", children: [
           /* @__PURE__ */ jsx(RiIcon, { icon: "RiEyeLine" }),
           "Preview"
         ] }) })
@@ -15494,8 +16111,8 @@ const FormBuilder = memo(
                   render: ({ setValue, value, meta }) => /* @__PURE__ */ jsx(InputWithHelpText, { severity: "danger", helpText: meta.error ?? null, children: /* @__PURE__ */ jsx(
                     Input,
                     {
-                      className: classNames$1(styles$c.title, {
-                        [styles$c.error]: meta.error
+                      className: classNames$1(styles$d.title, {
+                        [styles$d.error]: meta.error
                       }),
                       placeholder: "Form title",
                       value,
@@ -15517,7 +16134,7 @@ const FormBuilder = memo(
                   render: ({ setValue, value }) => /* @__PURE__ */ jsx(
                     TextArea,
                     {
-                      className: styles$c.description,
+                      className: styles$d.description,
                       placeholder: "Explain the purpose of this form",
                       value,
                       onChange: (event) => {
@@ -15535,7 +16152,7 @@ const FormBuilder = memo(
             /* @__PURE__ */ jsx(FieldsEditor, { fieldsOnly }),
             /* @__PURE__ */ jsx(Text$1, { severity: "danger", size: "1", children: typeof formik.errors.fields === "string" && formik.errors.fields })
           ] }),
-          /* @__PURE__ */ jsxs(Flex$1, { className: styles$c.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
+          /* @__PURE__ */ jsxs(Flex$1, { className: styles$d.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
             onCancel && /* @__PURE__ */ jsx(Button, { type: "button", variant: "solid", severity: "info", onClick: onCancel, children: "Cancel" }),
             /* @__PURE__ */ jsx(Button, { type: "submit", children: "Save form" })
           ] })
@@ -15570,6 +16187,9 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   NumberInput,
   PatchField,
   PatchFormProvider,
+  QrField,
+  QrInput,
+  QrScanner,
   SelectField,
   SelectInput,
   StringField,
@@ -15584,6 +16204,7 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   emptyMultiSelectField,
   emptyMultiStringField,
   emptyNumberField,
+  emptyQrField,
   emptySelectField,
   emptyStringField,
   emptyTextField,
@@ -15674,6 +16295,9 @@ export {
   ProjectFileService,
   ProjectService,
   ProjectType,
+  QrField,
+  QrInput,
+  QrScanner,
   SDKContext,
   SDKProvider,
   SUPPORTED_IMAGE_FILE_TYPES,
@@ -15684,6 +16308,7 @@ export {
   SpreadsheetViewer,
   StringField,
   StringInput,
+  TeamService,
   TextField,
   TextInput,
   UserFormService,
@@ -15691,6 +16316,7 @@ export {
   VerificationCodeType,
   WorkspaceService,
   YELLOW,
+  _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
   addActiveProjectFormSubmissionsCount,
@@ -15708,6 +16334,16 @@ export {
   addDocuments,
   addEmailDomain,
   addFavouriteProjectId,
+  addForm,
+  addFormRevision,
+  addFormRevisionAttachment,
+  addFormRevisionAttachments,
+  addFormRevisions,
+  addFormSubmission,
+  addFormSubmissionAttachment,
+  addFormSubmissionAttachments,
+  addFormSubmissions,
+  addForms,
   addIssue,
   addIssueAttachment,
   addIssueAttachments,
@@ -15727,14 +16363,8 @@ export {
   addStageCompletion,
   addStageCompletions,
   addStages,
+  addTeam,
   addToRecentIssues,
-  addUserForm,
-  addUserFormRevision,
-  addUserFormRevisionAttachment,
-  addUserFormRevisions,
-  addUserFormSubmissionAttachment,
-  addUserFormSubmissions,
-  addUserForms,
   addUsers,
   addWorkspace,
   areArraysEqual,
@@ -15755,6 +16385,7 @@ export {
   componentStageSlice,
   componentTypeReducer,
   componentTypeSlice,
+  constructUploadedFilePayloads,
   coordinatesAreEqual,
   coordinatesToLiteral,
   coordinatesToPointGeometry,
@@ -15765,12 +16396,17 @@ export {
   defaultBadgeColor,
   defaultStore,
   deleteComponentType,
+  deleteForm,
+  deleteFormRevision,
+  deleteFormRevisionAttachment,
+  deleteFormRevisionAttachments,
+  deleteFormRevisions,
+  deleteFormSubmission,
+  deleteFormSubmissionAttachment,
+  deleteFormSubmissionAttachments,
+  deleteFormSubmissions,
   deleteProject,
-  deleteUserForm,
-  deleteUserFormRevision,
-  deleteUserFormRevisions,
-  deleteUserFormSubmission,
-  deleteUserFormSubmissions,
+  deleteTeam,
   dequeue,
   deserialize,
   deserializeField,
@@ -15788,6 +16424,7 @@ export {
   emptyMultiSelectField,
   emptyMultiStringField,
   emptyNumberField,
+  emptyQrField,
   emptySelectField,
   emptyStringField,
   emptyTextField,
@@ -15799,7 +16436,13 @@ export {
   fileSlice,
   fileToBlob,
   flipCoordinates,
+  formReducer,
+  formRevisionReducer,
   formRevisionToSchema,
+  formRevisionsSlice,
+  formSlice,
+  formSubmissionReducer,
+  formSubmissionSlice,
   index as forms,
   fullComponentMarkerSize,
   generateBadgeColors,
@@ -15927,6 +16570,8 @@ export {
   selectAttachmentsOfComponentTypeByType,
   selectAttachmentsOfDocument,
   selectAttachmentsOfDocumentByType,
+  selectAttachmentsOfFormRevision,
+  selectAttachmentsOfFormSubmission,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
   selectAttachmentsOfProject,
@@ -15944,11 +16589,9 @@ export {
   selectComponent,
   selectComponentAttachment,
   selectComponentAttachmentMapping,
-  selectComponentSubmissionMapping,
   selectComponentType,
   selectComponentTypeAttachment,
   selectComponentTypeAttachmentMapping,
-  selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
   selectComponentTypeStagesMapping,
@@ -15978,8 +16621,24 @@ export {
   selectExpandedSections,
   selectFavouriteProjects,
   selectFileAttachmentsOfIssue,
-  selectFilteredUserForms,
+  selectFilteredForms,
+  selectForm,
+  selectFormMapping,
+  selectFormOfComponentType,
   selectFormRevision,
+  selectFormRevisionMapping,
+  selectFormRevisions,
+  selectFormRevisionsOfForm,
+  selectFormSubmission,
+  selectFormSubmissionAttachmentsMapping,
+  selectFormSubmissions,
+  selectFormSubmissionsByComponents,
+  selectFormSubmissionsMapping,
+  selectFormSubmissionsOfComponent,
+  selectFormSubmissionsOfForm,
+  selectFormSubmissionsOfIssue,
+  selectFormsCount,
+  selectGeneralFormCount,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -15994,10 +16653,10 @@ export {
   selectIssueUpdateMapping,
   selectIssueUpdatesOfIssue,
   selectIssues,
-  selectLatestFormRevision,
+  selectLatestFormRevisionByForm,
+  selectLatestFormRevisionOfForm,
+  selectLatestFormRevisionsOfComponentTypes,
   selectLatestRetryTime,
-  selectLatestRevisionByFormId,
-  selectLatestRevisionsFromComponentTypeIds,
   selectLicense,
   selectLicenseForProject,
   selectLicenses,
@@ -16006,8 +16665,6 @@ export {
   selectMapStyle,
   selectNumberOfComponentTypesMatchingCaseInsensitiveName,
   selectNumberOfComponentsOfComponentType,
-  selectNumberOfGeneralUserForms,
-  selectNumberOfUserForms,
   selectOrganization,
   selectOrganizationAccess,
   selectOrganizationAccessForUser,
@@ -16035,8 +16692,6 @@ export {
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,
   selectRehydrated,
-  selectRevisionAttachments,
-  selectRevisionsForForm,
   selectRootDocuments,
   selectShowTooltips,
   selectSortedEmailDomains,
@@ -16051,16 +16706,15 @@ export {
   selectStagesFromComponentType,
   selectStagesFromComponentTypeIds,
   selectStagesFromStageIds,
-  selectSubmissionAttachments,
-  selectSubmissionsForComponent,
-  selectSubmissionsForForm,
-  selectSubmissionsForIssue,
+  selectTeam,
+  selectTeams,
+  selectTeamsMapping,
+  selectTeamsOfOrganization,
+  selectTeamsOfUser,
   selectUploadUrl,
   selectUsedColors,
   selectUser,
-  selectUserForm,
-  selectUserFormMapping,
-  selectUserFormSubmission,
+  selectUserFormRevisionAttachmentsMapping,
   selectUsersAsMapping,
   selectVisibleStatuses,
   selectVisibleUserIds,
@@ -16087,6 +16741,13 @@ export {
   setEnableClustering,
   setEnableDuplicateIssues,
   setEnablePlacementMode,
+  setFormRevision,
+  setFormRevisionAttachments,
+  setFormRevisions,
+  setFormSubmission,
+  setFormSubmissionAttachments,
+  setFormSubmissions,
+  setForms,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
   setIsLoading,
@@ -16108,12 +16769,11 @@ export {
   setSectionExpanded,
   setShowTooltips,
   setStageCompletions,
+  setTeam,
+  setTeams,
   setTokens,
   setTourStep,
   setUploadUrl,
-  setUserFormRevisionAttachments,
-  setUserFormSubmissionAttachments,
-  setUserFormSubmissions,
   setUsers,
   setVisibleStatuses,
   setVisibleUserIds,
@@ -16124,6 +16784,8 @@ export {
   slugify,
   spacesToDashesLower,
   successColor,
+  teamReducer,
+  teamSlice,
   toFileNameSafeString,
   toOfflineIdRecord,
   toggleComponentTypeVisibility,
@@ -16138,15 +16800,18 @@ export {
   updateComponentTypeAttachment,
   updateDocumentAttachment,
   updateDocuments,
+  updateFormSubmission,
+  updateFormSubmissionAttachments,
+  updateFormSubmissions,
   updateIssue,
   updateIssueAttachment,
   updateLicense,
   updateOrCreateProject,
-  updateOrCreateUserFormSubmission,
   updateOrganizationAccess,
   updateProjectAccess,
   updateProjectAttachment,
   updateStages,
+  updateTeam,
   useAppDispatch,
   useAppSelector,
   useFieldInput,
@@ -16156,8 +16821,6 @@ export {
   useFormikInput,
   useMemoCompare,
   useSDK,
-  userFormReducer,
-  userFormSlice,
   userReducer,
   userSlice,
   valueIsFile,