Skip to content

Show the hosted lobby start countdown in the detailed lobby view ⏱️ - #5662

Merged
evanpelle merged 1 commit into
mainfrom
hosted-lobby-countdown-detailed-view
Sep 25, 2026
Merged

evanpelle merged 1 commit into
mainfrom
hosted-lobby-countdown-detailed-view

Conversation

@FloPinguin

Copy link
Copy Markdown
Contributor

Description:

Probably makes sense to put that in the next v34 patch:
Show the actual time instead of "waiting for players":

image

AI Description

In the detailed lobby view (upcoming games), hosted lobbies showed "Waiting for players" until the host pressed Start. The "Open lobbies" list in the join modal already shows a countdown for these lobbies, using the auto-start deadline the server sends for every listed lobby.

The detailed view now uses the same start time as the join modal: the host's Start countdown if it has been started, otherwise the listing's auto-start deadline. Hosted and featured lobbies now show a countdown (e.g. "4min 30s") there too. The time pill also keeps its normal casing for these countdowns, so it no longer reads "4MIN 30S".

Scheduled public lobbies and paid-queued lobbies are unchanged. They still show their countdown or queue position.

Please complete the following:

  • I have added screenshots for all UI updates
  • I process any text displayed to the user through translateText() and I've added it to the en.json file
  • I have added relevant tests to the test directory

Please put your Discord username so you can be contacted if a bug or regression is found:

FloPinguin

@FloPinguin FloPinguin added this to the v34 milestone Sep 25, 2026
@FloPinguin
FloPinguin requested a review from a team as a code owner September 25, 2026 15:42
@FloPinguin FloPinguin added the UI/UX UI/UX changes including assets, menus, QoL, etc. label Sep 25, 2026
@coderabbitai

coderabbitai Bot commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 087151e5-71a3-4c01-8ab9-d9724b77a814

📥 Commits

Reviewing files that changed from the base of the PR and between 22722df and badb0bb.

📒 Files selected for processing (1)
  • src/client/components/DetailedGameViewModal.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


Walkthrough

The lobby card now displays a countdown using startsAt, or autoStartAt when startsAt is absent. When neither timestamp exists, the existing waiting and queue-position display remains unchanged.

Changes

Lobby start-time countdown

Layer / File(s) Summary
Select and display the start timestamp
src/client/components/DetailedGameViewModal.ts
renderCard selects startsAt or autoStartAt and passes the result to timeDisplay. The countdown uses the selected timestamp. Uppercase formatting applies only when neither timestamp is defined.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Feature

Suggested reviewers: evanpelle

Merge Risk: ⚪ Minimal · up to badb0

The detailed lobby view now shows the hosted listing’s auto-start countdown when no host start time is set. The inspected timestamp contract is compatible, and no material merge risk is established.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the main change: showing the hosted lobby start countdown in the detailed lobby view.
Description check ✅ Passed The description directly explains the countdown behavior, affected lobby types, unchanged behavior, UI casing, tests, and screenshot coverage.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

A lobby clock now finds its start,
First scheduled time, then backup part.
With neither time, the old words stay,
The queue still shows its place today.
A simple countdown marks the way.

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Claude Code Review

Verdict: No issues found — 0 findings (0 high, 0 medium, 0 low).

Checked for bugs and CLAUDE.md compliance. The change mirrors the existing startsAt ?? autoStartAt logic in JoinLobbyModal.ts. Paid-queued lobbies stay unchanged because ListingState.autoStartAt() returns undefined once a lobby is queued, so they still show their queue position. No new user-visible strings were added, and src/core is not touched.

@evanpelle
evanpelle merged commit 5f26cb7 into main Sep 25, 2026
19 checks passed
@evanpelle
evanpelle deleted the hosted-lobby-countdown-detailed-view branch September 25, 2026 20:12
evanpelle added a commit that referenced this pull request Sep 25, 2026
## Summary
- The cherry-pick workflow from #5658 can't write to release branches.
The `Baseline branch protection` and `Versioned branches` rulesets
require a PR for every change to `v[0-9]*`. So the clean pick of #5662
was rejected on push
([run](https://github.com/openfrontio/OpenFrontIO/actions/runs/36184368166)),
and a conflict PR opened with `GITHUB_TOKEN` would never run its six
required checks.
- Pushes and the backport PR now use a token from a dedicated backport
GitHub App, which goes on those rulesets' bypass lists. Clean picks push
straight to `vNN`. Conflict resolutions still go through a PR, which now
runs CI because it isn't opened by `GITHUB_TOKEN`.
- Why a new app instead of the existing OpenFrontIO one: that app's key
is used by `deploy.yml`, which anyone with write access can run on any
branch. Adding it to the bypass list would let them push to `main`
unreviewed. The new app's key lives only in a `backport` environment
limited to `main`.
- The backport PR now carries the `vNN` milestone, for the Has Milestone
check.
- Any other failure now comments on the source PR with the run link. The
rejected #5662 push was silent.

## Setup needed before merge
1. Create a GitHub App in the org (e.g. `openfront-backport`) with
repository permissions **Contents: write** and **Pull requests: write**,
installed on OpenFrontIO only. Add **Workflows: write** if backports
that touch `.github/workflows` should go through; without it, those
picks fail and get reported on the PR.
2. Create environment `backport` with deployment branches limited to
`main`. Give it variable `BACKPORT_APP_CLIENT_ID` and secret
`BACKPORT_APP_PRIVATE_KEY`.
3. Add the app to the bypass list of both `Baseline branch protection`
and `Versioned branches`.

## Test plan
- YAML parses. `actionlint` is clean except for a stale-metadata error
on `client-id`, which `deploy.yml` also triggers; `client-id` is a real
v3 input (checked the action's `action.yml`).
- The pick logic is unchanged from #5658. It was tested locally against
real `v34`, and both real runs so far behaved as designed up to the
push. #5665's conflict was correctly declined, because it depends on
#5656, which isn't on v34.
- After setup, remove and re-add the `v34` milestone on #5662 to re-run
it with this workflow.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@evanpelle evanpelle modified the milestones: v34, Backlog Sep 25, 2026
evanpelle added a commit that referenced this pull request Sep 25, 2026
## Summary
- The job's `concurrency: cherry-pick-<milestone>` group was meant to
make picks to the same release branch wait their turn. But GitHub keeps
only **one pending run per group** and cancels the others. When #5669,
#5662 and a third v34 PR merged within a minute, #5662's queued run was
cancelled
([run](https://github.com/openfrontio/OpenFrontIO/actions/runs/36193340148)).
A cancelled run never reaches the failure-report step, so nothing said
the pick was lost.
- Removed the concurrency group. "Push clean pick" now retries up to 5
times: on a rejected push it fetches the release branch, rebases the
pick onto it, and pushes again. If the rebase leaves nothing to push
because another run already landed the same PR, it exits cleanly. After
5 failures the job fails and the existing step comments on the PR.
- Conflict picks are unaffected. They push to their own
`cherry-pick/vNN/pr-N` branch, not the release branch.

## Test plan
- `actionlint`: nothing new. The only errors left are the stale-metadata
`client-id` one and info-level SC2016.
- Simulated the race on a throwaway repo, with `gh` stubbed:
- Two different picks pushing at once: the second is rejected, rebases
and lands, and the release branch ends up with both.
- The same PR picked twice: the second exits 0 with "landed from another
run" and pushes nothing.
- After merge, re-add the `v34` milestone on #5662, which still isn't on
v34.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@evanpelle evanpelle modified the milestone: v34 Sep 25, 2026
openfront-backport Bot pushed a commit that referenced this pull request Sep 25, 2026
…5662)

## Description:

Probably makes sense to put that in the next v34 patch:
Show the actual time instead of "waiting for players":

<img width="863" height="383" alt="image"
src="https://github.com/user-attachments/assets/0272107a-2356-4b93-96cf-43f37e014076"
/>

### AI Description

In the detailed lobby view (upcoming games), hosted lobbies showed
"Waiting for players" until the host pressed Start. The "Open lobbies"
list in the join modal already shows a countdown for these lobbies,
using the auto-start deadline the server sends for every listed lobby.

The detailed view now uses the same start time as the join modal: the
host's Start countdown if it has been started, otherwise the listing's
auto-start deadline. Hosted and featured lobbies now show a countdown
(e.g. "4min 30s") there too. The time pill also keeps its normal casing
for these countdowns, so it no longer reads "4MIN 30S".

Scheduled public lobbies and paid-queued lobbies are unchanged. They
still show their countdown or queue position.

## Please complete the following:

- [X] I have added screenshots for all UI updates
- [X] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [X] I have added relevant tests to the test directory

## Please put your Discord username so you can be contacted if a bug or
regression is found:

FloPinguin

(cherry picked from commit 5f26cb7)
@github-actions

Copy link
Copy Markdown
Contributor

🍒 Cherry-picked onto v34 as fb72dbe.

This branch was successfully deployed

1 active and 1 inactive deployments
backport — badb0bb0 Deployed Sep 25, 2026 by evanpelle via Cherry-pick #12
staging — badb0bb0 Deployed Sep 25, 2026 by openfrontio[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

UI/UX UI/UX changes including assets, menus, QoL, etc.

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

2 participants