diff --git a/apps/website/e2e/models-sign-in-draft.spec.ts b/apps/website/e2e/models-sign-in-draft.spec.ts index 4d53505f4a8..7982a05b941 100644 --- a/apps/website/e2e/models-sign-in-draft.spec.ts +++ b/apps/website/e2e/models-sign-in-draft.spec.ts @@ -35,9 +35,7 @@ for (const { entry, randomUUID, failRead } of [ }) await page.goto(path) const chooser = page.waitForEvent('filechooser') - await page - .getByText('Choose images or drop them here', { exact: true }) - .click() + await page.getByText(/^Select or drop /).click() await (await chooser).setFiles('e2e/assets/placeholder-1x1.webp') const replacement = page.getByRole('button', { name: 'Replace placeholder-1x1.webp' @@ -154,9 +152,7 @@ test('unavailable draft storage does not trap sign-in and reports missing files }) await page.goto(path) const chooser = page.waitForEvent('filechooser') - await page - .getByText('Choose images or drop them here', { exact: true }) - .click() + await page.getByText(/^Select or drop /).click() await (await chooser).setFiles('e2e/assets/placeholder-1x1.webp') await page.getByRole('link', { name: 'Sign in to run', exact: true }).click() await expect(page).toHaveURL(/\/login\/\?returnTo=/) diff --git a/apps/website/e2e/workshop.spec.ts b/apps/website/e2e/workshop.spec.ts index c0a18da8236..46d4b7fe8eb 100644 --- a/apps/website/e2e/workshop.spec.ts +++ b/apps/website/e2e/workshop.spec.ts @@ -166,11 +166,13 @@ test.describe('Models catalog', () => { const sections = page.getByTestId('workshop-sections') await expect(sections).toBeVisible() const videos = page.getByTestId('section-generate-videos') - const rowHeading = await videos - .getByRole('heading', { level: 2 }) + const rowLabel = ( + await videos.getByRole('heading', { level: 2 }).innerText() + ).trim() + const seeAll = await videos + .getByTestId('section-generate-videos-see-all') .innerText() - const promisedCount = Number(rowHeading.match(/(\d+)\s*$/)?.[1]) - const rowLabel = rowHeading.replace(/\s*\d+\s*$/, '').trim() + const promisedCount = Number(seeAll.match(/(\d+)/)?.[1]) expect(promisedCount).toBeGreaterThan(0) await videos.getByTestId('section-generate-videos-open').click() const cards = page @@ -370,6 +372,45 @@ test.describe('Models catalog', () => { '/models/byteplus--seedance-2-5-text-to-video--generate-videos/' ) }) + + test('the row arrow sits level with the middle of a card', async ({ + page + }) => { + for (const width of [1440, 820, 420]) { + await page.setViewportSize({ width, height: 1000 }) + await page.goto('/models/') + const row = page.getByTestId('section-generate-images') + const card = row.getByTestId('workshop-model-card').first() + await expect(card).toBeVisible() + await card.hover() + const cardBox = await card.boundingBox() + const arrowBox = await row.getByTestId('card-row-next').boundingBox() + if (!cardBox || !arrowBox) throw new Error('the row did not lay out') + const middleOf = (box: { y: number; height: number }) => + box.y + box.height / 2 + expect(Math.abs(middleOf(arrowBox) - middleOf(cardBox))).toBeLessThan(1) + } + }) + + test('the fade reaches both ends of the scrolling row', async ({ page }) => { + await page.goto('/models/') + const row = page.getByTestId('section-generate-images') + await expect(row.getByTestId('workshop-model-card').first()).toBeVisible() + await row.hover() + const edges = await row.evaluate((section) => { + const span = (selector: string) => { + const element = section.querySelector(selector) + if (!element) return undefined + const { x, width } = element.getBoundingClientRect() + return { left: x, right: x + width } + } + return { + scroller: span('ul'), + fades: span('[data-testid="card-row-arrows"]') + } + }) + expect(edges.fades).toEqual(edges.scroller) + }) }) test.describe('Model playground', () => { @@ -427,7 +468,7 @@ test.describe('Model playground', () => { await expect(page.getByTestId('run-button')).toBeEnabled() const [chooser] = await Promise.all([ page.waitForEvent('filechooser'), - page.getByText('Choose images or drop them here', { exact: true }).click() + page.getByText(/^Select or drop /).click() ]) await chooser.setFiles('e2e/assets/placeholder-1x1.webp') await expect( @@ -473,7 +514,7 @@ test.describe('Model playground', () => { await page.goto('/models/byteplus--seedream-4-5--edit-images/') const [chooser] = await Promise.all([ page.waitForEvent('filechooser'), - page.getByText('Choose images or drop them here', { exact: true }).click() + page.getByText(/^Select or drop /).click() ]) await chooser.setFiles('e2e/assets/placeholder-1x1.webp') await page.getByRole('tab', { name: 'API', exact: true }).click() diff --git a/apps/website/src/components/workshop/CardRow.test.ts b/apps/website/src/components/workshop/CardRow.test.ts index caa6de6798b..35d50685459 100644 --- a/apps/website/src/components/workshop/CardRow.test.ts +++ b/apps/website/src/components/workshop/CardRow.test.ts @@ -5,7 +5,7 @@ import { describe, expect, it } from 'vitest' import CardRow from './CardRow.vue' describe('CardRow', () => { - it('shows paging controls and disables each one at its edge', async () => { + it('offers each arrow only while that side has somewhere to go', async () => { render(CardRow, { slots: { default: '
- {{ t('workshop.examples.samplesSubtitle', locale) }} -
diff --git a/apps/website/src/components/workshop/FeaturedBanner.vue b/apps/website/src/components/workshop/FeaturedBanner.vue index 3761d775214..679a80773f9 100644 --- a/apps/website/src/components/workshop/FeaturedBanner.vue +++ b/apps/website/src/components/workshop/FeaturedBanner.vue @@ -145,7 +145,7 @@ const fill = computed(() => decoding="async" />
diff --git a/apps/website/src/components/workshop/FileSourceInput.test.ts b/apps/website/src/components/workshop/FileSourceInput.test.ts index c0ae1518d47..691a6b3c113 100644 --- a/apps/website/src/components/workshop/FileSourceInput.test.ts +++ b/apps/website/src/components/workshop/FileSourceInput.test.ts @@ -80,7 +80,7 @@ describe('file source selection', () => { expect(screen.getByText('2 KB')).toBeTruthy() expect(screen.queryByRole('img')).toBeNull() expect(values.value).toMatchObject([{ file }]) - expect(screen.getByText('Choose files or drop them here')).toBeTruthy() + expect(screen.getByText('Select or drop up to 2 files')).toBeTruthy() await user.click(screen.getByRole('button', { name: `Replace ${name}` })) const replacement = new File(['replacement bytes'], 'replacement.fbx', { type: 'application/octet-stream' @@ -244,6 +244,16 @@ describe('file source selection', () => { expect(screen.getAllByRole('img')).toHaveLength(1) }) + it('promises one image where a second would replace the first', async () => { + const single = { ...field, multiple: false, maxItems: 1 } + const value = mountInput(false, single) + expect(screen.getByText('Select or drop an image')).toBeTruthy() + await drop([new File(['one'], 'one.png', { type: 'image/png' })]) + expect(screen.getByText('Select or drop to replace')).toBeTruthy() + await drop([new File(['two'], 'two.png', { type: 'image/png' })]) + expect(value.value).toMatchObject({ name: 'two.png' }) + }) + it('ignores file drops while disabled', async () => { const value = mountInput(true) await drop([new File(['one'], 'one.png', { type: 'image/png' })]) diff --git a/apps/website/src/components/workshop/FileSourceInput.vue b/apps/website/src/components/workshop/FileSourceInput.vue index 566686031f5..7109ecd5ee1 100644 --- a/apps/website/src/components/workshop/FileSourceInput.vue +++ b/apps/website/src/components/workshop/FileSourceInput.vue @@ -53,15 +53,25 @@ const description = computed( .join(' ') || undefined ) +// A field that takes one file replaces what it holds, so plural copy would +// promise a second slot that does not exist. const prompt = computed(() => { - const replacing = selectedFiles.value.length > 0 && !field.multiple - if (replacing) - return imageOnly.value - ? 'workshop.field.replaceOrDropImage' - : 'workshop.field.replaceOrDropFile' - return imageOnly.value - ? 'workshop.field.chooseOrDropImages' - : 'workshop.field.chooseOrDropFiles' + const allowed = field.multiple ? field.maxItems : undefined + if (allowed !== undefined && allowed > 1) + return t( + imageOnly.value + ? 'workshop.field.selectOrDropImages' + : 'workshop.field.selectOrDropFiles', + locale + ).replace('{count}', String(allowed)) + if (selectedFiles.value.length > 0) + return t('workshop.field.selectOrDropReplacement', locale) + return t( + imageOnly.value + ? 'workshop.field.selectOrDropImage' + : 'workshop.field.selectOrDropFile', + locale + ) }) const acceptedTypes = computed(() => @@ -188,7 +198,7 @@ function remove(index: number) { @click="replacement = undefined" > - {{ t(prompt, locale) }} + {{ prompt }} {{ acceptedTypes }} · {{ t('workshop.field.uploadLimit', locale) }} diff --git a/apps/website/src/components/workshop/ModelDetail.test.ts b/apps/website/src/components/workshop/ModelDetail.test.ts index 257ff826916..0bdeb64c862 100644 --- a/apps/website/src/components/workshop/ModelDetail.test.ts +++ b/apps/website/src/components/workshop/ModelDetail.test.ts @@ -1,3 +1,4 @@ +// @vitest-environment happy-dom import userEvent from '@testing-library/user-event' import { fireEvent, render, screen, within } from '@testing-library/vue' import { IDBFactory } from 'fake-indexeddb' @@ -657,6 +658,16 @@ describe('ModelDetail', () => { expect(screen.getByTestId('router-request-id').textContent).toContain( 'request-123' ) + expect(screen.getByTestId('output-expires').textContent).toContain( + 'expire 24 hours' + ) + const copyRequestId = screen.getByRole('button', { + name: 'Copy request ID' + }) + await user().click(copyRequestId) + await vi.waitFor(() => + expect(copyRequestId.textContent).toContain('Copied') + ) expect(refreshWorkshopCredits).toHaveBeenCalledWith({ force: true }) }) @@ -1699,7 +1710,6 @@ describe('ModelDetail', () => { expect( screen.getByRole('heading', { name: 'Sample outputs' }) ).toBeTruthy() - expect(screen.getByText(/without touching your inputs/)).toBeTruthy() if (nativeJson) await user().click(screen.getByRole('button', { name: 'Native JSON' })) const input = screen.getByTestId- {{ t('workshop.error.creditsTitle', locale) }} -
-- {{ - t('workshop.error.noCreditsCloud', locale).replace( - '{workspace}', - () => session?.workspace.name ?? '' - ) - }} -
-+ {{ + t('workshop.error.noCreditsCloud', locale).replace( + '{workspace}', + () => session?.workspace.name ?? '' + ) + }} +
-- {{ t('workshop.run.requestId', locale) }} {{ requestId }} -
++ {{ t('workshop.output.expires', locale) }} +
++ {{ t('workshop.run.requestId', locale) }} {{ requestId }} +
++
{{ t('workshop.run.running', locale) }} + + {{ elapsed }} +
-
{{ - state.status === 'example' - ? t('workshop.output.exampleHint', locale).replace( - '{model}', - modelName - ) - : t('workshop.output.expires', locale) + t('workshop.output.exampleHint', locale).replace('{model}', modelName) }}