Skip to content

ui: scoreboard: virtual-scroll #566

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ui: scoreboard: virtual-scroll #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c996d
ui: scoreboard: virtual-scroll
undefined-moe Apr 28, 2023
c0cfa13
update packages
undefined-moe Apr 29, 2023
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
1 change: 1 addition & 0 deletions packages/ui-default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"chalk": "^5.2.0",
"classnames": "^2.3.2",
"clipboard": "^2.0.11",
"clusterize.js": "^1.0.0",
"cordis": "^2.7.4",
"diff": "^5.1.0",
"diff-dom": "^5.0.4",
Expand Down
45 changes: 32 additions & 13 deletions packages/ui-default/pages/contest_scoreboard.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import Clusterize from 'clusterize.js';
import $ from 'jquery';
import { NamedPage } from 'vj/misc/Page';
import { pjax } from 'vj/utils';

const page = new NamedPage('contest_scoreboard', () => {
const { tdoc } = UiContext;
const key = `scoreboard-star/${tdoc.domainId}/${tdoc.docId}`;
const read = () => JSON.parse(localStorage.getItem(key) || '[]');
const read = () => JSON.parse(localStorage.getItem(key) || '[]').map((i) => +i);
const write = (data) => localStorage.setItem(key, JSON.stringify(data));

read().forEach((uid) => $(`.star.user--${uid}`).addClass('activated'));
Expand All @@ -23,22 +24,40 @@ const page = new NamedPage('contest_scoreboard', () => {
write(star);
});

const rows: Record<number, string> = {};
const total = [];
let nowRendering = [];
const unrank = [];
for (const line of $('.data-table tbody tr')) {
const uid = +$(line).find('[data-uid]').data('uid');
line.style.display = 'table-row';
rows[uid] = line.outerHTML;
nowRendering.push(uid);
total.push(uid);
if ($(line).find('.rank--unrank').length) unrank.push(uid);
$(line).remove();
}

const virtualizedList = new Clusterize({
rows: nowRendering.map((i) => rows[i]),
scrollElem: $('.data-table').get(0),
contentElem: $('tbody').get(0),
});

$('.select.filter').on('change', (e) => {
const val = $(e.target).val();
if (val === 'all') {
$('.data-table tbody tr').show();
} else if (val === 'star') {
$('.data-table tbody tr').hide();
read().forEach((uid) => $(`.star.user--${uid}`).closest('tr').show());
} else if (val === 'rank') {
$('.data-table tbody tr').show();
$('.rank--unrank').closest('tr').hide();
} else {
$('.data-table tbody tr').hide();
if (val === 'all') nowRendering = total;
else if (val === 'star') nowRendering = read();
else if (val === 'rank') nowRendering = total.filter((i) => !unrank.includes(i));
else {
nowRendering = [];
const uids = val.toString().split(',').map((i) => +i.trim()).filter((i) => i);
if (!uids?.length) return;
uids.forEach((uid) => $(`.user--${uid}`).closest('tr').show());
for (const uid of total) {
if (!uids.includes(+uid)) continue;
nowRendering.push(uid);
}
}
virtualizedList.update(nowRendering.map((i) => rows[i]));
});

const beginAt = new Date(UiContext.tdoc.beginAt).getTime();
Expand Down
81 changes: 45 additions & 36 deletions packages/ui-default/templates/partials/scoreboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,41 @@
</a>
{% endmacro %}

{% macro scoreboardRow(row) %}
{%- for column in row -%}
<td class="col--{{ rows[0][loop.index0]['type'] }}"{% if column.style %} style="{{ column.style }}"{% endif %}>
{%- if column.type == 'rank' -%}
<span class="{{ 'rank--unrank' if column.value == '0' else 'rank--normal' }}">{{ '*' if column.value == '0' else column.value|string|nl2br|safe }}</span>
{%- elif column.type == 'user' -%}
{%- set canView = canViewAll or handler.user._id == column.raw -%}
<button class="star user--{{ column.raw }}" data-uid="{{ column.raw }}">
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
</button>
{{ user.render_inline(udict[column.raw], badge=false) }}
{%- elif column.type == 'record' and column.raw -%}
<a href="{{ url('record_detail', rid=column.raw) if canView else '' }}"{% if column.hover %} data-tooltip="{{ column.hover }}"{% endif %}>
<span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|string|nl2br|safe }}</span>
</a>
{%- elif column.type == 'records' -%}
{%- for record in column.raw -%}
{%- if loop.index0 -%}/{%- endif -%}
{%- if record.raw -%}
<a href="{{ url('record_detail', rid=record.raw) if canView else '' }}">
{%- set _color = utils.status.getScoreColor(record.score|default(record.value)) -%}
<span style="font-weight:bold;color:{{ _color }}">{{ record.value|string|nl2br|safe }}</span>
</a>
{%- else -%}
{{ record.value|string|nl2br|safe }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
<span{% if column.hover %} data-tooltip="{{ column.hover }}"{% endif %}>{{ column.value|string|nl2br|safe }}</span>
{%- endif -%}
</td>
{%- endfor -%}
{% endmacro %}

<div data-fragment-id="scoreboard">
{% if model.contest.isLocked(tdoc) %}
<div class="section__body no-padding">
Expand Down Expand Up @@ -42,42 +77,16 @@
</thead>
<tbody>
{%- set canViewAll = handler.user.own(tdoc) or model.contest.canShowRecord.call(handler, tdoc) -%}
{%- for row in rows -%}{%- if loop.index0 > 0 -%}
<tr>
{%- for column in row -%}
<td class="col--{{ rows[0][loop.index0]['type'] }}"{% if column.style %} style="{{ column.style }}"{% endif %}>
{%- if column.type == 'rank' -%}
<span class="{{ 'rank--unrank' if column.value == '0' else 'rank--normal' }}">{{ '*' if column.value == '0' else column.value|string|nl2br|safe }}</span>
{%- elif column.type == 'user' -%}
{%- set canView = canViewAll or handler.user._id == column.raw -%}
<button class="star user--{{ column.raw }}" data-uid="{{ column.raw }}">
<span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
<span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
</button>
{{ user.render_inline(udict[column.raw], badge=false) }}
{%- elif column.type == 'record' and column.raw -%}
<a href="{{ url('record_detail', rid=column.raw) if canView else '' }}" data-tooltip="{{ column.hover }}">
<span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|string|nl2br|safe }}</span>
</a>
{%- elif column.type == 'records' -%}
{%- for record in column.raw -%}
{%- if loop.index0 -%}/{%- endif -%}
{%- if record.raw -%}
<a href="{{ url('record_detail', rid=record.raw) if canView else '' }}">
{%- set _color = utils.status.getScoreColor(record.score|default(record.value)) -%}
<span style="font-weight:bold;color:{{ _color }}">{{ record.value|string|nl2br|safe }}</span>
</a>
{%- else -%}
{{ record.value|string|nl2br|safe }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
<span data-tooltip="{{ column.hover }}">{{ column.value|string|nl2br|safe }}</span>
{%- endif -%}
</td>
{%- endfor -%}
</tr>
{%- endif -%}{%- endfor -%}
{%- for row in rows -%}
{%- if loop.index0 == 1001 -%}
{{ noscript_note.render() }}
{%- endif -%}
{%- if loop.index0 > 1000 -%}
<tr style="display:none">{{ scoreboardRow(row) }}</tr>
{%- elif loop.index0 > 0 -%}
<tr>{{ scoreboardRow(row) }}</tr>
{%- endif -%}
{%- endfor -%}
</tbody>
</table>
</div>
Expand Down