@overmap-ai/core 1.0.65 → 1.0.67-fix-agent-service.0

package/dist/overmap-core.js

@@ -7,20 +7,19 @@ var __publicField = (obj, 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 { 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, createNextState } from "@reduxjs/toolkit";
+import { createSlice, createSelector, combineReducers } from "@reduxjs/toolkit";
 import request from "superagent";
-import { saveAs } from "file-saver";
-import React, { useRef, useEffect } from "react";
-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 { RESET_STATE } from "@redux-offline/redux-offline/lib/constants";
 import jwtDecode from "jwt-decode";
-import { unsafeShowToast } from "@overmap-ai/blocks";
 import { openDB } from "idb";
+import { unsafeShowToast } from "@overmap-ai/blocks";
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["GET"] = "GET";
   HttpMethod2["POST"] = "POST";
@@ -29,6 +28,14 @@ var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["DELETE"] = "DELETE";
   return HttpMethod2;
 })(HttpMethod || {});
+var AttachmentModel = /* @__PURE__ */ ((AttachmentModel2) => {
+  AttachmentModel2["Issue"] = "issue";
+  AttachmentModel2["Asset"] = "asset";
+  AttachmentModel2["AssetType"] = "asset_type";
+  AttachmentModel2["Project"] = "project";
+  AttachmentModel2["Document"] = "document";
+  return AttachmentModel2;
+})(AttachmentModel || {});
 var IssuePriority = /* @__PURE__ */ ((IssuePriority2) => {
   IssuePriority2[IssuePriority2["LOWEST"] = 0] = "LOWEST";
   IssuePriority2[IssuePriority2["LOW"] = 2] = "LOW";
@@ -43,6 +50,43 @@ var IssueStatus = /* @__PURE__ */ ((IssueStatus2) => {
   IssueStatus2[IssueStatus2["DONE"] = 4] = "DONE";
   return IssueStatus2;
 })(IssueStatus || {});
+var IssueUpdateChange = /* @__PURE__ */ ((IssueUpdateChange2) => {
+  IssueUpdateChange2["STATUS"] = "status";
+  IssueUpdateChange2["PRIORITY"] = "priority";
+  IssueUpdateChange2["CATEGORY"] = "category";
+  IssueUpdateChange2["DESCRIPTION"] = "description";
+  IssueUpdateChange2["TITLE"] = "title";
+  IssueUpdateChange2["ASSIGNED_TO"] = "assigned_to";
+  IssueUpdateChange2["DUE_DATE"] = "due_date";
+  return IssueUpdateChange2;
+})(IssueUpdateChange || {});
+var ProjectAccessLevel = /* @__PURE__ */ ((ProjectAccessLevel2) => {
+  ProjectAccessLevel2[ProjectAccessLevel2["BASIC"] = 0] = "BASIC";
+  ProjectAccessLevel2[ProjectAccessLevel2["ADMIN"] = 2] = "ADMIN";
+  return ProjectAccessLevel2;
+})(ProjectAccessLevel || {});
+var OrganizationAccessLevel = /* @__PURE__ */ ((OrganizationAccessLevel2) => {
+  OrganizationAccessLevel2[OrganizationAccessLevel2["BASIC"] = 0] = "BASIC";
+  OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
+  return OrganizationAccessLevel2;
+})(OrganizationAccessLevel || {});
+var PaddleCheckoutEvent = /* @__PURE__ */ ((PaddleCheckoutEvent2) => {
+  PaddleCheckoutEvent2["COMPLETED"] = "checkout.completed";
+  PaddleCheckoutEvent2["CLOSED"] = "checkout.closed";
+  return PaddleCheckoutEvent2;
+})(PaddleCheckoutEvent || {});
+var LicenseLevel = /* @__PURE__ */ ((LicenseLevel2) => {
+  LicenseLevel2[LicenseLevel2["PRO"] = 0] = "PRO";
+  return LicenseLevel2;
+})(LicenseLevel || {});
+var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
+  LicenseStatus2[LicenseStatus2["ACTIVE"] = 0] = "ACTIVE";
+  LicenseStatus2[LicenseStatus2["PAUSED"] = 2] = "PAUSED";
+  LicenseStatus2[LicenseStatus2["CANCELLED"] = 4] = "CANCELLED";
+  LicenseStatus2[LicenseStatus2["INACTIVE"] = 6] = "INACTIVE";
+  LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
+  return LicenseStatus2;
+})(LicenseStatus || {});
 class OutboxCoordinator {
   constructor() {
     __publicField(this, "graph");
@@ -285,130 +329,6 @@ class APIError extends Error {
     this.options = options;
   }
 }
-class DeferredPromise {
-  constructor() {
-    __publicField(this, _a, "Promise");
-    __publicField(this, "_promise");
-    __publicField(this, "_resolve");
-    __publicField(this, "_reject");
-    __publicField(this, "_state", "pending");
-    this._resolve = null;
-    this._reject = null;
-    this._promise = new Promise((resolve, reject) => {
-      this._resolve = resolve;
-      this._reject = reject;
-    });
-  }
-  get state() {
-    return this._state;
-  }
-  then(onFulfilled, onRejected) {
-    return this._promise.then(onFulfilled, onRejected);
-  }
-  catch(onRejected) {
-    return this._promise.catch(onRejected);
-  }
-  resolve(value) {
-    if (!this._resolve)
-      throw new Error("No resolve callback");
-    this._resolve(value);
-    this._state = "fulfilled";
-  }
-  reject(reason) {
-    if (!this._reject)
-      throw reason;
-    this._reject(reason);
-    this._state = "rejected";
-  }
-  finally(_onFinally) {
-    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) => {
-  state[VERSION_REDUCER_KEY$1] = { version: latestVersion() };
-  return state;
-};
-const signOut = () => {
-  return initialVersioning({});
-};
-const createOutboxState = (state) => {
-  if (state.outboxReducer) {
-    state.outboxReducer.deletedRequests = [];
-  }
-  return state;
-};
-const wrapMigration = (migrator) => (state) => {
-  var _a2;
-  if (state === void 0) {
-    state = {};
-  }
-  if (((_a2 = state[VERSION_REDUCER_KEY$1]) == null ? void 0 : _a2.version) === latestVersion())
-    return state;
-  return migrator(state);
-};
-const migrations = [initialVersioning, signOut, signOut, createOutboxState];
-const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$B = {
-  accessToken: "",
-  refreshToken: "",
-  isLoggedIn: false
-};
-const authSlice = createSlice({
-  name: "auth",
-  initialState: initialState$B,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$B)),
-  reducers: {
-    setTokens: (state, action) => {
-      state.accessToken = action.payload.accessToken;
-      state.refreshToken = action.payload.refreshToken;
-    },
-    clearTokens: (state) => {
-      state.accessToken = "";
-      state.refreshToken = "";
-    },
-    setLoggedIn: (state, action) => {
-      if (!action.payload) {
-        authSlice.caseReducers.clearTokens(state);
-      }
-      state.isLoggedIn = action.payload;
-    }
-  }
-});
-const { setTokens, clearTokens, setLoggedIn } = authSlice.actions;
-const selectAccessToken = (state) => state.authReducer.accessToken;
-const selectIsLoggedIn = (state) => state.authReducer.isLoggedIn;
-const authReducer = authSlice.reducer;
 const coordinatesToLiteral = (coordinates) => {
   return { lng: coordinates[0], lat: coordinates[1] };
 };
@@ -473,24 +393,6 @@ const createMultiPointGeometry = (coordinates) => {
     coordinates
   };
 };
-function classNames(...args) {
-  const classes = [];
-  for (const arg of args) {
-    if (!arg) {
-      continue;
-    }
-    if (typeof arg === "string") {
-      classes.push(arg);
-    } else if (typeof arg === "object") {
-      for (const [key, value] of Object.entries(arg)) {
-        if (value) {
-          classes.push(key);
-        }
-      }
-    }
-  }
-  return classes.join(" ");
-}
 function hex(buffer) {
   const hashArray = new Uint8Array(buffer);
   return hashArray.reduce((data, byte) => data + byte.toString(16).padStart(2, "0"), "");
@@ -603,14 +505,6 @@ function toOfflineIdRecord(array) {
   }
   return asMapping;
 }
-const issueToSearchResult = (issue, tag) => {
-  return {
-    label: issue.title || "",
-    typeLabel: "issue",
-    tag,
-    item: issue
-  };
-};
 function toFileNameSafeString(str, extension = void 0, maxLength = 255) {
   let ret = str.replace(/[^a-z0-9_\-.]/gi, "_").replace(/_{2,}/g, "_");
   if (!extension) {
@@ -654,7 +548,6 @@ function boundsContainPoint(bounds, coordinates) {
   return bounds[0][0] > coordinates[0] && bounds[1][0] < coordinates[0] && bounds[0][1] > coordinates[1] && bounds[1][1] < coordinates[1];
 }
 const emailRegex = /^.+@.+\..+$/;
-const fullAssetMarkerSize = 45;
 const DEFAULT_ISSUE_STATUS = IssueStatus.BACKLOG;
 const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
 const OUTBOX_RETRY_DELAY = 6e4;
@@ -700,17 +593,6 @@ function memoize(func) {
     }
   };
 }
-function useMemoCompare(next, compare) {
-  const previousRef = useRef(void 0);
-  const previous = previousRef.current;
-  const isEqual = compare(previous, next);
-  useEffect(() => {
-    if (!isEqual) {
-      previousRef.current = next;
-    }
-  });
-  return isEqual ? previous : next;
-}
 function areArraysEqual(first, second) {
   if (first.length !== second.length)
     return false;
@@ -720,7 +602,6 @@ function areArraysEqual(first, second) {
   }
   return true;
 }
-const genericMemo = React.memo;
 const fallbackToEmptyArray = (array) => {
   return array.length === 0 ? EMPTY_ARRAY : array;
 };
@@ -753,19 +634,6 @@ const Colors = {
   mint: mint.mint9,
   sky: sky.sky9
 };
-const AssetStageColors = {
-  indigo: indigo.indigo9,
-  red: red.red9,
-  violet: violet.violet9,
-  yellow: yellow.yellow9,
-  jade: jade.jade9,
-  cyan: cyan.cyan9,
-  gold: gold.gold9,
-  orange: orange.orange9,
-  lime: lime.lime9,
-  sky: sky.sky9,
-  pink: pink.pink9
-};
 const defaultBadgeColor = "#868686";
 const generateBadgeColors = (rawColor) => {
   const color = ColorCls(rawColor);
@@ -774,9 +642,6 @@ const generateBadgeColors = (rawColor) => {
   const textColor = color.hex() === safety.hex() ? "#000000" : "#FFFFFF";
   return { backgroundColor, textColor };
 };
-function getStageColor(index) {
-  return Object.values(AssetStageColors)[index % Object.keys(AssetStageColors).length];
-}
 const getLocalDateString = memoize((date) => {
   if (!date)
     return "";
@@ -799,63 +664,187 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-function createModelAdapter(computeModelId) {
-  const addOne = (state, action) => {
-    const id = computeModelId(action.payload);
-    state.instances[id] = action.payload;
-  };
-  const addMany = (state, action) => {
-    for (const model of action.payload) {
-      const id = computeModelId(model);
-      state.instances[id] = model;
-    }
-  };
-  const setOne = (state, action) => {
-    const id = computeModelId(action.payload);
-    state.instances[id] = action.payload;
-  };
-  const setMany = (state, action) => {
-    for (const model of action.payload) {
-      const id = computeModelId(model);
-      state.instances[id] = model;
-    }
-  };
-  const updateOne = (state, action) => {
-    const id = computeModelId(action.payload);
-    state.instances[id] = action.payload;
-  };
-  const updateMany = (state, action) => {
-    for (const model of action.payload) {
-      const id = computeModelId(model);
-      state.instances[id] = model;
-    }
-  };
-  const deleteOne = (state, action) => {
-    delete state.instances[action.payload];
-  };
-  const deleteMany = (state, action) => {
-    for (const id of action.payload) {
-      delete state.instances[id];
-    }
-  };
-  const initialize = (state, action) => {
-    state.instances = {};
-    for (const model of action.payload) {
-      const id = computeModelId(model);
-      state.instances[id] = model;
-    }
-  };
-  const getInitialState = (state) => {
-    return {
-      ...state,
-      instances: {}
-    };
-  };
-  return {
-    addOne,
-    addMany,
-    setOne,
-    setMany,
+class DeferredPromise {
+  constructor() {
+    __publicField(this, _a, "Promise");
+    __publicField(this, "_promise");
+    __publicField(this, "_resolve");
+    __publicField(this, "_reject");
+    __publicField(this, "_state", "pending");
+    this._resolve = null;
+    this._reject = null;
+    this._promise = new Promise((resolve, reject) => {
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+  }
+  get state() {
+    return this._state;
+  }
+  then(onFulfilled, onRejected) {
+    return this._promise.then(onFulfilled, onRejected);
+  }
+  catch(onRejected) {
+    return this._promise.catch(onRejected);
+  }
+  resolve(value) {
+    if (!this._resolve)
+      throw new Error("No resolve callback");
+    this._resolve(value);
+    this._state = "fulfilled";
+  }
+  reject(reason) {
+    if (!this._reject)
+      throw reason;
+    this._reject(reason);
+    this._state = "rejected";
+  }
+  finally(_onFinally) {
+    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) => {
+  state[VERSION_REDUCER_KEY$1] = { version: latestVersion() };
+  return state;
+};
+const signOut = () => {
+  return initialVersioning({});
+};
+const createOutboxState = (state) => {
+  if (state.outboxReducer) {
+    state.outboxReducer.deletedRequests = [];
+  }
+  return state;
+};
+const wrapMigration = (migrator) => (state) => {
+  var _a2;
+  if (state === void 0) {
+    state = {};
+  }
+  if (((_a2 = state[VERSION_REDUCER_KEY$1]) == null ? void 0 : _a2.version) === latestVersion())
+    return state;
+  return migrator(state);
+};
+const migrations = [initialVersioning, signOut, signOut, createOutboxState];
+const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
+const initialState$B = {
+  accessToken: "",
+  refreshToken: "",
+  isLoggedIn: false
+};
+const authSlice = createSlice({
+  name: "auth",
+  initialState: initialState$B,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$B)),
+  reducers: {
+    setTokens: (state, action) => {
+      state.accessToken = action.payload.accessToken;
+      state.refreshToken = action.payload.refreshToken;
+    },
+    clearTokens: (state) => {
+      state.accessToken = "";
+      state.refreshToken = "";
+    },
+    setLoggedIn: (state, action) => {
+      if (!action.payload) {
+        authSlice.caseReducers.clearTokens(state);
+      }
+      state.isLoggedIn = action.payload;
+    }
+  }
+});
+const { setTokens, clearTokens, setLoggedIn } = authSlice.actions;
+const selectAccessToken = (state) => state.authReducer.accessToken;
+const selectIsLoggedIn = (state) => state.authReducer.isLoggedIn;
+const authReducer = authSlice.reducer;
+function createModelAdapter(computeModelId) {
+  const addOne = (state, action) => {
+    const id = computeModelId(action.payload);
+    state.instances[id] = action.payload;
+  };
+  const addMany = (state, action) => {
+    for (const model of action.payload) {
+      const id = computeModelId(model);
+      state.instances[id] = model;
+    }
+  };
+  const setOne = (state, action) => {
+    const id = computeModelId(action.payload);
+    state.instances[id] = action.payload;
+  };
+  const setMany = (state, action) => {
+    for (const model of action.payload) {
+      const id = computeModelId(model);
+      state.instances[id] = model;
+    }
+  };
+  const updateOne = (state, action) => {
+    const id = computeModelId(action.payload);
+    state.instances[id] = action.payload;
+  };
+  const updateMany = (state, action) => {
+    for (const model of action.payload) {
+      const id = computeModelId(model);
+      state.instances[id] = model;
+    }
+  };
+  const deleteOne = (state, action) => {
+    delete state.instances[action.payload];
+  };
+  const deleteMany = (state, action) => {
+    for (const id of action.payload) {
+      delete state.instances[id];
+    }
+  };
+  const initialize = (state, action) => {
+    state.instances = {};
+    for (const model of action.payload) {
+      const id = computeModelId(model);
+      state.instances[id] = model;
+    }
+  };
+  const getInitialState = (state) => {
+    return {
+      ...state,
+      instances: {}
+    };
+  };
+  return {
+    addOne,
+    addMany,
+    setOne,
+    setMany,
     updateOne,
     updateMany,
     deleteOne,
@@ -1031,61 +1020,72 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetAttachmentReducer = assetAttachmentSlice.reducer;
-const initialState$x = {
-  completionsByAssetId: {}
-};
+const assetStageCompletionAdapter = createModelAdapter(
+  (stageCompletion) => stageCompletion.offline_id
+);
+const initialState$x = assetStageCompletionAdapter.getInitialState({});
 const assetStageCompletionSlice = createSlice({
   name: "assetStageCompletions",
   initialState: initialState$x,
   extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$x)),
   reducers: {
-    addStageCompletion: (state, action) => {
-      let stageToCompletionDateMapping = state.completionsByAssetId[action.payload.asset];
-      if (!stageToCompletionDateMapping) {
-        stageToCompletionDateMapping = {};
-        state.completionsByAssetId[action.payload.asset] = stageToCompletionDateMapping;
-      }
-      stageToCompletionDateMapping[action.payload.stage] = (/* @__PURE__ */ new Date()).toISOString();
-    },
-    addStageCompletions: (state, action) => {
-      for (const [assetId, stageIdToCompletionDateMapping] of Object.entries(action.payload)) {
-        if (Object.keys(stageIdToCompletionDateMapping).length === 0)
-          throw new Error(`Encountered empty stageIdToCompletionDateMapping argument for asset ${assetId}`);
-        let thisAssetCompletions = state.completionsByAssetId[assetId];
-        if (thisAssetCompletions === void 0) {
-          thisAssetCompletions = {};
-        }
-        for (const [stageId, completionDate] of Object.entries(stageIdToCompletionDateMapping)) {
-          thisAssetCompletions[stageId] = completionDate;
-        }
-        state.completionsByAssetId[assetId] = thisAssetCompletions;
-      }
-    },
-    removeStageCompletions: (state, action) => {
-      for (const completion of action.payload) {
-        const thisAssetCompletions = state.completionsByAssetId[completion.asset];
-        if (!thisAssetCompletions || !(completion.stage in thisAssetCompletions)) {
-          console.warn(
-            "Skipping removal of uncompleted stage. This message indicates completion objects are created unnecessarily."
-          );
-          continue;
-        }
-        delete thisAssetCompletions[completion.stage];
-      }
-    },
-    setStageCompletions: (state, action) => {
-      state.completionsByAssetId = action.payload;
-    }
+    initializeAssetStageCompletions: assetStageCompletionAdapter.initialize,
+    addAssetStageCompletion: assetStageCompletionAdapter.addOne,
+    addAssetStageCompletions: assetStageCompletionAdapter.addMany,
+    updateAssetStageCompletion: assetStageCompletionAdapter.updateOne,
+    updateAssetStageCompletions: assetStageCompletionAdapter.updateMany,
+    deleteAssetStageCompletion: assetStageCompletionAdapter.deleteOne,
+    deleteAssetStageCompletions: assetStageCompletionAdapter.deleteMany
   }
 });
-const { addStageCompletion, addStageCompletions, removeStageCompletions, setStageCompletions } = assetStageCompletionSlice.actions;
-const selectCompletedStages = (state) => {
-  return state.assetStageCompletionReducer.completionsByAssetId;
+const {
+  initializeAssetStageCompletions,
+  addAssetStageCompletion,
+  addAssetStageCompletions,
+  updateAssetStageCompletion,
+  updateAssetStageCompletions,
+  deleteAssetStageCompletion,
+  deleteAssetStageCompletions
+} = assetStageCompletionSlice.actions;
+const selectAssetStageCompletionMapping = (state) => {
+  return state.assetStageCompletionReducer.instances;
 };
+const selectCompletedStagesByAsset = createSelector(
+  [selectAssetStageCompletionMapping],
+  (completedStagesMapping) => {
+    const completedStagesByAsset = {};
+    for (const stageCompletion of Object.values(completedStagesMapping)) {
+      const { asset, stage, submitted_at } = stageCompletion;
+      if (!completedStagesByAsset[asset])
+        completedStagesByAsset[asset] = {};
+      completedStagesByAsset[asset][stage] = submitted_at;
+    }
+    return completedStagesByAsset;
+  }
+);
 const selectCompletedStageIdsForAsset = restructureCreateSelectorWithArgs(
-  createSelector([selectCompletedStages, (_state, asset) => asset], (completedStages, asset) => {
-    return Object.keys(completedStages[asset.offline_id] ?? {});
-  })
+  createSelector(
+    [selectAssetStageCompletionMapping, (_state, asset) => asset],
+    (completedStages, asset) => {
+      return Object.keys(completedStages[asset.offline_id] ?? {});
+    }
+  )
+);
+const selectAssetStageCompletionById = (id) => (state) => {
+  return state.assetStageCompletionReducer.instances[id];
+};
+const selectAssetStageCompletionsByIds = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAssetStageCompletionMapping, (_, stageCompletionIds) => stageCompletionIds],
+    (stageCompletionMapping, stageCompletionIds) => {
+      const stageCompletionIdsSet = new Set(stageCompletionIds);
+      return fallbackToEmptyArray(
+        Object.values(stageCompletionMapping).filter(
+          (stageCompletion) => stageCompletionIdsSet.has(stageCompletion.offline_id)
+        )
+      );
+    }
+  )
 );
 const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
 const assetStageAdapter = createModelAdapter((assetStage) => assetStage.offline_id);
@@ -1095,14 +1095,29 @@ const assetStageSlice = createSlice({
   initialState: initialState$w,
   extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$w)),
   reducers: {
-    initializeStages: assetStageAdapter.initialize,
-    setStage: assetStageAdapter.setOne,
-    addStages: assetStageAdapter.addMany,
-    updateStage: assetStageAdapter.updateOne,
-    updateStages: assetStageAdapter.updateMany,
-    removeStages: assetStageAdapter.deleteMany
+    initializeAssetStages: assetStageAdapter.initialize,
+    setAssetStage: assetStageAdapter.setOne,
+    setAssetStages: assetStageAdapter.setMany,
+    addAssetStage: assetStageAdapter.addOne,
+    addAssetStages: assetStageAdapter.addMany,
+    updateAssetStage: assetStageAdapter.updateOne,
+    updateAssetStages: assetStageAdapter.updateMany,
+    deleteAssetStage: assetStageAdapter.deleteOne,
+    deleteAssetStages: assetStageAdapter.deleteMany
   }
 });
+const {
+  initializeAssetStages,
+  setAssetStage,
+  setAssetStages,
+  addAssetStage,
+  addAssetStages,
+  updateAssetStage,
+  updateAssetStages,
+  deleteAssetStage,
+  deleteAssetStages
+} = assetStageSlice.actions;
+const assetStageReducer = assetStageSlice.reducer;
 const selectStageMapping = (state) => state.assetStageReducer.instances;
 const selectAssetStageById = (id) => (state) => {
   return state.assetStageReducer.instances[id];
@@ -1110,24 +1125,6 @@ const selectAssetStageById = (id) => (state) => {
 const selectAssetStages = createSelector([selectStageMapping], (stageMapping) => {
   return Object.values(stageMapping);
 });
-const selectStagesFromAssetTypeIds = restructureCreateSelectorWithArgs(
-  createSelector([selectAssetStages, (_state, assetTypeIds) => assetTypeIds], (stages, assetTypeIds) => {
-    const assetTypeIdsSet = new Set(assetTypeIds);
-    const ret = {};
-    for (const stage of stages) {
-      if (assetTypeIdsSet.has(stage.asset_type)) {
-        if (!ret[stage.asset_type]) {
-          ret[stage.asset_type] = [];
-        }
-        ret[stage.asset_type].push(stage);
-      }
-    }
-    for (const key in ret) {
-      ret[key] = ret[key].sort((a, b) => a.priority - b.priority);
-    }
-    return ret;
-  })
-);
 const selectAssetTypeStagesMapping = restructureCreateSelectorWithArgs(
   createSelector([selectStageMapping, (_state, assetTypeId) => assetTypeId], (stagesMapping, assetTypeId) => {
     const assetTypeStagesMapping = {};
@@ -1175,8 +1172,6 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
     return ret;
   })
 );
-const { initializeStages, setStage, addStages, updateStages, removeStages, updateStage } = assetStageSlice.actions;
-const assetStageReducer = assetStageSlice.reducer;
 const assetTypeAdapter = createModelAdapter((assetType) => assetType.offline_id);
 const initialState$v = assetTypeAdapter.getInitialState({});
 const assetTypeSlice = createSlice({
@@ -1185,11 +1180,27 @@ const assetTypeSlice = createSlice({
   extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$v)),
   reducers: {
     initializeAssetTypes: assetTypeAdapter.initialize,
+    setAssetType: assetTypeAdapter.setOne,
+    setAssetTypes: assetTypeAdapter.setMany,
     addAssetType: assetTypeAdapter.addOne,
-    deleteAssetType: assetTypeAdapter.deleteOne
+    addAssetTypes: assetTypeAdapter.addMany,
+    updateAssetType: assetTypeAdapter.updateOne,
+    updateAssetTypes: assetTypeAdapter.updateMany,
+    deleteAssetType: assetTypeAdapter.deleteOne,
+    deleteAssetTypes: assetTypeAdapter.deleteMany
   }
 });
-const { addAssetType, initializeAssetTypes, deleteAssetType } = assetTypeSlice.actions;
+const {
+  initializeAssetTypes,
+  setAssetType,
+  setAssetTypes,
+  addAssetType,
+  addAssetTypes,
+  updateAssetType,
+  updateAssetTypes,
+  deleteAssetType,
+  deleteAssetTypes
+} = assetTypeSlice.actions;
 const selectAssetTypesMapping = (state) => state.assetTypeReducer.instances;
 const selectAssetTypes = createSelector(
   [selectAssetTypesMapping],
@@ -1281,50 +1292,13 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetTypeAttachmentReducer = assetTypeAttachmentSlice.reducer;
-const workspaceAdapter = createModelAdapter((workspace) => workspace.offline_id);
-const initialState$t = workspaceAdapter.getInitialState({});
-const workspaceSlice = createSlice({
-  name: "workspace",
-  initialState: initialState$t,
-  reducers: {
-    initializeWorkspaces: workspaceAdapter.initialize,
-    setWorkspaces: workspaceAdapter.setMany,
-    addWorkspace: workspaceAdapter.addOne,
-    updateWorkspace: workspaceAdapter.updateOne,
-    deleteWorkspace: workspaceAdapter.deleteOne
-  }
-});
-const { initializeWorkspaces, setWorkspaces, addWorkspace, updateWorkspace, deleteWorkspace } = workspaceSlice.actions;
-const selectWorkspaceMapping = (state) => state.workspaceReducer.instances;
-const selectWorkspaces = createSelector([selectWorkspaceMapping], (mapping) => Object.values(mapping));
-const selectMainWorkspace = createSelector(
-  [selectWorkspaces],
-  (workspaces) => {
-    return workspaces.find((workspace) => workspace.name.toLowerCase() === "main");
-  }
-);
-const selectWorkspaceById = (id) => (state) => {
-  return state.workspaceReducer.instances[id];
-};
-const selectPermittedWorkspaceIds = createSelector(
-  [selectWorkspaceMapping],
-  (mapping) => {
-    return new Set(
-      Object.values(mapping).filter((workspace) => workspace.permitted).map((workspace) => workspace.offline_id)
-    );
-  }
-);
-const workspaceReducer = workspaceSlice.reducer;
-const maxRecentIssues = 10;
 const issueAdapter = createModelAdapter((issue) => issue.offline_id);
-const initialState$s = issueAdapter.getInitialState({
-  recentIssueIds: []
-});
+const initialState$t = issueAdapter.getInitialState({});
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$s,
+  initialState: initialState$t,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$s);
+    Object.assign(state, initialState$t);
   }),
   reducers: {
     initializeIssues: issueAdapter.initialize,
@@ -1332,104 +1306,14 @@ const issueSlice = createSlice({
     addIssues: issueAdapter.addMany,
     updateIssue: issueAdapter.updateOne,
     deleteIssue: issueAdapter.deleteOne,
-    deleteIssues: issueAdapter.deleteMany,
-    cleanRecentIssues: (state) => {
-      state.recentIssueIds = state.recentIssueIds.filter((recentIssue) => state.instances[recentIssue.offlineId]);
-    },
-    addToRecentIssues: (state, action) => {
-      state.recentIssueIds = state.recentIssueIds.filter(
-        (recentIssue) => recentIssue.offlineId !== action.payload
-      );
-      state.recentIssueIds.push({ offlineId: action.payload.toLowerCase(), lastOpenedEpochTime: Date.now() });
-      if (state.recentIssueIds.length > maxRecentIssues) {
-        state.recentIssueIds.shift();
-      }
-    },
-    resetRecentIssues: (state) => {
-      state.recentIssueIds = [];
-    },
-    removeRecentIssue: (state, action) => {
-      const indexToRemove = state.recentIssueIds.findIndex((item) => {
-        return item.offlineId == action.payload;
-      });
-      if (indexToRemove !== -1) {
-        state.recentIssueIds.splice(indexToRemove, 1);
-      }
-    }
+    deleteIssues: issueAdapter.deleteMany
   }
 });
-const {
-  initializeIssues,
-  addIssue,
-  addIssues,
-  updateIssue,
-  deleteIssue,
-  deleteIssues,
-  addToRecentIssues,
-  cleanRecentIssues,
-  removeRecentIssue,
-  resetRecentIssues
-} = issueSlice.actions;
+const { initializeIssues, addIssue, addIssues, updateIssue, deleteIssue, deleteIssues } = issueSlice.actions;
 const selectIssueMapping = (state) => state.issueReducer.instances;
-const selectRecentIssueIds = (state) => state.issueReducer.recentIssueIds;
 const selectIssueById = (id) => (state) => {
   return state.issueReducer.instances[id];
 };
-const searchIssues = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectIssueMapping, selectWorkspaceMapping, (_state, searchArgs) => searchArgs],
-    (mapping, workspaceMapping, searchArgs) => {
-      let searchTerm = searchArgs.searchTerm;
-      const maxResults = searchArgs.maxResults;
-      searchTerm = searchTerm.toLowerCase();
-      const ret = [];
-      const issues = Object.values(mapping);
-      let nbResults = 0;
-      for (const issue of issues) {
-        if (!issue.index_workspace) {
-          logOnlyOnce(
-            "issue-has-no-index-workspace",
-            issue.offline_id,
-            "warn",
-            `Issue ${issue.offline_id} has no index_workspace and cannot be searched.`
-          );
-          continue;
-        }
-        const workspace = workspaceMapping[issue.index_workspace];
-        if (!workspace) {
-          logOnlyOnce(
-            "issue-has-non-existent-index-workspace",
-            issue.offline_id,
-            "warn",
-            `Encountered issue with an index_workspace that doesn't exist. Issue ${issue.offline_id} has 
-					index_workspace = ${issue.index_workspace}, which does not exist in:`,
-            Object.keys(workspaceMapping)
-          );
-          continue;
-        }
-        const workspaceAbbreviation = workspace.abbreviation;
-        if (!workspaceAbbreviation) {
-          logOnlyOnce(
-            "workspace-has-no-abbreviation",
-            workspace.offline_id,
-            "error",
-            `Workspace ${workspace.name} has no abbreviation. Not including any issues in search.`
-          );
-          continue;
-        }
-        const tag = "index" in issue ? `${workspaceAbbreviation.toUpperCase()}-${issue.index}` : null;
-        if ((issue.title || "").toLowerCase().includes(searchTerm) || tag && tag.toLowerCase().includes(searchTerm)) {
-          ret.push(issueToSearchResult(issue, tag));
-          nbResults++;
-          if (maxResults && nbResults >= maxResults) {
-            return ret;
-          }
-        }
-      }
-      return ret;
-    }
-  )
-);
 const selectIssuesByIds = restructureCreateSelectorWithArgs(
   createSelector([selectIssueMapping, (_, issueIds) => issueIds], (issuesMapping, issueIds) => {
     const issues = [];
@@ -1444,48 +1328,14 @@ const selectIssuesByIds = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(issues);
   })
 );
-const selectRecentIssuesAsSearchResults = createSelector(
-  [selectIssueMapping, selectRecentIssueIds, selectWorkspaceMapping],
-  (issueMapping, recentIssueIds, workspaceMapping) => {
-    const ret = [];
-    for (const recentIssueResult of recentIssueIds) {
-      const issue = issueMapping[recentIssueResult.offlineId];
-      if (!issue) {
-        console.info("Recent issue no longer exists");
-        continue;
-      }
-      if ("index" in issue && issue.index_workspace) {
-        const indexWorkspace = workspaceMapping[issue.index_workspace];
-        if (!indexWorkspace) {
-          logOnlyOnce(
-            "issue-has-index-but-not-index-workspace",
-            issue.offline_id,
-            "warn",
-            `Issue ${issue.offline_id} has an index but no index_workspace. This may be because the 
-					workspace has been deleted, but the new index has not been returned by the server yet. It will not
-					be included in search results.`
-          );
-          continue;
-        }
-        const workspaceTag = `${indexWorkspace.abbreviation}-${issue.index}`;
-        const searchResult = {
-          ...issueToSearchResult(issue, workspaceTag),
-          lastOpenedEpochTime: recentIssueResult.lastOpenedEpochTime
-        };
-        ret.push(searchResult);
-      }
-    }
-    return ret;
-  }
-);
 const issueReducer = issueSlice.reducer;
 const issueTypeAdapter = createModelAdapter((issueType) => issueType.offline_id);
-const initialState$r = issueTypeAdapter.getInitialState({});
+const initialState$s = issueTypeAdapter.getInitialState({});
 const issueTypeSlice = createSlice({
   name: "issueTypes",
-  initialState: initialState$r,
+  initialState: initialState$s,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$r);
+    Object.assign(state, initialState$s);
   }),
   reducers: {
     initializeIssueTypes: issueTypeAdapter.initialize,
@@ -1533,117 +1383,58 @@ const selectIssuesOfIssueType = restructureCreateSelectorWithArgs(
     [(state) => state.issueReducer.instances, (_, issueTypeId) => issueTypeId],
     (issuesMapping, issueTypeId) => {
       return fallbackToEmptyArray(
-        Object.values(issuesMapping).filter((issue) => issue.issue_type === issueTypeId)
-      );
-    }
-  )
-);
-const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
-  return selectIssuesOfIssueType(issueTypeId)(state).length;
-};
-const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$q = {
-  s3Urls: {}
-};
-const msPerHour = 1e3 * 60 * 60;
-const msPerWeek = msPerHour * 24 * 7;
-const fileSlice = createSlice({
-  name: "file",
-  initialState: initialState$q,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
-  reducers: {
-    setUploadUrl: (state, action) => {
-      const { url, fields, sha1 } = action.payload;
-      const today2 = /* @__PURE__ */ new Date();
-      const weekFromToday = new Date(today2.getTime() + msPerWeek);
-      state.s3Urls[sha1] = {
-        url,
-        fields,
-        exp: weekFromToday.getTime()
-      };
-    }
-  }
-});
-const { setUploadUrl } = fileSlice.actions;
-const selectUploadUrl = (sha1) => (state) => {
-  const url = state.fileReducer.s3Urls[sha1];
-  if (!url) {
-    return void 0;
-  }
-  const today2 = (/* @__PURE__ */ new Date()).getTime();
-  const expiringWithinAnHour = (url.exp ?? today2) - today2 < msPerHour;
-  if (expiringWithinAnHour)
-    return void 0;
-  return url;
-};
-const fileReducer = fileSlice.reducer;
-var ProjectAccessLevel = /* @__PURE__ */ ((ProjectAccessLevel2) => {
-  ProjectAccessLevel2[ProjectAccessLevel2["BASIC"] = 0] = "BASIC";
-  ProjectAccessLevel2[ProjectAccessLevel2["ADMIN"] = 2] = "ADMIN";
-  return ProjectAccessLevel2;
-})(ProjectAccessLevel || {});
-var OrganizationAccessLevel = /* @__PURE__ */ ((OrganizationAccessLevel2) => {
-  OrganizationAccessLevel2[OrganizationAccessLevel2["BASIC"] = 0] = "BASIC";
-  OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
-  return OrganizationAccessLevel2;
-})(OrganizationAccessLevel || {});
-var AttachmentModel = /* @__PURE__ */ ((AttachmentModel2) => {
-  AttachmentModel2["Issue"] = "issue";
-  AttachmentModel2["Asset"] = "asset";
-  AttachmentModel2["AssetType"] = "asset_type";
-  AttachmentModel2["Project"] = "project";
-  AttachmentModel2["Document"] = "document";
-  return AttachmentModel2;
-})(AttachmentModel || {});
-var IssueUpdateChange = /* @__PURE__ */ ((IssueUpdateChange2) => {
-  IssueUpdateChange2["STATUS"] = "status";
-  IssueUpdateChange2["PRIORITY"] = "priority";
-  IssueUpdateChange2["CATEGORY"] = "category";
-  IssueUpdateChange2["DESCRIPTION"] = "description";
-  IssueUpdateChange2["TITLE"] = "title";
-  IssueUpdateChange2["ASSIGNED_TO"] = "assigned_to";
-  IssueUpdateChange2["DUE_DATE"] = "due_date";
-  return IssueUpdateChange2;
-})(IssueUpdateChange || {});
-var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
-  VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
-  VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
-  VerificationCodeType2[VerificationCodeType2["PROJECT_INVITE"] = 4] = "PROJECT_INVITE";
-  VerificationCodeType2[VerificationCodeType2["ORGANIZATION_INVITE"] = 6] = "ORGANIZATION_INVITE";
-  VerificationCodeType2[VerificationCodeType2["ADD_EMAIL_DOMAIN"] = 8] = "ADD_EMAIL_DOMAIN";
-  VerificationCodeType2[VerificationCodeType2["RESET_PASSWORD"] = 10] = "RESET_PASSWORD";
-  return VerificationCodeType2;
-})(VerificationCodeType || {});
-var PaddleCheckoutEvent = /* @__PURE__ */ ((PaddleCheckoutEvent2) => {
-  PaddleCheckoutEvent2["COMPLETED"] = "checkout.completed";
-  PaddleCheckoutEvent2["CLOSED"] = "checkout.closed";
-  return PaddleCheckoutEvent2;
-})(PaddleCheckoutEvent || {});
-var LicenseLevel = /* @__PURE__ */ ((LicenseLevel2) => {
-  LicenseLevel2[LicenseLevel2["PRO"] = 0] = "PRO";
-  return LicenseLevel2;
-})(LicenseLevel || {});
-var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
-  LicenseStatus2[LicenseStatus2["ACTIVE"] = 0] = "ACTIVE";
-  LicenseStatus2[LicenseStatus2["PAUSED"] = 2] = "PAUSED";
-  LicenseStatus2[LicenseStatus2["CANCELLED"] = 4] = "CANCELLED";
-  LicenseStatus2[LicenseStatus2["INACTIVE"] = 6] = "INACTIVE";
-  LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
-  return LicenseStatus2;
-})(LicenseStatus || {});
-const initialState$p = {
-  users: {},
-  currentUser: {
-    id: 0,
-    username: "",
-    email: "",
-    profile: { file: null, file_sha1: null, favourite_project_ids: [], tour_step: -1 }
+        Object.values(issuesMapping).filter((issue) => issue.issue_type === issueTypeId)
+      );
+    }
+  )
+);
+const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
+  return selectIssuesOfIssueType(issueTypeId)(state).length;
+};
+const issueTypeReducer = issueTypeSlice.reducer;
+const initialState$r = {
+  s3Urls: {}
+};
+const msPerHour = 1e3 * 60 * 60;
+const msPerWeek = msPerHour * 24 * 7;
+const fileSlice = createSlice({
+  name: "file",
+  initialState: initialState$r,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
+  reducers: {
+    setUploadUrl: (state, action) => {
+      const { url, fields, sha1 } = action.payload;
+      const today2 = /* @__PURE__ */ new Date();
+      const weekFromToday = new Date(today2.getTime() + msPerWeek);
+      state.s3Urls[sha1] = {
+        url,
+        fields,
+        exp: weekFromToday.getTime()
+      };
+    }
+  }
+});
+const { setUploadUrl } = fileSlice.actions;
+const selectUploadUrl = (sha1) => (state) => {
+  const url = state.fileReducer.s3Urls[sha1];
+  if (!url) {
+    return void 0;
   }
+  const today2 = (/* @__PURE__ */ new Date()).getTime();
+  const expiringWithinAnHour = (url.exp ?? today2) - today2 < msPerHour;
+  if (expiringWithinAnHour)
+    return void 0;
+  return url;
+};
+const fileReducer = fileSlice.reducer;
+const initialState$q = {
+  users: {},
+  currentUser: null
 };
 const userSlice = createSlice({
   name: "users",
-  initialState: initialState$p,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
+  initialState: initialState$q,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -1661,6 +1452,8 @@ const userSlice = createSlice({
       state.currentUser = action.payload;
     },
     setProfilePicture: (state, action) => {
+      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];
@@ -1670,32 +1463,12 @@ const userSlice = createSlice({
       currentUser.profile.file = action.payload.file ?? null;
       currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
     },
-    addFavouriteProjectId: (state, action) => {
-      state.currentUser.profile.favourite_project_ids.push(action.payload);
-    },
-    removeFavouriteProjectId: (state, action) => {
-      state.currentUser.profile.favourite_project_ids = state.currentUser.profile.favourite_project_ids.filter(
-        (id) => id !== action.payload
-      );
-    },
-    setTourStep: (state, action) => {
-      state.currentUser.profile.tour_step = action.payload;
-    },
     removeUser: (state, action) => {
       delete state.users[action.payload];
     }
   }
 });
-const {
-  setCurrentUser,
-  setProfilePicture,
-  setUsers,
-  addUsers,
-  addFavouriteProjectId,
-  removeFavouriteProjectId,
-  setTourStep,
-  removeUser
-} = userSlice.actions;
+const { setCurrentUser, setProfilePicture, setUsers, addUsers, removeUser } = userSlice.actions;
 const userReducer = userSlice.reducer;
 const selectCurrentUser = (state) => state.userReducer.currentUser;
 const selectUsersMapping = (state) => state.userReducer.users;
@@ -1716,15 +1489,14 @@ const selectUsersByIds = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(users);
   })
 );
-const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
-const initialState$o = organizationAccessAdapter.getInitialState({});
+const initialState$p = organizationAccessAdapter.getInitialState({});
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$o,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
+  initialState: initialState$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     initializeOrganizationAccesses: organizationAccessAdapter.initialize,
     updateOrganizationAccess: organizationAccessAdapter.updateOne,
@@ -1742,7 +1514,7 @@ const selectActiveOrganizationAccess = createSelector(
   [selectCurrentUser, selectOrganizationAccesses],
   (currentUser, organizationAccesses) => {
     const activeOrganizationAccess = Object.values(organizationAccesses).find(
-      (organizationAccess) => organizationAccess.user === currentUser.id
+      (organizationAccess) => organizationAccess.user === (currentUser == null ? void 0 : currentUser.id)
     );
     return activeOrganizationAccess ?? null;
   }
@@ -1761,11 +1533,11 @@ const selectOrganizationAccessUserMapping = (state) => {
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
 const licenseAdapter = createModelAdapter((license) => license.offline_id);
-const initialState$n = licenseAdapter.getInitialState({});
+const initialState$o = licenseAdapter.getInitialState({});
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     initializeLicences: licenseAdapter.initialize,
     addLicenses: licenseAdapter.addMany,
@@ -1790,11 +1562,11 @@ const selectLicensesForProjectsMapping = createSelector(
 );
 const licenseReducer = licenseSlice.reducer;
 const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
-const initialState$m = projectAccessAdapter.getInitialState({});
+const initialState$n = projectAccessAdapter.getInitialState({});
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$m,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     initializeProjectAccesses: projectAccessAdapter.initialize,
     updateProjectAccess: projectAccessAdapter.updateOne,
@@ -1819,7 +1591,7 @@ 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.id && projectAccess.project === activeProjectId;
+    return projectAccess.user === (currentUser == null ? void 0 : currentUser.id) && projectAccess.project === activeProjectId;
   }) ?? null;
 };
 const selectProjectAccessForUser = (user) => (state) => {
@@ -1835,14 +1607,14 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$l = {
+const initialState$m = {
   projects: {},
   activeProjectId: null
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -1932,9 +1704,9 @@ const selectSortedProjectUsers = createSelector(
   [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
   (currentUser, userMapping, projectAccessMapping) => {
     return Object.values(userMapping).sort((userA, userB) => {
-      if (userA.id === currentUser.id) {
+      if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
         return -1;
-      } else if (userB.id === currentUser.id) {
+      } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
         return 1;
       }
       const projectAccessesA = projectAccessMapping[userA.id];
@@ -1949,13 +1721,13 @@ const selectSortedProjectUsers = createSelector(
     });
   }
 );
-const initialState$k = {
+const initialState$l = {
   organizations: {}
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -2011,9 +1783,9 @@ const selectSortedOrganizationUsers = createSelector(
   [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
   (currentUser, userMapping, organizationAccessMapping) => {
     return Object.values(userMapping).sort((userA, userB) => {
-      if (userA.id === currentUser.id) {
+      if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
         return -1;
-      } else if (userB.id === currentUser.id) {
+      } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
         return 1;
       }
       const organizationAccessesA = organizationAccessMapping[userA.id];
@@ -2046,14 +1818,14 @@ const createOfflineAction = (request2, baseUrl, serviceName) => {
     }
   };
 };
-const initialState$j = {
+const initialState$k = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
     // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -2085,15 +1857,15 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$i = {
+const initialState$j = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$j,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -2180,11 +1952,11 @@ const selectProjectFileById = (id) => (state) => {
 };
 const projectFileReducer = projectFileSlice.reducer;
 const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$h = projectAttachmentAdapter.getInitialState({});
+const initialState$i = projectAttachmentAdapter.getInitialState({});
 const projectAttachmentSlice = createSlice({
   name: "projectAttachments",
-  initialState: initialState$h,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
+  initialState: initialState$i,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
   reducers: {
     initializeProjectAttachments: projectAttachmentAdapter.initialize,
     addProjectAttachment: projectAttachmentAdapter.addOne,
@@ -2239,12 +2011,12 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
   )
 );
 const projectAttachmentReducer = projectAttachmentSlice.reducer;
-const initialState$g = {
+const initialState$h = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$g,
+  initialState: initialState$h,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -2269,11 +2041,11 @@ const formRevisionSortFn = (formRevisionA, formRevisionB) => {
   }
 };
 const formRevisionAdapter = createModelAdapter((revision) => revision.offline_id);
-const initialState$f = formRevisionAdapter.getInitialState({});
+const initialState$g = formRevisionAdapter.getInitialState({});
 const formRevisionsSlice = createSlice({
   name: "formRevisions",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     initializeFormRevisions: formRevisionAdapter.initialize,
     setFormRevision: formRevisionAdapter.setOne,
@@ -2345,11 +2117,11 @@ const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping
 });
 const formRevisionReducer = formRevisionsSlice.reducer;
 const formAdapter = createModelAdapter((form) => form.offline_id);
-const initialState$e = formAdapter.getInitialState({});
+const initialState$f = formAdapter.getInitialState({});
 const formSlice = createSlice({
   name: "forms",
-  initialState: initialState$e,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     initializeForms: formAdapter.initialize,
     setForm: formAdapter.setOne,
@@ -2375,29 +2147,18 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       (_state, search) => search
     ],
     (formsMapping, revisions, search) => {
-      const { searchTerm, maxResults, favorites, organization } = search;
-      const favoriteMatches = [];
+      const { searchTerm, maxResults, organization } = search;
       const regularMatches = [];
       for (const [formId, form] of Object.entries(formsMapping)) {
-        if (favorites !== void 0 && form.favorite != favorites)
-          continue;
         if (Number.isInteger(organization) && organization !== form.organization) {
           continue;
         }
         const latestRevision = _selectLatestFormRevision(revisions, formId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
-          if (form.favorite) {
-            favoriteMatches.push({ ...form, latestRevision });
-          } else {
-            regularMatches.push({ ...form, latestRevision });
-          }
-        }
-        if (favoriteMatches.length >= maxResults) {
-          break;
+          regularMatches.push(form);
         }
       }
-      const maxRegularMatches = maxResults - favoriteMatches.length;
-      return [...favoriteMatches, ...regularMatches.slice(0, maxRegularMatches)];
+      return [...regularMatches.slice(0, maxResults)];
     },
     // as the argument is an object, we check the first level of properties for equality
     { memoizeOptions: { equalityCheck: shallowEqual } }
@@ -2429,11 +2190,11 @@ const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping
   return Object.values(formsMapping).filter((form) => !form.asset_type).length;
 });
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
-const initialState$d = submissionAdapter.getInitialState({});
+const initialState$e = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
   name: "formSubmissions",
-  initialState: initialState$d,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     initializeFormSubmissions: submissionAdapter.initialize,
     setFormSubmission: submissionAdapter.setOne,
@@ -2645,11 +2406,11 @@ const formSubmissionReducer = formSubmissionSlice.reducer;
 const formSubmissionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$c = formSubmissionAttachmentAdapter.getInitialState({});
+const initialState$d = formSubmissionAttachmentAdapter.getInitialState({});
 const formSubmissionAttachmentSlice = createSlice({
   name: "formSubmissionAttachments",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     initializeFormSubmissionAttachments: formSubmissionAttachmentAdapter.initialize,
     addFormSubmissionAttachment: formSubmissionAttachmentAdapter.addOne,
@@ -2701,11 +2462,11 @@ const formSubmissionAttachmentReducer = formSubmissionAttachmentSlice.reducer;
 const formRevisionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$b = formRevisionAttachmentAdapter.getInitialState({});
+const initialState$c = formRevisionAttachmentAdapter.getInitialState({});
 const formRevisionAttachmentSlice = createSlice({
   name: "formRevisionAttachments",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     initializeFormRevisionAttachments: formRevisionAttachmentAdapter.initialize,
     addFormRevisionAttachment: formRevisionAttachmentAdapter.addOne,
@@ -2743,6 +2504,40 @@ const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
   )
 );
 const formRevisionAttachmentReducer = formRevisionAttachmentSlice.reducer;
+const workspaceAdapter = createModelAdapter((workspace) => workspace.offline_id);
+const initialState$b = workspaceAdapter.getInitialState({});
+const workspaceSlice = createSlice({
+  name: "workspace",
+  initialState: initialState$b,
+  reducers: {
+    initializeWorkspaces: workspaceAdapter.initialize,
+    setWorkspaces: workspaceAdapter.setMany,
+    addWorkspace: workspaceAdapter.addOne,
+    updateWorkspace: workspaceAdapter.updateOne,
+    deleteWorkspace: workspaceAdapter.deleteOne
+  }
+});
+const { initializeWorkspaces, setWorkspaces, addWorkspace, updateWorkspace, deleteWorkspace } = workspaceSlice.actions;
+const selectWorkspaceMapping = (state) => state.workspaceReducer.instances;
+const selectWorkspaces = createSelector([selectWorkspaceMapping], (mapping) => Object.values(mapping));
+const selectMainWorkspace = createSelector(
+  [selectWorkspaces],
+  (workspaces) => {
+    return workspaces.find((workspace) => workspace.name.toLowerCase() === "main");
+  }
+);
+const selectWorkspaceById = (id) => (state) => {
+  return state.workspaceReducer.instances[id];
+};
+const selectPermittedWorkspaceIds = createSelector(
+  [selectWorkspaceMapping],
+  (mapping) => {
+    return new Set(
+      Object.values(mapping).filter((workspace) => workspace.permitted).map((workspace) => workspace.offline_id)
+    );
+  }
+);
+const workspaceReducer = workspaceSlice.reducer;
 const emailDomainAdapter = createModelAdapter((emailDomain) => emailDomain.offline_id);
 const initialState$a = emailDomainAdapter.getInitialState({});
 const emailDomainsSlice = createSlice({
@@ -3131,13 +2926,13 @@ const {
   deleteIssueComments
 } = issueCommentSlice.actions;
 const selectIssueCommentMapping = (state) => state.issueCommentReducer.instances;
+const selectIssueCommentById = (id) => (state) => {
+  return state.issueCommentReducer.instances[id];
+};
 const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectIssueCommentMapping, (_state, issueId) => issueId],
-    (commentMapping, issueId) => {
-      return fallbackToEmptyArray(Object.values(commentMapping).filter((comment) => comment.issue === issueId));
-    }
-  )
+  createSelector([selectIssueCommentMapping, (_state, issueId) => issueId], (commentMapping, issueId) => {
+    return fallbackToEmptyArray(Object.values(commentMapping).filter((comment) => comment.issue === issueId));
+  })
 );
 const issueCommentReducer = issueCommentSlice.reducer;
 const issueUpdateAdapter = createModelAdapter((issueUpdate) => issueUpdate.offline_id);
@@ -3424,62 +3219,11 @@ const overmapReducers = {
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
-function handleWorkspaceRemoval(draft, action) {
-  const workspaceId = action.payload;
-  const issuesVisibleInWorkspace = Object.values(draft.issueReducer.instances).filter(
-    (issue) => issue.visible_in_workspaces.includes(workspaceId)
-  );
-  const mainWorkspace = selectMainWorkspace(draft);
-  if (!mainWorkspace) {
-    throw new Error("Main workspace not found");
-  }
-  if (action.payload === mainWorkspace.offline_id) {
-    throw new Error("Tried to delete main workspace");
-  }
-  const categoriesInThisWorkspace = new Set(
-    selectCategoriesOfWorkspace(workspaceId)(draft).map((category) => category.offline_id)
-  );
-  for (const issue of issuesVisibleInWorkspace) {
-    if (issue.category && categoriesInThisWorkspace.has(issue.category)) {
-      issue.category = null;
-    }
-  }
-  const issuesWithThisWorkspaceIndex = issuesVisibleInWorkspace.filter(
-    (issue) => issue.index_workspace === action.payload
-  );
-  for (const issue of issuesWithThisWorkspaceIndex) {
-    issue.index_workspace = mainWorkspace.offline_id;
-    if (!issue.visible_in_workspaces.includes(mainWorkspace.offline_id)) {
-      issue.visible_in_workspaces.push(mainWorkspace.offline_id);
-    }
-  }
-  for (const issue of issuesVisibleInWorkspace) {
-    const indexOfWorkspace = issue.visible_in_workspaces.indexOf(workspaceId);
-    if (indexOfWorkspace === -1) {
-      throw new Error("Workspace not found in issue's visible_in_workspaces");
-    }
-    issue.visible_in_workspaces.splice(indexOfWorkspace, 1);
-  }
-  for (const issue of issuesVisibleInWorkspace) {
-    if (issue.visible_in_workspaces.length === 0) {
-      throw new Error(`Unexpected error: Issue ${issue.offline_id} has no visible_in_workspaces`);
-    }
-    if (issue.index_workspace === action.payload || !issue.index_workspace) {
-      throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
-    }
-  }
-}
 const overmapRootReducer = (state, action) => {
   if (action.type === "auth/setLoggedIn" && !action.payload) {
     return overmapReducer(void 0, action);
   }
-  let mutatedState = state;
-  if (state && action.type === "workspace/removeWorkspace") {
-    mutatedState = createNextState(state, (draft) => {
-      handleWorkspaceRemoval(draft, action);
-    });
-  }
-  return overmapReducer(mutatedState, action);
+  return overmapReducer(state, action);
 };
 let __OUTBOX_COORDINATOR = null;
 function getOutboxCoordinator() {
@@ -4098,57 +3842,66 @@ class BaseApiService extends BaseService {
   }
 }
 class CategoryService extends BaseApiService {
-  add(category, workspaceId) {
-    const offlineCategory = offline(category);
-    const categoryWithWorkspace = { ...offlineCategory, workspace: workspaceId };
-    this.dispatch(addCategory(categoryWithWorkspace));
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineCategory = offline({
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
+    });
+    this.dispatch(addCategory(offlineCategory));
     const promise = this.enqueueRequest({
       description: "Create Category",
       method: HttpMethod.POST,
       url: "/categories/",
       queryParams: {
-        workspace_id: workspaceId.toString()
+        workspace_id: payload.workspace.toString()
       },
       payload: offlineCategory,
-      blockers: [],
+      blockers: [payload.workspace],
       blocks: [offlineCategory.offline_id]
     });
-    return [categoryWithWorkspace, promise];
+    return [offlineCategory, promise];
   }
-  update(category, workspaceId) {
+  update(payload) {
     const state = this.client.store.getState();
-    const existingCategory = selectCategoryById(category.offline_id)(state);
+    const existingCategory = selectCategoryById(payload.offline_id)(state);
     if (!existingCategory) {
-      throw new Error(`Expected an existing category with offline_id ${category.offline_id}`);
+      throw new Error(`Expected an existing category with offline_id ${payload.offline_id}`);
     }
-    const optimisticCategory = { ...existingCategory, ...category };
+    const optimisticCategory = { ...existingCategory, ...payload };
     this.dispatch(updateCategory(optimisticCategory));
     const promise = this.enqueueRequest({
       description: "Edit Category",
       method: HttpMethod.PATCH,
-      url: `/categories/${category.offline_id}/`,
-      queryParams: {
-        workspace_id: workspaceId.toString()
-      },
-      payload: category,
-      blockers: [category.offline_id],
-      blocks: [category.offline_id]
+      url: `/categories/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     return [optimisticCategory, promise];
   }
-  remove(category, workspaceId) {
-    this.dispatch(deleteCategory(category.offline_id));
-    return this.enqueueRequest({
+  remove(id) {
+    const { store } = this.client;
+    const category = selectCategoryById(id)(store.getState());
+    if (!category) {
+      throw new Error(`No category with id ${id} found in the store`);
+    }
+    this.dispatch(deleteCategory(id));
+    const promise = this.enqueueRequest({
       description: "Delete Category",
       method: HttpMethod.DELETE,
       url: `/categories/${category.offline_id}/`,
-      // TODO: Shouldn't be necessary to specify workspace_id here
-      queryParams: {
-        workspace_id: workspaceId.toString()
-      },
       blockers: [category.offline_id],
       blocks: []
     });
+    promise.catch(() => {
+      this.dispatch(addCategory(category));
+    });
+    return promise;
   }
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
@@ -4172,53 +3925,81 @@ function chunkArray(arr, chunkSize) {
 }
 class AssetService extends BaseApiService {
   // Basic CRUD functions
-  add(asset, workspaceId) {
-    if (!asset.canvas_marker && !asset.geo_marker) {
+  add(payload) {
+    const { store } = this.client;
+    if (!payload.canvas_marker && !payload.geo_marker) {
       throw new Error("Asset must have either a canvas_marker or geo_marker");
     }
-    const offlineAsset = offline(asset);
+    const createdBy = store.getState().userReducer.currentUser.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineAsset = offline({
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
+    });
     this.dispatch(addAsset(offlineAsset));
     const promise = this.enqueueRequest({
       description: "Create asset",
       method: HttpMethod.POST,
-      url: `/assets/types/${offlineAsset.asset_type}/add-assets/`,
-      queryParams: {
-        workspace_id: workspaceId.toString()
+      url: "/assets/",
+      payload: {
+        offline_id: offlineAsset.offline_id,
+        submitted_at: offlineAsset.submitted_at,
+        geo_marker: offlineAsset.geo_marker,
+        canvas_marker: offlineAsset.canvas_marker,
+        label: offlineAsset.label,
+        description: offlineAsset.description,
+        asset_type: offlineAsset.asset_type
       },
-      payload: { assets: [offlineAsset] },
-      blockers: [],
+      blockers: [offlineAsset.asset_type],
       blocks: [offlineAsset.offline_id]
     });
+    promise.then((createdAsset) => {
+      this.dispatch(updateAsset(createdAsset));
+    }).catch(() => {
+      this.dispatch(deleteAsset(offlineAsset.offline_id));
+    });
     return [offlineAsset, promise];
   }
-  update(asset, workspaceId) {
-    if (!asset.canvas_marker && !asset.geo_marker) {
+  update(payload) {
+    const { store } = this.client;
+    if (!payload.canvas_marker && !payload.geo_marker) {
       throw new Error("Asset must have either a canvas_marker or geo_marker");
     }
-    this.client.store.dispatch(updateAsset(asset));
+    const asset = selectAssetById(payload.offline_id)(store.getState());
+    if (!asset) {
+      throw new Error(`No asset with id ${payload.offline_id} found in the store`);
+    }
+    const updatedAsset = {
+      ...asset,
+      ...payload
+    };
+    this.dispatch(updateAsset(updatedAsset));
     const promise = this.enqueueRequest({
       description: "Edit asset",
       method: HttpMethod.PATCH,
-      url: `/assets/${asset.offline_id}/`,
-      queryParams: {
-        workspace_id: workspaceId.toString()
-      },
-      payload: asset,
-      blockers: [asset.offline_id],
-      blocks: [asset.offline_id]
+      url: `/assets/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
+    });
+    promise.then((result) => {
+      this.dispatch(updateAsset(result));
+    }).catch(() => {
+      this.dispatch(updateAsset(asset));
     });
-    return [asset, promise];
+    return [updatedAsset, promise];
   }
-  async remove(assetId) {
+  async remove(id) {
     const { store } = this.client;
     const state = store.getState();
-    const assetToBeDeleted = selectAssetById(assetId)(state);
+    const assetToBeDeleted = selectAssetById(id)(state);
     if (!assetToBeDeleted)
-      throw new Error(`No asset with id ${assetId} found in the store`);
-    const attachmentsOfAssets = selectAttachmentsOfAsset(assetId)(state);
-    const formSubmissionsOfAssets = selectFormSubmissionsOfAsset(assetId)(state);
-    const issueAssociations = selectIssueAssociationsOfAsset(assetId)(state);
-    this.dispatch(deleteAsset(assetId));
+      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);
+    this.dispatch(deleteAsset(id));
     if (attachmentsOfAssets.length > 0) {
       const attachmentsOfAssetIds = attachmentsOfAssets.map(({ offline_id }) => offline_id);
       this.dispatch(deleteAssetAttachments(attachmentsOfAssetIds));
@@ -4234,8 +4015,8 @@ class AssetService extends BaseApiService {
     return this.enqueueRequest({
       description: "Delete asset",
       method: HttpMethod.DELETE,
-      url: `/assets/${assetId}/`,
-      blockers: [assetId],
+      url: `/assets/${id}/`,
+      blockers: [id],
       blocks: []
     }).catch((err) => {
       this.dispatch(addAsset(assetToBeDeleted));
@@ -4245,39 +4026,17 @@ class AssetService extends BaseApiService {
       throw err;
     });
   }
-  async deleteAllAssetsOfAssetType(assetTypeId) {
-    const { store } = this.client;
-    const state = store.getState();
-    const allAssetsOfAssetType = selectAssetsOfAssetType(assetTypeId)(state);
-    const allAssetsOfAssetTypeIds = allAssetsOfAssetType.map((c) => c.offline_id);
-    const affectedOfflineIds = [assetTypeId, ...allAssetsOfAssetTypeIds];
-    store.dispatch(deleteAssets(allAssetsOfAssetTypeIds));
-    return this.enqueueRequest({
-      description: "Delete all assets of asset type",
-      method: HttpMethod.DELETE,
-      url: `/assets/types/${assetTypeId}/delete-all-of-type/`,
-      blockers: affectedOfflineIds,
-      blocks: affectedOfflineIds
-    }).catch((err) => {
-      store.dispatch(addAssets(allAssetsOfAssetType));
-      throw err;
-    });
-  }
-  // TODO: payload does not require asset_type
-  bulkAdd(assetsToCreate, workspaceId, assetTypeId, batchSize) {
+  bulkAdd(payloads, assetTypeId, batchSize) {
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const transactionId = v4();
-    const assetBatches = chunkArray(assetsToCreate, batchSize).map((assetBatch) => {
-      const assetPayloads = assetBatch.map((assetPayload) => {
-        return offline({
-          ...assetPayload,
-          submitted_at: submittedAt
-        });
-      });
+    const assetBatches = chunkArray(payloads, batchSize).map((assetBatch) => {
+      const assetPayloads = assetBatch.map((assetPayload) => offline(assetPayload));
       return {
         batchId: v4(),
         payload: {
           transaction_id: transactionId,
+          submitted_at: submittedAt,
+          asset_type: assetTypeId,
           assets: assetPayloads
         }
       };
@@ -4295,10 +4054,7 @@ class AssetService extends BaseApiService {
       const promise = this.enqueueRequest({
         description: "Batch create assets",
         method: HttpMethod.POST,
-        url: `/assets/types/${assetTypeId}/add-assets/`,
-        queryParams: {
-          workspace_id: workspaceId.toString()
-        },
+        url: "/assets/bulk/",
         payload,
         blockers,
         blocks
@@ -4324,117 +4080,152 @@ class AssetService extends BaseApiService {
   }
 }
 class AssetStageCompletionService extends BaseApiService {
-  add(assetId, stageId) {
-    var _a2;
+  add(payload) {
     const { store } = this.client;
-    const assetTypeId = (_a2 = selectAssetById(assetId)(store.getState())) == null ? void 0 : _a2.asset_type;
-    if (!assetTypeId) {
-      throw new Error(`Asset with offline_id ${assetId} not found`);
-    }
+    const createdBy = store.getState().userReducer.currentUser.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const offlineStageCompletion = offline({
-      asset: assetId,
-      stage: stageId
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
     });
-    this.dispatch(addStageCompletion(offlineStageCompletion));
+    this.dispatch(addAssetStageCompletion(offlineStageCompletion));
     const promise = this.enqueueRequest({
-      description: "Complete stage",
+      description: "Add asset stage completion",
       method: HttpMethod.POST,
-      url: `/assets/types/${assetTypeId}/complete-stages/`,
-      // TODO: Add submitted_at to model
-      payload: { completions: [{ ...offlineStageCompletion, submitted_at: (/* @__PURE__ */ new Date()).getTime() / 1e3 }] },
-      blockers: [assetId, stageId],
+      url: "/assets/completions/",
+      payload: {
+        offline_id: offlineStageCompletion.offline_id,
+        submitted_at: submittedAt,
+        asset: payload.asset,
+        stage: payload.stage
+      },
+      blockers: [payload.asset, payload.stage],
       blocks: [offlineStageCompletion.offline_id]
     });
+    promise.then((result) => {
+      this.dispatch(updateAssetStageCompletion(result));
+    }).catch(() => {
+      this.dispatch(deleteAssetStageCompletion(offlineStageCompletion.offline_id));
+    });
     return [offlineStageCompletion, promise];
   }
-  async refreshStore(projectId) {
-    const result = await this.enqueueRequest({
-      description: "Get stage completions",
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}/asset-stage-completions/`,
-      blockers: [],
+  delete(id) {
+    const { store } = this.client;
+    const assetStageCompletion = selectAssetStageCompletionById(id)(store.getState());
+    if (!assetStageCompletion) {
+      throw new Error(`Expected asset stage completion with id ${id} to exist`);
+    }
+    this.dispatch(deleteAssetStageCompletion(id));
+    const promise = this.enqueueRequest({
+      description: "Delete asset stage completion",
+      method: HttpMethod.DELETE,
+      url: `/assets/completions/${id}/`,
+      blockers: [id],
       blocks: []
     });
-    this.dispatch(addStageCompletions(result));
+    promise.catch(() => {
+      this.dispatch(addAssetStageCompletion(assetStageCompletion));
+    });
+    return promise;
   }
-  /**
-   * Creates a collection of AssetStageCompletions, marking the referenced stages as completed for the referenced
-   * assets. It's REQUIRED that all assets referenced all have the SAME asset type.
-   * @param assetTypeId The ID of the asset type for which we are completing stages (we can only complete
-   * stages for one asset type at a time)
-   * @param stageCompletions
-   */
-  async bulkAdd(assetTypeId, stageCompletions) {
-    const offlineStageCompletions = stageCompletions.map((completion) => {
-      return offline(completion);
-    });
-    const asMapping = {};
-    for (const completion of stageCompletions) {
-      const stageToCompletionDateMapping = asMapping[completion.asset] || {};
-      stageToCompletionDateMapping[completion.stage] = (/* @__PURE__ */ new Date()).toISOString();
-      asMapping[completion.asset] = stageToCompletionDateMapping;
-    }
-    this.dispatch(addStageCompletions(asMapping));
-    await this.enqueueRequest({
-      description: "Bulk complete stages",
+  bulkAdd(payloads) {
+    const { store } = this.client;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = store.getState().userReducer.currentUser.id;
+    const payload = payloads.map((payload2) => offline(payload2));
+    const offlineStageCompletions = payload.map((completion) => {
+      return {
+        ...completion,
+        created_by: createdBy,
+        submitted_at: submittedAt
+      };
+    });
+    const offlineIds = offlineStageCompletions.map(({ offline_id }) => offline_id);
+    this.dispatch(addAssetStageCompletions(offlineStageCompletions));
+    const promise = this.enqueueRequest({
+      description: "Bulk create asset stage completions",
       method: HttpMethod.POST,
-      url: `/assets/types/${assetTypeId}/complete-stages/`,
+      url: "/assets/completions/bulk/",
       payload: {
-        completions: offlineStageCompletions
+        submitted_at: submittedAt,
+        completions: payload
       },
-      blockers: [assetTypeId, ...stageCompletions.map((c) => c.asset), ...stageCompletions.map((c) => c.stage)],
-      blocks: offlineStageCompletions.map((c) => c.offline_id)
+      blockers: [...payloads.map((c) => c.asset), ...payloads.map((c) => c.stage)],
+      blocks: offlineIds
     });
-  }
-  bulkDelete(stageId, assetIds) {
-    const stageCompletionsToRemove = assetIds.map((assetId) => {
-      return {
-        asset: assetId,
-        stage: stageId
-      };
+    promise.then((result) => {
+      this.dispatch(updateAssetStageCompletions(result));
+    }).catch(() => {
+      this.dispatch(deleteAssetStageCompletions(offlineIds));
     });
-    this.dispatch(removeStageCompletions(stageCompletionsToRemove));
-    return this.enqueueRequest({
-      description: `Undo stage for ${assetIds.length} assets(s)`,
-      // TODO: Rename to setCompletedStages
+    return [offlineStageCompletions, promise];
+  }
+  bulkDelete(ids) {
+    const { store } = this.client;
+    const assetStageCompletions = selectAssetStageCompletionsByIds(ids)(store.getState());
+    this.dispatch(deleteAssetStageCompletions(ids));
+    const promise = this.enqueueRequest({
+      description: "Deleting asset stage completions",
       method: HttpMethod.DELETE,
-      url: `/assets/stages/${stageId}/undo-stages/`,
+      url: "/assets/completions/bulk/",
       payload: {
-        assets: assetIds
+        completion_ids: ids
       },
-      blockers: [stageId, ...assetIds],
+      blockers: ids,
+      blocks: []
+    });
+    promise.catch(() => {
+      this.dispatch(addAssetStageCompletions(assetStageCompletions));
+    });
+    return promise;
+  }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get asset stage completions",
+      method: HttpMethod.GET,
+      url: `/projects/${projectId}/asset-stage-completions/`,
+      blockers: [],
       blocks: []
     });
+    this.dispatch(initializeAssetStageCompletions(result));
   }
 }
 class AssetStageService extends BaseApiService {
-  async bulkCreateStages(stagesToSubmit, assetTypeId, workspaceId) {
+  bulkAdd(stagesToSubmit, assetTypeId) {
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = this.client.store.getState().userReducer.currentUser.id;
     const payload = stagesToSubmit.map((stage) => {
       return offline(stage);
     });
-    const fullStages = payload.map((stage) => {
-      return { ...stage, asset_type: assetTypeId };
+    const offlineStages = payload.map((stage) => {
+      return { ...stage, asset_type: assetTypeId, created_by: createdBy, submitted_at: submittedAt };
     });
-    this.dispatch(addStages(fullStages));
-    return this.enqueueRequest({
+    this.dispatch(addAssetStages(offlineStages));
+    const promise = this.enqueueRequest({
       description: "Add asset stages",
       method: HttpMethod.POST,
-      url: `/assets/types/${assetTypeId}/add-stages/`,
+      url: "/assets/stages/bulk/",
       payload: {
+        submitted_at: submittedAt,
+        asset_type: assetTypeId,
         stages: payload
       },
-      queryParams: {
-        workspace_id: workspaceId.toString()
-      },
-      blockers: [assetTypeId, workspaceId],
+      blockers: [assetTypeId],
       blocks: payload.map(({ offline_id }) => offline_id)
     });
+    promise.then((result) => {
+      this.dispatch(updateAssetStages(result));
+    }).catch(() => {
+      this.dispatch(deleteAssetStages(offlineStages.map(({ offline_id }) => offline_id)));
+    });
+    return [offlineStages, promise];
   }
-  async bulkUpdateStages(stagesToUpdate, assetTypeId) {
+  async bulkUpdate(stagesToUpdate, assetTypeId) {
     const store = this.client.store;
     const state = store.getState();
     const prevStages = selectAssetStagesByIds(stagesToUpdate.map(({ offline_id }) => offline_id))(state);
-    this.dispatch(updateStages(stagesToUpdate));
+    this.dispatch(updateAssetStages(stagesToUpdate));
     return this.enqueueRequest({
       description: "Edit asset stages",
       method: HttpMethod.PATCH,
@@ -4445,33 +4236,58 @@ class AssetStageService extends BaseApiService {
       blockers: [assetTypeId],
       blocks: stagesToUpdate.map(({ offline_id }) => offline_id)
     }).catch((e) => {
-      store.dispatch(updateStages(prevStages));
+      this.dispatch(updateAssetStages(prevStages));
       throw e;
     });
   }
   async bulkDelete(idsToDelete) {
-    this.dispatch(removeStages(idsToDelete));
-    return this.enqueueRequest({
+    const { store } = this.client;
+    const assetStages = selectAssetStagesByIds(idsToDelete)(store.getState());
+    this.dispatch(deleteAssetStages(idsToDelete));
+    const promise = this.enqueueRequest({
       description: "Delete asset stages",
       method: HttpMethod.DELETE,
-      url: "/assets/stages/bulk-delete/",
+      url: "/assets/stages/bulk/",
       payload: {
         stage_ids: idsToDelete
       },
       blockers: idsToDelete,
       blocks: []
     });
+    promise.catch(() => {
+      this.dispatch(addAssetStages(assetStages));
+    });
+    return promise;
   }
-  async update(assetStage) {
-    this.dispatch(addStages([assetStage]));
-    return this.enqueueRequest({
+  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`);
+    const updatedAssetStage = {
+      ...assetStage,
+      ...payload
+    };
+    this.dispatch(updateAssetStage(updatedAssetStage));
+    const promise = this.enqueueRequest({
       description: "Update asset stage",
       method: HttpMethod.PATCH,
       url: `/assets/stages/${assetStage.offline_id}/`,
-      payload: assetStage,
+      payload: {
+        name: payload.name,
+        description: payload.description,
+        priority: payload.priority,
+        color: payload.color
+      },
       blockers: [assetStage.offline_id],
       blocks: [assetStage.offline_id]
     });
+    promise.then((result) => {
+      this.dispatch(updateAssetStage(result));
+    }).catch(() => {
+      this.dispatch(setAssetStage(assetStage));
+    });
+    return [updatedAssetStage, promise];
   }
   async linkForm(stageId, formId) {
     const { store } = this.client;
@@ -4479,7 +4295,7 @@ class AssetStageService extends BaseApiService {
     if (!stage) {
       throw new Error(`No asset stage with id ${stageId} found in the store`);
     }
-    this.dispatch(updateStage({ ...stage, form: formId }));
+    this.dispatch(updateAssetStage({ ...stage, form: formId }));
     try {
       await this.enqueueRequest({
         description: "Link asset stage to form",
@@ -4490,7 +4306,7 @@ class AssetStageService extends BaseApiService {
         blocks: [stageId]
       });
     } catch (e) {
-      this.dispatch(setStage(stage));
+      this.dispatch(setAssetStage(stage));
       throw e;
     }
   }
@@ -4500,7 +4316,7 @@ class AssetStageService extends BaseApiService {
     if (!stage) {
       throw new Error(`No asset stage with id ${stageId} found in the store`);
     }
-    this.dispatch(updateStage({ ...stage, form: void 0 }));
+    this.dispatch(updateAssetStage({ ...stage, form: void 0 }));
     try {
       await this.enqueueRequest({
         description: "Unlink asset stage from form",
@@ -4510,7 +4326,7 @@ class AssetStageService extends BaseApiService {
         blocks: [stageId]
       });
     } catch (e) {
-      this.dispatch(setStage(stage));
+      this.dispatch(setAssetStage(stage));
       throw e;
     }
   }
@@ -4522,7 +4338,7 @@ class AssetStageService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    this.dispatch(initializeStages(result));
+    this.dispatch(initializeAssetStages(result));
   }
 }
 class BaseUploadService extends BaseApiService {
@@ -4602,8 +4418,9 @@ const AttachmentModelMeta = {
 };
 class BaseAttachmentService extends BaseUploadService {
   async attachFiles(files, modelId, buildOfflineAttachment) {
+    var _a2;
     const { store } = this.client;
-    const currentUser = store.getState().userReducer.currentUser;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const offlineAttachments = [];
     const attachmentPayloads = [];
@@ -4623,7 +4440,7 @@ class BaseAttachmentService extends BaseUploadService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId
       });
@@ -4729,29 +4546,61 @@ class AssetAttachmentService extends BaseAttachmentService {
   }
 }
 class AssetTypeService extends BaseApiService {
-  add(assetType) {
-    const offlineAssetType = offline(assetType);
+  add(payload) {
+    const { store } = this.client;
+    const createdBy = store.getState().userReducer.currentUser.id;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineAssetType = offline({
+      ...payload,
+      created_by: createdBy,
+      submitted_at: submittedAt
+    });
     this.dispatch(addAssetType(offlineAssetType));
     const promise = this.enqueueRequest({
       description: "Create asset type",
       method: HttpMethod.POST,
-      url: `/projects/${assetType.project}/asset-types/`,
+      url: `/projects/${payload.project}/asset-types/`,
       payload: { ...offlineAssetType },
       blockers: [],
       blocks: [offlineAssetType.offline_id]
     });
+    promise.then((result) => {
+      this.dispatch(updateAssetType(result));
+    }).catch(() => {
+      this.dispatch(deleteAssetType(offlineAssetType.offline_id));
+    });
     return [offlineAssetType, promise];
   }
-  update(assetType) {
-    this.dispatch(addAssetType(assetType));
-    return this.enqueueRequest({
+  update(payload) {
+    const { store } = this.client;
+    const assetType = selectAssetTypeById(payload.offline_id)(store.getState());
+    if (!assetType) {
+      throw new Error(`Expected asset type with offline_id ${payload.offline_id} to exist`);
+    }
+    const updatedAssetType = {
+      ...assetType,
+      ...payload
+    };
+    this.dispatch(updateAssetType(updatedAssetType));
+    const promise = this.enqueueRequest({
       description: "Update asset type",
       method: HttpMethod.PATCH,
-      url: `/assets/types/${assetType.offline_id}/`,
-      payload: assetType,
+      url: `/assets/types/${payload.offline_id}/`,
+      payload: {
+        icon: payload.icon,
+        color: payload.color,
+        name: payload.name,
+        description: payload.description
+      },
       blockers: [assetType.offline_id],
       blocks: [assetType.offline_id]
     });
+    promise.then((result) => {
+      this.dispatch(updateAssetType(result));
+    }).catch(() => {
+      this.dispatch(updateAssetType(assetType));
+    });
+    return [updatedAssetType, promise];
   }
   async delete(assetTypeId) {
     const { store } = this.client;
@@ -4760,17 +4609,13 @@ class AssetTypeService extends BaseApiService {
     if (!assetType) {
       throw new Error(`Expected asset type with offline_id ${assetTypeId} to exist`);
     }
+    const assetsOfAssetType = selectAssetsOfAssetType(assetTypeId)(state);
     const stagesOfAssetType = selectStagesOfAssetType(assetTypeId)(state);
     const attachmentsOfAssetType = selectAttachmentsOfAssetType(assetTypeId)(state);
     this.dispatch(deleteAssetType(assetTypeId));
-    if (stagesOfAssetType.length > 0) {
-      const stagesOfAssetTypeIds = stagesOfAssetType.map((assetStage) => assetStage.offline_id);
-      this.dispatch(removeStages(stagesOfAssetTypeIds));
-    }
-    if (attachmentsOfAssetType.length > 0) {
-      const attachmentsOfAssetTypeIds = attachmentsOfAssetType.map(({ offline_id }) => offline_id);
-      this.dispatch(deleteAssetTypeAttachments(attachmentsOfAssetTypeIds));
-    }
+    this.dispatch(deleteAssets(assetsOfAssetType.map((asset) => asset.offline_id)));
+    this.dispatch(deleteAssetStages(stagesOfAssetType.map((assetStage) => assetStage.offline_id)));
+    this.dispatch(deleteAssetTypeAttachments(attachmentsOfAssetType.map(({ offline_id }) => offline_id)));
     return this.enqueueRequest({
       description: "Delete asset type",
       method: HttpMethod.DELETE,
@@ -4779,7 +4624,8 @@ class AssetTypeService extends BaseApiService {
       blocks: []
     }).catch((e) => {
       this.dispatch(addAssetType(assetType));
-      this.dispatch(addStages(stagesOfAssetType));
+      this.dispatch(addAssets(assetsOfAssetType));
+      this.dispatch(addAssetStages(stagesOfAssetType));
       this.dispatch(addAssetTypeAttachments(attachmentsOfAssetType));
       throw e;
     });
@@ -4827,21 +4673,21 @@ class AssetTypeAttachmentService extends BaseAttachmentService {
   }
 }
 class IssueCommentService extends BaseApiService {
-  // Omit author and submitted_at since these will always be set internally
-  add(comment) {
+  add(payload) {
+    var _a2;
     const { store } = this.client;
     const offlineComment = offline({
-      ...comment,
-      author: store.getState().userReducer.currentUser.id,
+      ...payload,
+      author: (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     });
     this.dispatch(addIssueComment(offlineComment));
     const promise = this.enqueueRequest({
-      description: `${truncate(comment.content, 80)}`,
+      description: "Add issue comment",
       method: HttpMethod.POST,
-      url: `/issues/${comment.issue}/comment/`,
+      url: `/issues/${payload.issue}/comment/`,
       payload: offlineComment,
-      blockers: [comment.issue],
+      blockers: [payload.issue],
       blocks: [offlineComment.offline_id]
     });
     promise.catch(() => {
@@ -4849,37 +4695,41 @@ class IssueCommentService extends BaseApiService {
     });
     return [offlineComment, promise];
   }
-  update(comment) {
+  update(payload) {
     const { store } = this.client;
-    const commentToUpdate = store.getState().issueCommentReducer.instances[comment.offline_id];
+    const commentToUpdate = selectIssueCommentById(payload.offline_id)(store.getState());
     if (!commentToUpdate) {
-      throw new Error(`Comment with offline_id ${comment.offline_id} not found in store`);
+      throw new Error(`Comment with offline_id ${payload.offline_id} not found in store`);
     }
-    this.dispatch(setIssueComment(comment));
+    const updatedComment = {
+      ...commentToUpdate,
+      ...payload
+    };
+    this.dispatch(setIssueComment(updatedComment));
     const promise = this.enqueueRequest({
-      description: `Edit comment: ${truncate(comment.content, 80)}`,
+      description: "Edit issue comment",
       method: HttpMethod.PATCH,
-      url: `/issues/comments/${comment.offline_id}/`,
-      payload: comment,
-      blockers: [comment.issue],
-      blocks: [comment.offline_id]
+      url: `/issues/comments/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     promise.catch(() => {
       this.dispatch(setIssueComment(commentToUpdate));
     });
-    return [comment, promise];
+    return [updatedComment, promise];
   }
-  remove(offline_id) {
-    const commentToRemove = this.client.store.getState().issueCommentReducer.instances[offline_id];
+  remove(id) {
+    const commentToRemove = this.client.store.getState().issueCommentReducer.instances[id];
     if (!commentToRemove) {
-      throw new Error(`Comment with offline_id ${offline_id} not found in store`);
+      throw new Error(`Comment with offline_id ${id} not found in store`);
     }
-    this.dispatch(deleteIssueComment(offline_id));
+    this.dispatch(deleteIssueComment(id));
     const promise = this.enqueueRequest({
       description: "Delete comment",
       method: HttpMethod.DELETE,
-      url: `/issues/comments/${offline_id}/`,
-      blockers: [offline_id],
+      url: `/issues/comments/${id}/`,
+      blockers: [id],
       blocks: []
     });
     promise.catch(() => {
@@ -4952,71 +4802,50 @@ class IssueAttachmentService extends BaseAttachmentService {
 }
 class IssueService extends BaseApiService {
   // Basic CRUD functions
-  // TODO: Once all models are represented in `Created<TModel>`, use `Created` in `OptimisticModelResult`, so we don't
-  //  have to repeat it for all optimistic model results (all optimistic results are created).
-  add(issue, workspaceId, issueType = null) {
+  add(payload) {
+    var _a2;
     const { store } = this.client;
-    const dateWithoutMilliseconds = /* @__PURE__ */ new Date();
     const state = store.getState();
-    const currentUserId = state.userReducer.currentUser.id;
-    dateWithoutMilliseconds.setMilliseconds(0);
-    if (!workspaceId) {
-      throw new Error("No active workspace ID while creating issue.");
-    }
-    const issuePayload = offline({
-      ...issue,
-      submitted_at: dateWithoutMilliseconds.toISOString(),
-      index_workspace: workspaceId,
-      created_by: currentUserId,
-      status: issue.status ?? DEFAULT_ISSUE_STATUS,
-      priority: issue.priority ?? DEFAULT_ISSUE_PRIORITY
-    });
-    this.dispatch(addIssue(issuePayload));
-    this.dispatch(addToRecentIssues(issuePayload.offline_id));
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id;
+    const offlineIssue = offline({
+      ...payload,
+      submitted_at: submittedAt,
+      created_by: createdBy
+    });
+    this.dispatch(addIssue(offlineIssue));
     this.dispatch(addActiveProjectIssuesCount(1));
     const promise = this.enqueueRequest({
       description: "Create issue",
       method: HttpMethod.POST,
       url: "/issues/",
       queryParams: {
-        workspace_id: workspaceId,
-        ...issueType ? { issue_type: issueType } : {}
+        workspace_id: payload.index_workspace,
+        ...payload.issue_type ? { issue_type: payload.issue_type } : {}
       },
-      payload: issuePayload,
-      blockers: [
-        "add-issue",
-        ...issuePayload.index_workspace ? [issuePayload.index_workspace] : [],
-        ...issuePayload.visible_in_workspaces
-      ],
-      blocks: [issuePayload.offline_id]
+      payload: offlineIssue,
+      blockers: ["add-issue", ...offlineIssue.index_workspace ? [offlineIssue.index_workspace] : []],
+      blocks: [offlineIssue.offline_id]
     });
     void promise.then((result) => {
       this.dispatch(updateIssue(result));
     }).catch((error) => {
-      var _a2;
-      console.error(error);
-      if (error instanceof APIError) {
-        (_a2 = unsafeShowToast) == null ? void 0 : _a2({
-          title: "Could not create issue",
-          description: error.message,
-          accentColor: "red"
-        });
-      }
-      this.dispatch(deleteIssue(issuePayload.offline_id));
+      this.dispatch(deleteIssue(offlineIssue.offline_id));
       this.dispatch(addActiveProjectIssuesCount(-1));
       throw error;
     });
-    return [issuePayload, promise];
+    return [offlineIssue, promise];
   }
-  update(issue) {
+  update(payload) {
+    var _a2;
     const state = this.client.store.getState();
-    const issueToBeUpdated = selectIssueById(issue.offline_id)(state);
+    const issueToBeUpdated = selectIssueById(payload.offline_id)(state);
     if (!issueToBeUpdated) {
       throw new Error(
-        `Attempting to update an issue with offline_id ${issue.offline_id} that doesn't exist in the store`
+        `Attempting to update an issue with offline_id ${payload.offline_id} that doesn't exist in the store`
       );
     }
-    const updatedIssue = { ...issueToBeUpdated, ...issue };
+    const updatedIssue = { ...issueToBeUpdated, ...payload };
     this.dispatch(updateIssue(updatedIssue));
     const changes = {};
     for (const issueUpdateChange of [
@@ -5028,11 +4857,11 @@ class IssueService extends BaseApiService {
       IssueUpdateChange.ASSIGNED_TO,
       IssueUpdateChange.DUE_DATE
     ]) {
-      if (issueUpdateChange in issue && issue[issueUpdateChange] !== issueToBeUpdated[issueUpdateChange]) {
+      if (issueUpdateChange in payload && payload[issueUpdateChange] !== issueToBeUpdated[issueUpdateChange]) {
         switch (issueUpdateChange) {
           case "category": {
             let categoryOrNull = null;
-            const categoryIdOrNull = issue[issueUpdateChange];
+            const categoryIdOrNull = payload[issueUpdateChange];
             if (categoryIdOrNull) {
               categoryOrNull = state.categoryReducer.instances[categoryIdOrNull] ?? null;
               if (!categoryOrNull)
@@ -5049,7 +4878,7 @@ class IssueService extends BaseApiService {
           }
           case "assigned_to": {
             let userOrNull = null;
-            const userIdOrNull = issue[issueUpdateChange];
+            const userIdOrNull = payload[issueUpdateChange];
             if (userIdOrNull) {
               userOrNull = state.userReducer.users[userIdOrNull] ?? null;
               if (!userOrNull)
@@ -5064,24 +4893,24 @@ class IssueService extends BaseApiService {
             break;
           }
           case "description":
-            changes[issueUpdateChange] = issue[issueUpdateChange] ?? null;
+            changes[issueUpdateChange] = payload[issueUpdateChange] ?? null;
             break;
           case "title":
-            changes[issueUpdateChange] = issue[issueUpdateChange] ?? null;
+            changes[issueUpdateChange] = payload[issueUpdateChange] ?? null;
             break;
           case "priority":
-            changes[issueUpdateChange] = issue[issueUpdateChange];
+            changes[issueUpdateChange] = payload[issueUpdateChange];
             break;
           case "status":
-            changes[issueUpdateChange] = issue[issueUpdateChange];
+            changes[issueUpdateChange] = payload[issueUpdateChange];
             break;
           case "due_date":
-            changes[issueUpdateChange] = issue[issueUpdateChange] ? issue[issueUpdateChange] : null;
+            changes[issueUpdateChange] = payload[issueUpdateChange] ? payload[issueUpdateChange] : null;
         }
       }
     }
     const offlineIssueUpdate = offline({
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       issue: issueToBeUpdated.offline_id,
       changes
@@ -5090,10 +4919,10 @@ class IssueService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Edit issue",
       method: HttpMethod.PATCH,
-      url: `/issues/${issue.offline_id}/`,
-      payload: issue,
-      blockers: [issue.offline_id],
-      blocks: [issue.offline_id]
+      url: `/issues/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     promise.catch(() => {
       this.dispatch(updateIssue(issueToBeUpdated));
@@ -5145,7 +4974,6 @@ class IssueService extends BaseApiService {
       throw e;
     }
   }
-  // Special functions
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get issues",
@@ -5153,33 +4981,24 @@ class IssueService extends BaseApiService {
       url: `/projects/${projectId}/issues/`,
       blockers: [],
       blocks: []
-    }).then((result2) => {
-      const filteredResult = result2.filter(onlyUniqueOfflineIds);
-      if (result2.length !== filteredResult.length) {
-        console.error(
-          `Received duplicate issues from the API (new length ${filteredResult.length});
-						 filtered in browser.`
-        );
-      }
-      return filteredResult;
     });
     this.dispatch(initializeIssues(result));
   }
 }
 class IssueTypeService extends BaseApiService {
-  add(payload, organizationId) {
+  add(payload) {
+    var _a2;
     const { store } = this.client;
     const state = store.getState();
     const offlineIssueType = offline({
       ...payload,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-      created_by: state.userReducer.currentUser.id,
-      organization: organizationId
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id
     });
     this.dispatch(addIssueType(offlineIssueType));
     const promise = this.enqueueRequest({
       method: HttpMethod.POST,
-      url: `/organizations/${organizationId}/issue-types/`,
+      url: `/organizations/${payload.organization}/issue-types/`,
       // Sending only whats needed here
       payload: {
         offline_id: offlineIssueType.offline_id,
@@ -5225,20 +5044,20 @@ class IssueTypeService extends BaseApiService {
     });
     return [offlineUpdatedIssueType, promise];
   }
-  delete(issueTypeId) {
+  delete(id) {
     const { store } = this.client;
     const state = store.getState();
-    const issueTypeToDelete = selectIssueTypeById(issueTypeId)(state);
+    const issueTypeToDelete = selectIssueTypeById(id)(state);
     if (!issueTypeToDelete) {
-      throw new Error(`IssueType with offline_id ${issueTypeId} does not exist in the store.`);
+      throw new Error(`IssueType with offline_id ${id} does not exist in the store.`);
     }
-    const issuesOfIssueType = selectIssuesOfIssueType(issueTypeId)(state);
-    this.dispatch(removeIssueType(issueTypeId));
+    const issuesOfIssueType = selectIssuesOfIssueType(id)(state);
+    this.dispatch(removeIssueType(id));
     this.dispatch(deleteIssues(issuesOfIssueType.map((issue) => issue.offline_id)));
     const promise = this.enqueueRequest({
       method: HttpMethod.DELETE,
-      url: `/issues/types/${issueTypeId}/`,
-      blockers: [issueTypeId],
+      url: `/issues/types/${id}/`,
+      blockers: [id],
       blocks: []
     });
     promise.catch(() => {
@@ -5258,15 +5077,6 @@ class IssueTypeService extends BaseApiService {
   }
 }
 class ProjectAccessService extends BaseApiService {
-  async fetchAll(projectId) {
-    return this.enqueueRequest({
-      description: "Get project accesses",
-      method: HttpMethod.GET,
-      url: `/projects/${projectId}/access/`,
-      blockers: [],
-      blocks: []
-    });
-  }
   async update(projectAccess) {
     this.dispatch(updateProjectAccess(projectAccess));
     return this.enqueueRequest({
@@ -5279,34 +5089,28 @@ class ProjectAccessService extends BaseApiService {
     });
   }
   // TODO: Re-add user to project if removal fails
-  async remove(projectAccess) {
-    this.dispatch(deleteProjectAccess(projectAccess.offline_id));
+  async remove(id) {
+    this.dispatch(deleteProjectAccess(id));
     return this.enqueueRequest({
       description: "Delete project access",
       method: HttpMethod.DELETE,
-      url: `/access/${projectAccess.offline_id}/`,
-      blockers: [projectAccess.offline_id],
+      url: `/access/${id}/`,
+      blockers: [id],
       blocks: []
     });
   }
-  async refreshStore(projectId) {
-    const promise = this.fetchAll(projectId);
-    const result = await promise;
-    this.dispatch(initializeProjectAccesses(result));
-  }
-}
-class ProjectFileService extends BaseApiService {
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
-      description: "Get project files",
+      description: "Get project accesses",
       method: HttpMethod.GET,
-      url: `/projects/${projectId}/files/`,
+      url: `/projects/${projectId}/access/`,
       blockers: [],
       blocks: []
     });
-    this.dispatch(addOrReplaceProjectFiles([]));
-    this.dispatch(addOrReplaceProjectFiles(result));
+    this.dispatch(initializeProjectAccesses(result));
   }
+}
+class ProjectFileService extends BaseApiService {
   async saveExisting(file) {
     if (!file.offline_id) {
       throw new Error(
@@ -5394,6 +5198,17 @@ class ProjectFileService extends BaseApiService {
       blocks: []
     });
   }
+  async refreshStore(projectId) {
+    const result = await this.enqueueRequest({
+      description: "Get project files",
+      method: HttpMethod.GET,
+      url: `/projects/${projectId}/files/`,
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(addOrReplaceProjectFiles([]));
+    this.dispatch(addOrReplaceProjectFiles(result));
+  }
 }
 class ProjectAttachmentService extends BaseAttachmentService {
   constructor() {
@@ -5427,29 +5242,23 @@ class ProjectAttachmentService extends BaseAttachmentService {
   }
 }
 class ProjectService extends BaseApiService {
-  /**
-   * Creates a new project. Due to the nature of project creation,
-   * @param project A Payload<Project> object containing project attributes.
-   * @returns A promise that resolves to a Project.
-   * @throws An APIError if the server returns an error, or any other error that may occur.
-   */
-  async add(project) {
-    if (!project.organization_owner && !project.user_owner) {
+  async add(payload) {
+    if (!payload.organization_owner && !payload.user_owner) {
       throw new Error("Project type was not chosen when trying to create a project");
     }
-    if (!project.bounds && !project.canvas_bounds) {
+    if (!payload.bounds && !payload.canvas_bounds) {
       throw new Error("Project must either have bounds or canvas_bounds set");
     }
-    const isOrganizationProject = !!project.organization_owner;
-    const url = isOrganizationProject ? `/organizations/${project.organization_owner}/projects/` : "/projects/";
-    const projectType = isOrganizationProject ? { organization_owner: project.organization_owner } : { user_owner: project.user_owner };
+    const isOrganizationProject = !!payload.organization_owner;
+    const url = isOrganizationProject ? `/organizations/${payload.organization_owner}/projects/` : "/projects/";
+    const projectType = isOrganizationProject ? { organization_owner: payload.organization_owner } : { user_owner: payload.user_owner };
     return await this.enqueueRequest({
       description: "Create project",
       method: HttpMethod.POST,
       url,
       payload: {
-        name: project.name,
-        bounds: project.bounds,
+        name: payload.name,
+        bounds: payload.bounds,
         ...projectType
       },
       blockers: [],
@@ -5579,8 +5388,9 @@ const separateImageFromFields = async (fields) => {
 };
 class FormService extends BaseUploadService {
   async bulkAddRevisionAttachments(revisionId, files) {
+    var _a2;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = this.client.store.getState().userReducer.currentUser.id;
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const filePayloads = {};
     const offlineFormRevisionAttachments = [];
     const attachmentPayloads = [];
@@ -5682,10 +5492,11 @@ class FormService extends BaseUploadService {
     return [form, offlineFormRevision, offlineFormRevisionAttachments, formPromise, attachmentsPromise];
   }
   addForOrganization(organizationId, initialRevision) {
+    var _a2;
     const state = this.client.store.getState();
     const offlineForm = offline({
       favorite: false,
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       organization: organizationId
     });
@@ -5697,45 +5508,49 @@ class FormService extends BaseUploadService {
     );
   }
   addForProject(projectId, initialRevision) {
+    var _a2;
     const state = this.client.store.getState();
     const offlineForm = offline({
       favorite: false,
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       project: projectId
     });
     return this.add(projectId.toString(), offlineForm, initialRevision, `/projects/${projectId}/create-form/`);
   }
   addForIssueType(issueTypeId, initialRevision) {
+    var _a2;
     const state = this.client.store.getState();
     const offlineForm = offline({
       favorite: false,
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       issue_type: issueTypeId
     });
     return this.add(issueTypeId, offlineForm, initialRevision, `/issues/types/${issueTypeId}/create-form/`);
   }
   addForAssetType(assetTypeId, initialRevision) {
+    var _a2;
     const state = this.client.store.getState();
     const offlineForm = offline({
       favorite: false,
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       asset_type: assetTypeId
     });
     return this.add(assetTypeId, offlineForm, initialRevision, `/assets/types/${assetTypeId}/create-form/`);
   }
   async createRevision(formId, revision) {
+    var _a2;
     const offlineRevision = offline(revision);
     const { store } = this.client;
     const state = store.getState();
-    const currentUserId = state.userReducer.currentUser.id;
+    const createdBy = (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id;
     const { fields, images } = await separateImageFromFields(offlineRevision.fields);
     const fullRevision = {
       ...offlineRevision,
       fields,
-      created_by: currentUserId,
+      created_by: createdBy,
       revision: "Pending",
       form: formId,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
@@ -5768,48 +5583,6 @@ class FormService extends BaseUploadService {
     });
     return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
   }
-  async favorite(formId, projectId) {
-    const { store } = this.client;
-    const state = store.getState();
-    const form = state.formReducer.instances[formId];
-    if (!form) {
-      throw new Error(`Expected form to exist, got ${form}`);
-    }
-    this.dispatch(updateForm({ ...form, favorite: true }));
-    try {
-      await this.enqueueRequest({
-        description: "Favorite form",
-        method: HttpMethod.POST,
-        url: `/forms/${formId}/favorite/${projectId}/`,
-        blockers: [formId, `favorite-${formId}`],
-        blocks: [`favorite-${formId}`]
-      });
-    } catch (e) {
-      this.dispatch(updateForm(form));
-      throw e;
-    }
-  }
-  async unfavorite(formId, projectId) {
-    const { store } = this.client;
-    const state = store.getState();
-    const form = state.formReducer.instances[formId];
-    if (!form) {
-      throw new Error(`Expected form to exist, got ${form}`);
-    }
-    this.dispatch(updateForm({ ...form, favorite: false }));
-    try {
-      return await this.enqueueRequest({
-        description: "Unfavorite form",
-        method: HttpMethod.DELETE,
-        url: `/forms/${formId}/unfavorite/${projectId}/`,
-        blockers: [formId, `favorite-${formId}`],
-        blocks: [`favorite-${formId}`]
-      });
-    } catch (e) {
-      this.dispatch(updateForm(form));
-      throw e;
-    }
-  }
   async delete(formId) {
     const { store } = this.client;
     const state = store.getState();
@@ -5926,8 +5699,9 @@ const separateFilesFromValues = (values) => {
 };
 class FormSubmissionService extends BaseUploadService {
   async bulkAddSubmissionAttachments(submissionId, files) {
+    var _a2;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = this.client.store.getState().userReducer.currentUser.id;
+    const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const filePayloads = {};
     const offlineFormSubmissionAttachments = [];
     const attachmentPayloads = [];
@@ -6009,13 +5783,14 @@ class FormSubmissionService extends BaseUploadService {
   }
   // Outer promise is for hashing and caching files for submission attachments
   async add(payload) {
+    var _a2;
     const { store } = this.client;
     const state = store.getState();
     const { values, files } = separateFilesFromValues(payload.values);
     const offlineSubmission = offline({
       ...payload,
       values,
-      created_by: state.userReducer.currentUser.id,
+      created_by: (_a2 = state.userReducer.currentUser) == null ? void 0 : _a2.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
     });
     const promise = this.enqueueRequest({
@@ -6164,7 +5939,7 @@ class FormSubmissionService extends BaseUploadService {
       description: "Delete user form submissions",
       method: HttpMethod.PATCH,
       url: `/forms/submissions/${updatedSubmission.offline_id}/`,
-      payload: updatedSubmission,
+      payload,
       blockers: [updatedSubmission.offline_id],
       blocks: [updatedSubmission.offline_id]
     });
@@ -6270,13 +6045,20 @@ class FormSubmissionService extends BaseUploadService {
   }
 }
 class WorkspaceService extends BaseApiService {
-  add(workspace) {
-    const offlineWorkspace = offline(workspace);
+  add(payload) {
+    var _a2;
+    const { store } = this.client;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
+    const offlineWorkspace = offline({
+      ...payload,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      created_by: createdBy
+    });
     this.dispatch(addWorkspace(offlineWorkspace));
     const promise = this.enqueueRequest({
       description: "Create Workspace",
       method: HttpMethod.POST,
-      url: `/projects/${workspace.project}/workspaces/`,
+      url: `/projects/${payload.project}/workspaces/`,
       payload: offlineWorkspace,
       blockers: ["add-workspace"],
       blocks: [offlineWorkspace.offline_id]
@@ -6288,20 +6070,33 @@ class WorkspaceService extends BaseApiService {
     });
     return [offlineWorkspace, promise];
   }
-  update(workspace) {
-    this.dispatch(addWorkspace(workspace));
+  update(payload) {
+    const { store } = this.client;
+    const workspace = selectWorkspaceById(payload.offline_id)(store.getState());
+    if (!workspace) {
+      throw new Error(`Expected an existing workspace with offline_id ${payload.offline_id}`);
+    }
+    const updatedWorkspace = { ...workspace, ...payload };
+    this.dispatch(updateWorkspace(updatedWorkspace));
     const promise = this.enqueueRequest({
       description: "Update Workspace",
       method: HttpMethod.PATCH,
       url: `/workspaces/${workspace.offline_id}/`,
-      payload: workspace,
+      payload,
       blockers: [workspace.offline_id],
       blocks: [workspace.offline_id]
     });
+    promise.then((result) => {
+      this.dispatch(updateWorkspace(result));
+    }).catch(() => {
+      this.dispatch(updateWorkspace(workspace));
+    });
     return [workspace, promise];
   }
   delete(workspaceId) {
     const { store } = this.client;
+    const originalWorkspace = selectWorkspaceById(workspaceId)(store.getState());
+    this.dispatch(deleteWorkspace(workspaceId));
     const promise = this.enqueueRequest({
       description: "Delete Workspace",
       method: HttpMethod.DELETE,
@@ -6309,8 +6104,6 @@ class WorkspaceService extends BaseApiService {
       blockers: [workspaceId],
       blocks: []
     });
-    const originalWorkspace = store.getState().workspaceReducer.instances[workspaceId];
-    this.dispatch(deleteWorkspace(workspaceId));
     void promise.then(() => {
     }).catch((reason) => {
       if (originalWorkspace) {
@@ -6812,12 +6605,13 @@ class LicenseService extends BaseApiService {
 }
 class DocumentService extends BaseApiService {
   add(payload) {
+    var _a2;
     const { store } = this.client;
-    const currentUserId = store.getState().userReducer.currentUser.id;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const offlineDocument = offline({
       ...payload,
-      created_by: currentUserId,
+      created_by: createdBy,
       submitted_at: submittedAt
     });
     this.dispatch(addDocuments([offlineDocument]));
@@ -6838,28 +6632,31 @@ class DocumentService extends BaseApiService {
     });
     return [offlineDocument, promise];
   }
-  update(document2) {
+  update(payload) {
     const { store } = this.client;
-    const documentToBeUpdated = store.getState().documentsReducer.documents[document2.offline_id];
+    const documentToBeUpdated = store.getState().documentsReducer.documents[payload.offline_id];
     if (!documentToBeUpdated) {
       throw new Error(
-        `attempting to update a document with offline_id ${document2.offline_id} that does not exist in store.documents`
+        `attempting to update a document with offline_id ${payload.offline_id} that does not exist in store.documents`
       );
     }
-    this.dispatch(updateDocuments([document2]));
+    const updatedDocument = {
+      ...documentToBeUpdated,
+      ...payload
+    };
+    this.dispatch(updateDocuments([updatedDocument]));
     const promise = this.enqueueRequest({
       description: "Update Document",
       method: HttpMethod.PATCH,
-      url: `/documents/${document2.offline_id}/`,
-      payload: document2,
-      blockers: [document2.offline_id],
-      blocks: [document2.offline_id]
+      url: `/documents/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     promise.catch(() => {
       updateDocuments([documentToBeUpdated]);
     });
-    const fullDocument = store.getState().documentsReducer.documents[document2.offline_id];
-    return [fullDocument, promise];
+    return [updatedDocument, promise];
   }
   move(documentId, targetDocumentId, position) {
     const { store } = this.client;
@@ -6906,22 +6703,22 @@ class DocumentService extends BaseApiService {
     });
     return promise;
   }
-  delete(documentId) {
+  delete(id) {
     const { store } = this.client;
     const documentsMapping = selectDocumentsMapping(store.getState());
-    const documentToBeDeleted = documentsMapping[documentId];
+    const documentToBeDeleted = selectDocumentById(id)(store.getState());
     if (!documentToBeDeleted) {
       throw new Error(
-        `attempting to delete a document with offline_id ${documentId} that does not exist in store.documents`
+        `attempting to delete a document with offline_id ${id} that does not exist in store.documents`
       );
     }
     const parentDocument = documentToBeDeleted.parent_document ? documentsMapping[documentToBeDeleted.parent_document] : void 0;
-    this.dispatch(removeDocuments([documentId]));
+    this.dispatch(removeDocuments([id]));
     const promise = this.enqueueRequest({
       description: "Delete Document",
       method: HttpMethod.DELETE,
-      url: `/documents/${documentId}/`,
-      blockers: [documentId],
+      url: `/documents/${id}/`,
+      blockers: [id],
       blocks: []
     });
     promise.then((documentsToUpdate) => {
@@ -6979,8 +6776,9 @@ class DocumentAttachmentService extends BaseAttachmentService {
   }
   // NOTE: overriding the method from BaseAttachmentService since document attachments get vectorized
   async attachFilesToDocument(files, documentId) {
+    var _a2;
     const { store } = this.client;
-    const currentUser = store.getState().userReducer.currentUser;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const offlineAttachments = [];
     const attachmentPayloads = [];
@@ -7002,7 +6800,7 @@ class DocumentAttachmentService extends BaseAttachmentService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId: documentId
       });
@@ -7117,19 +6915,7 @@ class AgentService extends BaseApiService {
       blocks: ["prompt"],
       queryParams: { conversation_id: conversationId }
     }).then((response) => {
-      const conversation = store.getState().agentsReducer.instances[conversationId];
-      if (!(conversation == null ? void 0 : conversation.offline_id)) {
-        throw new Error("Conversation not found");
-      }
-      if (!Array.isArray(response)) {
-        response = [response];
-      }
-      this.dispatch(
-        updateConversation({
-          ...conversation,
-          tiptap_content: [...conversation.tiptap_content || [], ...response]
-        })
-      );
+      this.dispatch(updateConversation(response));
     });
   }
   async fetchDetails(conversationId) {
@@ -7165,10 +6951,9 @@ class AgentService extends BaseApiService {
   }
 }
 class TeamService extends BaseApiService {
-  add(teamPayload, organizationId) {
+  add(payload) {
     const offlineTeam = offline({
-      ...teamPayload,
-      organization: organizationId,
+      ...payload,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
       // TODO: uncomment once supported
       // created_by: state.userReducer.currentUser.id,
@@ -7177,7 +6962,7 @@ class TeamService extends BaseApiService {
     const promise = this.enqueueRequest({
       description: "Create team",
       method: HttpMethod.POST,
-      url: `/organizations/${organizationId}/teams/`,
+      url: `/organizations/${payload.organization}/teams/`,
       payload: offlineTeam,
       // No blocks since users and organizations are not offline
       blockers: [],
@@ -7190,25 +6975,24 @@ class TeamService extends BaseApiService {
     });
     return [offlineTeam, promise];
   }
-  // TODO: @Audiopolis / Magnus - should we pass a offline_id as one arg and a UpdatedTeamProps as a second arg instead of this set up?
-  update(team) {
+  update(payload) {
     const { store } = this.client;
-    const teamToBeUpdated = selectTeamById(team.offline_id)(store.getState());
+    const teamToBeUpdated = selectTeamById(payload.offline_id)(store.getState());
     if (!teamToBeUpdated) {
-      throw new Error(`Expected team with offline_id ${team.offline_id} to exist`);
+      throw new Error(`Expected team with offline_id ${payload.offline_id} to exist`);
     }
     const offlineUpdatedTeam = {
       ...teamToBeUpdated,
-      ...team
+      ...payload
     };
     this.dispatch(updateTeam(offlineUpdatedTeam));
     const promise = this.enqueueRequest({
       description: "Update team",
       method: HttpMethod.PATCH,
-      url: `/organizations/teams/${team.offline_id}/`,
-      payload: offlineUpdatedTeam,
-      blockers: [team.offline_id],
-      blocks: [team.offline_id]
+      url: `/organizations/teams/${payload.offline_id}/`,
+      payload,
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     promise.then((updatedTeam) => {
       this.dispatch(setTeam(updatedTeam));
@@ -7320,10 +7104,11 @@ class UserService extends BaseApiService {
 }
 class GeoImageService extends BaseUploadService {
   async add(payload) {
+    var _a2;
     const { store } = this.client;
     const { file, ...payloadWithoutFile } = payload;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const currentUser = store.getState().userReducer.currentUser;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const projectId = payloadWithoutFile.project;
     const sha1 = await hashFile(file);
     const filePayload = {
@@ -7338,9 +7123,9 @@ class GeoImageService extends BaseUploadService {
       file_sha1: sha1,
       file: URL.createObjectURL(file),
       submitted_at: submittedAt,
-      created_by: currentUser.id
+      created_by: createdBy
     });
-    store.dispatch(addGeoImage(offlineMapImage));
+    this.dispatch(addGeoImage(offlineMapImage));
     const promise = this.enqueueRequest({
       description: "Add geo image",
       method: HttpMethod.POST,
@@ -7364,16 +7149,17 @@ class GeoImageService extends BaseUploadService {
     });
     promise.then((result) => {
       this.processPresignedUrls(result.presigned_urls);
-      store.dispatch(setGeoImage(result.geo_image));
+      this.dispatch(setGeoImage(result.geo_image));
     }).catch(() => {
-      store.dispatch(deleteGeoImage(offlineMapImage.offline_id));
+      this.dispatch(deleteGeoImage(offlineMapImage.offline_id));
     });
     return [offlineMapImage, promise.then((result) => result.geo_image)];
   }
   async bulkAdd(payloads, projectId) {
+    var _a2;
     const { store } = this.client;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const currentUser = store.getState().userReducer.currentUser;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const offlineGeoImages = [];
     const offlineIds = [];
     const geoImagePayloads = [];
@@ -7396,7 +7182,7 @@ class GeoImageService extends BaseUploadService {
         file_sha1: sha1,
         file: URL.createObjectURL(file),
         submitted_at: submittedAt,
-        created_by: currentUser.id,
+        created_by: createdBy,
         project: projectId
       });
       offlineGeoImages.push(offlineMapImage);
@@ -7413,7 +7199,7 @@ class GeoImageService extends BaseUploadService {
         original_date: offlineMapImage.original_date
       });
     }
-    store.dispatch(addGeoImages(offlineGeoImages));
+    this.dispatch(addGeoImages(offlineGeoImages));
     const promise = this.enqueueRequest({
       description: "Bulk add geo images",
       method: HttpMethod.POST,
@@ -7429,9 +7215,9 @@ class GeoImageService extends BaseUploadService {
     });
     promise.then((result) => {
       this.processPresignedUrls(result.presigned_urls);
-      store.dispatch(setGeoImages(result.geo_images));
+      this.dispatch(setGeoImages(result.geo_images));
     }).catch(() => {
-      store.dispatch(deleteGeoImages(offlineIds));
+      this.dispatch(deleteGeoImages(offlineIds));
     });
     return [offlineGeoImages, promise.then((result) => result.geo_images)];
   }
@@ -7443,7 +7229,7 @@ class GeoImageService extends BaseUploadService {
       throw new Error(`Map image with offline_id ${payload.offline_id} does not exist in the store`);
     }
     const updatedGeoImage = { ...geoImageToUpdate, ...payload };
-    store.dispatch(updateGeoImage(updatedGeoImage));
+    this.dispatch(updateGeoImage(updatedGeoImage));
     const promise = this.enqueueRequest({
       description: "Update geo image",
       method: HttpMethod.PATCH,
@@ -7453,9 +7239,9 @@ class GeoImageService extends BaseUploadService {
       blockers: [payload.offline_id]
     });
     promise.then((result) => {
-      store.dispatch(setGeoImage(result));
+      this.dispatch(setGeoImage(result));
     }).catch(() => {
-      store.dispatch(setGeoImage(geoImageToUpdate));
+      this.dispatch(setGeoImage(geoImageToUpdate));
     });
     return [updatedGeoImage, promise];
   }
@@ -7466,7 +7252,7 @@ class GeoImageService extends BaseUploadService {
     if (!geoImageToDelete) {
       throw new Error(`Map image with offline_id ${geoImageId} does not exist in the store`);
     }
-    store.dispatch(deleteGeoImage(geoImageId));
+    this.dispatch(deleteGeoImage(geoImageId));
     const promise = this.enqueueRequest({
       description: "Delete geo image",
       method: HttpMethod.DELETE,
@@ -7475,12 +7261,11 @@ class GeoImageService extends BaseUploadService {
       blockers: [geoImageId]
     });
     promise.catch(() => {
-      store.dispatch(setGeoImage(geoImageToDelete));
+      this.dispatch(setGeoImage(geoImageToDelete));
     });
     return promise;
   }
   async refreshStore(projectId) {
-    const { store } = this.client;
     const result = await this.enqueueRequest({
       description: "Get geo images",
       method: HttpMethod.GET,
@@ -7488,14 +7273,15 @@ class GeoImageService extends BaseUploadService {
       blocks: [projectId.toString()],
       blockers: []
     });
-    store.dispatch(initializeGeoImages(result));
+    this.dispatch(initializeGeoImages(result));
   }
 }
 class IssueAssociationService extends BaseUploadService {
   add(payload) {
+    var _a2;
     const { store } = this.client;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const createdBy = store.getState().userReducer.currentUser.id;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const offlineIssueAssociation = offline({
       ...payload,
       submitted_at: submittedAt,
@@ -7509,7 +7295,6 @@ class IssueAssociationService extends BaseUploadService {
       payload: {
         offline_id: offlineIssueAssociation.offline_id,
         submitted_at: submittedAt,
-        created_by: createdBy,
         ...payload
       },
       blockers: [
@@ -7557,12 +7342,20 @@ class IssueAssociationService extends BaseUploadService {
     this.dispatch(initializeIssueAssociations(issueAssociations));
   }
 }
+var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
+  VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
+  VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
+  VerificationCodeType2[VerificationCodeType2["PROJECT_INVITE"] = 4] = "PROJECT_INVITE";
+  VerificationCodeType2[VerificationCodeType2["ORGANIZATION_INVITE"] = 6] = "ORGANIZATION_INVITE";
+  VerificationCodeType2[VerificationCodeType2["ADD_EMAIL_DOMAIN"] = 8] = "ADD_EMAIL_DOMAIN";
+  VerificationCodeType2[VerificationCodeType2["RESET_PASSWORD"] = 10] = "RESET_PASSWORD";
+  return VerificationCodeType2;
+})(VerificationCodeType || {});
 export {
   APIError,
   AgentService,
   AssetAttachmentService,
   AssetService,
-  AssetStageColors,
   AssetStageCompletionService,
   AssetStageService,
   AssetTypeAttachmentService,
@@ -7624,9 +7417,14 @@ export {
   addAsset,
   addAssetAttachment,
   addAssetAttachments,
+  addAssetStage,
+  addAssetStageCompletion,
+  addAssetStageCompletions,
+  addAssetStages,
   addAssetType,
   addAssetTypeAttachment,
   addAssetTypeAttachments,
+  addAssetTypes,
   addAssets,
   addCategory,
   addConversation,
@@ -7634,7 +7432,6 @@ export {
   addDocumentAttachments,
   addDocuments,
   addEmailDomain,
-  addFavouriteProjectId,
   addForm,
   addFormRevision,
   addFormRevisionAttachment,
@@ -7664,11 +7461,7 @@ export {
   addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
-  addStageCompletion,
-  addStageCompletions,
-  addStages,
   addTeam,
-  addToRecentIssues,
   addUsers,
   addWorkspace,
   agentsReducer,
@@ -7692,8 +7485,6 @@ export {
   boundsContainPoint,
   categoryReducer,
   categorySlice,
-  classNames,
-  cleanRecentIssues,
   clearTokens,
   constructUploadedFilePayloads,
   coordinatesAreEqual,
@@ -7707,9 +7498,14 @@ export {
   deleteAsset,
   deleteAssetAttachment,
   deleteAssetAttachments,
+  deleteAssetStage,
+  deleteAssetStageCompletion,
+  deleteAssetStageCompletions,
+  deleteAssetStages,
   deleteAssetType,
   deleteAssetTypeAttachment,
   deleteAssetTypeAttachments,
+  deleteAssetTypes,
   deleteAssets,
   deleteCategory,
   deleteDocumentAttachment,
@@ -7774,9 +7570,7 @@ export {
   formSubmissionAttachmentSlice,
   formSubmissionReducer,
   formSubmissionSlice,
-  fullAssetMarkerSize,
   generateBadgeColors,
-  genericMemo,
   geoImageReducer,
   geoImageSlice,
   getFileIdentifier,
@@ -7785,10 +7579,11 @@ export {
   getLocalRelativeDateString,
   getOutboxCoordinator,
   getRenamedFile,
-  getStageColor,
   hashFile,
   initSDK,
   initializeAssetAttachments,
+  initializeAssetStageCompletions,
+  initializeAssetStages,
   initializeAssetTypeAttachments,
   initializeAssetTypes,
   initializeAssets,
@@ -7811,7 +7606,6 @@ export {
   initializeOrganizationAccesses,
   initializeProjectAccesses,
   initializeProjectAttachments,
-  initializeStages,
   initializeTeams,
   initializeWorkspaces,
   isToday,
@@ -7823,7 +7617,6 @@ export {
   issueCommentSlice,
   issueReducer,
   issueSlice,
-  issueToSearchResult,
   issueTypeReducer,
   issueTypeSlice,
   issueUpdateReducer,
@@ -7864,20 +7657,14 @@ export {
   rehydratedReducer,
   rehydratedSlice,
   removeDocuments,
-  removeFavouriteProjectId,
   removeIssueType,
   removeProjectFile,
   removeProjectFilesOfProject,
-  removeRecentIssue,
-  removeStageCompletions,
-  removeStages,
   removeUser,
   resetProjectFileObjectUrls,
-  resetRecentIssues,
   resetStore,
   restructureCreateSelectorWithArgs,
   saveActiveProjectFileBounds,
-  searchIssues,
   selectAccessToken,
   selectActiveOrganizationAccess,
   selectActiveProject,
@@ -7893,6 +7680,9 @@ export {
   selectAssetAttachments,
   selectAssetById,
   selectAssetStageById,
+  selectAssetStageCompletionById,
+  selectAssetStageCompletionMapping,
+  selectAssetStageCompletionsByIds,
   selectAssetStages,
   selectAssetStagesByIds,
   selectAssetTypeAttachmentById,
@@ -7928,7 +7718,7 @@ export {
   selectCategoryMapping,
   selectCommentsOfIssue,
   selectCompletedStageIdsForAsset,
-  selectCompletedStages,
+  selectCompletedStagesByAsset,
   selectConversation,
   selectConversationMapping,
   selectConversations,
@@ -7943,7 +7733,6 @@ export {
   selectEmailDomains,
   selectEmailDomainsAsMapping,
   selectEmailDomainsOfOrganization,
-  selectFavouriteProjects,
   selectFilteredForms,
   selectFormById,
   selectFormMapping,
@@ -7984,6 +7773,7 @@ export {
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueById,
+  selectIssueCommentById,
   selectIssueCommentMapping,
   selectIssueCountOfCategory,
   selectIssueMapping,
@@ -8033,8 +7823,6 @@ export {
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
   selectProjectsOfOrganization,
-  selectRecentIssueIds,
-  selectRecentIssuesAsSearchResults,
   selectRehydrated,
   selectRootDocuments,
   selectSortedFormSubmissionsOfForm,
@@ -8042,7 +7830,6 @@ export {
   selectSortedProjectUsers,
   selectStageFormIdsFromStageIds,
   selectStageMapping,
-  selectStagesFromAssetTypeIds,
   selectStagesOfAssetType,
   selectTeamById,
   selectTeams,
@@ -8062,8 +7849,12 @@ export {
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
+  setAssetStage,
+  setAssetStages,
+  setAssetType,
   setAssetTypeAttachment,
   setAssetTypeAttachments,
+  setAssetTypes,
   setAssets,
   setConversation,
   setCurrentUser,
@@ -8096,11 +7887,8 @@ export {
   setProjectAttachments,
   setProjects,
   setRehydrated,
-  setStage,
-  setStageCompletions,
   setTeam,
   setTokens,
-  setTourStep,
   setUploadUrl,
   setUsers,
   setWorkspaces,
@@ -8116,8 +7904,14 @@ export {
   updateAsset,
   updateAssetAttachment,
   updateAssetAttachments,
+  updateAssetStage,
+  updateAssetStageCompletion,
+  updateAssetStageCompletions,
+  updateAssetStages,
+  updateAssetType,
   updateAssetTypeAttachment,
   updateAssetTypeAttachments,
+  updateAssetTypes,
   updateAssets,
   updateCategory,
   updateConversation,
@@ -8145,11 +7939,8 @@ export {
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,
-  updateStage,
-  updateStages,
   updateTeam,
   updateWorkspace,
-  useMemoCompare,
   userReducer,
   userSlice,
   versioningReducer,