@overmap-ai/core 1.0.48-activity-history.2 → 1.0.48-activity-history.3

package/dist/overmap-core.umd.cjs

@@ -2135,20 +2135,55 @@ var __publicField = (obj, key, value) => {
       setVisibleUserIds: (state, action) => {
         state.visibleUserIds = [...new Set(action.payload)];
       },
-      setIssueComments: (state, action) => {
+      // Comments
+      addIssueComment: (state, action) => {
+        if (action.payload.offline_id in state.comments) {
+          throw new Error(
+            `Tried to add issue comment with offline_id: ${action.payload.offline_id} that already exists`
+          );
+        }
+        state.comments[action.payload.offline_id] = action.payload;
+      },
+      addIssueComments: (state, action) => {
+        for (const comment of action.payload) {
+          if (comment.offline_id in state.comments) {
+            throw new Error(
+              `Tried to add issue comment with offline_id: ${comment.offline_id} that already exists`
+            );
+          }
+        }
         for (const comment of action.payload) {
           state.comments[comment.offline_id] = comment;
         }
       },
+      setIssueComment: (state, action) => {
+        state.comments[action.payload.offline_id] = action.payload;
+      },
+      setIssueComments: (state, action) => {
+        const newComments = {};
+        for (const comment of action.payload) {
+          newComments[comment.offline_id] = comment;
+        }
+        state.comments = newComments;
+      },
       addOrReplaceIssueComment: (state, action) => {
         state.comments[action.payload.offline_id] = action.payload;
       },
       removeIssueComment: (state, action) => {
-        if (action.payload in state.comments) {
-          delete state.comments[action.payload];
-        } else {
+        if (!(action.payload in state.comments)) {
           throw new Error(`Failed to remove issue comment because ID doesn't exist: ${action.payload}`);
         }
+        delete state.comments[action.payload];
+      },
+      removeIssueComments: (state, action) => {
+        for (const commentId of action.payload) {
+          if (!(commentId in state.comments)) {
+            throw new Error(`Failed to remove issue comment because ID doesn't exist: ${commentId}`);
+          }
+        }
+        for (const commentId of action.payload) {
+          delete state.comments[commentId];
+        }
       },
       cleanRecentIssues: (state) => {
         state.recentIssueIds = state.recentIssueIds.filter((recentIssue) => state.issues[recentIssue.offlineId]);
@@ -2187,20 +2222,25 @@ var __publicField = (obj, key, value) => {
     removeIssueAttachment,
     removeAttachmentsOfIssue,
     removeIssue,
-    removeIssueComment,
     removeIssueUpdate,
     removeIssueUpdates,
     removeRecentIssue,
     resetRecentIssues,
     setActiveIssueId,
     setIssueAttachments,
-    setIssueComments,
     setIssueUpdates,
     setIssues,
     setVisibleStatuses,
     setVisibleUserIds,
     updateIssueAttachment,
-    updateIssue
+    updateIssue,
+    // Commments
+    addIssueComment,
+    addIssueComments,
+    setIssueComment,
+    setIssueComments,
+    removeIssueComment,
+    removeIssueComments
   } = issueSlice.actions;
   const selectIssueMapping = (state) => state.issueReducer.issues;
   const selectRecentIssueIds = (state) => state.issueReducer.recentIssueIds;
@@ -5757,49 +5797,36 @@ var __publicField = (obj, key, value) => {
     }
   }
   class IssueCommentService extends BaseApiService {
+    // Omit author and submitted_at since these will always be set internally
     add(comment) {
-      const offlinePayload = offline(comment);
-      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const { store } = this.client;
-      const offlineComment = {
-        ...offlinePayload,
+      const offlineComment = offline({
+        ...comment,
         author: store.getState().userReducer.currentUser.id,
-        created_at: submittedAt
-      };
-      store.dispatch(addOrReplaceIssueComment(offlineComment));
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        resolved: false
+      });
+      store.dispatch(addIssueComment(offlineComment));
       const promise = this.enqueueRequest({
         description: `${truncate(comment.content, 80)}`,
         method: HttpMethod.POST,
         url: `/issues/${comment.issue}/comment/`,
-        payload: { ...offlinePayload, submitted_at: submittedAt },
+        payload: offlineComment,
         blockers: [comment.issue],
-        blocks: [offlinePayload.offline_id]
+        blocks: [offlineComment.offline_id]
+      });
+      promise.catch(() => {
+        store.dispatch(removeIssueComment(offlineComment.offline_id));
       });
       return [offlineComment, promise];
     }
-    async refreshStore() {
+    update(comment) {
       const { store } = this.client;
-      const result = await this.enqueueRequest({
-        description: "Get comments",
-        method: HttpMethod.GET,
-        // TODO: Choose between /issues/comments/in-project/${projectId}/ and /projects/${projectId}/issue-comments/
-        url: `/projects/${store.getState().projectReducer.activeProjectId}/comments/`,
-        blockers: [],
-        blocks: []
-      });
-      let filteredResult = result.filter(onlyUniqueOfflineIds);
-      filteredResult = filteredResult.map((comment) => {
-        return { ...comment };
-      });
-      if (result.length !== filteredResult.length) {
-        console.error(
-          `Received duplicate comments from the API (new length ${filteredResult.length}); filtered in browser.`
-        );
+      const commentToUpdate = store.getState().issueReducer.comments[comment.offline_id];
+      if (!commentToUpdate) {
+        throw new Error(`Comment with offline_id ${comment.offline_id} not found in store`);
       }
-      store.dispatch(setIssueComments(filteredResult));
-    }
-    update(comment) {
-      this.client.store.dispatch(addOrReplaceIssueComment(comment));
+      store.dispatch(setIssueComment(comment));
       const promise = this.enqueueRequest({
         description: `Edit comment: ${truncate(comment.content, 80)}`,
         method: HttpMethod.PATCH,
@@ -5808,17 +5835,40 @@ var __publicField = (obj, key, value) => {
         blockers: [comment.issue],
         blocks: [comment.offline_id]
       });
+      promise.catch(() => {
+        store.dispatch(setIssueComment(commentToUpdate));
+      });
       return [comment, promise];
     }
     remove(offline_id) {
+      const commentToRemove = this.client.store.getState().issueReducer.comments[offline_id];
+      if (!commentToRemove) {
+        throw new Error(`Comment with offline_id ${offline_id} not found in store`);
+      }
       this.client.store.dispatch(removeIssueComment(offline_id));
-      return this.enqueueRequest({
+      const promise = this.enqueueRequest({
         description: "Delete comment",
         method: HttpMethod.DELETE,
         url: `/issues/comments/${offline_id}/`,
         blockers: [offline_id],
         blocks: []
       });
+      promise.catch(() => {
+        this.client.store.dispatch(addIssueComment(commentToRemove));
+      });
+      return promise;
+    }
+    async refreshStore() {
+      const { store } = this.client;
+      const result = await this.enqueueRequest({
+        description: "Get comments",
+        method: HttpMethod.GET,
+        // TODO: Choose between /issues/comments/in-project/${projectId}/ and /projects/${projectId}/issue-comments/
+        url: `/projects/${store.getState().projectReducer.activeProjectId}/comments/`,
+        blockers: [],
+        blocks: []
+      });
+      store.dispatch(setIssueComments(result));
     }
   }
   class IssueUpdateService extends BaseApiService {
@@ -15474,6 +15524,8 @@ var __publicField = (obj, key, value) => {
   exports2.addIssue = addIssue;
   exports2.addIssueAttachment = addIssueAttachment;
   exports2.addIssueAttachments = addIssueAttachments;
+  exports2.addIssueComment = addIssueComment;
+  exports2.addIssueComments = addIssueComments;
   exports2.addIssueUpdate = addIssueUpdate;
   exports2.addIssueUpdates = addIssueUpdates;
   exports2.addLicenses = addLicenses;
@@ -15635,6 +15687,7 @@ var __publicField = (obj, key, value) => {
   exports2.removeIssue = removeIssue;
   exports2.removeIssueAttachment = removeIssueAttachment;
   exports2.removeIssueComment = removeIssueComment;
+  exports2.removeIssueComments = removeIssueComments;
   exports2.removeIssueUpdate = removeIssueUpdate;
   exports2.removeIssueUpdates = removeIssueUpdates;
   exports2.removeOrganizationAccess = removeOrganizationAccess;
@@ -15835,6 +15888,7 @@ var __publicField = (obj, key, value) => {
   exports2.setIsImportingProjectFile = setIsImportingProjectFile;
   exports2.setIsLoading = setIsLoading;
   exports2.setIssueAttachments = setIssueAttachments;
+  exports2.setIssueComment = setIssueComment;
   exports2.setIssueComments = setIssueComments;
   exports2.setIssueUpdates = setIssueUpdates;
   exports2.setIssues = setIssues;