@overmap-ai/core 1.0.71-project-file-improvements.4 → 1.0.71-remove-login-timeout.0

package/dist/overmap-core.umd.cjs

@@ -1,14 +1,11 @@
-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;
-};
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("dependency-graph"), require("uuid"), require("file-saver"), require("color"), require("@radix-ui/colors"), require("@redux-offline/redux-offline"), require("@redux-offline/redux-offline/lib/defaults"), require("localforage"), require("redux-persist-migrate"), require("@reduxjs/toolkit"), require("superagent"), require("@redux-offline/redux-offline/lib/constants"), require("jwt-decode"), require("idb"), require("@overmap-ai/blocks")) : typeof define === "function" && define.amd ? define(["exports", "dependency-graph", "uuid", "file-saver", "color", "@radix-ui/colors", "@redux-offline/redux-offline", "@redux-offline/redux-offline/lib/defaults", "localforage", "redux-persist-migrate", "@reduxjs/toolkit", "superagent", "@redux-offline/redux-offline/lib/constants", "jwt-decode", "idb", "@overmap-ai/blocks"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["overmap-core"] = {}, global.dependencyGraph, global.uuid, global.fileSaver, global.ColorCls, global.colors, global.reduxOffline, global.offlineConfig, global.localforage, global.createMigration, global.toolkit, global.request, global.constants, global.jwtDecode, global.idb, global.blocks));
-})(this, function(exports2, dependencyGraph, uuid, fileSaver, ColorCls, colors, reduxOffline, offlineConfig, localforage, createMigration, toolkit, request, constants, jwtDecode, idb, blocks) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("dependency-graph"), require("uuid"), require("file-saver"), require("color"), require("@radix-ui/colors"), require("@reduxjs/toolkit"), require("@redux-offline/redux-offline"), require("@redux-offline/redux-offline/lib/defaults"), require("localforage"), require("redux-persist-migrate"), require("superagent"), require("@redux-offline/redux-offline/lib/constants"), require("jwt-decode"), require("idb")) : typeof define === "function" && define.amd ? define(["exports", "dependency-graph", "uuid", "file-saver", "color", "@radix-ui/colors", "@reduxjs/toolkit", "@redux-offline/redux-offline", "@redux-offline/redux-offline/lib/defaults", "localforage", "redux-persist-migrate", "superagent", "@redux-offline/redux-offline/lib/constants", "jwt-decode", "idb"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["overmap-core"] = {}, global.dependencyGraph, global.uuid, global.fileSaver, global.ColorCls, global.colors, global.toolkit, global.reduxOffline, global.offlineConfig, global.localforage, global.createMigration, global.request, global.constants, global.jwtDecode, global.idb));
+})(this, function(exports2, dependencyGraph, uuid, fileSaver, ColorCls, colors, toolkit, reduxOffline, offlineConfig, localforage, createMigration, request, constants, jwtDecode, idb) {
+  "use strict";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);
+
   var _a;
-  "use strict";
   var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
     HttpMethod2["GET"] = "GET";
     HttpMethod2["POST"] = "POST";
@@ -142,8 +139,7 @@ var __publicField = (obj, key, value) => {
         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);
@@ -160,8 +156,7 @@ var __publicField = (obj, key, value) => {
     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);
@@ -197,8 +192,7 @@ var __publicField = (obj, key, value) => {
      */
     peek() {
       const nextNode = this._getNextNode();
-      if (!nextNode)
-        return void 0;
+      if (!nextNode) return void 0;
       return this.graph.getNodeData(nextNode);
     }
     /**
@@ -274,13 +268,11 @@ var __publicField = (obj, key, value) => {
           try {
             ret = Object.entries(responseBody.body).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)}`;
@@ -348,11 +340,9 @@ var __publicField = (obj, key, value) => {
     return a[0] === b[0] && a[1] === b[1];
   };
   const coordinatesToText = (coordinates, decimalPlaces) => {
-    if (!coordinates)
-      return "(No Location)";
+    if (!coordinates) return "(No Location)";
     const { lat, lng } = coordinatesToLiteral(coordinates);
-    if (decimalPlaces)
-      return `${lat.toFixed(decimalPlaces)}, ${lng.toFixed(decimalPlaces)}`;
+    if (decimalPlaces) return `${lat.toFixed(decimalPlaces)}, ${lng.toFixed(decimalPlaces)}`;
     return `${lat}, ${lng}`;
   };
   const coordinatesToUrlText = (coordinates) => {
@@ -405,7 +395,7 @@ var __publicField = (obj, key, value) => {
       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) => {
@@ -419,8 +409,7 @@ var __publicField = (obj, key, value) => {
   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}`;
   }
@@ -542,21 +531,19 @@ var __publicField = (obj, key, value) => {
   const OUTBOX_RETRY_DELAY = 6e4;
   const EMPTY_ARRAY = 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]) {
@@ -583,11 +570,9 @@ var __publicField = (obj, key, value) => {
     };
   }
   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;
   }
@@ -632,13 +617,11 @@ var __publicField = (obj, key, value) => {
     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" });
@@ -649,10 +632,10 @@ var __publicField = (obj, key, value) => {
   };
   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");
@@ -677,14 +660,12 @@ var __publicField = (obj, key, value) => {
       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";
     }
@@ -692,35 +673,6 @@ var __publicField = (obj, key, value) => {
       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) => {
@@ -741,8 +693,7 @@ var __publicField = (obj, key, value) => {
     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];
@@ -936,8 +887,7 @@ var __publicField = (obj, key, value) => {
       const assets = [];
       for (const assetId of assetIds) {
         const asset = assetsMapping[assetId];
-        if (asset)
-          assets.push(asset);
+        if (asset) assets.push(asset);
       }
       return fallbackToEmptyArray(assets);
     })
@@ -998,11 +948,11 @@ var __publicField = (obj, key, value) => {
         const attachmentsOfAsset = attachments.filter(({ asset }) => assetId === asset);
         const fileAttachments = 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/")
+          ({ 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 && file_type.startsWith("image/")
+          ({ file_type }) => file_type.startsWith("image/")
         );
         return { fileAttachments, imageAttachments };
       }
@@ -1045,8 +995,7 @@ var __publicField = (obj, key, value) => {
       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 completedStagesByAsset;
@@ -1270,11 +1219,11 @@ var __publicField = (obj, key, value) => {
         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 };
       }
@@ -1411,8 +1360,7 @@ var __publicField = (obj, key, value) => {
     }
     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;
@@ -1441,8 +1389,7 @@ var __publicField = (obj, key, value) => {
         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];
@@ -1576,13 +1523,6 @@ var __publicField = (obj, key, value) => {
   const selectProjectAccessById = (id) => (state) => {
     return state.projectAccessReducer.instances[id];
   };
-  const selectActiveProjectAccess = (state) => {
-    const currentUser = state.userReducer.currentUser;
-    const activeProjectId = state.projectReducer.activeProjectId;
-    return Object.values(state.projectAccessReducer.instances).find((projectAccess) => {
-      return projectAccess.user === (currentUser == null ? void 0 : currentUser.id) && projectAccess.project === activeProjectId;
-    }) ?? null;
-  };
   const selectProjectAccessForUser = (user) => (state) => {
     return Object.values(state.projectAccessReducer.instances).find(
       (projectAccess) => projectAccess.user === user.id
@@ -1597,8 +1537,7 @@ var __publicField = (obj, key, value) => {
   };
   const projectAccessReducer = projectAccessSlice.reducer;
   const initialState$m = {
-    projects: {},
-    activeProjectId: null
+    projects: {}
   };
   const projectSlice = toolkit.createSlice({
     name: "projects",
@@ -1612,19 +1551,9 @@ var __publicField = (obj, key, value) => {
         });
         state.projects = projectsMap;
       },
-      setActiveProjectId: (state, action) => {
-        state.activeProjectId = action.payload;
-      },
-      updateOrCreateProject: (state, action) => {
+      updateProject: (state, action) => {
         state.projects[action.payload.id] = action.payload;
       },
-      // Takes a list of Projects and updates existing ones to match the payload, or adds them
-      // to the store if they are not already present
-      updateOrCreateProjects: (state, action) => {
-        action.payload.forEach((project) => {
-          state.projects[project.id] = project;
-        });
-      },
       deleteProject: (state, action) => {
         delete state.projects[action.payload.id];
       },
@@ -1634,50 +1563,12 @@ var __publicField = (obj, key, value) => {
         } else {
           throw new Error("Accept project invite: user is not in this project");
         }
-      },
-      addActiveProjectIssuesCount: (state, action) => {
-        if (!state.activeProjectId || !(state.activeProjectId in state.projects)) {
-          throw new Error("Update issues count: no active project");
-        }
-        if (!state.projects[state.activeProjectId].issues_count) {
-          state.projects[state.activeProjectId].issues_count = action.payload;
-        } else {
-          state.projects[state.activeProjectId].issues_count += action.payload;
-        }
-      },
-      addActiveProjectFormSubmissionsCount: (state, action) => {
-        if (state.activeProjectId && state.activeProjectId in state.projects) {
-          if (!state.projects[state.activeProjectId].form_submissions_count) {
-            state.projects[state.activeProjectId].form_submissions_count = action.payload;
-          } else {
-            state.projects[state.activeProjectId].form_submissions_count += action.payload;
-          }
-        } else {
-          throw new Error("Update form submissions count: no active project");
-        }
       }
     }
   });
-  const {
-    setProjects,
-    updateOrCreateProject,
-    updateOrCreateProjects: addOrReplaceProjects,
-    setActiveProjectId,
-    deleteProject,
-    acceptProjectInvite,
-    addActiveProjectIssuesCount,
-    addActiveProjectFormSubmissionsCount
-  } = projectSlice.actions;
+  const { setProjects, updateProject, deleteProject, acceptProjectInvite } = projectSlice.actions;
   const projectReducer = projectSlice.reducer;
   const selectProjectMapping = (state) => state.projectReducer.projects;
-  const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
-  const selectActiveProject = (state) => {
-    const activeProjectId = selectActiveProjectId(state);
-    if (!activeProjectId) {
-      return null;
-    }
-    return state.projectReducer.projects[activeProjectId] ?? null;
-  };
   const selectProjectById = (id) => (state) => {
     return state.projectReducer.projects[id];
   };
@@ -1834,8 +1725,7 @@ var __publicField = (obj, key, value) => {
       },
       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;
@@ -1846,46 +1736,93 @@ var __publicField = (obj, key, value) => {
   const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
   const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
   const outboxReducer = outboxSlice.reducer;
-  const projectFileAdapter = createModelAdapter((file) => file.offline_id);
-  const initialState$j = projectFileAdapter.getInitialState({});
+  const initialState$j = {
+    projectFiles: {},
+    activeProjectFileId: null,
+    isImportingProjectFile: false
+  };
   const projectFileSlice = toolkit.createSlice({
     name: "projectFiles",
     initialState: initialState$j,
     extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
     reducers: {
-      initializeProjectFiles: projectFileAdapter.initialize,
-      addProjectFile: projectFileAdapter.addOne,
-      addProjectFiles: projectFileAdapter.addMany,
-      setProjectFile: projectFileAdapter.setOne,
-      setProjectFiles: projectFileAdapter.setMany,
-      updateProjectFile: projectFileAdapter.updateOne,
-      updateProjectFiles: projectFileAdapter.updateMany,
-      deleteProjectFile: projectFileAdapter.deleteOne,
-      deleteProjectFiles: projectFileAdapter.deleteMany
+      addOrReplaceProjectFiles: (state, action) => {
+        for (let fileObj of action.payload) {
+          let file = fileObj.file;
+          if (file.includes("+")) {
+            console.warn("Attempting to apply fix for image URL with '+' character:", file);
+            const parts = file.split("/");
+            if (parts.length < 2) {
+              throw new Error("Invalid URL: " + file);
+            }
+            const lastPart = encodeURIComponent(parts[parts.length - 1]);
+            file = parts.slice(0, -1).join("/") + "/" + lastPart;
+            console.warn("Fixed URL:", file);
+            fileObj = { ...fileObj, file };
+          }
+          state.projectFiles[fileObj.offline_id] = fileObj;
+        }
+      },
+      addOrReplaceProjectFile: (state, action) => {
+        if (!action.payload.project) {
+          throw new Error("ProjectFile has no project. A project must be set before storing.");
+        }
+        state.projectFiles[action.payload.offline_id] = action.payload;
+      },
+      setIsImportingProjectFile: (state, action) => {
+        state.isImportingProjectFile = action.payload;
+      },
+      saveActiveProjectFileBounds: (state, action) => {
+        const activeProjectFileId = state.activeProjectFileId;
+        if (!activeProjectFileId) {
+          throw new Error("Tried to save bounds for active project file, but no active project file was set.");
+        }
+        if (!state.projectFiles[activeProjectFileId]) {
+          throw new Error(
+            `Tried to save bounds for active project file, but project file with ID ${activeProjectFileId} 
+					doesn't exist.`
+          );
+        }
+        state.projectFiles[activeProjectFileId].bounds = action.payload;
+      },
+      // TODO: Move to MapContext. Should not be persisted.
+      setActiveProjectFileId: (state, action) => {
+        state.activeProjectFileId = action.payload;
+      },
+      removeProjectFile: (state, action) => {
+        delete state.projectFiles[action.payload];
+      },
+      removeProjectFilesOfProject: (state, action) => {
+        const filesToDelete = Object.values(state.projectFiles).filter((file) => file.project === action.payload);
+        for (const file of filesToDelete) {
+          delete state.projectFiles[file.offline_id];
+        }
+      },
+      resetProjectFileObjectUrls: (state, ..._args) => {
+        for (const key in state.projectFiles) {
+          delete state.projectFiles[key].objectURL;
+        }
+      }
     }
   });
   const {
-    initializeProjectFiles,
-    addProjectFile,
-    addProjectFiles,
-    setProjectFile,
-    setProjectFiles,
-    updateProjectFile,
-    updateProjectFiles,
-    deleteProjectFile,
-    deleteProjectFiles
+    addOrReplaceProjectFiles,
+    addOrReplaceProjectFile,
+    setIsImportingProjectFile,
+    setActiveProjectFileId,
+    saveActiveProjectFileBounds,
+    removeProjectFile,
+    removeProjectFilesOfProject,
+    resetProjectFileObjectUrls
   } = projectFileSlice.actions;
-  const selectProjectFileMapping = (state) => state.projectFileReducer.instances;
-  const selectProjectFiles = toolkit.createSelector(
-    [selectProjectFileMapping, selectActiveProjectId],
-    (mapping, activeProjectId) => {
-      return fallbackToEmptyArray(
-        Object.values(mapping).filter((file) => file.project === activeProjectId).sort((a, b) => a.z_index - b.z_index)
-      );
-    }
-  );
+  const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
+  const selectProjectFiles = toolkit.createSelector([selectProjectFileMapping], (mapping) => {
+    return fallbackToEmptyArray(Object.values(mapping).sort((a, b) => a.z_index - b.z_index));
+  });
+  const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
+  const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const selectProjectFileById = (id) => (state) => {
-    return state.projectFileReducer.instances[id];
+    return state.projectFileReducer.projectFiles[id];
   };
   const projectFileReducer = projectFileSlice.reducer;
   const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
@@ -1937,11 +1874,11 @@ var __publicField = (obj, key, value) => {
         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 };
       }
@@ -2025,8 +1962,7 @@ var __publicField = (obj, key, value) => {
       [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];
@@ -2098,7 +2034,7 @@ var __publicField = (obj, key, value) => {
         return [...regularMatches.slice(0, maxResults)];
       },
       // as the argument is an object, we check the first level of properties for equality
-      { memoizeOptions: { equalityCheck: shallowEqual } }
+      { memoizeOptions: { resultEqualityCheck: shallowEqual } }
     )
   );
   const selectFormById = (formId) => (state) => {
@@ -2177,8 +2113,7 @@ var __publicField = (obj, key, value) => {
       (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(
@@ -2245,8 +2180,7 @@ var __publicField = (obj, key, value) => {
       ],
       (issues, forms, formRevisions, submissions, issueId) => {
         const issue = issues[issueId];
-        if (!issue)
-          return [];
+        if (!issue) return [];
         if (!issue.issue_type) {
           return Object.values(submissions).filter((submission) => submission.issue === issueId);
         }
@@ -2303,8 +2237,7 @@ var __publicField = (obj, key, value) => {
       ],
       (assets, forms, formRevisions, submissions, assetId) => {
         const asset = assets[assetId];
-        if (!asset)
-          return [];
+        if (!asset) return [];
         if (!asset.asset_type) {
           return Object.values(submissions).filter((submission) => submission.asset === assetId);
         }
@@ -2680,8 +2613,7 @@ var __publicField = (obj, key, value) => {
     toolkit.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);
@@ -2747,11 +2679,11 @@ var __publicField = (obj, key, value) => {
         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 };
       }
@@ -2957,11 +2889,11 @@ var __publicField = (obj, key, value) => {
         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 };
       }
@@ -3108,6 +3040,7 @@ var __publicField = (obj, key, value) => {
     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);
     }
@@ -3177,9 +3110,8 @@ var __publicField = (obj, key, value) => {
     __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 });
@@ -3237,20 +3169,17 @@ var __publicField = (obj, key, value) => {
     }
   };
   const migration = createMigration(manifest, VERSION_REDUCER_KEY);
-  const overmapEnhancer = compose(reduxOffline.offline(customConfig), migration);
+  const overmapEnhancer = toolkit.compose(reduxOffline.offline(customConfig), migration);
   function extractResponseFromError(error) {
     function isResponse(response) {
       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;
   }
@@ -3291,15 +3220,11 @@ var __publicField = (obj, key, value) => {
     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);
@@ -3359,8 +3284,7 @@ var __publicField = (obj, key, value) => {
       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 {
@@ -3388,11 +3312,9 @@ var __publicField = (obj, key, value) => {
       } 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);
       }
     }
@@ -3413,20 +3335,6 @@ var __publicField = (obj, key, value) => {
     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(
@@ -3479,14 +3387,6 @@ var __publicField = (obj, key, value) => {
       }
       if (status !== void 0 && discardStatuses.includes(status)) {
         console.warn("Discarding request due to error:", reason, "\nAction:", action);
-        const message = statusMessages[status];
-        if (message) {
-          if (blocks.unsafeShowToast) {
-            blocks.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");
@@ -3514,6 +3414,7 @@ var __publicField = (obj, key, value) => {
   }
   class BaseSDK {
     constructor(store) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       __publicField(this, "store");
       this.store = store;
     }
@@ -3549,9 +3450,13 @@ var __publicField = (obj, key, value) => {
         };
         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(
@@ -3605,10 +3510,8 @@ var __publicField = (obj, key, value) => {
   }
   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 {
@@ -3645,8 +3548,7 @@ var __publicField = (obj, key, value) => {
           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() };
       });
     }
@@ -3702,8 +3604,7 @@ var __publicField = (obj, key, value) => {
       return `Bearer ${accessToken}`;
     }
     async prepareAuth() {
-      if (!this.tokenIsExpiringSoon())
-        return;
+      if (!this.tokenIsExpiringSoon()) return;
       console.debug(this.constructor.name, "preparing auth");
       try {
         await this.renewTokens();
@@ -3711,7 +3612,11 @@ var __publicField = (obj, key, value) => {
         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 */
@@ -3742,7 +3647,7 @@ var __publicField = (obj, key, value) => {
     async initAuth(payload) {
       const uuid$1 = uuid.v4();
       console.debug(this.constructor.name, "Initiating auth");
-      const promise = this.enqueueRequest({
+      return this.enqueueRequest({
         uuid: uuid$1,
         description: "Get token pair",
         method: HttpMethod.POST,
@@ -3752,23 +3657,9 @@ var __publicField = (obj, key, value) => {
         checkAuth: false,
         blockers: [],
         blocks: []
-      }).then(parseTokens);
-      const timeout = 5;
-      let timedOut = false;
-      const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => {
-          timedOut = true;
-          this.dispatch(markForDeletion(uuid$1));
-          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 {
@@ -3931,8 +3822,7 @@ var __publicField = (obj, key, value) => {
       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);
@@ -3955,12 +3845,12 @@ var __publicField = (obj, key, value) => {
         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) {
@@ -3984,17 +3874,16 @@ var __publicField = (obj, key, value) => {
         const { batchId, payload } = assetBatch;
         const batchAssetOfflineIds = payload.assets.map((c) => c.offline_id);
         const blockers = [assetTypeId];
-        if (prevBatchId)
-          blockers.push(prevBatchId);
-        const blocks2 = batchAssetOfflineIds;
-        blocks2.push(batchId);
+        if (prevBatchId) blockers.push(prevBatchId);
+        const blocks = batchAssetOfflineIds;
+        blocks.push(batchId);
         const promise = this.enqueueRequest({
           description: "Batch create assets",
           method: HttpMethod.POST,
           url: "/assets/bulk/",
           payload,
           blockers,
-          blocks: blocks2
+          blocks
         });
         prevBatchId = assetBatch.batchId;
         batchPromises.push(promise);
@@ -4199,8 +4088,7 @@ var __publicField = (obj, key, value) => {
     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
@@ -4751,7 +4639,6 @@ var __publicField = (obj, key, value) => {
         created_by: createdBy
       });
       this.dispatch(addIssue(offlineIssue));
-      this.dispatch(addActiveProjectIssuesCount(1));
       const promise = this.enqueueRequest({
         description: "Create issue",
         method: HttpMethod.POST,
@@ -4768,7 +4655,6 @@ var __publicField = (obj, key, value) => {
         this.dispatch(updateIssue(result));
       }).catch((error) => {
         this.dispatch(deleteIssue(offlineIssue.offline_id));
-        this.dispatch(addActiveProjectIssuesCount(-1));
         throw error;
       });
       return [offlineIssue, promise];
@@ -4796,7 +4682,18 @@ var __publicField = (obj, key, value) => {
       ]) {
         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) {
@@ -4813,7 +4710,7 @@ var __publicField = (obj, key, value) => {
               } : null;
               break;
             }
-            case "assigned_to": {
+            case IssueUpdateChange.ASSIGNED_TO: {
               let userOrNull = null;
               const userIdOrNull = payload[issueUpdateChange];
               if (userIdOrNull) {
@@ -4829,20 +4726,6 @@ var __publicField = (obj, key, value) => {
               } : 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;
           }
         }
       }
@@ -4884,7 +4767,6 @@ var __publicField = (obj, key, value) => {
         issueAssociationsRecord[issueAssociation.offline_id] = issueAssociation;
       const issueAssociations = Object.values(issueAssociationsRecord);
       this.dispatch(deleteIssue(id));
-      this.dispatch(addActiveProjectIssuesCount(-1));
       if (attachmentsOfIssue.length > 0)
         this.dispatch(deleteIssueAttachments(attachmentsOfIssue.map(({ offline_id }) => offline_id)));
       if (updatesOfIssue.length > 0)
@@ -4905,7 +4787,6 @@ var __publicField = (obj, key, value) => {
         this.dispatch(addIssue(backup));
         this.dispatch(addIssueAttachments(attachmentsOfIssue));
         this.dispatch(addIssueUpdates(updatesOfIssue));
-        this.dispatch(addActiveProjectIssuesCount(1));
         this.dispatch(addFormSubmissions(formSubmissionsOfIssue));
         this.dispatch(addIssueAssociations(issueAssociations));
         throw e;
@@ -5047,98 +4928,89 @@ var __publicField = (obj, key, value) => {
       this.dispatch(initializeProjectAccesses(result));
     }
   }
-  class ProjectFileService extends BaseUploadService {
-    async add(payload) {
-      var _a2;
-      const { store } = this.client;
-      const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-      const { file, ...payloadWithoutFile } = payload;
-      const sha1 = await hashFile(file);
-      const filePayload = {
-        sha1,
-        file_type: file.type,
-        extension: file.name.split(".").pop(),
-        size: file.size
-      };
-      const offlineProjectFile = offline({
-        ...payloadWithoutFile,
-        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-        created_by: createdBy,
-        file_name: file.name,
-        file_sha1: sha1,
-        file: URL.createObjectURL(file)
-      });
-      this.dispatch(addProjectFile(offlineProjectFile));
+  class ProjectFileService extends BaseApiService {
+    async saveExisting(file) {
+      if (!file.offline_id) {
+        throw new Error(
+          "You can only use this method to save existing project files. The one provided has no offline_id."
+        );
+      }
+      const editableData = { ...file };
+      delete editableData.file;
       const promise = this.enqueueRequest({
-        description: "Add project file",
-        method: HttpMethod.POST,
-        url: `/projects/${payload.project}/files/`,
-        payload: {
-          offline_id: offlineProjectFile.offline_id,
-          submitted_at: offlineProjectFile.submitted_at,
-          z_index: offlineProjectFile.z_index,
-          canvas_bounds: offlineProjectFile.canvas_bounds,
-          bounds: offlineProjectFile.bounds,
-          file_name: offlineProjectFile.file_name,
-          file_sha1: offlineProjectFile.file_sha1,
-          file: offlineProjectFile.file,
-          file_payload: filePayload
-        },
-        blockers: [],
-        blocks: [offlineProjectFile.offline_id]
+        method: HttpMethod.PATCH,
+        url: `/projects/files/${file.offline_id}/`,
+        payload: editableData,
+        blockers: [file.offline_id],
+        blocks: [file.offline_id]
       });
-      promise.then((result) => {
-        this.processPresignedUrls(result.presigned_urls);
-        this.dispatch(updateProjectFile(result.project_file));
-      }).catch(() => {
-        this.dispatch(deleteProjectFile(offlineProjectFile.offline_id));
+      void promise.then((result) => {
+        this.dispatch(addOrReplaceProjectFile(result));
       });
-      return [offlineProjectFile, promise.then((result) => result.project_file)];
+      return promise;
     }
-    update(payload) {
+    // TODO: This needs to be seperated into a update and create method
+    saveActive() {
       const { store } = this.client;
-      const projectFile = selectProjectFileById(payload.offline_id)(store.getState());
-      if (!projectFile) {
-        throw new Error(`Project file with id ${payload.offline_id} not found`);
+      const state = store.getState();
+      const activeProjectFileId = state.projectFileReducer.activeProjectFileId;
+      if (!activeProjectFileId) {
+        throw new Error("No active project file");
+      }
+      const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
+      if (!activeProjectFile) {
+        throw new Error("No active project file");
+      }
+      if (!activeProjectFile.bounds && !activeProjectFile.canvas_bounds) {
+        throw new Error("Project file must either have bounds or canvas_bounds set");
+      }
+      let requestDetails;
+      const existing = typeof activeProjectFile.file === "string" && !activeProjectFile.file.startsWith("blob:");
+      if (existing) {
+        const editableData = { ...activeProjectFile };
+        delete editableData.file;
+        requestDetails = {
+          method: HttpMethod.PATCH,
+          url: `/projects/files/${activeProjectFileId}/`,
+          payload: editableData,
+          blockers: [activeProjectFileId],
+          blocks: [activeProjectFileId]
+        };
+      } else {
+        requestDetails = new Promise((resolve, reject) => {
+          this.client.files.uploadFileToS3(activeProjectFile.file_sha1).then(([fileProps]) => {
+            resolve({
+              method: HttpMethod.POST,
+              url: `/projects/${activeProjectFile.project}/files/`,
+              payload: {
+                ...activeProjectFile,
+                ...fileProps
+              },
+              blockers: [activeProjectFileId],
+              blocks: [activeProjectFileId]
+            });
+          }).catch(reject);
+        });
       }
-      const updatedProjectFile = {
-        ...projectFile,
-        ...payload
-      };
-      this.dispatch(updateProjectFile(updatedProjectFile));
-      const promise = this.enqueueRequest({
-        description: "Update project file",
-        method: HttpMethod.PATCH,
-        url: `/projects/files/${payload.offline_id}/`,
-        payload,
-        blockers: [payload.offline_id],
-        blocks: [payload.offline_id]
+      const promise = Promise.resolve(requestDetails).then((requestDetails2) => {
+        return this.enqueueRequest(requestDetails2);
       });
-      promise.then((result) => {
-        this.dispatch(updateProjectFile(result));
-      }).catch(() => {
-        this.dispatch(updateProjectFile(projectFile));
+      void promise.then((result) => {
+        this.dispatch(addOrReplaceProjectFile(result));
       });
-      return [updatedProjectFile, promise];
+      this.dispatch(saveActiveProjectFileBounds);
+      this.dispatch(setActiveProjectFileId(null));
+      this.dispatch(setIsImportingProjectFile(false));
+      return [activeProjectFile, promise];
     }
-    delete(id) {
-      const { store } = this.client;
-      const projectFileToDelete = selectProjectFileById(id)(store.getState());
-      if (!projectFileToDelete) {
-        throw new Error(`Project file with id ${id} not found`);
-      }
-      this.dispatch(deleteProjectFile(id));
-      const promise = this.enqueueRequest({
-        description: "Delete project file",
+    delete(projectFileId) {
+      this.dispatch(removeProjectFile(projectFileId));
+      return this.enqueueRequest({
         method: HttpMethod.DELETE,
-        url: `/projects/files/${id}/`,
-        blockers: [id],
+        url: `/projects/files/${projectFileId}`,
+        blockers: [projectFileId],
         blocks: []
       });
-      promise.catch(() => {
-        this.dispatch(updateProjectFile(projectFileToDelete));
-      });
-      return promise;
     }
     async refreshStore(projectId) {
       const result = await this.enqueueRequest({
@@ -5148,7 +5020,8 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      this.dispatch(initializeProjectFiles(result));
+      this.dispatch(addOrReplaceProjectFiles([]));
+      this.dispatch(addOrReplaceProjectFiles(result));
     }
   }
   class ProjectAttachmentService extends BaseAttachmentService {
@@ -5204,7 +5077,7 @@ var __publicField = (obj, key, value) => {
       if (!project.bounds && !project.canvas_bounds) {
         throw new Error("Project must either have bounds or canvas_bounds set");
       }
-      this.dispatch(updateOrCreateProject(project));
+      this.dispatch(updateProject(project));
       return await this.enqueueRequest({
         description: "Update project",
         method: HttpMethod.PATCH,
@@ -5225,8 +5098,8 @@ var __publicField = (obj, key, value) => {
       if (!project) {
         throw new Error("Expected project to exist");
       }
-      const projectFiles = selectProjectFiles(state).filter((file) => file.project === projectId);
-      this.dispatch(deleteProjectFiles(projectFiles.map(({ offline_id }) => offline_id)));
+      const filesToDelete = selectProjectFiles(state).filter((file) => file.project === projectId);
+      this.dispatch(removeProjectFilesOfProject(project.id));
       const attachmentsOfProject = selectAttachmentsOfProject(project.id)(state);
       this.dispatch(deleteProjectAttachments(attachmentsOfProject.map(({ offline_id }) => offline_id)));
       const projectAccesses = selectProjectAccesses(state);
@@ -5249,7 +5122,7 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         this.dispatch(setProjects(Object.values(projects)));
         this.dispatch(initializeProjectAccesses(Object.values(projectAccesses)));
-        this.dispatch(initializeProjectFiles(projectFiles));
+        this.dispatch(addOrReplaceProjectFiles(filesToDelete));
         this.dispatch(setProjectAttachments(attachmentsOfProject));
         this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
         if (license) {
@@ -5564,12 +5437,9 @@ var __publicField = (obj, key, value) => {
         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);
+      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({
         description: "Fetch organization forms",
         method: HttpMethod.GET,
@@ -5577,12 +5447,9 @@ var __publicField = (obj, key, value) => {
         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);
+      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,
@@ -5590,12 +5457,9 @@ var __publicField = (obj, key, value) => {
         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);
+      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,
@@ -5603,12 +5467,9 @@ var __publicField = (obj, key, value) => {
         blockers: [projectId.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);
+      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));
@@ -5744,12 +5605,10 @@ var __publicField = (obj, key, value) => {
         files
       );
       promise.then((result) => {
-        this.dispatch(addActiveProjectFormSubmissionsCount(1));
         this.dispatch(setFormSubmission(result));
         return result;
       }).catch(() => {
         this.dispatch(deleteFormSubmission(offlineSubmission.offline_id));
-        this.dispatch(addActiveProjectFormSubmissionsCount(-1));
       });
       return [offlineSubmission, offlineFormSubmissionAttachments, promise, attachmentsPromise];
     }
@@ -5821,16 +5680,15 @@ var __publicField = (obj, key, value) => {
         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 blocks2 = [...batchSubmissionOfflineIds, ...batchAttachmentsOfflineIds, batchId];
+        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: blocks2
+          blocks
         });
         void promise.then(({ presigned_urls }) => {
           this.processPresignedUrls(presigned_urls);
@@ -5842,10 +5700,8 @@ var __publicField = (obj, key, value) => {
         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);
+          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));
@@ -5916,7 +5772,6 @@ var __publicField = (obj, key, value) => {
       }
       const submissionAttachments = selectAttachmentsOfFormSubmission(id)(state);
       this.dispatch(deleteFormSubmission(id));
-      this.dispatch(addActiveProjectFormSubmissionsCount(-1));
       this.dispatch(deleteFormSubmissionAttachments(submissionAttachments.map((x) => x.offline_id)));
       try {
         return await this.enqueueRequest({
@@ -5927,7 +5782,6 @@ var __publicField = (obj, key, value) => {
           blocks: []
         });
       } catch (e) {
-        this.dispatch(addActiveProjectFormSubmissionsCount(1));
         this.dispatch(addFormSubmission(submissionToBeDeleted));
         this.dispatch(addFormSubmissionAttachments(submissionAttachments));
         throw e;
@@ -6043,9 +5897,9 @@ var __publicField = (obj, key, value) => {
         blockers: [id],
         blocks: []
       });
-      void promise.catch((reason) => {
+      void promise.catch((e) => {
         this.dispatch(addWorkspace(originalWorkspace));
-        throw reason;
+        throw e;
       });
       return promise;
     }
@@ -6106,7 +5960,7 @@ var __publicField = (obj, key, value) => {
   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", idb.openDB("fileCache", 1, {
@@ -6117,8 +5971,7 @@ var __publicField = (obj, key, value) => {
     }
     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",
@@ -6188,8 +6041,7 @@ var __publicField = (obj, key, value) => {
     /** 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,
@@ -6283,7 +6135,7 @@ var __publicField = (obj, key, value) => {
 					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);
         }
@@ -6804,15 +6656,14 @@ var __publicField = (obj, key, value) => {
     }
   }
   class AgentService extends BaseApiService {
-    async startConversation(prompt) {
-      const activeProjectId = this.client.store.getState().projectReducer.activeProjectId;
+    async startConversation(prompt, projectId) {
       return this.enqueueRequest({
         description: "Start agent conversation",
         method: HttpMethod.POST,
         url: "/agents/prompt/",
         payload: {
           prompt,
-          active_project: activeProjectId
+          active_project: projectId
         },
         blockers: ["prompt"],
         blocks: ["prompt"]
@@ -6821,21 +6672,14 @@ var __publicField = (obj, key, value) => {
         return response;
       });
     }
-    /**
-     * Prompt the agent with a message.
-     * @param prompt The message to prompt the agent with.
-     * @param conversationId If continuing an existing message, the UUID of that conversation.
-     */
-    async continueConversation(prompt, conversationId) {
-      const { store } = this.client;
-      const activeProjectId = store.getState().projectReducer.activeProjectId;
+    async continueConversation(prompt, conversationId, projectId) {
       return this.enqueueRequest({
         description: "Prompt agent",
         method: HttpMethod.POST,
         url: "/agents/prompt/",
         payload: {
           prompt,
-          active_project: activeProjectId
+          active_project: projectId
         },
         blockers: ["prompt"],
         blocks: ["prompt"],
@@ -7329,6 +7173,7 @@ var __publicField = (obj, key, value) => {
   exports2.ProjectFileService = ProjectFileService;
   exports2.ProjectService = ProjectService;
   exports2.TeamService = TeamService;
+  exports2.UNKNOWN_ERROR_MESSAGE = UNKNOWN_ERROR_MESSAGE;
   exports2.UserService = UserService;
   exports2.VERSION_REDUCER_KEY = VERSION_REDUCER_KEY;
   exports2.VerificationCodeType = VerificationCodeType;
@@ -7337,8 +7182,6 @@ var __publicField = (obj, key, value) => {
   exports2._selectLatestFormRevision = _selectLatestFormRevision;
   exports2._setLatestRetryTime = _setLatestRetryTime;
   exports2.acceptProjectInvite = acceptProjectInvite;
-  exports2.addActiveProjectFormSubmissionsCount = addActiveProjectFormSubmissionsCount;
-  exports2.addActiveProjectIssuesCount = addActiveProjectIssuesCount;
   exports2.addAsset = addAsset;
   exports2.addAssetAttachment = addAssetAttachment;
   exports2.addAssetAttachments = addAssetAttachments;
@@ -7381,11 +7224,10 @@ var __publicField = (obj, key, value) => {
   exports2.addIssueUpdates = addIssueUpdates;
   exports2.addIssues = addIssues;
   exports2.addLicenses = addLicenses;
-  exports2.addOrReplaceProjects = addOrReplaceProjects;
+  exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
+  exports2.addOrReplaceProjectFiles = addOrReplaceProjectFiles;
   exports2.addProjectAttachment = addProjectAttachment;
   exports2.addProjectAttachments = addProjectAttachments;
-  exports2.addProjectFile = addProjectFile;
-  exports2.addProjectFiles = addProjectFiles;
   exports2.addTeam = addTeam;
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
@@ -7463,8 +7305,6 @@ var __publicField = (obj, key, value) => {
   exports2.deleteProjectAccesses = deleteProjectAccesses;
   exports2.deleteProjectAttachment = deleteProjectAttachment;
   exports2.deleteProjectAttachments = deleteProjectAttachments;
-  exports2.deleteProjectFile = deleteProjectFile;
-  exports2.deleteProjectFiles = deleteProjectFiles;
   exports2.deleteTeam = deleteTeam;
   exports2.deleteWorkspace = deleteWorkspace;
   exports2.dequeue = dequeue;
@@ -7533,7 +7373,6 @@ var __publicField = (obj, key, value) => {
   exports2.initializeOrganizationAccesses = initializeOrganizationAccesses;
   exports2.initializeProjectAccesses = initializeProjectAccesses;
   exports2.initializeProjectAttachments = initializeProjectAttachments;
-  exports2.initializeProjectFiles = initializeProjectFiles;
   exports2.initializeTeams = initializeTeams;
   exports2.initializeWorkspaces = initializeWorkspaces;
   exports2.isToday = isToday;
@@ -7586,14 +7425,16 @@ var __publicField = (obj, key, value) => {
   exports2.rehydratedSlice = rehydratedSlice;
   exports2.removeDocuments = removeDocuments;
   exports2.removeIssueType = removeIssueType;
+  exports2.removeProjectFile = removeProjectFile;
+  exports2.removeProjectFilesOfProject = removeProjectFilesOfProject;
   exports2.removeUser = removeUser;
+  exports2.resetProjectFileObjectUrls = resetProjectFileObjectUrls;
   exports2.resetStore = resetStore;
   exports2.restructureCreateSelectorWithArgs = restructureCreateSelectorWithArgs;
+  exports2.saveActiveProjectFileBounds = saveActiveProjectFileBounds;
   exports2.selectAccessToken = selectAccessToken;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
-  exports2.selectActiveProject = selectActiveProject;
-  exports2.selectActiveProjectAccess = selectActiveProjectAccess;
-  exports2.selectActiveProjectId = selectActiveProjectId;
+  exports2.selectActiveProjectFileId = selectActiveProjectFileId;
   exports2.selectActiveStatusLicenses = selectActiveStatusLicenses;
   exports2.selectAllDocumentAttachments = selectAllDocumentAttachments;
   exports2.selectAllProjectAttachments = selectAllProjectAttachments;
@@ -7684,6 +7525,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectGeoImageMapping = selectGeoImageMapping;
   exports2.selectGeoImages = selectGeoImages;
   exports2.selectGeoImagesOfProject = selectGeoImagesOfProject;
+  exports2.selectIsImportingProjectFile = selectIsImportingProjectFile;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
   exports2.selectIssueAssociationById = selectIssueAssociationById;
   exports2.selectIssueAssociationMapping = selectIssueAssociationMapping;
@@ -7766,7 +7608,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectWorkspaceById = selectWorkspaceById;
   exports2.selectWorkspaceMapping = selectWorkspaceMapping;
   exports2.selectWorkspaces = selectWorkspaces;
-  exports2.setActiveProjectId = setActiveProjectId;
+  exports2.setActiveProjectFileId = setActiveProjectFileId;
   exports2.setAsset = setAsset;
   exports2.setAssetAttachment = setAssetAttachment;
   exports2.setAssetAttachments = setAssetAttachments;
@@ -7792,6 +7634,7 @@ var __publicField = (obj, key, value) => {
   exports2.setFormSubmissions = setFormSubmissions;
   exports2.setGeoImage = setGeoImage;
   exports2.setGeoImages = setGeoImages;
+  exports2.setIsImportingProjectFile = setIsImportingProjectFile;
   exports2.setIssueAssociation = setIssueAssociation;
   exports2.setIssueAssociations = setIssueAssociations;
   exports2.setIssueAttachment = setIssueAttachment;
@@ -7805,8 +7648,6 @@ var __publicField = (obj, key, value) => {
   exports2.setProfilePicture = setProfilePicture;
   exports2.setProjectAttachment = setProjectAttachment;
   exports2.setProjectAttachments = setProjectAttachments;
-  exports2.setProjectFile = setProjectFile;
-  exports2.setProjectFiles = setProjectFiles;
   exports2.setProjects = setProjects;
   exports2.setRehydrated = setRehydrated;
   exports2.setTeam = setTeam;
@@ -7856,13 +7697,11 @@ var __publicField = (obj, key, value) => {
   exports2.updateIssueAttachments = updateIssueAttachments;
   exports2.updateIssueType = updateIssueType;
   exports2.updateLicense = updateLicense;
-  exports2.updateOrCreateProject = updateOrCreateProject;
   exports2.updateOrganizationAccess = updateOrganizationAccess;
+  exports2.updateProject = updateProject;
   exports2.updateProjectAccess = updateProjectAccess;
   exports2.updateProjectAttachment = updateProjectAttachment;
   exports2.updateProjectAttachments = updateProjectAttachments;
-  exports2.updateProjectFile = updateProjectFile;
-  exports2.updateProjectFiles = updateProjectFiles;
   exports2.updateTeam = updateTeam;
   exports2.updateWorkspace = updateWorkspace;
   exports2.userReducer = userReducer;