@overmap-ai/core 1.0.35-projects-licensing.20 → 1.0.36-add-image-to-forms.0

package/dist/overmap-core.umd.cjs

@@ -5,8 +5,8 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 (function(global2, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("react/jsx-runtime"), require("@overmap-ai/blocks"), require("dependency-graph"), require("@redux-offline/redux-offline"), require("@redux-offline/redux-offline/lib/defaults"), require("localforage"), require("redux-persist-migrate"), require("@reduxjs/toolkit"), require("superagent"), require("react-redux"), require("uuid"), require("color"), require("jwt-decode"), require("@redux-offline/redux-offline/lib/constants"), require("idb"), require("formik"), require("lodash.get"), require("linkify-react"), require("@hello-pangea/dnd"), require("file-saver"), require("lodash.set"), require("lodash.clonedeep"), require("react-dom")) : typeof define === "function" && define.amd ? define(["exports", "react", "react/jsx-runtime", "@overmap-ai/blocks", "dependency-graph", "@redux-offline/redux-offline", "@redux-offline/redux-offline/lib/defaults", "localforage", "redux-persist-migrate", "@reduxjs/toolkit", "superagent", "react-redux", "uuid", "color", "jwt-decode", "@redux-offline/redux-offline/lib/constants", "idb", "formik", "lodash.get", "linkify-react", "@hello-pangea/dnd", "file-saver", "lodash.set", "lodash.clonedeep", "react-dom"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["overmap-core"] = {}, global2.React, global2.jsxRuntime, global2.blocks, global2.dependencyGraph, global2.reduxOffline, global2.offlineConfig, global2.localforage, global2.createMigration, global2.toolkit, global2.request, global2.reactRedux, global2.uuid, global2.ColorCls, global2.jwtDecode, global2.constants, global2.idb, global2.formik, global2.get, global2.Linkify, global2.dnd, global2.fileSaver, global2.set, global2.cloneDeep, global2.ReactDOM));
-})(this, function(exports2, React, jsxRuntime, blocks, dependencyGraph, reduxOffline, offlineConfig, localforage, createMigration, toolkit, request, reactRedux, uuid, ColorCls, jwtDecode, constants, idb, formik, get, Linkify, dnd, fileSaver, set, cloneDeep, ReactDOM) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("react/jsx-runtime"), require("@overmap-ai/blocks"), require("dependency-graph"), require("@redux-offline/redux-offline"), require("@redux-offline/redux-offline/lib/defaults"), require("localforage"), require("redux-persist-migrate"), require("@reduxjs/toolkit"), require("superagent"), require("react-redux"), require("uuid"), require("color"), require("jwt-decode"), require("@redux-offline/redux-offline/lib/constants"), require("idb"), require("file-saver"), require("formik"), require("lodash.get"), require("linkify-react"), require("@hello-pangea/dnd"), require("lodash.set"), require("lodash.clonedeep"), require("react-dom")) : typeof define === "function" && define.amd ? define(["exports", "react", "react/jsx-runtime", "@overmap-ai/blocks", "dependency-graph", "@redux-offline/redux-offline", "@redux-offline/redux-offline/lib/defaults", "localforage", "redux-persist-migrate", "@reduxjs/toolkit", "superagent", "react-redux", "uuid", "color", "jwt-decode", "@redux-offline/redux-offline/lib/constants", "idb", "file-saver", "formik", "lodash.get", "linkify-react", "@hello-pangea/dnd", "lodash.set", "lodash.clonedeep", "react-dom"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["overmap-core"] = {}, global2.React, global2.jsxRuntime, global2.blocks, global2.dependencyGraph, global2.reduxOffline, global2.offlineConfig, global2.localforage, global2.createMigration, global2.toolkit, global2.request, global2.reactRedux, global2.uuid, global2.ColorCls, global2.jwtDecode, global2.constants, global2.idb, global2.saveAs, global2.formik, global2.get, global2.Linkify, global2.dnd, global2.set, global2.cloneDeep, global2.ReactDOM));
+})(this, function(exports2, React, jsxRuntime, blocks, dependencyGraph, reduxOffline, offlineConfig, localforage, createMigration, toolkit, request, reactRedux, uuid, ColorCls, jwtDecode, constants, idb, saveAs, formik, get, Linkify, dnd, set, cloneDeep, ReactDOM) {
   var _a;
   "use strict";
   function _interopNamespaceDefault(e) {
@@ -622,15 +622,15 @@ var __publicField = (obj, key, value) => {
   };
   const migrations = [initialVersioning, signOut, signOut, createOutboxState];
   const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-  const initialState$m = {
+  const initialState$l = {
     accessToken: "",
     refreshToken: "",
     isLoggedIn: false
   };
   const authSlice = toolkit.createSlice({
     name: "auth",
-    initialState: initialState$m,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+    initialState: initialState$l,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
     reducers: {
       setTokens: (state, action) => {
         state.accessToken = action.payload.accessToken;
@@ -1334,7 +1334,7 @@ var __publicField = (obj, key, value) => {
       return getLocalDateString(date);
     return relative.format(days, "days");
   });
-  const initialState$l = {
+  const initialState$k = {
     categories: {},
     usedCategoryColors: [],
     categoryVisibility: {
@@ -1344,8 +1344,8 @@ var __publicField = (obj, key, value) => {
   };
   const categorySlice = toolkit.createSlice({
     name: "categories",
-    initialState: initialState$l,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+    initialState: initialState$k,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
     reducers: {
       setCategories: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -1478,13 +1478,13 @@ var __publicField = (obj, key, value) => {
     return hiddenCategoryCount;
   };
   const categoryReducer = categorySlice.reducer;
-  const initialState$k = {
+  const initialState$j = {
     components: {}
   };
   const componentSlice = toolkit.createSlice({
     name: "components",
-    initialState: initialState$k,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+    initialState: initialState$j,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
     reducers: {
       addComponent: (state, action) => {
         state.components[action.payload.offline_id] = action.payload;
@@ -1596,13 +1596,13 @@ var __publicField = (obj, key, value) => {
     removeAllComponentsOfType
   } = componentSlice.actions;
   const componentReducer = componentSlice.reducer;
-  const initialState$j = {
+  const initialState$i = {
     completionsByComponentId: {}
   };
   const componentStageCompletionSlice = toolkit.createSlice({
     name: "componentStageCompletions",
-    initialState: initialState$j,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+    initialState: initialState$i,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
     reducers: {
       addStageCompletion: (state, action) => {
         let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1653,13 +1653,13 @@ var __publicField = (obj, key, value) => {
     return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
   };
   const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-  const initialState$i = {
+  const initialState$h = {
     stages: {}
   };
   const componentStageSlice = toolkit.createSlice({
     name: "componentStages",
-    initialState: initialState$i,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+    initialState: initialState$h,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
     reducers: {
       addStages: (state, action) => {
         Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1719,14 +1719,14 @@ var __publicField = (obj, key, value) => {
   );
   const { addStages, updateStages, removeStages } = componentStageSlice.actions;
   const componentStageReducer = componentStageSlice.reducer;
-  const initialState$h = {
+  const initialState$g = {
     componentTypes: {},
     hiddenComponentTypeIds: {}
   };
   const componentTypeSlice = toolkit.createSlice({
     name: "componentTypes",
-    initialState: initialState$h,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
+    initialState: initialState$g,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
     reducers: {
       addComponentType: (state, action) => {
         state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1785,13 +1785,13 @@ var __publicField = (obj, key, value) => {
   const selectHiddenComponentTypeIds = (state) => state.componentTypeReducer.hiddenComponentTypeIds;
   const { addComponentType, setComponentTypes, toggleComponentTypeVisibility, deleteComponentType } = componentTypeSlice.actions;
   const componentTypeReducer = componentTypeSlice.reducer;
-  const initialState$g = {
+  const initialState$f = {
     workspaces: {},
     activeWorkspaceId: null
   };
   const workspaceSlice = toolkit.createSlice({
     name: "workspace",
-    initialState: initialState$g,
+    initialState: initialState$f,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setWorkspaces: (state, action) => {
@@ -1848,20 +1848,21 @@ var __publicField = (obj, key, value) => {
   );
   const workspaceReducer = workspaceSlice.reducer;
   const maxRecentIssues = 10;
-  const initialState$f = {
+  const initialState$e = {
     issues: {},
     attachments: {},
     comments: {},
     visibleStatuses: [IssueStatus.BACKLOG, IssueStatus.SELECTED],
+    isFetchingInitialData: false,
     visibleUserIds: null,
     recentIssueIds: [],
     activeIssueId: null
   };
   const issueSlice = toolkit.createSlice({
     name: "issues",
-    initialState: initialState$f,
+    initialState: initialState$e,
     extraReducers: (builder) => builder.addCase("RESET", (state) => {
-      Object.assign(state, initialState$f);
+      Object.assign(state, initialState$e);
     }),
     reducers: {
       setIssues: (state, action) => {
@@ -1940,6 +1941,9 @@ var __publicField = (obj, key, value) => {
       setVisibleStatuses: (state, action) => {
         state.visibleStatuses = action.payload;
       },
+      setIsFetchingInitialData: (state, action) => {
+        state.isFetchingInitialData = action.payload;
+      },
       setVisibleUserIds: (state, action) => {
         state.visibleUserIds = [...new Set(action.payload)];
       },
@@ -1998,6 +2002,7 @@ var __publicField = (obj, key, value) => {
     resetRecentIssues,
     setActiveIssueId,
     setAttachments,
+    setIsFetchingInitialData,
     setIssueComments,
     setIssues,
     setVisibleStatuses,
@@ -2096,6 +2101,7 @@ var __publicField = (obj, key, value) => {
       return mapping[id];
     })
   );
+  const selectIsFetchingInitialData = (state) => state.issueReducer.isFetchingInitialData;
   const selectAllAttachments = toolkit.createSelector([selectIssueAttachmentMapping], (mapping) => Object.values(mapping));
   const searchIssues = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
@@ -2187,15 +2193,15 @@ var __publicField = (obj, key, value) => {
     }
   );
   const issueReducer = issueSlice.reducer;
-  const initialState$e = {
+  const initialState$d = {
     s3Urls: {}
   };
   const msPerHour = 1e3 * 60 * 60;
   const msPerWeek = msPerHour * 24 * 7;
   const fileSlice = toolkit.createSlice({
     name: "file",
-    initialState: initialState$e,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+    initialState: initialState$d,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
     reducers: {
       setUploadUrl: (state, action) => {
         const { url, fields, sha1 } = action.payload;
@@ -2222,7 +2228,7 @@ var __publicField = (obj, key, value) => {
     return url;
   };
   const fileReducer = fileSlice.reducer;
-  const initialState$d = {
+  const initialState$c = {
     // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
     mapStyle: MapStyle.SATELLITE,
     showTooltips: false,
@@ -2230,8 +2236,8 @@ var __publicField = (obj, key, value) => {
   };
   const mapSlice = toolkit.createSlice({
     name: "map",
-    initialState: initialState$d,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+    initialState: initialState$c,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
     reducers: {
       setMapStyle: (state, action) => {
         state.mapStyle = action.payload;
@@ -2273,18 +2279,7 @@ var __publicField = (obj, key, value) => {
     VerificationCodeType2[VerificationCodeType2["RESET_PASSWORD"] = 10] = "RESET_PASSWORD";
     return VerificationCodeType2;
   })(VerificationCodeType || {});
-  var LicenseLevel = /* @__PURE__ */ ((LicenseLevel2) => {
-    LicenseLevel2[LicenseLevel2["PRO"] = 0] = "PRO";
-    return LicenseLevel2;
-  })(LicenseLevel || {});
-  var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
-    LicenseStatus2[LicenseStatus2["ACTIVE"] = 0] = "ACTIVE";
-    LicenseStatus2[LicenseStatus2["PAUSED"] = 2] = "PAUSED";
-    LicenseStatus2[LicenseStatus2["CANCELED"] = 4] = "CANCELED";
-    LicenseStatus2[LicenseStatus2["INACTIVE"] = 6] = "INACTIVE";
-    return LicenseStatus2;
-  })(LicenseStatus || {});
-  const initialState$c = {
+  const initialState$b = {
     users: {},
     currentUser: {
       id: 0,
@@ -2295,8 +2290,8 @@ var __publicField = (obj, key, value) => {
   };
   const userSlice = toolkit.createSlice({
     name: "users",
-    initialState: initialState$c,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+    initialState: initialState$b,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
     reducers: {
       setUsers: (state, action) => {
         const usersMapping = {};
@@ -2358,13 +2353,13 @@ var __publicField = (obj, key, value) => {
   const selectUsersAsMapping = (state) => state.userReducer.users;
   const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
   const userReducer = userSlice.reducer;
-  const initialState$b = {
+  const initialState$a = {
     organizationAccesses: {}
   };
   const organizationAccessSlice = toolkit.createSlice({
     name: "organizationAccess",
-    initialState: initialState$b,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+    initialState: initialState$a,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
     reducers: {
       setOrganizationAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2427,13 +2422,151 @@ var __publicField = (obj, key, value) => {
     return organizationAccesses;
   };
   const organizationAccessReducer = organizationAccessSlice.reducer;
-  const initialState$a = {
+  const initialState$9 = {
+    organizations: {},
+    activeOrganizationId: null
+  };
+  const organizationSlice = toolkit.createSlice({
+    name: "organizations",
+    initialState: initialState$9,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
+    reducers: {
+      setOrganizations: (state, action) => {
+        for (const org of action.payload) {
+          state.organizations[org.id] = org;
+        }
+      },
+      updateActiveOrganization: (state, action) => {
+        if (!state.activeOrganizationId) {
+          throw new Error("Cannot update name of active organization. Active organization ID does not exist");
+        }
+        if (state.activeOrganizationId !== action.payload.id) {
+          throw new Error("Tried updating active organization with different organization");
+        }
+        state.organizations[state.activeOrganizationId] = action.payload;
+      },
+      setActiveOrganizationId: (state, action) => {
+        state.activeOrganizationId = action.payload;
+      }
+    }
+  });
+  const { setOrganizations, setActiveOrganizationId, updateActiveOrganization } = organizationSlice.actions;
+  const selectActiveOrganizationId = (state) => {
+    return state.organizationReducer.activeOrganizationId;
+  };
+  const selectOrganizations = (state) => {
+    return Object.values(state.organizationReducer.organizations);
+  };
+  const selectOrganizationsWithAccess = toolkit.createSelector(
+    [selectOrganizations],
+    (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
+  );
+  const selectActiveOrganization = (state) => {
+    const id = selectActiveOrganizationId(state);
+    if (!id) {
+      return null;
+    }
+    const organization = state.organizationReducer.organizations[id];
+    if (!organization) {
+      return null;
+    }
+    return organization;
+  };
+  const selectOrganizationUsersIds = toolkit.createSelector(
+    [selectOrganizationAccesses],
+    (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
+  );
+  const selectOrganizationUsersAsMapping = toolkit.createSelector(
+    [selectOrganizationUsersIds, selectUsersAsMapping],
+    (organizationUserIds, users) => organizationUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
+  );
+  const selectSortedOrganizationUsers = toolkit.createSelector(
+    [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
+    (currentUser, userMapping, organizationAccessMapping) => {
+      return Object.values(userMapping).sort((userA, userB) => {
+        if (userA.id === currentUser.id) {
+          return -1;
+        } else if (userB.id === currentUser.id) {
+          return 1;
+        }
+        const organizationAccessesA = organizationAccessMapping[userA.id];
+        const organizationAccessesB = organizationAccessMapping[userB.id];
+        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === (organizationAccessesB == null ? void 0 : organizationAccessesB.access_level)) {
+          return userA.username.localeCompare(userB.username);
+        }
+        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === OrganizationAccessLevel.ADMIN) {
+          return -1;
+        }
+        return 1;
+      });
+    }
+  );
+  const selectOrganization = (id) => (state) => {
+    return state.organizationReducer.organizations[id];
+  };
+  const organizationReducer = organizationSlice.reducer;
+  const createOfflineAction = (request2, baseUrl) => {
+    const requestWithUuid = request2.uuid ? request2 : { ...request2, uuid: uuid.v4() };
+    return {
+      payload: requestWithUuid,
+      type: "",
+      meta: {
+        offline: {
+          effect: {
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            request: requestWithUuid,
+            BASE_URL: baseUrl
+          }
+        }
+      }
+    };
+  };
+  const initialState$8 = {
+    deletedRequests: [],
+    latestRetryTime: 0
+  };
+  const outboxSlice = toolkit.createSlice({
+    name: "outbox",
+    initialState: initialState$8,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+    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
+      // Then this reducer enqueueRequest() is responsible for adding the actual request data to the outbox
+      enqueueRequest: {
+        reducer: (state, _action) => {
+          return state;
+        },
+        prepare: (payload) => {
+          console.debug("Preparing to enqueue request", payload);
+          const { BASE_URL, ...rest } = payload;
+          return createOfflineAction(rest, BASE_URL);
+        }
+      },
+      markForDeletion(state, action) {
+        state.deletedRequests.push(action.payload);
+      },
+      markAsDeleted(state, action) {
+        const index2 = state.deletedRequests.indexOf(action.payload);
+        if (index2 !== -1)
+          state.deletedRequests.splice(index2, 1);
+      },
+      _setLatestRetryTime: (state, action) => {
+        state.latestRetryTime = action.payload;
+      }
+    }
+  });
+  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$7 = {
     projectAccesses: {}
   };
   const projectAccessSlice = toolkit.createSlice({
     name: "projectAccess",
-    initialState: initialState$a,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+    initialState: initialState$7,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
     reducers: {
       setProjectAccesses: (state, action) => {
         if (!Array.isArray(action.payload))
@@ -2501,7 +2634,7 @@ var __publicField = (obj, key, value) => {
     return projectAccesses;
   };
   const projectAccessReducer = projectAccessSlice.reducer;
-  const initialState$9 = {
+  const initialState$6 = {
     projects: {},
     activeProjectId: null,
     recentProjectIds: [],
@@ -2510,7 +2643,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
-    initialState: initialState$9,
+    initialState: initialState$6,
     reducers: {
       setProjects: (state, action) => {
         const projectsMap = {};
@@ -2556,20 +2689,6 @@ var __publicField = (obj, key, value) => {
         } else {
           throw new Error("Accept project invite: user is not in this project");
         }
-      },
-      updateActiveProjectIssuesCount: (state, action) => {
-        if (state.activeProjectId) {
-          state.projects[state.activeProjectId].issues_count += action.payload;
-        } else {
-          throw new Error("Update issues count: no active project");
-        }
-      },
-      updateActiveProjectFormSubmissionsCount: (state, action) => {
-        if (state.activeProjectId) {
-          state.projects[state.activeProjectId].form_submissions_count += action.payload;
-        } else {
-          throw new Error("Update form submissions count: no active project");
-        }
       }
     }
   });
@@ -2580,9 +2699,7 @@ var __publicField = (obj, key, value) => {
     setActiveProjectId,
     setCreateProjectType,
     deleteProject,
-    acceptProjectInvite,
-    updateActiveProjectIssuesCount,
-    updateActiveProjectFormSubmissionsCount
+    acceptProjectInvite
   } = projectSlice.actions;
   const selectProjects = (state) => state.projectReducer.projects;
   const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
@@ -2646,264 +2763,39 @@ var __publicField = (obj, key, value) => {
       });
     }
   );
-  const initialState$8 = {
-    licenses: {}
+  const initialState$5 = {
+    projectFiles: {},
+    activeProjectFileId: null,
+    isImportingProjectFile: false,
+    enabledProjectFiles: {}
   };
-  const licenseSlice = toolkit.createSlice({
-    name: "license",
-    initialState: initialState$8,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  const projectFileSlice = toolkit.createSlice({
+    name: "projectFiles",
+    initialState: initialState$5,
+    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
     reducers: {
-      setLicenses: (state, action) => {
-        if (!Array.isArray(action.payload))
-          throw new Error("Expected an array of Licenses");
-        if (action.payload.filter(onlyUniqueOfflineIds).length !== action.payload.length) {
-          throw new Error("Tried to use setLicenses reducer with duplicate ID's");
-        }
-        const licenses = {};
-        for (const license of action.payload) {
-          licenses[license.offline_id] = license;
+      addOrReplaceProjectFiles: (state, action) => {
+        for (let fileObj of action.payload) {
+          let file = fileObj.file;
+          if (file.includes("+")) {
+            console.warn("Attempting to apply fix for image URL with '+' character:", file);
+            const parts = file.split("/");
+            if (parts.length < 2) {
+              throw new Error("Invalid URL: " + file);
+            }
+            const lastPart = encodeURIComponent(parts[parts.length - 1]);
+            file = parts.slice(0, -1).join("/") + "/" + lastPart;
+            console.warn("Fixed URL:", file);
+            fileObj = { ...fileObj, file };
+          }
+          state.projectFiles[fileObj.offline_id] = fileObj;
         }
-        state.licenses = licenses;
       },
-      addLicenses: (state, action) => {
-        for (const license of action.payload) {
-          state.licenses[license.offline_id] = license;
+      addOrReplaceProjectFile: (state, action) => {
+        if (!action.payload.project) {
+          throw new Error("ProjectFile has no project. A project must be set before storing.");
         }
-      },
-      updateLicense: (state, action) => {
-        if (!(action.payload.offline_id in state.licenses)) {
-          throw new Error("Tried to update license that does not exist.");
-        }
-        state.licenses[action.payload.offline_id] = action.payload;
-      }
-    }
-  });
-  const { setLicenses, addLicenses, updateLicense } = licenseSlice.actions;
-  const selectLicenses = (state) => {
-    return state.licenseReducer.licenses;
-  };
-  const selectLicense = (licenseId) => (state) => state.licenseReducer.licenses[licenseId];
-  const selectActiveLicense = toolkit.createSelector(
-    [selectLicenses, selectActiveProjectId],
-    (licenses, activeProjectId) => {
-      const activeLicense = Object.values(licenses).find((license) => license.project === activeProjectId);
-      return activeLicense ?? null;
-    }
-  );
-  const selectLicenseForProject = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectLicenses, (_state, projectId) => projectId],
-      (licenses, projectId) => Object.values(licenses).find((license) => license.project === projectId) ?? null
-    )
-  );
-  const selectActiveStatusLicenses = toolkit.createSelector(
-    [selectLicenses],
-    (licenses) => Object.values(licenses).filter((license) => license.is_active)
-  );
-  const selectLicencesMapping = toolkit.createSelector(
-    [selectLicenses],
-    (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
-  );
-  const licenseReducer = licenseSlice.reducer;
-  const initialState$7 = {
-    organizations: {},
-    activeOrganizationId: null
-  };
-  const organizationSlice = toolkit.createSlice({
-    name: "organizations",
-    initialState: initialState$7,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
-    reducers: {
-      setOrganizations: (state, action) => {
-        for (const org of action.payload) {
-          state.organizations[org.id] = org;
-        }
-      },
-      updateActiveOrganization: (state, action) => {
-        if (!state.activeOrganizationId) {
-          throw new Error("Cannot update name of active organization. Active organization ID does not exist");
-        }
-        if (state.activeOrganizationId !== action.payload.id) {
-          throw new Error("Tried updating active organization with different organization");
-        }
-        state.organizations[state.activeOrganizationId] = action.payload;
-      },
-      setActiveOrganizationId: (state, action) => {
-        state.activeOrganizationId = action.payload;
-      }
-    }
-  });
-  const { setOrganizations, setActiveOrganizationId, updateActiveOrganization } = organizationSlice.actions;
-  const selectActiveOrganizationId = (state) => {
-    return state.organizationReducer.activeOrganizationId;
-  };
-  const selectOrganizations = (state) => {
-    return Object.values(state.organizationReducer.organizations);
-  };
-  const selectOrganizationsMapping = (state) => {
-    return state.organizationReducer.organizations;
-  };
-  const selectOrganizationsWithAccess = toolkit.createSelector(
-    [selectOrganizations],
-    (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
-  );
-  const selectActiveOrganization = (state) => {
-    const id = selectActiveOrganizationId(state);
-    if (!id) {
-      return null;
-    }
-    const organization = state.organizationReducer.organizations[id];
-    if (!organization) {
-      return null;
-    }
-    return organization;
-  };
-  const selectOrganizationUsersIds = toolkit.createSelector(
-    [selectOrganizationAccesses],
-    (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
-  );
-  const selectActiveOrganizationProjects = toolkit.createSelector(
-    [selectProjects, selectActiveOrganizationId],
-    (projects, activeOrganizationId) => activeOrganizationId ? Object.values(projects).filter((project) => project.owner_organization === activeOrganizationId) : []
-  );
-  const selectActiveOrganizationLicenses = toolkit.createSelector(
-    [selectActiveOrganizationId, selectLicenses],
-    (activeOrganizationId, licenses) => !activeOrganizationId ? [] : Object.values(licenses).filter((license) => license.organization_owner === activeOrganizationId)
-  );
-  const selectSortedOrganizationLicenses = toolkit.createSelector(
-    [selectActiveOrganizationLicenses, selectProjects],
-    (licences, projects) => licences.sort((licenseA, licenseB) => {
-      if (!licenseA.project) {
-        return 1;
-      }
-      if (!licenseB.project) {
-        return -1;
-      }
-      return projects[licenseA.project].name.toLowerCase().localeCompare(
-        projects[licenseB.project].name.toLowerCase(),
-        void 0,
-        { numeric: true }
-      );
-    })
-  );
-  const selectOrganizationUsersAsMapping = toolkit.createSelector(
-    [selectOrganizationUsersIds, selectUsersAsMapping],
-    (organizationUserIds, users) => organizationUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
-  );
-  const selectSortedOrganizationUsers = toolkit.createSelector(
-    [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
-    (currentUser, userMapping, organizationAccessMapping) => {
-      return Object.values(userMapping).sort((userA, userB) => {
-        if (userA.id === currentUser.id) {
-          return -1;
-        } else if (userB.id === currentUser.id) {
-          return 1;
-        }
-        const organizationAccessesA = organizationAccessMapping[userA.id];
-        const organizationAccessesB = organizationAccessMapping[userB.id];
-        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === (organizationAccessesB == null ? void 0 : organizationAccessesB.access_level)) {
-          return userA.username.localeCompare(userB.username);
-        }
-        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === OrganizationAccessLevel.ADMIN) {
-          return -1;
-        }
-        return 1;
-      });
-    }
-  );
-  const selectOrganization = (id) => (state) => {
-    return state.organizationReducer.organizations[id];
-  };
-  const organizationReducer = organizationSlice.reducer;
-  const createOfflineAction = (request2, baseUrl) => {
-    const requestWithUuid = request2.uuid ? request2 : { ...request2, uuid: uuid.v4() };
-    return {
-      payload: requestWithUuid,
-      type: "",
-      meta: {
-        offline: {
-          effect: {
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-            request: requestWithUuid,
-            BASE_URL: baseUrl
-          }
-        }
-      }
-    };
-  };
-  const initialState$6 = {
-    deletedRequests: [],
-    latestRetryTime: 0
-  };
-  const outboxSlice = toolkit.createSlice({
-    name: "outbox",
-    initialState: initialState$6,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
-    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
-      // Then this reducer enqueueRequest() is responsible for adding the actual request data to the outbox
-      enqueueRequest: {
-        reducer: (state, _action) => {
-          return state;
-        },
-        prepare: (payload) => {
-          console.debug("Preparing to enqueue request", payload);
-          const { BASE_URL, ...rest } = payload;
-          return createOfflineAction(rest, BASE_URL);
-        }
-      },
-      markForDeletion(state, action) {
-        state.deletedRequests.push(action.payload);
-      },
-      markAsDeleted(state, action) {
-        const index2 = state.deletedRequests.indexOf(action.payload);
-        if (index2 !== -1)
-          state.deletedRequests.splice(index2, 1);
-      },
-      _setLatestRetryTime: (state, action) => {
-        state.latestRetryTime = action.payload;
-      }
-    }
-  });
-  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$5 = {
-    projectFiles: {},
-    activeProjectFileId: null,
-    isImportingProjectFile: false,
-    enabledProjectFiles: {}
-  };
-  const projectFileSlice = toolkit.createSlice({
-    name: "projectFiles",
-    initialState: initialState$5,
-    extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
-    reducers: {
-      addOrReplaceProjectFiles: (state, action) => {
-        for (let fileObj of action.payload) {
-          let file = fileObj.file;
-          if (file.includes("+")) {
-            console.warn("Attempting to apply fix for image URL with '+' character:", file);
-            const parts = file.split("/");
-            if (parts.length < 2) {
-              throw new Error("Invalid URL: " + file);
-            }
-            const lastPart = encodeURIComponent(parts[parts.length - 1]);
-            file = parts.slice(0, -1).join("/") + "/" + lastPart;
-            console.warn("Fixed URL:", file);
-            fileObj = { ...fileObj, file };
-          }
-          state.projectFiles[fileObj.offline_id] = fileObj;
-        }
-      },
-      addOrReplaceProjectFile: (state, action) => {
-        if (!action.payload.project) {
-          throw new Error("ProjectFile has no project. A project must be set before storing.");
-        }
-        state.projectFiles[action.payload.offline_id] = action.payload;
+        state.projectFiles[action.payload.offline_id] = action.payload;
       },
       setProjectFileVisible: (state, action) => {
         state.enabledProjectFiles[action.payload.fileId] = action.payload.visible;
@@ -3007,9 +2899,7 @@ var __publicField = (obj, key, value) => {
       Components: false,
       Experimental: false
     },
-    appearance: "dark",
-    isFetchingInitialData: false,
-    isLoading: false
+    appearance: "dark"
   };
   const settingSlice = toolkit.createSlice({
     name: "settings",
@@ -3033,12 +2923,6 @@ var __publicField = (obj, key, value) => {
       },
       setAppearance: (state, action) => {
         state.appearance = action.payload;
-      },
-      setIsFetchingInitialData: (state, action) => {
-        state.isFetchingInitialData = action.payload;
-      },
-      setIsLoading: (state, action) => {
-        state.isLoading = action.payload;
       }
     }
   });
@@ -3047,9 +2931,7 @@ var __publicField = (obj, key, value) => {
     setEnablePlacementMode,
     setSectionExpanded,
     setEnableClustering,
-    setAppearance,
-    setIsFetchingInitialData,
-    setIsLoading
+    setAppearance
   } = settingSlice.actions;
   const selectEnablePlacementMode = (state) => state.settingReducer.placementMode;
   const selectEnableDuplicateIssues = (state) => state.settingReducer.useIssueTemplate;
@@ -3058,8 +2940,6 @@ var __publicField = (obj, key, value) => {
   const selectEnableClustering = (state) => state.settingReducer.enableClustering;
   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;
@@ -3091,7 +2971,8 @@ var __publicField = (obj, key, value) => {
     userForms: {},
     revisions: {},
     submissions: {},
-    submissionAttachments: {}
+    submissionAttachments: {},
+    revisionAttachments: {}
   };
   const userFormSlice = toolkit.createSlice({
     name: "userForms",
@@ -3144,6 +3025,15 @@ var __publicField = (obj, key, value) => {
           state.submissionAttachments[submissionId] = [action.payload];
         }
       },
+      addUserFormRevisionAttachment: (state, action) => {
+        const revisionId = action.payload.revision;
+        const revisionAttachments = state.revisionAttachments[revisionId];
+        if (revisionAttachments) {
+          revisionAttachments.push(action.payload);
+        } else {
+          state.revisionAttachments[revisionId] = [action.payload];
+        }
+      },
       setUserFormSubmissionAttachments: (state, action) => {
         state.submissionAttachments = {};
         for (const attachment of action.payload) {
@@ -3156,6 +3046,18 @@ var __publicField = (obj, key, value) => {
           }
         }
       },
+      setUserFormRevisionAttachments: (state, action) => {
+        state.revisionAttachments = {};
+        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];
+          }
+        }
+      },
       deleteUserFormSubmission: (state, action) => {
         delete state.submissions[action.payload];
       },
@@ -3212,11 +3114,16 @@ var __publicField = (obj, key, value) => {
     setUserFormSubmissions,
     addUserFormRevision,
     addUserFormSubmissionAttachment,
-    setUserFormSubmissionAttachments
+    addUserFormRevisionAttachment,
+    setUserFormSubmissionAttachments,
+    setUserFormRevisionAttachments
   } = userFormSlice.actions;
   const selectSubmissionAttachments = (submissionId) => (state) => {
     return state.userFormReducer.submissionAttachments[submissionId] || [];
   };
+  const selectRevisionAttachments = (revisionId) => (state) => {
+    return state.userFormReducer.revisionAttachments[revisionId] || [];
+  };
   const selectFilteredUserForms = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [
@@ -3287,6 +3194,7 @@ var __publicField = (obj, key, value) => {
   const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
   const selectSubmissions = toolkit.createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
   const selectRevisionMapping = (state) => state.userFormReducer.revisions;
+  const selectRevisionAttachmentsMapping = (state) => state.userFormReducer.revisionAttachments;
   const selectRevisions = toolkit.createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
   const selectRevisionsForForm = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
@@ -3340,6 +3248,19 @@ var __publicField = (obj, key, value) => {
     }
     return latestRevisions;
   });
+  const selectAllRevisionAttachmentsByLatestRevisionId = toolkit.createSelector(
+    [selectUserFormMapping, selectRevisionMapping, selectRevisionAttachmentsMapping],
+    (forms, revisions, attachments) => {
+      const mappedAttachments = {};
+      for (const form of Object.values(forms)) {
+        const latestRevision = _selectLatestFormRevision(revisions, form.offline_id);
+        if (attachments[latestRevision.offline_id] !== void 0) {
+          mappedAttachments[latestRevision.offline_id] = attachments[latestRevision.offline_id];
+        }
+      }
+      return mappedAttachments;
+    }
+  );
   const selectNumberOfUserForms = toolkit.createSelector([selectUserFormMapping], (userForms) => {
     return Object.keys(userForms).length;
   });
@@ -3420,8 +3341,7 @@ var __publicField = (obj, key, value) => {
     userFormReducer,
     userReducer,
     workspaceReducer,
-    emailDomainsReducer,
-    licenseReducer
+    emailDomainsReducer
   };
   const overmapReducer = toolkit.combineReducers(overmapReducers);
   const resetStore = "RESET";
@@ -3582,6 +3502,19 @@ var __publicField = (obj, key, value) => {
           return errorRes.body.error;
         if (typeof errorRes.body.message === "string")
           return errorRes.body.message;
+        try {
+          return Object.entries(errorRes.body).map(([key, value]) => {
+            if (typeof value === "string") {
+              return `${key}: ${value}`;
+            }
+            if (Array.isArray(value)) {
+              return value.map((v) => `${key}: ${v}`).join("\n");
+            }
+            return `${key}: ${JSON.stringify(value)}`;
+          }).join("\n");
+        } catch (e) {
+          console.error("Failed to extract error message from response body", e);
+        }
       } else if (typeof errorRes.body === "string")
         return errorRes.body;
     } else if (errorRes == null ? void 0 : errorRes.text) {
@@ -4122,7 +4055,7 @@ var __publicField = (obj, key, value) => {
        * @returns {Promise<TokenPair>} The new access and refresh tokens
        */
       __publicField(this, "_getRenewedTokens", async (refreshToken) => {
-        const response = await this.enqueueRequest({
+        const promise = this.enqueueRequest({
           description: "Get renewed tokens",
           method: HttpMethod.POST,
           url: "/api/token/refresh/",
@@ -4135,6 +4068,14 @@ var __publicField = (obj, key, value) => {
           // Don't wait for other requests to finish, or we might end up in a deadlock.
           immediate: true
         });
+        let response = void 0;
+        try {
+          response = await promise;
+        } catch (e) {
+          await this.logout();
+        }
+        if (!response)
+          throw new Error("No response");
         if (!response.access)
           throw new Error("Missing access token");
         if (!response.refresh)
@@ -4854,7 +4795,6 @@ var __publicField = (obj, key, value) => {
       });
       store.dispatch(addIssue(issuePayload));
       store.dispatch(addToRecentIssues(issuePayload.offline_id));
-      store.dispatch(updateActiveProjectIssuesCount(1));
       const promise = this.enqueueRequest({
         description: "Create issue",
         method: HttpMethod.POST,
@@ -4881,7 +4821,6 @@ var __publicField = (obj, key, value) => {
           });
         }
         store.dispatch(removeIssue(issuePayload.offline_id));
-        store.dispatch(updateActiveProjectIssuesCount(-1));
         throw error2;
       });
       return [issuePayload, promise];
@@ -4920,8 +4859,7 @@ var __publicField = (obj, key, value) => {
       return [fullIssue, promise];
     }
     async remove(id) {
-      const { store } = this.client;
-      const state = store.getState();
+      const state = this.client.store.getState();
       const backup = state.issueReducer.issues[id];
       if (!backup) {
         throw new Error(`No issue with id ${id} found in the store`);
@@ -4929,7 +4867,6 @@ var __publicField = (obj, key, value) => {
       const attachments = Object.values(state.issueReducer.attachments).filter((a) => a.issue_id === id);
       const attachmentsOfIssue = selectPhotoAttachmentsOfIssue(id)(state);
       this.client.store.dispatch(removeIssue(id));
-      store.dispatch(updateActiveProjectIssuesCount(-1));
       if (attachmentsOfIssue) {
         this.client.store.dispatch(removeAttachmentsOfIssue(id));
       }
@@ -4944,7 +4881,6 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         this.client.store.dispatch(addIssue(backup));
         this.client.store.dispatch(addAttachments(attachments));
-        store.dispatch(updateActiveProjectIssuesCount(1));
         throw e;
       }
     }
@@ -5020,9 +4956,7 @@ var __publicField = (obj, key, value) => {
           owner_organization: projectData.organization_owner,
           owner_user: projectData.user_owner,
           bounds: projectData.bounds,
-          invited: projectData.invited || false,
-          issues_count: projectData.issues_count,
-          form_submissions_count: projectData.form_submissions_count
+          invited: projectData.invited || false
         });
         if (currentProjectId === projectData.id && !projectData.invited) {
           isProjectIdValid = true;
@@ -5040,7 +4974,6 @@ var __publicField = (obj, key, value) => {
       }
       store.dispatch(setCurrentUser(data.user));
       store.dispatch(addUsers(data.project_owners));
-      store.dispatch(setLicenses(data.licenses));
       const organizationsData = data.organizations;
       store.dispatch(setOrganizations(organizationsData));
       const validProjects = projects.filter((project) => !project.invited);
@@ -5353,7 +5286,6 @@ var __publicField = (obj, key, value) => {
       if (!project) {
         throw new Error("Expected project to exist");
       }
-      const license = selectLicenseForProject(project.id);
       const activeProjectId = state.projectReducer.activeProjectId;
       if (activeProjectId === projectId) {
         store.dispatch({ type: "project/setActiveProjectId", payload: null });
@@ -5364,9 +5296,6 @@ var __publicField = (obj, key, value) => {
       store.dispatch(removeProjectAccessesOfProject(project.id));
       store.dispatch({ type: "rehydrated/setRehydrated", payload: false });
       store.dispatch(deleteProject(project));
-      if (license) {
-        store.dispatch(updateLicense({ ...license, project: null }));
-      }
       try {
         await this.enqueueRequest({
           description: "Delete project",
@@ -5382,9 +5311,6 @@ var __publicField = (obj, key, value) => {
         store.dispatch(addOrReplaceProjectFiles(filesToDelete));
         store.dispatch(setActiveProjectId(activeProjectId));
         store.dispatch({ type: "rehydrated/setRehydrated", payload: true });
-        if (license) {
-          store.dispatch(updateLicense({ ...license, project: project.id }));
-        }
         throw e;
       }
     }
@@ -5423,8 +5349,72 @@ var __publicField = (obj, key, value) => {
       });
     }
   }
+  const separateImageFromFields = async (payload) => {
+    const { fields } = payload;
+    const images = {};
+    const newFields = [];
+    for (const section of fields) {
+      if (section.type !== "section") {
+        throw new Error(`Expected ISerializedField type to be a section. Got ${section.type} instead.`);
+      }
+      const { fields: sectionFields } = section;
+      const newSectionFields = [];
+      for (const field of sectionFields) {
+        if (field.image) {
+          if (field.image instanceof Promise) {
+            try {
+              images[field.identifier] = await field.image;
+            } catch (e) {
+              console.error("Failed to get image from promise", e);
+            }
+          } else {
+            images[field.identifier] = field.image;
+          }
+          delete field.image;
+        }
+        newSectionFields.push(field);
+      }
+      newFields.push({ ...section, fields: newSectionFields });
+    }
+    const payloadWithoutImage = {
+      ...payload,
+      fields: newFields
+    };
+    return { payloadWithoutImage, images };
+  };
   class UserFormService extends BaseApiService {
-    add(state, initialRevision, url, ownerUser, ownerOrganization) {
+    constructor() {
+      super(...arguments);
+      // Attach images to revision, after uploading them to S3
+      __publicField(this, "getAttachImagePromises", (images, offlineRevisionId) => {
+        const { store } = this.client;
+        return Object.entries(images).map(async ([key, image]) => {
+          const sha1 = await hashFile(image);
+          await this.client.files.addCache(image, sha1);
+          const [fileProps] = await this.client.files.uploadFileToS3(sha1);
+          const revisionAttachmentPayload = offline({
+            ...fileProps,
+            revision: offlineRevisionId,
+            field_identifier: key
+          });
+          const attach = await this.enqueueRequest({
+            description: "Attach image to form revision field",
+            method: HttpMethod.POST,
+            url: `/forms/revisions/${offlineRevisionId}/attachments/`,
+            payload: revisionAttachmentPayload,
+            blockers: [revisionAttachmentPayload.revision],
+            blocks: [revisionAttachmentPayload.offline_id]
+          });
+          const offlinePayload = {
+            ...revisionAttachmentPayload,
+            file: URL.createObjectURL(image)
+          };
+          store.dispatch(addUserFormRevisionAttachment(offlinePayload));
+          return attach;
+        });
+      });
+    }
+    async add(state, initialRevision, url, ownerUser, ownerOrganization) {
       if (!!ownerUser === !!ownerOrganization) {
         throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
       }
@@ -5444,8 +5434,9 @@ var __publicField = (obj, key, value) => {
         created_by: currentUser.id,
         ...ownerAttrs
       };
+      const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
       const retRevision = {
-        ...offlineRevisionPayload,
+        ...payloadWithoutImage,
         created_by: currentUser.id,
         form: retForm.offline_id,
         revision: 0
@@ -5460,24 +5451,26 @@ var __publicField = (obj, key, value) => {
         queryParams: activeWorkspaceId ? {
           workspace_id: activeWorkspaceId
         } : void 0,
-        payload: { ...offlineFormPayload, initial_revision: offlineRevisionPayload },
+        payload: { ...offlineFormPayload, initial_revision: payloadWithoutImage },
         blockers: [],
-        blocks: [offlineFormPayload.offline_id, offlineRevisionPayload.offline_id]
+        blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
       });
+      const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
       void formPromise.catch((e) => {
         store.dispatch(deleteUserForm(retForm.offline_id));
         store.dispatch(deleteUserFormRevision(retRevision.offline_id));
         throw e;
       });
-      return [retForm, retRevision, formPromise];
+      const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
+      return [retForm, retRevision, formPromise, settledPromise];
     }
-    addForOrganization(initialRevision) {
+    async addForOrganization(initialRevision) {
       const state = this.client.store.getState();
       const activeOrganizationId = state.organizationReducer.activeOrganizationId;
       if (!activeOrganizationId) {
         throw new Error("Cannot add forms for organization when there is no active organization.");
       }
-      return this.add(
+      return await this.add(
         state,
         initialRevision,
         `/forms/in-organization/${activeOrganizationId}/`,
@@ -5485,12 +5478,12 @@ var __publicField = (obj, key, value) => {
         activeOrganizationId
       );
     }
-    addForCurrentUser(initialRevision) {
+    async addForCurrentUser(initialRevision) {
       const state = this.client.store.getState();
       const currentUser = state.userReducer.currentUser;
-      return this.add(state, initialRevision, "/forms/my-forms/", currentUser.id);
+      return await this.add(state, initialRevision, "/forms/my-forms/", currentUser.id);
     }
-    createRevision(formId2, revision) {
+    async createRevision(formId2, revision) {
       const offlineRevision = offline(revision);
       const { store } = this.client;
       const state = store.getState();
@@ -5499,8 +5492,9 @@ var __publicField = (obj, key, value) => {
         throw new Error("Cannot create form revision when there is no active project.");
       }
       const currentUserId = state.userReducer.currentUser.id;
+      const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevision);
       const fullRevision = {
-        ...offlineRevision,
+        ...payloadWithoutImage,
         created_by: currentUserId,
         revision: "Pending",
         form: formId2
@@ -5510,19 +5504,21 @@ var __publicField = (obj, key, value) => {
         description: "Create form revision",
         method: HttpMethod.PATCH,
         url: `/forms/${formId2}/`,
-        payload: { initial_revision: offlineRevision },
+        payload: { initial_revision: payloadWithoutImage },
         queryParams: {
           project_id: activeProjectId.toString()
         },
         blockers: [formId2],
         blocks: [offlineRevision.offline_id]
       });
+      const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
       void promise.then((result) => {
         store.dispatch(addUserFormRevision(result));
       }).catch(() => {
         store.dispatch(deleteUserFormRevision(fullRevision.offline_id));
       });
-      return [fullRevision, promise];
+      const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
+      return [fullRevision, settledPromise];
     }
     async favorite(formId2) {
       const { store } = this.client;
@@ -5604,6 +5600,7 @@ var __publicField = (obj, key, value) => {
       });
       store.dispatch(addUserForms(Object.values(result.forms)));
       store.dispatch(addUserFormRevisions(Object.values(result.revisions)));
+      store.dispatch(setUserFormRevisionAttachments(Object.values(result.attachments)));
     }
   }
   const isArrayOfFiles = (value) => {
@@ -5690,11 +5687,9 @@ var __publicField = (obj, key, value) => {
       store.dispatch(addUserFormSubmission(offlineResultWithoutFiles));
       void promise.then((result) => {
         store.dispatch(addUserFormSubmission(result));
-        store.dispatch(updateActiveProjectFormSubmissionsCount(1));
         return result;
       }).catch(() => {
         store.dispatch(deleteUserFormSubmission(payload.offline_id));
-        store.dispatch(updateActiveProjectFormSubmissionsCount(-1));
       });
       const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
       return [fullOfflineResult, settledPromise];
@@ -5704,7 +5699,6 @@ var __publicField = (obj, key, value) => {
       const state = store.getState();
       const submission = state.userFormReducer.submissions[submissionId];
       store.dispatch(deleteUserFormSubmission(submissionId));
-      store.dispatch(updateActiveProjectFormSubmissionsCount(-1));
       try {
         return await this.enqueueRequest({
           description: "Delete user form submissions",
@@ -5716,7 +5710,6 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         if (submission) {
           store.dispatch(addUserFormSubmission(submission));
-          store.dispatch(updateActiveProjectFormSubmissionsCount(1));
         }
         throw e;
       }
@@ -6129,12 +6122,10 @@ var __publicField = (obj, key, value) => {
       const organizationAccesses = data.organization_accesses;
       const emailDomains = data.email_domains;
       const users = data.users;
-      const licenses = data.licenses;
       store.dispatch(addUsers(users));
       store.dispatch(setActiveOrganizationId(activeOrganization.id));
       store.dispatch(setOrganizationAccesses(organizationAccesses));
       store.dispatch(setEmailDomains(emailDomains));
-      store.dispatch(addLicenses(licenses));
       if (showLoading) {
         store.dispatch(setIsFetchingInitialData(false));
       }
@@ -6175,109 +6166,6 @@ var __publicField = (obj, key, value) => {
       });
     }
   }
-  class LicenseService extends BaseApiService {
-    async getLicensesForOrganization(organizationId, showLoading = false) {
-      if (showLoading) {
-        this.client.store.dispatch(setIsFetchingInitialData(true));
-      }
-      return this.enqueueRequest({
-        description: "Get licenses",
-        method: HttpMethod.GET,
-        url: `/organizations/${organizationId}/licenses/`,
-        isAuthNeeded: true,
-        blockers: [organizationId.toString()],
-        blocks: []
-      }).then((result) => {
-        if (showLoading) {
-          this.client.store.dispatch(setIsFetchingInitialData(false));
-        }
-        return result;
-      });
-    }
-    async pauseLicense(license) {
-      this.client.store.dispatch(setIsFetchingInitialData(true));
-      return this.enqueueRequest({
-        description: "Pause license",
-        method: HttpMethod.DELETE,
-        url: `/billing/${license.offline_id}/suspend/`,
-        isAuthNeeded: true,
-        blockers: [
-          license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-        ],
-        blocks: []
-      }).then((result) => {
-        this.client.store.dispatch(updateLicense(result));
-        this.client.store.dispatch(setIsFetchingInitialData(false));
-        return result;
-      });
-    }
-    async resumeLicense(license) {
-      this.client.store.dispatch(setIsFetchingInitialData(true));
-      return this.enqueueRequest({
-        description: "Resume license",
-        method: HttpMethod.PATCH,
-        url: `/billing/${license.offline_id}/suspend/`,
-        isAuthNeeded: true,
-        blockers: [
-          license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-        ],
-        blocks: []
-      }).then((result) => {
-        this.client.store.dispatch(updateLicense(result));
-        this.client.store.dispatch(setIsFetchingInitialData(false));
-        return result;
-      });
-    }
-    async cancelLicense(license) {
-      this.client.store.dispatch(setIsFetchingInitialData(true));
-      return this.enqueueRequest({
-        description: "Cancel license",
-        method: HttpMethod.DELETE,
-        url: `/billing/${license.offline_id}/`,
-        isAuthNeeded: true,
-        blockers: [
-          license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-        ],
-        blocks: []
-      }).then((result) => {
-        this.client.store.dispatch(updateLicense(result));
-        this.client.store.dispatch(setIsFetchingInitialData(false));
-        return result;
-      });
-    }
-    async attachLicenseToProject(license, project) {
-      return this.enqueueRequest({
-        description: "Attach license",
-        method: HttpMethod.PATCH,
-        url: `/billing/${license.offline_id}/project/`,
-        isAuthNeeded: true,
-        payload: { project: project.id },
-        blockers: [
-          license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : "",
-          project.id ? project.id.toString() : ""
-        ],
-        blocks: []
-      }).then((result) => {
-        this.client.store.dispatch(updateLicense(result));
-        return result;
-      });
-    }
-    async detachLicenseFromProject(license) {
-      return this.enqueueRequest({
-        description: "Detach license",
-        method: HttpMethod.DELETE,
-        url: `/billing/${license.offline_id}/project/`,
-        isAuthNeeded: true,
-        blockers: [
-          license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
-        ],
-        blocks: []
-      }).then((result) => {
-        this.client.store.dispatch(updateLicense(result));
-        return result;
-      });
-    }
-  }
   class OvermapSDK {
     constructor(apiUrl, store) {
       __publicField(this, "API_URL");
@@ -6303,7 +6191,6 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "projectFiles", new ProjectFileService(this));
       __publicField(this, "emailVerification", new EmailVerificationService(this));
       __publicField(this, "emailDomains", new EmailDomainsService(this));
-      __publicField(this, "licenses", new LicenseService(this));
       this.API_URL = apiUrl;
       this.store = store;
     }
@@ -6332,16 +6219,26 @@ var __publicField = (obj, key, value) => {
     }
     return /* @__PURE__ */ jsxRuntime.jsx(OvermapContext.Provider, { value: null, children: ret });
   };
-  const description$1 = "_description_o5vqt_1";
-  const floatingButtonContainer$1 = "_floatingButtonContainer_o5vqt_5";
-  const tabsList = "_tabsList_o5vqt_12";
-  const tabTrigger = "_tabTrigger_o5vqt_20";
-  const patchfieldBorder = "_patchfieldBorder_o5vqt_24";
-  const title = "_title_o5vqt_24";
-  const error = "_error_o5vqt_40";
+  const description$2 = "_description_1rtl0_1";
+  const floatingButtonContainer$2 = "_floatingButtonContainer_1rtl0_5";
+  const FullScreenImageContainer$2 = "_FullScreenImageContainer_1rtl0_12";
+  const fileName$2 = "_fileName_1rtl0_22";
+  const longIconButton$2 = "_longIconButton_1rtl0_27";
+  const previewImage$3 = "_previewImage_1rtl0_33";
+  const FullScreenImage$2 = "_FullScreenImage_1rtl0_12";
+  const tabsList = "_tabsList_1rtl0_51";
+  const tabTrigger = "_tabTrigger_1rtl0_59";
+  const patchfieldBorder = "_patchfieldBorder_1rtl0_63";
+  const title = "_title_1rtl0_63";
+  const error = "_error_1rtl0_79";
   const styles$7 = {
-    description: description$1,
-    floatingButtonContainer: floatingButtonContainer$1,
+    description: description$2,
+    floatingButtonContainer: floatingButtonContainer$2,
+    FullScreenImageContainer: FullScreenImageContainer$2,
+    fileName: fileName$2,
+    longIconButton: longIconButton$2,
+    previewImage: previewImage$3,
+    FullScreenImage: FullScreenImage$2,
     tabsList,
     tabTrigger,
     patchfieldBorder,
@@ -6382,12 +6279,13 @@ var __publicField = (obj, key, value) => {
   };
   class BaseField extends BaseFormElement {
     constructor(options) {
-      const { label, required, fieldValidators = [], formValidators = [], ...base } = options;
+      const { label, required, image, fieldValidators = [], formValidators = [], ...base } = options;
       super(base);
       __publicField(this, "required");
       __publicField(this, "formValidators");
       __publicField(this, "fieldValidators");
       __publicField(this, "label");
+      __publicField(this, "image");
       /**
        * By default, validation doesn't execute on `onChange` events when editing fields
        * until the field has been `touched`. This can be overridden by setting this to `false`
@@ -6397,6 +6295,7 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "onlyValidateAfterTouched", true);
       this.label = label;
       this.required = required;
+      this.image = image;
       this.fieldValidators = fieldValidators;
       this.formValidators = formValidators;
     }
@@ -6431,7 +6330,8 @@ var __publicField = (obj, key, value) => {
       return {
         ...super._serialize(),
         label: this.label,
-        required: this.required
+        required: this.required,
+        image: this.image
       };
     }
     getFieldValidators() {
@@ -6443,108 +6343,22 @@ var __publicField = (obj, key, value) => {
   }
   __publicField(BaseField, "fieldTypeName");
   __publicField(BaseField, "fieldTypeDescription");
-  const description = "_description_1p32e_1";
-  const floatingButtonContainer = "_floatingButtonContainer_1p32e_5";
+  const description$1 = "_description_1nfty_1";
+  const floatingButtonContainer$1 = "_floatingButtonContainer_1nfty_5";
+  const FullScreenImageContainer$1 = "_FullScreenImageContainer_1nfty_12";
+  const fileName$1 = "_fileName_1nfty_22";
+  const longIconButton$1 = "_longIconButton_1nfty_27";
+  const previewImage$2 = "_previewImage_1nfty_33";
+  const FullScreenImage$1 = "_FullScreenImage_1nfty_12";
   const styles$6 = {
-    description,
-    floatingButtonContainer
-  };
-  const InputWithLabel = (props) => {
-    const { label, children, size, severity, inputId, labelId, flexProps } = props;
-    return /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "column", gap: "1", asChild: true, ...flexProps, children: /* @__PURE__ */ jsxRuntime.jsxs("label", { htmlFor: inputId, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { size, severity, id: labelId, children: label }),
-      children
-    ] }) });
-  };
-  const InputWithHelpText = (props) => {
-    const { helpText, children, severity } = props;
-    return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { direction: "column", gap: "1", children: [
-      children,
-      /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "column", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { size: "1", severity, className: styles$6.description, children: helpText }) })
-    ] });
-  };
-  const InputWithLabelAndHelpText = (props) => {
-    const { children, ...restProps } = props;
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithHelpText, { ...restProps, children });
-  };
-  const useFormikInput = (props) => {
-    const { id, field, formId: formId2, size, showInputOnly, ...rest } = props;
-    const [fieldProps, meta, helpers] = formik.useField(field.getId());
-    const { touched } = meta;
-    const helpText = meta.error ?? field.description;
-    const severity = meta.error ? "danger" : void 0;
-    const inputId = id ?? `${formId2}-${field.getId()}-input`;
-    const labelId = `${inputId}-label`;
-    const label = field.required ? `${field.label} *` : field.label;
-    const fieldPropsWithValidation = React.useMemo(() => {
-      const handleChange = (e) => {
-        const value = field.getValueFromChangeEvent(e);
-        void helpers.setValue(value, false).then();
-        if (touched || !field.onlyValidateAfterTouched) {
-          helpers.setError(field.getError(value));
-        }
-      };
-      const handleBlur = (e) => {
-        void helpers.setTouched(true, false).then();
-        helpers.setError(field.getError(field.getValueFromChangeEvent(e)));
-      };
-      return {
-        ...fieldProps,
-        onChange: handleChange,
-        onBlur: handleBlur
-      };
-    }, [field, fieldProps, helpers, touched]);
-    return [
-      {
-        helpText,
-        size,
-        severity,
-        inputId,
-        labelId,
-        label,
-        showInputOnly,
-        fieldProps: fieldPropsWithValidation,
-        helpers,
-        field
-      },
-      { ...rest, "aria-labelledby": labelId }
-    ];
+    description: description$1,
+    floatingButtonContainer: floatingButtonContainer$1,
+    FullScreenImageContainer: FullScreenImageContainer$1,
+    fileName: fileName$1,
+    longIconButton: longIconButton$1,
+    previewImage: previewImage$2,
+    FullScreenImage: FullScreenImage$1
   };
-  const truthyValues = [true, "true"];
-  const BooleanInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps }, rest] = useFormikInput(props);
-    let [{ helpText, label }] = useFormikInput(props);
-    helpText = showInputOnly ? null : helpText;
-    label = showInputOnly ? "" : label;
-    const color = blocks.useSeverityColor(severity);
-    const value = truthyValues.includes(fieldProps.value);
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
-      InputWithLabel,
-      {
-        size,
-        severity,
-        inputId,
-        labelId,
-        label,
-        flexProps: { direction: "row-reverse", justify: "end", align: "center", gap: "2" },
-        children: /* @__PURE__ */ jsxRuntime.jsx(
-          blocks.Checkbox,
-          {
-            ...rest,
-            ...fieldProps,
-            id: inputId,
-            color,
-            value: value.toString(),
-            checked: value,
-            onCheckedChange: fieldProps.onChange,
-            onChange: void 0,
-            onBlur: void 0
-          }
-        )
-      }
-    ) });
-  });
-  BooleanInput.displayName = "BooleanInput";
   function _objectWithoutPropertiesLoose(source, excluded) {
     if (source == null)
       return {};
@@ -6809,6 +6623,24 @@ var __publicField = (obj, key, value) => {
       clipRule: "evenodd"
     }));
   });
+  var _excluded$2C = ["color"];
+  var ImageIcon = /* @__PURE__ */ React.forwardRef(function(_ref, forwardedRef) {
+    var _ref$color = _ref.color, color = _ref$color === void 0 ? "currentColor" : _ref$color, props = _objectWithoutPropertiesLoose(_ref, _excluded$2C);
+    return React.createElement("svg", Object.assign({
+      width: "15",
+      height: "15",
+      viewBox: "0 0 15 15",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, props, {
+      ref: forwardedRef
+    }), React.createElement("path", {
+      d: "M2.5 1H12.5C13.3284 1 14 1.67157 14 2.5V12.5C14 13.3284 13.3284 14 12.5 14H2.5C1.67157 14 1 13.3284 1 12.5V2.5C1 1.67157 1.67157 1 2.5 1ZM2.5 2C2.22386 2 2 2.22386 2 2.5V8.3636L3.6818 6.6818C3.76809 6.59551 3.88572 6.54797 4.00774 6.55007C4.12975 6.55216 4.24568 6.60372 4.32895 6.69293L7.87355 10.4901L10.6818 7.6818C10.8575 7.50607 11.1425 7.50607 11.3182 7.6818L13 9.3636V2.5C13 2.22386 12.7761 2 12.5 2H2.5ZM2 12.5V9.6364L3.98887 7.64753L7.5311 11.4421L8.94113 13H2.5C2.22386 13 2 12.7761 2 12.5ZM12.5 13H10.155L8.48336 11.153L11 8.6364L13 10.6364V12.5C13 12.7761 12.7761 13 12.5 13ZM6.64922 5.5C6.64922 5.03013 7.03013 4.64922 7.5 4.64922C7.96987 4.64922 8.35078 5.03013 8.35078 5.5C8.35078 5.96987 7.96987 6.35078 7.5 6.35078C7.03013 6.35078 6.64922 5.96987 6.64922 5.5ZM7.5 3.74922C6.53307 3.74922 5.74922 4.53307 5.74922 5.5C5.74922 6.46693 6.53307 7.25078 7.5 7.25078C8.46693 7.25078 9.25078 6.46693 9.25078 5.5C9.25078 4.53307 8.46693 3.74922 7.5 3.74922Z",
+      fill: color,
+      fillRule: "evenodd",
+      clipRule: "evenodd"
+    }));
+  });
   var _excluded$2E = ["color"];
   var InputIcon = /* @__PURE__ */ React.forwardRef(function(_ref, forwardedRef) {
     var _ref$color = _ref.color, color = _ref$color === void 0 ? "currentColor" : _ref$color, props = _objectWithoutPropertiesLoose(_ref, _excluded$2E);
@@ -7005,6 +6837,196 @@ var __publicField = (obj, key, value) => {
       clipRule: "evenodd"
     }));
   });
+  const FullScreenImagePreview = React.memo((props) => {
+    const { file, url, name, setShowPreview } = props;
+    const handleDownload = React.useCallback(
+      (event) => {
+        event.stopPropagation();
+        const blob = new Blob([file]);
+        saveAs(blob, name);
+      },
+      [name, file]
+    );
+    return /* @__PURE__ */ jsxRuntime.jsxs(
+      "button",
+      {
+        className: styles$6.FullScreenImageContainer,
+        onClick: () => {
+          setShowPreview(false);
+        },
+        children: [
+          /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { align: "center", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              blocks.IconButton,
+              {
+                className: styles$6.longIconButton,
+                variant: "soft",
+                "aria-label": "Exit preview",
+                onClick: () => {
+                  setShowPreview(false);
+                },
+                children: /* @__PURE__ */ jsxRuntime.jsx(ArrowLeftIcon, {})
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { className: styles$6.fileName, children: name }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              blocks.IconButton,
+              {
+                className: styles$6.longIconButton,
+                variant: "soft",
+                "aria-label": `Download ${name}`,
+                onClick: handleDownload,
+                children: /* @__PURE__ */ jsxRuntime.jsx(DownloadIcon, {})
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "img",
+            {
+              className: styles$6.FullScreenImage,
+              src: url,
+              alt: name,
+              onClick: (e) => {
+                e.stopPropagation();
+              }
+            }
+          )
+        ]
+      }
+    );
+  });
+  FullScreenImagePreview.displayName = "FullScreenImagePreview";
+  const InputWithLabel = (props) => {
+    const { label, children, size, severity, inputId, labelId, image, flexProps } = props;
+    const [resolvedImage, setResolvedImage] = React.useState(void 0);
+    const [showImagePreview, setShowImagePreview] = React.useState(false);
+    React.useEffect(() => {
+      if (image instanceof Promise) {
+        image.then(setResolvedImage).catch(console.error);
+      } else {
+        setResolvedImage(image);
+      }
+    }, [image]);
+    const resolvedImageURL = resolvedImage ? URL.createObjectURL(resolvedImage) : void 0;
+    return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { direction: "column", gap: "2", children: [
+      resolvedImage && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "img",
+          {
+            className: styles$6.previewImage,
+            src: resolvedImageURL,
+            alt: resolvedImage.name,
+            onClick: () => {
+              setShowImagePreview(true);
+            }
+          }
+        ),
+        showImagePreview && /* @__PURE__ */ jsxRuntime.jsx(
+          FullScreenImagePreview,
+          {
+            file: resolvedImage,
+            url: resolvedImageURL,
+            name: resolvedImage.name,
+            setShowPreview: setShowImagePreview
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "column", gap: "1", asChild: true, ...flexProps, children: /* @__PURE__ */ jsxRuntime.jsxs("label", { htmlFor: inputId, children: [
+        /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { size, severity, id: labelId, children: label }),
+        children
+      ] }) })
+    ] });
+  };
+  const InputWithHelpText = (props) => {
+    const { helpText, children, severity } = props;
+    return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { direction: "column", gap: "1", children: [
+      children,
+      /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "column", children: /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { size: "1", severity, className: styles$6.description, children: helpText }) })
+    ] });
+  };
+  const InputWithLabelAndHelpText = (props) => {
+    const { children, ...restProps } = props;
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithHelpText, { ...restProps, children });
+  };
+  const useFormikInput = (props) => {
+    const { id, field, formId: formId2, size, showInputOnly, ...rest } = props;
+    const [fieldProps, meta, helpers] = formik.useField(field.getId());
+    const { touched } = meta;
+    const helpText = meta.error ?? field.description;
+    const severity = meta.error ? "danger" : void 0;
+    const inputId = id ?? `${formId2}-${field.getId()}-input`;
+    const labelId = `${inputId}-label`;
+    const label = field.required ? `${field.label} *` : field.label;
+    const fieldPropsWithValidation = React.useMemo(() => {
+      const handleChange = (e) => {
+        const value = field.getValueFromChangeEvent(e);
+        void helpers.setValue(value, false).then();
+        if (touched || !field.onlyValidateAfterTouched) {
+          helpers.setError(field.getError(value));
+        }
+      };
+      const handleBlur = (e) => {
+        void helpers.setTouched(true, false).then();
+        helpers.setError(field.getError(field.getValueFromChangeEvent(e)));
+      };
+      return {
+        ...fieldProps,
+        onChange: handleChange,
+        onBlur: handleBlur
+      };
+    }, [field, fieldProps, helpers, touched]);
+    return [
+      {
+        helpText,
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        showInputOnly,
+        fieldProps: fieldPropsWithValidation,
+        helpers,
+        field
+      },
+      { ...rest, "aria-labelledby": labelId }
+    ];
+  };
+  const truthyValues = [true, "true"];
+  const BooleanInput = React.memo((props) => {
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
+    let [{ helpText, label }] = useFormikInput(props);
+    helpText = showInputOnly ? null : helpText;
+    label = showInputOnly ? "" : label;
+    const color = blocks.useSeverityColor(severity);
+    const value = truthyValues.includes(fieldProps.value);
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
+      {
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        flexProps: { direction: "row-reverse", justify: "end", align: "center", gap: "2" },
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.Checkbox,
+          {
+            ...rest,
+            ...fieldProps,
+            id: inputId,
+            color,
+            value: value.toString(),
+            checked: value,
+            onCheckedChange: fieldProps.onChange,
+            onChange: void 0,
+            onBlur: void 0
+          }
+        )
+      }
+    ) });
+  });
+  BooleanInput.displayName = "BooleanInput";
   const emptyBooleanField = {
     ...emptyBaseField,
     type: "boolean"
@@ -8433,25 +8455,36 @@ var __publicField = (obj, key, value) => {
     Content: TabsContent
   });
   const NumberInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps, field }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
     const color = blocks.useSeverityColor(severity);
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: /* @__PURE__ */ jsxRuntime.jsx(
-      TextField$1.Input,
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
       {
-        ...rest,
-        ...fieldProps,
-        type: "number",
-        id: inputId,
-        placeholder: "Enter a number",
-        min: field.minimum,
-        max: field.maximum,
-        step: field.integers ? 1 : 0.1,
-        color
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          TextField$1.Input,
+          {
+            ...rest,
+            ...fieldProps,
+            type: "number",
+            id: inputId,
+            placeholder: "Enter a number",
+            min: field.minimum,
+            max: field.maximum,
+            step: field.integers ? 1 : 0.1,
+            color
+          }
+        )
       }
-    ) }) });
+    ) });
   });
   NumberInput.displayName = "NumberInput";
   const emptyNumberField = {
@@ -8585,13 +8618,24 @@ var __publicField = (obj, key, value) => {
   });
   let NumberField = _NumberField;
   const DateInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
     const color = blocks.useSeverityColor(severity);
     const value = fieldProps.value ? fieldProps.value.split("T")[0] : "";
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: /* @__PURE__ */ jsxRuntime.jsx(TextField$1.Input, { ...rest, ...fieldProps, type: "date", id: inputId, color, value }) }) });
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
+      {
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: /* @__PURE__ */ jsxRuntime.jsx(TextField$1.Input, { ...rest, ...fieldProps, type: "date", id: inputId, color, value })
+      }
+    ) });
   });
   DateInput.displayName = "DateInput";
   const emptyDateField = {
@@ -8735,43 +8779,54 @@ var __publicField = (obj, key, value) => {
     TextFieldInputCopy
   };
   const StringInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps, field }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
     const color = blocks.useSeverityColor(severity);
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: !rest.disabled || !fieldProps.value ? /* @__PURE__ */ jsxRuntime.jsx(
-      TextField$1.Input,
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
       {
-        ...rest,
-        ...fieldProps,
-        type: field.inputType,
-        id: inputId,
-        placeholder: "Enter a short description",
-        color
-      }
-    ) : /* @__PURE__ */ jsxRuntime.jsxs(TextField$1.Root, { className: styles$5.clickableLinkContainer, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        "div",
-        {
-          className: classNames$1(
-            "rt-TextFieldInput rt-r-size-2 rt-variant-surface",
-            styles$5.TextFieldInputCopy
-          ),
-          children: /* @__PURE__ */ jsxRuntime.jsx(
-            Linkify,
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: !rest.disabled || !fieldProps.value ? /* @__PURE__ */ jsxRuntime.jsx(
+          TextField$1.Input,
+          {
+            ...rest,
+            ...fieldProps,
+            type: field.inputType,
+            id: inputId,
+            placeholder: "Enter a short description",
+            color
+          }
+        ) : /* @__PURE__ */ jsxRuntime.jsxs(TextField$1.Root, { className: styles$5.clickableLinkContainer, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "div",
             {
-              options: {
-                target: "_blank",
-                rel: "noopener"
-              },
-              children: fieldProps.value
+              className: classNames$1(
+                "rt-TextFieldInput rt-r-size-2 rt-variant-surface",
+                styles$5.TextFieldInputCopy
+              ),
+              children: /* @__PURE__ */ jsxRuntime.jsx(
+                Linkify,
+                {
+                  options: {
+                    target: "_blank",
+                    rel: "noopener"
+                  },
+                  children: fieldProps.value
+                }
+              )
             }
-          )
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rt-TextFieldChrome" })
-    ] }) }) });
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rt-TextFieldChrome" })
+        ] })
+      }
+    ) });
   });
   StringInput.displayName = "StringInput";
   const emptyStringField = {
@@ -8807,21 +8862,32 @@ var __publicField = (obj, key, value) => {
   __publicField(_StringField, "Icon", InputIcon);
   let StringField = _StringField;
   const TextInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: /* @__PURE__ */ jsxRuntime.jsx(
-      blocks.TextArea,
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
       {
-        ...rest,
-        ...fieldProps,
-        resize: "vertical",
-        id: inputId,
-        placeholder: "Enter a description",
-        severity
+        size,
+        severity,
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.TextArea,
+          {
+            ...rest,
+            ...fieldProps,
+            resize: "vertical",
+            id: inputId,
+            placeholder: "Enter a description",
+            severity
+          }
+        )
       }
-    ) }) });
+    ) });
   });
   TextInput.displayName = "TextInput";
   const emptyTextField = {
@@ -8853,7 +8919,7 @@ var __publicField = (obj, key, value) => {
   __publicField(_TextField, "Icon", RowsIcon);
   let TextField = _TextField;
   const SelectInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps, field }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     const { onChange, onBlur } = fieldProps;
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
@@ -8869,18 +8935,29 @@ var __publicField = (obj, key, value) => {
       },
       [onChange, onBlur]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: /* @__PURE__ */ jsxRuntime.jsx(
-      blocks.Select,
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
       {
-        items: options,
-        ...fieldProps,
-        onValueChange: handleChange,
-        placeholder: "Select one...",
-        id: inputId,
+        size,
         severity,
-        ...rest
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.Select,
+          {
+            items: options,
+            ...fieldProps,
+            onValueChange: handleChange,
+            placeholder: "Select one...",
+            id: inputId,
+            severity,
+            ...rest
+          }
+        )
       }
-    ) }) });
+    ) });
   });
   SelectInput.displayName = "SelectInput";
   const emptySection = (id = "", fields = []) => ({
@@ -9048,7 +9125,7 @@ var __publicField = (obj, key, value) => {
     return { reorderSection, reorderField };
   };
   const MultiStringInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
     label = showInputOnly ? "" : label;
@@ -9121,32 +9198,43 @@ var __publicField = (obj, key, value) => {
       [setValueAndTouched, value]
     );
     return /* @__PURE__ */ jsxRuntime.jsx(dnd.DragDropContext, { onDragEnd: handleDragEnd, children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { direction: "column", gap: "2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText: updatedHelpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: (!disabled || value.length === 0) && /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { gap: "2", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(Box, { grow: "1", children: /* @__PURE__ */ jsxRuntime.jsx(
-          TextField$1.Input,
-          {
-            placeholder: "Press enter to add a new option",
-            ...rest,
-            ...fieldProps,
-            value: intermediateValue,
-            onChange: handleChange,
-            onKeyDown: handleKeyDown,
-            id: inputId,
-            color: updatedColor,
-            onBlur: void 0
-          }
-        ) }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          blocks.IconButton,
-          {
-            type: "button",
-            "aria-label": "Add option",
-            disabled: !!internalError || disabled,
-            onClick: addOption,
-            children: /* @__PURE__ */ jsxRuntime.jsx(PlusIcon, {})
-          }
-        )
-      ] }) }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText: updatedHelpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+        InputWithLabel,
+        {
+          size,
+          severity,
+          inputId,
+          labelId,
+          label,
+          image: showInputOnly ? void 0 : field.image,
+          children: (!disabled || value.length === 0) && /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { gap: "2", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(Box, { grow: "1", children: /* @__PURE__ */ jsxRuntime.jsx(
+              TextField$1.Input,
+              {
+                placeholder: "Press enter to add a new option",
+                ...rest,
+                ...fieldProps,
+                value: intermediateValue,
+                onChange: handleChange,
+                onKeyDown: handleKeyDown,
+                id: inputId,
+                color: updatedColor,
+                onBlur: void 0
+              }
+            ) }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              blocks.IconButton,
+              {
+                type: "button",
+                "aria-label": "Add option",
+                disabled: !!internalError || disabled,
+                onClick: addOption,
+                children: /* @__PURE__ */ jsxRuntime.jsx(PlusIcon, {})
+              }
+            )
+          ] })
+        }
+      ) }),
       /* @__PURE__ */ jsxRuntime.jsx(dnd.Droppable, { droppableId, children: (droppableProvided) => /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { ...droppableProvided.droppableProps, ref: droppableProvided.innerRef, direction: "column", children: [
         value.map((option, index2) => /* @__PURE__ */ jsxRuntime.jsx(
           dnd.Draggable,
@@ -9328,7 +9416,7 @@ var __publicField = (obj, key, value) => {
     return [value];
   };
   const MultiSelectInput = React.memo((props) => {
-    const [{ inputId, labelId, size, severity, showInputOnly, fieldProps, field }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     const { onChange, onBlur } = fieldProps;
     let [{ helpText, label }] = useFormikInput(props);
     helpText = showInputOnly ? null : helpText;
@@ -9341,19 +9429,30 @@ var __publicField = (obj, key, value) => {
       },
       [onChange, onBlur]
     );
-    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(InputWithLabel, { size, severity, inputId, labelId, label, children: /* @__PURE__ */ jsxRuntime.jsx(
-      blocks.MultiSelect,
+    return /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText, severity, children: /* @__PURE__ */ jsxRuntime.jsx(
+      InputWithLabel,
       {
-        value,
-        onValueChange: handleChange,
-        options: field.options,
-        name: fieldProps.name,
-        placeholder: "Select one or more...",
-        id: inputId,
+        size,
         severity,
-        ...rest
+        inputId,
+        labelId,
+        label,
+        image: showInputOnly ? void 0 : field.image,
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          blocks.MultiSelect,
+          {
+            value,
+            onValueChange: handleChange,
+            options: field.options,
+            name: fieldProps.name,
+            placeholder: "Select one or more...",
+            id: inputId,
+            severity,
+            ...rest
+          }
+        )
       }
-    ) }) });
+    ) });
   });
   MultiSelectInput.displayName = "MultiSelectInput";
   const emptyMultiSelectField = {
@@ -9429,23 +9528,15 @@ var __publicField = (obj, key, value) => {
       super(options, FieldInputCloner);
     }
   }
-  const previewImage = "_previewImage_y4yd1_1";
-  const nameContainer = "_nameContainer_y4yd1_9";
-  const hasPreview = "_hasPreview_y4yd1_14";
-  const useEllipsis = "_useEllipsis_y4yd1_19";
-  const FullScreenImageContainer = "_FullScreenImageContainer_y4yd1_25";
-  const fileName = "_fileName_y4yd1_35";
-  const longIconButton = "_longIconButton_y4yd1_40";
-  const FullScreenImage = "_FullScreenImage_y4yd1_25";
+  const previewImage$1 = "_previewImage_ebhyt_1";
+  const nameContainer = "_nameContainer_ebhyt_9";
+  const hasPreview = "_hasPreview_ebhyt_14";
+  const useEllipsis = "_useEllipsis_ebhyt_19";
   const styles$4 = {
-    previewImage,
+    previewImage: previewImage$1,
     nameContainer,
     hasPreview,
-    useEllipsis,
-    FullScreenImageContainer,
-    fileName,
-    longIconButton,
-    FullScreenImage
+    useEllipsis
   };
   const convertBytesToLargestUnit = (bytes) => {
     const units = ["byte", "kilobyte", "megabyte"];
@@ -9465,7 +9556,7 @@ var __publicField = (obj, key, value) => {
   };
   const UploadInput = React.memo((props) => {
     var _a2;
-    const [{ inputId, labelId, size, severity, helpText, showInputOnly, fieldProps, field }, rest] = useFormikInput(props);
+    const [{ inputId, labelId, size, severity, helpText, showInputOnly, field, fieldProps }, rest] = useFormikInput(props);
     const { onChange } = fieldProps;
     let [{ label }] = useFormikInput(props);
     label = showInputOnly ? "" : label;
@@ -9499,28 +9590,39 @@ var __publicField = (obj, key, value) => {
     const singleButtonText = value ? "Select new file" : "Select a file";
     const buttonText = field.maxFiles > 1 ? multipleButtonText : singleButtonText;
     return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { direction: "column", gap: "2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText: updatedHelpText, severity, children: /* @__PURE__ */ jsxRuntime.jsxs(InputWithLabel, { size, severity, inputId, labelId, label, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "row", gap: "2", children: /* @__PURE__ */ jsxRuntime.jsx(Box, { width: "max-content", asChild: true, children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { ...rest, variant: "soft", onClick: handleClick, id: "upload-input-upload-button", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(UploadIcon, {}),
-          " ",
-          buttonText
-        ] }) }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "input",
-          {
-            ...rest,
-            type: "file",
-            ref: input,
-            id: inputId,
-            accept: (_a2 = field.extensions) == null ? void 0 : _a2.join(","),
-            multiple: field.maxFiles > 1,
-            color,
-            style: { display: "none" },
-            ...fieldProps,
-            value: ""
-          }
-        )
-      ] }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(InputWithLabelAndHelpText, { helpText: updatedHelpText, severity, children: /* @__PURE__ */ jsxRuntime.jsxs(
+        InputWithLabel,
+        {
+          size,
+          severity,
+          inputId,
+          labelId,
+          label,
+          image: showInputOnly ? void 0 : field.image,
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "row", gap: "2", children: /* @__PURE__ */ jsxRuntime.jsx(Box, { width: "max-content", asChild: true, children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { ...rest, variant: "soft", onClick: handleClick, id: "upload-input-upload-button", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(UploadIcon, {}),
+              " ",
+              buttonText
+            ] }) }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              "input",
+              {
+                ...rest,
+                type: "file",
+                ref: input,
+                id: inputId,
+                accept: (_a2 = field.extensions) == null ? void 0 : _a2.join(","),
+                multiple: field.maxFiles > 1,
+                color,
+                style: { display: "none" },
+                ...fieldProps,
+                value: ""
+              }
+            )
+          ]
+        }
+      ) }),
       Array.isArray(value) && value.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { direction: "column", gap: "2", children: value.map((file, index2) => /* @__PURE__ */ jsxRuntime.jsx(
         DisplayFile,
         {
@@ -9571,7 +9673,7 @@ var __publicField = (obj, key, value) => {
           throw new Error("Cannot download a file that is not resolved.");
         }
         const blob = new Blob([resolvedFile]);
-        fileSaver.saveAs(blob, name);
+        saveAs.saveAs(blob, name);
       },
       [name, resolvedFile]
     );
@@ -9626,51 +9728,13 @@ var __publicField = (obj, key, value) => {
             }
           }
         ),
-        showPreview && /* @__PURE__ */ jsxRuntime.jsxs(
-          "div",
+        showPreview && /* @__PURE__ */ jsxRuntime.jsx(
+          FullScreenImagePreview,
           {
-            className: styles$4.FullScreenImageContainer,
-            onClick: () => {
-              setShowPreview(false);
-            },
-            children: [
-              /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { align: "center", children: [
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  blocks.IconButton,
-                  {
-                    className: styles$4.longIconButton,
-                    variant: "soft",
-                    "aria-label": "Exit preview",
-                    onClick: () => {
-                      setShowPreview(false);
-                    },
-                    children: /* @__PURE__ */ jsxRuntime.jsx(ArrowLeftIcon, {})
-                  }
-                ),
-                /* @__PURE__ */ jsxRuntime.jsx(blocks.Text, { className: styles$4.fileName, children: name }),
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  blocks.IconButton,
-                  {
-                    className: styles$4.longIconButton,
-                    variant: "soft",
-                    "aria-label": `Download ${name}`,
-                    onClick: handleDownload,
-                    children: /* @__PURE__ */ jsxRuntime.jsx(DownloadIcon, {})
-                  }
-                )
-              ] }),
-              /* @__PURE__ */ jsxRuntime.jsx(
-                "img",
-                {
-                  className: styles$4.FullScreenImage,
-                  src: url,
-                  alt: name,
-                  onClick: (e) => {
-                    e.stopPropagation();
-                  }
-                }
-              )
-            ]
+            file: resolvedFile,
+            url,
+            name,
+            setShowPreview
           }
         )
       ] })
@@ -9684,7 +9748,6 @@ var __publicField = (obj, key, value) => {
     maximum_size: void 0,
     maximum_files: 1
   };
-  const largestSupportedSize = 50;
   const _UploadField = class _UploadField extends BaseField {
     constructor(options) {
       const { extensions, maximum_files, maximum_size, ...base } = options;
@@ -9722,11 +9785,11 @@ var __publicField = (obj, key, value) => {
           field: new NumberField({
             // TODO: Default value
             label: "What is the maximum size of each file?",
-            description: `Maximum file size in megabytes (between 1MB–${largestSupportedSize}MB).`,
+            description: `Maximum file size in megabytes (between 1MB–${maxFileSizeMB}MB).`,
             required: false,
             identifier: `${path}maximum_size`,
             minimum: 1,
-            maximum: largestSupportedSize,
+            maximum: maxFileSizeMB,
             integers: true
           }),
           showDirectly: false
@@ -9766,7 +9829,7 @@ var __publicField = (obj, key, value) => {
     }
     getFieldValidators() {
       const validators = super.getFieldValidators();
-      const maxFileSizeInMB = this.maxFileSize ?? largestSupportedSize;
+      const maxFileSizeInMB = this.maxFileSize ?? maxFileSizeMB;
       const maxFileSizeInB = maxFileSizeInMB * 1e3 * 1e3;
       const maxFiles = this.maxFiles || 1;
       validators.push((value) => {
@@ -9828,6 +9891,9 @@ var __publicField = (obj, key, value) => {
     "multi-string": emptyMultiStringField,
     "multi-select": emptyMultiSelectField
   };
+  const maxFileSizeMB = 50;
+  const maxFileSizeKB = maxFileSizeMB * 1e3;
+  const maxFileSizeB = maxFileSizeKB * 1e3;
   const deserializeField = (serializedField) => {
     const fieldType = serializedField.type;
     const fieldCls = FieldTypeToClsMapping[fieldType];
@@ -10093,6 +10159,29 @@ var __publicField = (obj, key, value) => {
       cloneDeep(values)
     );
   };
+  const useAttachImagesToFormRevisionFields = (revision) => {
+    const { sdk } = useSDK();
+    const revisionCopy = React.useMemo(
+      () => JSON.parse(JSON.stringify(revision)),
+      [revision]
+    );
+    React.useEffect(() => {
+      const attachments = selectRevisionAttachments(revisionCopy.offline_id)(sdk.store.getState()) ?? [];
+      for (const attachment of attachments) {
+        const filePromise = sdk.files.fetchFileFromUrl(attachment.file, attachment.file_sha1, attachment.file_name);
+        let sectionIndex = -1;
+        let fieldIndex = -1;
+        sectionIndex = revisionCopy.fields.findIndex((section) => {
+          fieldIndex = section.fields.findIndex((field) => field.identifier === attachment.field_identifier);
+          return fieldIndex !== -1;
+        });
+        if (sectionIndex !== -1 && fieldIndex !== -1) {
+          set(revisionCopy, `fields[${sectionIndex}].fields[${fieldIndex}].image`, filePromise);
+        }
+      }
+    }, [revisionCopy, sdk]);
+    return revisionCopy;
+  };
   const defaultHandleSubmit = () => {
     throw new Error("onSubmit must be provided if form is not readonly.");
   };
@@ -10161,9 +10250,10 @@ var __publicField = (obj, key, value) => {
           `Could not find revision ${submission.form_revision} for submission ${submission.offline_id}.`
         );
       }
+      const revisionWithImages = useAttachImagesToFormRevisionFields(revision);
       const schema = React.useMemo(() => {
-        return formRevisionToSchema(revision, { readonly: true });
-      }, [revision]);
+        return formRevisionToSchema(revisionWithImages, { readonly: true });
+      }, [revisionWithImages]);
       const submissionValuesWithAttachments = React.useMemo(() => {
         const attachments = selectSubmissionAttachments(submission.offline_id)(sdk.store.getState()) ?? [];
         const downloadedAttachments = {};
@@ -10450,9 +10540,9 @@ var __publicField = (obj, key, value) => {
   PatchField.displayName = "PatchField";
   const PatchFormProvider = React.memo(
     React.forwardRef((props, ref) => {
-      const { children, schema, values, onPatch, onError, ...rest } = props;
+      const { children, schema, values, onPatch, onError, requiresDiff = true, onDirtyChange, ...rest } = props;
       const initialValues2 = React.useMemo(() => initialFormValues(schema.fields, values), [schema.fields, values]);
-      const handlePatch = React.useCallback(
+      const getDiff = React.useCallback(
         (values2) => {
           const diff = {};
           for (const key in values2) {
@@ -10461,11 +10551,18 @@ var __publicField = (obj, key, value) => {
               diff[key] = value;
             }
           }
-          if (!hasKeys(diff))
+          return diff;
+        },
+        [initialValues2]
+      );
+      const handlePatch = React.useCallback(
+        (values2) => {
+          const diff = getDiff(values2);
+          if (requiresDiff && !hasKeys(diff))
             return;
           onPatch(diff);
         },
-        [initialValues2, onPatch]
+        [getDiff, onPatch, requiresDiff]
       );
       const validate = React.useCallback(
         (form) => {
@@ -10473,9 +10570,13 @@ var __publicField = (obj, key, value) => {
           if (error2) {
             onError(error2);
           }
+          if (onDirtyChange) {
+            const diff = getDiff(form);
+            onDirtyChange(hasKeys(diff));
+          }
           return error2;
         },
-        [schema, onError]
+        [schema, onDirtyChange, onError, getDiff]
       );
       const formik$1 = formik.useFormik({
         initialValues: initialValues2,
@@ -10485,13 +10586,21 @@ var __publicField = (obj, key, value) => {
         validateOnBlur: false,
         validateOnChange: false
       });
+      const handleChange = React.useCallback(() => {
+        if (onDirtyChange) {
+          const diff = getDiff(formik$1.values);
+          if (hasKeys(diff)) {
+            onDirtyChange(true);
+          }
+        }
+      }, [formik$1.values, getDiff, onDirtyChange]);
       const { errors, resetForm } = formik$1;
       React.useEffect(() => {
         if (hasKeys(errors)) {
           resetForm({ values: initialValues2, errors: {} });
         }
       }, [errors, initialValues2, resetForm]);
-      return /* @__PURE__ */ jsxRuntime.jsx(formik.FormikProvider, { value: formik$1, children: /* @__PURE__ */ jsxRuntime.jsx("form", { ...rest, ref, onSubmit: formik$1.handleSubmit, children }) });
+      return /* @__PURE__ */ jsxRuntime.jsx(formik.FormikProvider, { value: formik$1, children: /* @__PURE__ */ jsxRuntime.jsx("form", { ...rest, ref, onSubmit: formik$1.handleSubmit, onChange: handleChange, children }) });
     })
   );
   const typeBadge$1 = "_typeBadge_an5ff_1";
@@ -10505,8 +10614,12 @@ var __publicField = (obj, key, value) => {
     sm: mobile ? "none" : display
   });
   const FieldActions = React.memo((props) => {
-    const { index: index2, sectionIndex, remove: remove2, duplicate, move } = props;
+    const { index: index2, type, sectionIndex, remove: remove2, duplicate, move, upload } = props;
+    if (type !== "section" && !upload) {
+      throw new Error("Upload function prop must be defined for non-section fields.");
+    }
     const { values } = formik.useFormikContext();
+    const fileInputRef = React.useRef(null);
     const actions = React.useMemo(() => {
       const actions2 = [
         {
@@ -10517,11 +10630,24 @@ var __publicField = (obj, key, value) => {
         },
         {
           Icon: TrashIcon,
-          buttonProps: { onClick: remove2 },
           key: "delete",
-          text: "Delete"
+          text: "Delete",
+          buttonProps: { onClick: remove2 }
         }
       ];
+      if (type !== "section") {
+        actions2.unshift({
+          Icon: ImageIcon,
+          key: "upload",
+          text: "Upload image",
+          buttonProps: {
+            onClick: () => {
+              var _a2;
+              (_a2 = fileInputRef.current) == null ? void 0 : _a2.click();
+            }
+          }
+        });
+      }
       if (sectionIndex === void 0 && index2 !== values.fields.length - 1 || sectionIndex !== void 0 && (sectionIndex < values.fields.length - 1 || index2 !== values.fields[sectionIndex].fields.length - 1)) {
         actions2.unshift({
           Icon: ArrowDownIcon,
@@ -10547,7 +10673,7 @@ var __publicField = (obj, key, value) => {
         });
       }
       return actions2;
-    }, [duplicate, index2, move, remove2, sectionIndex, values.fields]);
+    }, [duplicate, index2, move, remove2, sectionIndex, type, values.fields]);
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(blocks.Flex, { display: forMobile(false, "flex"), direction: "column", gap: "5", mx: "2", children: actions.map((Action) => /* @__PURE__ */ jsxRuntime.jsx(
         blocks.IconButton,
@@ -10576,17 +10702,36 @@ var __publicField = (obj, key, value) => {
             };
           })
         }
-      ) })
+      ) }),
+      type !== "section" && /* @__PURE__ */ jsxRuntime.jsx("input", { style: { display: "none" }, ref: fileInputRef, type: "file", accept: "image/*", onChange: upload })
     ] });
   });
   FieldActions.displayName = "FieldActions";
-  const popoverInputsContainer = "_popoverInputsContainer_wqdmr_1";
-  const typeBadge = "_typeBadge_wqdmr_5";
-  const previewInput = "_previewInput_wqdmr_10";
-  const directInput = "_directInput_wqdmr_14";
-  const grow = "_grow_wqdmr_19";
+  const description = "_description_13g4a_1";
+  const floatingButtonContainer = "_floatingButtonContainer_13g4a_5";
+  const FullScreenImageContainer = "_FullScreenImageContainer_13g4a_12";
+  const fileName = "_fileName_13g4a_22";
+  const longIconButton = "_longIconButton_13g4a_27";
+  const previewImage = "_previewImage_13g4a_33";
+  const FullScreenImage = "_FullScreenImage_13g4a_12";
+  const popoverInputsContainer = "_popoverInputsContainer_13g4a_51";
+  const imageContainer = "_imageContainer_13g4a_55";
+  const deleteImageButton = "_deleteImageButton_13g4a_60";
+  const typeBadge = "_typeBadge_13g4a_71";
+  const previewInput = "_previewInput_13g4a_76";
+  const directInput = "_directInput_13g4a_80";
+  const grow = "_grow_13g4a_85";
   const styles = {
+    description,
+    floatingButtonContainer,
+    FullScreenImageContainer,
+    fileName,
+    longIconButton,
+    previewImage,
+    FullScreenImage,
     popoverInputsContainer,
+    imageContainer,
+    deleteImageButton,
     typeBadge,
     previewInput,
     directInput,
@@ -10622,6 +10767,9 @@ var __publicField = (obj, key, value) => {
       });
     }, [onSelect]);
   };
+  const isSection = (field) => {
+    return field.type === "section";
+  };
   const FieldSettingsPopover = React.memo((props) => {
     const { popoverInputs, hasError } = props;
     return /* @__PURE__ */ jsxRuntime.jsx(
@@ -10651,6 +10799,8 @@ var __publicField = (obj, key, value) => {
   const FieldBuilder = React.memo((props) => {
     var _a2, _b, _c, _d, _e, _f;
     const { parentPath, index: index2, initial, conditionalSourceFields } = props;
+    const { values, setFieldValue, errors } = formik.useFormikContext();
+    const fieldTypeItems = useFieldTypeItems();
     const RADIX_SM_MIN_WIDTH = 576;
     const [isLargeScreen, setIsLargeScreen] = React.useState(
       window.matchMedia(`(min-width: ${RADIX_SM_MIN_WIDTH}px)`).matches
@@ -10665,22 +10815,39 @@ var __publicField = (obj, key, value) => {
         mediaQuery.removeEventListener("change", handleMediaQueryChange);
       };
     }, []);
-    const { values, setFieldValue, errors } = formik.useFormikContext();
-    const fieldTypeItems = useFieldTypeItems();
-    const isSection = React.useCallback((field) => {
-      return field.type === "section";
-    }, []);
+    const [resolvedImage, setResolvedImage] = React.useState(void 0);
+    const [showImagePreview, setShowImagePreview] = React.useState(false);
+    React.useEffect(() => {
+      if (!isSection(initial)) {
+        if (initial.image instanceof Promise) {
+          initial.image.then(setResolvedImage).catch(console.error);
+        } else {
+          setResolvedImage(initial.image);
+        }
+      } else {
+        setResolvedImage(void 0);
+      }
+    }, [initial]);
+    const resolvedImageURL = resolvedImage ? URL.createObjectURL(resolvedImage) : void 0;
+    const handleImageDelete = React.useCallback(
+      (event) => {
+        event.stopPropagation();
+        const { image: _, ...fieldWithoutImage } = initial;
+        void setFieldValue(`${parentPath}.${index2}`, fieldWithoutImage).then();
+      },
+      [index2, initial, parentPath, setFieldValue]
+    );
     React.useEffect(() => {
       if (isSection(initial) && !initial.conditional) {
         void setFieldValue(`${parentPath}.${index2}.condition`, null).then();
       }
-    }, [index2, initial, isSection, parentPath, setFieldValue]);
+    }, [index2, initial, parentPath, setFieldValue]);
     const conditionLabel = React.useMemo(
       () => {
         var _a3, _b2;
         return isSection(initial) ? (_b2 = findFieldByIdentifier(values.fields, (_a3 = initial.condition) == null ? void 0 : _a3.identifier)) == null ? void 0 : _b2.label : void 0;
       },
-      [initial, isSection, values.fields]
+      [initial, values.fields]
     );
     const conditionComparison = isSection(initial) ? Array.isArray((_a2 = initial.condition) == null ? void 0 : _a2.value) ? "contains all of" : "equals" : void 0;
     let conditionValue = void 0;
@@ -10791,6 +10958,41 @@ var __publicField = (obj, key, value) => {
           /* @__PURE__ */ jsxRuntime.jsxs(blocks.Flex, { align: "center", gap: "3", children: [
             /* @__PURE__ */ jsxRuntime.jsx(blocks.Badge, { className: styles.typeBadge, children: (_f = fieldTypeItems.flat().find((item) => item.value === type)) == null ? void 0 : _f.content }),
             showPopoverInputs && /* @__PURE__ */ jsxRuntime.jsx(FieldSettingsPopover, { popoverInputs, hasError: popoverHasErrors })
+          ] }),
+          resolvedImage && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: styles.imageContainer, children: [
+              /* @__PURE__ */ jsxRuntime.jsx(
+                "img",
+                {
+                  className: styles.previewImage,
+                  src: resolvedImageURL,
+                  alt: resolvedImage.name,
+                  onClick: () => {
+                    setShowImagePreview(true);
+                  }
+                }
+              ),
+              /* @__PURE__ */ jsxRuntime.jsx(
+                blocks.IconButton,
+                {
+                  className: styles.deleteImageButton,
+                  variant: "solid",
+                  severity: "danger",
+                  "aria-label": "delete",
+                  onClick: handleImageDelete,
+                  children: /* @__PURE__ */ jsxRuntime.jsx(TrashIcon, {})
+                }
+              )
+            ] }),
+            showImagePreview && /* @__PURE__ */ jsxRuntime.jsx(
+              FullScreenImagePreview,
+              {
+                file: resolvedImage,
+                url: resolvedImageURL,
+                name: resolvedImage.name,
+                setShowPreview: setShowImagePreview
+              }
+            )
           ] })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -10847,6 +11049,7 @@ var __publicField = (obj, key, value) => {
     const { field, index: index2, sectionIndex, takenLabels, remove: remove2 } = props;
     const { setFieldValue, values } = formik.useFormikContext();
     const { reorderField } = useFieldReordering();
+    const { showError } = blocks.useToast();
     const parentPath = `fields.${sectionIndex}.fields`;
     const editFieldProps = React.useMemo(
       () => ({
@@ -10890,6 +11093,28 @@ var __publicField = (obj, key, value) => {
       },
       [sectionIndex, values.fields, index2, reorderField, setFieldValue]
     );
+    const uploadImage = React.useCallback(
+      (event) => {
+        const { files } = event.target;
+        if (!files || files.length !== 1)
+          return;
+        const file = files.item(0);
+        if (!file)
+          return;
+        if (file.size > maxFileSizeB) {
+          showError({
+            title: "File upload error",
+            description: `The file ${file.name} exceeded the maximum file size`
+          });
+          return;
+        }
+        void setFieldValue(`${parentPath}.${index2}`, {
+          ...field,
+          image: file
+        }).then();
+      },
+      [field, index2, parentPath, setFieldValue, showError]
+    );
     return /* @__PURE__ */ jsxRuntime.jsx(dnd.Draggable, { draggableId: field.identifier, index: index2, children: (draggableProvided) => /* @__PURE__ */ jsxRuntime.jsx(
       Card,
       {
@@ -10908,10 +11133,12 @@ var __publicField = (obj, key, value) => {
             FieldActions,
             {
               index: index2,
+              type: field.type,
               sectionIndex,
               remove: remove2,
               duplicate: duplicateField,
-              move: moveField
+              move: moveField,
+              upload: uploadImage
             }
           )
         ] })
@@ -10919,12 +11146,6 @@ var __publicField = (obj, key, value) => {
     ) });
   });
   FieldWithActions.displayName = "FieldWithActions";
-  const FieldTypeDropdown = React.memo((props) => {
-    const { setFieldType, children } = props;
-    const fieldTypeItems = useFieldTypeItems(setFieldType);
-    return /* @__PURE__ */ jsxRuntime.jsx(blocks.DropdownItemMenu, { trigger: children, items: fieldTypeItems.flat() });
-  });
-  FieldTypeDropdown.displayName = "FieldTypeDropdown";
   const FieldSectionWithActions = React.memo((props) => {
     var _a2;
     const { field, index: sectionIndex, dropState } = props;
@@ -11060,6 +11281,7 @@ var __publicField = (obj, key, value) => {
       },
       [sectionIndex, field.fields.length, values, setFieldValue]
     );
+    const fieldTypeItems = useFieldTypeItems(handleCreateField);
     return /* @__PURE__ */ jsxRuntime.jsx(dnd.Draggable, { draggableId: field.identifier, index: sectionIndex, children: (draggableProvided) => {
       return /* @__PURE__ */ jsxRuntime.jsx(
         Card,
@@ -11099,10 +11321,16 @@ var __publicField = (obj, key, value) => {
                           child.identifier
                         )),
                         droppableProvided.placeholder,
-                        /* @__PURE__ */ jsxRuntime.jsx(FieldTypeDropdown, { setFieldType: handleCreateField, children: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { type: "button", variant: "soft", children: [
-                          /* @__PURE__ */ jsxRuntime.jsx(PlusIcon, {}),
-                          " Add field"
-                        ] }) })
+                        /* @__PURE__ */ jsxRuntime.jsx(
+                          blocks.DropdownItemMenu,
+                          {
+                            trigger: /* @__PURE__ */ jsxRuntime.jsxs(blocks.Button, { type: "button", variant: "soft", children: [
+                              /* @__PURE__ */ jsxRuntime.jsx(PlusIcon, {}),
+                              " Add field"
+                            ] }),
+                            items: fieldTypeItems.flat()
+                          }
+                        )
                       ]
                     }
                   )
@@ -11113,6 +11341,7 @@ var __publicField = (obj, key, value) => {
               FieldActions,
               {
                 index: sectionIndex,
+                type: field.type,
                 remove: removeSection,
                 duplicate: duplicateSection,
                 move: moveSection
@@ -11491,9 +11720,6 @@ var __publicField = (obj, key, value) => {
   exports2.IssuePriority = IssuePriority;
   exports2.IssueService = IssueService;
   exports2.IssueStatus = IssueStatus;
-  exports2.LicenseLevel = LicenseLevel;
-  exports2.LicenseService = LicenseService;
-  exports2.LicenseStatus = LicenseStatus;
   exports2.MainService = MainService;
   exports2.MapStyle = MapStyle;
   exports2.MultiSelectField = MultiSelectField;
@@ -11541,7 +11767,6 @@ var __publicField = (obj, key, value) => {
   exports2.addEmailDomain = addEmailDomain;
   exports2.addFavouriteProjectId = addFavouriteProjectId;
   exports2.addIssue = addIssue;
-  exports2.addLicenses = addLicenses;
   exports2.addOrReplaceCategories = addOrReplaceCategories;
   exports2.addOrReplaceIssueComment = addOrReplaceIssueComment;
   exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
@@ -11554,6 +11779,7 @@ var __publicField = (obj, key, value) => {
   exports2.addToRecentIssues = addToRecentIssues;
   exports2.addUserForm = addUserForm;
   exports2.addUserFormRevision = addUserFormRevision;
+  exports2.addUserFormRevisionAttachment = addUserFormRevisionAttachment;
   exports2.addUserFormRevisions = addUserFormRevisions;
   exports2.addUserFormSubmission = addUserFormSubmission;
   exports2.addUserFormSubmissionAttachment = addUserFormSubmissionAttachment;
@@ -11640,8 +11866,6 @@ var __publicField = (obj, key, value) => {
   exports2.issueReducer = issueReducer;
   exports2.issueSlice = issueSlice;
   exports2.issueToSearchResult = issueToSearchResult;
-  exports2.licenseReducer = licenseReducer;
-  exports2.licenseSlice = licenseSlice;
   exports2.literalToCoordinates = literalToCoordinates;
   exports2.logOnlyOnce = logOnlyOnce;
   exports2.makeClient = makeClient;
@@ -11708,20 +11932,17 @@ var __publicField = (obj, key, value) => {
   exports2.searchIssues = searchIssues;
   exports2.selectAccessToken = selectAccessToken;
   exports2.selectActiveIssueId = selectActiveIssueId;
-  exports2.selectActiveLicense = selectActiveLicense;
   exports2.selectActiveOrganization = selectActiveOrganization;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
   exports2.selectActiveOrganizationId = selectActiveOrganizationId;
-  exports2.selectActiveOrganizationLicenses = selectActiveOrganizationLicenses;
-  exports2.selectActiveOrganizationProjects = selectActiveOrganizationProjects;
   exports2.selectActiveProject = selectActiveProject;
   exports2.selectActiveProjectAccess = selectActiveProjectAccess;
   exports2.selectActiveProjectFileId = selectActiveProjectFileId;
   exports2.selectActiveProjectId = selectActiveProjectId;
-  exports2.selectActiveStatusLicenses = selectActiveStatusLicenses;
   exports2.selectActiveWorkspace = selectActiveWorkspace;
   exports2.selectActiveWorkspaceId = selectActiveWorkspaceId;
   exports2.selectAllAttachments = selectAllAttachments;
+  exports2.selectAllRevisionAttachmentsByLatestRevisionId = selectAllRevisionAttachmentsByLatestRevisionId;
   exports2.selectAppearance = selectAppearance;
   exports2.selectCategories = selectCategories;
   exports2.selectCategoriesOfWorkspace = selectCategoriesOfWorkspace;
@@ -11763,7 +11984,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectHiddenComponentTypeIds = selectHiddenComponentTypeIds;
   exports2.selectIsFetchingInitialData = selectIsFetchingInitialData;
   exports2.selectIsImportingProjectFile = selectIsImportingProjectFile;
-  exports2.selectIsLoading = selectIsLoading;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
   exports2.selectIssue = selectIssue;
   exports2.selectIssueAttachmentMapping = selectIssueAttachmentMapping;
@@ -11773,10 +11993,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectLatestFormRevision = selectLatestFormRevision;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
   exports2.selectLatestRevisionByFormId = selectLatestRevisionByFormId;
-  exports2.selectLicencesMapping = selectLicencesMapping;
-  exports2.selectLicense = selectLicense;
-  exports2.selectLicenseForProject = selectLicenseForProject;
-  exports2.selectLicenses = selectLicenses;
   exports2.selectMainWorkspace = selectMainWorkspace;
   exports2.selectMapStyle = selectMapStyle;
   exports2.selectNumberOfComponentTypesMatchingCaseInsensitiveName = selectNumberOfComponentTypesMatchingCaseInsensitiveName;
@@ -11790,7 +12006,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectOrganizationUsersAsMapping = selectOrganizationUsersAsMapping;
   exports2.selectOrganizationUsersIds = selectOrganizationUsersIds;
   exports2.selectOrganizations = selectOrganizations;
-  exports2.selectOrganizationsMapping = selectOrganizationsMapping;
   exports2.selectOrganizationsWithAccess = selectOrganizationsWithAccess;
   exports2.selectPermittedWorkspaceIds = selectPermittedWorkspaceIds;
   exports2.selectPhotoAttachmentsOfIssue = selectPhotoAttachmentsOfIssue;
@@ -11808,10 +12023,10 @@ var __publicField = (obj, key, value) => {
   exports2.selectRecentIssuesAsSearchResults = selectRecentIssuesAsSearchResults;
   exports2.selectRecentProjects = selectRecentProjects;
   exports2.selectRehydrated = selectRehydrated;
+  exports2.selectRevisionAttachments = selectRevisionAttachments;
   exports2.selectRevisionsForForm = selectRevisionsForForm;
   exports2.selectShowTooltips = selectShowTooltips;
   exports2.selectSortedEmailDomains = selectSortedEmailDomains;
-  exports2.selectSortedOrganizationLicenses = selectSortedOrganizationLicenses;
   exports2.selectSortedOrganizationUsers = selectSortedOrganizationUsers;
   exports2.selectSortedProjectUsers = selectSortedProjectUsers;
   exports2.selectSortedProjects = selectSortedProjects;
@@ -11854,10 +12069,8 @@ var __publicField = (obj, key, value) => {
   exports2.setEnablePlacementMode = setEnablePlacementMode;
   exports2.setIsFetchingInitialData = setIsFetchingInitialData;
   exports2.setIsImportingProjectFile = setIsImportingProjectFile;
-  exports2.setIsLoading = setIsLoading;
   exports2.setIssueComments = setIssueComments;
   exports2.setIssues = setIssues;
-  exports2.setLicenses = setLicenses;
   exports2.setLoggedIn = setLoggedIn;
   exports2.setMapStyle = setMapStyle;
   exports2.setOrganizationAccesses = setOrganizationAccesses;
@@ -11872,6 +12085,7 @@ var __publicField = (obj, key, value) => {
   exports2.setTokens = setTokens;
   exports2.setTourStep = setTourStep;
   exports2.setUploadUrl = setUploadUrl;
+  exports2.setUserFormRevisionAttachments = setUserFormRevisionAttachments;
   exports2.setUserFormSubmissionAttachments = setUserFormSubmissionAttachments;
   exports2.setUserFormSubmissions = setUserFormSubmissions;
   exports2.setUsers = setUsers;
@@ -11892,12 +12106,9 @@ var __publicField = (obj, key, value) => {
   exports2.unhideAllCategories = unhideAllCategories;
   exports2.unhideCategory = unhideCategory;
   exports2.updateActiveOrganization = updateActiveOrganization;
-  exports2.updateActiveProjectFormSubmissionsCount = updateActiveProjectFormSubmissionsCount;
-  exports2.updateActiveProjectIssuesCount = updateActiveProjectIssuesCount;
   exports2.updateAttachment = updateAttachment;
   exports2.updateComponent = updateComponent;
   exports2.updateIssue = updateIssue;
-  exports2.updateLicense = updateLicense;
   exports2.updateOrCreateProject = updateOrCreateProject;
   exports2.updateOrganizationAccess = updateOrganizationAccess;
   exports2.updateProjectAccess = updateProjectAccess;