@overmap-ai/core 1.0.71-mapbox.5 → 1.0.71-mapbox.7

package/dist/overmap-core.js

@@ -1,25 +1,21 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a;
 import { DepGraph } from "dependency-graph";
 import { v4 } from "uuid";
 import { saveAs } from "file-saver";
 import ColorCls from "color";
-import { gray, gold, brown, yellow, amber, orange, red, crimson, pink, plum, purple, violet, iris, indigo, blue, cyan, jade, grass, lime, mint, sky } from "@radix-ui/colors";
+import { sky, mint, lime, grass, jade, cyan, blue, indigo, iris, violet, purple, plum, pink, crimson, red, orange, amber, yellow, brown, gold, gray } from "@radix-ui/colors";
+import { createSlice, createSelector, combineReducers, compose } from "@reduxjs/toolkit";
 import { offline as offline$1 } from "@redux-offline/redux-offline";
 import offlineConfig from "@redux-offline/redux-offline/lib/defaults";
 import localforage from "localforage";
 import createMigration from "redux-persist-migrate";
-import { createSlice, createSelector, combineReducers } from "@reduxjs/toolkit";
 import request from "superagent";
 import { RESET_STATE } from "@redux-offline/redux-offline/lib/constants";
 import jwtDecode from "jwt-decode";
 import { openDB } from "idb";
-import { unsafeShowToast } from "@overmap-ai/blocks";
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["GET"] = "GET";
   HttpMethod2["POST"] = "POST";
@@ -153,8 +149,7 @@ class OutboxCoordinator {
       return;
     }
     for (const node of this.graph.overallOrder()) {
-      if (node === request2.payload.uuid)
-        continue;
+      if (node === request2.payload.uuid) continue;
       const details = this.graph.getNodeData(node);
       if (request2.payload.blockers.some((blocker) => details.payload.blocks.includes(blocker))) {
         this._addDependency(request2.payload.uuid, node);
@@ -171,8 +166,7 @@ class OutboxCoordinator {
   insertRequest(request2) {
     this.graph.addNode(request2.payload.uuid, request2);
     for (const node of this.graph.overallOrder()) {
-      if (node === request2.payload.uuid)
-        continue;
+      if (node === request2.payload.uuid) continue;
       const details = this.graph.getNodeData(node);
       if (details.payload.blockers.some((blocker) => request2.payload.blocks.includes(blocker))) {
         this._addDependency(node, request2.payload.uuid);
@@ -208,8 +202,7 @@ class OutboxCoordinator {
    */
   peek() {
     const nextNode = this._getNextNode();
-    if (!nextNode)
-      return void 0;
+    if (!nextNode) return void 0;
     return this.graph.getNodeData(nextNode);
   }
   /**
@@ -281,17 +274,15 @@ function extractErrorMessage(errorRes, err) {
         ret = responseBody.error;
       } else if (typeof responseBody.message === "string") {
         ret = responseBody.message;
-      } else if (responseBody.body) {
+      } else {
         try {
-          ret = Object.entries(responseBody.body).map(([key, value]) => {
+          ret = Object.entries(responseBody).map(([key, value]) => {
             if (typeof value === "string") {
-              if (_SPECIAL_KEYS.includes(key))
-                return value;
+              if (_SPECIAL_KEYS.includes(key)) return value;
               return `${key}: ${value}`;
             }
             if (Array.isArray(value)) {
-              if (_SPECIAL_KEYS.includes(key))
-                return value.join("\n");
+              if (_SPECIAL_KEYS.includes(key)) return value.join("\n");
               return value.map((v) => `${key}: ${v}`).join("\n");
             }
             return `${key}: ${JSON.stringify(value)}`;
@@ -367,7 +358,7 @@ function hashFile(file) {
     reader.onload = () => {
       const fileResult = reader.result;
       if (!fileResult) {
-        reject();
+        reject(new Error("FileReader did not return a valid ArrayBuffer."));
         return;
       }
       void crypto.subtle.digest("SHA-1", fileResult).then((hash) => {
@@ -381,8 +372,7 @@ function hashFile(file) {
 function getFileIdentifier(file) {
   if (!file.name || !file.type || !file.size) {
     const message = "File has no name, type, and/or size";
-    console.error(`${message}`, file);
-    throw new Error(`${message}.`);
+    throw new Error(message);
   }
   return `${file.name}&${file.type}${file.size}`;
 }
@@ -502,21 +492,19 @@ const OUTBOX_RETRY_DELAY = 6e4;
 const EMPTY_ARRAY = Object.freeze([]);
 const EMPTY_OBJECT = Object.freeze({});
 let debug = false;
-const REACT_APP_DEBUG_MEMOIZATION = {}.REACT_APP_DEBUG_MEMOIZATION || "";
+const REACT_APP_DEBUG_MEMOIZATION = "";
 if (["true", "1"].includes(REACT_APP_DEBUG_MEMOIZATION.toLowerCase())) {
   debug = true;
 }
 function shallowEqual(objA, objB) {
-  if (objA === objB)
-    return true;
+  if (objA === objB) return true;
   if (typeof objA !== typeof objB) {
     return false;
   }
   const keysA = Object.keys(objA);
   const keysB = Object.keys(objB);
   const keysALength = keysA.length;
-  if (keysALength !== keysB.length)
-    return false;
+  if (keysALength !== keysB.length) return false;
   for (let i = 0; i < keysALength; i++) {
     const key = keysA[i];
     if (!Object.prototype.hasOwnProperty.call(objB, key) || objA[key] !== objB[key]) {
@@ -543,11 +531,9 @@ function memoize(func) {
   };
 }
 function areArraysEqual(first, second) {
-  if (first.length !== second.length)
-    return false;
+  if (first.length !== second.length) return false;
   for (let i = 0; i < first.length; i++) {
-    if (first[i] !== second[i])
-      return false;
+    if (first[i] !== second[i]) return false;
   }
   return true;
 }
@@ -595,13 +581,11 @@ const generateBadgeColors = (rawColor) => {
   return { backgroundColor, textColor };
 };
 const getLocalDateString = memoize((date) => {
-  if (!date)
-    return "";
+  if (!date) return "";
   const asDate = new Date(date);
   const isThisYear = asDate.getFullYear() === today.getFullYear();
   const options = { day: "numeric", month: "short" };
-  if (!isThisYear)
-    options.year = "numeric";
+  if (!isThisYear) options.year = "numeric";
   return asDate.toLocaleDateString([], options);
 });
 const relative = new Intl.RelativeTimeFormat([], { style: "long", numeric: "auto" });
@@ -612,10 +596,10 @@ const isToday = (date) => {
 };
 const getLocalRelativeDateString = memoize((date, min, max) => {
   const days = Math.round((new Date(date).getTime() - today.getTime()) / msInDay);
-  if (days < min || days > max)
-    return getLocalDateString(date);
+  if (days < min || days > max) return getLocalDateString(date);
   return relative.format(days, "days");
 });
+_a = Symbol.toStringTag;
 class DeferredPromise {
   constructor() {
     __publicField(this, _a, "Promise");
@@ -640,14 +624,12 @@ class DeferredPromise {
     return this._promise.catch(onRejected);
   }
   resolve(value) {
-    if (!this._resolve)
-      throw new Error("No resolve callback");
+    if (!this._resolve) throw new Error("No resolve callback");
     this._resolve(value);
     this._state = "fulfilled";
   }
   reject(reason) {
-    if (!this._reject)
-      throw reason;
+    if (!this._reject) throw reason;
     this._reject(reason);
     this._state = "rejected";
   }
@@ -655,35 +637,6 @@ class DeferredPromise {
     throw new Error("`finally` not implemented");
   }
 }
-_a = Symbol.toStringTag;
-var randomString = function randomString2() {
-  return Math.random().toString(36).substring(7).split("").join(".");
-};
-({
-  INIT: "@@redux/INIT" + randomString(),
-  REPLACE: "@@redux/REPLACE" + randomString(),
-  PROBE_UNKNOWN_ACTION: function PROBE_UNKNOWN_ACTION() {
-    return "@@redux/PROBE_UNKNOWN_ACTION" + randomString();
-  }
-});
-function compose() {
-  for (var _len = arguments.length, funcs = new Array(_len), _key = 0; _key < _len; _key++) {
-    funcs[_key] = arguments[_key];
-  }
-  if (funcs.length === 0) {
-    return function(arg) {
-      return arg;
-    };
-  }
-  if (funcs.length === 1) {
-    return funcs[0];
-  }
-  return funcs.reduce(function(a, b) {
-    return function() {
-      return a(b.apply(void 0, arguments));
-    };
-  });
-}
 const VERSION_REDUCER_KEY$1 = "versioning";
 const latestVersion = () => migrations.length - 1;
 const initialVersioning = (state) => {
@@ -704,21 +657,20 @@ const wrapMigration = (migrator) => (state) => {
   if (state === void 0) {
     state = {};
   }
-  if (((_a2 = state[VERSION_REDUCER_KEY$1]) == null ? void 0 : _a2.version) === latestVersion())
-    return state;
+  if (((_a2 = state[VERSION_REDUCER_KEY$1]) == null ? void 0 : _a2.version) === latestVersion()) return state;
   return migrator(state);
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$B = {
+const initialState$J = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$B,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$B)),
+  initialState: initialState$J,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$J)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -806,11 +758,11 @@ function createModelAdapter(computeModelId) {
   };
 }
 const categoryAdapter = createModelAdapter((category) => category.offline_id);
-const initialState$A = categoryAdapter.getInitialState({});
+const initialState$I = categoryAdapter.getInitialState({});
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$A,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$A)),
+  initialState: initialState$I,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$I)),
   reducers: {
     initializeCategories: categoryAdapter.initialize,
     addCategory: categoryAdapter.addOne,
@@ -848,11 +800,11 @@ const selectIssueCountOfCategory = (categoryId) => (state) => {
 };
 const categoryReducer = categorySlice.reducer;
 const assetAdapter = createModelAdapter((asset) => asset.offline_id);
-const initialState$z = assetAdapter.getInitialState({});
+const initialState$H = assetAdapter.getInitialState({});
 const assetSlice = createSlice({
   name: "assets",
-  initialState: initialState$z,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$z)),
+  initialState: initialState$H,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$H)),
   reducers: {
     initializeAssets: assetAdapter.initialize,
     addAsset: assetAdapter.addOne,
@@ -893,8 +845,7 @@ const selectAssetsByIds = restructureCreateSelectorWithArgs(
     const assets = [];
     for (const assetId of assetIds) {
       const asset = assetsMapping[assetId];
-      if (asset)
-        assets.push(asset);
+      if (asset) assets.push(asset);
     }
     return fallbackToEmptyArray(assets);
   })
@@ -904,11 +855,11 @@ const selectNumberOfAssetsOfAssetType = (assetTypeId) => (state) => {
 };
 const assetReducer = assetSlice.reducer;
 const assetAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$y = assetAttachmentAdapter.getInitialState({});
+const initialState$G = assetAttachmentAdapter.getInitialState({});
 const assetAttachmentSlice = createSlice({
   name: "assetAttachments",
-  initialState: initialState$y,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$y)),
+  initialState: initialState$G,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$G)),
   reducers: {
     initializeAssetAttachments: assetAttachmentAdapter.initialize,
     addAssetAttachment: assetAttachmentAdapter.addOne,
@@ -953,17 +904,13 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
     [selectAssetAttachments, (_state, assetId) => assetId],
     (attachments, assetId) => {
       const attachmentsOfAsset = attachments.filter(({ asset }) => assetId === asset);
-      const fileAttachments = fallbackToEmptyArray(
-        attachmentsOfAsset.filter(
-          // this null check here is necessary, there are cases where file_type is null or undefined
-          ({ file_type }) => !file_type || !file_type.startsWith("image/")
-        )
+      const fileAttachments = attachmentsOfAsset.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => !file_type.startsWith("image/")
       );
-      const imageAttachments = fallbackToEmptyArray(
-        attachmentsOfAsset.filter(
-          // this null check here is necessary, there are cases where file_type is null or undefined
-          ({ file_type }) => file_type && file_type.startsWith("image/")
-        )
+      const imageAttachments = attachmentsOfAsset.filter(
+        // this null check here is necessary, there are cases where file_type is null or undefined
+        ({ file_type }) => file_type.startsWith("image/")
       );
       return { fileAttachments, imageAttachments };
     }
@@ -973,11 +920,11 @@ const assetAttachmentReducer = assetAttachmentSlice.reducer;
 const assetStageCompletionAdapter = createModelAdapter(
   (stageCompletion) => stageCompletion.offline_id
 );
-const initialState$x = assetStageCompletionAdapter.getInitialState({});
+const initialState$F = assetStageCompletionAdapter.getInitialState({});
 const assetStageCompletionSlice = createSlice({
   name: "assetStageCompletions",
-  initialState: initialState$x,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$x)),
+  initialState: initialState$F,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$F)),
   reducers: {
     initializeAssetStageCompletions: assetStageCompletionAdapter.initialize,
     addAssetStageCompletion: assetStageCompletionAdapter.addOne,
@@ -1006,8 +953,7 @@ const selectCompletedStagesByAsset = createSelector(
     const completedStagesByAsset = {};
     for (const stageCompletion of Object.values(completedStagesMapping)) {
       const { asset, stage, submitted_at } = stageCompletion;
-      if (!completedStagesByAsset[asset])
-        completedStagesByAsset[asset] = {};
+      if (!completedStagesByAsset[asset]) completedStagesByAsset[asset] = {};
       completedStagesByAsset[asset][stage] = submitted_at;
     }
     return fallbackToEmptyObject(completedStagesByAsset);
@@ -1031,11 +977,11 @@ const selectAssetStageCompletionsByIds = restructureCreateSelectorWithArgs(
 );
 const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
 const assetStageAdapter = createModelAdapter((assetStage) => assetStage.offline_id);
-const initialState$w = assetStageAdapter.getInitialState({});
+const initialState$E = assetStageAdapter.getInitialState({});
 const assetStageSlice = createSlice({
   name: "assetStages",
-  initialState: initialState$w,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$w)),
+  initialState: initialState$E,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$E)),
   reducers: {
     initializeAssetStages: assetStageAdapter.initialize,
     setAssetStage: assetStageAdapter.setOne,
@@ -1099,27 +1045,12 @@ const selectAssetStagesByIds = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(assetStages);
   })
 );
-const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
-  createSelector([selectStageMapping, (_state, stageIds) => stageIds], (stageMapping, stageIds) => {
-    const ret = {};
-    for (const stageId of stageIds) {
-      const stage = stageMapping[stageId];
-      if (!stage) {
-        throw new Error("No stage exists with the id " + stageId);
-      }
-      if (stage.form) {
-        ret[stageId] = stage.form;
-      }
-    }
-    return ret;
-  })
-);
 const assetTypeAdapter = createModelAdapter((assetType) => assetType.offline_id);
-const initialState$v = assetTypeAdapter.getInitialState({});
+const initialState$D = assetTypeAdapter.getInitialState({});
 const assetTypeSlice = createSlice({
   name: "assetTypes",
-  initialState: initialState$v,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$v)),
+  initialState: initialState$D,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$D)),
   reducers: {
     initializeAssetTypes: assetTypeAdapter.initialize,
     setAssetType: assetTypeAdapter.setOne,
@@ -1172,11 +1103,11 @@ const assetTypeReducer = assetTypeSlice.reducer;
 const assetTypeAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$u = assetTypeAttachmentAdapter.getInitialState({});
+const initialState$C = assetTypeAttachmentAdapter.getInitialState({});
 const assetTypeAttachmentSlice = createSlice({
   name: "assetTypeAttachments",
-  initialState: initialState$u,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$u)),
+  initialState: initialState$C,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$C)),
   reducers: {
     initializeAssetTypeAttachments: assetTypeAttachmentAdapter.initialize,
     addAssetTypeAttachment: assetTypeAttachmentAdapter.addOne,
@@ -1223,11 +1154,11 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
       const attachmentsOfAssetType = attachments.filter(({ asset_type }) => asset_type === assetTypeId);
       const fileAttachments = attachmentsOfAssetType.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+        ({ file_type }) => !file_type.startsWith("image/")
       );
       const imageAttachments = attachmentsOfAssetType.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => file_type && file_type.startsWith("image/")
+        ({ file_type }) => file_type.startsWith("image/")
       );
       return { fileAttachments, imageAttachments };
     }
@@ -1235,12 +1166,12 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
 );
 const assetTypeAttachmentReducer = assetTypeAttachmentSlice.reducer;
 const issueAdapter = createModelAdapter((issue) => issue.offline_id);
-const initialState$t = issueAdapter.getInitialState({});
+const initialState$B = issueAdapter.getInitialState({});
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$t,
+  initialState: initialState$B,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$t);
+    Object.assign(state, initialState$B);
   }),
   reducers: {
     initializeIssues: issueAdapter.initialize,
@@ -1272,12 +1203,12 @@ const selectIssuesByIds = restructureCreateSelectorWithArgs(
 );
 const issueReducer = issueSlice.reducer;
 const issueTypeAdapter = createModelAdapter((issueType) => issueType.offline_id);
-const initialState$s = issueTypeAdapter.getInitialState({});
+const initialState$A = issueTypeAdapter.getInitialState({});
 const issueTypeSlice = createSlice({
   name: "issueTypes",
-  initialState: initialState$s,
+  initialState: initialState$A,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$s);
+    Object.assign(state, initialState$A);
   }),
   reducers: {
     initializeIssueTypes: issueTypeAdapter.initialize,
@@ -1334,15 +1265,15 @@ const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
   return selectIssuesOfIssueType(issueTypeId)(state).length;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$r = {
+const initialState$z = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$r,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
+  initialState: initialState$z,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$z)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -1364,19 +1295,18 @@ const selectUploadUrl = (sha1) => (state) => {
   }
   const today2 = (/* @__PURE__ */ new Date()).getTime();
   const expiringWithinAnHour = (url.exp ?? today2) - today2 < msPerHour;
-  if (expiringWithinAnHour)
-    return void 0;
+  if (expiringWithinAnHour) return void 0;
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$q = {
+const initialState$y = {
   users: {},
   currentUser: null
 };
 const userSlice = createSlice({
   name: "users",
-  initialState: initialState$q,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
+  initialState: initialState$y,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$y)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -1394,8 +1324,7 @@ const userSlice = createSlice({
       state.currentUser = action.payload;
     },
     setProfilePicture: (state, action) => {
-      if (!state.currentUser)
-        return;
+      if (!state.currentUser) return;
       state.currentUser.profile.file = action.payload.file ?? null;
       state.currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
       const currentUser = state.users[state.currentUser.id];
@@ -1434,11 +1363,11 @@ const selectUsersByIds = restructureCreateSelectorWithArgs(
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
-const initialState$p = organizationAccessAdapter.getInitialState({});
+const initialState$x = organizationAccessAdapter.getInitialState({});
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$p,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
+  initialState: initialState$x,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$x)),
   reducers: {
     initializeOrganizationAccesses: organizationAccessAdapter.initialize,
     updateOrganizationAccess: organizationAccessAdapter.updateOne,
@@ -1475,11 +1404,11 @@ const selectOrganizationAccessUserMapping = (state) => {
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
 const licenseAdapter = createModelAdapter((license) => license.offline_id);
-const initialState$o = licenseAdapter.getInitialState({});
+const initialState$w = licenseAdapter.getInitialState({});
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$o,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
+  initialState: initialState$w,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$w)),
   reducers: {
     initializeLicences: licenseAdapter.initialize,
     addLicenses: licenseAdapter.addMany,
@@ -1506,11 +1435,11 @@ const selectLicensesForProjectsMapping = createSelector(
 );
 const licenseReducer = licenseSlice.reducer;
 const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
-const initialState$n = projectAccessAdapter.getInitialState({});
+const initialState$v = projectAccessAdapter.getInitialState({});
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$v,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$v)),
   reducers: {
     initializeProjectAccesses: projectAccessAdapter.initialize,
     updateProjectAccess: projectAccessAdapter.updateOne,
@@ -1544,13 +1473,13 @@ const selectProjectAccessUserMapping = (state) => {
   return fallbackToEmptyObject(projectAccesses);
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$m = {
+const initialState$u = {
   projects: {}
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$m,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+  initialState: initialState$u,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$u)),
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -1611,13 +1540,13 @@ const selectSortedProjectUsers = createSelector(
     );
   }
 );
-const initialState$l = {
+const initialState$t = {
   organizations: {}
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$t,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$t)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -1712,14 +1641,14 @@ const createOfflineAction = (request2, baseUrl, serviceName) => {
     }
   };
 };
-const initialState$k = {
+const initialState$s = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$s,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$s)),
   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
@@ -1739,8 +1668,7 @@ const outboxSlice = createSlice({
     },
     markAsDeleted(state, action) {
       const index = state.deletedRequests.indexOf(action.payload);
-      if (index !== -1)
-        state.deletedRequests.splice(index, 1);
+      if (index !== -1) state.deletedRequests.splice(index, 1);
     },
     _setLatestRetryTime: (state, action) => {
       state.latestRetryTime = action.payload;
@@ -1752,14 +1680,14 @@ const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
 const projectFileModelAdapter = createModelAdapter((projectFile) => projectFile.offline_id);
-const initialState$j = projectFileModelAdapter.getInitialState({
+const initialState$r = projectFileModelAdapter.getInitialState({
   activeProjectFileId: null,
   isImportingProjectFile: false
 });
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$r,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
   reducers: {
     initializeProjectFiles: projectFileModelAdapter.initialize,
     setProjectFile: projectFileModelAdapter.setOne,
@@ -1824,11 +1752,11 @@ const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProj
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
 const projectFileReducer = projectFileSlice.reducer;
 const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$i = projectAttachmentAdapter.getInitialState({});
+const initialState$q = projectAttachmentAdapter.getInitialState({});
 const projectAttachmentSlice = createSlice({
   name: "projectAttachments",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$q,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
   reducers: {
     initializeProjectAttachments: projectAttachmentAdapter.initialize,
     addProjectAttachment: projectAttachmentAdapter.addOne,
@@ -1872,23 +1800,23 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
       const attachmentsOfProject = attachments.filter(({ project }) => projectId === project);
       const fileAttachments = attachmentsOfProject.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+        ({ file_type }) => !file_type.startsWith("image/")
       );
       const imageAttachments = attachmentsOfProject.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => file_type && file_type.startsWith("image/")
+        ({ file_type }) => file_type.startsWith("image/")
       );
       return { fileAttachments, imageAttachments };
     }
   )
 );
 const projectAttachmentReducer = projectAttachmentSlice.reducer;
-const initialState$h = {
+const initialState$p = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$h,
+  initialState: initialState$p,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -1913,11 +1841,11 @@ const formRevisionSortFn = (formRevisionA, formRevisionB) => {
   }
 };
 const formRevisionAdapter = createModelAdapter((revision) => revision.offline_id);
-const initialState$g = formRevisionAdapter.getInitialState({});
+const initialState$o = formRevisionAdapter.getInitialState({});
 const formRevisionsSlice = createSlice({
   name: "formRevisions",
-  initialState: initialState$g,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     initializeFormRevisions: formRevisionAdapter.initialize,
     setFormRevision: formRevisionAdapter.setOne,
@@ -1960,8 +1888,7 @@ const selectLatestFormRevisionOfForm = restructureCreateSelectorWithArgs(
     [selectFormRevisionMapping, (_state, formId) => formId],
     (revisions, formId) => {
       const revisionsOfForm = Object.values(revisions).filter((revision) => revision.form === formId);
-      if (revisionsOfForm.length === 0)
-        return void 0;
+      if (revisionsOfForm.length === 0) return void 0;
       const sortedRevisions = revisionsOfForm.sort(formRevisionSortFn);
       const latestRevision = sortedRevisions[revisionsOfForm.length - 1];
       return revisions[latestRevision.offline_id];
@@ -1976,24 +1903,13 @@ const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping], (revisions) => {
-  const latestRevisions = {};
-  for (const revision of Object.values(revisions)) {
-    const formId = revision.form;
-    const currentLatestRevision = latestRevisions[formId];
-    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
-      latestRevisions[formId] = revision;
-    }
-  }
-  return latestRevisions;
-});
 const formRevisionReducer = formRevisionsSlice.reducer;
 const formAdapter = createModelAdapter((form) => form.offline_id);
-const initialState$f = formAdapter.getInitialState({});
+const initialState$n = formAdapter.getInitialState({});
 const formSlice = createSlice({
   name: "forms",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     initializeForms: formAdapter.initialize,
     setForm: formAdapter.setOne,
@@ -2011,6 +1927,9 @@ const selectFormMapping = (state) => {
 const selectForms = createSelector([selectFormMapping], (formsMapping) => {
   return Object.values(formsMapping);
 });
+const selectFormById = (formId) => (state) => {
+  return state.formReducer.instances[formId];
+};
 const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
@@ -2033,40 +1952,15 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       return [...regularMatches.slice(0, maxResults)];
     },
     // as the argument is an object, we check the first level of properties for equality
-    { memoizeOptions: { equalityCheck: shallowEqual } }
-  )
-);
-const selectFormById = (formId) => (state) => {
-  return state.formReducer.instances[formId];
-};
-const selectFormOfAssetType = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectFormMapping, (_state, assetTypeId) => assetTypeId],
-    (formsMapping, assetTypeId) => {
-      return Object.values(formsMapping).find((form) => form.asset_type === assetTypeId);
-    }
+    { memoizeOptions: { resultEqualityCheck: shallowEqual } }
   )
 );
-const selectFormOfIssueType = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectFormMapping, (_state, issueTypeId) => issueTypeId],
-    (formsMapping, issueTypeId) => {
-      return Object.values(formsMapping).find((form) => form.issue_type === issueTypeId);
-    }
-  )
-);
-const selectFormsCount = createSelector([selectFormMapping], (formsMapping) => {
-  return Object.keys(formsMapping).length;
-});
-const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping) => {
-  return Object.values(formsMapping).filter((form) => !form.asset_type).length;
-});
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
-const initialState$e = submissionAdapter.getInitialState({});
+const initialState$m = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
   name: "formSubmissions",
-  initialState: initialState$e,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     initializeFormSubmissions: submissionAdapter.initialize,
     setFormSubmission: submissionAdapter.setOne,
@@ -2112,8 +2006,7 @@ const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
     (submissionsMapping, revisionMapping, formId) => {
       const revisionIds = /* @__PURE__ */ new Set();
       for (const revision of Object.values(revisionMapping)) {
-        if (revision.form !== formId)
-          continue;
+        if (revision.form !== formId) continue;
         revisionIds.add(revision.offline_id);
       }
       return Object.values(submissionsMapping).filter(
@@ -2122,43 +2015,6 @@ const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectFormSubmissionsByFormRevisions = createSelector([selectFormRevisionMapping, selectFormSubmissions], (revisions, submissions) => {
-  var _a2;
-  const submissionMapping = {};
-  for (const revisionId in revisions) {
-    submissionMapping[revisionId] = [];
-  }
-  for (const submission of submissions) {
-    (_a2 = submissionMapping[submission.form_revision]) == null ? void 0 : _a2.push(submission);
-  }
-  return submissionMapping;
-});
-const selectSortedFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      selectFormRevisionMapping,
-      selectFormSubmissionsByFormRevisions,
-      (_state, formId) => formId
-    ],
-    (revisionsMapping, submissionsByRevision, formId) => {
-      const submissionsByFormRevisions = {};
-      for (const revisionId in revisionsMapping) {
-        const revision = revisionsMapping[revisionId];
-        const submissionsOfRevision = submissionsByRevision[revisionId];
-        if (revision && submissionsOfRevision && revision.form === formId) {
-          submissionsByFormRevisions[revisionId] = submissionsOfRevision.sort(
-            (a, b) => a.submitted_at < b.submitted_at ? -1 : 1
-          );
-        }
-      }
-      return Object.entries(submissionsByFormRevisions).sort((a, b) => {
-        const aRevision = revisionsMapping[a[0]];
-        const bRevision = revisionsMapping[b[0]];
-        return formRevisionSortFn(aRevision, bRevision);
-      }).map(([_revisionId, submissions]) => submissions).flat();
-    }
-  )
-);
 const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormSubmissions, (_state, issueId) => issueId],
@@ -2169,54 +2025,6 @@ const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectAttachedFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      (state) => state.issueReducer.instances,
-      (state) => state.formReducer.instances,
-      (state) => state.formRevisionReducer.instances,
-      (state) => state.formSubmissionReducer.instances,
-      (_state, issueId) => issueId
-    ],
-    (issues, forms, formRevisions, submissions, issueId) => {
-      const issue = issues[issueId];
-      if (!issue)
-        return [];
-      if (!issue.issue_type) {
-        return Object.values(submissions).filter((submission) => submission.issue === issueId);
-      }
-      const issueTypeForms = new Set(
-        Object.keys(forms).filter((formId) => forms[formId].issue_type === issue.issue_type)
-      );
-      const issueTypeFormRevisions = new Set(
-        Object.keys(formRevisions).filter(
-          (formRevisionId) => issueTypeForms.has(formRevisions[formRevisionId].form)
-        )
-      );
-      return Object.values(submissions).filter(
-        (submission) => submission.issue === issueId && !issueTypeFormRevisions.has(submission.form_revision)
-      );
-    }
-  )
-);
-const selectFormSubmissionsByIssues = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectFormSubmissions, (_state, issueIds) => issueIds],
-    (submissions, issueIds) => {
-      var _a2;
-      const issueSubmissions = {};
-      for (const issueId of issueIds) {
-        issueSubmissions[issueId] = [];
-      }
-      for (const submission of submissions) {
-        if (submission.issue && issueIds.includes(submission.issue)) {
-          (_a2 = issueSubmissions[submission.issue]) == null ? void 0 : _a2.push(submission);
-        }
-      }
-      return issueSubmissions;
-    }
-  )
-);
 const selectFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormSubmissions, (_state, assetId) => assetId],
@@ -2227,62 +2035,15 @@ const selectFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectAttachedFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      (state) => state.assetReducer.instances,
-      (state) => state.formReducer.instances,
-      (state) => state.formRevisionReducer.instances,
-      (state) => state.formSubmissionReducer.instances,
-      (_state, assetId) => assetId
-    ],
-    (assets, forms, formRevisions, submissions, assetId) => {
-      const asset = assets[assetId];
-      if (!asset)
-        return [];
-      if (!asset.asset_type) {
-        return Object.values(submissions).filter((submission) => submission.asset === assetId);
-      }
-      const issueTypeForms = new Set(
-        Object.keys(forms).filter((formId) => forms[formId].asset_type === asset.asset_type)
-      );
-      const issueTypeFormRevisions = new Set(
-        Object.keys(formRevisions).filter(
-          (formRevisionId) => issueTypeForms.has(formRevisions[formRevisionId].form)
-        )
-      );
-      return Object.values(submissions).filter(
-        (submission) => submission.asset === assetId && !issueTypeFormRevisions.has(submission.form_revision)
-      );
-    }
-  )
-);
-const selectFormSubmissionsByAssets = createSelector(
-  [selectFormSubmissionsMapping, selectAssetsMapping],
-  (submissions, assets) => {
-    var _a2;
-    const assetSubmissionMapping = {};
-    for (const assetId in assets) {
-      assetSubmissionMapping[assetId] = [];
-    }
-    for (const submissionId in submissions) {
-      const submission = submissions[submissionId];
-      if (submission.asset) {
-        (_a2 = assetSubmissionMapping[submission.asset]) == null ? void 0 : _a2.push(submission);
-      }
-    }
-    return assetSubmissionMapping;
-  }
-);
 const formSubmissionReducer = formSubmissionSlice.reducer;
 const formSubmissionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$d = formSubmissionAttachmentAdapter.getInitialState({});
+const initialState$l = formSubmissionAttachmentAdapter.getInitialState({});
 const formSubmissionAttachmentSlice = createSlice({
   name: "formSubmissionAttachments",
-  initialState: initialState$d,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     initializeFormSubmissionAttachments: formSubmissionAttachmentAdapter.initialize,
     addFormSubmissionAttachment: formSubmissionAttachmentAdapter.addOne,
@@ -2325,7 +2086,9 @@ const selectAttachmentsOfFormSubmission = restructureCreateSelectorWithArgs(
     [selectFormSubmissionAttachmentsMapping, (_state, submissionId) => submissionId],
     (attachmentsMapping, submissionId) => {
       return fallbackToEmptyArray(
-        Object.values(attachmentsMapping).filter((attachment) => attachment.submission === submissionId)
+        Object.values(attachmentsMapping).filter(
+          (attachment) => attachment.form_submission === submissionId
+        )
       );
     }
   )
@@ -2334,11 +2097,11 @@ const formSubmissionAttachmentReducer = formSubmissionAttachmentSlice.reducer;
 const formRevisionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$c = formRevisionAttachmentAdapter.getInitialState({});
+const initialState$k = formRevisionAttachmentAdapter.getInitialState({});
 const formRevisionAttachmentSlice = createSlice({
   name: "formRevisionAttachments",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     initializeFormRevisionAttachments: formRevisionAttachmentAdapter.initialize,
     addFormRevisionAttachment: formRevisionAttachmentAdapter.addOne,
@@ -2370,17 +2133,17 @@ const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
     [selectFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
     (attachments, revisionId) => {
       return fallbackToEmptyArray(
-        Object.values(attachments).filter((attachment) => attachment.revision === revisionId)
+        Object.values(attachments).filter((attachment) => attachment.form_revision === revisionId)
       );
     }
   )
 );
 const formRevisionAttachmentReducer = formRevisionAttachmentSlice.reducer;
 const workspaceAdapter = createModelAdapter((workspace) => workspace.offline_id);
-const initialState$b = workspaceAdapter.getInitialState({});
+const initialState$j = workspaceAdapter.getInitialState({});
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$b,
+  initialState: initialState$j,
   reducers: {
     initializeWorkspaces: workspaceAdapter.initialize,
     setWorkspaces: workspaceAdapter.setMany,
@@ -2411,10 +2174,10 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const emailDomainAdapter = createModelAdapter((emailDomain) => emailDomain.offline_id);
-const initialState$a = emailDomainAdapter.getInitialState({});
+const initialState$i = emailDomainAdapter.getInitialState({});
 const emailDomainsSlice = createSlice({
   name: "emailDomains",
-  initialState: initialState$a,
+  initialState: initialState$i,
   reducers: {
     initializeEmailDomains: emailDomainAdapter.initialize,
     addEmailDomain: emailDomainAdapter.addOne,
@@ -2435,14 +2198,14 @@ const selectEmailDomainsOfOrganization = restructureCreateSelectorWithArgs(
   )
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
-const initialState$9 = {
+const initialState$h = {
   documents: {}
 };
 const documentSlice = createSlice({
   name: "documents",
-  initialState: initialState$9,
+  initialState: initialState$h,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$9);
+    Object.assign(state, initialState$h);
   }),
   reducers: {
     setDocuments: (state, action) => {
@@ -2615,8 +2378,7 @@ const selectAncestorIdsOfDocument = restructureCreateSelectorWithArgs(
   createSelector([selectDocumentsMapping, (_state, documentId) => documentId], (mapping, documentId) => {
     const listOfAncestors = [];
     const document2 = mapping[documentId];
-    if (!document2 || !document2.parent_document)
-      return listOfAncestors;
+    if (!document2 || !document2.parent_document) return listOfAncestors;
     let currentAncestor = mapping[document2.parent_document];
     while (currentAncestor) {
       listOfAncestors.push(currentAncestor.offline_id);
@@ -2631,11 +2393,11 @@ const selectRootDocuments = createSelector(
 );
 const documentsReducer = documentSlice.reducer;
 const documentAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$8 = documentAttachmentAdapter.getInitialState({});
+const initialState$g = documentAttachmentAdapter.getInitialState({});
 const documentAttachmentSlice = createSlice({
   name: "documentAttachments",
-  initialState: initialState$8,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     initializeDocumentAttachments: documentAttachmentAdapter.initialize,
     addDocumentAttachment: documentAttachmentAdapter.addOne,
@@ -2682,11 +2444,11 @@ const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
       const attachmentsOfProject = attachments.filter(({ document: document2 }) => documentId === document2);
       const fileAttachments = attachmentsOfProject.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+        ({ file_type }) => !file_type.startsWith("image/")
       );
       const imageAttachments = attachmentsOfProject.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => file_type && file_type.startsWith("image/")
+        ({ file_type }) => file_type.startsWith("image/")
       );
       return { fileAttachments, imageAttachments };
     }
@@ -2694,11 +2456,11 @@ const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
 );
 const documentAttachmentReducer = documentAttachmentSlice.reducer;
 const teamAdapter = createModelAdapter((team) => team.offline_id);
-const initialState$7 = teamAdapter.getInitialState({});
+const initialState$f = teamAdapter.getInitialState({});
 const teamSlice = createSlice({
   name: "teams",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     setTeam: teamAdapter.setOne,
     initializeTeams: teamAdapter.initialize,
@@ -2749,11 +2511,11 @@ const teamReducer = teamSlice.reducer;
 const agentUserConversationAdapter = createModelAdapter(
   (conversation) => conversation.offline_id
 );
-const initialState$6 = agentUserConversationAdapter.getInitialState({});
+const initialState$e = agentUserConversationAdapter.getInitialState({});
 const agentsSlice = createSlice({
   name: "agents",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     initializeConversations: agentUserConversationAdapter.initialize,
     addConversation: agentUserConversationAdapter.addOne,
@@ -2775,11 +2537,11 @@ const selectConversation = restructureCreateSelectorWithArgs(
 );
 const agentsReducer = agentsSlice.reducer;
 const issueCommentAdapter = createModelAdapter((comment) => comment.offline_id);
-const initialState$5 = issueCommentAdapter.getInitialState({});
+const initialState$d = issueCommentAdapter.getInitialState({});
 const issueCommentSlice = createSlice({
   name: "issueComments",
-  initialState: initialState$5,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     addIssueComment: issueCommentAdapter.addOne,
     addIssueComments: issueCommentAdapter.addMany,
@@ -2808,11 +2570,11 @@ const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueCommentReducer = issueCommentSlice.reducer;
 const issueUpdateAdapter = createModelAdapter((issueUpdate) => issueUpdate.offline_id);
-const initialState$4 = issueUpdateAdapter.getInitialState({});
+const initialState$c = issueUpdateAdapter.getInitialState({});
 const issueUpdateSlice = createSlice({
   name: "issueUpdates",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     initializeIssueUpdates: issueUpdateAdapter.setMany,
     setIssueUpdate: issueUpdateAdapter.setOne,
@@ -2841,11 +2603,11 @@ const selectIssueUpdatesOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueUpdateReducer = issueUpdateSlice.reducer;
 const issueAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$3 = issueAttachmentAdapter.getInitialState({});
+const initialState$b = issueAttachmentAdapter.getInitialState({});
 const issueAttachmentSlice = createSlice({
   name: "issueAttachments",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  initialState: initialState$b,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
   reducers: {
     initializeIssueAttachments: issueAttachmentAdapter.initialize,
     addIssueAttachment: issueAttachmentAdapter.addOne,
@@ -2892,34 +2654,34 @@ const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
       const attachmentsOfIssue = attachments.filter(({ issue }) => issue === issueId);
       const fileAttachments = attachmentsOfIssue.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => !file_type || !file_type.startsWith("image/")
+        ({ file_type }) => !file_type.startsWith("image/")
       );
       const imageAttachments = attachmentsOfIssue.filter(
         // this null check here is necessary, there are cases where file_type is null or undefined
-        ({ file_type }) => file_type && file_type.startsWith("image/")
+        ({ file_type }) => file_type.startsWith("image/")
       );
       return { fileAttachments, imageAttachments };
     }
   )
 );
 const issueAttachmentReducer = issueAttachmentSlice.reducer;
-const initialState$2 = {
+const initialState$a = {
   version: 0
 };
 const versioningSlice = createSlice({
   name: "versioning",
-  initialState: initialState$2,
+  initialState: initialState$a,
   reducers: {}
 });
 const versioningReducer = versioningSlice.reducer;
 const geoImageAdapter = createModelAdapter((model) => model.offline_id);
-const initialState$1 = geoImageAdapter.getInitialState({});
+const initialState$9 = geoImageAdapter.getInitialState({});
 const geoImageSlice = createSlice({
   name: "geoImages",
-  initialState: initialState$1,
+  initialState: initialState$9,
   extraReducers: (builder) => {
     builder.addCase("RESET", (state) => {
-      Object.assign(state, initialState$1);
+      Object.assign(state, initialState$9);
     });
   },
   reducers: {
@@ -2959,11 +2721,11 @@ const selectGeoImagesOfProject = restructureCreateSelectorWithArgs(
 );
 const geoImageReducer = geoImageSlice.reducer;
 const issueAssociationAdapter = createModelAdapter((assoc) => assoc.offline_id);
-const initialState = issueAssociationAdapter.getInitialState({});
+const initialState$8 = issueAssociationAdapter.getInitialState({});
 const issueAssociationSlice = createSlice({
   name: "issueAssociations",
-  initialState,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState)),
+  initialState: initialState$8,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
     initializeIssueAssociations: issueAssociationAdapter.initialize,
     addIssueAssociation: issueAssociationAdapter.addOne,
@@ -3021,35 +2783,458 @@ const selectIssueAssociationsOfAsset = restructureCreateSelectorWithArgs(
   )
 );
 const issueAssociationReducer = issueAssociationSlice.reducer;
-let clientStore;
-function setClientStore(store) {
-  clientStore = store;
-}
-function getClientStore() {
-  return clientStore;
-}
-let clientSDK;
-function setClientSDK(sdkCtor) {
-  clientSDK = sdkCtor;
-}
-function getClientSDK() {
-  return clientSDK;
-}
-const CLASS_NAME_TO_SERVICE = {};
-class BaseService {
-  constructor(sdk) {
-    __publicField(this, "client");
-    CLASS_NAME_TO_SERVICE[this.constructor.name] = this;
-    this.client = sdk;
-  }
-  async enqueueRequest(requestDetails) {
-    return this.client.enqueueRequest(requestDetails, this.host, this.constructor.name);
-  }
-  dispatch(action) {
-    this.client.store.dispatch(action);
+const issueTypeFieldValuesAdapter = createModelAdapter(
+  (fieldValues) => fieldValues.offline_id
+);
+const initialState$7 = issueTypeFieldValuesAdapter.getInitialState({});
+const issueTypeFieldValuesSlice = createSlice({
+  name: "issueTypeFieldValues",
+  initialState: initialState$7,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  reducers: {
+    initializeIssueTypeFieldValues: issueTypeFieldValuesAdapter.initialize,
+    addIssueTypeFieldValues: issueTypeFieldValuesAdapter.addOne,
+    addIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.addMany,
+    setIssueTypeFieldValues: issueTypeFieldValuesAdapter.setOne,
+    setIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.setMany,
+    updateIssueTypeFieldValues: issueTypeFieldValuesAdapter.updateOne,
+    updateIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.updateMany,
+    deleteIssueTypeFieldValues: issueTypeFieldValuesAdapter.deleteOne,
+    deleteIssueTypeFieldValuesMany: issueTypeFieldValuesAdapter.deleteMany
   }
-}
-const VERSION_REDUCER_KEY = "versioning";
+});
+const {
+  initializeIssueTypeFieldValues,
+  addIssueTypeFieldValues,
+  addIssueTypeFieldValuesMany,
+  setIssueTypeFieldValues,
+  setIssueTypeFieldValuesMany,
+  updateIssueTypeFieldValues,
+  updateIssueTypeFieldValuesMany,
+  deleteIssueTypeFieldValues,
+  deleteIssueTypeFieldValuesMany
+} = issueTypeFieldValuesSlice.actions;
+const selectIssueTypeFieldValuesMapping = (state) => state.issueTypeFieldValuesReducer.instances;
+const selectIssueTypeFieldValues = createSelector([selectIssueTypeFieldValuesMapping], (fieldValuesMapping) => {
+  return Object.values(fieldValuesMapping);
+});
+const selectIssueTypeFieldValuesOfIssue = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueTypeFieldValues, (_state, issueId) => issueId], (fieldValues, issueId) => {
+    return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.issue === issueId));
+  })
+);
+const selectIssueTypeFieldValuesById = (fieldValuesId) => (state) => {
+  return state.issueTypeFieldValuesReducer.instances[fieldValuesId];
+};
+const issueTypeFieldValuesReducer = issueTypeFieldValuesSlice.reducer;
+const issueTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
+const initialState$6 = issueTypeFieldsAdapter.getInitialState({});
+const issueTypeFieldsSlice = createSlice({
+  name: "issueTypeFields",
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  reducers: {
+    initializeIssueTypeFields: issueTypeFieldsAdapter.initialize,
+    addIssueTypeFields: issueTypeFieldsAdapter.addOne,
+    addIssueTypeFieldsMany: issueTypeFieldsAdapter.addMany,
+    setIssueTypeFields: issueTypeFieldsAdapter.setOne,
+    setIssueTypeFieldsMany: issueTypeFieldsAdapter.setMany,
+    updateIssueTypeFields: issueTypeFieldsAdapter.updateOne,
+    updateIssueTypeFieldsMany: issueTypeFieldsAdapter.updateMany,
+    deleteIssueTypeFields: issueTypeFieldsAdapter.deleteOne,
+    deleteIssueTypeFieldsMany: issueTypeFieldsAdapter.deleteMany
+  }
+});
+const {
+  initializeIssueTypeFields,
+  addIssueTypeFields,
+  addIssueTypeFieldsMany,
+  setIssueTypeFields,
+  setIssueTypeFieldsMany,
+  updateIssueTypeFields,
+  updateIssueTypeFieldsMany,
+  deleteIssueTypeFields,
+  deleteIssueTypeFieldsMany
+} = issueTypeFieldsSlice.actions;
+const selectIssueTypeFieldsMapping = (state) => state.issueTypeFieldsReducer.instances;
+const selectIssueTypeFields = createSelector([selectIssueTypeFieldsMapping], (fieldsMapping) => {
+  return Object.values(fieldsMapping);
+});
+const selectIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueTypeFields, (_state, issueTypeId) => issueTypeId], (fields, issueTypeId) => {
+    return fallbackToEmptyArray(fields.filter((field) => field.issue_type === issueTypeId));
+  })
+);
+const selectLatestIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueTypeFields, (_state, id) => id], (fields, id) => {
+    return fields.filter((field) => field.issue_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+  })
+);
+const selectIssueTypeValuesOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFields, selectIssueTypeFieldValues, (_state, id) => id],
+    (fields, fieldValues, id) => {
+      const fieldsIds = new Set(
+        fields.filter((field) => field.issue_type === id).map((field) => field.offline_id)
+      );
+      return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
+    }
+  )
+);
+const selectIssueTypeFieldsById = (fieldsId) => (state) => {
+  return state.issueTypeFieldsReducer.instances[fieldsId];
+};
+const issueTypeFieldsReducer = issueTypeFieldsSlice.reducer;
+const issueTypeFieldsAttachmentAdapter = createModelAdapter(
+  (attachment) => attachment.offline_id
+);
+const initialState$5 = issueTypeFieldsAttachmentAdapter.getInitialState({});
+const issueTypeFieldsAttachmentSlice = createSlice({
+  name: "issueTypeFieldsAttachments",
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
+  reducers: {
+    initializeIssueTypeFieldsAttachments: issueTypeFieldsAttachmentAdapter.initialize,
+    addIssueTypeFieldsAttachment: issueTypeFieldsAttachmentAdapter.addOne,
+    addIssueTypeFieldsAttachments: issueTypeFieldsAttachmentAdapter.addMany,
+    setIssueTypeFieldsAttachment: issueTypeFieldsAttachmentAdapter.setOne,
+    setIssueTypeFieldsAttachments: issueTypeFieldsAttachmentAdapter.setMany,
+    updateIssueTypeFieldsAttachment: issueTypeFieldsAttachmentAdapter.updateOne,
+    updateIssueTypeFieldsAttachments: issueTypeFieldsAttachmentAdapter.updateMany,
+    deleteIssueTypeFieldsAttachment: issueTypeFieldsAttachmentAdapter.deleteOne,
+    deleteIssueTypeFieldsAttachments: issueTypeFieldsAttachmentAdapter.deleteMany
+  }
+});
+const {
+  initializeIssueTypeFieldsAttachments,
+  addIssueTypeFieldsAttachment,
+  addIssueTypeFieldsAttachments,
+  setIssueTypeFieldsAttachment,
+  setIssueTypeFieldsAttachments,
+  updateIssueTypeFieldsAttachment,
+  updateIssueTypeFieldsAttachments,
+  deleteIssueTypeFieldsAttachment,
+  deleteIssueTypeFieldsAttachments
+} = issueTypeFieldsAttachmentSlice.actions;
+const selectIssueTypeFieldsAttachmentsMapping = (state) => state.issueTypeFieldsAttachmentReducer.instances;
+const selectIssueTypeFieldsAttachments = createSelector(
+  [selectIssueTypeFieldsAttachmentsMapping],
+  (attachmentsMapping) => {
+    return Object.values(attachmentsMapping);
+  }
+);
+const selectAttachmentsOfIssueTypeFields = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFieldsAttachments, (_state, fieldsRevision) => fieldsRevision],
+    (attachments, fieldsRevision) => {
+      return fallbackToEmptyArray(
+        attachments.filter((attachment) => attachment.fields_revision === fieldsRevision)
+      );
+    }
+  )
+);
+const selectIssueTypeFieldsAttachmentById = (attachmentId) => (state) => {
+  return state.issueTypeFieldsAttachmentReducer.instances[attachmentId];
+};
+const issueTypeFieldsAttachmentReducer = issueTypeFieldsAttachmentSlice.reducer;
+const issueTypeFieldValuesAttachmentAdapter = createModelAdapter(
+  (attachment) => attachment.offline_id
+);
+const initialState$4 = issueTypeFieldValuesAttachmentAdapter.getInitialState({});
+const issueTypeFieldValuesAttachmentSlice = createSlice({
+  name: "issueTypeFieldValuesAttachments",
+  initialState: initialState$4,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  reducers: {
+    initializeIssueTypeFieldValuesAttachments: issueTypeFieldValuesAttachmentAdapter.initialize,
+    addIssueTypeFieldValuesAttachment: issueTypeFieldValuesAttachmentAdapter.addOne,
+    addIssueTypeFieldValuesAttachments: issueTypeFieldValuesAttachmentAdapter.addMany,
+    setIssueTypeFieldValuesAttachment: issueTypeFieldValuesAttachmentAdapter.setOne,
+    setIssueTypeFieldValuesAttachments: issueTypeFieldValuesAttachmentAdapter.setMany,
+    updateIssueTypeFieldValuesAttachment: issueTypeFieldValuesAttachmentAdapter.updateOne,
+    updateIssueTypeFieldValuesAttachments: issueTypeFieldValuesAttachmentAdapter.updateMany,
+    deleteIssueTypeFieldValuesAttachment: issueTypeFieldValuesAttachmentAdapter.deleteOne,
+    deleteIssueTypeFieldValuesAttachments: issueTypeFieldValuesAttachmentAdapter.deleteMany
+  }
+});
+const {
+  initializeIssueTypeFieldValuesAttachments,
+  addIssueTypeFieldValuesAttachment,
+  addIssueTypeFieldValuesAttachments,
+  setIssueTypeFieldValuesAttachment,
+  setIssueTypeFieldValuesAttachments,
+  updateIssueTypeFieldValuesAttachment,
+  updateIssueTypeFieldValuesAttachments,
+  deleteIssueTypeFieldValuesAttachment,
+  deleteIssueTypeFieldValuesAttachments
+} = issueTypeFieldValuesAttachmentSlice.actions;
+const selectIssueTypeFieldValuesAttachmentsMapping = (state) => state.issueTypeFieldValuesAttachmentReducer.instances;
+const selectIssueTypeFieldValuesAttachments = createSelector(
+  [selectIssueTypeFieldValuesAttachmentsMapping],
+  (attachmentsMapping) => {
+    return Object.values(attachmentsMapping);
+  }
+);
+const selectIssueTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
+  return state.issueTypeFieldValuesAttachmentReducer.instances[attachmentId];
+};
+const selectIssueTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFieldValuesAttachmentsMapping, (_, attachmentIds) => attachmentIds],
+    (mapping, attachmentIds) => {
+      const attachmentIdsSet = new Set(attachmentIds);
+      return fallbackToEmptyArray(
+        Object.values(mapping).filter((attachment) => attachmentIdsSet.has(attachment.offline_id))
+      );
+    }
+  )
+);
+const selectAttachmentsOfIssueTypeFieldValues = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFieldValuesAttachments, (_state, fieldValuesId) => fieldValuesId],
+    (attachments, fieldValuesId) => {
+      return fallbackToEmptyArray(attachments.filter((attachment) => attachment.field_values === fieldValuesId));
+    }
+  )
+);
+const issueTypeFieldValuesAttachmentReducer = issueTypeFieldValuesAttachmentSlice.reducer;
+const assetTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
+const initialState$3 = assetTypeFieldsAdapter.getInitialState({});
+const assetTypeFieldsSlice = createSlice({
+  name: "assetTypeFields",
+  initialState: initialState$3,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  reducers: {
+    initializeAssetTypeFields: assetTypeFieldsAdapter.initialize,
+    addAssetTypeFields: assetTypeFieldsAdapter.addOne,
+    addAssetTypeFieldsMany: assetTypeFieldsAdapter.addMany,
+    setAssetTypeFields: assetTypeFieldsAdapter.setOne,
+    setAssetTypeFieldsMany: assetTypeFieldsAdapter.setMany,
+    updateAssetTypeFields: assetTypeFieldsAdapter.updateOne,
+    updateAssetTypeFieldsMany: assetTypeFieldsAdapter.updateMany,
+    deleteAssetTypeFields: assetTypeFieldsAdapter.deleteOne,
+    deleteAssetTypeFieldsMany: assetTypeFieldsAdapter.deleteMany
+  }
+});
+const {
+  initializeAssetTypeFields,
+  addAssetTypeFields,
+  addAssetTypeFieldsMany,
+  setAssetTypeFields,
+  setAssetTypeFieldsMany,
+  updateAssetTypeFields,
+  updateAssetTypeFieldsMany,
+  deleteAssetTypeFields,
+  deleteAssetTypeFieldsMany
+} = assetTypeFieldsSlice.actions;
+const selectAssetTypeFieldsMapping = (state) => state.assetTypeFieldsReducer.instances;
+const selectAssetTypeFields = createSelector([selectAssetTypeFieldsMapping], (fieldsMapping) => {
+  return Object.values(fieldsMapping);
+});
+const selectAssetTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFields, (_state, assetTypeId) => assetTypeId], (fields, assetTypeId) => {
+    return fallbackToEmptyArray(fields.filter((field) => field.asset_type === assetTypeId));
+  })
+);
+const selectLatestAssetTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFields, (_state, id) => id], (fields, id) => {
+    return fields.filter((field) => field.asset_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+  })
+);
+const selectAssetTypeFieldsById = (fieldsId) => (state) => {
+  return state.assetTypeFieldsReducer.instances[fieldsId];
+};
+const assetTypeFieldsReducer = assetTypeFieldsSlice.reducer;
+const assetTypeFieldValuesAdapter = createModelAdapter(
+  (fieldValues) => fieldValues.offline_id
+);
+const initialState$2 = assetTypeFieldValuesAdapter.getInitialState({});
+const assetTypeFieldValuesSlice = createSlice({
+  name: "assetTypeFieldValues",
+  initialState: initialState$2,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$2)),
+  reducers: {
+    initializeAssetTypeFieldValues: assetTypeFieldValuesAdapter.initialize,
+    addAssetTypeFieldValues: assetTypeFieldValuesAdapter.addOne,
+    addAssetTypeFieldValuesMany: assetTypeFieldValuesAdapter.addMany,
+    setAssetTypeFieldValues: assetTypeFieldValuesAdapter.setOne,
+    setAssetTypeFieldValuesMany: assetTypeFieldValuesAdapter.setMany,
+    updateAssetTypeFieldValues: assetTypeFieldValuesAdapter.updateOne,
+    updateAssetTypeFieldValuesMany: assetTypeFieldValuesAdapter.updateMany,
+    deleteAssetTypeFieldValues: assetTypeFieldValuesAdapter.deleteOne,
+    deleteAssetTypeFieldValuesMany: assetTypeFieldValuesAdapter.deleteMany
+  }
+});
+const {
+  initializeAssetTypeFieldValues,
+  addAssetTypeFieldValues,
+  addAssetTypeFieldValuesMany,
+  setAssetTypeFieldValues,
+  setAssetTypeFieldValuesMany,
+  updateAssetTypeFieldValues,
+  updateAssetTypeFieldValuesMany,
+  deleteAssetTypeFieldValues,
+  deleteAssetTypeFieldValuesMany
+} = assetTypeFieldValuesSlice.actions;
+const selectAssetTypeFieldValuesMapping = (state) => state.assetTypeFieldValuesReducer.instances;
+const selectAssetTypeFieldValues = createSelector([selectAssetTypeFieldValuesMapping], (fieldValuesMapping) => {
+  return Object.values(fieldValuesMapping);
+});
+const selectAssetTypeFieldValuesOfAsset = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFieldValues, (_state, assetId) => assetId], (fieldValues, assetId) => {
+    return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.asset === assetId));
+  })
+);
+const selectAssetTypeValuesOfAssetType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAssetTypeFields, selectAssetTypeFieldValues, (_state, id) => id],
+    (fields, fieldValues, id) => {
+      const fieldsIds = new Set(
+        fields.filter((field) => field.asset_type === id).map((field) => field.offline_id)
+      );
+      return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
+    }
+  )
+);
+const selectAssetTypeFieldValuesById = (fieldValuesId) => (state) => {
+  return state.assetTypeFieldValuesReducer.instances[fieldValuesId];
+};
+const assetTypeFieldValuesReducer = assetTypeFieldValuesSlice.reducer;
+const assetTypeFieldsAttachmentAdapter = createModelAdapter(
+  (attachment) => attachment.offline_id
+);
+const initialState$1 = assetTypeFieldsAttachmentAdapter.getInitialState({});
+const assetTypeFieldsAttachmentSlice = createSlice({
+  name: "assetTypeFieldsAttachments",
+  initialState: initialState$1,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$1)),
+  reducers: {
+    initializeAssetTypeFieldsAttachments: assetTypeFieldsAttachmentAdapter.initialize,
+    addAssetTypeFieldsAttachment: assetTypeFieldsAttachmentAdapter.addOne,
+    addAssetTypeFieldsAttachments: assetTypeFieldsAttachmentAdapter.addMany,
+    setAssetTypeFieldsAttachment: assetTypeFieldsAttachmentAdapter.setOne,
+    setAssetTypeFieldsAttachments: assetTypeFieldsAttachmentAdapter.setMany,
+    updateAssetTypeFieldsAttachment: assetTypeFieldsAttachmentAdapter.updateOne,
+    updateAssetTypeFieldsAttachments: assetTypeFieldsAttachmentAdapter.updateMany,
+    deleteAssetTypeFieldsAttachment: assetTypeFieldsAttachmentAdapter.deleteOne,
+    deleteAssetTypeFieldsAttachments: assetTypeFieldsAttachmentAdapter.deleteMany
+  }
+});
+const {
+  initializeAssetTypeFieldsAttachments,
+  addAssetTypeFieldsAttachment,
+  addAssetTypeFieldsAttachments,
+  setAssetTypeFieldsAttachment,
+  setAssetTypeFieldsAttachments,
+  updateAssetTypeFieldsAttachment,
+  updateAssetTypeFieldsAttachments,
+  deleteAssetTypeFieldsAttachment,
+  deleteAssetTypeFieldsAttachments
+} = assetTypeFieldsAttachmentSlice.actions;
+const selectAssetTypeFieldsAttachmentsMapping = (state) => state.assetTypeFieldsAttachmentReducer.instances;
+const selectAssetTypeFieldsAttachments = createSelector(
+  [selectAssetTypeFieldsAttachmentsMapping],
+  (attachmentsMapping) => {
+    return Object.values(attachmentsMapping);
+  }
+);
+const selectAttachmentsOfAssetTypeFields = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFieldsAttachments, (_state, id) => id], (attachments, id) => {
+    return fallbackToEmptyArray(attachments.filter((attachment) => attachment.fields_revision === id));
+  })
+);
+const selectAssetTypeFieldsAttachmentById = (attachmentId) => (state) => {
+  return state.assetTypeFieldsAttachmentReducer.instances[attachmentId];
+};
+const assetTypeFieldsAttachmentReducer = assetTypeFieldsAttachmentSlice.reducer;
+const assetTypeFieldValuesAttachmentAdapter = createModelAdapter(
+  (attachment) => attachment.offline_id
+);
+const initialState = assetTypeFieldValuesAttachmentAdapter.getInitialState({});
+const assetTypeFieldValuesAttachmentSlice = createSlice({
+  name: "assetTypeFieldValuesAttachments",
+  initialState,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState)),
+  reducers: {
+    initializeAssetTypeFieldValuesAttachments: assetTypeFieldValuesAttachmentAdapter.initialize,
+    addAssetTypeFieldValuesAttachment: assetTypeFieldValuesAttachmentAdapter.addOne,
+    addAssetTypeFieldValuesAttachments: assetTypeFieldValuesAttachmentAdapter.addMany,
+    setAssetTypeFieldValuesAttachment: assetTypeFieldValuesAttachmentAdapter.setOne,
+    setAssetTypeFieldValuesAttachments: assetTypeFieldValuesAttachmentAdapter.setMany,
+    updateAssetTypeFieldValuesAttachment: assetTypeFieldValuesAttachmentAdapter.updateOne,
+    updateAssetTypeFieldValuesAttachments: assetTypeFieldValuesAttachmentAdapter.updateMany,
+    deleteAssetTypeFieldValuesAttachment: assetTypeFieldValuesAttachmentAdapter.deleteOne,
+    deleteAssetTypeFieldValuesAttachments: assetTypeFieldValuesAttachmentAdapter.deleteMany
+  }
+});
+const {
+  initializeAssetTypeFieldValuesAttachments,
+  addAssetTypeFieldValuesAttachment,
+  addAssetTypeFieldValuesAttachments,
+  setAssetTypeFieldValuesAttachment,
+  setAssetTypeFieldValuesAttachments,
+  updateAssetTypeFieldValuesAttachment,
+  updateAssetTypeFieldValuesAttachments,
+  deleteAssetTypeFieldValuesAttachment,
+  deleteAssetTypeFieldValuesAttachments
+} = assetTypeFieldValuesAttachmentSlice.actions;
+const selectAssetTypeFieldValuesAttachmentsMapping = (state) => state.assetTypeFieldValuesAttachmentReducer.instances;
+const selectAssetTypeFieldValuesAttachments = createSelector(
+  [selectAssetTypeFieldValuesAttachmentsMapping],
+  (attachmentsMapping) => {
+    return Object.values(attachmentsMapping);
+  }
+);
+const selectAssetTypeFieldValuesAttachmentById = (attachmentId) => (state) => {
+  return state.assetTypeFieldValuesAttachmentReducer.instances[attachmentId];
+};
+const selectAssetTypeFieldValuesAttachmentsByIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAssetTypeFieldValuesAttachmentsMapping, (_, attachmentIds) => attachmentIds],
+    (mapping, attachmentIds) => {
+      const attachmentIdsSet = new Set(attachmentIds);
+      return fallbackToEmptyArray(
+        Object.values(mapping).filter((attachment) => attachmentIdsSet.has(attachment.offline_id))
+      );
+    }
+  )
+);
+const selectAttachmentsOfAssetTypeFieldValues = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFieldValuesAttachments, (_state, id) => id], (attachments, id) => {
+    return fallbackToEmptyArray(attachments.filter((attachment) => attachment.field_values === id));
+  })
+);
+const assetTypeFieldValuesAttachmentReducer = assetTypeFieldValuesAttachmentSlice.reducer;
+let clientStore;
+function setClientStore(store) {
+  clientStore = store;
+}
+function getClientStore() {
+  return clientStore;
+}
+let clientSDK;
+function setClientSDK(sdkCtor) {
+  clientSDK = sdkCtor;
+}
+function getClientSDK() {
+  return clientSDK;
+}
+const CLASS_NAME_TO_SERVICE = {};
+class BaseService {
+  constructor(sdk) {
+    __publicField(this, "client");
+    CLASS_NAME_TO_SERVICE[this.constructor.name] = this;
+    this.client = sdk;
+  }
+  async enqueueRequest(requestDetails) {
+    return this.client.enqueueRequest(requestDetails, this.host, this.constructor.name);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  dispatch(action) {
+    this.client.store.dispatch(action);
+  }
+}
+const VERSION_REDUCER_KEY = "versioning";
 const overmapReducers = {
   // TODO: attachmentReducer,
   [VERSION_REDUCER_KEY]: versioningReducer,
@@ -3089,7 +3274,15 @@ const overmapReducers = {
   issueCommentReducer,
   issueUpdateReducer,
   geoImageReducer,
-  issueAssociationReducer
+  issueAssociationReducer,
+  issueTypeFieldsReducer,
+  issueTypeFieldValuesReducer,
+  issueTypeFieldsAttachmentReducer,
+  issueTypeFieldValuesAttachmentReducer,
+  assetTypeFieldsReducer,
+  assetTypeFieldValuesReducer,
+  assetTypeFieldsAttachmentReducer,
+  assetTypeFieldValuesAttachmentReducer
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
@@ -3114,9 +3307,8 @@ function getOutboxCoordinator() {
   __OUTBOX_COORDINATOR = coordinator;
   return coordinator;
 }
-const persistCallback = (err) => {
-  if (err)
-    throw err;
+const persistCallback = (e) => {
+  if (e) throw e;
   const clientStore2 = getClientStore();
   if (clientStore2) {
     clientStore2.dispatch({ type: "rehydrated/setRehydrated", payload: true });
@@ -3180,14 +3372,11 @@ function extractResponseFromError(error) {
     const knownKeys = ["ok", "redirect", "clientError", "serverError", "error"];
     return typeof response === "object" && response !== null && knownKeys.every((key) => key in response);
   }
-  if (isResponse(error))
-    return error;
+  if (isResponse(error)) return error;
   if (typeof error === "object" && error !== null) {
     const typedError = error;
-    if (isResponse(typedError.response))
-      return typedError.response;
-    if (typedError.response && isResponse(typedError.response.response))
-      return typedError.response.response;
+    if (isResponse(typedError.response)) return typedError.response;
+    if (typedError.response && isResponse(typedError.response.response)) return typedError.response.response;
   }
   return void 0;
 }
@@ -3228,15 +3417,11 @@ async function performRequest(action, client) {
   const addPayload = (req) => {
     if (attachmentHash) {
       const s3url = requestDetails.s3url;
-      if (!s3url)
-        throw new Error(`No S3 URL for file ${attachmentHash}`);
-      if ("warning" in s3url)
-        throw new Error(`S3 URL warning for file ${attachmentHash}`);
-      if (!file)
-        throw new Error(`No file for file ${attachmentHash}`);
+      if (!s3url) throw new Error(`No S3 URL for file ${attachmentHash}`);
+      if ("warning" in s3url) throw new Error(`S3 URL warning for file ${attachmentHash}`);
+      if (!file) throw new Error(`No file for file ${attachmentHash}`);
       const s3Sha1Checksum = s3url.fields["x-amz-checksum-sha1"];
-      if (!s3Sha1Checksum)
-        throw new Error(`No checksum for file ${attachmentHash}`);
+      if (!s3Sha1Checksum) throw new Error(`No checksum for file ${attachmentHash}`);
       return req.set("x-amz-checksum-sha1", s3Sha1Checksum).field({ ...payload, ...s3url.fields }).attach("file", file);
     }
     return req.send(payload);
@@ -3296,8 +3481,7 @@ class MiddlewareChainerPrivate {
     this.compile = this.compile.bind(this);
   }
   then(next) {
-    if (this._previous)
-      this._previous.next = next;
+    if (this._previous) this._previous.next = next;
     this._all.push(next);
     this._previous = next;
     return {
@@ -3325,11 +3509,9 @@ class OfflineMiddleware {
     } else {
       console.debug("Middleware finished. Performing request:", action);
       const clientStore2 = getClientStore();
-      if (!clientStore2)
-        throw new Error("Client store not set");
+      if (!clientStore2) throw new Error("Client store not set");
       const clientSDK2 = getClientSDK();
-      if (!clientSDK2)
-        throw new Error("Client SDK not set");
+      if (!clientSDK2) throw new Error("Client SDK not set");
       return performRequest(action, clientSDK2);
     }
   }
@@ -3350,20 +3532,6 @@ function runMiddleware(action) {
   return (_a2 = allMiddleware[0]) == null ? void 0 : _a2.run(action);
 }
 const discardStatuses = [400, 409, 403, 404, 405, 500];
-const statusMessages = {
-  403: { title: "Forbidden", description: "You are not authorized to perform this action.", accentColor: "red" },
-  404: { title: "Not found", description: "The requested resource was not found.", accentColor: "red" },
-  405: {
-    title: "Not supported",
-    description: "It's not you. It's us. Sorry for the inconvenience.",
-    accentColor: "red"
-  },
-  500: {
-    title: "Server error",
-    description: "Our server seems to be experiencing problems at the moment. We have been alerted and will fix the problem as soon as possible.",
-    accentColor: "red"
-  }
-};
 function discard(reason, action, retries = 0) {
   var _a2;
   console.debug(
@@ -3416,14 +3584,6 @@ function discard(reason, action, retries = 0) {
     }
     if (status !== void 0 && discardStatuses.includes(status)) {
       console.warn("Discarding request due to error:", reason, "\nAction:", action);
-      const message = statusMessages[status];
-      if (message) {
-        if (unsafeShowToast) {
-          unsafeShowToast(message);
-        } else {
-          console.error(`Could not display toast for status ${status} because there is no toast handle.`);
-        }
-      }
       const coordinator2 = getOutboxCoordinator();
       if (!coordinator2) {
         throw new Error("Outbox coordinator not set");
@@ -3451,6 +3611,7 @@ function retry(_action, _retries) {
 }
 class BaseSDK {
   constructor(store) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "store");
     this.store = store;
   }
@@ -3486,9 +3647,13 @@ class BaseSDK {
       };
       performRequest(fullOfflineAction, this).then((result) => {
         promise.resolve(result.body);
-      }).catch((error) => {
-        discard(error, fullOfflineAction);
-        promise.reject(error);
+      }).catch((e) => {
+        discard(e, fullOfflineAction);
+        if (e instanceof Error) {
+          promise.reject(e);
+        } else {
+          promise.reject(new Error((e ?? UNKNOWN_ERROR_MESSAGE).toString()));
+        }
       });
     } else {
       const innerPromise = this.store.dispatch(
@@ -3542,10 +3707,8 @@ class BaseAuthService extends BaseService {
 }
 const EXPIRING_SOON_THRESHOLD = 1800;
 function parseTokens(response) {
-  if (!response.access)
-    throw new Error("Missing access token");
-  if (!response.refresh)
-    throw new Error("Missing refresh token");
+  if (!response.access) throw new Error("Missing access token");
+  if (!response.refresh) throw new Error("Missing refresh token");
   return { accessToken: response.access, refreshToken: response.refresh };
 }
 class JWTService extends BaseAuthService {
@@ -3582,8 +3745,7 @@ class JWTService extends BaseAuthService {
         this.clearAuth();
         return void 0;
       }
-      if (!response.access)
-        throw new Error("Missing access token");
+      if (!response.access) throw new Error("Missing access token");
       return { accessToken: response.access, refreshToken: response.refresh ?? this.getRefreshToken() };
     });
   }
@@ -3639,8 +3801,7 @@ class JWTService extends BaseAuthService {
     return `Bearer ${accessToken}`;
   }
   async prepareAuth() {
-    if (!this.tokenIsExpiringSoon())
-      return;
+    if (!this.tokenIsExpiringSoon()) return;
     console.debug(this.constructor.name, "preparing auth");
     try {
       await this.renewTokens();
@@ -3648,7 +3809,11 @@ class JWTService extends BaseAuthService {
       if (e instanceof APIError) {
         this.clearAuth();
       }
-      return Promise.reject(e);
+      if (e instanceof Error) {
+        return Promise.reject(e);
+      } else {
+        return Promise.reject(new Error((e ?? UNKNOWN_ERROR_MESSAGE).toString()));
+      }
     }
   }
   /* if not successfull in gracefully handling an unauthorized response, throw and APIError */
@@ -3679,7 +3844,7 @@ class JWTService extends BaseAuthService {
   async initAuth(payload) {
     const uuid = v4();
     console.debug(this.constructor.name, "Initiating auth");
-    const promise = this.enqueueRequest({
+    return this.enqueueRequest({
       uuid,
       description: "Get token pair",
       method: HttpMethod.POST,
@@ -3687,25 +3852,12 @@ class JWTService extends BaseAuthService {
       payload,
       isAuthNeeded: false,
       checkAuth: false,
+      immediate: true,
       blockers: [],
       blocks: []
-    }).then(parseTokens);
-    const timeout = 5;
-    let timedOut = false;
-    const timeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
-        timedOut = true;
-        this.dispatch(markForDeletion(uuid));
-        reject(new APIError({ message: `Request timed out after ${timeout} seconds` }));
-      }, timeout * 1e3);
-    });
-    const successPromise = promise.then((tokens) => {
-      if (timedOut) {
-        return void 0;
-      }
-      this.setTokens(tokens);
+    }).then((tokens) => {
+      this.setTokens(parseTokens(tokens));
     });
-    return Promise.race([timeoutPromise, successPromise]);
   }
 }
 class BaseApiService extends BaseService {
@@ -3731,9 +3883,6 @@ class CategoryService extends BaseApiService {
       description: "Create Category",
       method: HttpMethod.POST,
       url: "/categories/",
-      queryParams: {
-        workspace_id: payload.workspace.toString()
-      },
       payload: offlineCategory,
       blockers: [payload.workspace],
       blocks: [offlineCategory.offline_id]
@@ -3816,15 +3965,7 @@ class AssetService extends BaseApiService {
       description: "Create asset",
       method: HttpMethod.POST,
       url: "/assets/",
-      payload: {
-        offline_id: offlineAsset.offline_id,
-        submitted_at: offlineAsset.submitted_at,
-        geo_marker: offlineAsset.geo_marker,
-        canvas_marker: offlineAsset.canvas_marker,
-        label: offlineAsset.label,
-        description: offlineAsset.description,
-        asset_type: offlineAsset.asset_type
-      },
+      payload: offlineAsset,
       blockers: [offlineAsset.asset_type],
       blocks: [offlineAsset.offline_id]
     });
@@ -3868,8 +4009,7 @@ class AssetService extends BaseApiService {
     const { store } = this.client;
     const state = store.getState();
     const assetToBeDeleted = selectAssetById(id)(state);
-    if (!assetToBeDeleted)
-      throw new Error(`No asset with id ${id} found in the store`);
+    if (!assetToBeDeleted) throw new Error(`No asset with id ${id} found in the store`);
     const attachmentsOfAssets = selectAttachmentsOfAsset(id)(state);
     const formSubmissionsOfAssets = selectFormSubmissionsOfAsset(id)(state);
     const issueAssociations = selectIssueAssociationsOfAsset(id)(state);
@@ -3892,15 +4032,15 @@ class AssetService extends BaseApiService {
       url: `/assets/${id}/`,
       blockers: [id],
       blocks: []
-    }).catch((err) => {
+    }).catch((e) => {
       this.dispatch(addAsset(assetToBeDeleted));
       this.dispatch(addAssetAttachments(attachmentsOfAssets));
       this.dispatch(addFormSubmissions(formSubmissionsOfAssets));
       this.dispatch(addIssueAssociations(issueAssociations));
-      throw err;
+      throw e;
     });
   }
-  bulkAdd(payloads, assetTypeId, batchSize) {
+  bulkAdd(payloads, assetTypeId, projectId, batchSize) {
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const transactionId = v4();
     const assetBatches = chunkArray(payloads, batchSize).map((assetBatch) => {
@@ -3911,6 +4051,7 @@ class AssetService extends BaseApiService {
           transaction_id: transactionId,
           submitted_at: submittedAt,
           asset_type: assetTypeId,
+          project: projectId,
           assets: assetPayloads
         }
       };
@@ -3921,8 +4062,7 @@ class AssetService extends BaseApiService {
       const { batchId, payload } = assetBatch;
       const batchAssetOfflineIds = payload.assets.map((c) => c.offline_id);
       const blockers = [assetTypeId];
-      if (prevBatchId)
-        blockers.push(prevBatchId);
+      if (prevBatchId) blockers.push(prevBatchId);
       const blocks = batchAssetOfflineIds;
       blocks.push(batchId);
       const promise = this.enqueueRequest({
@@ -3946,7 +4086,10 @@ class AssetService extends BaseApiService {
     const result = await this.enqueueRequest({
       description: "Get assets",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/assets/`,
+      url: "/assets/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -3967,7 +4110,7 @@ class AssetStageCompletionService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Add asset stage completion",
       method: HttpMethod.POST,
-      url: "/assets/completions/",
+      url: "/asset-stage-completions/",
       payload: {
         offline_id: offlineStageCompletion.offline_id,
         submitted_at: submittedAt,
@@ -3994,7 +4137,7 @@ class AssetStageCompletionService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Delete asset stage completion",
       method: HttpMethod.DELETE,
-      url: `/assets/completions/${id}/`,
+      url: `/asset-stage-completions/${id}/`,
       blockers: [id],
       blocks: []
     });
@@ -4020,7 +4163,7 @@ class AssetStageCompletionService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Bulk create asset stage completions",
       method: HttpMethod.POST,
-      url: "/assets/completions/bulk/",
+      url: "/asset-stage-completions/bulk/",
       payload: {
         submitted_at: submittedAt,
         completions: payload
@@ -4042,7 +4185,7 @@ class AssetStageCompletionService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Deleting asset stage completions",
       method: HttpMethod.DELETE,
-      url: "/assets/completions/bulk/",
+      url: "/asset-stage-completions/bulk/",
       payload: {
         completion_ids: ids
       },
@@ -4058,7 +4201,10 @@ class AssetStageCompletionService extends BaseApiService {
     const result = await this.enqueueRequest({
       description: "Get asset stage completions",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/asset-stage-completions/`,
+      url: "/asset-stage-completions/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -4079,7 +4225,7 @@ class AssetStageService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Add asset stages",
       method: HttpMethod.POST,
-      url: "/assets/stages/bulk/",
+      url: "/asset-stages/bulk/",
       payload: {
         submitted_at: submittedAt,
         asset_type: assetTypeId,
@@ -4103,7 +4249,7 @@ class AssetStageService extends BaseApiService {
     return this.enqueueRequest({
       description: "Edit asset stages",
       method: HttpMethod.PATCH,
-      url: `/assets/types/${assetTypeId}/bulk-update-stages/`,
+      url: `/asset-types/${assetTypeId}/bulk-update-stages/`,
       payload: {
         stages: stagesToUpdate
       },
@@ -4121,7 +4267,7 @@ class AssetStageService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Delete asset stages",
       method: HttpMethod.DELETE,
-      url: "/assets/stages/bulk/",
+      url: "/asset-stages/bulk/",
       payload: {
         stage_ids: idsToDelete
       },
@@ -4136,8 +4282,7 @@ class AssetStageService extends BaseApiService {
   update(payload) {
     const { store } = this.client;
     const assetStage = selectAssetStageById(payload.offline_id)(store.getState());
-    if (!assetStage)
-      throw new Error(`No asset stage with id ${payload.offline_id} found in the store`);
+    if (!assetStage) throw new Error(`No asset stage with id ${payload.offline_id} found in the store`);
     const updatedAssetStage = {
       ...assetStage,
       ...payload
@@ -4146,7 +4291,7 @@ class AssetStageService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Update asset stage",
       method: HttpMethod.PATCH,
-      url: `/assets/stages/${assetStage.offline_id}/`,
+      url: `/asset-stages/${assetStage.offline_id}/`,
       payload: {
         name: payload.name,
         description: payload.description,
@@ -4163,52 +4308,14 @@ class AssetStageService extends BaseApiService {
     });
     return [updatedAssetStage, promise];
   }
-  async linkForm(stageId, formId) {
-    const { store } = this.client;
-    const stage = store.getState().assetStageReducer.instances[stageId];
-    if (!stage) {
-      throw new Error(`No asset stage with id ${stageId} found in the store`);
-    }
-    this.dispatch(updateAssetStage({ ...stage, form: formId }));
-    try {
-      await this.enqueueRequest({
-        description: "Link asset stage to form",
-        method: HttpMethod.POST,
-        url: `/assets/stages/${stageId}/associate-with-form/`,
-        payload: { form: formId },
-        blockers: [stageId, formId],
-        blocks: [stageId]
-      });
-    } catch (e) {
-      this.dispatch(setAssetStage(stage));
-      throw e;
-    }
-  }
-  async unlinkForm(stageId, formId) {
-    const { store } = this.client;
-    const stage = store.getState().assetStageReducer.instances[stageId];
-    if (!stage) {
-      throw new Error(`No asset stage with id ${stageId} found in the store`);
-    }
-    this.dispatch(updateAssetStage({ ...stage, form: void 0 }));
-    try {
-      await this.enqueueRequest({
-        description: "Unlink asset stage from form",
-        method: HttpMethod.DELETE,
-        url: `/assets/stages/${stageId}/associate-with-form/`,
-        blockers: [stageId, formId],
-        blocks: [stageId]
-      });
-    } catch (e) {
-      this.dispatch(setAssetStage(stage));
-      throw e;
-    }
-  }
-  async refreshStore(projectId) {
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       description: "Get asset stages",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/asset-stages/`,
+      url: "/asset-stages/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -4225,7 +4332,12 @@ class BaseUploadService extends BaseApiService {
       projectAttachmentReducer: projectAttachmentReducer2,
       formRevisionAttachmentReducer: formRevisionAttachmentReducer2,
       formSubmissionAttachmentReducer: formSubmissionAttachmentReducer2,
-      geoImageReducer: geoImageReducer2
+      geoImageReducer: geoImageReducer2,
+      // fields
+      assetTypeFieldsAttachmentReducer: assetTypeFieldsAttachmentReducer2,
+      assetTypeFieldValuesAttachmentReducer: assetTypeFieldValuesAttachmentReducer2,
+      issueTypeFieldsAttachmentReducer: issueTypeFieldsAttachmentReducer2,
+      issueTypeFieldValuesAttachmentReducer: issueTypeFieldValuesAttachmentReducer2
     } = this.client.store.getState();
     const objectsWithSha1 = [].concat(
       Object.values(issueAttachmentReducer2.instances),
@@ -4235,7 +4347,11 @@ class BaseUploadService extends BaseApiService {
       Object.values(projectAttachmentReducer2.instances),
       Object.values(formRevisionAttachmentReducer2.instances),
       Object.values(formSubmissionAttachmentReducer2.instances),
-      Object.values(geoImageReducer2.instances)
+      Object.values(geoImageReducer2.instances),
+      Object.values(assetTypeFieldsAttachmentReducer2.instances),
+      Object.values(assetTypeFieldValuesAttachmentReducer2.instances),
+      Object.values(issueTypeFieldsAttachmentReducer2.instances),
+      Object.values(issueTypeFieldValuesAttachmentReducer2.instances)
     );
     return objectsWithSha1.filter((object) => object.file_sha1 === sha1).length;
   }
@@ -4257,41 +4373,20 @@ class BaseUploadService extends BaseApiService {
     }
     return promisesBySha1;
   }
-}
-const AttachmentModelMeta = {
-  [AttachmentModel.Issue]: {
-    name: "issue",
-    attachUrlPrefix: "/issues",
-    deleteUrlPrefix: "/issues",
-    fetchUrlPostfix: "/issue-attachments"
-  },
-  [AttachmentModel.Asset]: {
-    name: "asset",
-    attachUrlPrefix: "/assets",
-    deleteUrlPrefix: "/assets",
-    fetchUrlPostfix: "/asset-attachments"
-  },
-  [AttachmentModel.AssetType]: {
-    name: "asset type",
-    attachUrlPrefix: "/assets/types",
-    deleteUrlPrefix: "/assets/types",
-    fetchUrlPostfix: "/asset-type-attachments"
-  },
-  [AttachmentModel.Project]: {
-    name: "project",
-    attachUrlPrefix: "/projects",
-    deleteUrlPrefix: "/projects",
-    fetchUrlPostfix: "/attachments"
-  },
-  [AttachmentModel.Document]: {
-    name: "document",
-    attachUrlPrefix: "/documents",
-    deleteUrlPrefix: "/documents",
-    fetchUrlPostfix: "/document-attachments"
+  async getFilePayload(file) {
+    const sha1 = await hashFile(file);
+    const filePayload = {
+      sha1,
+      file_type: file.type,
+      extension: file.name.split(".").pop(),
+      size: file.size
+    };
+    await this.client.files.addCache(file, sha1);
+    return filePayload;
   }
-};
+}
 class BaseAttachmentService extends BaseUploadService {
-  async attachFiles(files, modelId, buildOfflineAttachment) {
+  async _bulkAdd(payloads) {
     var _a2;
     const { store } = this.client;
     const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
@@ -4299,39 +4394,35 @@ class BaseAttachmentService extends BaseUploadService {
     const offlineAttachments = [];
     const attachmentPayloads = [];
     const filePayloads = {};
-    for (const file of files) {
-      const sha1 = await hashFile(file);
-      if (!(sha1 in filePayloads)) {
-        filePayloads[sha1] = {
-          sha1,
-          file_type: file.type,
-          extension: file.name.split(".").pop(),
-          size: file.size
-        };
-        await this.client.files.addCache(file, sha1);
-      }
-      const offlineAttachment = buildOfflineAttachment({
+    for (const payload of payloads) {
+      const { modelId, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineAttachment = this.buildOfflineAttachment({
         file,
-        sha1,
-        submittedAt,
-        createdBy,
+        file_sha1: filePayload.sha1,
+        submitted_at: submittedAt,
+        created_by: createdBy,
         description: "",
         modelId
       });
       offlineAttachments.push(offlineAttachment);
-      attachmentPayloads.push({
-        offline_id: offlineAttachment.offline_id,
-        name: offlineAttachment.file_name,
-        sha1: offlineAttachment.file_sha1,
-        description: offlineAttachment.description
-      });
+      attachmentPayloads.push(
+        this.buildAttachmentPayload({
+          offline_id: offlineAttachment.offline_id,
+          file_name: offlineAttachment.file_name,
+          file_sha1: offlineAttachment.file_sha1,
+          file_extension: filePayload.extension,
+          description: offlineAttachment.description,
+          modelId
+        })
+      );
     }
     this.dispatch(this.addAttachments(offlineAttachments));
-    const meta = AttachmentModelMeta[this.attachmentModel];
     const promise = this.enqueueRequest({
-      description: `Attach files to ${meta.name}`,
+      description: `Add ${this.name}`,
       method: HttpMethod.POST,
-      url: `${meta.attachUrlPrefix}/${modelId}/attach/`,
+      url: `${this.url}/bulk/`,
       payload: {
         submitted_at: submittedAt,
         attachments: attachmentPayloads,
@@ -4348,7 +4439,7 @@ class BaseAttachmentService extends BaseUploadService {
     });
     return [offlineAttachments, promise.then(({ attachments }) => attachments)];
   }
-  async deleteAttachment(attachmendId) {
+  async _delete(attachmendId) {
     const { store } = this.client;
     const attachment = this.selectAttachment(attachmendId)(store.getState());
     if (!attachment) {
@@ -4357,11 +4448,10 @@ class BaseAttachmentService extends BaseUploadService {
       );
     }
     this.dispatch(this.removeAttachment(attachment.offline_id));
-    const meta = AttachmentModelMeta[this.attachmentModel];
     const promise = this.enqueueRequest({
-      description: "Delete attachment",
+      description: `Delete ${this.name}`,
       method: HttpMethod.DELETE,
-      url: `${meta.deleteUrlPrefix}/attachments/${attachmendId}/`,
+      url: `${this.url}/${attachmendId}/`,
       blockers: [attachmendId],
       blocks: []
     });
@@ -4374,24 +4464,12 @@ class BaseAttachmentService extends BaseUploadService {
     });
     return promise;
   }
-  // Note that currently the fetching of attachments for all models dependds on the active projectId. This may change in the future. And
-  //  so for some attachment model services, this method will have to be overridden.
-  async refreshStore(projectId, _organizationId) {
-    const meta = AttachmentModelMeta[this.attachmentModel];
-    const result = await this.enqueueRequest({
-      description: `Get ${meta.name} attachments`,
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}${meta.fetchUrlPostfix}/`,
-      blocks: [],
-      blockers: []
-    });
-    this.dispatch(this.initializeAttachments(result));
-  }
 }
 class AssetAttachmentService extends BaseAttachmentService {
   constructor() {
     super(...arguments);
-    __publicField(this, "attachmentModel", AttachmentModel.Asset);
+    __publicField(this, "name", "Asset Attachment");
+    __publicField(this, "url", "/asset-attachments");
     __publicField(this, "initializeAttachments", initializeAssetAttachments);
     __publicField(this, "addAttachments", addAssetAttachments);
     __publicField(this, "updateAttachments", updateAssetAttachments);
@@ -4403,20 +4481,39 @@ class AssetAttachmentService extends BaseAttachmentService {
   buildOfflineAttachment(data) {
     return offline({
       file: URL.createObjectURL(data.file),
-      file_sha1: data.sha1,
-      created_by: data.createdBy,
+      file_sha1: data.file_sha1,
+      created_by: data.created_by,
       file_name: data.file.name,
       file_type: data.file.type,
-      submitted_at: data.submittedAt,
+      submitted_at: data.submitted_at,
       description: data.description,
       asset: data.modelId
     });
   }
-  async attachFilesToAsset(files, assetId) {
-    return this.attachFiles(files, assetId, this.buildOfflineAttachment.bind(this));
+  buildAttachmentPayload(data) {
+    return {
+      ...data,
+      asset: data.modelId
+    };
+  }
+  async bulkAdd(payloads) {
+    return this._bulkAdd(payloads.map((p) => ({ modelId: p.assetId, file: p.file })));
+  }
+  async delete(id) {
+    return this._delete(id);
   }
-  async deleteAssetAttachment(attachmentId) {
-    return this.deleteAttachment(attachmentId);
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get asset attachments",
+      method: HttpMethod.GET,
+      url: `${this.url}/`,
+      queryParams: {
+        project: projectId.toString()
+      },
+      blocks: [],
+      blockers: []
+    });
+    this.dispatch(initializeAssetAttachments(result));
   }
 }
 class AssetTypeService extends BaseApiService {
@@ -4433,8 +4530,8 @@ class AssetTypeService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Create asset type",
       method: HttpMethod.POST,
-      url: `/projects/${payload.project}/asset-types/`,
-      payload: { ...offlineAssetType },
+      url: "/asset-types/",
+      payload: offlineAssetType,
       blockers: [],
       blocks: [offlineAssetType.offline_id]
     });
@@ -4459,7 +4556,7 @@ class AssetTypeService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Update asset type",
       method: HttpMethod.PATCH,
-      url: `/assets/types/${payload.offline_id}/`,
+      url: `/asset-types/${payload.offline_id}/`,
       payload: {
         icon: payload.icon,
         color: payload.color,
@@ -4493,7 +4590,7 @@ class AssetTypeService extends BaseApiService {
     return this.enqueueRequest({
       description: "Delete asset type",
       method: HttpMethod.DELETE,
-      url: `/assets/types/${assetTypeId}/`,
+      url: `/asset-types/${assetTypeId}/`,
       blockers: [assetTypeId],
       blocks: []
     }).catch((e) => {
@@ -4504,11 +4601,14 @@ class AssetTypeService extends BaseApiService {
       throw e;
     });
   }
-  async refreshStore(projectId) {
+  async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       description: "Get asset types",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/asset-types/`,
+      url: "/asset-types/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -4518,8 +4618,8 @@ class AssetTypeService extends BaseApiService {
 class AssetTypeAttachmentService extends BaseAttachmentService {
   constructor() {
     super(...arguments);
-    __publicField(this, "attachmentModel", AttachmentModel.AssetType);
-    __publicField(this, "initializeAttachments", initializeAssetTypeAttachments);
+    __publicField(this, "name", "Asset Type Attachment");
+    __publicField(this, "url", "/asset-type-attachments");
     __publicField(this, "addAttachments", addAssetTypeAttachments);
     __publicField(this, "updateAttachments", updateAssetTypeAttachments);
     __publicField(this, "removeAttachments", deleteAssetTypeAttachments);
@@ -4530,20 +4630,39 @@ class AssetTypeAttachmentService extends BaseAttachmentService {
   buildOfflineAttachment(data) {
     return offline({
       file: URL.createObjectURL(data.file),
-      file_sha1: data.sha1,
-      created_by: data.createdBy,
+      file_sha1: data.file_sha1,
+      created_by: data.created_by,
       file_name: data.file.name,
       file_type: data.file.type,
-      submitted_at: data.submittedAt,
+      submitted_at: data.submitted_at,
       description: data.description,
       asset_type: data.modelId
     });
   }
-  async attachFilesToAssetType(files, assetTypeId) {
-    return this.attachFiles(files, assetTypeId, this.buildOfflineAttachment.bind(this));
-  }
-  async deleteAssetTypeAttachment(attachmentId) {
-    return this.deleteAttachment(attachmentId);
+  buildAttachmentPayload(data) {
+    return {
+      ...data,
+      asset_type: data.modelId
+    };
+  }
+  async bulkAdd(payloads) {
+    return this._bulkAdd(payloads.map((p) => ({ modelId: p.assetTypeId, file: p.file })));
+  }
+  async delete(attachmentId) {
+    return this._delete(attachmentId);
+  }
+  async refreshStore(organizationId) {
+    const result = await this.enqueueRequest({
+      description: "Get asset type attachments",
+      method: HttpMethod.GET,
+      url: `${this.url}/`,
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blocks: [],
+      blockers: []
+    });
+    this.dispatch(initializeAssetTypeAttachments(result));
   }
 }
 class IssueCommentService extends BaseApiService {
@@ -4559,7 +4678,7 @@ class IssueCommentService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Add issue comment",
       method: HttpMethod.POST,
-      url: `/issues/${payload.issue}/comment/`,
+      url: "/issue-comments/",
       payload: offlineComment,
       blockers: [payload.issue],
       blocks: [offlineComment.offline_id]
@@ -4583,7 +4702,7 @@ class IssueCommentService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Edit issue comment",
       method: HttpMethod.PATCH,
-      url: `/issues/comments/${payload.offline_id}/`,
+      url: `/issue-comments/${payload.offline_id}/`,
       payload,
       blockers: [payload.offline_id],
       blocks: [payload.offline_id]
@@ -4602,7 +4721,7 @@ class IssueCommentService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Delete comment",
       method: HttpMethod.DELETE,
-      url: `/issues/comments/${id}/`,
+      url: `/issue-comments/${id}/`,
       blockers: [id],
       blocks: []
     });
@@ -4615,7 +4734,10 @@ class IssueCommentService extends BaseApiService {
     const result = await this.enqueueRequest({
       description: "Get comments",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/comments/`,
+      url: "/issue-comments/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -4627,27 +4749,21 @@ class IssueUpdateService extends BaseApiService {
     const result = await this.enqueueRequest({
       description: "Get issue updates",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/issues/updates/`,
+      url: "/issue-updates/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
-    let filteredResult = result.filter(onlyUniqueOfflineIds);
-    filteredResult = filteredResult.map((comment) => {
-      return { ...comment };
-    });
-    if (result.length !== filteredResult.length) {
-      console.error(
-        `Received duplicate comments from the API (new length ${filteredResult.length}); filtered in browser.`
-      );
-    }
-    this.dispatch(initializeIssueUpdates(filteredResult));
+    this.dispatch(initializeIssueUpdates(result));
   }
 }
 class IssueAttachmentService extends BaseAttachmentService {
   constructor() {
     super(...arguments);
-    __publicField(this, "attachmentModel", AttachmentModel.Issue);
-    __publicField(this, "initializeAttachments", initializeIssueAttachments);
+    __publicField(this, "name", "Issue Attachment");
+    __publicField(this, "url", "/issue-attachments");
     __publicField(this, "addAttachments", addIssueAttachments);
     __publicField(this, "updateAttachments", updateIssueAttachments);
     __publicField(this, "removeAttachments", deleteIssueAttachments);
@@ -4658,24 +4774,42 @@ class IssueAttachmentService extends BaseAttachmentService {
   buildOfflineAttachment(data) {
     return offline({
       file: URL.createObjectURL(data.file),
-      file_sha1: data.sha1,
-      created_by: data.createdBy,
+      file_sha1: data.file_sha1,
+      created_by: data.created_by,
       file_name: data.file.name,
       file_type: data.file.type,
-      submitted_at: data.submittedAt,
+      submitted_at: data.submitted_at,
       description: data.description,
       issue: data.modelId
     });
   }
-  async attachFilesToIssue(files, issueId) {
-    return this.attachFiles(files, issueId, this.buildOfflineAttachment.bind(this));
+  buildAttachmentPayload(data) {
+    return {
+      ...data,
+      issue: data.modelId
+    };
+  }
+  async bulkAdd(payloads) {
+    return this._bulkAdd(payloads.map((p) => ({ modelId: p.issueId, file: p.file })));
+  }
+  async delete(id) {
+    return this._delete(id);
   }
-  async deleteIssueAttachment(attachmentId) {
-    return this.deleteAttachment(attachmentId);
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get issue attachments",
+      method: HttpMethod.GET,
+      url: `${this.url}/`,
+      queryParams: {
+        project: projectId.toString()
+      },
+      blocks: [],
+      blockers: []
+    });
+    this.dispatch(initializeIssueAttachments(result));
   }
 }
 class IssueService extends BaseApiService {
-  // Basic CRUD functions
   add(payload) {
     var _a2;
     const { store } = this.client;
@@ -4692,10 +4826,6 @@ class IssueService extends BaseApiService {
       description: "Create issue",
       method: HttpMethod.POST,
       url: "/issues/",
-      queryParams: {
-        workspace_id: payload.index_workspace,
-        ...payload.issue_type ? { issue_type: payload.issue_type } : {}
-      },
       payload: offlineIssue,
       blockers: ["add-issue", ...offlineIssue.index_workspace ? [offlineIssue.index_workspace] : []],
       blocks: [offlineIssue.offline_id]
@@ -4731,7 +4861,18 @@ class IssueService extends BaseApiService {
     ]) {
       if (issueUpdateChange in payload && payload[issueUpdateChange] !== issueToBeUpdated[issueUpdateChange]) {
         switch (issueUpdateChange) {
-          case "category": {
+          case IssueUpdateChange.PRIORITY:
+          case IssueUpdateChange.STATUS: {
+            const val = payload[issueUpdateChange];
+            changes[issueUpdateChange] = val !== void 0 ? Number(val) : null;
+            break;
+          }
+          case IssueUpdateChange.DUE_DATE:
+          case IssueUpdateChange.DESCRIPTION:
+          case IssueUpdateChange.TITLE:
+            changes[issueUpdateChange] = payload[issueUpdateChange] ?? null;
+            break;
+          case IssueUpdateChange.CATEGORY: {
             let categoryOrNull = null;
             const categoryIdOrNull = payload[issueUpdateChange];
             if (categoryIdOrNull) {
@@ -4748,7 +4889,7 @@ class IssueService extends BaseApiService {
             } : null;
             break;
           }
-          case "assigned_to": {
+          case IssueUpdateChange.ASSIGNED_TO: {
             let userOrNull = null;
             const userIdOrNull = payload[issueUpdateChange];
             if (userIdOrNull) {
@@ -4764,20 +4905,6 @@ class IssueService extends BaseApiService {
             } : null;
             break;
           }
-          case "description":
-            changes[issueUpdateChange] = payload[issueUpdateChange] ?? null;
-            break;
-          case "title":
-            changes[issueUpdateChange] = payload[issueUpdateChange] ?? null;
-            break;
-          case "priority":
-            changes[issueUpdateChange] = payload[issueUpdateChange];
-            break;
-          case "status":
-            changes[issueUpdateChange] = payload[issueUpdateChange];
-            break;
-          case "due_date":
-            changes[issueUpdateChange] = payload[issueUpdateChange] ? payload[issueUpdateChange] : null;
         }
       }
     }
@@ -4848,7 +4975,10 @@ class IssueService extends BaseApiService {
     const result = await this.enqueueRequest({
       description: "Get issues",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/issues/`,
+      url: "/issues/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -4868,16 +4998,8 @@ class IssueTypeService extends BaseApiService {
     this.dispatch(addIssueType(offlineIssueType));
     const promise = this.enqueueRequest({
       method: HttpMethod.POST,
-      url: `/organizations/${payload.organization}/issue-types/`,
-      // Sending only whats needed here
-      payload: {
-        offline_id: offlineIssueType.offline_id,
-        submitted_at: offlineIssueType.submitted_at,
-        icon: offlineIssueType.icon,
-        color: offlineIssueType.color,
-        name: offlineIssueType.name,
-        description: offlineIssueType.description
-      },
+      url: "/issue-types/",
+      payload: offlineIssueType,
       blockers: [],
       blocks: [offlineIssueType.offline_id]
     });
@@ -4902,7 +5024,7 @@ class IssueTypeService extends BaseApiService {
     this.dispatch(updateIssueType(offlineUpdatedIssueType));
     const promise = this.enqueueRequest({
       method: HttpMethod.PATCH,
-      url: `/issues/types/${payload.offline_id}/`,
+      url: `/issue-types/${payload.offline_id}/`,
       payload,
       blockers: [payload.offline_id],
       blocks: [payload.offline_id]
@@ -4926,7 +5048,7 @@ class IssueTypeService extends BaseApiService {
     this.dispatch(deleteIssues(issuesOfIssueType.map((issue) => issue.offline_id)));
     const promise = this.enqueueRequest({
       method: HttpMethod.DELETE,
-      url: `/issues/types/${id}/`,
+      url: `/issue-types/${id}/`,
       blockers: [id],
       blocks: []
     });
@@ -4939,7 +5061,10 @@ class IssueTypeService extends BaseApiService {
   async refreshStore(organizationId) {
     const result = await this.enqueueRequest({
       method: HttpMethod.GET,
-      url: `/organizations/${organizationId}/issue-types/`,
+      url: "/issue-types/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
       blockers: [],
       blocks: []
     });
@@ -5078,8 +5203,8 @@ class ProjectFileService extends BaseApiService {
 class ProjectAttachmentService extends BaseAttachmentService {
   constructor() {
     super(...arguments);
-    __publicField(this, "attachmentModel", AttachmentModel.Project);
-    __publicField(this, "initializeAttachments", initializeProjectAttachments);
+    __publicField(this, "name", "Project Attachment");
+    __publicField(this, "url", "/project-attachments");
     __publicField(this, "addAttachments", addProjectAttachments);
     __publicField(this, "updateAttachments", updateProjectAttachments);
     __publicField(this, "removeAttachments", deleteProjectAttachments);
@@ -5090,20 +5215,39 @@ class ProjectAttachmentService extends BaseAttachmentService {
   buildOfflineAttachment(data) {
     return offline({
       file: URL.createObjectURL(data.file),
-      file_sha1: data.sha1,
-      created_by: data.createdBy,
+      file_sha1: data.file_sha1,
+      created_by: data.created_by,
       file_name: data.file.name,
       file_type: data.file.type,
-      submitted_at: data.submittedAt,
+      submitted_at: data.submitted_at,
       description: data.description,
       project: data.modelId
     });
   }
-  async attachFilesToProject(files, projectId) {
-    return this.attachFiles(files, projectId, this.buildOfflineAttachment.bind(this));
+  buildAttachmentPayload(data) {
+    return {
+      ...data,
+      project: data.modelId
+    };
+  }
+  async bulkAdd(payloads) {
+    return this._bulkAdd(payloads.map((p) => ({ modelId: p.projectId, file: p.file })));
+  }
+  async delete(attachmentId) {
+    return this._delete(attachmentId);
   }
-  async deleteProjectAttachment(attachmentId) {
-    return this.deleteAttachment(attachmentId);
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get project attachments",
+      method: HttpMethod.GET,
+      url: `${this.url}/`,
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeProjectAttachments(result));
   }
 }
 class ProjectService extends BaseApiService {
@@ -5246,88 +5390,31 @@ const separateImageFromFields = async (fields) => {
   return { fields: newFields, images };
 };
 class FormService extends BaseUploadService {
-  async bulkAddRevisionAttachments(revisionId, files) {
+  add(payload, initialRevision) {
     var _a2;
+    const { store } = this.client;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-    const filePayloads = {};
-    const offlineFormRevisionAttachments = [];
-    const attachmentPayloads = [];
-    for (const [fieldIdentifier, file] of Object.entries(files)) {
-      const sha1 = await hashFile(file);
-      if (!(sha1 in filePayloads)) {
-        filePayloads[sha1] = {
-          sha1,
-          file_type: file.type,
-          extension: file.name.split(".").pop(),
-          size: file.size
-        };
-        await this.client.files.addCache(file, sha1);
-      }
-      const offlineFormRevisionAttachment = offline({
-        file: URL.createObjectURL(file),
-        file_type: file.type,
-        file_name: file.name,
-        file_sha1: sha1,
-        created_by: createdBy,
-        revision: revisionId,
-        submitted_at: submittedAt,
-        field_identifier: fieldIdentifier
-      });
-      offlineFormRevisionAttachments.push(offlineFormRevisionAttachment);
-      const attachmentPayload = {
-        offline_id: offlineFormRevisionAttachment.offline_id,
-        name: file.name,
-        field_identifier: fieldIdentifier,
-        sha1
-      };
-      attachmentPayloads.push(attachmentPayload);
-    }
-    this.dispatch(addFormRevisionAttachments(offlineFormRevisionAttachments));
-    const promise = this.enqueueRequest({
-      description: "Attach files to form revision",
-      method: HttpMethod.POST,
-      url: `/forms/revisions/${revisionId}/attachments/bulk/`,
-      payload: {
-        submitted_at: submittedAt,
-        attachments: attachmentPayloads,
-        files: Object.values(filePayloads)
-      },
-      blockers: [revisionId],
-      blocks: offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
-    });
-    promise.then((result) => {
-      this.processPresignedUrls(result.presigned_urls);
-      this.dispatch(updateFormRevisionAttachments(result.attachments));
-    }).catch(() => {
-      this.dispatch(
-        deleteFormRevisionAttachments(
-          offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
-        )
-      );
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const offlineForm = offline({
+      ...payload,
+      submitted_at: submittedAt,
+      created_by: createdBy
     });
-    return [offlineFormRevisionAttachments, promise.then(({ attachments }) => attachments)];
-  }
-  async add(ownerId, form, initialRevision, urlPrefix) {
-    const { fields, images } = await separateImageFromFields(initialRevision.fields);
     const offlineFormRevision = offline({
       ...initialRevision,
-      fields,
-      created_by: form.created_by,
-      form: form.offline_id,
-      submitted_at: form.submitted_at,
-      revision: "Pending"
+      form: offlineForm.offline_id,
+      revision: "Pending",
+      submitted_at: submittedAt,
+      created_by: createdBy
     });
-    this.dispatch(addForm(form));
+    this.dispatch(addForm(offlineForm));
     this.dispatch(addFormRevision(offlineFormRevision));
     const formPromise = this.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
-      url: urlPrefix,
+      url: "/forms/",
       payload: {
-        // Sending exactly what is currently needed for the endpoint
-        offline_id: form.offline_id,
-        submitted_at: form.submitted_at,
+        ...offlineForm,
         initial_revision: {
           offline_id: offlineFormRevision.offline_id,
           submitted_at: offlineFormRevision.submitted_at,
@@ -5336,111 +5423,15 @@ class FormService extends BaseUploadService {
           fields: offlineFormRevision.fields
         }
       },
-      blockers: [ownerId],
-      blocks: [form.offline_id, offlineFormRevision.offline_id]
+      blockers: [],
+      blocks: [offlineForm.offline_id, offlineFormRevision.offline_id]
     });
-    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
-      offlineFormRevision.offline_id,
-      images
-    );
     void formPromise.catch((e) => {
-      this.dispatch(deleteForm(form.offline_id));
+      this.dispatch(deleteForm(offlineForm.offline_id));
       this.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
       throw e;
     });
-    return [form, offlineFormRevision, offlineFormRevisionAttachments, formPromise, attachmentsPromise];
-  }
-  addForOrganization(organizationId, initialRevision) {
-    var _a2;
-    const state = this.client.store.getState();
-    const offlineForm = offline({
-      favorite: false,
-      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-      organization: organizationId
-    });
-    return this.add(
-      organizationId.toString(),
-      offlineForm,
-      initialRevision,
-      `/organizations/${organizationId}/create-form/`
-    );
-  }
-  addForProject(projectId, initialRevision) {
-    var _a2;
-    const state = this.client.store.getState();
-    const offlineForm = offline({
-      favorite: false,
-      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-      project: projectId
-    });
-    return this.add(projectId.toString(), offlineForm, initialRevision, `/projects/${projectId}/create-form/`);
-  }
-  addForIssueType(issueTypeId, initialRevision) {
-    var _a2;
-    const state = this.client.store.getState();
-    const offlineForm = offline({
-      favorite: false,
-      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-      issue_type: issueTypeId
-    });
-    return this.add(issueTypeId, offlineForm, initialRevision, `/issues/types/${issueTypeId}/create-form/`);
-  }
-  addForAssetType(assetTypeId, initialRevision) {
-    var _a2;
-    const state = this.client.store.getState();
-    const offlineForm = offline({
-      favorite: false,
-      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-      asset_type: assetTypeId
-    });
-    return this.add(assetTypeId, offlineForm, initialRevision, `/assets/types/${assetTypeId}/create-form/`);
-  }
-  async createRevision(formId, revision) {
-    var _a2;
-    const offlineRevision = offline(revision);
-    const { store } = this.client;
-    const state = store.getState();
-    const createdBy = (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id;
-    const { fields, images } = await separateImageFromFields(offlineRevision.fields);
-    const fullRevision = {
-      ...offlineRevision,
-      fields,
-      created_by: createdBy,
-      revision: "Pending",
-      form: formId,
-      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    this.dispatch(addFormRevision(fullRevision));
-    const promise = this.enqueueRequest({
-      description: "Create form revision",
-      method: HttpMethod.PATCH,
-      url: `/forms/${formId}/`,
-      payload: {
-        initial_revision: {
-          offline_id: fullRevision.offline_id,
-          submitted_at: fullRevision.submitted_at,
-          title: fullRevision.title,
-          description: fullRevision.description,
-          fields: fullRevision.fields
-        }
-      },
-      blockers: [formId],
-      blocks: [offlineRevision.offline_id]
-    });
-    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
-      fullRevision.offline_id,
-      images
-    );
-    void promise.then((result) => {
-      this.dispatch(setFormRevision(result));
-    }).catch(() => {
-      this.dispatch(deleteFormRevision(fullRevision.offline_id));
-    });
-    return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
+    return [offlineForm, offlineFormRevision, formPromise];
   }
   async delete(id) {
     const { store } = this.client;
@@ -5477,65 +5468,18 @@ class FormService extends BaseUploadService {
       throw e;
     }
   }
-  async refreshStore(projectId) {
-    const forms = [];
-    const revisions = [];
-    const attachments = [];
-    const projectFormsResult = await this.enqueueRequest({
-      description: "Fetch project forms",
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}/forms/`,
-      blockers: [projectId.toString()],
-      blocks: []
-    });
-    for (const form of projectFormsResult.forms)
-      forms.push(form);
-    for (const revision of projectFormsResult.revisions)
-      revisions.push(revision);
-    for (const attachment of projectFormsResult.attachments)
-      attachments.push(attachment);
-    const organizationFormsResult = await this.enqueueRequest({
+  async refreshStore(organizationId) {
+    const forms = await this.enqueueRequest({
       description: "Fetch organization forms",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/organizations/forms/`,
-      blockers: [projectId.toString()],
-      blocks: []
-    });
-    for (const form of organizationFormsResult.forms)
-      forms.push(form);
-    for (const revision of organizationFormsResult.revisions)
-      revisions.push(revision);
-    for (const attachment of organizationFormsResult.attachments)
-      attachments.push(attachment);
-    const assetTypeFormsResult = await this.enqueueRequest({
-      description: "Fetch asset type forms",
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}/asset-types/forms/`,
-      blockers: [projectId.toString()],
-      blocks: []
-    });
-    for (const form of assetTypeFormsResult.forms)
-      forms.push(form);
-    for (const revision of assetTypeFormsResult.revisions)
-      revisions.push(revision);
-    for (const attachment of assetTypeFormsResult.attachments)
-      attachments.push(attachment);
-    const issueTypeFormsResult = await this.enqueueRequest({
-      description: "Fetch issue type forms",
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}/issue-types/forms/`,
-      blockers: [projectId.toString()],
+      url: "/forms/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [organizationId.toString()],
       blocks: []
     });
-    for (const form of issueTypeFormsResult.forms)
-      forms.push(form);
-    for (const revision of issueTypeFormsResult.revisions)
-      revisions.push(revision);
-    for (const attachment of issueTypeFormsResult.attachments)
-      attachments.push(attachment);
     this.dispatch(initializeForms(forms));
-    this.dispatch(initializeFormRevisions(revisions));
-    this.dispatch(initializeFormRevisionAttachments(attachments));
   }
 }
 const isArrayOfFiles = (value) => {
@@ -5557,95 +5501,11 @@ const separateFilesFromValues = (values) => {
   return { values: newValues, files };
 };
 class FormSubmissionService extends BaseUploadService {
-  async bulkAddSubmissionAttachments(submissionId, files) {
-    var _a2;
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-    const filePayloads = {};
-    const offlineFormSubmissionAttachments = [];
-    const attachmentPayloads = [];
-    for (const [fieldIdentifier, filesArray] of Object.entries(files)) {
-      for (const file of filesArray) {
-        const sha1 = await hashFile(file);
-        if (!(sha1 in filePayloads)) {
-          filePayloads[sha1] = {
-            sha1,
-            file_type: file.type,
-            extension: file.name.split(".").pop(),
-            size: file.size
-          };
-          await this.client.files.addCache(file, sha1);
-        }
-        const offlineFormSubmissionAttachment = offline({
-          file: URL.createObjectURL(file),
-          file_type: file.type,
-          file_name: file.name,
-          file_sha1: sha1,
-          created_by: createdBy,
-          submission: submissionId,
-          submitted_at: submittedAt,
-          field_identifier: fieldIdentifier
-        });
-        offlineFormSubmissionAttachments.push(offlineFormSubmissionAttachment);
-        const attachmentPayload = {
-          offline_id: offlineFormSubmissionAttachment.offline_id,
-          name: file.name,
-          sha1,
-          field_identifier: fieldIdentifier
-        };
-        attachmentPayloads.push(attachmentPayload);
-      }
-    }
-    this.dispatch(addFormSubmissionAttachments(offlineFormSubmissionAttachments));
-    const promise = this.enqueueRequest({
-      description: "Attach files to form submission",
-      method: HttpMethod.POST,
-      url: `/forms/submissions/${submissionId}/attachments/bulk/`,
-      payload: {
-        submitted_at: submittedAt,
-        attachments: attachmentPayloads,
-        files: Object.values(filePayloads)
-      },
-      blockers: [submissionId],
-      blocks: offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
-    });
-    promise.then((result) => {
-      this.processPresignedUrls(result.presigned_urls);
-      this.dispatch(updateFormSubmissionAttachments(result.attachments));
-    }).catch(() => {
-      this.dispatch(
-        deleteFormSubmissionAttachments(
-          offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
-        )
-      );
-    });
-    return [offlineFormSubmissionAttachments, promise.then(({ attachments }) => attachments)];
-  }
-  async bulkDeleteSubmissionAttachments(submissionId, attachmentsIds) {
-    const { store } = this.client;
-    const state = store.getState();
-    const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(attachmentsIds)(state);
-    this.dispatch(deleteFormSubmissionAttachments(attachmentsIds));
-    try {
-      await this.enqueueRequest({
-        description: "Delete form submission attachments",
-        method: HttpMethod.DELETE,
-        url: `/forms/submissions/${submissionId}/attachments/bulk/`,
-        payload: { attachments: attachmentsIds },
-        blockers: [submissionId, ...attachmentsIds],
-        blocks: []
-      });
-    } catch (e) {
-      this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
-      throw e;
-    }
-  }
-  // Outer promise is for hashing and caching files for submission attachments
-  async add(payload) {
+  add(payload) {
     var _a2;
     const { store } = this.client;
     const state = store.getState();
-    const { values, files } = separateFilesFromValues(payload.values);
+    const { values } = separateFilesFromValues(payload.values);
     const offlineSubmission = offline({
       ...payload,
       values,
@@ -5653,135 +5513,35 @@ class FormSubmissionService extends BaseUploadService {
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     });
     const promise = this.enqueueRequest({
-      description: "Respond to form",
+      description: "Add form submission",
       method: HttpMethod.POST,
-      url: `/forms/revisions/${payload.form_revision}/respond/`,
+      url: "/form-submissions/",
       payload: offlineSubmission,
-      blockers: [payload.issue, payload.asset, payload.asset_stage, "add-form-entry"].filter(
-        (x) => x !== void 0
-      ),
-      blocks: [offlineSubmission.offline_id]
-    });
-    this.dispatch(addFormSubmission(offlineSubmission));
-    const [offlineFormSubmissionAttachments, attachmentsPromise] = await this.bulkAddSubmissionAttachments(
-      offlineSubmission.offline_id,
-      files
-    );
+      blockers: [
+        "add-form-entry",
+        payload.form_revision,
+        ...payload.issue ? [payload.issue] : [],
+        ...payload.asset ? [payload.asset] : []
+      ],
+      blocks: [offlineSubmission.offline_id]
+    });
+    this.dispatch(addFormSubmission(offlineSubmission));
     promise.then((result) => {
       this.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
       this.dispatch(deleteFormSubmission(offlineSubmission.offline_id));
     });
-    return [offlineSubmission, offlineFormSubmissionAttachments, promise, attachmentsPromise];
-  }
-  // Note currently the bulkAdd method is specific to form submissions for assets
-  // TODO: adapt the support bulk adding to any model type
-  async bulkAdd(args, batchSize) {
-    const { formRevision, commonFieldValues, fieldValuesByAsset } = args;
-    const { values: fileSeperatedCommonFieldValues, files: commonFiles } = separateFilesFromValues(commonFieldValues);
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const transactionId = v4();
-    const assetIdBatches = chunkArray(Object.keys(fieldValuesByAsset), batchSize);
-    const bulkAddBatches = await Promise.all(
-      assetIdBatches.map(async (assetIdBatch) => {
-        const batchId = v4();
-        const submissionPayloads = [];
-        const attachmentPayloads = [];
-        const files = { ...commonFiles };
-        for (const assetId of assetIdBatch) {
-          const { values: fileSeperatedSubmissionSpecificValues, files: submissionSpecificFiles } = separateFilesFromValues(fieldValuesByAsset[assetId] ?? {});
-          Object.assign(files, submissionSpecificFiles);
-          const submissionPayload = offline({
-            asset_id: assetId,
-            form_data: fileSeperatedSubmissionSpecificValues
-          });
-          submissionPayloads.push(submissionPayload);
-          for (const [fieldIdentifier, fileArray] of Object.entries(files)) {
-            for (const file of fileArray) {
-              const sha1 = await hashFile(file);
-              await this.client.files.addCache(file, sha1);
-              const attachmentPayload = offline({
-                submission_id: submissionPayload.offline_id,
-                sha1,
-                name: file.name,
-                field_identifier: fieldIdentifier
-              });
-              attachmentPayloads.push(attachmentPayload);
-            }
-          }
-        }
-        const filePaylods = [];
-        for (const file of Object.values(files).flat()) {
-          const sha1 = await hashFile(file);
-          const filePayload = {
-            sha1,
-            extension: file.name.split(".").pop() || "",
-            file_type: file.type,
-            size: file.size
-          };
-          filePaylods.push(filePayload);
-        }
-        return {
-          batchId,
-          payload: {
-            transaction_id: transactionId,
-            form_data: fileSeperatedCommonFieldValues,
-            submitted_at: submittedAt,
-            submissions: submissionPayloads,
-            attachments: attachmentPayloads,
-            files: filePaylods
-          }
-        };
-      })
-    );
-    const batchPromises = [];
-    let prevBatchId = null;
-    for (const batch of bulkAddBatches) {
-      const { payload, batchId } = batch;
-      const batchAssetIds = payload.submissions.map((x) => x.asset_id);
-      const batchSubmissionOfflineIds = payload.submissions.map((x) => x.offline_id);
-      const batchAttachmentsOfflineIds = payload.attachments.map((x) => x.offline_id);
-      const blockers = batchAssetIds;
-      if (prevBatchId)
-        blockers.push(prevBatchId);
-      const blocks = [...batchSubmissionOfflineIds, ...batchAttachmentsOfflineIds, batchId];
-      const promise = this.enqueueRequest({
-        description: "Bulk add form submissions",
-        method: HttpMethod.POST,
-        url: `/forms/revisions/${formRevision}/bulk-respond/`,
-        payload,
-        blockers,
-        blocks
-      });
-      void promise.then(({ presigned_urls }) => {
-        this.processPresignedUrls(presigned_urls);
-      });
-      prevBatchId = batchId;
-      batchPromises.push(promise);
-    }
-    void Promise.all(batchPromises).then((results) => {
-      const createdSubmissions = [];
-      const createdAttachments = [];
-      for (const result of results) {
-        for (const createdSubmission of result.submissions)
-          createdSubmissions.push(createdSubmission);
-        for (const createdAttachment of result.attachments)
-          createdAttachments.push(createdAttachment);
-      }
-      this.dispatch(addFormSubmissions(createdSubmissions));
-      this.dispatch(addFormSubmissionAttachments(createdAttachments));
-    });
-    return batchPromises;
+    return [offlineSubmission, promise];
   }
-  async update(payload) {
+  update(payload) {
     const { store } = this.client;
     const state = store.getState();
     const submissionToBeUpdated = selectFormSubmissionById(payload.offline_id)(state);
     if (!submissionToBeUpdated) {
       throw new Error(`Expected submission with offline_id ${payload.offline_id} to exist`);
     }
-    const { values, files } = separateFilesFromValues(payload.values ?? {});
+    const { values } = separateFilesFromValues(payload.values ?? {});
     const updatedSubmission = {
       ...submissionToBeUpdated,
       ...payload,
@@ -5795,39 +5555,18 @@ class FormSubmissionService extends BaseUploadService {
     const promise = this.enqueueRequest({
       description: "Delete user form submissions",
       method: HttpMethod.PATCH,
-      url: `/forms/submissions/${updatedSubmission.offline_id}/`,
+      url: `/form-submissions/${updatedSubmission.offline_id}/`,
       // TODO: send just payload when FormSubmissionDeserializer is updated to handle partial updates
       payload: updatedSubmission,
       blockers: [updatedSubmission.offline_id],
       blocks: [updatedSubmission.offline_id]
     });
-    const formSubmissionAttachments = selectAttachmentsOfFormSubmission(payload.offline_id)(state);
-    const formSubmissionAttachmentIdsToBeDeleted = [];
-    for (const attachment of formSubmissionAttachments) {
-      if (attachment.field_identifier in files) {
-        formSubmissionAttachmentIdsToBeDeleted.push(attachment.offline_id);
-      }
-    }
-    const [offlineFormSubmissionAttachments, attachmentsPromise] = await this.bulkAddSubmissionAttachments(
-      payload.offline_id,
-      files
-    );
-    const deleteAttachmentsPromise = this.bulkDeleteSubmissionAttachments(
-      payload.offline_id,
-      formSubmissionAttachmentIdsToBeDeleted
-    );
     promise.then((result) => {
       this.dispatch(setFormSubmission(result));
     }).catch(() => {
       this.dispatch(setFormSubmission(submissionToBeUpdated));
     });
-    return [
-      updatedSubmission,
-      offlineFormSubmissionAttachments,
-      promise,
-      attachmentsPromise,
-      deleteAttachmentsPromise
-    ];
+    return [updatedSubmission, promise];
   }
   async delete(id) {
     const { store } = this.client;
@@ -5843,7 +5582,7 @@ class FormSubmissionService extends BaseUploadService {
       return await this.enqueueRequest({
         description: "Delete user form submissions",
         method: HttpMethod.DELETE,
-        url: `/forms/submissions/${id}/`,
+        url: `/form-submissions/${id}/`,
         blockers: [id],
         blocks: []
       });
@@ -5854,50 +5593,17 @@ class FormSubmissionService extends BaseUploadService {
     }
   }
   async refreshStore(projectId) {
-    const formSubmissions = {};
-    const modelSubmissions = await this.enqueueRequest({
-      description: "Fetch model submissions",
-      method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/submissions/model/latest/`,
-      blockers: [],
-      blocks: []
-    });
-    for (const modelSubmission of modelSubmissions) {
-      formSubmissions[modelSubmission.offline_id] = modelSubmission;
-    }
-    const standaloneSubmissions = await this.enqueueRequest({
-      description: "Fetch standalone submissions",
-      method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/submissions/standalone/`,
-      blockers: [],
-      blocks: []
-    });
-    for (const standaloneSubmission of standaloneSubmissions) {
-      formSubmissions[standaloneSubmission.offline_id] = standaloneSubmission;
-    }
-    this.dispatch(initializeFormSubmissions(Object.values(formSubmissions)));
-    const attachments = {};
-    const modelAttachments = await this.enqueueRequest({
-      description: "Fetch model submission attachments",
-      method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/attachments/model/latest/`,
-      blockers: [],
-      blocks: []
-    });
-    for (const modelAttachment of modelAttachments) {
-      attachments[modelAttachment.offline_id] = modelAttachment;
-    }
-    const standaloneAttachments = await this.enqueueRequest({
-      description: "Fetch standalone submission attachments",
+    const result = await this.enqueueRequest({
+      description: "Fetch form submissions",
       method: HttpMethod.GET,
-      url: `/forms/in-project/${projectId}/attachments/standalone/`,
+      url: "/form-submissions/",
+      queryParams: {
+        project: projectId.toString()
+      },
       blockers: [],
       blocks: []
     });
-    for (const standaloneAttachent of standaloneAttachments) {
-      attachments[standaloneAttachent.offline_id] = standaloneAttachent;
-    }
-    this.dispatch(initializeFormSubmissionAttachments(Object.values(attachments)));
+    this.dispatch(initializeFormSubmissions(result));
   }
 }
 class WorkspaceService extends BaseApiService {
@@ -5963,9 +5669,9 @@ class WorkspaceService extends BaseApiService {
       blockers: [id],
       blocks: []
     });
-    void promise.catch((reason) => {
+    void promise.catch((e) => {
       this.dispatch(addWorkspace(originalWorkspace));
-      throw reason;
+      throw e;
     });
     return promise;
   }
@@ -6026,7 +5732,7 @@ const summarizeEvery = 20;
 class FileService extends BaseApiService {
   constructor() {
     super(...arguments);
-    __publicField(this, "host", {}.REACT_APP_API_URL);
+    __publicField(this, "host");
     // NOTE: If you alter the schema (of the IndexedDB database) in any way, you must increment the version in order to
     //  migrate the store. This allows idb to automatically migrate the user's existing data to the new schema.
     __publicField(this, "_dbPromise", openDB("fileCache", 1, {
@@ -6037,8 +5743,7 @@ class FileService extends BaseApiService {
   }
   async renewUploadUrl(sha1) {
     const file = await this.fetchCache(sha1);
-    if (!file)
-      throw new Error(`File with sha1 ${sha1} not found in cache`);
+    if (!file) throw new Error(`File with sha1 ${sha1} not found in cache`);
     const key = await getFileS3Key(file, sha1);
     const s3UploadUrl = await this.enqueueRequest({
       description: "Get S3 URL",
@@ -6108,8 +5813,7 @@ class FileService extends BaseApiService {
   /** Ensure the file has been added to the file cache before calling `uploadFileToS3()` */
   async uploadFileToS3(sha1) {
     const file = await this.fetchCache(sha1);
-    if (!file)
-      throw new Error(`File with sha1 ${sha1} not found in cache`);
+    if (!file) throw new Error(`File with sha1 ${sha1} not found in cache`);
     const key = await getFileS3Key(file, sha1);
     const dbFileProperties = {
       file_name: file.name,
@@ -6203,7 +5907,7 @@ class FileService extends BaseApiService {
 					isExternalUrl flag in the request details is set to true, because instead of requesting the local
 					REST API, you will be requesting localhost:80 (where this app runs), resulting in a transformed blob
 					(with an offline_id attached) being returned. Alternatively, you may be running with 
-					true, which will result in some file requests being treated as
+					import.meta.env.PROD, which will result in some file requests being treated as
 					external URLs and therefore not prepended with VITE_API_URL.`;
         throw new Error(message);
       }
@@ -6599,8 +6303,8 @@ class DocumentService extends BaseApiService {
 class DocumentAttachmentService extends BaseAttachmentService {
   constructor() {
     super(...arguments);
-    __publicField(this, "attachmentModel", AttachmentModel.Document);
-    __publicField(this, "initializeAttachments", initializeDocumentAttachments);
+    __publicField(this, "name", "Document Attachment");
+    __publicField(this, "url", "/document-attachments");
     __publicField(this, "addAttachments", addDocumentAttachments);
     __publicField(this, "updateAttachments", updateDocumentAttachments);
     __publicField(this, "removeAttachments", deleteDocumentAttachments);
@@ -6611,17 +6315,23 @@ class DocumentAttachmentService extends BaseAttachmentService {
   buildOfflineAttachment(data) {
     return offline({
       file: URL.createObjectURL(data.file),
-      file_sha1: data.sha1,
-      created_by: data.createdBy,
+      file_sha1: data.file_sha1,
+      created_by: data.created_by,
       file_name: data.file.name,
       file_type: data.file.type,
-      submitted_at: data.submittedAt,
+      submitted_at: data.submitted_at,
       description: data.description,
       document: data.modelId
     });
   }
+  buildAttachmentPayload(data) {
+    return {
+      ...data,
+      document: data.modelId
+    };
+  }
   // NOTE: overriding the method from BaseAttachmentService since document attachments get vectorized
-  async attachFilesToDocument(files, documentId) {
+  async bulkAdd(payloads) {
     var _a2;
     const { store } = this.client;
     const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
@@ -6630,40 +6340,37 @@ class DocumentAttachmentService extends BaseAttachmentService {
     const attachmentPayloads = [];
     const filePayloads = {};
     const sha1ToAttachmentIds = {};
-    for (const file of files) {
-      const sha1 = await hashFile(file);
-      if (!(sha1 in filePayloads)) {
-        filePayloads[sha1] = {
-          sha1,
-          file_type: file.type,
-          extension: file.name.split(".").pop(),
-          size: file.size
-        };
-        sha1ToAttachmentIds[sha1] = [];
-        await this.client.files.addCache(file, sha1);
+    for (const payload of payloads) {
+      const { documentId, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) {
+        filePayloads[filePayload.sha1] = filePayload;
+        sha1ToAttachmentIds[filePayload.sha1] = [];
       }
       const offlineAttachment = this.buildOfflineAttachment({
         file,
-        sha1,
-        submittedAt,
-        createdBy,
+        file_sha1: filePayload.sha1,
+        submitted_at: submittedAt,
+        created_by: createdBy,
         description: "",
         modelId: documentId
       });
       offlineAttachments.push(offlineAttachment);
       attachmentPayloads.push({
         offline_id: offlineAttachment.offline_id,
-        name: offlineAttachment.file_name,
-        sha1: offlineAttachment.file_sha1,
-        description: offlineAttachment.description
+        file_name: offlineAttachment.file_name,
+        file_sha1: offlineAttachment.file_sha1,
+        file_extension: filePayload.extension,
+        description: offlineAttachment.description,
+        document: documentId
       });
-      sha1ToAttachmentIds[sha1].push(offlineAttachment.offline_id);
+      sha1ToAttachmentIds[filePayload.sha1].push(offlineAttachment.offline_id);
     }
     this.dispatch(this.addAttachments(offlineAttachments));
     const promise = this.enqueueRequest({
       description: "Attach files to document",
       method: HttpMethod.POST,
-      url: `/documents/${documentId}/attach/`,
+      url: "/document-attachments/bulk/",
       payload: {
         submitted_at: submittedAt,
         attachments: attachmentPayloads,
@@ -6688,14 +6395,14 @@ class DocumentAttachmentService extends BaseAttachmentService {
     });
     return [offlineAttachments, promise.then(({ attachments }) => attachments)];
   }
-  async deleteDocumentAttachment(attachmentId) {
-    return this.deleteAttachment(attachmentId);
+  async delete(id) {
+    return this._delete(id);
   }
   makeReadable(attachmnentId) {
     void this.enqueueRequest({
       description: "Add attachment to AI assistant",
       method: HttpMethod.PATCH,
-      url: `/documents/attachments/${attachmnentId}/`,
+      url: `/document-attachments/${attachmnentId}/`,
       payload: {
         readable_to_assistant: true
       },
@@ -6712,7 +6419,7 @@ class DocumentAttachmentService extends BaseAttachmentService {
       blocks: [],
       blockers: []
     });
-    this.dispatch(this.initializeAttachments(projectDocumentAttachments));
+    this.dispatch(initializeDocumentAttachments(projectDocumentAttachments));
     const organizationDocumentAttachments = await this.enqueueRequest({
       description: "Get document attachments",
       method: HttpMethod.GET,
@@ -6948,17 +6655,11 @@ class GeoImageService extends BaseUploadService {
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const projectId = payloadWithoutFile.project;
-    const sha1 = await hashFile(file);
-    const filePayload = {
-      sha1,
-      file_type: file.type,
-      extension: file.name.split(".").pop(),
-      size: file.size
-    };
+    const filePayload = await this.getFilePayload(file);
     const offlineMapImage = offline({
       ...payloadWithoutFile,
       file_name: file.name,
-      file_sha1: sha1,
+      file_sha1: filePayload.sha1,
       file: URL.createObjectURL(file),
       submitted_at: submittedAt,
       created_by: createdBy
@@ -7001,23 +6702,15 @@ class GeoImageService extends BaseUploadService {
     const offlineGeoImages = [];
     const offlineIds = [];
     const geoImagePayloads = [];
-    const filePayloadRecord = {};
+    const filePayloads = {};
     for (const payloadAndFile of payloads) {
       const { file, ...payload } = payloadAndFile;
-      const sha1 = await hashFile(file);
-      if (!(sha1 in filePayloadRecord)) {
-        filePayloadRecord[sha1] = {
-          sha1,
-          file_type: file.type,
-          extension: file.name.split(".").pop(),
-          size: file.size
-        };
-        await this.client.files.addCache(file, sha1);
-      }
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
       const offlineMapImage = offline({
         ...payload,
         file_name: file.name,
-        file_sha1: sha1,
+        file_sha1: filePayload.sha1,
         file: URL.createObjectURL(file),
         submitted_at: submittedAt,
         created_by: createdBy,
@@ -7046,7 +6739,7 @@ class GeoImageService extends BaseUploadService {
         submitted_at: submittedAt,
         project: projectId,
         geo_images: geoImagePayloads,
-        files: Object.values(filePayloadRecord)
+        files: Object.values(filePayloads)
       },
       blocks: [projectId.toString()],
       blockers: offlineIds
@@ -7114,7 +6807,7 @@ class GeoImageService extends BaseUploadService {
     this.dispatch(initializeGeoImages(result));
   }
 }
-class IssueAssociationService extends BaseUploadService {
+class IssueAssociationService extends BaseApiService {
   add(payload) {
     var _a2;
     const { store } = this.client;
@@ -7129,7 +6822,7 @@ class IssueAssociationService extends BaseUploadService {
     const promise = this.enqueueRequest({
       description: "Add issue association",
       method: HttpMethod.POST,
-      url: "/issues/associations/",
+      url: "/issue-associations/",
       payload: {
         offline_id: offlineIssueAssociation.offline_id,
         submitted_at: submittedAt,
@@ -7159,7 +6852,7 @@ class IssueAssociationService extends BaseUploadService {
     const promise = this.enqueueRequest({
       description: "Delete issue association",
       method: HttpMethod.DELETE,
-      url: `/issues/associations/${id}/`,
+      url: `/issue-associations/${id}/`,
       blockers: [id],
       blocks: []
     });
@@ -7172,14 +6865,917 @@ class IssueAssociationService extends BaseUploadService {
     const issueAssociations = await this.enqueueRequest({
       description: "Fetch issue associations",
       method: HttpMethod.GET,
-      url: "/issues/associations/",
-      queryParams: { project_id: projectId.toString() },
+      url: "/issue-associations/",
+      queryParams: { project: projectId.toString() },
       blockers: [],
       blocks: []
     });
     this.dispatch(initializeIssueAssociations(issueAssociations));
   }
 }
+class FormRevisionAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const filePayloads = {};
+    const offlineFormRevisionAttachments = [];
+    const attachmentPayloads = [];
+    for (const payload of payloads) {
+      const { revisionId, fieldIdentifier, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineFormRevisionAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        created_by: createdBy,
+        form_revision: revisionId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
+      });
+      offlineFormRevisionAttachments.push(offlineFormRevisionAttachment);
+      const attachmentPayload = {
+        offline_id: offlineFormRevisionAttachment.offline_id,
+        file_name: file.name,
+        field_identifier: fieldIdentifier,
+        file_extension: filePayload.extension,
+        file_sha1: filePayload.sha1,
+        form_revision: revisionId
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addFormRevisionAttachments(offlineFormRevisionAttachments));
+    const promise = this.enqueueRequest({
+      description: "Attach files to form revision",
+      method: HttpMethod.POST,
+      url: "/form-revision-attachments/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: offlineFormRevisionAttachments.map((attachment) => attachment.form_revision),
+      blocks: offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateFormRevisionAttachments(result.attachments));
+    }).catch(() => {
+      this.dispatch(
+        deleteFormRevisionAttachments(
+          offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+    });
+    return [offlineFormRevisionAttachments, promise.then(({ attachments }) => attachments)];
+  }
+  async refreshStore(organizationId) {
+    const formRevisions = await this.enqueueRequest({
+      description: "Fetch organization form revision attachments",
+      method: HttpMethod.GET,
+      url: "/form-revision-attachments/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [organizationId.toString()],
+      blocks: []
+    });
+    this.dispatch(initializeFormRevisionAttachments(formRevisions));
+  }
+}
+class FormSubmissionAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const filePayloads = {};
+    const offlineFormSubmissionAttachments = [];
+    const attachmentPayloads = [];
+    for (const payload of payloads) {
+      const { submissionId, fieldIdentifier, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineFormSubmissionAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        created_by: createdBy,
+        form_submission: submissionId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
+      });
+      offlineFormSubmissionAttachments.push(offlineFormSubmissionAttachment);
+      const attachmentPayload = {
+        offline_id: offlineFormSubmissionAttachment.offline_id,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        file_extension: filePayload.extension,
+        field_identifier: fieldIdentifier,
+        form_submission: submissionId
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addFormSubmissionAttachments(offlineFormSubmissionAttachments));
+    const promise = this.enqueueRequest({
+      description: "Attach files to form submission",
+      method: HttpMethod.POST,
+      url: "/form-submission-attachments/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: offlineFormSubmissionAttachments.map((attachment) => attachment.form_submission),
+      blocks: offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateFormSubmissionAttachments(result.attachments));
+    }).catch((error) => {
+      this.dispatch(
+        deleteFormSubmissionAttachments(
+          offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+      throw error;
+    });
+    return [offlineFormSubmissionAttachments, promise.then(({ attachments }) => attachments)];
+  }
+  async bulkDelete(attachmentsIds) {
+    const { store } = this.client;
+    const state = store.getState();
+    const formSubmissionAttachments = selectFormSubmissionAttachemntsByIds(attachmentsIds)(state);
+    this.dispatch(deleteFormSubmissionAttachments(attachmentsIds));
+    try {
+      await this.enqueueRequest({
+        description: "Delete form submission attachments",
+        method: HttpMethod.DELETE,
+        url: "/form-submission-attachments/bulk/",
+        payload: { attachment_ids: attachmentsIds },
+        blockers: attachmentsIds,
+        blocks: []
+      });
+    } catch (e) {
+      this.dispatch(addFormSubmissionAttachments(formSubmissionAttachments));
+      throw e;
+    }
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get form submission attachments",
+      method: HttpMethod.GET,
+      url: "/form-submission-attachments/",
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeFormSubmissionAttachments(result));
+  }
+}
+class FormRevisionService extends BaseUploadService {
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const state = store.getState();
+    const createdBy = (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id;
+    const offlineFormRevision = offline({
+      ...payload,
+      created_by: createdBy,
+      revision: "Pending",
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    this.dispatch(addFormRevision(offlineFormRevision));
+    const promise = this.enqueueRequest({
+      description: "Create form revision",
+      method: HttpMethod.POST,
+      url: "/form-revisions/",
+      payload: offlineFormRevision,
+      blockers: [payload.form],
+      blocks: [offlineFormRevision.offline_id]
+    });
+    void promise.then((result) => {
+      this.dispatch(setFormRevision(result));
+    }).catch(() => {
+      this.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
+    });
+    return [offlineFormRevision, promise];
+  }
+  async refreshStore(organizationId) {
+    const formRevisions = await this.enqueueRequest({
+      description: "Get organization form revisions",
+      method: HttpMethod.GET,
+      url: "/form-revisions/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [organizationId.toString()],
+      blocks: []
+    });
+    this.dispatch(initializeFormRevisions(formRevisions));
+  }
+}
+class AssetTypeFieldsAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const filePayloads = {};
+    const offlineAssetTypeFieldsAttachments = [];
+    const attachmentPayloads = [];
+    for (const payload of payloads) {
+      const { fieldsRevisionId, fieldIdentifier, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineAssetTypeFieldsAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        created_by: createdBy,
+        fields_revision: fieldsRevisionId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
+      });
+      offlineAssetTypeFieldsAttachments.push(offlineAssetTypeFieldsAttachment);
+      const attachmentPayload = {
+        offline_id: offlineAssetTypeFieldsAttachment.offline_id,
+        file_name: file.name,
+        field_identifier: fieldIdentifier,
+        file_extension: filePayload.extension,
+        file_sha1: filePayload.sha1,
+        fields_revision: fieldsRevisionId
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addAssetTypeFieldsAttachments(offlineAssetTypeFieldsAttachments));
+    const promise = this.enqueueRequest({
+      description: "Add asset type fields attachments",
+      method: HttpMethod.POST,
+      url: "/asset-type-fields-attachments/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: offlineAssetTypeFieldsAttachments.map((attachment) => attachment.fields_revision),
+      blocks: offlineAssetTypeFieldsAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateAssetTypeFieldsAttachments(result.attachments));
+    }).catch(() => {
+      this.dispatch(
+        deleteAssetTypeFieldsAttachments(
+          offlineAssetTypeFieldsAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+    });
+    return [offlineAssetTypeFieldsAttachments, promise.then(({ attachments }) => attachments)];
+  }
+  async refreshStore(organization) {
+    const result = await this.enqueueRequest({
+      description: "Get asset type fields attachments",
+      method: HttpMethod.GET,
+      url: "/asset-type-fields-attachments/",
+      queryParams: {
+        organization: organization.toString()
+      },
+      blockers: [organization.toString()],
+      blocks: []
+    });
+    this.dispatch(initializeAssetTypeFieldsAttachments(result));
+  }
+}
+class AssetTypeFieldsService extends BaseApiService {
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineAssetTypeFields = offline({
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
+    });
+    this.dispatch(addAssetTypeFields(offlineAssetTypeFields));
+    const promise = this.enqueueRequest({
+      description: "Add Asset Type Fields",
+      method: HttpMethod.POST,
+      url: "/asset-type-fields/",
+      payload: offlineAssetTypeFields,
+      blockers: [offlineAssetTypeFields.asset_type],
+      blocks: [offlineAssetTypeFields.offline_id]
+    });
+    promise.then((response) => {
+      this.dispatch(updateAssetTypeFields(response));
+    }).catch((error) => {
+      this.dispatch(deleteAssetTypeFields(offlineAssetTypeFields.offline_id));
+      throw error;
+    });
+    return [offlineAssetTypeFields, promise];
+  }
+  async refreshStore(organizationId) {
+    const result = await this.enqueueRequest({
+      description: "Get Asset Type Fields",
+      method: HttpMethod.GET,
+      url: "/asset-type-fields/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeAssetTypeFields(result));
+  }
+}
+class AssetTypeFieldValuesService extends BaseApiService {
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const state = store.getState();
+    const { values } = separateFilesFromValues(payload.values);
+    const offlineAssetTypeFieldValues = offline({
+      ...payload,
+      values,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    const promise = this.enqueueRequest({
+      description: "Add asset type field values",
+      method: HttpMethod.POST,
+      url: "/asset-type-field-values/",
+      payload: offlineAssetTypeFieldValues,
+      blockers: [payload.asset, payload.fields_revision],
+      blocks: [offlineAssetTypeFieldValues.offline_id]
+    });
+    this.dispatch(addAssetTypeFieldValues(offlineAssetTypeFieldValues));
+    promise.then((result) => {
+      this.dispatch(updateAssetTypeFieldValues(result));
+      return result;
+    }).catch(() => {
+      this.dispatch(deleteAssetTypeFieldValues(offlineAssetTypeFieldValues.offline_id));
+    });
+    return [offlineAssetTypeFieldValues, promise];
+  }
+  bulkAdd(payload, batchSize) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const { values } = separateFilesFromValues(payload.values);
+    const offlineAssetTypeFieldValuesMany = [];
+    const batches = chunkArray(payload.payloads, batchSize ?? payload.payloads.length);
+    const batchPayloads = [];
+    for (const batch of batches) {
+      const assetTypeFieldValuesPayloads = [];
+      for (const payload2 of batch) {
+        const offlineAssetTypeFieldValues = offline({
+          ...payload2,
+          values: separateFilesFromValues(payload2.values).values,
+          created_by: (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id,
+          submitted_at: submittedAt
+        });
+        offlineAssetTypeFieldValuesMany.push(offlineAssetTypeFieldValues);
+        assetTypeFieldValuesPayloads.push({
+          offline_id: offlineAssetTypeFieldValues.offline_id,
+          asset: payload2.asset,
+          fields_revision: payload2.fields_revision,
+          published_at: payload2.published_at,
+          values: offlineAssetTypeFieldValues.values
+        });
+      }
+      batchPayloads.push({
+        submitted_at: submittedAt,
+        values,
+        field_values: assetTypeFieldValuesPayloads
+      });
+    }
+    this.dispatch(addAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany));
+    const promises = [];
+    for (const payload2 of batchPayloads) {
+      const assetIds = payload2.field_values.map((x) => x.asset);
+      const assetTypeFieldsIds = payload2.field_values.map((x) => x.fields_revision);
+      const assetTypeFieldValuesIds = payload2.field_values.map((x) => x.offline_id);
+      const promise = this.enqueueRequest({
+        description: "Bulk add asset type field values",
+        method: HttpMethod.POST,
+        url: "/asset-type-field-values/bulk/",
+        payload: payload2,
+        blockers: [...assetIds, ...assetTypeFieldsIds],
+        blocks: assetTypeFieldValuesIds
+      });
+      promises.push(promise);
+    }
+    void Promise.all(promises).then((results) => {
+      this.dispatch(updateAssetTypeFieldValuesMany(results.flat()));
+    }).catch(() => {
+      this.dispatch(deleteAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany.map((x) => x.offline_id)));
+    });
+    return [offlineAssetTypeFieldValuesMany, promises];
+  }
+  update(payload) {
+    const { store } = this.client;
+    const state = store.getState();
+    const assetTypeFieldValues = selectAssetTypeFieldValuesById(payload.offline_id)(state);
+    if (!assetTypeFieldValues) {
+      throw new Error(`Expected AssetTypeFieldValues with offline_id ${payload.offline_id} to exist`);
+    }
+    const { values } = separateFilesFromValues(payload.values ?? {});
+    const updatedAssetTypeFieldValues = {
+      ...assetTypeFieldValues,
+      ...payload,
+      // values could also have a partial update
+      values: {
+        ...assetTypeFieldValues.values,
+        ...values
+      }
+    };
+    this.dispatch(updateAssetTypeFieldValues(updatedAssetTypeFieldValues));
+    const promise = this.enqueueRequest({
+      description: "Delete asset type field values",
+      method: HttpMethod.PATCH,
+      url: `/asset-type-field-values/${payload.offline_id}/`,
+      payload: {
+        ...payload,
+        values: {
+          ...assetTypeFieldValues.values,
+          ...values
+        }
+      },
+      blockers: [
+        updatedAssetTypeFieldValues.offline_id,
+        updatedAssetTypeFieldValues.fields_revision,
+        updatedAssetTypeFieldValues.asset
+      ],
+      blocks: [updatedAssetTypeFieldValues.offline_id]
+    });
+    promise.then((result) => {
+      this.dispatch(updateAssetTypeFieldValues(result));
+    }).catch(() => {
+      this.dispatch(updateAssetTypeFieldValues(assetTypeFieldValues));
+    });
+    return [updatedAssetTypeFieldValues, promise];
+  }
+  async delete(id) {
+    const { store } = this.client;
+    const state = store.getState();
+    const assetTypeFieldValues = selectAssetTypeFieldValuesById(id)(state);
+    if (!assetTypeFieldValues) {
+      throw new Error(`Expected submission with offline_id ${id} to exist`);
+    }
+    const assetTypeFieldValuesAttachments = selectAttachmentsOfAssetTypeFieldValues(id)(state);
+    this.dispatch(deleteAssetTypeFieldValues(id));
+    this.dispatch(deleteAssetTypeFieldValuesAttachments(assetTypeFieldValuesAttachments.map((x) => x.offline_id)));
+    try {
+      await this.enqueueRequest({
+        description: "Delete asset type field values",
+        method: HttpMethod.DELETE,
+        url: `/asset-type-field-values/${id}/`,
+        blockers: [id],
+        blocks: []
+      });
+    } catch (e) {
+      this.dispatch(addAssetTypeFieldValues(assetTypeFieldValues));
+      this.dispatch(addAssetTypeFieldValuesAttachments(assetTypeFieldValuesAttachments));
+      throw e;
+    }
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get asset type field values",
+      method: HttpMethod.GET,
+      url: "/asset-type-field-values/",
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeAssetTypeFieldValues(result));
+  }
+}
+class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads, batchSize) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const batches = chunkArray(payloads, batchSize ?? payloads.length);
+    const offlineAssetTypeFieldValuesAttachments = [];
+    const batchPayloads = [];
+    for (const batch of batches) {
+      const filePayloads = {};
+      const attachmentPayloads = [];
+      for (const payload of batch) {
+        const { fieldValuesId, fieldIdentifier, file } = payload;
+        const filePayload = await this.getFilePayload(file);
+        if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+        const offlineAssetTypeFieldValuesAttachment = offline({
+          file: URL.createObjectURL(file),
+          file_type: file.type,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          created_by: createdBy,
+          field_values: fieldValuesId,
+          submitted_at: submittedAt,
+          field_identifier: fieldIdentifier
+        });
+        offlineAssetTypeFieldValuesAttachments.push(offlineAssetTypeFieldValuesAttachment);
+        const attachmentPayload = {
+          offline_id: offlineAssetTypeFieldValuesAttachment.offline_id,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          file_extension: filePayload.extension,
+          field_identifier: fieldIdentifier,
+          field_values: fieldValuesId
+        };
+        attachmentPayloads.push(attachmentPayload);
+      }
+      batchPayloads.push({
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      });
+    }
+    this.dispatch(addAssetTypeFieldValuesAttachments(offlineAssetTypeFieldValuesAttachments));
+    const promises = batchPayloads.map((payload) => {
+      return this.enqueueRequest({
+        description: "Add asset type field values attachments",
+        method: HttpMethod.POST,
+        url: "/asset-type-field-values-attachments/bulk/",
+        payload,
+        blockers: payload.attachments.map((payload2) => payload2.field_values),
+        blocks: payload.attachments.map((payload2) => payload2.offline_id)
+      });
+    });
+    Promise.all(promises).then((result) => {
+      for (const res of result) this.processPresignedUrls(res.presigned_urls);
+      const attachments = result.flatMap((res) => res.attachments);
+      this.dispatch(updateAssetTypeFieldValuesAttachments(attachments));
+    }).catch((error) => {
+      this.dispatch(
+        deleteAssetTypeFieldValuesAttachments(
+          offlineAssetTypeFieldValuesAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+      throw error;
+    });
+    return [
+      offlineAssetTypeFieldValuesAttachments,
+      promises.map((promise) => promise.then(({ attachments }) => attachments))
+    ];
+  }
+  async bulkDelete(ids) {
+    const { store } = this.client;
+    const state = store.getState();
+    const attachments = selectAssetTypeFieldValuesAttachmentsByIds(ids)(state);
+    this.dispatch(deleteAssetTypeFieldValuesAttachments(ids));
+    try {
+      await this.enqueueRequest({
+        description: "Delete asset type field values attachments",
+        method: HttpMethod.DELETE,
+        url: "/asset-type-field-values-attachments/bulk/",
+        payload: { attachment_ids: ids },
+        blockers: ids,
+        blocks: []
+      });
+    } catch (e) {
+      this.dispatch(addAssetTypeFieldValuesAttachments(attachments));
+      throw e;
+    }
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get asset type field values attachments",
+      method: HttpMethod.GET,
+      url: "/asset-type-field-values-attachments/",
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeAssetTypeFieldValuesAttachments(result));
+  }
+}
+class IssueTypeFieldsAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const filePayloads = {};
+    const offlineIssueTypeFieldsAttachments = [];
+    const attachmentPayloads = [];
+    for (const payload of payloads) {
+      const { fieldsRevisionId, fieldIdentifier, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineIssueTypeFieldsAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        created_by: createdBy,
+        fields_revision: fieldsRevisionId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
+      });
+      offlineIssueTypeFieldsAttachments.push(offlineIssueTypeFieldsAttachment);
+      const attachmentPayload = {
+        offline_id: offlineIssueTypeFieldsAttachment.offline_id,
+        file_name: file.name,
+        file_extension: filePayload.extension,
+        field_identifier: fieldIdentifier,
+        file_sha1: filePayload.sha1,
+        fields_revision: fieldsRevisionId
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addIssueTypeFieldsAttachments(offlineIssueTypeFieldsAttachments));
+    const promise = this.enqueueRequest({
+      description: "Add issue type fields attachments",
+      method: HttpMethod.POST,
+      url: "/issue-type-fields-attachments/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: offlineIssueTypeFieldsAttachments.map((attachment) => attachment.fields_revision),
+      blocks: offlineIssueTypeFieldsAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateIssueTypeFieldsAttachments(result.attachments));
+    }).catch(() => {
+      this.dispatch(
+        deleteIssueTypeFieldsAttachments(
+          offlineIssueTypeFieldsAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+    });
+    return [offlineIssueTypeFieldsAttachments, promise.then(({ attachments }) => attachments)];
+  }
+  async refreshStore(organizationId) {
+    const result = await this.enqueueRequest({
+      description: "get issue type fields attachments",
+      method: HttpMethod.GET,
+      url: "/issue-type-fields-attachments/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [organizationId.toString()],
+      blocks: []
+    });
+    this.dispatch(initializeIssueTypeFieldsAttachments(result));
+  }
+}
+class IssueTypeFieldsService extends BaseApiService {
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineIssueTypeFields = offline({
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
+    });
+    this.dispatch(addIssueTypeFields(offlineIssueTypeFields));
+    const promise = this.enqueueRequest({
+      description: "Add Issue Type Fields",
+      method: HttpMethod.POST,
+      url: "/issue-type-fields/",
+      payload: offlineIssueTypeFields,
+      blockers: [offlineIssueTypeFields.issue_type],
+      blocks: [offlineIssueTypeFields.offline_id]
+    });
+    promise.then((response) => {
+      this.dispatch(updateIssueTypeFields(response));
+    }).catch((error) => {
+      this.dispatch(deleteIssueTypeFields(offlineIssueTypeFields.offline_id));
+      throw error;
+    });
+    return [offlineIssueTypeFields, promise];
+  }
+  async refreshStore(organizationId) {
+    const result = await this.enqueueRequest({
+      description: "Get Issue Type Fields",
+      method: HttpMethod.GET,
+      url: "/issue-type-fields/",
+      queryParams: {
+        organization: organizationId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeIssueTypeFields(result));
+  }
+}
+class IssueTypeFieldValuesAttachmentService extends BaseUploadService {
+  async bulkAdd(payloads) {
+    var _a2;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const filePayloads = {};
+    const offlineIssueTypeFieldValuesAttachments = [];
+    const attachmentPayloads = [];
+    for (const payload of payloads) {
+      const { fieldValuesId, fieldIdentifier, file } = payload;
+      const filePayload = await this.getFilePayload(file);
+      if (!(filePayload.sha1 in filePayloads)) filePayloads[filePayload.sha1] = filePayload;
+      const offlineIssueTypeFieldValuesAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        created_by: createdBy,
+        field_values: fieldValuesId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
+      });
+      offlineIssueTypeFieldValuesAttachments.push(offlineIssueTypeFieldValuesAttachment);
+      const attachmentPayload = {
+        offline_id: offlineIssueTypeFieldValuesAttachment.offline_id,
+        file_name: file.name,
+        file_sha1: filePayload.sha1,
+        file_extension: filePayload.extension,
+        field_identifier: fieldIdentifier,
+        field_values: fieldValuesId
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addIssueTypeFieldValuesAttachments(offlineIssueTypeFieldValuesAttachments));
+    const promise = this.enqueueRequest({
+      description: "Add issue type field values attachments",
+      method: HttpMethod.POST,
+      url: "/issue-type-field-values-attachments/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: offlineIssueTypeFieldValuesAttachments.map((attachment) => attachment.field_values),
+      blocks: offlineIssueTypeFieldValuesAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then(({ presigned_urls, attachments }) => {
+      this.processPresignedUrls(presigned_urls);
+      this.dispatch(updateIssueTypeFieldValuesAttachments(attachments));
+    }).catch((error) => {
+      this.dispatch(
+        deleteIssueTypeFieldValuesAttachments(
+          offlineIssueTypeFieldValuesAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+      throw error;
+    });
+    return [offlineIssueTypeFieldValuesAttachments, promise.then(({ attachments }) => attachments)];
+  }
+  async bulkDelete(attachmentsIds) {
+    const { store } = this.client;
+    const state = store.getState();
+    const attachments = selectIssueTypeFieldValuesAttachmentsByIds(attachmentsIds)(state);
+    this.dispatch(deleteIssueTypeFieldValuesAttachments(attachmentsIds));
+    try {
+      await this.enqueueRequest({
+        description: "Delete issue type field values attachments",
+        method: HttpMethod.DELETE,
+        url: "/issue-type-field-values-attachments/bulk/",
+        payload: { attachment_ids: attachmentsIds },
+        blockers: attachmentsIds,
+        blocks: []
+      });
+    } catch (e) {
+      this.dispatch(addIssueTypeFieldValuesAttachments(attachments));
+      throw e;
+    }
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get issue type field values attachments",
+      method: HttpMethod.GET,
+      url: "/issue-type-field-values-attachments/",
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeIssueTypeFieldValuesAttachments(result));
+  }
+}
+class IssueTypeFieldValuesService extends BaseApiService {
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const state = store.getState();
+    const { values } = separateFilesFromValues(payload.values);
+    const offlineIssueTypeFieldValues = offline({
+      ...payload,
+      values,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    const promise = this.enqueueRequest({
+      description: "Add issue type field values",
+      method: HttpMethod.POST,
+      url: "/issue-type-field-values/",
+      payload: offlineIssueTypeFieldValues,
+      blockers: [payload.issue, payload.fields_revision],
+      blocks: [offlineIssueTypeFieldValues.offline_id]
+    });
+    this.dispatch(addIssueTypeFieldValues(offlineIssueTypeFieldValues));
+    promise.then((result) => {
+      this.dispatch(updateIssueTypeFieldValues(result));
+      return result;
+    }).catch(() => {
+      this.dispatch(deleteIssueTypeFieldValues(offlineIssueTypeFieldValues.offline_id));
+    });
+    return [offlineIssueTypeFieldValues, promise];
+  }
+  update(payload) {
+    const { store } = this.client;
+    const state = store.getState();
+    const issueTypeFieldValues = selectIssueTypeFieldValuesById(payload.offline_id)(state);
+    if (!issueTypeFieldValues) {
+      throw new Error(`Expected IssueTypeFieldValues with offline_id ${payload.offline_id} to exist`);
+    }
+    const { values } = separateFilesFromValues(payload.values ?? {});
+    const updatedIssueTypeFieldValues = {
+      ...issueTypeFieldValues,
+      ...payload,
+      // values could also have a partial update
+      values: {
+        ...issueTypeFieldValues.values,
+        ...values
+      }
+    };
+    this.dispatch(updateIssueTypeFieldValues(updatedIssueTypeFieldValues));
+    const promise = this.enqueueRequest({
+      description: "Update issue type field values",
+      method: HttpMethod.PATCH,
+      url: `/issue-type-field-values/${payload.offline_id}/`,
+      payload: {
+        ...payload,
+        values: {
+          ...issueTypeFieldValues.values,
+          ...values
+        }
+      },
+      blockers: [
+        updatedIssueTypeFieldValues.offline_id,
+        updatedIssueTypeFieldValues.fields_revision,
+        updatedIssueTypeFieldValues.issue
+      ],
+      blocks: [updatedIssueTypeFieldValues.offline_id]
+    });
+    promise.then((result) => {
+      this.dispatch(updateIssueTypeFieldValues(result));
+    }).catch(() => {
+      this.dispatch(updateIssueTypeFieldValues(issueTypeFieldValues));
+    });
+    return [updatedIssueTypeFieldValues, promise];
+  }
+  async delete(id) {
+    const { store } = this.client;
+    const state = store.getState();
+    const issueTypeFieldValues = selectIssueTypeFieldValuesById(id)(state);
+    if (!issueTypeFieldValues) {
+      throw new Error(`Expected submission with offline_id ${id} to exist`);
+    }
+    const issueTypeFieldValuesAttachments = selectAttachmentsOfIssueTypeFieldValues(id)(state);
+    this.dispatch(deleteIssueTypeFieldValues(id));
+    this.dispatch(deleteIssueTypeFieldValuesAttachments(issueTypeFieldValuesAttachments.map((x) => x.offline_id)));
+    try {
+      await this.enqueueRequest({
+        description: "Delete issue type field values",
+        method: HttpMethod.DELETE,
+        url: `/issue-type-field-values/${id}/`,
+        blockers: [id],
+        blocks: []
+      });
+    } catch (e) {
+      this.dispatch(addIssueTypeFieldValues(issueTypeFieldValues));
+      this.dispatch(addIssueTypeFieldValuesAttachments(issueTypeFieldValuesAttachments));
+      throw e;
+    }
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get issue type field values",
+      method: HttpMethod.GET,
+      url: "/issue-type-field-values/",
+      queryParams: {
+        project: projectId.toString()
+      },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeIssueTypeFieldValues(result));
+  }
+}
 var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
   VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
   VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
@@ -7197,6 +7793,10 @@ export {
   AssetStageCompletionService,
   AssetStageService,
   AssetTypeAttachmentService,
+  AssetTypeFieldValuesAttachmentService,
+  AssetTypeFieldValuesService,
+  AssetTypeFieldsAttachmentService,
+  AssetTypeFieldsService,
   AssetTypeService,
   AttachmentModel,
   BaseApiService,
@@ -7213,7 +7813,10 @@ export {
   EmailDomainsService,
   EmailVerificationService,
   FileService,
+  FormRevisionAttachmentService,
+  FormRevisionService,
   FormService,
+  FormSubmissionAttachmentService,
   FormSubmissionService,
   GREEN,
   GeoImageService,
@@ -7224,6 +7827,10 @@ export {
   IssuePriority,
   IssueService,
   IssueStatus,
+  IssueTypeFieldValuesAttachmentService,
+  IssueTypeFieldValuesService,
+  IssueTypeFieldsAttachmentService,
+  IssueTypeFieldsService,
   IssueTypeService,
   IssueUpdateChange,
   IssueUpdateService,
@@ -7243,6 +7850,7 @@ export {
   ProjectFileService,
   ProjectService,
   TeamService,
+  UNKNOWN_ERROR_MESSAGE,
   UserService,
   VERSION_REDUCER_KEY,
   VerificationCodeType,
@@ -7261,6 +7869,14 @@ export {
   addAssetType,
   addAssetTypeAttachment,
   addAssetTypeAttachments,
+  addAssetTypeFieldValues,
+  addAssetTypeFieldValuesAttachment,
+  addAssetTypeFieldValuesAttachments,
+  addAssetTypeFieldValuesMany,
+  addAssetTypeFields,
+  addAssetTypeFieldsAttachment,
+  addAssetTypeFieldsAttachments,
+  addAssetTypeFieldsMany,
   addAssetTypes,
   addAssets,
   addCategory,
@@ -7289,6 +7905,14 @@ export {
   addIssueComment,
   addIssueComments,
   addIssueType,
+  addIssueTypeFieldValues,
+  addIssueTypeFieldValuesAttachment,
+  addIssueTypeFieldValuesAttachments,
+  addIssueTypeFieldValuesMany,
+  addIssueTypeFields,
+  addIssueTypeFieldsAttachment,
+  addIssueTypeFieldsAttachments,
+  addIssueTypeFieldsMany,
   addIssueUpdate,
   addIssueUpdates,
   addIssues,
@@ -7313,6 +7937,14 @@ export {
   assetStageSlice,
   assetTypeAttachmentReducer,
   assetTypeAttachmentSlice,
+  assetTypeFieldValuesAttachmentReducer,
+  assetTypeFieldValuesAttachmentSlice,
+  assetTypeFieldValuesReducer,
+  assetTypeFieldValuesSlice,
+  assetTypeFieldsAttachmentReducer,
+  assetTypeFieldsAttachmentSlice,
+  assetTypeFieldsReducer,
+  assetTypeFieldsSlice,
   assetTypeReducer,
   assetTypeSlice,
   authReducer,
@@ -7337,6 +7969,14 @@ export {
   deleteAssetType,
   deleteAssetTypeAttachment,
   deleteAssetTypeAttachments,
+  deleteAssetTypeFieldValues,
+  deleteAssetTypeFieldValuesAttachment,
+  deleteAssetTypeFieldValuesAttachments,
+  deleteAssetTypeFieldValuesMany,
+  deleteAssetTypeFields,
+  deleteAssetTypeFieldsAttachment,
+  deleteAssetTypeFieldsAttachments,
+  deleteAssetTypeFieldsMany,
   deleteAssetTypes,
   deleteAssets,
   deleteCategory,
@@ -7361,6 +8001,14 @@ export {
   deleteIssueAttachments,
   deleteIssueComment,
   deleteIssueComments,
+  deleteIssueTypeFieldValues,
+  deleteIssueTypeFieldValuesAttachment,
+  deleteIssueTypeFieldValuesAttachments,
+  deleteIssueTypeFieldValuesMany,
+  deleteIssueTypeFields,
+  deleteIssueTypeFieldsAttachment,
+  deleteIssueTypeFieldsAttachments,
+  deleteIssueTypeFieldsMany,
   deleteIssueUpdate,
   deleteIssueUpdates,
   deleteIssues,
@@ -7418,6 +8066,10 @@ export {
   initializeAssetStageCompletions,
   initializeAssetStages,
   initializeAssetTypeAttachments,
+  initializeAssetTypeFieldValues,
+  initializeAssetTypeFieldValuesAttachments,
+  initializeAssetTypeFields,
+  initializeAssetTypeFieldsAttachments,
   initializeAssetTypes,
   initializeAssets,
   initializeCategories,
@@ -7432,6 +8084,10 @@ export {
   initializeGeoImages,
   initializeIssueAssociations,
   initializeIssueAttachments,
+  initializeIssueTypeFieldValues,
+  initializeIssueTypeFieldValuesAttachments,
+  initializeIssueTypeFields,
+  initializeIssueTypeFieldsAttachments,
   initializeIssueTypes,
   initializeIssueUpdates,
   initializeIssues,
@@ -7451,6 +8107,14 @@ export {
   issueCommentSlice,
   issueReducer,
   issueSlice,
+  issueTypeFieldValuesAttachmentReducer,
+  issueTypeFieldValuesAttachmentSlice,
+  issueTypeFieldValuesReducer,
+  issueTypeFieldValuesSlice,
+  issueTypeFieldsAttachmentReducer,
+  issueTypeFieldsAttachmentSlice,
+  issueTypeFieldsReducer,
+  issueTypeFieldsSlice,
   issueTypeReducer,
   issueTypeSlice,
   issueUpdateReducer,
@@ -7514,7 +8178,23 @@ export {
   selectAssetTypeAttachmentMapping,
   selectAssetTypeAttachments,
   selectAssetTypeById,
+  selectAssetTypeFieldValues,
+  selectAssetTypeFieldValuesAttachmentById,
+  selectAssetTypeFieldValuesAttachments,
+  selectAssetTypeFieldValuesAttachmentsByIds,
+  selectAssetTypeFieldValuesAttachmentsMapping,
+  selectAssetTypeFieldValuesById,
+  selectAssetTypeFieldValuesMapping,
+  selectAssetTypeFieldValuesOfAsset,
+  selectAssetTypeFields,
+  selectAssetTypeFieldsAttachmentById,
+  selectAssetTypeFieldsAttachments,
+  selectAssetTypeFieldsAttachmentsMapping,
+  selectAssetTypeFieldsById,
+  selectAssetTypeFieldsMapping,
+  selectAssetTypeFieldsOfAssetType,
   selectAssetTypeStagesMapping,
+  selectAssetTypeValuesOfAssetType,
   selectAssetTypes,
   selectAssetTypesByIds,
   selectAssetTypesMapping,
@@ -7522,18 +8202,20 @@ export {
   selectAssetsByIds,
   selectAssetsMapping,
   selectAssetsOfAssetType,
-  selectAttachedFormSubmissionsOfAsset,
-  selectAttachedFormSubmissionsOfIssue,
   selectAttachmentsOfAsset,
   selectAttachmentsOfAssetByType,
   selectAttachmentsOfAssetType,
   selectAttachmentsOfAssetTypeByType,
+  selectAttachmentsOfAssetTypeFieldValues,
+  selectAttachmentsOfAssetTypeFields,
   selectAttachmentsOfDocument,
   selectAttachmentsOfDocumentByType,
   selectAttachmentsOfFormRevision,
   selectAttachmentsOfFormSubmission,
   selectAttachmentsOfIssue,
   selectAttachmentsOfIssueByType,
+  selectAttachmentsOfIssueTypeFieldValues,
+  selectAttachmentsOfIssueTypeFields,
   selectAttachmentsOfProject,
   selectAttachmentsOfProjectByType,
   selectCategories,
@@ -7559,8 +8241,6 @@ export {
   selectFilteredForms,
   selectFormById,
   selectFormMapping,
-  selectFormOfAssetType,
-  selectFormOfIssueType,
   selectFormRevisionAttachmentsMapping,
   selectFormRevisionById,
   selectFormRevisionMapping,
@@ -7570,16 +8250,11 @@ export {
   selectFormSubmissionAttachmentsMapping,
   selectFormSubmissionById,
   selectFormSubmissions,
-  selectFormSubmissionsByAssets,
-  selectFormSubmissionsByFormRevisions,
-  selectFormSubmissionsByIssues,
   selectFormSubmissionsMapping,
   selectFormSubmissionsOfAsset,
   selectFormSubmissionsOfForm,
   selectFormSubmissionsOfIssue,
   selectForms,
-  selectFormsCount,
-  selectGeneralFormCount,
   selectGeoImageById,
   selectGeoImageMapping,
   selectGeoImages,
@@ -7601,7 +8276,23 @@ export {
   selectIssueCountOfCategory,
   selectIssueMapping,
   selectIssueTypeById,
+  selectIssueTypeFieldValues,
+  selectIssueTypeFieldValuesAttachmentById,
+  selectIssueTypeFieldValuesAttachments,
+  selectIssueTypeFieldValuesAttachmentsByIds,
+  selectIssueTypeFieldValuesAttachmentsMapping,
+  selectIssueTypeFieldValuesById,
+  selectIssueTypeFieldValuesMapping,
+  selectIssueTypeFieldValuesOfIssue,
+  selectIssueTypeFields,
+  selectIssueTypeFieldsAttachmentById,
+  selectIssueTypeFieldsAttachments,
+  selectIssueTypeFieldsAttachmentsMapping,
+  selectIssueTypeFieldsById,
+  selectIssueTypeFieldsMapping,
+  selectIssueTypeFieldsOfIssueType,
   selectIssueTypeMapping,
+  selectIssueTypeValuesOfIssueType,
   selectIssueTypes,
   selectIssueTypesByIds,
   selectIssueTypesOfOrganization,
@@ -7610,8 +8301,9 @@ export {
   selectIssuesByIds,
   selectIssuesOfIssueType,
   selectIssuesOfIssueTypeCount,
-  selectLatestFormRevisionByForm,
+  selectLatestAssetTypeFieldsOfAssetType,
   selectLatestFormRevisionOfForm,
+  selectLatestIssueTypeFieldsOfIssueType,
   selectLatestRetryTime,
   selectLicense,
   selectLicenseForProject,
@@ -7648,10 +8340,8 @@ export {
   selectProjectsOfOrganization,
   selectRehydrated,
   selectRootDocuments,
-  selectSortedFormSubmissionsOfForm,
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
-  selectStageFormIdsFromStageIds,
   selectStageMapping,
   selectStagesOfAssetType,
   selectTeamById,
@@ -7667,6 +8357,8 @@ export {
   selectWorkspaceById,
   selectWorkspaceMapping,
   selectWorkspaces,
+  separateFilesFromValues,
+  separateImageFromFields,
   setActiveProjectFileId,
   setAsset,
   setAssetAttachment,
@@ -7676,6 +8368,14 @@ export {
   setAssetType,
   setAssetTypeAttachment,
   setAssetTypeAttachments,
+  setAssetTypeFieldValues,
+  setAssetTypeFieldValuesAttachment,
+  setAssetTypeFieldValuesAttachments,
+  setAssetTypeFieldValuesMany,
+  setAssetTypeFields,
+  setAssetTypeFieldsAttachment,
+  setAssetTypeFieldsAttachments,
+  setAssetTypeFieldsMany,
   setAssetTypes,
   setAssets,
   setConversation,
@@ -7701,6 +8401,14 @@ export {
   setIssueComment,
   setIssueComments,
   setIssueType,
+  setIssueTypeFieldValues,
+  setIssueTypeFieldValuesAttachment,
+  setIssueTypeFieldValuesAttachments,
+  setIssueTypeFieldValuesMany,
+  setIssueTypeFields,
+  setIssueTypeFieldsAttachment,
+  setIssueTypeFieldsAttachments,
+  setIssueTypeFieldsMany,
   setIssueUpdate,
   setLoggedIn,
   setOrganizations,
@@ -7735,6 +8443,14 @@ export {
   updateAssetType,
   updateAssetTypeAttachment,
   updateAssetTypeAttachments,
+  updateAssetTypeFieldValues,
+  updateAssetTypeFieldValuesAttachment,
+  updateAssetTypeFieldValuesAttachments,
+  updateAssetTypeFieldValuesMany,
+  updateAssetTypeFields,
+  updateAssetTypeFieldsAttachment,
+  updateAssetTypeFieldsAttachments,
+  updateAssetTypeFieldsMany,
   updateAssetTypes,
   updateAssets,
   updateCategory,
@@ -7757,6 +8473,14 @@ export {
   updateIssueAttachment,
   updateIssueAttachments,
   updateIssueType,
+  updateIssueTypeFieldValues,
+  updateIssueTypeFieldValuesAttachment,
+  updateIssueTypeFieldValuesAttachments,
+  updateIssueTypeFieldValuesMany,
+  updateIssueTypeFields,
+  updateIssueTypeFieldsAttachment,
+  updateIssueTypeFieldsAttachments,
+  updateIssueTypeFieldsMany,
   updateLicense,
   updateOrganizationAccess,
   updateProject,