Merge pull request #2260 from tangjeff0/comments/edit-delete

feat: enable edit and delete of comments
athensresearch · Jul 29, 2022 · 17f7bd3 · 17f7bd3
2 parents d50ba6b + 5ba03a0
commit 17f7bd3
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 111 deletions.
diff --git a/src/cljs/athens/db.cljs b/src/cljs/athens/db.cljs
@@ -164,7 +164,7 @@
                :fs/watcher          nil
                :presence            {}
                :connection-status   :disconnected
-               :comment/show-inline-comments true})
+               :comment/show-comments? true})
 
 
 (defn init-app-db

diff --git a/src/cljs/athens/self_hosted/presence/subs.cljs b/src/cljs/athens/self_hosted/presence/subs.cljs
@@ -40,6 +40,13 @@
         second)))
 
 
+(rf/reg-sub
+  :presence/current-username
+  :<- [:presence/current-user]
+  (fn [current-user _]
+    (:username current-user)))
+
+
 (defn on-page-uid?
   [page-uid [_username user]]
   (= page-uid (:page/uid user)))

diff --git a/src/cljs/athens/views/app_toolbar.cljs b/src/cljs/athens/views/app_toolbar.cljs
@@ -21,7 +21,7 @@
         right-open?            (rf/subscribe [:right-sidebar/open])
         help-open?             (rf/subscribe [:help/open?])
         athena-open?           (rf/subscribe [:athena/open])
-        inline-comments        (rf/subscribe [:comment/show-inline-comments?])
+        show-comments?         (rf/subscribe [:comment/show-comments?])
         route-name             (rf/subscribe [:current-route/name])
         theme-dark             (rf/subscribe [:theme/dark])
         selected-db            (rf/subscribe [:db-picker/selected-db])
@@ -109,5 +109,5 @@
                        {:notificationPopover (r/as-element [notifications-popover])
                         :isNotificationsPopoverOpen @notificationsPopoverOpen?})
                      (when (comments/enabled?)
-                       {:isShowInlineComments  @inline-comments
-                        :onClickInlineComments #(rf/dispatch [:comment/toggle-inline-comments])}))]))
+                       {:isShowComments  @show-comments?
+                        :onClickComments #(rf/dispatch [:comment/toggle-comments])}))]))
diff --git a/src/cljs/athens/views/blocks/context_menu.cljs b/src/cljs/athens/views/blocks/context_menu.cljs
@@ -41,7 +41,7 @@
 
 (defn handle-click-comment
   [e uid]
-  (rf/dispatch [:comment/show-comment-textarea uid])
+  (rf/dispatch [:comment/show-editor uid])
   (.. e preventDefault))
 
 
diff --git a/src/cljs/athens/views/blocks/editor.cljs b/src/cljs/athens/views/blocks/editor.cljs
@@ -160,9 +160,9 @@
         linked-ref-open?      (rf/subscribe [::linked-ref.subs/open? uid])
         inline-refs-open?     (rf/subscribe [::inline-refs.subs/open? uid])
         feature-flags         (rf/subscribe [:feature-flags])
-        show-inline-comments  (rf/subscribe [:comment/show-inline-comments?])
-        show-textarea         (rf/subscribe [:comment/show-comment-textarea? uid])
-        enable-properties?    (rf/subscribe [:feature-flags/enabled? :properties])]
+        enable-properties?    (rf/subscribe [:feature-flags/enabled? :properties])
+        show-comments?        (rf/subscribe [:comment/show-comments?])
+        show-textarea         (rf/subscribe [:comment/show-editor? uid])]
     (fn editor-component-render
       [_block-el _block-o _children? _block _linked-ref-data _uid-sanitized-block _state-hooks _opts]
       (let [{:block/keys [;; uid
@@ -244,7 +244,7 @@
                                          :onToggleReaction (partial toggle-reaction [:block/uid uid])}])
 
           ;; Show comments when the toggle is on
-          (when (and @show-inline-comments
+          (when (and @show-comments?
                      open
                      (or @show-textarea
                          (comments/get-comment-thread-uid @db/dsdb uid)))

diff --git a/src/cljs/athens/views/comments/core.cljs b/src/cljs/athens/views/comments/core.cljs
@@ -17,44 +17,43 @@
 
 
 (rf/reg-sub
-  :comment/show-comment-textarea?
+  :comment/show-editor?
   (fn [db [_ uid]]
-    (= uid (:comment/show-comment-textarea db))))
+    (= uid (:comment/show-editor db))))
 
 
 (rf/reg-event-fx
-  :comment/show-comment-textarea
+  :comment/show-editor
   (fn [{:keys [db]} [_ uid]]
-    {:db (assoc db :comment/show-comment-textarea uid)}))
+    {:db (assoc db :comment/show-editor uid)}))
 
 
 (rf/reg-event-fx
-  :comment/hide-comment-textarea
+  :comment/hide-editor
   (fn [{:keys [db]} [_]]
-    {:db (assoc db :comment/show-comment-textarea nil)}))
+    {:db (assoc db :comment/show-editor nil)}))
 
 
 (rf/reg-sub
-  :comment/show-inline-comments?
+  :comment/show-comments?
   (fn [db [_]]
-    (= true (:comment/show-inline-comments db))))
+    (= true (:comment/show-comments? db))))
 
 
-(rf/reg-event-fx
-  :comment/toggle-inline-comments
-  (fn [{:keys [db]} [_]]
-    (let [current-state (:comment/show-inline-comments db)]
-      (println "toggle inline comments" current-state)
-      {:db (assoc db :comment/show-inline-comments (not current-state))})))
+(rf/reg-event-db
+  :comment/toggle-comments
+  (fn [db [_]]
+    (update db :comment/show-comments? not)))
 
 
 (defn thread-child->comment
   [comment-block]
-  (let [comment-uid (:block/uid comment-block)]
-    {:block/uid comment-uid
-     :string (:block/string comment-block)
-     :author (-> comment-block :block/create :event/auth :presence/id)
-     :time   (-> comment-block :block/create :event/time :time/ts)}))
+  (let [{:block/keys [uid string create properties]} comment-block]
+    {:block/uid uid
+     :string    string
+     :author    (-> create :event/auth :presence/id)
+     :time      (-> create :event/time :time/ts)
+     :edited?   (boolean (get properties "athens/comment/edited"))}))
 
 
 (defn add-is-follow-up?