From 871836f636bcba97805b302b3034394a384c729c Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 18:19:05 -0500
Subject: [PATCH 1/5] Adding description field to flags.

---
 client/coral-embed-stream/style/default.css |  2 ++
 client/coral-plugin-flags/FlagButton.js     | 27 ++++++++++-----------
 client/coral-plugin-flags/FlagComment.js    |  3 ++-
 client/coral-plugin-flags/translations.json |  6 +++--
 models/action.js                            |  1 +
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 463c8dc68..bc5ce27bc 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -241,6 +241,7 @@ hr {
 .coral-plugin-flags-popup-radio-label {
   margin:5px;
   font-size: 14px;
+  font-weight: 700;
 }
 
 .coral-plugin-flags-popup-counter {
@@ -256,6 +257,7 @@ hr {
 
 .coral-plugin-flags-other-text {
   margin-left: 20px;
+  margin-top: 5px;
   width: 75%;
 }
 
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index d0b9cb6b4..57b3d1946 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -10,10 +10,9 @@ class FlagButton extends Component {
 
   state = {
     showMenu: false,
-    showOther: false,
     itemType: '',
     detail: '',
-    otherText: '',
+    description: '',
     step: 0,
     posted: false
   }
@@ -30,7 +29,7 @@ class FlagButton extends Component {
 
   onPopupContinue = () => {
     const {postAction, addItem, updateItem, flag, id, author_id} = this.props;
-    const {itemType, field, detail, step, otherText, posted} = this.state;
+    const {itemType, field, detail, step, description, posted} = this.state;
 
     //Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -42,7 +41,6 @@ class FlagButton extends Component {
     // If itemType and detail are both set, post the action
     if (itemType && detail && !posted) {
       // Set the text from the "other" field if it exists.
-      const updatedDetail = otherText || detail;
       let item_id;
       switch(itemType) {
       case 'comments':
@@ -55,7 +53,8 @@ class FlagButton extends Component {
       const action = {
         action_type: 'flag',
         field,
-        detail: updatedDetail
+        detail,
+        description
       };
       postAction(item_id, itemType, action)
         .then((action) => {
@@ -92,7 +91,7 @@ class FlagButton extends Component {
   }
 
   onOtherTextChange = (e) => {
-    this.setState({otherText: e.target.value});
+    this.setState({description: e.target.value});
   }
 
   handleClickOutside () {
@@ -141,16 +140,16 @@ class FlagButton extends Component {
                   )
                 }
                 {
-                  this.state.showOther && <div>
-                    <input
+                  this.state.detail && <div>
+                  <label htmlFor={'description'} className={`${name}-popup-radio-label`}>
+                    {lang.t('flag-reason')}
+                  </label><br/>
+                <textarea
                       className={`${name}-other-text`}
-                      type="text"
-                      id="otherText"
+                      id="description"
+                      rows={4}
                       onChange={this.onOtherTextChange}
-                      value={this.state.otherText}/>
-                    <label htmlFor={'otherText'} className={`${name}-popup-radio-label screen-reader-text`}>
-                      lang.t('flag-reason')
-                    </label><br/>
+                      value={this.state.description}/>
                   </div>
                 }
               </form>
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 2d5b33039..4a2634b6c 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -22,12 +22,13 @@ const getPopupMenu = [
     [
       {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
       {val: 'This comment is offensive', text: lang.t('comment-offensive')},
-      {val: 'This comment reveals personally identifiable infomration', text: lang.t('personal-info')},
+      {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'other', text: lang.t('other')}
     ]
     : [
       {val: 'This username is offensive', text: lang.t('username-offensive')},
       {val: 'I don\'t like this username', text: lang.t('no-like-username')},
+      {val: 'This user is impersonating', text: lang.t('user-impersonating')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'other', text: lang.t('other')}
     ];
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index 0c2ce594d..28eff28ee 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -19,8 +19,9 @@
     "bio-offensive": "This bio is offensive",
     "no-like-bio": "I don't like this bio",
     "marketing": "This looks like an ad/marketing",
+    "user-impersonating": "This user is impersonating",
     "thank-you": "We value your safety and feedback. A moderator will review your flag.",
-    "flag-reason": "Reason for flag",
+    "flag-reason": "Reason for flag (Optional)",
     "other": "Other"
   },
   "es": {
@@ -42,9 +43,10 @@
     "no-like-username": "No me gusta ese nombre de usuario",
     "bio-offensive": "Esta bio es ofensiva",
     "no-like-bio": "No me gusta esta bio",
+    "user-impersonating": "This user is impersonating",
     "marketing": "Esto parece una publicidad/marketing",
     "thank-you": "Nos interesa tu protección y comentarios. Un moderador va a mirar tu marca.",
-    "flag-reason": "Razón por la que marcar",
+    "flag-reason": "Razón por la que marcar (Opcional)",
     "other": "Otro"
   }
 }
diff --git a/models/action.js b/models/action.js
index 45f828226..ef3d0c525 100644
--- a/models/action.js
+++ b/models/action.js
@@ -15,6 +15,7 @@ const ActionSchema = new Schema({
   user_id: String,
   field: String, // Used when an action references a particular field of an object. (e.g. a flag on a username or bio)
   detail: String, // Describes the reason for an action (e.g. 'Username is offensive')
+  description: String, // Describes the reason for the action in more detail (e.g. A description of why the comment is offensive.)
 }, {
   timestamps: {
     createdAt: 'created_at',

From 59735600439edbd2533bba679a2e128b93c5619d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 16 Dec 2016 18:20:31 -0500
Subject: [PATCH 2/5] Updating translation.

---
 .../src/containers/Community => coral-plugin-flags}/Pager.css   | 0
 .../src/containers/Community => coral-plugin-flags}/Pager.js    | 0
 client/coral-plugin-flags/translations.json                     | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename client/{coral-admin/src/containers/Community => coral-plugin-flags}/Pager.css (100%)
 rename client/{coral-admin/src/containers/Community => coral-plugin-flags}/Pager.js (100%)

diff --git a/client/coral-admin/src/containers/Community/Pager.css b/client/coral-plugin-flags/Pager.css
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.css
rename to client/coral-plugin-flags/Pager.css
diff --git a/client/coral-admin/src/containers/Community/Pager.js b/client/coral-plugin-flags/Pager.js
similarity index 100%
rename from client/coral-admin/src/containers/Community/Pager.js
rename to client/coral-plugin-flags/Pager.js
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index 28eff28ee..caac6cbf1 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -43,7 +43,7 @@
     "no-like-username": "No me gusta ese nombre de usuario",
     "bio-offensive": "Esta bio es ofensiva",
     "no-like-bio": "No me gusta esta bio",
-    "user-impersonating": "This user is impersonating",
+    "user-impersonating": "Este usario suplanta a alguien",
     "marketing": "Esto parece una publicidad/marketing",
     "thank-you": "Nos interesa tu protección y comentarios. Un moderador va a mirar tu marca.",
     "flag-reason": "Razón por la que marcar (Opcional)",

From be3d50645991b6243dff621272ce9d55d23cb20f Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 19 Dec 2016 20:10:42 -0500
Subject: [PATCH 3/5] Moving action metadata to nested object.

---
 client/coral-plugin-flags/FlagButton.js | 30 +++++++++++++------------
 models/action.js                        |  4 +---
 models/comment.js                       |  5 ++---
 models/user.js                          |  5 ++---
 routes/api/comments/index.js            |  5 ++---
 routes/api/users/index.js               |  5 ++---
 tests/routes/api/comments/index.js      |  5 +++--
 tests/routes/api/user/index.js          |  8 ++++---
 8 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 57b3d1946..3deeee1c9 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -11,8 +11,8 @@ class FlagButton extends Component {
   state = {
     showMenu: false,
     itemType: '',
-    detail: '',
-    description: '',
+    reason: '',
+    note: '',
     step: 0,
     posted: false
   }
@@ -29,7 +29,7 @@ class FlagButton extends Component {
 
   onPopupContinue = () => {
     const {postAction, addItem, updateItem, flag, id, author_id} = this.props;
-    const {itemType, field, detail, step, description, posted} = this.state;
+    const {itemType, field, reason, step, note, posted} = this.state;
 
     //Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -38,8 +38,8 @@ class FlagButton extends Component {
       this.setState({step: step + 1});
     }
 
-    // If itemType and detail are both set, post the action
-    if (itemType && detail && !posted) {
+    // If itemType and reason are both set, post the action
+    if (itemType && reason && !posted) {
       // Set the text from the "other" field if it exists.
       let item_id;
       switch(itemType) {
@@ -52,9 +52,11 @@ class FlagButton extends Component {
       }
       const action = {
         action_type: 'flag',
-        field,
-        detail,
-        description
+        metadata: {
+          field,
+          reason,
+          note
+        }
       };
       postAction(item_id, itemType, action)
         .then((action) => {
@@ -69,7 +71,7 @@ class FlagButton extends Component {
   onPopupOptionClick = (sets) => (e) => {
 
     // If the "other" option is clicked, show the other textbox
-    if(sets === 'detail' && e.target.value === 'other') {
+    if(sets === 'reason' && e.target.value === 'other') {
       this.setState({showOther: true});
     }
 
@@ -91,7 +93,7 @@ class FlagButton extends Component {
   }
 
   onOtherTextChange = (e) => {
-    this.setState({description: e.target.value});
+    this.setState({note: e.target.value});
   }
 
   handleClickOutside () {
@@ -140,16 +142,16 @@ class FlagButton extends Component {
                   )
                 }
                 {
-                  this.state.detail && <div>
-                  <label htmlFor={'description'} className={`${name}-popup-radio-label`}>
+                  this.state.reason && <div>
+                  <label htmlFor={'note'} className={`${name}-popup-radio-label`}>
                     {lang.t('flag-reason')}
                   </label><br/>
                 <textarea
                       className={`${name}-other-text`}
-                      id="description"
+                      id="note"
                       rows={4}
                       onChange={this.onOtherTextChange}
-                      value={this.state.description}/>
+                      value={this.state.note}/>
                   </div>
                 }
               </form>
diff --git a/models/action.js b/models/action.js
index ef3d0c525..79eabdd98 100644
--- a/models/action.js
+++ b/models/action.js
@@ -13,9 +13,7 @@ const ActionSchema = new Schema({
   item_type: String,
   item_id: String,
   user_id: String,
-  field: String, // Used when an action references a particular field of an object. (e.g. a flag on a username or bio)
-  detail: String, // Describes the reason for an action (e.g. 'Username is offensive')
-  description: String, // Describes the reason for the action in more detail (e.g. A description of why the comment is offensive.)
+  metadata: Object, //Holds arbitrary metadata about the action.
 }, {
   timestamps: {
     createdAt: 'created_at',
diff --git a/models/comment.js b/models/comment.js
index a855862d2..b2bd0367c 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -287,13 +287,12 @@ CommentSchema.statics.pushStatus = (id, status, assigned_by = null) => Comment.u
  * @param {String} action the new action to the comment
  * @return {Promise}
  */
-CommentSchema.statics.addAction = (item_id, user_id, action_type, field, detail) => Action.insertUserAction({
+CommentSchema.statics.addAction = (item_id, user_id, action_type, metadata) => Action.insertUserAction({
   item_id,
   item_type: 'comments',
   user_id,
   action_type,
-  field,
-  detail
+  metadata
 });
 
 /**
diff --git a/models/user.js b/models/user.js
index 287f57df2..d1be9e238 100644
--- a/models/user.js
+++ b/models/user.js
@@ -611,11 +611,10 @@ UserService.addBio = (id, bio) => (
  * @param {String} action the new action to the user
  * @return {Promise}
  */
-UserService.addAction = (item_id, user_id, action_type, field, detail) => Action.insertUserAction({
+UserService.addAction = (item_id, user_id, action_type, metadata) => Action.insertUserAction({
   item_id,
   item_type: 'users',
   user_id,
   action_type,
-  field,
-  detail
+  metadata
 });
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 90b8b40f2..e8181e116 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -187,12 +187,11 @@ router.post('/:comment_id/actions', (req, res, next) => {
 
   const {
     action_type,
-    field,
-    detail
+    metadata
   } = req.body;
 
   Comment
-    .addAction(req.params.comment_id, req.user.id, action_type, field, detail)
+    .addAction(req.params.comment_id, req.user.id, action_type, metadata)
     .then((action) => {
       res.status(201).json(action);
     })
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index 5b0c48de8..3288a196f 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -161,12 +161,11 @@ router.put('/:user_id/bio', (req, res, next) => {
 router.post('/:user_id/actions',  authorization.needed(), (req, res, next) => {
   const {
     action_type,
-    field,
-    detail
+    metadata
   } = req.body;
 
   User
-    .addAction(req.params.user_id, req.user.id, action_type, field, detail)
+    .addAction(req.params.user_id, req.user.id, action_type, metadata)
     .then((action) => {
       res.status(201).json(action);
     })
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 1d7ad5321..5e7045fb0 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -440,12 +440,13 @@ describe('/api/v1/comments/:comment_id/actions', () => {
       return chai.request(app)
         .post('/api/v1/comments/abc/actions')
         .set(passport.inject({id: '456', roles: ['admin']}))
-        .send({'action_type': 'flag', 'detail': 'Comment is too awesome.'})
+        .send({'action_type': 'flag', 'metadata': {'reason': 'Comment is too awesome.'}})
         .then((res) => {
           expect(res).to.have.status(201);
           expect(res).to.have.body;
           expect(res.body).to.have.property('action_type', 'flag');
-          expect(res.body).to.have.property('detail', 'Comment is too awesome.');
+          expect(res.body).to.have.property('metadata')
+            .and.to.deep.equal({'reason': 'Comment is too awesome.'});
           expect(res.body).to.have.property('item_id', 'abc');
         });
     });
diff --git a/tests/routes/api/user/index.js b/tests/routes/api/user/index.js
index 4c0c293d0..ad82b78bc 100644
--- a/tests/routes/api/user/index.js
+++ b/tests/routes/api/user/index.js
@@ -31,14 +31,16 @@ describe('/api/v1/users/:user_id/actions', () => {
       return chai.request(app)
         .post('/api/v1/users/abc/actions')
         .set(passport.inject({id: '456', roles: ['admin']}))
-        .send({'action_type': 'flag', 'detail': 'Bio is too awesome.'})
+        .send({'action_type': 'flag', 'metadata': {'reason': 'Bio is too awesome.'}})
         .then((res) => {
           expect(res).to.have.status(201);
           expect(res).to.have.body;
           expect(res.body).to.have.property('action_type', 'flag');
-          expect(res.body).to.have.property('detail', 'Bio is too awesome.');
+          expect(res.body).to.have.property('metadata')
+            .and.to.deep.equal({'reason': 'Bio is too awesome.'});
           expect(res.body).to.have.property('item_id', 'abc');
-        });
+        })
+        .catch(err => console.error(err.message));
     });
   });
 });

From 0235d262956c3588964e7ef5be15d1ae30dd1a51 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 20 Dec 2016 16:34:27 -0800
Subject: [PATCH 4/5] Correcting accidentally moved pager files.

---
 .../src/containers/Community}/Pager.css                           | 0
 .../src/containers/Community}/Pager.js                            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename client/{coral-plugin-flags => coral-admin/src/containers/Community}/Pager.css (100%)
 rename client/{coral-plugin-flags => coral-admin/src/containers/Community}/Pager.js (100%)

diff --git a/client/coral-plugin-flags/Pager.css b/client/coral-admin/src/containers/Community/Pager.css
similarity index 100%
rename from client/coral-plugin-flags/Pager.css
rename to client/coral-admin/src/containers/Community/Pager.css
diff --git a/client/coral-plugin-flags/Pager.js b/client/coral-admin/src/containers/Community/Pager.js
similarity index 100%
rename from client/coral-plugin-flags/Pager.js
rename to client/coral-admin/src/containers/Community/Pager.js

From 5e01fe402505ece6c37cd3989b15c8547fec66c4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 22 Dec 2016 11:01:59 -0800
Subject: [PATCH 5/5] Fixing bug in text box display.

---
 client/coral-embed-stream/style/default.css |  4 ++--
 client/coral-plugin-flags/FlagBio.js        |  2 +-
 client/coral-plugin-flags/FlagButton.js     | 15 +++++----------
 client/coral-plugin-flags/FlagComment.js    |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 20a5e02ac..28b2066e6 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -240,7 +240,7 @@ hr {
 .coral-plugin-flags-popup-radio-label {
   margin:5px;
   font-weight: 700;
-  font-size: 1.16rem;
+  font-size: .9rem;
 }
 
 .coral-plugin-flags-popup-counter {
@@ -254,7 +254,7 @@ hr {
     margin-top: 10px;
 }
 
-.coral-plugin-flags-other-text {
+.coral-plugin-flags-reason-text {
   margin-left: 20px;
   margin-top: 5px;
   width: 75%;
diff --git a/client/coral-plugin-flags/FlagBio.js b/client/coral-plugin-flags/FlagBio.js
index 90cc11a7a..edc0a5286 100644
--- a/client/coral-plugin-flags/FlagBio.js
+++ b/client/coral-plugin-flags/FlagBio.js
@@ -18,7 +18,7 @@ const getPopupMenu = [
         {val: 'other', text: lang.t('other')}
       ],
       button: lang.t('continue'),
-      sets: 'detail'
+      sets: 'reason'
     };
   },
   () =>  {
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 80a00a2d9..097ac9d5b 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -40,7 +40,7 @@ class FlagButton extends Component {
 
     // If itemType and reason are both set, post the action
     if (itemType && reason && !posted) {
-      
+
       // Set the text from the "other" field if it exists.
       let item_id;
       switch(itemType) {
@@ -71,11 +71,6 @@ class FlagButton extends Component {
 
   onPopupOptionClick = (sets) => (e) => {
 
-    // If the "other" option is clicked, show the other textbox
-    if(sets === 'reason' && e.target.value === 'other') {
-      this.setState({showOther: true});
-    }
-
     // If flagging a user, indicate that this is referencing the username rather than the bio
     if(sets === 'itemType' && e.target.value === 'user') {
       this.setState({field: 'username'});
@@ -93,7 +88,7 @@ class FlagButton extends Component {
     this.setState({[sets]: e.target.value});
   }
 
-  onOtherTextChange = (e) => {
+  onNoteTextChange = (e) => {
     this.setState({note: e.target.value});
   }
 
@@ -147,11 +142,11 @@ class FlagButton extends Component {
                   <label htmlFor={'note'} className={`${name}-popup-radio-label`}>
                     {lang.t('flag-reason')}
                   </label><br/>
-                <textarea
-                      className={`${name}-other-text`}
+                  <textarea
+                      className={`${name}-reason-text`}
                       id="note"
                       rows={4}
-                      onChange={this.onOtherTextChange}
+                      onChange={this.onNoteTextChange}
                       value={this.state.note}/>
                   </div>
                 }
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 4a2634b6c..57d02f719 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -36,7 +36,7 @@ const getPopupMenu = [
       header: lang.t('step-2-header'),
       options,
       button: lang.t('continue'),
-      sets: 'detail'
+      sets: 'reason'
     };
   },
   () =>  {