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

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);
   }
   /**
@@ -285,13 +278,11 @@ function extractErrorMessage(errorRes, err) {
         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)}`;
@@ -359,11 +350,9 @@ const coordinatesAreEqual = (a, b) => {
   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) => {
@@ -416,7 +405,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) => {
@@ -430,8 +419,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}`;
 }
@@ -553,21 +541,19 @@ const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
 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]) {
@@ -594,11 +580,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;
 }
@@ -643,13 +627,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" });
@@ -660,10 +642,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");
@@ -688,14 +670,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";
   }
@@ -703,35 +683,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) => {
@@ -752,8 +703,7 @@ 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];
@@ -947,8 +897,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);
   })
@@ -1009,11 +958,11 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
       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 };
     }
@@ -1056,8 +1005,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 completedStagesByAsset;
@@ -1281,11 +1229,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 };
     }
@@ -1422,8 +1370,7 @@ 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;
@@ -1452,8 +1399,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];
@@ -1587,13 +1533,6 @@ const selectProjectAccesses = createSelector(
 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
@@ -1608,8 +1547,7 @@ const selectProjectAccessUserMapping = (state) => {
 };
 const projectAccessReducer = projectAccessSlice.reducer;
 const initialState$m = {
-  projects: {},
-  activeProjectId: null
+  projects: {}
 };
 const projectSlice = createSlice({
   name: "projects",
@@ -1623,19 +1561,9 @@ const projectSlice = createSlice({
       });
       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];
     },
@@ -1645,50 +1573,12 @@ const projectSlice = createSlice({
       } 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];
 };
@@ -1845,8 +1735,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;
@@ -1857,46 +1746,93 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 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 = 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 = 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 = 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);
@@ -1948,11 +1884,11 @@ 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 };
     }
@@ -2036,8 +1972,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];
@@ -2109,7 +2044,7 @@ 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 } }
+    { memoizeOptions: { resultEqualityCheck: shallowEqual } }
   )
 );
 const selectFormById = (formId) => (state) => {
@@ -2188,8 +2123,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(
@@ -2256,8 +2190,7 @@ const selectAttachedFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     ],
     (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);
       }
@@ -2314,8 +2247,7 @@ const selectAttachedFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
     ],
     (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);
       }
@@ -2691,8 +2623,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);
@@ -2758,11 +2689,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 };
     }
@@ -2968,11 +2899,11 @@ 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 };
     }
@@ -3119,6 +3050,7 @@ class BaseService {
   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);
   }
@@ -3188,9 +3120,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 });
@@ -3254,14 +3185,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;
 }
@@ -3302,15 +3230,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);
@@ -3370,8 +3294,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 {
@@ -3399,11 +3322,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);
     }
   }
@@ -3424,20 +3345,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(
@@ -3490,14 +3397,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");
@@ -3525,6 +3424,7 @@ function retry(_action, _retries) {
 }
 class BaseSDK {
   constructor(store) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "store");
     this.store = store;
   }
@@ -3560,9 +3460,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(
@@ -3616,10 +3520,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 {
@@ -3656,8 +3558,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() };
     });
   }
@@ -3713,8 +3614,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();
@@ -3722,7 +3622,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 */
@@ -3753,7 +3657,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,
@@ -3761,25 +3665,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 {
@@ -3942,8 +3833,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);
@@ -3966,12 +3856,12 @@ 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) {
@@ -3995,8 +3885,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({
@@ -4210,8 +4099,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
@@ -4762,7 +4650,6 @@ class IssueService extends BaseApiService {
       created_by: createdBy
     });
     this.dispatch(addIssue(offlineIssue));
-    this.dispatch(addActiveProjectIssuesCount(1));
     const promise = this.enqueueRequest({
       description: "Create issue",
       method: HttpMethod.POST,
@@ -4779,7 +4666,6 @@ class IssueService extends BaseApiService {
       this.dispatch(updateIssue(result));
     }).catch((error) => {
       this.dispatch(deleteIssue(offlineIssue.offline_id));
-      this.dispatch(addActiveProjectIssuesCount(-1));
       throw error;
     });
     return [offlineIssue, promise];
@@ -4807,7 +4693,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) {
@@ -4824,7 +4721,7 @@ class IssueService extends BaseApiService {
             } : null;
             break;
           }
-          case "assigned_to": {
+          case IssueUpdateChange.ASSIGNED_TO: {
             let userOrNull = null;
             const userIdOrNull = payload[issueUpdateChange];
             if (userIdOrNull) {
@@ -4840,20 +4737,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;
         }
       }
     }
@@ -4895,7 +4778,6 @@ class IssueService extends BaseApiService {
       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)
@@ -4916,7 +4798,6 @@ class IssueService extends BaseApiService {
       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;
@@ -5058,98 +4939,89 @@ class ProjectAccessService extends BaseApiService {
     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({
@@ -5159,7 +5031,8 @@ class ProjectFileService extends BaseUploadService {
       blockers: [],
       blocks: []
     });
-    this.dispatch(initializeProjectFiles(result));
+    this.dispatch(addOrReplaceProjectFiles([]));
+    this.dispatch(addOrReplaceProjectFiles(result));
   }
 }
 class ProjectAttachmentService extends BaseAttachmentService {
@@ -5215,7 +5088,7 @@ class ProjectService extends BaseApiService {
     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,
@@ -5236,8 +5109,8 @@ class ProjectService extends BaseApiService {
     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);
@@ -5260,7 +5133,7 @@ class ProjectService extends BaseApiService {
     } 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) {
@@ -5575,12 +5448,9 @@ class FormService extends BaseUploadService {
       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,
@@ -5588,12 +5458,9 @@ class FormService extends BaseUploadService {
       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,
@@ -5601,12 +5468,9 @@ class FormService extends BaseUploadService {
       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,
@@ -5614,12 +5478,9 @@ class FormService extends BaseUploadService {
       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));
@@ -5755,12 +5616,10 @@ class FormSubmissionService extends BaseUploadService {
       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];
   }
@@ -5832,8 +5691,7 @@ class FormSubmissionService extends BaseUploadService {
       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);
+      if (prevBatchId) blockers.push(prevBatchId);
       const blocks = [...batchSubmissionOfflineIds, ...batchAttachmentsOfflineIds, batchId];
       const promise = this.enqueueRequest({
         description: "Bulk add form submissions",
@@ -5853,10 +5711,8 @@ class FormSubmissionService extends BaseUploadService {
       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));
@@ -5927,7 +5783,6 @@ class FormSubmissionService extends BaseUploadService {
     }
     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({
@@ -5938,7 +5793,6 @@ class FormSubmissionService extends BaseUploadService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(addFormSubmission(submissionToBeDeleted));
       this.dispatch(addFormSubmissionAttachments(submissionAttachments));
       throw e;
@@ -6054,9 +5908,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;
   }
@@ -6117,7 +5971,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, {
@@ -6128,8 +5982,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",
@@ -6199,8 +6052,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,
@@ -6294,7 +6146,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);
       }
@@ -6815,15 +6667,14 @@ class DocumentAttachmentService extends BaseAttachmentService {
   }
 }
 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"]
@@ -6832,21 +6683,14 @@ class AgentService extends BaseApiService {
       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"],
@@ -7341,6 +7185,7 @@ export {
   ProjectFileService,
   ProjectService,
   TeamService,
+  UNKNOWN_ERROR_MESSAGE,
   UserService,
   VERSION_REDUCER_KEY,
   VerificationCodeType,
@@ -7349,8 +7194,6 @@ export {
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
-  addActiveProjectFormSubmissionsCount,
-  addActiveProjectIssuesCount,
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
@@ -7393,11 +7236,10 @@ export {
   addIssueUpdates,
   addIssues,
   addLicenses,
-  addOrReplaceProjects,
+  addOrReplaceProjectFile,
+  addOrReplaceProjectFiles,
   addProjectAttachment,
   addProjectAttachments,
-  addProjectFile,
-  addProjectFiles,
   addTeam,
   addUsers,
   addWorkspace,
@@ -7475,8 +7317,6 @@ export {
   deleteProjectAccesses,
   deleteProjectAttachment,
   deleteProjectAttachments,
-  deleteProjectFile,
-  deleteProjectFiles,
   deleteTeam,
   deleteWorkspace,
   dequeue,
@@ -7545,7 +7385,6 @@ export {
   initializeOrganizationAccesses,
   initializeProjectAccesses,
   initializeProjectAttachments,
-  initializeProjectFiles,
   initializeTeams,
   initializeWorkspaces,
   isToday,
@@ -7598,14 +7437,16 @@ export {
   rehydratedSlice,
   removeDocuments,
   removeIssueType,
+  removeProjectFile,
+  removeProjectFilesOfProject,
   removeUser,
+  resetProjectFileObjectUrls,
   resetStore,
   restructureCreateSelectorWithArgs,
+  saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
-  selectActiveProject,
-  selectActiveProjectAccess,
-  selectActiveProjectId,
+  selectActiveProjectFileId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
@@ -7696,6 +7537,7 @@ export {
   selectGeoImageMapping,
   selectGeoImages,
   selectGeoImagesOfProject,
+  selectIsImportingProjectFile,
   selectIsLoggedIn,
   selectIssueAssociationById,
   selectIssueAssociationMapping,
@@ -7778,7 +7620,7 @@ export {
   selectWorkspaceById,
   selectWorkspaceMapping,
   selectWorkspaces,
-  setActiveProjectId,
+  setActiveProjectFileId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -7804,6 +7646,7 @@ export {
   setFormSubmissions,
   setGeoImage,
   setGeoImages,
+  setIsImportingProjectFile,
   setIssueAssociation,
   setIssueAssociations,
   setIssueAttachment,
@@ -7817,8 +7660,6 @@ export {
   setProfilePicture,
   setProjectAttachment,
   setProjectAttachments,
-  setProjectFile,
-  setProjectFiles,
   setProjects,
   setRehydrated,
   setTeam,
@@ -7868,13 +7709,11 @@ export {
   updateIssueAttachments,
   updateIssueType,
   updateLicense,
-  updateOrCreateProject,
   updateOrganizationAccess,
+  updateProject,
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,
-  updateProjectFile,
-  updateProjectFiles,
   updateTeam,
   updateWorkspace,
   userReducer,