From bdb54925eaba6762b9ef4892d5ff8d2a05b0f5e2 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sat, 3 Feb 2018 00:53:26 +0200
Subject: [PATCH] move logic about replacement and pasting comment to store
 instead of root component

---
 web/app/common/store.js          | 85 +++++++++++++++++++++++++++--
 web/app/components/root/root.jsx | 91 +++++---------------------------
 2 files changed, 92 insertions(+), 84 deletions(-)

diff --git a/web/app/common/store.js b/web/app/common/store.js
index 9950122f..88349d43 100644
--- a/web/app/common/store.js
+++ b/web/app/common/store.js
@@ -11,16 +11,91 @@ class Store {
     return _instance;
   }
 
-  set(obj) {
-    this.data = {
-      ...this.data,
-      ...obj,
-    };
+  set(key, obj) {
+    this.data[key] = obj;
   }
 
   get(key) {
     return this.data[key];
   }
+
+  addComment({ text, id, pid }) {
+    const comments = this.data.comments;
+    const newComment = {
+      comment: {
+        id,
+        text,
+        user: this.get('user'),
+        time: new Date(),
+        ...(pid ? { pid } : {}),
+      },
+    };
+
+    if (pid) {
+      this.pasteReply(newComment);
+    } else {
+      this.pasteComment(newComment);
+    }
+  }
+
+  pasteReply(newReply) {
+    let again = true;
+
+    const concatReply = (root, reply) => {
+      root.replies = root.replies || [];
+      root.replies = [reply].concat(root.replies);
+
+      again = false;
+
+      return root;
+    }
+
+    const paste = (root, commentObj) => {
+      if (!again) return root;
+
+      if (root.comment.id === commentObj.comment.pid) {
+        return concatReply(root, commentObj);
+      }
+
+      if (root.replies) {
+        root.replies = root.replies.map(reply => {
+          if (reply.comment.id === commentObj.comment.pid) {
+            return concatReply(reply, commentObj);
+          } else {
+            return paste(reply, commentObj);
+          }
+        })
+      }
+
+      return root;
+    };
+
+    this.data.comments = this.data.comments.map(thread => paste(thread, newReply));
+  }
+
+  pasteComment(newComment) {
+    this.data.comments = [newComment].concat(this.data.comments);
+  }
+
+  replaceComment(newComment) {
+    let again = true;
+
+    const replace = (thread, comment) => {
+      if (!again) return thread;
+
+      if (thread.comment.id === comment.id) {
+        thread.comment = comment;
+        again = false;
+        return thread;
+      }
+
+      thread.replies = thread.replies.map(reply => replace(reply, comment));
+
+      return thread;
+    };
+
+    this.data.comments = this.data.comments.map(thread => replace(thread, newComment));
+  }
 }
 
 export default new Store();
diff --git a/web/app/components/root/root.jsx b/web/app/components/root/root.jsx
index 2bb24a4b..7f51fc19 100644
--- a/web/app/components/root/root.jsx
+++ b/web/app/components/root/root.jsx
@@ -20,37 +20,25 @@ export default class Root extends Component {
 
   componentDidMount() {
     api.getUser()
-      .then(data => store.set({ user: data }))
-      .catch(() => store.set({ user: {} }))
+      .then(data => store.set('user', data))
+      .catch(() => store.set('user', {}))
       .finally(() => {
         api.find({ url })
-          .then(({ comments } = {}) => this.setState({ comments }))
+          .then(({ comments } = {}) => {
+            store.set('comments', comments);
+            this.setState({ comments });
+          })
           .finally(() => this.setState({ loaded: true }));
       });
   }
 
-  addComment({ text, id, pid }) {
-    const { comments } = this.state;
-    const newComment = {
-      comment: {
-        id,
-        text,
-        user: store.get('user'),
-        time: new Date(),
-        ...(pid ? { pid } : {}),
-      },
-    };
+  addComment(data) {
+    store.addComment(data);
+    this.setState({ comments: store.get('comments') });
 
-    const newComments = pid
-      ? Root.pasteReply({ comments, newComment })
-      : [newComment].concat(comments);
-
-    this.setState({ comments: newComments });
-
-    api.getComment({ id }).then(comment => {
-      this.setState({
-        comments: Root.replaceComment({ comments: newComments, newComment: comment }),
-      });
+    api.getComment({ id: data.id }).then(comment => {
+      store.replaceComment(comment);
+      this.setState({ comments: store.get('comments') });
     });
   }
 
@@ -82,59 +70,4 @@ export default class Root extends Component {
       </div>
     );
   }
-
-  static pasteReply({ comments, newComment }) {
-    let again = true;
-
-    const concatReply = (root, reply) => {
-      root.replies = root.replies || [];
-      root.replies = [reply].concat(root.replies);
-
-      again = false;
-
-      return root;
-    }
-
-    const paste = (root, commentObj) => {
-      if (!again) return root;
-
-      if (root.comment.id === commentObj.comment.pid) {
-        return concatReply(root, commentObj);
-      }
-
-      if (root.replies) {
-        root.replies = root.replies.map(reply => {
-          if (reply.comment.id === commentObj.comment.pid) {
-            return concatReply(reply, commentObj);
-          } else {
-            return paste(reply, commentObj);
-          }
-        })
-      }
-
-      return root;
-    };
-
-    return comments.map(thread => paste(thread, newComment));
-  }
-
-  static replaceComment({ comments, newComment }) {
-    let again = true;
-
-    const replace = (thread, comment) => {
-      if (!again) return thread;
-
-      if (thread.comment.id === comment.id) {
-        thread.comment = comment;
-        again = false;
-        return thread;
-      }
-
-      thread.replies = thread.replies.map(reply => replace(reply, comment));
-
-      return thread;
-    };
-
-    return comments.map(thread => replace(thread, newComment));
-  }
 }