@overmap-ai/core 1.0.65-strip-workspace-access.0 → 1.0.65-strip-workspace-access.2

package/dist/overmap-core.js

@@ -1633,12 +1633,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
 })(LicenseStatus || {});
 const initialState$p = {
   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",
@@ -1661,6 +1656,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 +1667,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,7 +1693,6 @@ const selectUsersByIds = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(users);
   })
 );
-const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
@@ -1742,7 +1718,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;
   }
@@ -1819,7 +1795,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) => {
@@ -1932,9 +1908,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];
@@ -2011,9 +1987,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];
@@ -2375,29 +2351,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 } }
@@ -3131,13 +3096,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);
@@ -4047,57 +4012,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({
@@ -4551,8 +4525,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 = [];
@@ -4572,7 +4547,7 @@ class BaseAttachmentService extends BaseUploadService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId
       });
@@ -4776,21 +4751,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(() => {
@@ -4798,37 +4773,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(() => {
@@ -4901,67 +4880,60 @@ 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(addToRecentIssues(offlineIssue.offline_id));
     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 [
@@ -4973,11 +4945,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)
@@ -4994,7 +4966,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)
@@ -5009,24 +4981,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
@@ -5035,10 +5007,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));
@@ -5090,7 +5062,6 @@ class IssueService extends BaseApiService {
       throw e;
     }
   }
-  // Special functions
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
       description: "Get issues",
@@ -5098,33 +5069,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,
@@ -5170,20 +5132,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(() => {
@@ -5241,17 +5203,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(
@@ -5339,6 +5290,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() {
@@ -5524,8 +5486,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 = [];
@@ -5627,10 +5590,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
     });
@@ -5642,45 +5606,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()
@@ -5713,48 +5681,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();
@@ -5871,8 +5797,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 = [];
@@ -5954,13 +5881,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({
@@ -6215,13 +6143,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]
@@ -6233,8 +6168,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,
@@ -6243,10 +6184,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,
@@ -6254,8 +6202,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) {
@@ -6757,12 +6703,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]));
@@ -6791,7 +6738,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,
@@ -6803,8 +6754,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;
@@ -6851,22 +6801,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) => {
@@ -6924,8 +6874,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 = [];
@@ -6947,7 +6898,7 @@ class DocumentAttachmentService extends BaseAttachmentService {
         file,
         sha1,
         submittedAt,
-        createdBy: currentUser.id,
+        createdBy,
         description: "",
         modelId: documentId
       });
@@ -7110,10 +7061,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,
@@ -7122,7 +7072,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: [],
@@ -7135,25 +7085,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));
@@ -7265,10 +7214,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 = {
@@ -7283,9 +7233,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,
@@ -7309,16 +7259,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 = [];
@@ -7341,7 +7292,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);
@@ -7358,7 +7309,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,
@@ -7374,9 +7325,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)];
   }
@@ -7388,7 +7339,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,
@@ -7398,9 +7349,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];
   }
@@ -7411,7 +7362,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,
@@ -7420,12 +7371,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,
@@ -7433,14 +7383,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,
@@ -7454,7 +7405,6 @@ class IssueAssociationService extends BaseUploadService {
       payload: {
         offline_id: offlineIssueAssociation.offline_id,
         submitted_at: submittedAt,
-        created_by: createdBy,
         ...payload
       },
       blockers: [
@@ -7579,7 +7529,6 @@ export {
   addDocumentAttachments,
   addDocuments,
   addEmailDomain,
-  addFavouriteProjectId,
   addForm,
   addFormRevision,
   addFormRevisionAttachment,
@@ -7809,7 +7758,6 @@ export {
   rehydratedReducer,
   rehydratedSlice,
   removeDocuments,
-  removeFavouriteProjectId,
   removeIssueType,
   removeProjectFile,
   removeProjectFilesOfProject,
@@ -7888,7 +7836,6 @@ export {
   selectEmailDomains,
   selectEmailDomainsAsMapping,
   selectEmailDomainsOfOrganization,
-  selectFavouriteProjects,
   selectFilteredForms,
   selectFormById,
   selectFormMapping,
@@ -7929,6 +7876,7 @@ export {
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueById,
+  selectIssueCommentById,
   selectIssueCommentMapping,
   selectIssueCountOfCategory,
   selectIssueMapping,
@@ -8045,7 +7993,6 @@ export {
   setStageCompletions,
   setTeam,
   setTokens,
-  setTourStep,
   setUploadUrl,
   setUsers,
   setWorkspaces,