From 2d5bfa4850f1ae2be0e0c149628216ace074b774 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 27 Nov 2020 20:52:35 +0200
Subject: [PATCH] PostList improvements

---
 .../public/locales/en/translation.json        |  3 +--
 .../src/components/PostCreate/index.jsx       | 27 +++----------------
 .../src/components/PostCreate/styles.css      |  8 ------
 .../components/PostList/PostListRow/index.jsx | 11 ++------
 .../PostList/PostListRow/styles.css           |  4 ---
 .../src/constants/PostsDatabaseKeys.js        |  2 --
 .../src/redux/sagas/peerDbReplicationSaga.js  |  3 +--
 .../src/views/Topic/TopicCreate/index.jsx     |  3 +--
 8 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json
index a6cb0b5..e8681d5 100644
--- a/packages/concordia-app/public/locales/en/translation.json
+++ b/packages/concordia-app/public/locales/en/translation.json
@@ -6,7 +6,6 @@
   "post.create.form.send.button": "Post",
   "post.form.content.field.placeholder": "Message",
   "post.form.subject.field.placeholder": "Subject",
-  "post.list.row.author.pre": "Post by",
   "post.list.row.post.id": "#{{id}}",
   "profile.general.tab.address.row.title": "Account address:",
   "profile.general.tab.location.row.title": "Location:",
@@ -55,4 +54,4 @@
   "topic.list.row.author.date": "Created by {{author}}, {{timeAgo}}",
   "topic.list.row.number.of.replies": "{{numberOfReplies}} replies",
   "topic.list.row.topic.id": "#{{id}}"
-}
\ No newline at end of file
+}
diff --git a/packages/concordia-app/src/components/PostCreate/index.jsx b/packages/concordia-app/src/components/PostCreate/index.jsx
index fcaec71..b6322ea 100644
--- a/packages/concordia-app/src/components/PostCreate/index.jsx
+++ b/packages/concordia-app/src/components/PostCreate/index.jsx
@@ -14,7 +14,7 @@ import { USER_PROFILE_PICTURE } from '../../constants/UserDatabaseKeys';
 import { breeze, drizzle } from '../../redux/store';
 import './styles.css';
 import { TRANSACTION_ERROR, TRANSACTION_SUCCESS } from '../../constants/TransactionStatus';
-import { POST_CONTENT, POST_SUBJECT } from '../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../constants/ContractNames';
 import { POST_CREATED_EVENT } from '../../constants/ForumContractEvents';
 
@@ -27,7 +27,7 @@ const PostCreate = (props) => {
   } = props;
   const transactionStack = useSelector((state) => state.transactionStack);
   const transactions = useSelector((state) => state.transactions);
-  const [postSubject, setPostSubject] = useState(initialPostSubject);
+  const [postSubject] = useState(initialPostSubject);
   const [postContent, setPostContent] = useState('');
   const [userProfilePictureUrl, setUserProfilePictureUrl] = useState();
   const [createPostCacheSendStackId, setCreatePostCacheSendStackId] = useState('');
@@ -68,9 +68,6 @@ const PostCreate = (props) => {
     }
 
     switch (event.target.name) {
-      case 'postSubject':
-        setPostSubject(event.target.value);
-        break;
       case 'postContent':
         setPostContent(event.target.value);
         break;
@@ -94,11 +91,9 @@ const PostCreate = (props) => {
 
         postsDb
           .put(contractPostId, {
-            [POST_SUBJECT]: postSubject,
             [POST_CONTENT]: postContent,
           }, { pin: true })
           .then(() => {
-            setPostSubject(initialPostSubject);
             setPostContent('');
             setPosting(false);
             setStoringPost(false);
@@ -147,21 +142,6 @@ const PostCreate = (props) => {
               </Feed.Label>
               <Feed.Content>
                   <Feed.Summary>
-                      <div>
-                          <Input
-                            placeholder={t('post.form.subject.field.placeholder')}
-                            name="postSubject"
-                            className="subject-input"
-                            size="mini"
-                            value={postSubject}
-                            onChange={handleInputChange}
-                          />
-                          <span className="post-summary-meta-index">
-                              {t('post.list.row.post.id', { id: postIndexInTopic })}
-                          </span>
-                      </div>
-                  </Feed.Summary>
-                  <Feed.Extra>
                       <Form>
                           <TextArea
                             placeholder={t('post.form.content.field.placeholder')}
@@ -172,8 +152,7 @@ const PostCreate = (props) => {
                             onChange={handleInputChange}
                           />
                       </Form>
-                  </Feed.Extra>
-
+                  </Feed.Summary>
                   <Feed.Meta>
                       <Feed.Like>
                           <Form.Button
diff --git a/packages/concordia-app/src/components/PostCreate/styles.css b/packages/concordia-app/src/components/PostCreate/styles.css
index f13e984..0bf8ac6 100644
--- a/packages/concordia-app/src/components/PostCreate/styles.css
+++ b/packages/concordia-app/src/components/PostCreate/styles.css
@@ -8,14 +8,6 @@
     opacity: 0.4;
 }
 
-.post-summary-meta-date {
-    float: right !important;
-}
-
-.subject-input {
-    min-width: 300px;
-}
-
 .like:hover .icon {
     color: #fff !important;
 }
diff --git a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
index 085c217..b107d87 100644
--- a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
+++ b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
@@ -15,7 +15,7 @@ import './styles.css';
 import { POSTS_DATABASE, USER_DATABASE } from '../../../constants/OrbitDatabases';
 import determineKVAddress from '../../../utils/orbitUtils';
 import { USER_PROFILE_PICTURE } from '../../../constants/UserDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../../constants/ContractNames';
 
 const { orbit } = breeze;
@@ -28,7 +28,6 @@ const PostListRow = (props) => {
   const [postAuthorAddress, setPostAuthorAddress] = useState(null);
   const [postAuthor, setPostAuthor] = useState(null);
   const [timeAgo, setTimeAgo] = useState(null);
-  const [postSubject, setPostSubject] = useState(null);
   const [postContent, setPostContent] = useState(null);
   const [postAuthorMeta, setPostAuthorMeta] = useState(null);
   const userAddress = useSelector((state) => state.user.address);
@@ -68,7 +67,6 @@ const PostListRow = (props) => {
       .find((post) => post.id === postId);
 
     if (postFound) {
-      setPostSubject(postFound[POST_SUBJECT]);
       setPostContent(postFound[POST_CONTENT]);
     }
   }, [postId, posts]);
@@ -126,9 +124,6 @@ const PostListRow = (props) => {
           <Feed.Content>
               <Feed.Summary>
                   <div>
-                      {postSubject !== null
-                        ? postSubject
-                        : <Placeholder><Placeholder.Line length="very long" /></Placeholder>}
                       <span className="post-summary-meta-index">
                           {t('post.list.row.post.id', { id: postIndexInTopic })}
                       </span>
@@ -136,8 +131,6 @@ const PostListRow = (props) => {
                   {postAuthor !== null && setPostAuthorAddress !== null && timeAgo !== null
                     ? (
                         <>
-                            {t('post.list.row.author.pre')}
-                            &nbsp;
                             <Feed.User as={Link} to={`/users/${postAuthorAddress}`}>{postAuthor}</Feed.User>
                             <Feed.Date className="post-summary-meta-date">{timeAgo}</Feed.Date>
                         </>
@@ -150,7 +143,7 @@ const PostListRow = (props) => {
           </Feed.Content>
       </Dimmer.Dimmable>
   ), [
-    authorAvatarLink, loading, postAuthor, postAuthorAddress, postContent, postIndexInTopic, postSubject, t, timeAgo,
+    authorAvatarLink, loading, postAuthor, postAuthorAddress, postContent, postIndexInTopic, t, timeAgo,
   ]);
 };
 
diff --git a/packages/concordia-app/src/components/PostList/PostListRow/styles.css b/packages/concordia-app/src/components/PostList/PostListRow/styles.css
index d74bc71..f6760c2 100644
--- a/packages/concordia-app/src/components/PostList/PostListRow/styles.css
+++ b/packages/concordia-app/src/components/PostList/PostListRow/styles.css
@@ -7,7 +7,3 @@
     font-size: 12px;
     opacity: 0.4;
 }
-
-.post-summary-meta-date {
-    float: right !important;
-}
\ No newline at end of file
diff --git a/packages/concordia-app/src/constants/PostsDatabaseKeys.js b/packages/concordia-app/src/constants/PostsDatabaseKeys.js
index 8a6a148..416f530 100644
--- a/packages/concordia-app/src/constants/PostsDatabaseKeys.js
+++ b/packages/concordia-app/src/constants/PostsDatabaseKeys.js
@@ -1,8 +1,6 @@
-export const POST_SUBJECT = 'subject';
 export const POST_CONTENT = 'content';
 
 const postsDatabaseKeys = [
-  POST_SUBJECT,
   POST_CONTENT,
 ];
 
diff --git a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
index 5e30042..bc1672c 100644
--- a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
+++ b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
@@ -12,7 +12,7 @@ import { FETCH_USER_DATABASE, UPDATE_ORBIT_DATA } from '../actions/peerDbReplica
 import { POSTS_DATABASE, TOPICS_DATABASE, USER_DATABASE } from '../../constants/OrbitDatabases';
 import userDatabaseKeys from '../../constants/UserDatabaseKeys';
 import { TOPIC_SUBJECT } from '../../constants/TopicsDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../constants/PostsDatabaseKeys';
 
 function* fetchUserDb({ orbit, userAddress, dbName }) {
   const peerDbAddress = yield call(determineKVAddress, {
@@ -94,7 +94,6 @@ function* updateReduxState({ database }) {
         ...oldPostsUnchanged,
         ...Object.entries(database.all).map(([key, value]) => ({
           id: parseInt(key, 10),
-          [POST_SUBJECT]: value[POST_SUBJECT],
           [POST_CONTENT]: value[POST_CONTENT],
         })),
       ],
diff --git a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
index a801b5a..2af825c 100644
--- a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
+++ b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
@@ -12,7 +12,7 @@ import { drizzle, breeze } from '../../../redux/store';
 import { TRANSACTION_ERROR, TRANSACTION_SUCCESS } from '../../../constants/TransactionStatus';
 import { POSTS_DATABASE, TOPICS_DATABASE } from '../../../constants/OrbitDatabases';
 import { TOPIC_SUBJECT } from '../../../constants/TopicsDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../../constants/ContractNames';
 import { TOPIC_CREATED_EVENT } from '../../../constants/ForumContractEvents';
 
@@ -74,7 +74,6 @@ const TopicCreate = (props) => {
           .put(topicId, { [TOPIC_SUBJECT]: subjectInput }, { pin: true })
           .then(() => postsDb
             .put(postId, {
-              [POST_SUBJECT]: subjectInput,
               [POST_CONTENT]: contentInput,
             }, { pin: true }))
           .then(() => {