Skip to content

Sync page: one cloud ladder, and Cloud Server starts by itself once paid - #2072

Closed
joepio wants to merge 6 commits into
developfrom
claude/project-thread-suyp37
Closed

joepio wants to merge 6 commits into
developfrom
claude/project-thread-suyp37

Conversation

@joepio

@joepio joepio commented Oct 5, 2026 •

Copy link
Copy Markdown
Member

Requested by Joep · project thread

Before: The cloud card on the Sync page opened with an "Atomic Place" row that read like a service ("Your Cloud Server subscription is active"). Cloud Vault and Cloud Server sat below it as two separate products, each drawn and worded differently. A drive with a paid Server plan still showed "Finish Cloud Server setup", and the setup went through a consent dialog.

After: The card opens with an atomic.place account header: icon, email, "Email recovery on" and Manage account. Below it, "Your plan" lists Cloud Vault and then Cloud Server, the step up that includes it. Both are drawn by one component, so every state reads the same way:

  • the name, with a Current, Included or Offered badge
  • one fixed sentence saying what the service is
  • what you get, while it is off
  • one status line with a coloured dot
  • the actions, primary first

The states:

  • Cloud Vault on: "Backed up 32 min ago · 75 objects".
  • Paid plan, or enrolled but not yet switched on this device: Cloud Server starts by itself, with "Moving this workspace to Cloud Server…". If that fails, the status line shows the reason and there is a Try again button.
  • A plan nobody bought (an admin grant): Offered. A notice says hosting stores a readable, unencrypted copy, and the action is Turn on Cloud Server.
  • No plan: the selling points and Upgrade to Cloud Server, which goes to that drive's billing.

Button wording follows one pattern: Turn on Cloud Vault, Turn on Cloud Server, Upgrade to Cloud Server, Manage plan, Try again. The copy says workspace throughout, and PRODUCT_NAME is now atomic.place. The email recovery row only appears when it needs you. The managed node is listed under Devices again with every other server: the plan card answers what you pay for, Devices answers where the drive syncs.

How: new components/Cloud/ServiceRow.tsx; VaultPanel and the Cloud Server row both render through it. SyncRoute derives one serverRow state (on, copied, moving, failed, offered, off) from the drive's enrollment and the new source field on /api/billing/subscription (ontola/atomic-saas#186: adds paid vs granted to the subscription response). A missing source counts as a grant, so an older control plane asks for consent rather than hosting silently. The automatic start reuses backupToCloud in an auto mode that never opens a sign-in window or redirects to checkout. The consent dialog is removed. The icons, backup line and selling points come from #1892 (Polle's side-by-side plan cards). The change is recorded in planning/sync-onboarding-ux.md; Flutter has no plan UI. sync-devices.spec.ts now expects "Upgrade to Cloud Server".

This overlaps with #2065 (drive-scoped Cloud Server status for every member) in SyncRoute.tsx; whichever merges second rebases. The "Finish setup" failure on node1 (commits 404 while the parent drive is missing) is being fixed separately; this PR only removes the button.

Screenshots of the real app (Vite plus a local server, control plane mocked in Playwright) for six states, at desktop and 390px, are in the project thread.

joepio added 2 commits October 5, 2026 13:14
The cloud card now opens with the atomic.place account as a header (email,
recovery, Manage account) instead of a row that read like a service. Below it
the drive sits on one ladder: on this device, Cloud Vault, Cloud Server, so
Cloud Server reads as the step up from the vault rather than a second
product.

There is no "Finish Cloud Server setup" any more. A drive whose plan was
paid, or that is enrolled but not yet switched over on this device, starts
Cloud Server by itself and shows a "Moving this drive" state; a failure says
why and offers Try again. The one case that still asks is a plan nobody
bought, such as Cloud Server added by hand: it shows what hosting stores
unencrypted and waits for Accept. Without a plan the row offers Upgrade this
drive, which goes straight to that drive's billing.

PRODUCT_NAME is now atomic.place.
@joepio joepio self-assigned this Oct 5, 2026
…g points

Takes the good parts of #1892: the account header gets its icon back, a
"Your plan" label with See plans heads the tiers, and the tier the drive is
on carries a Current badge (Cloud Vault says Included once Cloud Server is
on). Cloud Vault reads "Encrypted backup of your data. Only you can read
it." with a status line like "Backed up 32 min ago · 75 objects". The step
up to Cloud Server lists its selling points as checks.
Both tiers now render through the same component, so every state fills the
same slots: name with a Current, Included or Offered badge, one fixed
tagline, selling points while off, one status line with a coloured dot, and
actions with the primary first. State never renames a service any more
("Moving this drive…" and "atomic.place offers to host…" are status lines
now), button wording follows one pattern (Turn on Cloud Vault, Turn on
Cloud Server, Upgrade to Cloud Server, Manage plan, Try again), and the
copy says workspace throughout.

The managed node is listed under Devices with every other server again; the
plan card answers what you pay for, Devices where the drive syncs. The
email recovery row only appears when it needs you. The hosting offer drops
its Not now and Review toggle.
@joepio

joepio commented Oct 5, 2026

Copy link
Copy Markdown
Member Author
real-states

joepio commented Oct 5, 2026

Copy link
Copy Markdown
Member Author

"Downstream (atomic-saas builds against this commit)" failed on cargo check --locked: the paired atomic-saas branch's Cargo.lock predates develop's new altcha and lightningcss dependencies. This PR changes no Cargo files, so it is not this PR's. I ported the lockfile from ontola/atomic-saas#191 (Cargo.lock refresh for atomic-server develop) onto the paired branch (ontola/atomic-saas#186, commit 91475e6) and will re-run the failed job once the main CI job finishes.


Generated by Claude Code

The row is built during render, before switchToServer was declared, and
the React Compiler fails on that hoisted call (oxc-react-compiler.test).

joepio commented Oct 5, 2026

Copy link
Copy Markdown
Member Author

"Main (Mancave) / CI" on 21d0cf4 was cancelled, not failed: its log stops at 21:26 UTC, ten minutes into the Dagger step (mid data-browser build), and nothing more was written until the job was cancelled at 23:50. No test had reported a failure by then. On the previous head, the real failure was the React Compiler test on SyncRoute.tsx. 21d0cf4 fixes that, and the test passes locally. The downstream atomic-saas check is green on this head. I've re-run the failed jobs once.


Generated by Claude Code

The recovery row now only shows when recovery needs you; once signed in,
the email lives in the account header.
@joepio
joepio marked this pull request as ready for review October 6, 2026 05:05
joepio added a commit that referenced this pull request Oct 6, 2026
One tested commit for the open PRs of 5 October: link device to account (#1948), one profile form (#1953), faster branch runs (#1956), end-to-end encrypted conversations (#1971), passkey ceremony header (#1972), Flutter account package (#2035), cheap canvas undo (#2053), atomic.place tab title (#2056), table resource cell (#2057), small table fixes (#2058), storage map (#2061), Sync page cloud ladder (#2072), several served-domain suffixes (#2073), one sign-in (#2074), smaller chat messages (#2077), bring-along e2e fix (#2078), inline row data loss (#2079), Retry-After (#2080), #2070, #2071, #2066, #2067, #2068, #1969, #1887, #1897 and #1920.

Compressed stored values from #2077 stay readable, but a downgrade cannot read compressed rows.

Co-authored-by: Joep Meindertsma <joep@ontola.io>
@joepio joepio closed this Oct 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant