diff --git a/Cargo.lock b/Cargo.lock index 365442f..73732d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2205,6 +2205,27 @@ dependencies = [ "syn 2.0.118", ] +[[package]] +name = "dioxus-sdk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a653986dc3151f00a2be4cf04f83ec6c2af24b600ab926d5fcbcd159c6dadf" +dependencies = [ + "dioxus-sdk-time", +] + +[[package]] +name = "dioxus-sdk-time" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80c25ae93a3f72e734873b97fbd09d9b1b6adff97205fb0ffd8543e3564fb78e" +dependencies = [ + "dioxus", + "futures", + "gloo-timers", + "tokio", +] + [[package]] name = "dioxus-server" version = "0.7.9" @@ -6275,6 +6296,7 @@ dependencies = [ "chrono", "console_error_panic_hook", "dioxus", + "dioxus-sdk", "dotenvy", "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index eb86232..2753e9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,6 +60,7 @@ server = [ ] [dependencies] dioxus = { version = "0.7", features = ["router", "fullstack"] } +dioxus-sdk = { version = "0.7", default-features = false, features = ["time"] } jacquard = { workspace = true } jacquard-axum = { workspace = true, optional = true } jacquard-common = { workspace = true } @@ -131,7 +132,7 @@ js-sys = "0.3" tracing-wasm = "0.2" wasm-bindgen = "=0.2.121" wasm-bindgen-futures = "0.4" -web-sys = { version = "0.3", features = ["Window", "Document", "Element", "Event", "EventTarget", "HtmlCanvasElement", "WebGl2RenderingContext", "Performance", "MouseEvent", "WheelEvent", "PointerEvent", "DomRect", "BroadcastChannel", "console", "Response", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlInputElement", "Worker", "WorkerOptions", "WorkerType", "OffscreenCanvas", "MessageEvent", "ErrorEvent"] } +web-sys = { version = "0.3", features = ["Window", "Document", "Element", "Event", "EventTarget", "HtmlCanvasElement", "WebGl2RenderingContext", "Performance", "MouseEvent", "WheelEvent", "PointerEvent", "DomRect", "BroadcastChannel", "console", "Response", "File", "FileList", "Blob", "HtmlInputElement", "HtmlDetailsElement", "Worker", "WorkerOptions", "WorkerType", "OffscreenCanvas", "MessageEvent", "ErrorEvent"] } [dev-dependencies] anyhow = "1" diff --git a/assets/styling/primitives.css b/assets/styling/primitives.css index 3344642..68d65a3 100644 --- a/assets/styling/primitives.css +++ b/assets/styling/primitives.css @@ -42,13 +42,16 @@ font-weight: 600; color: var(--color-text); margin: 0; + text-wrap: balance; font-size: 1rem; line-height: 1.3; } .card-body { padding: 1rem; - display: grid; + display: flex; + flex-direction: column; + justify-content: space-between; gap: 0.65rem; } @@ -108,10 +111,10 @@ /* Thing cards */ .thing-card { - display: grid; - grid-template-rows: auto 1fr; min-width: 0; overflow: hidden; + display: flex; + flex-direction: column; } .thing-card-media { @@ -146,12 +149,11 @@ } .thing-card-body { - align-content: start; - grid-template-rows: auto auto auto minmax(0, 1fr) auto; + flex: 1; + justify-content: flex-start; } .thing-card-heading { - display: grid; gap: 0.25rem; min-width: 0; } @@ -171,13 +173,18 @@ gap: 0.45rem; } +.thing-card-details { + display: flex; + flex-direction: column; + gap: 0.25rem; + margin-top: auto; +} + .thing-card-actions { - grid-row: 5; - align-self: end; + align-self: stretch; display: flex; justify-content: space-between; gap: 0.65rem; - margin-top: auto; } .thing-card-actions a { @@ -228,13 +235,15 @@ } .thing-card-action { + margin: -0.18rem -0.28rem; padding: 0.18rem 0.28rem; cursor: pointer; color: var(--color-muted); background: transparent; - border: 1px solid transparent; + border: 0; font-family: var(--font-mono); font-size: 0.72rem; + line-height: 1.2; letter-spacing: 0.04em; text-transform: uppercase; } @@ -242,8 +251,9 @@ .thing-card-action:hover, .thing-card-action[aria-pressed="true"] { color: var(--color-tertiary); - border-color: var(--color-primary); background: color-mix(in srgb, var(--color-primary) 8%, transparent); + outline: 1px solid var(--color-primary); + outline-offset: 0; } .thing-card-action:focus-visible { diff --git a/assets/styling/publish.css b/assets/styling/publish.css index 6f8d491..5473115 100644 --- a/assets/styling/publish.css +++ b/assets/styling/publish.css @@ -1,6 +1,7 @@ -/* PM-43 publish wizard. Depends on theme.css tokens, base.css reset, and the - primitives layer (.blueprint-panel, .button, .tab, .status-pill, .field-label, - .card-meta, .blueprint-media). Page layer — loads after the shell. */ +/* Single-page publish flow. Depends on theme.css tokens, base.css reset, + and the primitives layer (.blueprint-panel, .button, .tab, .status-pill, + .field-label, .card-meta, .blueprint-media). Page layer — loads after the + shell. */ .publish-page { flex: 1; @@ -31,7 +32,7 @@ letter-spacing: -0.03em; } -/* Header: title + draft/published status + autosave state. */ +/* Header: title + draft/published status + autosave state + save affordance. */ .publish-head { display: flex; flex-direction: column; @@ -51,6 +52,11 @@ letter-spacing: -0.03em; } +.publish-save { + margin-left: auto; + font-size: 0.85rem; +} + .publish-save-state { margin: 0; color: var(--color-muted); @@ -58,44 +64,60 @@ font-size: 0.74rem; } -/* Stepper: each step is a .tab; complete steps pick up the success hue. */ -.wizard-steps { +/* Hero upload zone — the primary element of the signed-in page. */ +.publish-hero { display: flex; - flex-wrap: wrap; - gap: 0.5rem; + flex-direction: column; + gap: 0.75rem; + padding: clamp(1rem, 2.5vw, 1.75rem); } -.wizard-step { - gap: 0.4rem; - padding: 0.4rem 0.6rem; +.publish-dropzone { + position: relative; + display: block; + cursor: pointer; + border: 1px dashed var(--color-border); + border-radius: var(--radius-panel); + background: color-mix(in srgb, var(--color-overlay) 30%, transparent); + padding: clamp(1.5rem, 4vw, 2.5rem); + transition: border-color 150ms ease-out, background 150ms ease-out; } -.wizard-step-num { - font-family: var(--font-mono); - font-size: 0.72rem; - opacity: 0.8; +.publish-dropzone:hover, +.publish-dropzone:focus-within { + border-color: var(--color-primary); + background: color-mix(in srgb, var(--color-primary) 6%, transparent); } -.wizard-step-label { - font-family: var(--font-ui); - font-weight: 600; +.publish-dropzone.is-drag-over { + border-color: var(--color-action); + border-style: solid; + background: color-mix(in srgb, var(--color-action) 10%, transparent); } -.wizard-step.is-complete { - border-color: var(--color-success); - color: var(--color-success); - background: color-mix(in srgb, var(--color-success) 8%, transparent); +.publish-dropzone-body { + display: flex; + flex-direction: column; + align-items: center; + gap: 0.35rem; + text-align: center; + pointer-events: none; } -.wizard-step-check { - color: var(--color-success); +.publish-dropzone-title { + margin: 0; + color: var(--color-emphasis); + font-weight: 600; } -.wizard-step.is-active .wizard-step-check { - color: var(--color-tertiary); +.publish-dropzone-hint { + margin: 0; } -/* Body panel + step copy. */ +/* (Drag-and-drop target is the dropzone label itself; the body overlay stays + pointer-transparent so drops and label-clicks reach the input.) */ + +/* Body panel + section copy. */ .wizard-body { display: flex; flex-direction: column; @@ -109,12 +131,6 @@ letter-spacing: -0.02em; } -.wizard-step-hint { - margin: 0; - color: var(--color-subtle); - max-width: 60ch; -} - .wizard-subhead { margin: 0; color: var(--color-emphasis); @@ -165,6 +181,60 @@ color: var(--color-muted); } +.publish-license-field { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem 0.75rem; +} + +.publish-license-field .field-label { + flex: none; +} + +.publish-license-controls { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem; + flex: 1; + min-width: min(100%, 31rem); +} + +.publish-license-select { + flex: 0 0 12rem; + width: 12rem; + min-width: 12rem; +} + +.publish-license-custom { + flex: 1 1 16rem; + min-width: 14rem; + max-width: 22rem; +} + +/* Inline name field — prominent, the first edit after a drop. */ +.publish-name-field { + max-width: 32rem; +} + +/* Files list — also a drop target for adding more parts. */ +.publish-files { + display: flex; + flex-direction: column; + gap: 0.6rem; + border: 1px dashed transparent; + border-radius: var(--radius-panel); + padding: 0.5rem; + transition: border-color 150ms ease-out, background 150ms ease-out; +} + +.publish-files.is-drag-over { + border-color: var(--color-action); + background: color-mix(in srgb, var(--color-action) 8%, transparent); +} + /* Models & parts. */ .wizard-model { display: flex; @@ -205,6 +275,22 @@ flex-wrap: wrap; } +.wizard-part-advanced { + flex-direction: column; + align-items: stretch; + gap: 0.75rem; + padding: 0.75rem; + border: 1px solid var(--color-border); + border-radius: var(--radius-panel); +} + +.wizard-part-main { + display: flex; + align-items: center; + gap: 0.6rem; + flex-wrap: wrap; +} + .wizard-part-name { flex: 1; min-width: 10rem; @@ -214,6 +300,16 @@ white-space: nowrap; } +.wizard-part-meta-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr)); + gap: 0.6rem; +} + +.publish-field-wide { + grid-column: 1 / -1; +} + .wizard-empty { margin: 0; color: var(--color-muted); @@ -318,13 +414,104 @@ min-width: 12rem; } -/* Details step recap. */ -.wizard-recap { +/* Progressive disclosure sections. */ +.publish-sections { + display: flex; + flex-direction: column; + gap: 0.5rem; +} + +.publish-disclosure { + border: 1px solid var(--color-border); + border-radius: var(--radius-panel); + background: var(--color-surface); +} + +.publish-disclosure-summary { + display: flex; + align-items: baseline; + gap: 0.6rem; + flex-wrap: wrap; + padding: 0.6rem 0.75rem; + cursor: pointer; + list-style: none; +} + +.publish-disclosure-summary::-webkit-details-marker { + display: none; +} + +.publish-disclosure-title { + margin: 0; + color: var(--color-emphasis); + font-size: 0.95rem; + font-weight: 600; +} + +.publish-disclosure-hint { margin: 0; - color: var(--color-subtle); } -/* Review. */ +.publish-disclosure-body { + padding: 0.75rem; + border-top: 1px solid var(--color-border); + display: flex; + flex-direction: column; + gap: 0.75rem; +} + +/* Dimensions (bbox) inputs. */ +.publish-bbox { + border: 0; + padding: 0; + margin: 0; +} + +.publish-bbox-row { + display: flex; + gap: 0.5rem; + flex-wrap: wrap; +} + +.publish-bbox-row .field { + flex: 1; + min-width: 4.5rem; +} + +/* "Works with" compatibility chips. */ +.publish-compat-list { + list-style: none; + margin: 0; + padding: 0; + display: flex; + flex-wrap: wrap; + gap: 0.4rem; +} + +.publish-compat-chip { + display: inline-flex; + align-items: center; + gap: 0.35rem; + padding: 0.25rem 0.5rem; + border: 1px solid var(--color-border); + border-radius: var(--radius-pill); + background: color-mix(in srgb, var(--color-overlay) 40%, transparent); + font-size: 0.85rem; +} + +.publish-compat-remove { + padding: 0 0.35rem; + line-height: 1; + border: 0; + background: none; + color: var(--color-muted); +} + +.publish-compat-remove:hover { + color: var(--color-error); +} + +/* Review/confirm. */ .wizard-review { display: flex; flex-direction: column; @@ -418,18 +605,6 @@ color: var(--color-text); } -/* Navigation footer. */ -.wizard-nav { - display: flex; - align-items: center; - gap: 0.6rem; - flex-wrap: wrap; -} - -.wizard-nav-spacer { - flex: 1; -} - /* Errors. */ .wizard-error { margin: 0; @@ -460,4 +635,7 @@ width: 100%; opacity: 0.6; } + .publish-dropzone { + transition: none; + } } diff --git a/assets/styling/thing-detail.css b/assets/styling/thing-detail.css index aa8d53b..683197a 100644 --- a/assets/styling/thing-detail.css +++ b/assets/styling/thing-detail.css @@ -10,7 +10,6 @@ padding: clamp(0.75rem, 2vw, 1.75rem) clamp(1rem, 3vw, 2.5rem); } -.thing-detail-header, .thing-detail-summary, .thing-detail-copy, .detail-panel, @@ -22,7 +21,9 @@ } .thing-detail-header { - gap: 0.5rem; + display: flex; + flex-direction: column; + gap: 0.35rem; } .thing-detail-title-row { @@ -32,7 +33,6 @@ gap: 1rem; } -.thing-detail-title-row h1, .detail-panel h2, .selected-model-panel h2, .part-row h3 { @@ -41,9 +41,21 @@ letter-spacing: -0.03em; } -.thing-detail-title-row h1 { +.thing-detail-title { font-size: clamp(2.1rem, 5vw, 4rem); - line-height: 0.95; + line-height: 1; + margin: 0; + color: var(--color-emphasis); + letter-spacing: -0.03em; + text-wrap: balance; +} + +.thing-detail-title.is-long { + font-size: clamp(1.95rem, 4vw, 3.25rem); +} + +.thing-detail-title.is-very-long { + font-size: clamp(1.75rem, 3.3vw, 2.7rem); } .thing-detail-creator, diff --git a/e2e/tests/publish.spec.ts b/e2e/tests/publish.spec.ts index 909e5f4..fc33dab 100644 --- a/e2e/tests/publish.spec.ts +++ b/e2e/tests/publish.spec.ts @@ -1,21 +1,22 @@ import { expect, test } from '@playwright/test'; -// Coverage boundary: the publish wizard renders only for an authenticated -// ATProto session, and a live PDS publish needs real OAuth, which this CI e2e -// harness cannot establish. So e2e covers the signed-out callout (no wizard); -// the signed-in wizard assembly, draft round-trip, validation, and promote-on- -// publish are covered by the Rust unit/integration suites (src/publish/draft.rs, -// src/appview/drafts.rs) plus the manual Playwright pass against `just serve`. +// Coverage boundary: the publish flow renders only for an authenticated ATProto +// session, and a live PDS publish needs real OAuth, which this CI e2e harness +// cannot establish. So e2e covers the signed-out callout (no flow); the +// signed-in upload-first assembly, draft round-trip, validation, and +// promote-on-publish are covered by the Rust unit/integration suites +// (src/publish/draft.rs, src/appview/drafts.rs) plus the manual Playwright pass +// against `just serve`. -test('signed-out /publish shows the sign-in callout, not the wizard', async ({ page }) => { +test('signed-out /publish shows the sign-in callout, not the flow', async ({ page }) => { await page.goto('/publish'); await expect(page.getByRole('heading', { name: 'Share your models' })).toBeVisible(); const callout = page.locator('section[aria-label="Sign in"]'); await expect(callout.getByRole('button', { name: 'Sign in' })).toBeVisible(); - // The signed-out surface must not expose the wizard stepper or publish action. - await expect(page.getByRole('navigation', { name: 'Publish steps' })).toHaveCount(0); + // The signed-out surface must not expose the hero upload zone or publish action. + await expect(page.getByLabel('Upload model files')).toHaveCount(0); await expect(page.getByRole('button', { name: 'Publish', exact: true })).toHaveCount(0); }); diff --git a/src/publish.rs b/src/publish.rs index 46b0879..4c8b3ba 100644 --- a/src/publish.rs +++ b/src/publish.rs @@ -1,21 +1,37 @@ -use dioxus::html::FileData; -use std::collections::HashMap; - +//! Single-page, upload-first publish flow. +//! +//! Dropping geometry files is the hero action: it auto-creates the +//! Thing→Model→Part structure (one default model, each file a part) and +//! auto-fills the thing name from the first filename. All optional metadata — +//! thing-level fields, per-model/per-part fields, and thing-level +//! `intended_to_work_with` — lives behind progressive disclosure that +//! auto-expands for multi-model use, ending in a compact "what's public" +//! confirm + Publish. The server-side draft/publish backend is unchanged. +//! +//! Validation stays in [`DraftThingInput::assemble`](draft::DraftThingInput); +//! every exposed field is already carried on the draft types and mapped there. + +use dioxus::html::{FileData, HasFileData}; use dioxus::prelude::*; +use std::collections::{HashMap, HashSet}; use crate::Route; use crate::client::PolymodelClient; use crate::session::SessionIdentity; -use draft::{DraftModelInput, DraftPartInput, DraftSummary, DraftThingInput}; +use draft::{ + Bbox, DraftModelInput, DraftPartInput, DraftSummary, DraftThingInput, + ensure_default_model_for_upload, parse_thing_token, +}; use jacquard_common::deps::smol_str::SmolStr; +use polymodel_api::com_atproto::repo::strong_ref::StrongRef; use polymodel_api::space_polymodel::library::Image; -use state::{PublishPhase, WizardStep}; +use state::PublishPhase; pub(crate) mod draft; pub(crate) mod draft_client; pub(crate) mod state; -/// Common open licenses offered in the wizard. The first is the effective +/// Common open licenses offered in the flow. The first is the effective /// default when none is chosen. const LICENSE_OPTIONS: &[&str] = &[ "CC-BY-4.0", @@ -27,9 +43,10 @@ const LICENSE_OPTIONS: &[&str] = &[ "All rights reserved", ]; const DEFAULT_LICENSE: &str = "CC-BY-4.0"; +const CUSTOM_LICENSE_VALUE: &str = "__custom__"; /// Bluesky CDN thumbnail URL for an uploaded image blob (mirrors the appview's -/// `blob_cdn_url`) so the wizard can preview an image right after upload. +/// `blob_cdn_url`) so the flow can preview an image right after upload. fn image_cdn_url(did: &str, image: &Image) -> String { let cid = image.image.blob().r#ref.as_str(); format!("https://cdn.bsky.app/img/feed_thumbnail/plain/{did}/{cid}@jpeg") @@ -64,7 +81,7 @@ enum SaveState { } /// Publish route. Anonymous visitors see the sign-in callout (returning here); -/// signed-in users get the full wizard. `draft` is an optional draft id to +/// signed-in users get the full flow. `draft` is an optional draft id to /// resume (`/publish?draft=`). #[allow(clippy::useless_format)] #[component] @@ -112,16 +129,15 @@ pub(crate) fn Publish(draft: String) -> Element { } rsx! { - PublishWizard { resume: draft } + PublishFlow { resume: draft } } } #[derive(Clone)] -struct Wizard { +struct Flow { client: PolymodelClient, composition: Signal, draft_id: Signal>, - step: Signal, phase: Signal, save: Signal, upload: Signal, @@ -133,10 +149,37 @@ struct Wizard { /// blobref CID. CDN URLs for just-uploaded blobs aren't available until /// replication completes; this shows the image immediately. image_data_uris: Signal>, + /// Advanced (multi-model) disclosure open-state, shared with the auto-expand + /// at the add-model site and `resume_draft`. Controlled-
`ontoggle` + /// keeps it honest. + advanced_open: Signal, + /// One-way flag: once Advanced has auto-expanded (or a multi-model draft was + /// resumed expanded), it is never auto-opened again — so a user who collapses + /// Advanced and later removes/re-adds a model stays collapsed. + advanced_auto_expanded: Signal, + /// Live text of the "Works with" paste field, so blur can resolve it. + works_with_text: Signal, + /// Whether a file drag is over the hero dropzone (drives the drag-over class). + drag_over: Signal, + /// Resolved display names for "Works with" chips, keyed by thing URI string. + /// The persisted `intended_to_work_with` holds only `StrongRef`s (no name), so + /// the human-readable label lives here alongside the refs. + compat_names: Signal>, + /// License fields where the user explicitly opened the custom-license input. + custom_license_targets: Signal>, + /// Status of the "Works with" resolve flow (kept separate from file-upload + /// status so the two do not overwrite each other's feedback). + works_with_status: Signal, + /// Guards against concurrent saves: while a save is in flight, further + /// `mark_dirty_and_save` calls just mark Dirty; the completing save re-runs + /// if still Dirty. Prevents duplicate-draft creation on rapid edits. + save_in_flight: Signal, + /// The mounted name input element, focused once after the first upload. + name_element: Signal>>, } #[component] -fn PublishWizard(resume: String) -> Element { +fn PublishFlow(resume: String) -> Element { let client = use_context::(); let session = use_context::>(); let did = match &*session.read() { @@ -150,7 +193,6 @@ fn PublishWizard(resume: String) -> Element { ..DraftThingInput::default() }); let draft_id = use_signal(|| Option::::None); - let step = use_signal(|| WizardStep::Basics); let phase = use_signal(|| PublishPhase::Editing); let save = use_signal(|| SaveState::New); let upload = use_signal(|| UploadStatus::Idle); @@ -158,11 +200,30 @@ fn PublishWizard(resume: String) -> Element { let drafts = use_signal(Vec::::new); let image_data_uris = use_signal(HashMap::::new); - let wizard = Wizard { + // Disclosure open-state for the Advanced (multi-model) section, opened at the + // add-model site. Controlled-
`ontoggle` keeps it honest about + // manual collapses. + let advanced_open = use_signal(|| false); + // One-way flag: once Advanced has auto-expanded, it is never auto-opened again. + let advanced_auto_expanded = use_signal(|| false); + // Live text of the "Works with" paste field, so blur can resolve it. + let works_with_text = use_signal(String::new); + // Whether a file drag is over the hero dropzone (drives the drag-over class). + let drag_over = use_signal(|| false); + // Resolved display names for "Works with" chips (uri → name). + let compat_names = use_signal(std::collections::HashMap::new); + let custom_license_targets = use_signal(HashSet::::new); + // "Works with" resolve status, separate from file-upload status. + let works_with_status = use_signal(|| UploadStatus::Idle); + // Guards against concurrent saves (see Flow::save_draft). + let save_in_flight = use_signal(|| false); + // The mounted name input element, focused once after the first upload. + let name_element: Signal>> = use_signal(|| None); + + let flow = Flow { client, composition, draft_id, - step, phase, save, upload, @@ -170,22 +231,42 @@ fn PublishWizard(resume: String) -> Element { drafts, did, image_data_uris, + advanced_open, + advanced_auto_expanded, + works_with_text, + drag_over, + compat_names, + custom_license_targets, + works_with_status, + save_in_flight, + name_element, }; // Resume a draft once on mount when `?draft=` is present; always load // the actor's existing drafts so they can be picked up as entry points. { - let wizard = wizard.clone(); + let flow = flow.clone(); let resume = resume.clone(); use_hook(move || { if !resume.trim().is_empty() { - let mut wizard = wizard.clone(); + let flow = flow.clone(); let resume = resume.clone(); spawn(async move { - match draft_client::get_draft(&wizard.client, resume.trim()).await { + match draft_client::get_draft(&flow.client, resume.trim()).await { Ok(loaded) => { - wizard.composition.set(loaded); - wizard.draft_id.set(Some(resume.trim().to_string())); + // A resumed multi-model draft should land with its + // Advanced section expanded. + let multi = loaded.models.len() > 1; + { + let mut composition = flow.composition; + composition.set(loaded); + } + let mut advanced_open = advanced_open; + let mut auto_expanded = advanced_auto_expanded; + advanced_open.set(multi); + auto_expanded.set(multi); + let mut draft_id = flow.draft_id; + draft_id.set(Some(resume.trim().to_string())); } Err(error) => { tracing::warn!(%error, "failed to resume draft"); @@ -193,8 +274,8 @@ fn PublishWizard(resume: String) -> Element { } }); } - let wizard = wizard.clone(); - spawn(async move { wizard.reload_drafts().await }); + let flow = flow.clone(); + spawn(async move { flow.reload_drafts().await }); }); } @@ -203,7 +284,7 @@ fn PublishWizard(resume: String) -> Element { // draft via `?draft=` instead of dropping you on a blank `/publish`. // replace() avoids stacking a history entry on every autosave. { - let draft_id = wizard.draft_id; + let draft_id = flow.draft_id; use_effect(move || { if let Some(id) = draft_id.read().clone() { navigator().replace(Route::Publish { draft: id }); @@ -211,39 +292,68 @@ fn PublishWizard(resume: String) -> Element { }); } - let current = *wizard.step.read(); - let body = match current { - WizardStep::Basics => wizard.render_basics(), - WizardStep::Files => wizard.render_files(), - WizardStep::Images => wizard.render_images(), - WizardStep::Details => wizard.render_details(), - WizardStep::Review => wizard.render_review(), - }; + // (Auto-expand and focus-on-first-upload are handled at the mutation site, + // not via effects — observing signals to fire one-shot side effects re-runs + // on every change and needs fragile prev-state bookkeeping.) rsx! { main { class: "publish-page", - { wizard.render_header() } - if let PublishPhase::Published { repo, rkey } = wizard.phase.read().clone() { - { wizard.render_published(repo, rkey) } + { flow.render_header() } + if let PublishPhase::Published { repo, rkey } = flow.phase.read().clone() { + { flow.render_published(repo, rkey) } } else { - { wizard.render_resume() } - { wizard.render_stepper() } - section { class: "wizard-body blueprint-panel", aria_label: "{current.label()}", - {body} - } - { wizard.render_nav() } + { flow.render_resume() } + { flow.render_editor() } + { flow.render_confirm() } } } } } -impl Wizard { - /// Create (first save) or update the server-side draft. +/// The level a shared field renderer targets: the thing, a model, or a part. +#[derive(Clone, Copy)] +enum FieldTarget { + Thing, + Model(usize), + Part(usize, usize), +} + +/// Which bbox axis/unit a single dimension input edits. +#[derive(Clone, Copy)] +enum BboxField { + X, + Y, + Z, + Unit, +} + +impl Flow { + /// Create (first save) or update the server-side draft. Serializes saves: if + /// a save is already in flight, callers should mark Dirty and let the + /// in-flight save re-run — `mark_dirty_and_save` enforces that, and this + /// method re-spawns when it finishes with Dirty still set, so rapid edits + /// coalesce instead of racing into duplicate drafts. async fn save_draft(self) { + { + let mut guard = self.save_in_flight; + if *guard.read() { + // Another save is mid-flight; mark dirty and let it pick this up. + let mut save = self.save; + save.set(SaveState::Dirty); + return; + } + guard.set(true); + } let mut save = self.save; save.set(SaveState::Saving); let payload = self.composition.read().clone(); let existing = self.draft_id.read().clone(); + if existing.is_none() && is_initial_composition(&payload) { + save.set(SaveState::New); + let mut guard = self.save_in_flight; + guard.set(false); + return; + } let result = match existing { Some(id) => draft_client::put_draft(&self.client, &id, &payload) .await @@ -254,13 +364,37 @@ impl Wizard { Ok(id) => { let mut draft_id = self.draft_id; draft_id.set(Some(id)); - save.set(SaveState::Saved); + // Only mark Saved if no edit landed while the request was in + // flight — otherwise leave Dirty so the re-run below persists it. + if !matches!(*save.read(), SaveState::Dirty) { + save.set(SaveState::Saved); + } } Err(error) => { tracing::warn!(%error, "failed to save draft"); save.set(SaveState::Error); } } + // Release the guard; if edits landed during the save, re-run once. + let mut guard = self.save_in_flight; + guard.set(false); + if matches!(*self.save.read(), SaveState::Dirty) { + let flow = self.clone(); + spawn(async move { flow.save_draft().await }); + } + } + + /// Mark the composition dirty and persist it. Used after every structural or + /// committed-text mutation now that the step-change save trigger is gone. + /// Coalesces with any in-flight save (see `save_draft`). + fn mark_dirty_and_save(&self) { + let mut save = self.save; + save.set(SaveState::Dirty); + if *self.save_in_flight.read() { + return; + } + let flow = self.clone(); + spawn(async move { flow.save_draft().await }); } fn mark_dirty(&self) { @@ -268,11 +402,23 @@ impl Wizard { save.set(SaveState::Dirty); } - fn goto(&self, target: WizardStep) { - let mut step = self.step; - step.set(target); - let wizard = self.clone(); - spawn(async move { wizard.save_draft().await }); + fn set_license_value(&self, target: FieldTarget, value: String) { + let mut composition = self.composition; + let mut guard = composition.write(); + let value = if value.trim().is_empty() { + None + } else { + Some(value) + }; + match target { + FieldTarget::Thing => guard.license = value, + FieldTarget::Model(mi) => { + if let Some(model) = guard.models.get_mut(mi) { + model.license = value; + } + } + FieldTarget::Part(_, _) => {} + } } /// Refresh the actor's draft summaries for the resume list. @@ -284,17 +430,24 @@ impl Wizard { } } - /// Load an existing draft into the wizard in place (without a route change). + /// Load an existing draft into the editor in place (without a route change). async fn resume_draft(self, id: String) { match draft_client::get_draft(&self.client, &id).await { Ok(loaded) => { - let mut composition = self.composition; - let mut draft_id = self.draft_id; - let mut step = self.step; + let multi = loaded.models.len() > 1; + { + let mut composition = self.composition; + composition.set(loaded); + } + { + let mut draft_id = self.draft_id; + draft_id.set(Some(id)); + } + let mut advanced_open = self.advanced_open; + let mut auto_expanded = self.advanced_auto_expanded; + advanced_open.set(multi); + auto_expanded.set(multi); let mut save = self.save; - composition.set(loaded); - draft_id.set(Some(id)); - step.set(WizardStep::Basics); save.set(SaveState::Saved); } Err(error) => tracing::warn!(%error, "failed to resume draft"), @@ -317,8 +470,6 @@ impl Wizard { } } - /// Resume list: existing server-side drafts shown as entry points. Hidden - /// when the actor has no other drafts than the one being edited. fn render_resume(&self) -> Element { let drafts = self.drafts.read().clone(); let active = self.draft_id.read().clone(); @@ -342,9 +493,9 @@ impl Wizard { .filter(|n| !n.trim().is_empty()) .unwrap_or_else(|| "Untitled draft".to_string()); let model_count = summary.model_count; - let resume_w = self.clone(); + let resume_f = self.clone(); let resume_id = id.clone(); - let discard_w = self.clone(); + let discard_f = self.clone(); let discard_id = id.clone(); rsx! { li { key: "{id}", class: "wizard-resume-item", @@ -356,18 +507,18 @@ impl Wizard { button { class: "button button-secondary", onclick: move |_| { - let wizard = resume_w.clone(); + let flow = resume_f.clone(); let id = resume_id.clone(); - spawn(async move { wizard.resume_draft(id).await }); + spawn(async move { flow.resume_draft(id).await }); }, "Resume" } button { class: "button button-ghost", onclick: move |_| { - let wizard = discard_w.clone(); + let flow = discard_f.clone(); let id = discard_id.clone(); - spawn(async move { wizard.discard_draft(id).await }); + spawn(async move { flow.discard_draft(id).await }); }, "Delete" } @@ -397,11 +548,21 @@ impl Wizard { SaveState::Dirty => "Unsaved changes", SaveState::Error => "Save failed", }; + let save_f = self.clone(); rsx! { header { class: "publish-head", div { class: "publish-head-row", h1 { "Publish a thing" } span { class: "{pill_class}", "{pill_label}" } + button { + class: "button button-secondary publish-save", + disabled: matches!(save, SaveState::Saving), + onclick: move |_| { + let flow = save_f.clone(); + spawn(async move { flow.save_draft().await }); + }, + "Save draft" + } } p { class: "publish-save-state", aria_live: "polite", "{save_label}" } if let PublishPhase::Failed(message) = &phase { @@ -411,407 +572,1030 @@ impl Wizard { } } - fn render_stepper(&self) -> Element { - let composition = self.composition.read(); - let current = *self.step.read(); - let basics_done = composition.basics_complete(); - let files_done = composition.files_complete(); - drop(composition); + /// Upload/resolve status (progress or error), shown wherever file or + /// "Works with" staging can fail — both the hero (empty state) and the files + /// list (post-upload), so failures are never hidden by the hero swap. + fn render_upload_status(&self) -> Element { + let status = self.upload.read().clone(); + match status { + UploadStatus::Uploading(label) => rsx! { + div { class: "wizard-upload-status", role: "status", + span { class: "wizard-progress-bar", "aria-hidden": "true" } + span { "Uploading {label}…" } + } + }, + UploadStatus::Error(message) => rsx! { + p { class: "wizard-error", role: "alert", "{message}" } + }, + UploadStatus::Idle => rsx! {}, + } + } + + /// "Works with" resolve status, shown inside that disclosure only — kept + /// separate from the file-upload status so the two flows don't clobber each + /// other's feedback. + fn render_works_with_status(&self) -> Element { + let status = self.works_with_status.read().clone(); + match status { + UploadStatus::Error(message) => rsx! { + p { class: "wizard-error", role: "alert", "{message}" } + }, + _ => rsx! {}, + } + } + + /// Image-upload status (cover/previews), distinct from geometry-file status. + fn render_image_upload_status(&self) -> Element { + let status = self.image_upload.read().clone(); + match status { + UploadStatus::Uploading(label) => rsx! { + div { class: "wizard-upload-status", role: "status", + span { class: "wizard-progress-bar", "aria-hidden": "true" } + span { "Uploading {label}…" } + } + }, + UploadStatus::Error(message) => rsx! { + p { class: "wizard-error", role: "alert", "{message}" } + }, + UploadStatus::Idle => rsx! {}, + } + } + + /// The hero upload zone — the empty-state dropzone, shown only before any + /// file is staged. A large, keyboard-reachable label wraps a `multiple` + /// file picker, and accepts dragged geometry files. + fn render_hero(&self) -> Element { + let drag_over = *self.drag_over.read(); + let hero_w = self.clone(); + let over_w = self.clone(); + let leave_w = self.clone(); + let drop_w = self.clone(); + let drag_class = if drag_over { "is-drag-over" } else { "" }; rsx! { - nav { class: "wizard-steps", aria_label: "Publish steps", - for s in WizardStep::ALL { - { - let done = match s { - WizardStep::Basics => basics_done, - WizardStep::Files => files_done, - _ => false, - }; - let is_active = s == current; - let wizard = self.clone(); - let active_class = if is_active { "is-active" } else { "" }; - let done_class = if done { "is-complete" } else { "" }; - rsx! { - button { - key: "step-{s.number()}", - class: "tab wizard-step {active_class} {done_class}", - aria_current: if is_active { "step" } else { "false" }, - onclick: move |_| wizard.goto(s), - span { class: "wizard-step-num", "{s.number()}" } - span { class: "wizard-step-label", "{s.label()}" } - if done { - span { class: "wizard-step-check", aria_hidden: "true", "✓" } - } + section { class: "publish-hero blueprint-panel", aria_label: "Upload model files", + label { + class: "publish-dropzone {drag_class}", + ondragover: move |evt| { + evt.prevent_default(); + let mut drag_over = over_w.drag_over; + drag_over.set(true); + }, + ondragleave: move |_| { + let mut drag_over = leave_w.drag_over; + drag_over.set(false); + }, + ondrop: move |evt| { + evt.prevent_default(); + let mut drag_over = drop_w.drag_over; + drag_over.set(false); + let files = evt.files(); + if !files.is_empty() { + let flow = drop_w.clone(); + spawn(async move { flow.handle_files_upload(files).await }); + } + }, + input { + r#type: "file", + multiple: true, + accept: ".stl,.obj,.gltf,.glb,.3mf,.step,.stp,model/*,application/octet-stream", + class: "wizard-file-input", + aria_label: "Upload model files", + onchange: move |evt| { + let files = evt.files(); + if !files.is_empty() { + let flow = hero_w.clone(); + spawn(async move { flow.handle_files_upload(files).await }); } + }, + } + div { class: "publish-dropzone-body", + p { class: "publish-dropzone-title", "Drop geometry files to begin" } + p { class: "publish-dropzone-hint card-meta", + "STL · OBJ · glTF · GLB · 3MF · STEP — or click to choose" } } } + { self.render_upload_status() } } } } - fn render_nav(&self) -> Element { - let current = *self.step.read(); - let publishing = matches!(*self.phase.read(), PublishPhase::Publishing); - let prev = current.prev(); - let next = current.next(); - let wizard_back = self.clone(); - let wizard_next = self.clone(); - let wizard_save = self.clone(); + /// Inline editor: the thing name + uploaded-files list (default model's + /// parts), then progressive-disclosure "more" sections and the Advanced + /// multi-model disclosure with per-model/per-part metadata. + fn render_editor(&self) -> Element { + let composition = self.composition.read(); + let has_parts = composition.models.iter().any(|m| !m.parts.is_empty()); + drop(composition); + rsx! { - footer { class: "wizard-nav", - if let Some(prev) = prev { - button { - class: "button button-ghost", - disabled: publishing, - onclick: move |_| wizard_back.goto(prev), - "Back" - } - } - div { class: "wizard-nav-spacer" } - button { - class: "button button-secondary", - disabled: publishing, - onclick: move |_| { - let wizard = wizard_save.clone(); - spawn(async move { wizard.save_draft().await }); - }, - "Save draft" - } - if let Some(next) = next { - button { - class: "button button-primary", - disabled: publishing, - onclick: move |_| wizard_next.goto(next), - "Next: {next.label()}" - } + section { class: "wizard-body blueprint-panel", aria_label: "Publish", + { self.render_inline_name() } + { self.render_thing_sections() } + if has_parts { + { self.render_files_list() } + } else { + { self.render_hero() } } + { self.render_advanced() } } } } - fn render_basics(&self) -> Element { + /// The editable thing name, shown once the first file is staged. Focuses + /// itself on first mount so the user lands on the most likely next edit. + fn render_inline_name(&self) -> Element { let composition = self.composition.read(); let name = composition.name.clone().unwrap_or_default(); - let summary = composition.summary.clone().unwrap_or_default(); drop(composition); - let name_w = self.clone(); - let summary_w = self.clone(); - + let name_element = self.name_element; rsx! { - h2 { "Basics" } - label { class: "field", + label { class: "field publish-name-field", span { class: "field-label", "Name" } input { class: "field-input", r#type: "text", value: "{name}", placeholder: "e.g. Modular desk organizer", + onmounted: move |element| { + let mut name_element = name_element; + name_element.set(Some(element.data())); + }, oninput: move |evt| { let mut c = name_w.composition; c.write().name = Some(evt.value()); - name_w.mark_dirty(); - }, - } - } - label { class: "field", - span { class: "field-label", "Summary" } - textarea { - class: "field-input field-textarea", - value: "{summary}", - placeholder: "What is it?", - oninput: move |evt| { - let mut c = summary_w.composition; - let v = evt.value(); - c.write().summary = if v.trim().is_empty() { None } else { Some(v) }; - summary_w.mark_dirty(); }, + onblur: move |_| name_w.clone().mark_dirty_and_save(), } } } } - fn render_files(&self) -> Element { + /// The default model's parts as an editable files list (rename + remove + + /// size/format meta), plus "Add more files" routed through the same batch + /// handler as the hero. + fn render_files_list(&self) -> Element { let composition = self.composition.read(); - let models = composition.models.clone(); - let upload = self.upload.read().clone(); + let parts = composition + .models + .first() + .map(|m| m.parts.clone()) + .unwrap_or_default(); drop(composition); - - let add_model_w = self.clone(); + let add_w = self.clone(); + let over_w = self.clone(); + let leave_w = self.clone(); + let drop_w = self.clone(); + let drag_over = *self.drag_over.read(); + let drag_class = if drag_over { "is-drag-over" } else { "" }; rsx! { - h2 { "Files & parts" } - p { class: "wizard-step-hint", "Add one or more models. Each model holds ordered parts; upload a geometry file for every part." } - match &upload { - UploadStatus::Uploading(label) => rsx! { - div { class: "wizard-upload-status", role: "status", - span { class: "wizard-progress-bar", "aria-hidden": "true" } - span { "Uploading {label}…" } - } + div { + class: "publish-files {drag_class}", + ondragover: move |evt| { + evt.prevent_default(); + let mut drag_over = over_w.drag_over; + drag_over.set(true); }, - UploadStatus::Error(message) => rsx! { - p { class: "wizard-error", role: "alert", "{message}" } + ondragleave: move |_| { + let mut drag_over = leave_w.drag_over; + drag_over.set(false); }, - UploadStatus::Idle => rsx! {}, - } - if models.is_empty() { - p { class: "wizard-empty", "No models yet. Add one to start uploading parts." } - } - for (mi, model) in models.iter().enumerate() { - { - let model_name = model.name.clone().unwrap_or_default(); - let parts = model.parts.clone(); - let name_w = self.clone(); - let remove_w = self.clone(); - let upload_w = self.clone(); - rsx! { - section { key: "model-{mi}", class: "wizard-model", - div { class: "wizard-model-head", - label { class: "field wizard-model-name", - span { class: "field-label", "Model {mi + 1} name" } - input { - class: "field-input", - r#type: "text", - value: "{model_name}", - placeholder: "e.g. Base plate", - oninput: move |evt| { - let mut c = name_w.composition; - c.write().models[mi].name = Some(evt.value()); - name_w.mark_dirty(); - }, - } - } - button { - class: "button button-ghost wizard-remove", - onclick: move |_| { - let mut c = remove_w.composition; - c.write().models.remove(mi); - remove_w.mark_dirty(); - }, - "Remove model" - } - } - if parts.is_empty() { - p { class: "wizard-empty", "No parts yet. Upload a file below." } - } - ul { class: "wizard-part-list", - for (pi, part) in parts.iter().enumerate() { - { - let part_name = part.name.clone().unwrap_or_default(); - let size = part.file.as_ref().map(|f| human_size(f.size)).unwrap_or_default(); - let format = part.format.clone().unwrap_or_default(); - let pname_w = self.clone(); - let premove_w = self.clone(); - rsx! { - li { key: "part-{mi}-{pi}", class: "wizard-part", - label { class: "field wizard-part-name", - span { class: "field-label sr-only", "Part name" } - input { - class: "field-input", - r#type: "text", - value: "{part_name}", - oninput: move |evt| { - let mut c = pname_w.composition; - c.write().models[mi].parts[pi].name = Some(evt.value()); - pname_w.mark_dirty(); - }, - } - } - span { class: "wizard-part-meta card-meta", - if !format.is_empty() { "{format} · " } - "{size}" - } - button { - class: "button button-ghost wizard-remove", - onclick: move |_| { - let mut c = premove_w.composition; - c.write().models[mi].parts.remove(pi); - premove_w.mark_dirty(); - }, - "Remove" - } - } + ondrop: move |evt| { + evt.prevent_default(); + let mut drag_over = drop_w.drag_over; + drag_over.set(false); + let files = evt.files(); + if !files.is_empty() { + let flow = drop_w.clone(); + spawn(async move { flow.handle_files_upload(files).await }); + } + }, + h2 { "Files" } + { self.render_upload_status() } + ul { class: "wizard-part-list", + for (pi, part) in parts.iter().enumerate() { + { + let part_name = part.name.clone().unwrap_or_default(); + let size = part.file.as_ref().map(|f| human_size(f.size)).unwrap_or_default(); + let format = part.format.clone().unwrap_or_default(); + let pname_w = self.clone(); + let premove_w = self.clone(); + rsx! { + li { key: "part-0-{pi}", class: "wizard-part", + label { class: "field wizard-part-name", + span { class: "field-label sr-only", "Part name" } + input { + class: "field-input", + r#type: "text", + value: "{part_name}", + oninput: move |evt| { + let mut c = pname_w.composition; + c.write().models[0].parts[pi].name = Some(evt.value()); + }, + onblur: move |_| pname_w.clone().mark_dirty_and_save(), } } - } - } - label { class: "button button-secondary wizard-file-button", - "Add a file" - input { - class: "wizard-file-input", - r#type: "file", - accept: ".stl,.obj,.gltf,.glb,.3mf,.step,.stp,model/*,application/octet-stream", - onchange: move |evt| { - if let Some(file) = evt.files().into_iter().next() { - let wizard = upload_w.clone(); - spawn(async move { wizard.handle_file_upload(mi, file).await }); - } - }, + span { class: "wizard-part-meta card-meta", + if !format.is_empty() { "{format} · " } + "{size}" + } + button { + class: "button button-ghost wizard-remove", + onclick: move |_| { + let mut c = premove_w.composition; + c.write().models[0].parts.remove(pi); + premove_w.clone().mark_dirty_and_save(); + }, + "Remove" + } } } } } } - } - button { - class: "button button-secondary wizard-add-model", - onclick: move |_| { - let mut c = add_model_w.composition; - c.write().models.push(DraftModelInput::default()); - add_model_w.mark_dirty(); - }, - "Add a model" + label { class: "button button-secondary wizard-file-button", + "Add more files" + input { + class: "wizard-file-input", + r#type: "file", + multiple: true, + accept: ".stl,.obj,.gltf,.glb,.3mf,.step,.stp,model/*,application/octet-stream", + onchange: move |evt| { + let files = evt.files(); + if !files.is_empty() { + let flow = add_w.clone(); + spawn(async move { flow.handle_files_upload(files).await }); + } + }, + } + } } } } - async fn handle_file_upload(self, model_index: usize, file: FileData) { - let filename = file.name(); - let mut upload = self.upload; - upload.set(UploadStatus::Uploading(filename.clone())); - let bytes = match file.read_bytes().await { - Ok(bytes) => bytes.to_vec(), - Err(_) => { - upload.set(UploadStatus::Error( - "Could not read the selected file.".into(), - )); - return; - } - }; - let mime = file - .content_type() - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| mime_from_filename(&filename).to_string()); - // Clone before staging: `stage_file` takes `bytes` by value, but the - // worker preview request still needs a temporary Blob URL for the same bytes. - match draft_client::stage_file(&self.client, &filename, &mime, bytes.clone()).await { - Ok(staged) => { - let format = format_from_filename(&filename); - let mut part = DraftPartInput { - name: Some(filename.clone()), - upload_id: Some(staged.upload_id.to_string()), - file: Some(staged.file), - format: format.clone(), - ..Default::default() - }; - // Best-effort preview generation (wasm-only; no-op off-wasm). - // v1 supports STL only in the publish wizard — skip preview for other formats. - let preview = if format.as_deref() == Some("stl") { - let client = self.client.clone(); - let upload_sig = self.upload; - let data_uris_sig = self.image_data_uris; - generate_preview(client, filename.clone(), bytes, upload_sig, data_uris_sig) - .await - } else { - None - }; - { - let mut composition = self.composition; - let mut guard = composition.write(); - if let Some(image) = preview { - let parts_before_push = - guard.models.get(model_index).map_or(0, |m| m.parts.len()); - maybe_seed_cover(&mut guard, model_index, parts_before_push, &image); - attach_preview(&mut part, image); - } - if let Some(model) = guard.models.get_mut(model_index) { - model.parts.push(part); - } - } - upload.set(UploadStatus::Idle); - let wizard = self.clone(); - wizard.save_draft().await; - } - Err(error) => { - upload.set(UploadStatus::Error(format!("Upload failed: {error}"))); + /// Thing-level "more" sections behind progressive disclosure: Summary, + /// Tags, Images, Instructions, License, and Works with. + fn render_thing_sections(&self) -> Element { + rsx! { + div { class: "publish-sections", + { self.render_summary_section(FieldTarget::Thing, false) } + { self.render_tags_section(FieldTarget::Thing, false) } + { self.render_license_section(FieldTarget::Thing, false) } + { self.render_cover_inline() } + { self.render_instructions_section(FieldTarget::Thing) } + { self.render_images_section(FieldTarget::Thing) } + { self.render_works_with_section() } } } } - fn render_images(&self) -> Element { + /// Advanced multi-model disclosure: add/remove models, per-model metadata, + /// and per-part metadata via the shared field renderers. + fn render_advanced(&self) -> Element { let composition = self.composition.read(); - let cover = composition.cover.clone().unwrap_or_default(); - let previews = composition.previews.clone().unwrap_or_default(); - let status = self.image_upload.read().clone(); + let models = composition.models.clone(); drop(composition); - - let cover_w = self.clone(); - let preview_w = self.clone(); + let add_w = self.clone(); rsx! { - h2 { "Images" } - match &status { - UploadStatus::Uploading(label) => rsx! { - div { class: "wizard-upload-status", role: "status", - span { class: "wizard-progress-bar", "aria-hidden": "true" } - span { "Uploading {label}…" } + Disclosure { + title: "Advanced", + hint: "Multiple models and per-part metadata", + open: Some(self.advanced_open), + body: rsx! { + for (mi, model) in models.iter().enumerate() { + { self.render_model_block(mi, model) } } - }, - UploadStatus::Error(message) => rsx! { p { class: "wizard-error", role: "alert", "{message}" } }, - UploadStatus::Idle => rsx! {}, - } - div { class: "wizard-image-group", - h3 { class: "wizard-subhead", "Cover" } - { self.render_image_list(&cover, true) } - label { class: "button button-secondary wizard-file-button", - "Add cover image" - input { - class: "wizard-file-input", - r#type: "file", - accept: "image/png,image/jpeg,image/webp,image/gif", - onchange: move |evt| { - if let Some(file) = evt.files().into_iter().next() { - let wizard = cover_w.clone(); - spawn(async move { wizard.handle_image_upload(true, file).await }); + button { + class: "button button-secondary wizard-add-model", + onclick: move |_| { + let was_count = { + let g = add_w.composition.read(); + g.models.len() + }; + let next_name = format!("Model {}", was_count + 1); + let mut c = add_w.composition; + c.write().models.push(DraftModelInput { + name: Some(next_name), + ..Default::default() + }); + // First time reaching a second model: auto-open + // Advanced once. The one-way flag means a later + // remove→re-add after a manual collapse stays put. + if was_count == 1 && !*add_w.advanced_auto_expanded.read() { + let mut advanced_open = add_w.advanced_open; + advanced_open.set(true); + let mut auto_expanded = add_w.advanced_auto_expanded; + auto_expanded.set(true); } + add_w.clone().mark_dirty_and_save(); }, + "Add a model" } } } - div { class: "wizard-image-group", - h3 { class: "wizard-subhead", "Previews" } - { self.render_image_list(&previews, false) } + } + } + + fn render_model_block(&self, mi: usize, model: &DraftModelInput) -> Element { + let model_name = model.name.clone().unwrap_or_default(); + let parts = model.parts.clone(); + let name_w = self.clone(); + let remove_w = self.clone(); + let addfile_w = self.clone(); + rsx! { + section { key: "model-{mi}", class: "wizard-model", + div { class: "wizard-model-head", + label { class: "field wizard-model-name", + span { class: "field-label", "Model {mi + 1} name" } + input { + class: "field-input", + r#type: "text", + value: "{model_name}", + placeholder: "e.g. Base plate", + oninput: move |evt| { + let mut c = name_w.composition; + c.write().models[mi].name = Some(evt.value()); + }, + onblur: move |_| name_w.clone().mark_dirty_and_save(), + } + } + button { + class: "button button-ghost wizard-remove", + onclick: move |_| { + let mut c = remove_w.composition; + c.write().models.remove(mi); + remove_w.clone().mark_dirty_and_save(); + }, + "Remove model" + } + } + if parts.is_empty() { + p { class: "wizard-empty", "No parts yet. Upload a file below." } + } + ul { class: "wizard-part-list", + for (pi, part) in parts.iter().enumerate() { + { self.render_part_row(mi, pi, part) } + } + } label { class: "button button-secondary wizard-file-button", - "Add preview image" + "Add a file to this model" input { class: "wizard-file-input", r#type: "file", - accept: "image/png,image/jpeg,image/webp,image/gif", + accept: ".stl,.obj,.gltf,.glb,.3mf,.step,.stp,model/*,application/octet-stream", onchange: move |evt| { if let Some(file) = evt.files().into_iter().next() { - let wizard = preview_w.clone(); - spawn(async move { wizard.handle_image_upload(false, file).await }); + let flow = addfile_w.clone(); + spawn(async move { flow.stage_file_into(mi, file).await }); } }, } } + { self.render_summary_section(FieldTarget::Model(mi), true) } + { self.render_tags_section(FieldTarget::Model(mi), true) } + { self.render_instructions_section(FieldTarget::Model(mi)) } + { self.render_license_section(FieldTarget::Model(mi), true) } + { self.render_images_section(FieldTarget::Model(mi)) } } } } - fn render_image_list(&self, images: &[Image], is_cover: bool) -> Element { - if images.is_empty() { - return rsx! { p { class: "wizard-empty", "No images yet." } }; - } + fn render_part_row(&self, mi: usize, pi: usize, part: &DraftPartInput) -> Element { + let part_name = part.name.clone().unwrap_or_default(); + let size = part + .file + .as_ref() + .map(|f| human_size(f.size)) + .unwrap_or_default(); + let format = part.format.clone().unwrap_or_default(); + let notes = part.notes.clone().unwrap_or_default(); + let units = part.units.clone().unwrap_or_default(); + let print_settings = part.print_settings.clone().unwrap_or_default().join("\n"); + let bbox = part.dimensions.clone(); + let pname_w = self.clone(); + let premove_w = self.clone(); + let notes_w = self.clone(); + let units_w = self.clone(); + let prints_w = self.clone(); rsx! { - ul { class: "wizard-image-list", - for (i, image) in images.iter().enumerate() { - { - let alt = image.alt.to_string(); - let ratio = format!("{}×{}", image.aspect_ratio.width, image.aspect_ratio.height); - let cid = image.image.blob().r#ref.as_str().to_string(); - let preview_url = self.image_data_uris.read().get(cid.as_str()) - .map(|uri| uri.to_string()) - .or_else(|| self.did.as_ref().map(|did| image_cdn_url(did, image))); - let alt_w = self.clone(); - let remove_w = self.clone(); - rsx! { - li { key: "image-{is_cover}-{i}", class: "wizard-image", - div { class: "wizard-image-thumb blueprint-media", aria_hidden: "true", - if let Some(url) = preview_url { - img { class: "wizard-image-img", src: "{url}", alt: "" } - } else { - span { class: "blueprint-dimension", "{ratio}" } - } - } + li { key: "part-{mi}-{pi}", class: "wizard-part wizard-part-advanced", + div { class: "wizard-part-main", + label { class: "field wizard-part-name", + span { class: "field-label sr-only", "Part name" } + input { + class: "field-input", + r#type: "text", + value: "{part_name}", + oninput: move |evt| { + let mut c = pname_w.composition; + c.write().models[mi].parts[pi].name = Some(evt.value()); + }, + onblur: move |_| pname_w.clone().mark_dirty_and_save(), + } + } + span { class: "wizard-part-meta card-meta", + if !format.is_empty() { "{format} · " } + "{size}" + } + button { + class: "button button-ghost wizard-remove", + onclick: move |_| { + let mut c = premove_w.composition; + c.write().models[mi].parts.remove(pi); + premove_w.clone().mark_dirty_and_save(); + }, + "Remove" + } + } + div { class: "wizard-part-meta-grid", + label { class: "field", + span { class: "field-label", "Notes" } + input { + class: "field-input", + r#type: "text", + value: "{notes}", + placeholder: "e.g. Print supports off", + oninput: move |evt| { + let mut c = notes_w.composition; + let v = evt.value(); + c.write().models[mi].parts[pi].notes = if v.trim().is_empty() { None } else { Some(v) }; + }, + onblur: move |_| notes_w.clone().mark_dirty_and_save(), + } + } + label { class: "field", + span { class: "field-label", "Units" } + input { + class: "field-input", + r#type: "text", + value: "{units}", + placeholder: "mm", + oninput: move |evt| { + let mut c = units_w.composition; + let v = evt.value(); + c.write().models[mi].parts[pi].units = if v.trim().is_empty() { None } else { Some(v) }; + }, + onblur: move |_| units_w.clone().mark_dirty_and_save(), + } + } + label { class: "field publish-field-wide", + span { class: "field-label", "Print settings" } + textarea { + class: "field-input field-textarea", + value: "{print_settings}", + placeholder: "One setting per line", + oninput: move |evt| { + let mut c = prints_w.composition; + let lines: Vec = evt.value().split('\n').map(str::to_string).collect(); + c.write().models[mi].parts[pi].print_settings = if lines.iter().all(|l| l.trim().is_empty()) { None } else { Some(lines) }; + }, + onblur: move |_| prints_w.clone().mark_dirty_and_save(), + } + } + fieldset { class: "field publish-bbox", + legend { class: "field-label", "Dimensions" } + { self.render_bbox(mi, pi, &bbox) } + } + } + { self.render_images_section(FieldTarget::Part(mi, pi)) } + } + } + } + + /// Dimensions (bbox) inputs for a part. Each axis/unit is written live into + /// the part's `dimensions` (creating an empty bbox on first edit); all-or-none + /// is enforced at `assemble()` via the lexicon validator, so partial values + /// simply block publish until complete — no hand-rolled float checks here. + /// Existing `dimensions.unit` is preserved and defaults to `"mm"`. + fn render_bbox(&self, mi: usize, pi: usize, bbox: &Option) -> Element { + let (bx, by, bz, bunit) = match bbox { + Some(b) => ( + b.x.as_str().to_string(), + b.y.as_str().to_string(), + b.z.as_str().to_string(), + b.unit + .as_ref() + .map(|u| u.as_str().to_string()) + .unwrap_or_else(|| "mm".to_string()), + ), + None => ( + String::new(), + String::new(), + String::new(), + "mm".to_string(), + ), + }; + + let x_in = self.clone(); + let x_blur = self.clone(); + let y_in = self.clone(); + let y_blur = self.clone(); + let z_in = self.clone(); + let z_blur = self.clone(); + let u_in = self.clone(); + let u_blur = self.clone(); + rsx! { + div { class: "publish-bbox-row", + label { class: "field", + span { class: "field-label sr-only", "Width (X)" } + input { + class: "field-input", + r#type: "text", + inputmode: "decimal", + value: "{bx}", + placeholder: "X", + aria_label: "Width", + oninput: move |evt| Flow::set_bbox_axis(&x_in, mi, pi, BboxField::X, evt.value()), + onblur: move |_| x_blur.clone().mark_dirty_and_save(), + } + } + label { class: "field", + span { class: "field-label sr-only", "Depth (Y)" } + input { + class: "field-input", + r#type: "text", + inputmode: "decimal", + value: "{by}", + placeholder: "Y", + aria_label: "Depth", + oninput: move |evt| Flow::set_bbox_axis(&y_in, mi, pi, BboxField::Y, evt.value()), + onblur: move |_| y_blur.clone().mark_dirty_and_save(), + } + } + label { class: "field", + span { class: "field-label sr-only", "Height (Z)" } + input { + class: "field-input", + r#type: "text", + inputmode: "decimal", + value: "{bz}", + placeholder: "Z", + aria_label: "Height", + oninput: move |evt| Flow::set_bbox_axis(&z_in, mi, pi, BboxField::Z, evt.value()), + onblur: move |_| z_blur.clone().mark_dirty_and_save(), + } + } + label { class: "field", + span { class: "field-label sr-only", "Dimension unit" } + input { + class: "field-input", + r#type: "text", + value: "{bunit}", + placeholder: "mm", + aria_label: "Dimension unit", + oninput: move |evt| Flow::set_bbox_axis(&u_in, mi, pi, BboxField::Unit, evt.value()), + onblur: move |_| u_blur.clone().mark_dirty_and_save(), + } + } + } + } + } + + /// Mutate a single bbox field on a part, initializing an empty bbox when + /// none exists yet. A bbox that ends up fully empty is dropped so the draft + /// stays clean and does not block publish with a partial/empty dimensions. + fn set_bbox_axis(&self, mi: usize, pi: usize, field: BboxField, value: String) { + let mut c = self.composition; + let mut g = c.write(); + let Some(part) = g.models.get_mut(mi).and_then(|m| m.parts.get_mut(pi)) else { + return; + }; + let bbox = part.dimensions.get_or_insert_with(|| Bbox { + unit: None, + x: "".into(), + y: "".into(), + z: "".into(), + extra_data: None, + }); + match field { + BboxField::X => bbox.x = value.into(), + BboxField::Y => bbox.y = value.into(), + BboxField::Z => bbox.z = value.into(), + BboxField::Unit => { + bbox.unit = if value.trim().is_empty() { + None + } else { + Some(value.into()) + }; + } + } + // Drop a dimensions with no axes set so it does not serialize or block + // publish with a partial (unit-only) bbox — unit alone is not a dimension. + if bbox.x.as_str().trim().is_empty() + && bbox.y.as_str().trim().is_empty() + && bbox.z.as_str().trim().is_empty() + { + part.dimensions = None; + } + } + + // ---- Shared field renderers (one implementation per field type) ---- + + fn render_summary_section(&self, target: FieldTarget, wrapped: bool) -> Element { + let composition = self.composition.read(); + let value = match target { + FieldTarget::Thing => composition.summary.clone().unwrap_or_default(), + FieldTarget::Model(mi) => composition + .models + .get(mi) + .and_then(|m| m.summary.clone()) + .unwrap_or_default(), + FieldTarget::Part(_, _) => return rsx! {}, + }; + drop(composition); + let w = self.clone(); + let field = rsx! { + label { class: "field", + span { class: "field-label", "Summary" } + textarea { + class: "field-input field-textarea", + value: "{value}", + placeholder: "What is it?", + oninput: move |evt| { + let v = evt.value(); + let mut c = w.composition; + let mut g = c.write(); + match target { + FieldTarget::Thing => g.summary = if v.trim().is_empty() { None } else { Some(v) }, + FieldTarget::Model(mi) => { + if let Some(m) = g.models.get_mut(mi) { + m.summary = if v.trim().is_empty() { None } else { Some(v) }; + } + } + FieldTarget::Part(_, _) => {} + } + }, + onblur: move |_| w.clone().mark_dirty_and_save(), + } + } + }; + if wrapped { + rsx! { + Disclosure { + title: "Summary", + hint: Some("A short description".to_string()), + open: None, + body: field, + } + } + } else { + field + } + } + + fn render_tags_section(&self, target: FieldTarget, wrapped: bool) -> Element { + let composition = self.composition.read(); + let tags = match target { + FieldTarget::Thing => composition.tags.clone().unwrap_or_default(), + FieldTarget::Model(mi) => composition + .models + .get(mi) + .and_then(|m| m.tags.clone()) + .unwrap_or_default(), + FieldTarget::Part(_, _) => return rsx! {}, + }; + drop(composition); + let tags = tags.join(", "); + let w = self.clone(); + let field = rsx! { + label { class: "field", + span { class: "field-label", "Tags" } + input { + class: "field-input", + r#type: "text", + value: "{tags}", + placeholder: "comma, separated", + oninput: move |evt| { + let parsed: Vec = evt.value().split(',').map(|t| t.trim().to_string()).filter(|t| !t.is_empty()).collect(); + let mut c = w.composition; + let mut g = c.write(); + match target { + FieldTarget::Thing => g.tags = if parsed.is_empty() { None } else { Some(parsed) }, + FieldTarget::Model(mi) => { + if let Some(m) = g.models.get_mut(mi) { + m.tags = if parsed.is_empty() { None } else { Some(parsed) }; + } + } + FieldTarget::Part(_, _) => {} + } + }, + onblur: move |_| w.clone().mark_dirty_and_save(), + } + } + }; + if wrapped { + rsx! { + Disclosure { + title: "Tags", + hint: Some("Comma-separated".to_string()), + open: None, + body: field, + } + } + } else { + field + } + } + + fn render_instructions_section(&self, target: FieldTarget) -> Element { + let composition = self.composition.read(); + let value = match target { + FieldTarget::Thing => composition + .instructions + .clone() + .unwrap_or_default() + .join("\n"), + FieldTarget::Model(mi) => composition + .models + .get(mi) + .and_then(|m| m.instructions.clone()) + .unwrap_or_default() + .join("\n"), + FieldTarget::Part(_, _) => return rsx! {}, + }; + drop(composition); + let w = self.clone(); + rsx! { + Disclosure { + title: "Instructions", + hint: "One step per line", + open: None, + body: rsx! { + label { class: "field", + span { class: "field-label sr-only", "Instructions" } + textarea { + class: "field-input field-textarea field-textarea-tall", + value: "{value}", + placeholder: "One step per line", + oninput: move |evt| { + let value = evt.value(); + let lines: Vec = value.split('\n').map(str::to_string).collect(); + let mut c = w.composition; + let mut g = c.write(); + let opt = if value.trim().is_empty() { None } else { Some(lines) }; + match target { + FieldTarget::Thing => g.instructions = opt, + FieldTarget::Model(mi) => { + if let Some(m) = g.models.get_mut(mi) { + m.instructions = opt; + } + } + FieldTarget::Part(_, _) => {} + } + }, + onblur: move |_| w.clone().mark_dirty_and_save(), + } + } + } + } + } + } + + fn render_license_section(&self, target: FieldTarget, wrapped: bool) -> Element { + let composition = self.composition.read(); + let (value, is_default_thing) = match target { + FieldTarget::Thing => { + let v = composition + .license + .clone() + .unwrap_or_else(|| DEFAULT_LICENSE.to_string()); + (v, true) + } + FieldTarget::Model(mi) => { + let v = composition + .models + .get(mi) + .and_then(|m| m.license.clone()) + .unwrap_or_default(); + (v, false) + } + FieldTarget::Part(_, _) => return rsx! {}, + }; + drop(composition); + let license_target = license_target_key(target); + let explicit_custom = self.custom_license_targets.read().contains(&license_target); + let known_license = LICENSE_OPTIONS.contains(&value.as_str()); + let is_custom = explicit_custom || (!value.trim().is_empty() && !known_license); + let selected = if is_custom { + CUSTOM_LICENSE_VALUE + } else { + value.as_str() + }; + let custom_value = if is_custom && known_license { + "" + } else { + value.as_str() + }; + let select_w = self.clone(); + let custom_w = self.clone(); + let custom_blur_w = self.clone(); + let field = rsx! { + div { class: "field publish-license-field", + label { class: "field-label", r#for: "license-{license_target}", "License" } + div { class: "publish-license-controls", + select { + id: "license-{license_target}", + class: "field-input publish-license-select", + value: "{selected}", + onchange: move |evt| { + let selected = evt.value(); + let mut custom_targets = select_w.custom_license_targets; + if selected == CUSTOM_LICENSE_VALUE { + custom_targets.write().insert(license_target.clone()); + return; + } + custom_targets.write().remove(&license_target); + select_w.set_license_value(target, selected); + select_w.clone().mark_dirty_and_save(); + }, + if !is_default_thing { + option { value: "", "Use thing license" } + } + for option in LICENSE_OPTIONS { + option { key: "{option}", value: "{option}", "{option}" } + } + option { value: CUSTOM_LICENSE_VALUE, "Custom…" } + } + if is_custom { + input { + class: "field-input publish-license-custom", + r#type: "text", + value: "{custom_value}", + placeholder: "Custom license string", + aria_label: "Custom license", + oninput: move |evt| { + custom_w.set_license_value(target, evt.value()); + custom_w.mark_dirty(); + }, + onblur: move |_| custom_blur_w.clone().mark_dirty_and_save(), + } + } + } + } + }; + if wrapped { + let quiet = is_default_thing && value == DEFAULT_LICENSE; + rsx! { + Disclosure { + title: "License", + hint: if quiet { Some(DEFAULT_LICENSE.to_string()) } else { None }, + open: None, + body: field, + } + } + } else { + field + } + } + + /// Inline cover-image editor for the thing level (always visible, not + /// collapsed) — the cover is primary product media. + fn render_cover_inline(&self) -> Element { + let composition = self.composition.read(); + let cover = composition.cover.clone().unwrap_or_default(); + drop(composition); + let target = FieldTarget::Thing; + let cover_w = self.clone(); + rsx! { + div { class: "wizard-image-group publish-cover-inline", + span { class: "field-label", "Cover image" } + { self.render_image_upload_status() } + { self.render_image_list(&cover, target, true) } + label { class: "button button-secondary wizard-file-button", + "Add cover image" + input { + class: "wizard-file-input", + r#type: "file", + accept: "image/png,image/jpeg,image/webp,image/gif", + onchange: move |evt| { + if let Some(file) = evt.files().into_iter().next() { + let flow = cover_w.clone(); + spawn(async move { flow.handle_image_upload(target, true, file).await }); + } + }, + } + } + } + } + } + + fn render_images_section(&self, target: FieldTarget) -> Element { + let composition = self.composition.read(); + // Cover is rendered inline at the thing level (render_cover_inline), so + // this section only renders previews there; per-model it renders both. + let cover = match target { + FieldTarget::Model(mi) => composition + .models + .get(mi) + .and_then(|m| m.cover.clone()) + .unwrap_or_default(), + _ => Vec::new(), + }; + let previews = match target { + FieldTarget::Thing => composition.previews.clone().unwrap_or_default(), + FieldTarget::Model(mi) => composition + .models + .get(mi) + .and_then(|m| m.previews.clone()) + .unwrap_or_default(), + FieldTarget::Part(mi, pi) => composition + .models + .get(mi) + .and_then(|m| m.parts.get(pi)) + .and_then(|p| p.previews.clone()) + .unwrap_or_default(), + }; + let has_cover_group = matches!(target, FieldTarget::Model(_)); + drop(composition); + let cover_w = self.clone(); + let preview_w = self.clone(); + let (title, hint) = if has_cover_group { + ("Images".to_string(), Some("Cover and previews".to_string())) + } else { + ( + "Preview images".to_string(), + Some("Additional views".to_string()), + ) + }; + rsx! { + Disclosure { + title, + hint, + open: None, + body: rsx! { + if has_cover_group { + { self.render_image_upload_status() } + } + if has_cover_group { + div { class: "wizard-image-group", + h3 { class: "wizard-subhead", "Cover" } + { self.render_image_list(&cover, target, true) } + label { class: "button button-secondary wizard-file-button", + "Add cover image" + input { + class: "wizard-file-input", + r#type: "file", + accept: "image/png,image/jpeg,image/webp,image/gif", + onchange: move |evt| { + if let Some(file) = evt.files().into_iter().next() { + let flow = cover_w.clone(); + spawn(async move { flow.handle_image_upload(target, true, file).await }); + } + }, + } + } + } + } + div { class: "wizard-image-group", + h3 { class: "wizard-subhead", "Previews" } + { self.render_image_list(&previews, target, false) } + label { class: "button button-secondary wizard-file-button", + "Add preview image" + input { + class: "wizard-file-input", + r#type: "file", + accept: "image/png,image/jpeg,image/webp,image/gif", + onchange: move |evt| { + if let Some(file) = evt.files().into_iter().next() { + let flow = preview_w.clone(); + spawn(async move { flow.handle_image_upload(target, false, file).await }); + } + }, + } + } + } + } + } + } + } + + fn render_image_list(&self, images: &[Image], target: FieldTarget, is_cover: bool) -> Element { + if images.is_empty() { + return rsx! { p { class: "wizard-empty", "No images yet." } }; + } + rsx! { + ul { class: "wizard-image-list", + for (i, image) in images.iter().enumerate() { + { + let alt = image.alt.to_string(); + let ratio = format!("{}×{}", image.aspect_ratio.width, image.aspect_ratio.height); + let cid = image.image.blob().r#ref.as_str().to_string(); + let preview_url = self.image_data_uris.read().get(cid.as_str()) + .map(|uri| uri.to_string()) + .or_else(|| self.did.as_ref().map(|did| image_cdn_url(did, image))); + let alt_w = self.clone(); + let alt_blur_w = self.clone(); + let remove_w = self.clone(); + rsx! { + li { key: "image-{is_cover}-{i}", class: "wizard-image", + div { class: "wizard-image-thumb blueprint-media", aria_hidden: "true", + if let Some(url) = preview_url { + img { class: "wizard-image-img", src: "{url}", alt: "" } + } else { + span { class: "blueprint-dimension", "{ratio}" } + } + } label { class: "field wizard-image-alt", span { class: "field-label", "Alt text" } input { @@ -822,7 +1606,7 @@ impl Wizard { oninput: move |evt| { let mut c = alt_w.composition; let mut guard = c.write(); - let list = if is_cover { guard.cover.as_mut() } else { guard.previews.as_mut() }; + let list = image_list_mut(&mut guard, target, is_cover); if let Some(list) = list && let Some(img) = list.get_mut(i) { @@ -831,6 +1615,7 @@ impl Wizard { drop(guard); alt_w.mark_dirty(); }, + onblur: move |_| alt_blur_w.clone().mark_dirty_and_save(), } } button { @@ -838,14 +1623,12 @@ impl Wizard { onclick: move |_| { let mut c = remove_w.composition; let mut guard = c.write(); - let list = if is_cover { guard.cover.as_mut() } else { guard.previews.as_mut() }; - if let Some(list) = list - && i < list.len() - { + let list = image_list_mut(&mut guard, target, is_cover); + if let Some(list) = list && i < list.len() { list.remove(i); } drop(guard); - remove_w.mark_dirty(); + remove_w.clone().mark_dirty_and_save(); }, "Remove" } @@ -857,132 +1640,148 @@ impl Wizard { } } - async fn handle_image_upload(self, is_cover: bool, file: FileData) { - let filename = file.name(); - let mut status = self.image_upload; - status.set(UploadStatus::Uploading(filename.clone())); - let bytes = match file.read_bytes().await { - Ok(bytes) => bytes.to_vec(), - Err(_) => { - status.set(UploadStatus::Error( - "Could not read the selected image.".into(), - )); - return; - } - }; - let mime = file - .content_type() - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| mime_from_filename(&filename).to_string()); - match draft_client::upload_image(&self.client, &filename, &mime, bytes.clone()).await { - Ok(image) => { - { - let cid = image.image.blob().r#ref.as_str().to_string(); - let data_uri = data_uri_from_bytes(&bytes, &mime); - let mut data_uris = self.image_data_uris; - data_uris.write().insert(cid.into(), data_uri); - let mut composition = self.composition; - let mut guard = composition.write(); - let list = if is_cover { - guard.cover.get_or_insert_with(Vec::new) - } else { - guard.previews.get_or_insert_with(Vec::new) - }; - list.push(image); - } - status.set(UploadStatus::Idle); - let wizard = self.clone(); - wizard.save_draft().await; - } - Err(error) => { - status.set(UploadStatus::Error(format!("Image upload failed: {error}"))); - } - } - } - - fn render_details(&self) -> Element { + /// "Works with" — paste one or more thing URLs or `at://` URIs; each resolves + /// to a `StrongRef` and renders as a removable chip showing the thing's name. + fn render_works_with_section(&self) -> Element { let composition = self.composition.read(); - let instructions = composition - .instructions + let refs = composition + .intended_to_work_with .clone() - .unwrap_or_default() - .join("\n"); - let license = composition - .license - .clone() - .unwrap_or_else(|| DEFAULT_LICENSE.to_string()); - let tags = composition.tags.clone().unwrap_or_default(); + .unwrap_or_default(); drop(composition); - - let tags = tags.join(", "); - let license_w = self.clone(); - let tags_w = self.clone(); - let instructions_w = self.clone(); rsx! { - h2 { "Details" } - label { class: "field", - span { class: "field-label", "License" } - input { - class: "field-input", - r#type: "text", - list: "license-options", - value: "{license}", - placeholder: "{DEFAULT_LICENSE}", - oninput: move |evt| { - let mut c = license_w.composition; - let v = evt.value(); - c.write().license = if v.trim().is_empty() { None } else { Some(v) }; - license_w.mark_dirty(); - }, - } - datalist { id: "license-options", - for option in LICENSE_OPTIONS { - option { key: "{option}", value: "{option}" } + Disclosure { + title: "Works with", + hint: "Compatibility links to other things", + open: None, + body: rsx! { + { self.render_works_with_status() } + if !refs.is_empty() { + ul { class: "publish-compat-list", + for (i, r) in refs.iter().enumerate() { + { + let label = chip_label(self, r); + let remove_w = self.clone(); + rsx! { + li { key: "{i}", class: "publish-compat-chip", + span { "{label}" } + button { + class: "button button-ghost publish-compat-remove", + aria_label: "Remove {label}", + onclick: move |_| { + let mut c = remove_w.composition; + let mut g = c.write(); + if let Some(list) = g.intended_to_work_with.as_mut() { + list.remove(i); + if list.is_empty() { + g.intended_to_work_with = None; + } + } + drop(g); + remove_w.clone().mark_dirty_and_save(); + }, + "×" + } + } + } + } + } + } } + { self.render_works_with_input() } } } + } + } + + /// The "Works with" paste field, bound to `works_with_text`. + fn render_works_with_input(&self) -> Element { + let current = self.works_with_text.read().clone(); + let text_sig = self.works_with_text; + let flow = self.clone(); + rsx! { label { class: "field", - span { class: "field-label", "Tags" } - input { - class: "field-input", - r#type: "text", - value: "{tags}", - placeholder: "comma, separated", + span { class: "field-label sr-only", "Add compatible things" } + textarea { + class: "field-input field-textarea", + placeholder: "Paste a thing URL or at:// URI (one per line)", + value: "{current}", oninput: move |evt| { - let mut c = tags_w.composition; - let parsed: Vec = evt - .value() - .split(',') - .map(|t| t.trim().to_string()) - .filter(|t| !t.is_empty()) - .collect(); - c.write().tags = if parsed.is_empty() { None } else { Some(parsed) }; - tags_w.mark_dirty(); + let mut text_sig = text_sig; + text_sig.set(evt.value()); + }, + onblur: move |_| { + let value = text_sig.read().clone(); + if value.trim().is_empty() { + return; + } + let flow = flow.clone(); + spawn(async move { flow.resolve_works_with(value).await }); }, } } - label { class: "field", - span { class: "field-label", "Instructions" } - textarea { - class: "field-input field-textarea field-textarea-tall", - value: "{instructions}", - placeholder: "One step per line", - oninput: move |evt| { - let mut c = instructions_w.composition; - let value = evt.value(); - // Store the text exactly as typed (split only on newlines) so - // spaces and blank lines survive editing; empty lines are - // dropped at assembly. - let lines: Vec = value.split('\n').map(str::to_string).collect(); - c.write().instructions = if value.trim().is_empty() { None } else { Some(lines) }; - instructions_w.mark_dirty(); - }, + } + } + + async fn resolve_works_with(self, text: String) { + { + let mut status = self.works_with_status; + status.set(UploadStatus::Idle); + } + let tokens: Vec = text.split_whitespace().map(str::to_string).collect(); + let mut added = false; + let mut unresolved: Vec = Vec::new(); + for token in tokens { + match parse_thing_token(&token) { + Ok(uri) => match draft_client::resolve_strong_ref(&uri).await { + Ok(resolved) => { + let uri_str = resolved.strong_ref.uri.as_str().to_string(); + let name = resolved.name.clone(); + let already_present = { + let g = self.composition.read(); + g.intended_to_work_with + .as_ref() + .map(|list| list.iter().any(|r| r.uri.as_str() == uri_str)) + .unwrap_or(false) + }; + if !already_present { + let mut c = self.composition; + let mut g = c.write(); + let list = g.intended_to_work_with.get_or_insert_with(Vec::new); + list.push(resolved.strong_ref); + if let Some(name) = name { + let mut names = self.compat_names; + names.write().insert(uri_str, name); + } + added = true; + } + } + Err(error) => { + unresolved.push(token.clone()); + let mut status = self.works_with_status; + status.set(UploadStatus::Error(format!( + "Could not resolve “{token}”: {error}" + ))); + } + }, + Err(error) => { + unresolved.push(token.clone()); + let mut status = self.works_with_status; + status.set(UploadStatus::Error(format!("“{token}”: {error}"))); } } } + // Keep only the tokens that did not resolve, so the user can fix them; + // clear the field once everything resolved. + let mut text_sig = self.works_with_text; + text_sig.set(unresolved.join("\n")); + if added { + self.mark_dirty_and_save(); + } } - fn render_review(&self) -> Element { + /// Compact "what's public" confirm + Publish at the page bottom. + fn render_confirm(&self) -> Element { let composition = self.composition.read(); let assembled = composition.assemble(); let name = composition.display_name().unwrap_or("Untitled").to_string(); @@ -997,6 +1796,11 @@ impl Wizard { let cover_count = composition.cover.as_ref().map(|c| c.len()).unwrap_or(0); let preview_count = composition.previews.as_ref().map(|p| p.len()).unwrap_or(0); let instructions = composition.instructions.clone().unwrap_or_default(); + let works_count = composition + .intended_to_work_with + .as_ref() + .map(|w| w.len()) + .unwrap_or(0); drop(composition); let publishing = matches!(*self.phase.read(), PublishPhase::Publishing); @@ -1005,99 +1809,96 @@ impl Wizard { .as_ref() .map(|e| e.has_field("name")) .unwrap_or(false); - let license_error = issues - .as_ref() - .map(|e| e.has_field("license")) - .unwrap_or(false); let name_row_class = if name_error { "wizard-review-row is-error" } else { "wizard-review-row" }; - let license_row_class = if license_error { - "wizard-review-row is-error" - } else { - "wizard-review-row" - }; let can_publish = assembled.is_ok() && !publishing; let publish_w = self.clone(); rsx! { - h2 { "Review & publish" } - p { class: "wizard-step-hint", "This is what becomes public when you publish." } - - div { class: "wizard-review", - div { class: "{name_row_class}", - span { class: "field-label", "Name" } - span { "{name}" } - } - div { class: "{license_row_class}", - span { class: "field-label", "License" } - span { class: "status-pill", "{license}" } - } - if !summary.is_empty() { - div { class: "wizard-review-row", - span { class: "field-label", "Summary" } - span { "{summary}" } + section { class: "wizard-body blueprint-panel publish-confirm", aria_label: "Review and publish", + if let Some(issues) = issues { + div { class: "wizard-issues error-state state-card", role: "alert", + h3 { class: "wizard-subhead", "Fix these before publishing" } + ul { class: "instruction-list", + for issue in issues.issues { + li { key: "{issue.field}", "{issue.message}" } + } + } } } - if !tags.is_empty() { + div { class: "wizard-review", + div { class: "{name_row_class}", + span { class: "field-label", "Name" } + span { "{name}" } + } div { class: "wizard-review-row", - span { class: "field-label", "Tags" } - div { class: "thing-card-chips", - for tag in tags { span { key: "{tag}", class: "status-pill", "{tag}" } } + span { class: "field-label", "License" } + span { class: "status-pill", "{license}" } + } + if !summary.is_empty() { + div { class: "wizard-review-row", + span { class: "field-label", "Summary" } + span { "{summary}" } } } - } - div { class: "wizard-review-row", - span { class: "field-label", "Media" } - span { class: "card-meta", "{cover_count} cover · {preview_count} preview" } - } - div { class: "wizard-review-row", - span { class: "field-label", "Models ({model_count})" } - div { class: "wizard-review-models", - for (mi, model) in models.iter().enumerate() { - { - let mname = model.name.clone().unwrap_or_else(|| format!("Model {}", mi + 1)); - let part_count = model.parts.len(); - rsx! { - div { key: "review-model-{mi}", class: "wizard-review-model", - strong { "{mname}" } - span { class: "card-meta", "{part_count} part(s)" } + if !tags.is_empty() { + div { class: "wizard-review-row", + span { class: "field-label", "Tags" } + div { class: "thing-card-chips", + for tag in tags { span { key: "{tag}", class: "status-pill", "{tag}" } } + } + } + } + div { class: "wizard-review-row", + span { class: "field-label", "Media" } + span { class: "card-meta", "{cover_count} cover · {preview_count} preview" } + } + div { class: "wizard-review-row", + span { class: "field-label", "Models ({model_count})" } + div { class: "wizard-review-models", + for (mi, model) in models.iter().enumerate() { + { + let mname = model.name.clone().unwrap_or_else(|| format!("Model {}", mi + 1)); + let part_count = model.parts.len(); + rsx! { + div { key: "review-model-{mi}", class: "wizard-review-model", + strong { "{mname}" } + span { class: "card-meta", "{part_count} part(s)" } + } } } } } } - } - if !instructions.is_empty() { - div { class: "wizard-review-row", - span { class: "field-label", "Instructions" } - span { class: "card-meta", "{instructions.len()} step(s)" } + if !instructions.is_empty() { + div { class: "wizard-review-row", + span { class: "field-label", "Instructions" } + span { class: "card-meta", "{instructions.len()} step(s)" } + } } - } - } - - if let Some(issues) = issues { - div { class: "wizard-issues error-state state-card", role: "alert", - h3 { class: "wizard-subhead", "Fix these before publishing" } - ul { class: "instruction-list", - for issue in issues.issues { - li { key: "{issue.field}", "{issue.message}" } + if works_count > 0 { + div { class: "wizard-review-row", + span { class: "field-label", "Works with" } + span { class: "card-meta", "{works_count} link(s)" } } } } - } - div { class: "wizard-publish-row", - button { - class: "button button-primary wizard-publish", - disabled: !can_publish, - onclick: move |_| { - let wizard = publish_w.clone(); - spawn(async move { wizard.publish().await }); - }, - if publishing { "Publishing…" } else { "Publish" } + + + div { class: "wizard-publish-row", + button { + class: "button button-primary wizard-publish", + disabled: !can_publish, + onclick: move |_| { + let wizard = publish_w.clone(); + spawn(async move { wizard.publish().await }); + }, + if publishing { "Publishing…" } else { "Publish" } + } } } } @@ -1105,14 +1906,29 @@ impl Wizard { async fn publish(self) { // Persist the latest edits first. If that save fails, do NOT publish — - // otherwise we would publish stale server-side draft state. - self.clone().save_draft().await; - if matches!(*self.save.read(), SaveState::Error) { - let mut phase = self.phase; - phase.set(PublishPhase::Failed( - "Could not save your latest changes, so nothing was published. Try again.".into(), - )); - return; + // otherwise we would publish stale server-side draft state. Re-save + // until the state settles (an in-flight blur-save can leave us Dirty), + // so the server-side draft reflects every edit before we publish it. + loop { + self.clone().save_draft().await; + match *self.save.read() { + SaveState::Error => { + let mut phase = self.phase; + phase.set(PublishPhase::Failed( + "Could not save your latest changes, so nothing was published. Try again." + .into(), + )); + return; + } + SaveState::Saved => break, + // Dirty/Saving/New: a save is in flight or coalesced our edit. + // Yield to the executor so that save's future can complete and + // clear the guard, then loop to persist the latest state. + SaveState::Dirty | SaveState::Saving | SaveState::New => { + dioxus_sdk::time::sleep(std::time::Duration::from_millis(50)).await; + continue; + } + } } let Some(id) = self.draft_id.read().clone() else { let mut phase = self.phase; @@ -1151,6 +1967,347 @@ impl Wizard { } } +impl Flow { + /// Stage every dropped/picked file through one batch: ensure the default + /// model + auto name, stage each file (stop at first failure), then save once. + async fn handle_files_upload(self, files: Vec) { + let mut upload = self.upload; + let first_name = files.first().map(|f| f.name()).unwrap_or_default(); + { + let mut composition = self.composition; + let mut g = composition.write(); + ensure_default_model_for_upload(&mut g, &first_name); + } + let count = files.len(); + upload.set(UploadStatus::Uploading(if count == 1 { + first_name.clone() + } else { + format!("{count} files") + })); + for file in files { + let filename = file.name(); + match file.read_bytes().await { + Ok(bytes) => { + let bytes = bytes.to_vec(); + let mime = file + .content_type() + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| mime_from_filename(&filename).to_string()); + match draft_client::stage_file(&self.client, &filename, &mime, bytes.clone()) + .await + { + Ok(staged) => { + let format = format_from_filename(&filename); + let mut part = DraftPartInput { + name: Some(filename.clone()), + upload_id: Some(staged.upload_id.to_string()), + file: Some(staged.file), + format: format.clone(), + ..Default::default() + }; + let preview = if supports_generated_preview(&filename) { + generate_preview( + self.client.clone(), + filename.clone(), + bytes, + self.upload, + self.image_data_uris, + ) + .await + } else { + None + }; + let was_first = { + let g = self.composition.read(); + g.models.first().map(|m| m.parts.is_empty()).unwrap_or(true) + }; + let mut composition = self.composition; + let mut g = composition.write(); + if let Some(image) = preview { + let parts_before_push = + g.models.first().map_or(0, |m| m.parts.len()); + attach_generated_preview( + &mut g, + 0, + parts_before_push, + &mut part, + image, + ); + } + if let Some(model) = g.models.get_mut(0) { + model.parts.push(part); + } + drop(g); + // Focus the name field once, on the first staged + // file, so the user lands on the next likely edit. + if was_first && let Some(element) = self.name_element.read().clone() { + let name_element = self.name_element; + spawn(async move { + let _ = element.set_focus(true).await; + let _ = name_element; + }); + } + } + Err(error) => { + upload.set(UploadStatus::Error(format!( + "Upload failed for {filename}: {error}" + ))); + let flow = self.clone(); + flow.save_draft().await; + return; + } + } + } + Err(_) => { + upload.set(UploadStatus::Error(format!("Could not read {filename}."))); + let flow = self.clone(); + flow.save_draft().await; + return; + } + } + } + upload.set(UploadStatus::Idle); + let flow = self.clone(); + flow.save_draft().await; + } + + /// Stage a single file into a specific model (the per-model "Add a file" + /// button). Shares the per-file routine; saves once. + async fn stage_file_into(self, model_index: usize, file: FileData) { + let filename = file.name(); + let mut upload = self.upload; + upload.set(UploadStatus::Uploading(filename.clone())); + let bytes = match file.read_bytes().await { + Ok(bytes) => bytes.to_vec(), + Err(_) => { + upload.set(UploadStatus::Error( + "Could not read the selected file.".into(), + )); + return; + } + }; + let mime = file + .content_type() + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| mime_from_filename(&filename).to_string()); + match draft_client::stage_file(&self.client, &filename, &mime, bytes.clone()).await { + Ok(staged) => { + let format = format_from_filename(&filename); + let mut part = DraftPartInput { + name: Some(filename.clone()), + upload_id: Some(staged.upload_id.to_string()), + file: Some(staged.file), + format: format.clone(), + ..Default::default() + }; + let preview = if supports_generated_preview(&filename) { + generate_preview( + self.client.clone(), + filename.clone(), + bytes, + self.upload, + self.image_data_uris, + ) + .await + } else { + None + }; + { + let mut composition = self.composition; + let mut guard = composition.write(); + if let Some(image) = preview { + let parts_before_push = + guard.models.get(model_index).map_or(0, |m| m.parts.len()); + attach_generated_preview( + &mut guard, + model_index, + parts_before_push, + &mut part, + image, + ); + } + if let Some(model) = guard.models.get_mut(model_index) { + model.parts.push(part); + } + } + upload.set(UploadStatus::Idle); + let flow = self.clone(); + flow.save_draft().await; + } + Err(error) => { + upload.set(UploadStatus::Error(format!("Upload failed: {error}"))); + } + } + } + + /// Upload an image and attach it to the target's cover/previews, then save + /// once after success. The image-upload status is its own signal so it does + /// not race the file-upload status. + async fn handle_image_upload(self, target: FieldTarget, is_cover: bool, file: FileData) { + let filename = file.name(); + let mut status = self.image_upload; + status.set(UploadStatus::Uploading(filename.clone())); + let bytes = match file.read_bytes().await { + Ok(bytes) => bytes.to_vec(), + Err(_) => { + status.set(UploadStatus::Error( + "Could not read the selected image.".into(), + )); + return; + } + }; + let mime = file + .content_type() + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| mime_from_filename(&filename).to_string()); + match draft_client::upload_image(&self.client, &filename, &mime, bytes.clone()).await { + Ok(image) => { + { + let cid = image.image.blob().r#ref.as_str().to_string(); + let data_uri = data_uri_from_bytes(&bytes, &mime); + let mut data_uris = self.image_data_uris; + data_uris.write().insert(cid.into(), data_uri); + let mut composition = self.composition; + let mut guard = composition.write(); + let list = image_list_mut(&mut guard, target, is_cover); + if let Some(list) = list { + list.push(image); + } + } + status.set(UploadStatus::Idle); + self.mark_dirty_and_save(); + } + Err(error) => { + status.set(UploadStatus::Error(format!("Image upload failed: {error}"))); + } + } + } +} + +/// A controlled `
` disclosure. When `open` is `Some(signal)` the caller +/// drives open-state (the Advanced section, opened by the auto-expand effect); +/// when `None` the disclosure manages its own open-state. In both cases +/// `ontoggle` reads the real DOM open-state back into the owning signal so the +/// program and the user share one synced source of truth without fighting on +/// re-render. +#[component] +fn Disclosure( + title: String, + hint: Option, + open: Option>, + body: Element, +) -> Element { + let local = use_signal(|| false); + let on_toggle = move |evt: ToggleEvent| { + if let Some(now_open) = read_details_open(&evt) { + match open { + Some(signal) => { + let mut signal = signal; + signal.set(now_open); + } + None => { + let mut local = local; + local.set(now_open); + } + } + } + }; + let is_open = match open { + Some(signal) => *signal.read(), + None => *local.read(), + }; + rsx! { + details { class: "publish-disclosure", open: is_open, ontoggle: on_toggle, + summary { class: "publish-disclosure-summary", + h3 { class: "publish-disclosure-title", "{title}" } + if let Some(hint) = &hint { + span { class: "publish-disclosure-hint card-meta", "{hint}" } + } + } + div { class: "publish-disclosure-body", {body} } + } + } +} + +/// Read the real open-state of a toggled `
` from its DOM target. Wasm +/// only; returns `None` off-wasm (where the toggle event has no web backing). +#[cfg(target_arch = "wasm32")] +fn read_details_open(evt: &ToggleEvent) -> Option { + use dioxus::web::WebEventExt; + use wasm_bindgen::JsCast; + evt.try_as_web_event() + .and_then(|e| e.target()) + .and_then(|t| t.dyn_into::().ok()) + .map(|el| el.open()) +} + +#[cfg(not(target_arch = "wasm32"))] +fn read_details_open(_evt: &ToggleEvent) -> Option { + None +} + +fn image_list_mut( + thing: &mut DraftThingInput, + target: FieldTarget, + is_cover: bool, +) -> Option<&mut Vec> { + match target { + FieldTarget::Thing => { + if is_cover { + Some(thing.cover.get_or_insert_with(Vec::new)) + } else { + Some(thing.previews.get_or_insert_with(Vec::new)) + } + } + FieldTarget::Model(mi) => { + let model = thing.models.get_mut(mi)?; + if is_cover { + Some(model.cover.get_or_insert_with(Vec::new)) + } else { + Some(model.previews.get_or_insert_with(Vec::new)) + } + } + FieldTarget::Part(mi, pi) => { + let part = thing.models.get_mut(mi)?.parts.get_mut(pi)?; + Some(part.previews.get_or_insert_with(Vec::new)) + } + } +} + +fn license_target_key(target: FieldTarget) -> String { + match target { + FieldTarget::Thing => "thing".to_string(), + FieldTarget::Model(mi) => format!("model-{mi}"), + FieldTarget::Part(mi, pi) => format!("part-{mi}-{pi}"), + } +} + +fn is_initial_composition(composition: &DraftThingInput) -> bool { + composition.name.is_none() + && matches!(composition.license.as_deref(), None | Some(DEFAULT_LICENSE)) + && composition.summary.is_none() + && composition.tags.is_none() + && composition.instructions.is_none() + && composition.cover.is_none() + && composition.previews.is_none() + && composition.derived_from.is_none() + && composition.intended_to_work_with.is_none() + && composition.models.is_empty() +} + +/// A short human label for a resolved "works with" chip: the resolved thing's +/// name when known, else the rkey (never a raw URI or CID). +fn chip_label(flow: &Flow, r: &StrongRef) -> String { + if let Some(name) = flow.compat_names.read().get(r.uri.as_str()) { + return name.clone(); + } + if let Some(rkey) = r.uri.rkey() { + rkey.as_str().to_string() + } else { + "thing".to_string() + } +} + /// Best-effort MIME type from a filename extension (the server re-sniffs image /// dimensions independently). fn mime_from_filename(name: &str) -> &'static str { @@ -1181,6 +2338,13 @@ fn format_from_filename(name: &str) -> Option { } } +fn supports_generated_preview(name: &str) -> bool { + matches!( + extension(name).as_deref(), + Some("stl" | "obj" | "gltf" | "glb" | "step" | "stp") + ) +} + fn extension(name: &str) -> Option { name.rsplit_once('.') .map(|(_, ext)| ext.to_ascii_lowercase()) @@ -1210,6 +2374,27 @@ fn attach_preview(part: &mut DraftPartInput, image: Image) { part.previews = Some(vec![image]); } +fn attach_generated_preview( + composition: &mut DraftThingInput, + model_index: usize, + parts_before_push: usize, + part: &mut DraftPartInput, + image: Image, +) { + maybe_seed_cover(composition, model_index, parts_before_push, &image); + composition + .previews + .get_or_insert_with(Vec::new) + .push(image.clone()); + if let Some(model) = composition.models.get_mut(model_index) { + model + .previews + .get_or_insert_with(Vec::new) + .push(image.clone()); + } + attach_preview(part, image); +} + /// Seed the thing-level cover from the first file of the first model when no /// cover exists. Only fires for `model_index == 0` when the model has zero /// parts *before* pushing the new one (the first file overall) and cover is @@ -1289,6 +2474,22 @@ mod renderer_preview { width: u32, height: u32, ) -> Result, String> { + if is_step_filename(filename) { + let step_url = blob_url_for_bytes(bytes, "model/step")?; + let glb_url = match convert_step_to_glb_url(step_url.clone()).await { + Ok(url) => url, + Err(error) => { + let _ = web_sys::Url::revoke_object_url(&step_url); + return Err(error); + } + }; + let result = + request_preview_png(MeshFormat::Gltf, glb_url.clone(), width, height).await; + let _ = web_sys::Url::revoke_object_url(&glb_url); + let _ = web_sys::Url::revoke_object_url(&step_url); + return result; + } + let format = MeshFormat::from_extension(filename) .ok_or_else(|| "unsupported preview format".to_string())?; let blob_url = blob_url_for_bytes(bytes, mime_from_format(format))?; @@ -1318,6 +2519,114 @@ mod renderer_preview { .map_err(|e| format!("preview blob URL: {e:?}")) } + fn is_step_filename(filename: &str) -> bool { + filename + .rsplit_once('.') + .map(|(_, ext)| matches!(ext.to_ascii_lowercase().as_str(), "step" | "stp")) + .unwrap_or(false) + } + + async fn convert_step_to_glb_url(step_url: String) -> Result { + let opts = web_sys::WorkerOptions::new(); + opts.set_type(web_sys::WorkerType::Module); + let worker = web_sys::Worker::new_with_options("/step_worker_loader.js", &opts) + .map_err(|e| format!("STEP preview worker: {e:?}"))?; + let worker_for_message = worker.clone(); + let worker_for_error = worker.clone(); + let promise = js_sys::Promise::new(&mut move |resolve, reject| { + let step_url = step_url.clone(); + let worker_for_message = worker_for_message.clone(); + let resolve_message = resolve.clone(); + let reject_message = reject.clone(); + let onmessage = Closure::wrap(Box::new(move |event: web_sys::MessageEvent| { + let data = event.data(); + let kind = js_string_field(&data, "kind").unwrap_or_default(); + match kind.as_str() { + "ready" => { + let msg = js_sys::Object::new(); + let _ = + js_sys::Reflect::set(&msg, &"command".into(), &"convert-step".into()); + let _ = + js_sys::Reflect::set(&msg, &"stepUrl".into(), &step_url.clone().into()); + if let Err(e) = worker_for_message.post_message(&msg) { + let _ = reject_message.call1( + &JsValue::NULL, + &JsValue::from_str(&format!("STEP preview command post: {e:?}")), + ); + } + } + "converted" => { + let Some(buffer) = js_value_field(&data, "buffer") else { + let _ = reject_message.call1( + &JsValue::NULL, + &JsValue::from_str("STEP preview returned no GLB bytes"), + ); + return; + }; + let bytes = js_sys::Uint8Array::new(&buffer); + let parts = js_sys::Array::new(); + parts.push(&bytes.buffer()); + let opts = web_sys::BlobPropertyBag::new(); + opts.set_type("model/gltf-binary"); + let blob = match web_sys::Blob::new_with_buffer_source_sequence_and_options( + &parts, &opts, + ) { + Ok(blob) => blob, + Err(e) => { + let _ = reject_message.call1( + &JsValue::NULL, + &JsValue::from_str(&format!("STEP preview GLB blob: {e:?}")), + ); + return; + } + }; + match web_sys::Url::create_object_url_with_blob(&blob) { + Ok(url) => { + let _ = + resolve_message.call1(&JsValue::NULL, &JsValue::from_str(&url)); + } + Err(e) => { + let _ = reject_message.call1( + &JsValue::NULL, + &JsValue::from_str(&format!("STEP preview GLB URL: {e:?}")), + ); + } + } + } + "error" => { + let message = js_string_field(&data, "message") + .unwrap_or_else(|| "STEP preview conversion failed".into()); + let _ = reject_message.call1(&JsValue::NULL, &JsValue::from_str(&message)); + } + _ => {} + } + }) as Box); + let reject_error = reject.clone(); + let onerror = Closure::wrap(Box::new(move |event: web_sys::ErrorEvent| { + let _ = reject_error.call1(&JsValue::NULL, &JsValue::from_str(&event.message())); + }) as Box); + worker.set_onmessage(Some(onmessage.as_ref().unchecked_ref())); + worker.set_onerror(Some(onerror.as_ref().unchecked_ref())); + onmessage.forget(); + onerror.forget(); + }); + let output = wasm_bindgen_futures::JsFuture::from(promise) + .await + .map_err(|e| e.as_string().unwrap_or_else(|| format!("{e:?}")))?; + worker_for_error.terminate(); + output + .as_string() + .ok_or_else(|| "STEP preview returned a non-string GLB URL".to_string()) + } + + fn js_value_field(value: &wasm_bindgen::JsValue, name: &str) -> Option { + js_sys::Reflect::get(value, &name.into()).ok() + } + + fn js_string_field(value: &wasm_bindgen::JsValue, name: &str) -> Option { + js_value_field(value, name).and_then(|v| v.as_string()) + } + async fn request_preview_png( format: MeshFormat, primary_url: String, @@ -1424,6 +2733,17 @@ mod tests { assert_eq!(format_from_filename("a.txt"), None); } + #[test] + fn generated_preview_support_includes_renderer_formats_and_step() { + assert!(supports_generated_preview("part.stl")); + assert!(supports_generated_preview("part.obj")); + assert!(supports_generated_preview("part.glb")); + assert!(supports_generated_preview("part.step")); + assert!(supports_generated_preview("part.STP")); + assert!(!supports_generated_preview("part.3mf")); + assert!(!supports_generated_preview("notes.txt")); + } + #[test] fn human_size_scales_units() { assert_eq!(human_size(512), "512 B"); @@ -1486,6 +2806,26 @@ mod tests { ); } + #[test] + fn attach_generated_preview_sets_part_model_and_thing_preview() { + let mut composition = DraftThingInput { + models: vec![DraftModelInput::default()], + ..Default::default() + }; + let mut part = DraftPartInput::default(); + attach_generated_preview( + &mut composition, + 0, + 0, + &mut part, + test_image("Rendered preview of part.step"), + ); + assert_eq!(composition.cover.as_ref().unwrap().len(), 1); + assert_eq!(composition.previews.as_ref().unwrap().len(), 1); + assert_eq!(composition.models[0].previews.as_ref().unwrap().len(), 1); + assert_eq!(part.previews.as_ref().unwrap().len(), 1); + } + #[test] fn maybe_seed_cover_seeds_first_file_first_model() { let mut composition = DraftThingInput::default(); diff --git a/src/publish/draft.rs b/src/publish/draft.rs index 56f4fec..d0c7eb6 100644 --- a/src/publish/draft.rs +++ b/src/publish/draft.rs @@ -1,4 +1,4 @@ -//! PM-43 publish-draft data model. +//! Publish-draft data model. //! //! A draft is a server-side, non-public, in-progress publish composition. It is //! persisted as a [`DraftThingInput`]: a mirror of the generated @@ -19,13 +19,19 @@ //! length/grapheme limits to the generated [`LexiconSchema::validate`], so draft //! validation cannot drift from the lexicon. +use jacquard::common::types::string::AtUri; use jacquard_common::DefaultStr; use jacquard_lexicon::schema::LexiconSchema; use polymodel_api::com_atproto::repo::strong_ref::StrongRef; + +use crate::thing_detail::thing_uri_from_route; use polymodel_api::space_polymodel::library::publish_thing::{ModelInput, PartInput, ThingInput}; -use polymodel_api::space_polymodel::library::{Bbox, File, Image}; +use polymodel_api::space_polymodel::library::{File, Image}; use serde::{Deserialize, Serialize}; +// Re-export leaf types the publish UI edits directly. +pub use polymodel_api::space_polymodel::library::Bbox; + /// The owned string type the generated records use (`DefaultStr`). type S = DefaultStr; @@ -83,10 +89,10 @@ pub struct DraftThingInput { pub cover: Option>, #[serde(default, skip_serializing_if = "Option::is_none")] pub previews: Option>, - /// Out of scope for the PM-43 UI, carried as an optional pass-through. + /// Remix provenance; design pending. Carried pass-through, not yet surfaced. #[serde(default, skip_serializing_if = "Option::is_none")] pub derived_from: Option, - /// Out of scope for the PM-43 UI, carried as an optional pass-through. + /// Thing-level compatibility links, surfaced as resolvable "Works with" chips. #[serde(default, skip_serializing_if = "Option::is_none")] pub intended_to_work_with: Option>, #[serde(default)] @@ -102,7 +108,7 @@ pub struct DraftModelInput { pub name: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub summary: Option, - /// Per-model license override. Out of scope for the PM-43 UI. + /// Per-model license override. #[serde(default, skip_serializing_if = "Option::is_none")] pub license: Option, #[serde(default, skip_serializing_if = "Option::is_none")] @@ -138,7 +144,7 @@ pub struct DraftPartInput { pub format: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub notes: Option, - /// Out of scope for the PM-43 UI, carried as an optional pass-through. + /// Unit label for this part's dimensions (distinct from `dimensions.unit`). #[serde(default, skip_serializing_if = "Option::is_none")] pub units: Option, #[serde(default, skip_serializing_if = "Option::is_none")] @@ -147,10 +153,10 @@ pub struct DraftPartInput { pub dimensions: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub previews: Option>, - /// Out of scope for the PM-43 UI, carried as an optional pass-through. + /// Remix provenance; design pending. Carried pass-through, not yet surfaced. #[serde(default, skip_serializing_if = "Option::is_none")] pub derived_from: Option, - /// Out of scope for the PM-43 UI, carried as an optional pass-through. + /// Part-level compatibility links; not yet surfaced (thing-level only). #[serde(default, skip_serializing_if = "Option::is_none")] pub intended_to_work_with: Option>, } @@ -247,6 +253,7 @@ impl DraftPartInput { } /// A part is publishable when it has a non-empty name and a staged file. + #[allow(dead_code)] pub fn is_publishable(&self) -> bool { nonempty(&self.name) && self.has_file() } @@ -255,6 +262,7 @@ impl DraftPartInput { impl DraftModelInput { /// A model is publishable when it has a non-empty name and at least one /// publishable part. + #[allow(dead_code)] pub fn is_publishable(&self) -> bool { nonempty(&self.name) && !self.parts.is_empty() @@ -278,12 +286,14 @@ impl DraftThingInput { /// Basics is complete once the thing has a name. License has an effective /// default and is chosen in the details step, so it never gates Basics. + #[allow(dead_code)] pub fn basics_complete(&self) -> bool { nonempty(&self.name) } /// Step 2 (Files & parts) is complete when there is at least one model and /// every model is publishable. + #[allow(dead_code)] pub fn files_complete(&self) -> bool { !self.models.is_empty() && self.models.iter().all(|m| m.is_publishable()) } @@ -327,6 +337,19 @@ impl DraftThingInput { "Upload a file for this part.", ); } + // Dimensions are all-or-none: if any axis is set, all three + // must be non-empty. The lexicon only requires the fields exist, + // so this presence check is enforced here, not by the validator. + if let Some(bbox) = &part.dimensions { + let axes = [bbox.x.as_str(), bbox.y.as_str(), bbox.z.as_str()]; + let set_count = axes.iter().filter(|a| !a.trim().is_empty()).count(); + if set_count != 0 && set_count != 3 { + errors.push( + format!("models[{mi}].parts[{pi}].dimensions"), + "Set all three dimensions (X, Y, Z), or none.", + ); + } + } } } @@ -350,7 +373,7 @@ impl DraftThingInput { notes: opt_s(&part.notes), units: opt_s(&part.units), print_settings: opt_vec_s(&part.print_settings), - dimensions: part.dimensions.clone(), + dimensions: clean_bbox(part.dimensions.clone()), previews: part.previews.clone(), derived_from: part.derived_from.clone(), intended_to_work_with: part.intended_to_work_with.clone(), @@ -421,6 +444,91 @@ fn lexicon_message(err: &jacquard_lexicon::validation::ConstraintError) -> Strin format!("Exceeds a lexicon limit: {err}") } +/// Drop a `Bbox` whose axes are all empty so an in-progress edit does not +/// serialize as a partial/empty dimensions object. Unit alone is not a dimension. +fn clean_bbox(bbox: Option) -> Option { + bbox.and_then(|b| { + let empty = b.x.as_str().trim().is_empty() + && b.y.as_str().trim().is_empty() + && b.z.as_str().trim().is_empty(); + if empty { None } else { Some(b) } + }) +} + +/// Derive a thing/model name from an uploaded filename: drop the extension and +/// trim surrounding whitespace. A bare extension (e.g. `.stl`) or extensionless +/// name is returned trimmed. +pub fn name_from_filename(filename: &str) -> String { + let trimmed = filename.trim(); + match trimmed.rsplit_once('.') { + Some((stem, _ext)) if !stem.trim().is_empty() => stem.trim().to_string(), + _ => trimmed.to_string(), + } +} + +/// Give a freshly-uploaded-into draft the structure `assemble()` requires: a +/// thing name derived from the first filename (only when currently unset) and at +/// least one model carrying a non-empty name. Pure and idempotent — a later drop +/// neither renames the thing nor adds a second default model. +pub fn ensure_default_model_for_upload(thing: &mut DraftThingInput, first_filename: &str) { + let derived = name_from_filename(first_filename); + if !nonempty(&thing.name) && !derived.is_empty() { + thing.name = Some(derived.clone()); + } + if thing.models.is_empty() { + let model_name = thing + .display_name() + .map(str::to_string) + .filter(|name| !name.is_empty()) + .or_else(|| (!derived.is_empty()).then(|| derived.clone())) + .unwrap_or_else(|| "Model 1".to_string()); + thing.models.push(DraftModelInput { + name: Some(model_name), + ..Default::default() + }); + } +} + +/// Parse one "works with" token — an `at://` URI, a full Polymodel thing URL, or +/// a bare `/{repo}/thing/{rkey}` route path — into a thing `AtUri`. Pure; the +/// network resolution to a `StrongRef` happens separately. Query strings and +/// fragments are ignored; anything that is not a thing link is rejected. +pub fn parse_thing_token(token: &str) -> Result { + let token = token.trim(); + if token.is_empty() { + return Err("Empty link.".into()); + } + if token.starts_with("at://") { + let uri = AtUri::new_owned(token).map_err(|e| format!("Invalid at:// URI: {e}"))?; + // Only thing-record URIs are valid "Works with" links; reject model/part + // or other NSIDs early with a clear message rather than a decode error. + let is_thing = uri + .path() + .map(|p| p.collection.as_str() == "space.polymodel.library.thing") + .unwrap_or(false); + if !is_thing { + return Err("Not a thing link.".to_string()); + } + return Ok(uri); + } + let rest = match token.split_once("://") { + Some((_scheme, rest)) => rest.split_once('/').map(|(_host, path)| path).unwrap_or(""), + None => token, + }; + let path = rest + .split(['?', '#']) + .next() + .unwrap_or("") + .trim_matches('/'); + let segments: Vec<&str> = path.split('/').collect(); + match segments.as_slice() { + [repo, "thing", rkey] if !repo.is_empty() && !rkey.is_empty() => { + thing_uri_from_route(repo, rkey) + } + _ => Err("Not a Polymodel thing link.".to_string()), + } +} + #[cfg(test)] mod tests { use super::*; @@ -547,4 +655,156 @@ mod tests { assert!(!draft.basics_complete()); assert!(draft.assemble().is_err()); } + + #[test] + fn name_from_filename_strips_extension_and_trims() { + assert_eq!( + name_from_filename(" Desk Organizer.stl "), + "Desk Organizer" + ); + assert_eq!(name_from_filename("a.b.glb"), "a.b"); + assert_eq!(name_from_filename("noext"), "noext"); + // A bare dotfile keeps its name rather than collapsing to empty. + assert_eq!(name_from_filename(".stl"), ".stl"); + } + + #[test] + fn ensure_default_model_makes_a_one_file_drop_assemblable() { + let mut draft = DraftThingInput::default(); + ensure_default_model_for_upload(&mut draft, "Bracket.stl"); + draft.models[0].parts.push(part_with_upload("Bracket.stl")); + assert_eq!(draft.name.as_deref(), Some("Bracket")); + assert_eq!(draft.models.len(), 1); + assert!(nonempty(&draft.models[0].name)); + assert!(draft.assemble().is_ok(), "auto-created draft must publish"); + } + + #[test] + fn ensure_default_model_does_not_overwrite_name_or_add_second_model() { + let mut draft = DraftThingInput { + name: Some("Chosen".to_string()), + ..Default::default() + }; + ensure_default_model_for_upload(&mut draft, "First.stl"); + ensure_default_model_for_upload(&mut draft, "Second.stl"); + assert_eq!(draft.name.as_deref(), Some("Chosen")); + assert_eq!(draft.models.len(), 1); + } + + #[test] + fn parse_thing_token_accepts_at_uri_url_and_path() { + let at = parse_thing_token("at://did:plc:abc123/space.polymodel.library.thing/rkey1") + .expect("at:// passes through"); + assert_eq!(at.authority().as_str(), "did:plc:abc123"); + + let url = parse_thing_token("https://polymodel.app/alice.test/thing/rkey2") + .expect("full URL resolves"); + assert_eq!(url.authority().as_str(), "alice.test"); + assert_eq!( + url.path() + .and_then(|p| p.rkey) + .map(|r| r.as_ref().to_string()), + Some("rkey2".to_string()) + ); + + let path = parse_thing_token("/alice.test/thing/rkey3").expect("bare path resolves"); + assert_eq!(path.authority().as_str(), "alice.test"); + + // Query strings and fragments are ignored. + let q = parse_thing_token("https://host/alice.test/thing/rkey4?ref=x#frag") + .expect("query/fragment stripped"); + assert_eq!( + q.path() + .and_then(|p| p.rkey) + .map(|r| r.as_ref().to_string()), + Some("rkey4".to_string()) + ); + } + + #[test] + fn parse_thing_token_rejects_non_thing_links() { + assert!(parse_thing_token("").is_err()); + assert!(parse_thing_token("not a link").is_err()); + assert!(parse_thing_token("https://host/alice.test/profile").is_err()); + assert!(parse_thing_token("at://garbage").is_err()); + } + + #[test] + fn per_model_and_per_part_fields_map_through_assemble() { + let draft = DraftThingInput { + name: Some("Rig".to_string()), + models: vec![DraftModelInput { + name: Some("Frame".to_string()), + summary: Some("Main frame".to_string()), + license: Some("MIT".to_string()), + tags: Some(vec!["frame".to_string()]), + instructions: Some(vec!["Print at 0.2mm".to_string()]), + parts: vec![DraftPartInput { + name: Some("frame.stl".to_string()), + upload_id: Some("abcdef0123456789-1".to_string()), + notes: Some("Supports off".to_string()), + units: Some("mm".to_string()), + print_settings: Some(vec!["0.2mm layers".to_string()]), + dimensions: Some(Bbox { + unit: Some("mm".into()), + x: "10".into(), + y: "20".into(), + z: "30".into(), + extra_data: None, + }), + ..Default::default() + }], + ..Default::default() + }], + ..Default::default() + }; + let thing = draft.assemble().expect("rich draft assembles"); + let model = &thing.models[0]; + assert_eq!(model.summary.as_ref().unwrap().as_str(), "Main frame"); + assert_eq!(model.license.as_ref().unwrap().as_str(), "MIT"); + assert_eq!(model.tags.as_ref().unwrap()[0].as_str(), "frame"); + let part = &model.parts[0]; + assert_eq!(part.notes.as_ref().unwrap().as_str(), "Supports off"); + assert_eq!(part.units.as_ref().unwrap().as_str(), "mm"); + assert_eq!( + part.print_settings.as_ref().unwrap()[0].as_str(), + "0.2mm layers" + ); + let bbox = part.dimensions.as_ref().unwrap(); + assert_eq!(bbox.x.as_str(), "10"); + assert_eq!(bbox.unit.as_ref().unwrap().as_str(), "mm"); + assert!(thing.validate().is_ok()); + } + + #[test] + fn partial_bbox_is_rejected_by_assemble() { + let mut draft = complete_draft(); + // Only X set → must fail validation (all-or-none). + draft.models[0].parts[0].dimensions = Some(Bbox { + unit: Some("mm".into()), + x: "10".into(), + y: "".into(), + z: "".into(), + extra_data: None, + }); + let errors = draft + .assemble() + .expect_err("partial bbox must fail assemble"); + assert!(errors.has_field("models[0].parts[0].dimensions")); + } + + #[test] + fn empty_bbox_axes_are_dropped_at_assemble() { + let mut draft = complete_draft(); + // All axes empty (unit set) → dimensions dropped entirely, no error. + draft.models[0].parts[0].dimensions = Some(Bbox { + unit: Some("mm".into()), + x: "".into(), + y: "".into(), + z: "".into(), + extra_data: None, + }); + let thing = draft.assemble().expect("empty-axes bbox is dropped"); + assert!(thing.models[0].parts[0].dimensions.is_none()); + } } diff --git a/src/publish/draft_client.rs b/src/publish/draft_client.rs index 764761b..12a9570 100644 --- a/src/publish/draft_client.rs +++ b/src/publish/draft_client.rs @@ -1,20 +1,72 @@ -//! Same-origin client calls for the PM-43 publish wizard. +//! Same-origin client calls for the publish flow. //! //! Thin typed wrappers over [`PolymodelClient`]'s raw app-request helpers for //! the draft store, raw-byte file staging, and image upload. Every call rides //! the browser cookie session (same-origin), so these are authenticated without //! any explicit token handling. +//! +//! [`resolve_strong_ref`] is the exception: an unauthenticated, identity-resolving +//! `get_record` that reads a thing record directly from the target repo's own +//! PDS, so a cross-repo "Works with" link resolves. use http::Method; +use jacquard::client::{AgentSessionExt, BasicClient}; +use jacquard::common::types::string::AtUri; +use polymodel_api::com_atproto::repo::strong_ref::StrongRef; use polymodel_api::space_polymodel::library::Image; use polymodel_api::space_polymodel::library::publish_thing::PublishThingOutput; use polymodel_api::space_polymodel::library::stage_file::StageFileOutput; +use polymodel_api::space_polymodel::library::thing::Thing; use crate::client::{PolymodelClient, RawError}; use crate::publish::draft::{ DeleteDraftResponse, DraftIdResponse, DraftSummary, DraftThingInput, ImageUploadResponse, }; +/// A resolved compatibility target: the `StrongRef` to persist plus the thing's +/// display name, shown on the chip. +pub struct ResolvedRef { + pub strong_ref: StrongRef, + pub name: Option, +} + +/// Resolve a thing `AtUri` to a current `StrongRef` (uri + cid) by reading the +/// record directly from the target repo's own PDS. +/// +/// Uses an unauthenticated, identity-resolving jacquard agent: `get_record` +/// resolves the URI's authority (DID or handle) to its PDS and reads from there, +/// so a thing in *another* maker's repo resolves (unlike the same-origin proxy, +/// which is pinned to the signed-in user's PDS). A record with no `cid` is an +/// error — a `StrongRef` requires one. +pub async fn resolve_strong_ref(uri: &AtUri) -> Result { + let agent = BasicClient::unauthenticated(); + let response = agent + .get_record::(uri) + .await + .map_err(|error| RawError::Transport(error.to_string()))?; + // `into_output()` fails for typed XRPC errors — a `RecordNotFound` for a + // missing record, or a decode/validation error otherwise. Both are surfaced + // as a decode failure carrying the real cause rather than a fake HTTP status. + let output = response + .into_output() + .map_err(|error| RawError::Decode(error.to_string()))?; + let cid = output + .cid + .ok_or_else(|| RawError::Decode("record has no cid".to_string()))?; + let name = { + let n = output.value.name.as_str().trim(); + (!n.is_empty()).then(|| n.to_string()) + }; + Ok(ResolvedRef { + strong_ref: StrongRef { + cid, + uri: output.uri, + extra_data: None, + }, + name, + }) +} + /// stageFile XRPC path (raw-body upload), reused from the existing write path. const STAGE_FILE_PATH: &str = "/xrpc/space.polymodel.library.stageFile"; const DRAFTS_PATH: &str = "/app/drafts"; diff --git a/src/publish/state.rs b/src/publish/state.rs index e9a6af5..ba77efe 100644 --- a/src/publish/state.rs +++ b/src/publish/state.rs @@ -1,64 +1,8 @@ -//! PM-43 wizard step model and publish phase. +//! Publish lifecycle phase for the single-page publish flow. //! -//! The durable composition lives in [`DraftThingInput`](super::draft); these -//! types are the *ephemeral* wizard UI state — which step is active and where -//! the publish action is in its lifecycle. - -/// The five wizard steps, in order. -#[derive(Clone, Copy, PartialEq, Eq, Debug)] -pub enum WizardStep { - Basics, - Files, - Images, - Details, - Review, -} - -impl WizardStep { - /// All steps in display order. - pub const ALL: [WizardStep; 5] = [ - WizardStep::Basics, - WizardStep::Files, - WizardStep::Images, - WizardStep::Details, - WizardStep::Review, - ]; - - /// Zero-based position in the flow. - pub fn index(self) -> usize { - Self::ALL.iter().position(|s| *s == self).unwrap_or(0) - } - - /// One-based step number for the stepper label. - pub fn number(self) -> usize { - self.index() + 1 - } - - /// Full label for the stepper and headings. - pub fn label(self) -> &'static str { - match self { - WizardStep::Basics => "Basics", - WizardStep::Files => "Files & parts", - WizardStep::Images => "Images", - WizardStep::Details => "Instructions & license", - WizardStep::Review => "Review & publish", - } - } - - /// The next step, if any. - pub fn next(self) -> Option { - Self::ALL.get(self.index() + 1).copied() - } - - /// The previous step, if any. - pub fn prev(self) -> Option { - if self.index() == 0 { - None - } else { - Self::ALL.get(self.index() - 1).copied() - } - } -} +//! The durable composition lives in [`DraftThingInput`](super::draft); this +//! type is the *ephemeral* publish-action lifecycle, surfaced as the persistent +//! status indicator. /// Lifecycle of the publish action, surfaced as the persistent status indicator. #[derive(Clone, PartialEq, Debug)] @@ -72,29 +16,3 @@ pub enum PublishPhase { /// The publish attempt failed; the draft is preserved. Failed(String), } - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn steps_are_ordered_and_navigable() { - assert_eq!(WizardStep::Basics.number(), 1); - assert_eq!(WizardStep::Review.number(), 5); - assert_eq!(WizardStep::Basics.prev(), None); - assert_eq!(WizardStep::Review.next(), None); - assert_eq!(WizardStep::Basics.next(), Some(WizardStep::Files)); - assert_eq!(WizardStep::Files.prev(), Some(WizardStep::Basics)); - } - - #[test] - fn all_steps_have_distinct_indices() { - let mut seen = Vec::new(); - for step in WizardStep::ALL { - let idx = step.index(); - assert!(!seen.contains(&idx), "duplicate index {idx}"); - seen.push(idx); - } - assert_eq!(seen, vec![0, 1, 2, 3, 4]); - } -} diff --git a/src/thing_card.rs b/src/thing_card.rs index cb45ca1..6233270 100644 --- a/src/thing_card.rs +++ b/src/thing_card.rs @@ -194,105 +194,107 @@ pub fn ThingCard( } } } - if let Some(tags) = hydrated_tags(&thing) { - div { class: "thing-card-chips", aria_label: "Hydrated display tags", - for tag in tags.iter().take(3) { - span { class: "status-pill status-muted", "#{tag}" } + div { class: "thing-card-details", + if let Some(tags) = hydrated_tags(&thing) { + div { class: "thing-card-chips", aria_label: "Hydrated display tags", + for tag in tags.iter().take(3) { + span { class: "status-pill status-muted", "#{tag}" } + } } } - } - dl { class: "thing-card-stats", aria_label: "Thing stats", - for (label, value) in stats_with_social_counts(&stats, *like_count.read(), *save_count.read()) { - div { - dt { "{label}" } - dd { "{value}" } + dl { class: "thing-card-stats", aria_label: "Thing stats", + for (label, value) in stats_with_social_counts(&stats, *like_count.read(), *save_count.read()) { + div { + dt { "{label}" } + dd { "{value}" } + } } } - } - div { class: "thing-card-actions", aria_label: "Thing card saved and liked state", - if can_write { - button { - class: "thing-card-action", - disabled: *action_pending.read(), - aria_pressed: "{like_uri.read().is_some()}", - aria_label: "{like_label} {title}", - onclick: move |_| { - let client = like_client.clone(); - let subject = like_subject.clone(); - let current = like_uri.read().clone(); - action_pending.set(true); - action_error.set(None); - spawn(async move { - let result = if let Some(uri) = current { - match client.send(DeleteLike { uri: Some(uri), subject: None, extra_data: None }).await { - Ok(response) => response.into_output().map(|_| None).map_err(|error| error.to_string()), - Err(error) => Err(error.to_string()), + div { class: "thing-card-actions", aria_label: "Thing card saved and liked state", + if can_write { + button { + class: "thing-card-action", + disabled: *action_pending.read(), + aria_pressed: "{like_uri.read().is_some()}", + aria_label: "{like_label} {title}", + onclick: move |_| { + let client = like_client.clone(); + let subject = like_subject.clone(); + let current = like_uri.read().clone(); + action_pending.set(true); + action_error.set(None); + spawn(async move { + let result = if let Some(uri) = current { + match client.send(DeleteLike { uri: Some(uri), subject: None, extra_data: None }).await { + Ok(response) => response.into_output().map(|_| None).map_err(|error| error.to_string()), + Err(error) => Err(error.to_string()), + } + } else { + match client.send(CreateLike { subject, extra_data: None }).await { + Ok(response) => response.into_output().map(|output| Some(output.uri)).map_err(|error| error.to_string()), + Err(error) => Err(error.to_string()), + } + }; + match result { + Ok(next) => { + let was_liked = like_uri.read().is_some(); + like_uri.set(next); + let current_count = *like_count.read(); + let is_liked = like_uri.read().is_some(); + like_count.set(adjust_count(current_count, was_liked, is_liked)); + } + Err(error) => action_error.set(Some(format!("Like failed: {error}"))), } - } else { - match client.send(CreateLike { subject, extra_data: None }).await { - Ok(response) => response.into_output().map(|output| Some(output.uri)).map_err(|error| error.to_string()), - Err(error) => Err(error.to_string()), + action_pending.set(false); + }); + }, + "♡ {like_label}" + } + button { + class: "thing-card-action", + disabled: *action_pending.read(), + aria_pressed: "{save_uri.read().is_some()}", + aria_label: "{save_label} {title}", + onclick: move |_| { + let client = save_client.clone(); + let subject = save_subject.clone(); + let current = save_uri.read().clone(); + action_pending.set(true); + action_error.set(None); + spawn(async move { + let result = if let Some(uri) = current { + match client.send(DeleteSave { uri: Some(uri), subject: None, extra_data: None }).await { + Ok(response) => response.into_output().map(|_| None).map_err(|error| error.to_string()), + Err(error) => Err(error.to_string()), + } + } else { + match client.send(CreateSave { subject, note: None, extra_data: None }).await { + Ok(response) => response.into_output().map(|output| Some(output.uri)).map_err(|error| error.to_string()), + Err(error) => Err(error.to_string()), + } + }; + match result { + Ok(next) => { + let was_saved = save_uri.read().is_some(); + save_uri.set(next); + let current_count = *save_count.read(); + let is_saved = save_uri.read().is_some(); + save_count.set(adjust_count(current_count, was_saved, is_saved)); + } + Err(error) => action_error.set(Some(format!("Save failed: {error}"))), } - }; - match result { - Ok(next) => { - let was_liked = like_uri.read().is_some(); - like_uri.set(next); - let current_count = *like_count.read(); - let is_liked = like_uri.read().is_some(); - like_count.set(adjust_count(current_count, was_liked, is_liked)); - } - Err(error) => action_error.set(Some(format!("Like failed: {error}"))), - } - action_pending.set(false); - }); - }, - "♡ {like_label}" + action_pending.set(false); + }); + }, + "☆ {save_label}" + } + } else { + a { class: "thing-card-action", href: "/oauth/start", aria_label: "Sign in to like {title}", "♡ Like" } + a { class: "thing-card-action", href: "/oauth/start", aria_label: "Sign in to save {title}", "☆ Save" } } - button { - class: "thing-card-action", - disabled: *action_pending.read(), - aria_pressed: "{save_uri.read().is_some()}", - aria_label: "{save_label} {title}", - onclick: move |_| { - let client = save_client.clone(); - let subject = save_subject.clone(); - let current = save_uri.read().clone(); - action_pending.set(true); - action_error.set(None); - spawn(async move { - let result = if let Some(uri) = current { - match client.send(DeleteSave { uri: Some(uri), subject: None, extra_data: None }).await { - Ok(response) => response.into_output().map(|_| None).map_err(|error| error.to_string()), - Err(error) => Err(error.to_string()), - } - } else { - match client.send(CreateSave { subject, note: None, extra_data: None }).await { - Ok(response) => response.into_output().map(|output| Some(output.uri)).map_err(|error| error.to_string()), - Err(error) => Err(error.to_string()), - } - }; - match result { - Ok(next) => { - let was_saved = save_uri.read().is_some(); - save_uri.set(next); - let current_count = *save_count.read(); - let is_saved = save_uri.read().is_some(); - save_count.set(adjust_count(current_count, was_saved, is_saved)); - } - Err(error) => action_error.set(Some(format!("Save failed: {error}"))), - } - action_pending.set(false); - }); - }, - "☆ {save_label}" + if let Some(error) = action_error.read().as_ref() { + span { class: "thing-card-action-error", role: "status", "{error}" } } - } else { - a { class: "thing-card-action", href: "/oauth/start", aria_label: "Sign in to like {title}", "♡ Like" } - a { class: "thing-card-action", href: "/oauth/start", aria_label: "Sign in to save {title}", "☆ Save" } - } - if let Some(error) = action_error.read().as_ref() { - span { class: "thing-card-action-error", role: "status", "{error}" } } } } diff --git a/src/thing_detail.rs b/src/thing_detail.rs index a8393e0..27b878b 100644 --- a/src/thing_detail.rs +++ b/src/thing_detail.rs @@ -17,9 +17,7 @@ use crate::Route; use crate::client::PolymodelClient; use crate::profile::profile_href; use crate::session::SessionIdentity; -use crate::viewer::{ - AssetViewer, ViewerFallbackImage, ViewerMeshSource, ViewerSourceFormat, demo_models, -}; +use crate::viewer::{AssetViewer, ViewerFallbackImage, ViewerMeshSource, ViewerSourceFormat}; #[derive(Clone, Debug, PartialEq, Eq)] enum DetailState { @@ -158,7 +156,9 @@ fn extension_is(value: &SmolStr, extension: &str) -> bool { } #[cfg_attr(not(feature = "server"), allow(dead_code))] -fn thing_uri_from_route(repo: &str, rkey: &str) -> Result { +/// Build a `space.polymodel.library.thing` `at://` URI from route components. +/// Shared with the publish flow's "Works with" link parser. +pub(crate) fn thing_uri_from_route(repo: &str, rkey: &str) -> Result { let repo: AtIdentifier = AtIdentifier::new_owned(repo) .map_err(|error| format!("Invalid route: unsupported repository identifier: {error}"))?; let rkey: Rkey = Rkey::new_owned(rkey) @@ -326,6 +326,14 @@ fn DetailPopulated( let title = clean_text(Some(thing.name.as_ref())) .unwrap_or("Untitled thing") .to_string(); + let title_len = title.chars().count(); + let title_class = if title_len >= 48 { + "thing-detail-title is-very-long" + } else if title_len >= 28 { + "thing-detail-title is-long" + } else { + "thing-detail-title" + }; let creator = actor_label(&thing.author).to_string(); let summary = clean_text(thing.summary.as_ref().map(AsRef::as_ref)) .or_else(|| clean_text(thing_record.summary.as_ref().map(AsRef::as_ref))) @@ -383,15 +391,13 @@ fn DetailPopulated( rsx! { header { class: "thing-detail-header", + h1 { class: title_class, "{title}" } div { class: "thing-detail-title-row", - div { - h1 { "{title}" } - p { class: "thing-detail-creator", - if let Some(href) = profile_href(&thing.author) { - a { class: "thing-detail-creator-link", href: "{href}", "by {creator}" } - } else { - "by {creator}" - } + p { class: "thing-detail-creator", + if let Some(href) = profile_href(&thing.author) { + a { class: "thing-detail-creator-link", href: "{href}", "by {creator}" } + } else { + "by {creator}" } } dl { class: "thing-detail-stats", aria_label: "Thing stats", @@ -406,7 +412,6 @@ fn DetailPopulated( section { class: "thing-detail-shell blueprint-panel", aria_label: "Thing overview", div { class: "thing-detail-viewer", AssetViewer { - initial_model: demo_models()[0], fallback: media.map(|media| ViewerFallbackImage { url: media.url, alt: media.alt }), source: viewer_source, } diff --git a/src/viewer.rs b/src/viewer.rs index 152fc20..cada5e9 100644 --- a/src/viewer.rs +++ b/src/viewer.rs @@ -345,7 +345,7 @@ pub fn ViewerPage(initial_model: DemoModel) -> Element { } ModelViewer { - model, + model: Some(model), render_source: step_render_source, fallback_to_demo: true, mesh_stats, @@ -362,7 +362,7 @@ pub fn ViewerPage(initial_model: DemoModel) -> Element { #[component] pub fn AssetViewer( - initial_model: DemoModel, + #[props(default)] initial_model: Option, fallback: Option, #[props(default)] source: Option, ) -> Element { @@ -375,9 +375,14 @@ pub fn AssetViewer( let renderer_failed = use_signal(|| false); let mesh_stats: Signal> = use_signal(|| None); let status: Signal = use_signal(|| { - ViewerStatus::Loading(SessionKey::new(initial_model.id, initial_model.generation)) + let key = source + .as_ref() + .map(|source| SessionKey::new(source.key.clone(), 1)) + .or_else(|| initial_model.map(|model| SessionKey::new(model.id, model.generation))) + .unwrap_or_else(|| SessionKey::new("asset-viewer", 1)); + ViewerStatus::Loading(key) }); - let fallback_to_demo = source.is_none(); + let fallback_to_demo = source.is_none() && initial_model.is_some(); let _mesh_load = use_resource(move || { let model = initial_model; @@ -390,8 +395,9 @@ pub fn AssetViewer( async move { let session_key = source .as_ref() - .map(|source| SessionKey::new(source.key.clone(), model.generation)) - .unwrap_or_else(|| SessionKey::new(model.id, model.generation)); + .map(|source| SessionKey::new(source.key.clone(), 1)) + .or_else(|| model.map(|model| SessionKey::new(model.id, model.generation))) + .unwrap_or_else(|| SessionKey::new("asset-viewer", 1)); let using_source = source.is_some(); status.set(ViewerStatus::Loading(session_key.clone())); if let Some(source) = source { @@ -430,8 +436,8 @@ pub fn AssetViewer( None } else { Some(MeshStats { - vertices: model.vertices as u32, - triangles: model.triangles as u32, + vertices: model.map_or(0, |model| model.vertices as u32), + triangles: model.map_or(0, |model| model.triangles as u32), }) }); } @@ -685,7 +691,7 @@ fn worker_error_summary(data: &wasm_bindgen::JsValue) -> String { #[derive(Props, Clone, PartialEq)] pub struct ModelViewerProps { - model: DemoModel, + model: Option, render_source: Signal>, fallback_to_demo: bool, mesh_stats: Signal>, @@ -717,9 +723,11 @@ pub fn ModelViewer(props: ModelViewerProps) -> Element { load_status }; let stats = *mesh_stats.read(); - let summary = Some(mesh_summary_for(model)); + let summary = model.map(mesh_summary_for); let asset_path = summary.map(|s| s.asset_path).unwrap_or(""); - let session_label = format!("{}#{}", model.id, model.generation); + let session_label = model + .map(|model| format!("{}#{}", model.id, model.generation)) + .unwrap_or_else(|| "asset-viewer#1".to_string()); let acquisitions = *context_acquisitions.read(); let renderer_active = acquisitions > 0 && !*renderer_failed.read(); let renderer_kind = if renderer_active { @@ -811,7 +819,7 @@ fn AssetPreview(summary: MeshSummary, stats: Option) -> Element { /// worker (and its GL context). #[component] fn WorkerRendererSession( - model: DemoModel, + model: Option, render_source: Signal>, fallback_to_demo: bool, status: Signal, @@ -839,7 +847,7 @@ fn WorkerRendererSession( #[cfg(not(target_arch = "wasm32"))] #[component] fn WorkerSessionInner( - model: DemoModel, + model: Option, render_source: Signal>, fallback_to_demo: bool, status: Signal, @@ -866,7 +874,7 @@ fn WorkerSessionInner( #[cfg(target_arch = "wasm32")] #[component] fn WorkerSessionInner( - model: DemoModel, + model: Option, render_source: Signal>, fallback_to_demo: bool, status: Signal, @@ -948,11 +956,13 @@ fn WorkerSessionInner( let source = render_source.read().clone().or_else(|| { fallback_to_demo .then(|| { - pending_load_for(model_val).ok().map(|load| RenderSource { - key: load.model.id.to_string(), - format: load.format, - primary_url: load.model.asset_path.to_string(), - }) + model_val + .and_then(|model| pending_load_for(model).ok()) + .map(|load| RenderSource { + key: load.model.id.to_string(), + format: load.format, + primary_url: load.model.asset_path.to_string(), + }) }) .flatten() });