Skip to content

Commit 5b399c4

Browse files
authored
Merge pull request #941 from MarechJ/feat/include_id_in_colorfull_message
UI: Add column with colorfull name and IDs
2 parents c7660af + a3374ad commit 5b399c4

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

rcongui/src/components/shared/LogMessage.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getLogTeam, getTeamColor, removeLogPlayerIds } from "@/utils/lib";
33
import { Box } from "@mui/material";
44
import { Fragment } from "react";
55

6-
export const LogMessage = ({ log, colored = false, short = false }) => {
6+
export const LogMessage = ({ log, colored = false, short = false, include_ids = false }) => {
77
const output = [];
88
const teamPlayer1 = getLogTeam(log);
99
const teamPlayer2 =
@@ -12,8 +12,12 @@ export const LogMessage = ({ log, colored = false, short = false }) => {
1212
: teamPlayer1 === "Axis"
1313
? "Allies"
1414
: "Axis";
15-
let message = removeLogPlayerIds(log.message);
16-
15+
if (!include_ids || log.action === "MESSAGE") {
16+
var message = removeLogPlayerIds(log.message);
17+
} else {
18+
var message = log.message;
19+
}
20+
1721
message = message.split(log.player_name_1);
1822
// In between each element of the array, add the player link
1923
if (!short) {

rcongui/src/pages/views/live/logs-columns.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ export const logsColumns = [
152152
},
153153
{
154154
header: "Message",
155-
id: "message_colored",
155+
id: "message_with_id",
156156
accessorKey: "message",
157157
cell: ({ row }) => {
158-
return <LogMessage log={row.original} colored={true} />;
158+
return <LogMessage log={row.original} colored={true} include_ids = {true}/>;
159159
},
160160
},
161161
{

0 commit comments

Comments
 (0)