Merge pull request #127 from tremors0/report-find-agent-in-message

Report find agent in report

Secret-agency-web/src/main/react/secret-agency/src/App.tsx

@@ -7,7 +7,7 @@ import * as secretAgencyRepository from "./repository/secretAgecyRepository";
 import {IAgent} from "./types/Agent";
 import {TopBar} from "./components/top-bar/TopBar"
 import {AgentsPage} from "./components/agents-page/AgentsPage";
-import {BrowserRouter, Route} from "react-router-dom";
+import {BrowserRouter, Redirect, Route} from "react-router-dom";
 import {DepartmentsPage} from "./components/departments-page/DepartmentsPage";
 import {ROUTING_URL_BASE} from "./utils/requestUtils";
 import {ReportsPage} from "./components/reports-page/ReportsPage";
@@ -152,6 +152,7 @@ class App extends React.Component<{}, IState> {
                         )} />
                         <Route path={`${ROUTING_URL_BASE}/reports/report/:reportId`} component={ReportDetail}/>
                     </div>
+                    <Redirect to={`${ROUTING_URL_BASE}/reports`}/>
                 </div>
             </BrowserRouter>
         );

Secret-agency-web/src/main/react/secret-agency/src/components/reports-page/ReportDetail.css

@@ -19,4 +19,8 @@
 
 .ReportDetail__img {
     margin-right: 100px;
+}
+
+.ReportDetail__textWrapper {
+    margin-bottom: 10px;
 }

Secret-agency-web/src/main/react/secret-agency/src/components/reports-page/ReportDetail.tsx

@@ -8,6 +8,7 @@ import {Alert, Button, FormControl, FormGroup} from "react-bootstrap";
 import {Link} from "react-router-dom";
 import {ROUTING_URL_BASE} from "../../utils/requestUtils";
 import {AlertCloseable} from "../alert-closeable/AlertCloseable";
+import {IAgent} from "../../types/Agent";
 
 // easiest way, how to add image to page
 const topSecretImgSrc = "https://vignette.wikia.nocookie.net/uncyclopedia/images/2/25/Top_Secret_Stamp.png" +
@@ -20,6 +21,7 @@ interface IReportDetailState {
     readonly submitError: string;
     readonly serverError: string;
     readonly wasSaved: boolean;
+    readonly mentionedAgentsInReport: IAgent[] | null;
 }
 
 type IProps = RouteComponentProps<{reportId: string}>;
@@ -42,6 +44,19 @@ export class ReportDetail extends React.PureComponent<IProps, IState> {
         this.setState(prevState => ({...prevState, text , submitError: ""}));
     };
 
+    private onFindMentionedAgents = async () => {
+        // already run
+        if (this.state.mentionedAgentsInReport != null) {
+            return;
+        }
+        const response = await reportService.getAgentsMentionedInReport(this.displayedReport.id);
+        if (typeof response === "string") {
+            this.setState(prevState => ({...prevState, serverError: response}));
+            return;
+        }
+
+        this.setState(prevState => ({...prevState, mentionedAgentsInReport: response}));
+    };
 
     private onSaveClicked = async (): Promise<void> => {
         if (this.state.text.trim().length < 10) {
@@ -87,6 +102,7 @@ export class ReportDetail extends React.PureComponent<IProps, IState> {
             submitError: "",
             serverError: "",
             wasSaved: false,
+            mentionedAgentsInReport: null,
         }
     }
 
@@ -104,6 +120,20 @@ export class ReportDetail extends React.PureComponent<IProps, IState> {
         this.setState(prevState => ({...prevState, text: response.text, isLoading: false}));
     }
 
+    private getFindAgentsResult(): null | JSX.Element |JSX.Element[] {
+        if (this.state.mentionedAgentsInReport == null) {
+            return null;
+        }
+
+        if (this.state.mentionedAgentsInReport.length === 0) {
+            return <Alert bsStyle={"info"}>No agents found</Alert>;
+        }
+
+        return this.state.mentionedAgentsInReport.map((agent) => (
+            <div className={"ReportDetail__findAgentsResult"} key={agent.id}>{agent.codeName}</div>
+        ));
+    }
+
     /********************************************************
      * RENDERING
      *******************************************************/
@@ -151,9 +181,16 @@ export class ReportDetail extends React.PureComponent<IProps, IState> {
                     </div>
                     <img title={'Top-secret'} src={topSecretImgSrc} alt={'Top secret logo'} className={"ReportDetail__img"}/>
                 </div>
-                <div>Text: {textComponent}</div>
+                <div className={"ReportDetail__textWrapper"}>Text: {textComponent}</div>
                 {this.state.wasSaved && <p className={"text-success"}>Report was successfully updated</p>}
                 {this.isEditingMode() && <Button bsStyle={"primary"} onClick={this.onSaveClicked}>Save</Button>}
+                {this.getFindAgentsResult()}
+                {!this.isEditingMode() && (
+                    <Button className={"ReportDetail__findAgentsButton"}
+                            bsStyle={"warning"} onClick={this.onFindMentionedAgents}>
+                        Find mentioned agents
+                    </Button>
+                )}
             </div>
         )
     }

Secret-agency-web/src/main/react/secret-agency/src/components/reports-page/ReportFilter.tsx

@@ -91,7 +91,7 @@ export class ReportFilter extends React.PureComponent<IProps, IState> {
                 result = await reportService.getAllReports();
                 break;
             case SEARCH_BY_STATUS:
-                result = await reportService.getreportsWithStatus(this.state.reportStatus);
+                result = await reportService.getReportsWithStatus(this.state.reportStatus);
                 break;
             case SEARCH_BY_RESULT:
                 result = await reportService.getReportsWithResult(this.state.reportResult);

Secret-agency-web/src/main/react/secret-agency/src/components/reports-page/ReportsPage.tsx

@@ -161,7 +161,9 @@ export class ReportsPage extends React.PureComponent<IProps, IState> {
         // authenticated agent is not admin or Report author
         return (
             <div className={'ReportsPage__actions'}>
-                <Button bsStyle={'info'}>View</Button>
+                <span className={"icon-operation"} onClick={() => this.onShowDetail(report.id)}>
+                    <FontAwesomeIcon icon={faSearch} size={"2x"} />
+                </span>
             </div>
         );
     }

Secret-agency-web/src/main/react/secret-agency/src/services/reportService.ts

@@ -1,6 +1,7 @@
 import {IReport, IReportCreate, IReportUpdate} from "../types/Report";
 import {DELETE, GET, POST, PUT, REST_URL_BASE} from "../utils/requestUtils";
 import {AxiosError} from "axios";
+import {IAgent} from "../types/Agent";
 
 
 export function getAllReports(): Promise<IReport[]> {
@@ -101,10 +102,19 @@ export function getReportsWithResult(result: string): Promise<IReport[] | string
 }
 
 // /reportStatus/{reportStatus}
-export function getreportsWithStatus(status: string,): Promise<IReport[] | string> {
+export function getReportsWithStatus(status: string,): Promise<IReport[] | string> {
     return GET<IReport[]>(`${REST_URL_BASE}/reports/reportStatus/${status}`).then((response) => {
         return response.data;
     }).catch((error: AxiosError) => {
         return error.response ? error.response.data.message : error.message;
     });
+}
+
+// /report/{reportId}/mentionedAgents
+export function getAgentsMentionedInReport(reportId: number): Promise<IAgent[] | string> {
+    return GET<IReport[]>(`${REST_URL_BASE}/reports/report/${reportId}/mentionedAgents`).then((response) => {
+        return response.data;
+    }).catch((error: AxiosError) => {
+        return error.response ? error.response.data.message : error.message;
+    });
 }