@overmap-ai/core 1.0.65-strip-workspace-access.1 → 1.0.65-strip-workspace-access.3

package/dist/overmap-core.js

@@ -1281,50 +1281,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 +1295,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 +1317,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,
@@ -1542,15 +1381,15 @@ const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
   return selectIssuesOfIssueType(issueTypeId)(state).length;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$q = {
+const initialState$r = {
   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)),
+  initialState: initialState$r,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -1631,19 +1470,14 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$p = {
+const initialState$q = {
   users: {},
-  currentUser: {
-    id: 0,
-    username: "",
-    email: "",
-    profile: { file: null, file_sha1: null, favourite_project_ids: [], tour_step: -1 }
-  }
+  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 +1495,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 +1506,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 +1532,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 +1557,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 +1576,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 +1605,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 +1634,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 +1650,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 +1747,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 +1764,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 +1826,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 +1861,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 +1900,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 +1995,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 +2054,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 +2084,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 +2160,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,
@@ -2383,7 +2198,7 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
         }
         const latestRevision = _selectLatestFormRevision(revisions, formId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
-          regularMatches.push({ ...form, latestRevision });
+          regularMatches.push(form);
         }
       }
       return [...regularMatches.slice(0, maxResults)];
@@ -2418,11 +2233,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,
@@ -2634,11 +2449,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,
@@ -2690,11 +2505,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,
@@ -2732,6 +2547,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({
@@ -3120,13 +2969,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);
@@ -4036,15 +3885,15 @@ class BaseApiService extends BaseService {
   }
 }
 class CategoryService extends BaseApiService {
-  add(payload, workspaceId) {
+  add(payload) {
+    var _a2;
     const { store } = this.client;
-    const createdBy = store.getState().userReducer.currentUser.id;
+    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,
-      workspace: workspaceId
+      submitted_at: submittedAt
     });
     this.dispatch(addCategory(offlineCategory));
     const promise = this.enqueueRequest({
@@ -4052,48 +3901,50 @@ class CategoryService extends BaseApiService {
       method: HttpMethod.POST,
       url: "/categories/",
       queryParams: {
-        workspace_id: workspaceId.toString()
+        workspace_id: payload.workspace.toString()
       },
       payload: offlineCategory,
-      blockers: [workspaceId],
+      blockers: [payload.workspace],
       blocks: [offlineCategory.offline_id]
     });
     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({
@@ -4547,8 +4398,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 = [];
@@ -4568,7 +4420,7 @@ class BaseAttachmentService extends BaseUploadService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId
       });
@@ -4772,21 +4624,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(() => {
@@ -4794,37 +4646,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(() => {
@@ -4897,67 +4753,59 @@ 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] : []],
-      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;
+      var _a3;
       console.error(error);
       if (error instanceof APIError) {
-        (_a2 = unsafeShowToast) == null ? void 0 : _a2({
+        (_a3 = unsafeShowToast) == null ? void 0 : _a3({
           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 [
@@ -4969,11 +4817,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)
@@ -4990,7 +4838,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)
@@ -5005,24 +4853,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
@@ -5031,10 +4879,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));
@@ -5086,7 +4934,6 @@ class IssueService extends BaseApiService {
       throw e;
     }
   }
-  // Special functions
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get issues",
@@ -5094,33 +4941,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,
@@ -5166,20 +5004,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(() => {
@@ -5237,17 +5075,6 @@ class ProjectAccessService extends BaseApiService {
   }
 }
 class ProjectFileService extends BaseApiService {
-  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));
-  }
   async saveExisting(file) {
     if (!file.offline_id) {
       throw new Error(
@@ -5335,6 +5162,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() {
@@ -5520,8 +5358,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 = [];
@@ -5623,10 +5462,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
     });
@@ -5638,45 +5478,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()
@@ -5825,8 +5669,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 = [];
@@ -5908,13 +5753,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({
@@ -6170,8 +6016,9 @@ class FormSubmissionService extends BaseUploadService {
 }
 class WorkspaceService extends BaseApiService {
   add(payload) {
+    var _a2;
     const { store } = this.client;
-    const createdBy = store.getState().userReducer.currentUser.id;
+    const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
     const offlineWorkspace = offline({
       ...payload,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
@@ -6193,8 +6040,14 @@ 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,
@@ -6203,10 +6056,17 @@ class WorkspaceService extends BaseApiService {
       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,
@@ -6214,8 +6074,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) {
@@ -6717,12 +6575,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]));
@@ -6751,7 +6610,11 @@ class DocumentService extends BaseApiService {
         `attempting to update a document with offline_id ${document2.offline_id} that does not exist in store.documents`
       );
     }
-    this.dispatch(updateDocuments([document2]));
+    const updatedDocument = {
+      ...documentToBeUpdated,
+      ...document2
+    };
+    this.dispatch(updateDocuments([updatedDocument]));
     const promise = this.enqueueRequest({
       description: "Update Document",
       method: HttpMethod.PATCH,
@@ -6763,8 +6626,7 @@ class DocumentService extends BaseApiService {
     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;
@@ -6811,22 +6673,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) => {
@@ -6884,8 +6746,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 = [];
@@ -6907,7 +6770,7 @@ class DocumentAttachmentService extends BaseAttachmentService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId: documentId
       });
@@ -7070,10 +6933,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,
@@ -7082,7 +6944,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: [],
@@ -7095,25 +6957,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}/`,
+      url: `/organizations/teams/${payload.offline_id}/`,
       payload: offlineUpdatedTeam,
-      blockers: [team.offline_id],
-      blocks: [team.offline_id]
+      blockers: [payload.offline_id],
+      blocks: [payload.offline_id]
     });
     promise.then((updatedTeam) => {
       this.dispatch(setTeam(updatedTeam));
@@ -7225,10 +7086,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 = {
@@ -7243,9 +7105,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,
@@ -7269,16 +7131,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 = [];
@@ -7301,7 +7164,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);
@@ -7318,7 +7181,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,
@@ -7334,9 +7197,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)];
   }
@@ -7348,7 +7211,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,
@@ -7358,9 +7221,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];
   }
@@ -7371,7 +7234,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,
@@ -7380,12 +7243,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,
@@ -7393,14 +7255,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,
@@ -7414,7 +7277,6 @@ class IssueAssociationService extends BaseUploadService {
       payload: {
         offline_id: offlineIssueAssociation.offline_id,
         submitted_at: submittedAt,
-        created_by: createdBy,
         ...payload
       },
       blockers: [
@@ -7539,7 +7401,6 @@ export {
   addDocumentAttachments,
   addDocuments,
   addEmailDomain,
-  addFavouriteProjectId,
   addForm,
   addFormRevision,
   addFormRevisionAttachment,
@@ -7573,7 +7434,6 @@ export {
   addStageCompletions,
   addStages,
   addTeam,
-  addToRecentIssues,
   addUsers,
   addWorkspace,
   agentsReducer,
@@ -7598,7 +7458,6 @@ export {
   categoryReducer,
   categorySlice,
   classNames,
-  cleanRecentIssues,
   clearTokens,
   constructUploadedFilePayloads,
   coordinatesAreEqual,
@@ -7769,20 +7628,16 @@ export {
   rehydratedReducer,
   rehydratedSlice,
   removeDocuments,
-  removeFavouriteProjectId,
   removeIssueType,
   removeProjectFile,
   removeProjectFilesOfProject,
-  removeRecentIssue,
   removeStageCompletions,
   removeStages,
   removeUser,
   resetProjectFileObjectUrls,
-  resetRecentIssues,
   resetStore,
   restructureCreateSelectorWithArgs,
   saveActiveProjectFileBounds,
-  searchIssues,
   selectAccessToken,
   selectActiveOrganizationAccess,
   selectActiveProject,
@@ -7848,7 +7703,6 @@ export {
   selectEmailDomains,
   selectEmailDomainsAsMapping,
   selectEmailDomainsOfOrganization,
-  selectFavouriteProjects,
   selectFilteredForms,
   selectFormById,
   selectFormMapping,
@@ -7889,6 +7743,7 @@ export {
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueById,
+  selectIssueCommentById,
   selectIssueCommentMapping,
   selectIssueCountOfCategory,
   selectIssueMapping,
@@ -7938,8 +7793,6 @@ export {
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
   selectProjectsOfOrganization,
-  selectRecentIssueIds,
-  selectRecentIssuesAsSearchResults,
   selectRehydrated,
   selectRootDocuments,
   selectSortedFormSubmissionsOfForm,
@@ -8005,7 +7858,6 @@ export {
   setStageCompletions,
   setTeam,
   setTokens,
-  setTourStep,
   setUploadUrl,
   setUsers,
   setWorkspaces,