From 6f3b08ccb2c5635d269bb57ca9f1b7115ed8e5da Mon Sep 17 00:00:00 2001 From: shinuito <26803867+shinuito@users.noreply.github.com> Date: Fri, 18 Mar 2022 01:16:50 +0000 Subject: [PATCH 1/3] Update Ladder.tsx Add in button to go to group page from the ladder. --- src/views/Ladder/Ladder.tsx | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/Ladder/Ladder.tsx b/src/views/Ladder/Ladder.tsx index ffc56c82c4..5e1755f409 100644 --- a/src/views/Ladder/Ladder.tsx +++ b/src/views/Ladder/Ladder.tsx @@ -23,6 +23,7 @@ import * as data from "data"; import { List, AutoSizer } from "react-virtualized"; import { Player } from "Player"; import { UIPush } from "UIPush"; +import { shouldOpenNewTab } from "misc"; import { PlayerAutocomplete } from "PlayerAutocomplete"; import { close_all_popovers, popover } from "popover"; import { browserHistory } from "ogsHistory"; @@ -132,8 +133,20 @@ export class Ladder extends React.PureComponent { } }; + goToGroup = (ev) => { + close_all_popovers(); + + const url: string = "/group/" + this.state.ladder?.group.id; + if (shouldOpenNewTab(ev)) { + window.open(url, "_blank"); + } else { + browserHistory.push(url); + } + }; + render() { const user = data.get("user"); + const group_text = pgettext("Go to the main page for this group.", "Group Page"); return (
@@ -145,6 +158,13 @@ export class Ladder extends React.PureComponent { />
+

{this.state.ladder && this.state.ladder.name}

Date: Fri, 18 Mar 2022 01:41:33 +0000 Subject: [PATCH 2/3] Update Ladder.tsx Conditionally render the group button, so it doesn't show up on site ladders. --- src/views/Ladder/Ladder.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/Ladder/Ladder.tsx b/src/views/Ladder/Ladder.tsx index 5e1755f409..2fa8abf9b1 100644 --- a/src/views/Ladder/Ladder.tsx +++ b/src/views/Ladder/Ladder.tsx @@ -158,13 +158,14 @@ export class Ladder extends React.PureComponent { />
- + )}

{this.state.ladder && this.state.ladder.name}

Date: Fri, 18 Mar 2022 01:51:52 +0000 Subject: [PATCH 3/3] Update Ladder.tsx Take out console.log and run prettier --- src/views/Ladder/Ladder.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/Ladder/Ladder.tsx b/src/views/Ladder/Ladder.tsx index 2fa8abf9b1..5e4e0acbe4 100644 --- a/src/views/Ladder/Ladder.tsx +++ b/src/views/Ladder/Ladder.tsx @@ -158,14 +158,15 @@ export class Ladder extends React.PureComponent { />
- {console.log(this.state.ladder)} - {this.state.ladder && this.state.ladder?.group !== null && ()} + {this.state.ladder && this.state.ladder?.group !== null && ( + + )}

{this.state.ladder && this.state.ladder.name}