Team member update plus incident report layout tweaks

online-go · Nov 28, 2018 · 8726c90 · 8726c90
1 parent b7ebddd
commit 8726c90
Show file tree

Hide file tree

Showing 4 changed files with 438 additions and 1,375 deletions.
diff --git a/src/components/IncidentReportTracker/IncidentReportTracker.styl b/src/components/IncidentReportTracker/IncidentReportTracker.styl
@@ -47,6 +47,9 @@
         display: flex;
         justify-content: space-between;
         padding-top: 0.7rem;
+        .unclaimed {
+            font-style: italic;
+        }
     }
 
     .incident {
@@ -55,6 +58,10 @@
         border-bottom: 1px solid transparent;
         themed border-color shade3
 
+        h4.notes {
+            margin: 0.5em 0 0 0;
+        }
+
         .notes {
             user-select: text;
         }

diff --git a/src/components/IncidentReportTracker/IncidentReportTracker.tsx b/src/components/IncidentReportTracker/IncidentReportTracker.tsx
@@ -105,6 +105,7 @@ export class IncidentReportTracker extends React.PureComponent<IncidentReportTra
             report.set_note = (ev) => {
                 swal({
                     input: "text",
+                    inputValue: report.moderator_note,
                     showCancelButton: true,
                 })
                 .then((txt) => {
@@ -203,17 +204,21 @@ export class IncidentReportTracker extends React.PureComponent<IncidentReportTra
                         <div className="IncidentReportList-results">
                             {this.state.reports.map((report, idx) => (
                                 <div className="incident" key={report.id}>
+                                    <div className="spread">
+                                        {report.moderator ?
+                                            <Player user={report.moderator} icon />
+                                            :
+                                        <div className="unclaimed"> (unclaimed)</div>}
+                                    </div>
                                     {(report.reporter_note || null) && <h4 className="notes">{report.reporter_note}</h4>}
+
                                     {(report.system_note || null) && <h4 className="notes">{report.system_note}</h4>}
+
                                     <div className="notes"><i>{report.moderator_note || ""}</i></div>
 
-                                    {(report.moderator || null) &&
-                                        <div className="spread">
-                                            <Player user={report.moderator} icon />
-                                        </div>
-                                    }
                                     <div className="spread">
                                         {(report.url || null) && <a href={report.url} target="_blank">{report.url}</a>}
+
                                         {(report.reported_user || null) &&
                                             <span>{_("Reported user")}: <Player user={report.reported_user} icon /></span>
                                         }
@@ -225,6 +230,7 @@ export class IncidentReportTracker extends React.PureComponent<IncidentReportTra
                                         }
                                     </div>
 
+
                                     <div className="spread">
                                         {((!report.moderator && user.is_moderator) || null) &&
                                             <button className="primary xs" onClick={report.claim}>{_("Claim")}</button>
@@ -235,17 +241,17 @@ export class IncidentReportTracker extends React.PureComponent<IncidentReportTra
                                         {((!report.moderator && report.reporting_user && user.id === report.reporting_user.id) || null) &&
                                             <button className="reject xs" onClick={report.cancel}>{_("Cancel")}</button>
                                         }
-                                    </div>
 
-                                    {((report.moderator && user.is_moderator && user.id === report.moderator.id) || null) &&
-                                        <div className="spread">
-                                            <button className="success xs"  onClick={report.good_report}>{_("Good report")}</button>
-                                            <button className="info xs"  onClick={report.set_note}>{_("Note")}</button>
-                                            <button className="danger xs"  onClick={report.unclaim}>{_("Unclaim")}</button>
-                                            <button className="reject xs"  onClick={report.bad_report}>{_("Bad report")}</button>
-                                        </div>
-                                    }
 
+                                    {((report.moderator && user.is_moderator && user.id === report.moderator.id) || null) &&
+                                            <button className="success xs"  onClick={report.good_report}>{_("Good report")}</button>}
+                                    {((report.moderator && user.is_moderator && user.id === report.moderator.id) || null) &&
+                                            <button className="info xs"  onClick={report.set_note}>{_("Note")}</button>}
+                                    {((report.moderator && user.is_moderator && user.id === report.moderator.id) || null) &&
+                                            <button className="danger xs"  onClick={report.unclaim}>{_("Unclaim")}</button>}
+                                    {((report.moderator && user.is_moderator && user.id === report.moderator.id) || null) &&
+                                            <button className="reject xs"  onClick={report.bad_report}>{_("Bad report")}</button>}
+                                    </div>
                                     <div className="spread">
                                         {(report.reporting_user)
                                             ? <Player user={report.reporting_user} icon />

diff --git a/src/views/docs/Team.tsx b/src/views/docs/Team.tsx
@@ -79,7 +79,7 @@ export class Team extends React.PureComponent<{}, any> {
             {"id": 55415 , "username": "sousys"       , "country": ["se"] , "languages": [se, en]} ,
             {"id": 360861 , "username": "AdamR"       , "country": ["cz"] , "languages": [cz, en]} ,
             {"id": 299041 , "username": "Razza99"     , "country": ["gb"] , "languages": [en]} ,
-            {"id": 412892 , "username": "GreenAsJade" , "country": ["au"] , "languages": [en]} ,
+            {"id": 412892 , "username": "Eugene" , "country": ["au"] , "languages": [en]} ,
             {"id": 445315 , "username": "BHydden"     , "country": ["au"] , "languages": [en]} ,
             {"id": 391401 , "username": "Conrad Melville", "country": ["us"] , "languages": [en]} ,
         ];