Skip to content

Hide broadcast results in the single board view #16799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 21, 2025
Merged

Hide broadcast results in the single board view #16799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aa3e1d7
add a specific Conceal behaviour for broadcast
yafred Jan 18, 2025
0eeb086
prettier
yafred Jan 18, 2025
b1e0982
always display result on last ply
yafred Jan 18, 2025
242f889
use verbs for some boolean
yafred Jan 18, 2025
4f8adaa
prettier
yafred Jan 18, 2025
644aaaf
some non-mainline info were still visible
yafred Jan 19, 2025
2378b57
Merge branch 'master' into issue-16786-hide-results-in-single-board-view
ornicar Jan 21, 2025
23b4511
use common/defined
ornicar Jan 21, 2025
1e31613
remove superfluous check
ornicar Jan 21, 2025
a94bdc9
only compute `ctrl.tree.lastPly()` when necessary
ornicar Jan 21, 2025
49398eb
remove superfluous checks
ornicar Jan 21, 2025
589d255
pnpm format
ornicar Jan 21, 2025
ce7d9fc
remove unnecessary new analyse treeView ctx.onlyHide
ornicar Jan 21, 2025
79781f7
remove `hideIndex` from study columnView
ornicar Jan 21, 2025
96ac74a
only display and use playing/results toggles in relay studies
ornicar Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ui/analyse/src/study/multiBoard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,26 @@ import { type StudyChapters, gameLinkAttrs, gameLinksListener } from './studyCha
import { playerFed } from './playerBars';
import { userTitle } from 'common/userLink';
import { h } from 'snabbdom';
import { storage, storedBooleanProp, StoredProp } from 'common/storage';
import { storage, storedBooleanProp } from 'common/storage';
import { Chessground as makeChessground } from 'chessground';
import { EMPTY_BOARD_FEN } from 'chessops/fen';

export class MultiBoardCtrl {
playing: Toggle;
showResults: StoredProp<boolean>;
showResults: Prop<boolean>;
teamSelect: Prop<string> = prop('');
page: number = 1;
maxPerPageStorage = storage.make('study.multiBoard.maxPerPage');

constructor(
readonly chapters: StudyChapters,
readonly isRelay: boolean,
readonly multiCloudEval: MultiCloudEval | undefined,
private readonly initialTeamSelect: ChapterId | undefined,
readonly redraw: () => void,
) {
this.playing = toggle(false, this.redraw);
this.showResults = storedBooleanProp('study.showResults', true);
this.showResults = this.isRelay ? storedBooleanProp('study.showResults', true) : toggle(true);
if (this.initialTeamSelect) this.onChapterChange(this.initialTeamSelect);
}

Expand Down Expand Up @@ -104,8 +105,8 @@ export function view(ctrl: MultiBoardCtrl, study: StudyCtrl): MaybeVNode {
h('div.study__multiboard__options', [
ctrl.multiCloudEval &&
h('label.eval', [renderEvalToggle(ctrl.multiCloudEval), i18n.study.showEvalBar]),
renderPlayingToggle(ctrl),
renderShowResultsToggle(ctrl),
ctrl.isRelay ? renderPlayingToggle(ctrl) : undefined,
ctrl.isRelay ? renderShowResultsToggle(ctrl) : undefined,
]),
]),
!ctrl.showResults()
Expand Down
7 changes: 6 additions & 1 deletion ui/analyse/src/study/playerBars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { userTitle } from 'common/userLink';
import RelayPlayers, { fidePageLinkAttrs } from './relay/relayPlayers';
import { StudyCtrl } from './studyDeps';
import { intersection } from 'tree/path';
import { defined } from 'common';

export default function (ctrl: AnalyseCtrl): VNode[] | undefined {
const study = ctrl.study;
Expand Down Expand Up @@ -55,11 +56,15 @@ function renderPlayer(
showRatings: boolean,
relayPlayers?: RelayPlayers,
): VNode {
const showResult: boolean =
!defined(ctrl.study?.relay) ||
ctrl.study?.multiBoard.showResults() ||
ctrl.node.ply == ctrl.tree.lastPly();
const player = players?.[color],
fideId = parseInt(findTag(tags, `${color}fideid`) || ''),
team = findTag(tags, `${color}team`),
rating = showRatings && player?.rating,
result = resultOf(tags, color === 'white'),
result = showResult && resultOf(tags, color === 'white'),
top = ctrl.bottomColor() !== color;
return h(`div.study__player.study__player-${top ? 'top' : 'bot'}`, { class: { ticking } }, [
h('div.left', [
Expand Down
1 change: 1 addition & 0 deletions ui/analyse/src/study/studyCtrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export default class StudyCtrl {
);
this.multiBoard = new MultiBoardCtrl(
this.chapters.list,
defined(this.relay),
this.multiCloudEval,
this.relay?.tourShow() ? undefined : this.data.chapter.id,
this.redraw,
Expand Down
11 changes: 11 additions & 0 deletions ui/analyse/src/view/components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,17 @@ export function makeChatEl(ctrl: AnalyseCtrl, insert: (chat: HTMLElement) => voi
}

function makeConcealOf(ctrl: AnalyseCtrl): ConcealOf | undefined {
if (defined(ctrl.study?.relay)) {
if (!ctrl.study.multiBoard.showResults()) {
return (isMainline: boolean) => (path: Tree.Path, node: Tree.Node) => {
if (isMainline && ctrl.node.ply >= node.ply) return null;
if (treePath.contains(ctrl.path, path)) return null;
return 'hide';
};
}
return undefined;
}

const conceal =
ctrl.study && ctrl.study.data.chapter.conceal !== undefined
? {
Expand Down
Loading