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

package/dist/overmap-core.umd.cjs

@@ -1621,12 +1621,7 @@ var __publicField = (obj, key, value) => {
   })(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 = toolkit.createSlice({
     name: "users",
@@ -1649,6 +1644,8 @@ var __publicField = (obj, key, value) => {
         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];
@@ -1658,32 +1655,12 @@ var __publicField = (obj, key, value) => {
         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;
@@ -1704,7 +1681,6 @@ var __publicField = (obj, key, value) => {
       return fallbackToEmptyArray(users);
     })
   );
-  const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
   const organizationAccessAdapter = createModelAdapter(
     (organizationAccess) => organizationAccess.offline_id
   );
@@ -1730,7 +1706,7 @@ var __publicField = (obj, key, value) => {
     [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;
     }
@@ -1807,7 +1783,7 @@ var __publicField = (obj, key, value) => {
     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) => {
@@ -1920,9 +1896,9 @@ var __publicField = (obj, key, value) => {
     [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];
@@ -1999,9 +1975,9 @@ var __publicField = (obj, key, value) => {
     [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];
@@ -2363,29 +2339,18 @@ var __publicField = (obj, key, value) => {
         (_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 } }
@@ -3119,13 +3084,13 @@ var __publicField = (obj, key, value) => {
     deleteIssueComments
   } = issueCommentSlice.actions;
   const selectIssueCommentMapping = (state) => state.issueCommentReducer.instances;
+  const selectIssueCommentById = (id) => (state) => {
+    return state.issueCommentReducer.instances[id];
+  };
   const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectIssueCommentMapping, (_state, issueId) => issueId],
-      (commentMapping, issueId) => {
-        return fallbackToEmptyArray(Object.values(commentMapping).filter((comment) => comment.issue === issueId));
-      }
-    )
+    toolkit.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);
@@ -4035,57 +4000,66 @@ var __publicField = (obj, key, value) => {
     }
   }
   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({
@@ -4539,8 +4513,9 @@ var __publicField = (obj, key, value) => {
   };
   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 = [];
@@ -4560,7 +4535,7 @@ var __publicField = (obj, key, value) => {
           file,
           sha1,
           submittedAt,
-          createdBy: currentUser.id,
+          createdBy,
           description: "",
           modelId
         });
@@ -4764,21 +4739,21 @@ var __publicField = (obj, key, value) => {
     }
   }
   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(() => {
@@ -4786,37 +4761,41 @@ var __publicField = (obj, key, value) => {
       });
       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(() => {
@@ -4889,67 +4868,60 @@ var __publicField = (obj, key, value) => {
   }
   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 = blocks.unsafeShowToast) == null ? void 0 : _a2.call(blocks, {
+          (_a3 = blocks.unsafeShowToast) == null ? void 0 : _a3.call(blocks, {
             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 [
@@ -4961,11 +4933,11 @@ var __publicField = (obj, key, value) => {
         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)
@@ -4982,7 +4954,7 @@ var __publicField = (obj, key, value) => {
             }
             case "assigned_to": {
               let userOrNull = null;
-              const userIdOrNull = issue[issueUpdateChange];
+              const userIdOrNull = payload[issueUpdateChange];
               if (userIdOrNull) {
                 userOrNull = state.userReducer.users[userIdOrNull] ?? null;
                 if (!userOrNull)
@@ -4997,24 +4969,24 @@ var __publicField = (obj, key, value) => {
               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
@@ -5023,10 +4995,10 @@ var __publicField = (obj, key, value) => {
       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));
@@ -5078,7 +5050,6 @@ var __publicField = (obj, key, value) => {
         throw e;
       }
     }
-    // Special functions
     async refreshStore(projectId) {
       const result = await this.enqueueRequest({
         description: "Get issues",
@@ -5086,33 +5057,24 @@ var __publicField = (obj, key, value) => {
         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,
@@ -5158,20 +5120,20 @@ var __publicField = (obj, key, value) => {
       });
       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(() => {
@@ -5229,17 +5191,6 @@ var __publicField = (obj, key, value) => {
     }
   }
   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(
@@ -5327,6 +5278,17 @@ var __publicField = (obj, key, value) => {
         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() {
@@ -5512,8 +5474,9 @@ var __publicField = (obj, key, value) => {
   };
   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 = [];
@@ -5615,10 +5578,11 @@ var __publicField = (obj, key, value) => {
       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
       });
@@ -5630,45 +5594,49 @@ var __publicField = (obj, key, value) => {
       );
     }
     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()
@@ -5701,48 +5669,6 @@ var __publicField = (obj, key, value) => {
       });
       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();
@@ -5859,8 +5785,9 @@ var __publicField = (obj, key, value) => {
   };
   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 = [];
@@ -5942,13 +5869,14 @@ var __publicField = (obj, key, value) => {
     }
     // 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({
@@ -6203,13 +6131,20 @@ var __publicField = (obj, key, value) => {
     }
   }
   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]
@@ -6221,8 +6156,14 @@ var __publicField = (obj, key, value) => {
       });
       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,
@@ -6231,10 +6172,17 @@ var __publicField = (obj, key, value) => {
         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,
@@ -6242,8 +6190,6 @@ var __publicField = (obj, key, value) => {
         blockers: [workspaceId],
         blocks: []
       });
-      const originalWorkspace = store.getState().workspaceReducer.instances[workspaceId];
-      this.dispatch(deleteWorkspace(workspaceId));
       void promise.then(() => {
       }).catch((reason) => {
         if (originalWorkspace) {
@@ -6745,12 +6691,13 @@ var __publicField = (obj, key, value) => {
   }
   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]));
@@ -6779,7 +6726,11 @@ var __publicField = (obj, key, value) => {
           `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,
@@ -6791,8 +6742,7 @@ var __publicField = (obj, key, value) => {
       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;
@@ -6839,22 +6789,22 @@ var __publicField = (obj, key, value) => {
       });
       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) => {
@@ -6912,8 +6862,9 @@ var __publicField = (obj, key, value) => {
     }
     // 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 = [];
@@ -6935,7 +6886,7 @@ var __publicField = (obj, key, value) => {
           file,
           sha1,
           submittedAt,
-          createdBy: currentUser.id,
+          createdBy,
           description: "",
           modelId: documentId
         });
@@ -7098,10 +7049,9 @@ var __publicField = (obj, key, value) => {
     }
   }
   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,
@@ -7110,7 +7060,7 @@ var __publicField = (obj, key, value) => {
       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: [],
@@ -7123,25 +7073,24 @@ var __publicField = (obj, key, value) => {
       });
       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));
@@ -7253,10 +7202,11 @@ var __publicField = (obj, key, value) => {
   }
   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 = {
@@ -7271,9 +7221,9 @@ var __publicField = (obj, key, value) => {
         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,
@@ -7297,16 +7247,17 @@ var __publicField = (obj, key, value) => {
       });
       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 = [];
@@ -7329,7 +7280,7 @@ var __publicField = (obj, key, value) => {
           file_sha1: sha1,
           file: URL.createObjectURL(file),
           submitted_at: submittedAt,
-          created_by: currentUser.id,
+          created_by: createdBy,
           project: projectId
         });
         offlineGeoImages.push(offlineMapImage);
@@ -7346,7 +7297,7 @@ var __publicField = (obj, key, value) => {
           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,
@@ -7362,9 +7313,9 @@ var __publicField = (obj, key, value) => {
       });
       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)];
     }
@@ -7376,7 +7327,7 @@ var __publicField = (obj, key, value) => {
         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,
@@ -7386,9 +7337,9 @@ var __publicField = (obj, key, value) => {
         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];
     }
@@ -7399,7 +7350,7 @@ var __publicField = (obj, key, value) => {
       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,
@@ -7408,12 +7359,11 @@ var __publicField = (obj, key, value) => {
         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,
@@ -7421,14 +7371,15 @@ var __publicField = (obj, key, value) => {
         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,
@@ -7442,7 +7393,6 @@ var __publicField = (obj, key, value) => {
         payload: {
           offline_id: offlineIssueAssociation.offline_id,
           submitted_at: submittedAt,
-          created_by: createdBy,
           ...payload
         },
         blockers: [
@@ -7566,7 +7516,6 @@ var __publicField = (obj, key, value) => {
   exports2.addDocumentAttachments = addDocumentAttachments;
   exports2.addDocuments = addDocuments;
   exports2.addEmailDomain = addEmailDomain;
-  exports2.addFavouriteProjectId = addFavouriteProjectId;
   exports2.addForm = addForm;
   exports2.addFormRevision = addFormRevision;
   exports2.addFormRevisionAttachment = addFormRevisionAttachment;
@@ -7796,7 +7745,6 @@ var __publicField = (obj, key, value) => {
   exports2.rehydratedReducer = rehydratedReducer;
   exports2.rehydratedSlice = rehydratedSlice;
   exports2.removeDocuments = removeDocuments;
-  exports2.removeFavouriteProjectId = removeFavouriteProjectId;
   exports2.removeIssueType = removeIssueType;
   exports2.removeProjectFile = removeProjectFile;
   exports2.removeProjectFilesOfProject = removeProjectFilesOfProject;
@@ -7875,7 +7823,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectEmailDomains = selectEmailDomains;
   exports2.selectEmailDomainsAsMapping = selectEmailDomainsAsMapping;
   exports2.selectEmailDomainsOfOrganization = selectEmailDomainsOfOrganization;
-  exports2.selectFavouriteProjects = selectFavouriteProjects;
   exports2.selectFilteredForms = selectFilteredForms;
   exports2.selectFormById = selectFormById;
   exports2.selectFormMapping = selectFormMapping;
@@ -7916,6 +7863,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssueAttachmentMapping = selectIssueAttachmentMapping;
   exports2.selectIssueAttachments = selectIssueAttachments;
   exports2.selectIssueById = selectIssueById;
+  exports2.selectIssueCommentById = selectIssueCommentById;
   exports2.selectIssueCommentMapping = selectIssueCommentMapping;
   exports2.selectIssueCountOfCategory = selectIssueCountOfCategory;
   exports2.selectIssueMapping = selectIssueMapping;
@@ -8032,7 +7980,6 @@ var __publicField = (obj, key, value) => {
   exports2.setStageCompletions = setStageCompletions;
   exports2.setTeam = setTeam;
   exports2.setTokens = setTokens;
-  exports2.setTourStep = setTourStep;
   exports2.setUploadUrl = setUploadUrl;
   exports2.setUsers = setUsers;
   exports2.setWorkspaces = setWorkspaces;