-
+
{{ t('Media cleanup') }}
diff --git a/web/src/components/RetentionCard.vue b/web/src/components/RetentionCard.vue
index 7bd15b0..8c53ee9 100644
--- a/web/src/components/RetentionCard.vue
+++ b/web/src/components/RetentionCard.vue
@@ -146,23 +146,20 @@ onBeforeUnmount(clearSavedTimer)
-
-
-
-
+
+
+
{{ t('Retention') }}
-
{{ t('How long activity is kept.') }}
+
+ {{ t('How long activity is kept. Only owners can change it.') }}
+
-
+
-
- {{ t('Keep activity for') }}
-
+
+
+
+ {{ t('Keep activity for') }}
+
+ {{ helperCopy(selected) }}
+
-
{{ helperCopy(selected) }}
-
-
-
-
-
- {{ t('Last cleanup') }}
-
-
+
+
+
- {{ t('Last cleanup') }}
+ -
{{ lastCleanupLine(settings) }}
-
-
- {{ t('Next cleanup') }}
+
+
- {{ t('Next cleanup') }}
-
{{ nextCleanupLine(settings) }}
-
+
diff --git a/web/src/components/UpdatesCard.vue b/web/src/components/UpdatesCard.vue
index 29cbe75..f7d30cd 100644
--- a/web/src/components/UpdatesCard.vue
+++ b/web/src/components/UpdatesCard.vue
@@ -412,6 +412,7 @@ const block = computed
(() => {
"This site can't update itself from the browser yet. Whoever manages your server can set it up once, or update RenewCMS for you.",
)
},
+ meta: lastChecked.value,
}
}
if (props.status.available) {
@@ -427,6 +428,7 @@ const block = computed(() => {
[props.status.current],
)
},
+ meta: lastChecked.value,
}
}
return {
@@ -602,7 +604,7 @@ const notes = computed(() => {
id="updates-h"
ref="heading"
tabindex="-1"
- class="self-start text-lg font-semibold text-highlighted focus:outline-2 focus:outline-offset-4 focus:outline-primary"
+ class="self-start text-[0.9375rem]/6 font-semibold text-highlighted focus:outline-2 focus:outline-offset-4 focus:outline-primary"
>
{{ t('Updates') }}
@@ -689,7 +691,7 @@ const notes = computed(() => {
class="inline-flex items-center gap-1.5 self-start text-sm font-medium text-highlighted underline underline-offset-3"
>
{{ t('How to update') }}
-
+
{
class="inline-flex items-center gap-1.5 self-start text-sm font-medium text-highlighted underline underline-offset-3"
>
{{ t('How to update') }}
-
+
{
class="inline-flex items-center gap-1.5 self-start text-sm font-medium text-highlighted underline underline-offset-3"
>
{{ t('Read the release notes') }}
-
+
diff --git a/web/src/i18n/messages.ts b/web/src/i18n/messages.ts
index f01e4d1..8f706f2 100644
--- a/web/src/i18n/messages.ts
+++ b/web/src/i18n/messages.ts
@@ -1193,7 +1193,8 @@ export const messages = {
'Actions on your site will appear here.': 'Les actions sur votre site apparaîtront ici.',
'Your actions will appear here.': 'Vos actions apparaîtront ici.',
Retention: 'Conservation',
- 'How long activity is kept.': 'Durée de conservation de l’activité.',
+ 'How long activity is kept. Only owners can change it.':
+ 'Durée de conservation de l’activité. Seul le propriétaire peut la modifier.',
'Keep activity for': 'Conserver l’activité pendant',
'90 days': '90 jours',
'365 days': '365 jours',
diff --git a/web/src/views/HomeView.vue b/web/src/views/HomeView.vue
index 3137dc1..879fa2b 100644
--- a/web/src/views/HomeView.vue
+++ b/web/src/views/HomeView.vue
@@ -206,167 +206,164 @@ onMounted(loadArticles)
@dismiss="dismissBanner"
/>
-
-
-
-
-
-
-
-
-
-
-
- {{
- formatNumber(tile.value)
- }}
- {{ tile.label }}
-
-
-
-
- {{ t('Recently updated') }}
-
-
- {{ t('All articles') }}
-
-
-
-
- -
-
-
- {{ article.title }}
-
-
-
- {{ formatRelativeDate(article.updated_at) }}
-
-
-
-
-
-
-
-
-
-
- {{ t('New article') }}
-
-
-
-
-
-
-
- {{ t('Try again') }}
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+ {{
+ formatNumber(tile.value)
+ }}
+ {{ tile.label }}
+
-
-
- {{ t('Connect your website') }}
+
+
+
+
+
+ {{ t('Recently updated') }}
-
- {{
- t(
- 'Your site reads published articles from RenewCMS. Share this guide with whoever builds it.',
- )
- }}
-
- {{ t('Open the guide') }}
+ {{ t('All articles') }}
+ -
+
+
+ {{ article.title }}
+
+
+
+ {{ formatRelativeDate(article.updated_at) }}
+
+
+
+
+
+
+
+
+
+
+ {{ t('New article') }}
+
+
+
+
+
+
+
+ {{ t('Try again') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('Connect your website') }}
+
+
+ {{
+ t(
+ 'Your site reads published articles from RenewCMS. Share this guide with whoever builds it.',
+ )
+ }}
+
+
+ {{ t('Open the guide') }}
+
diff --git a/web/src/views/SettingsView.vue b/web/src/views/SettingsView.vue
index 68b04ce..bf76046 100644
--- a/web/src/views/SettingsView.vue
+++ b/web/src/views/SettingsView.vue
@@ -430,7 +430,7 @@ onBeforeUnmount(() => {
- {{ t('Version') }}
+ {{ t('Version') }}
{
expect(router.currentRoute.value.path).toBe('/home')
})
- it('clamps a long sentence to two lines', async () => {
+ it('truncates a long sentence on one line', async () => {
const items = [makeItem({ id: 1, target: target('article', '8', 'T'.repeat(150)) })]
await mountHome('owner', {
[ACTIVITY_ROUTE]: () => page(items),
[ARTICLES_ROUTE]: () => response(200, articles),
})
- expect(rows()[0]!.find('.line-clamp-2').exists()).toBe(true)
+ expect(rows()[0]!.find('[data-testid="recent-activity-sentence"]').classes()).toContain(
+ 'truncate',
+ )
expect(rows()[0]!.find('[data-testid="recent-activity-meta"]').classes()).toContain(
'truncate',
)
@@ -322,22 +324,19 @@ describe('Home card and article list are independent', () => {
})
})
-describe('Home layout is two columns from lg and stacked below', () => {
- it('uses the lg two-column grid with the 420 px column and no max-width cap', async () => {
+describe('Home layout puts Recent activity full width below Recently updated', () => {
+ it('renders the section after the recent list inside the same single column', async () => {
await mountHome('owner', {
[ACTIVITY_ROUTE]: () => page(recentItems(1)),
[ARTICLES_ROUTE]: () => response(200, articles),
})
- const grid = card().element.parentElement!
- expect(grid.className).toContain('lg:grid-cols-[minmax(0,1fr)_--spacing(105)]')
- expect(grid.className).toContain('lg:items-start')
- expect(grid.className).toContain('gap-4')
- const capped = [grid, grid.parentElement!].some((element) =>
- /(^|\s)max-w-/.test(element.className),
- )
- expect(capped).toBe(false)
- expect(card().classes()).toContain('lg:order-2')
+ const column = card().element.parentElement!
+ expect(column.className).not.toContain('grid-cols')
+ const list = column.querySelector('[data-testid="recent-list"]')!
+ expect(
+ list.compareDocumentPosition(card().element) & Node.DOCUMENT_POSITION_FOLLOWING,
+ ).toBeTruthy()
})
})
diff --git a/web/visual/check.ts b/web/visual/check.ts
index 47cda7e..8a266bc 100644
--- a/web/visual/check.ts
+++ b/web/visual/check.ts
@@ -26,14 +26,13 @@ interface Screen {
sources: Source[]
}
-const cleanupBoard = 'RenewCMS Screens Media cleanup.dc.html'
-const activityBoard = 'RenewCMS Screens Activity.dc.html'
+const officeBoard = 'RenewCMS Screens Back-office.dc.html'
const extraSources: Record = {
activity: [
{
- board: activityBoard,
- group: 'Details slide-over',
+ board: officeBoard,
+ group: 'Activity details',
states: [
'Edit with a diff',
'Settings diff, long text',
@@ -45,7 +44,7 @@ const extraSources: Record = {
alias: {},
},
{
- board: activityBoard,
+ board: officeBoard,
group: 'My activity',
states: ['Default', 'Empty', 'Details'],
alias: {},
@@ -53,8 +52,8 @@ const extraSources: Record = {
],
settings: [
{
- board: cleanupBoard,
- group: 'Settings',
+ board: officeBoard,
+ group: 'Settings: Media cleanup',
states: [
'Default: off, never run',
'On: 30 days, last run',
@@ -69,8 +68,8 @@ const extraSources: Record = {
alias: {},
},
{
- board: cleanupBoard,
- group: 'Dialog',
+ board: officeBoard,
+ group: 'Purge dialog',
states: [
'Loading preview',
'Confirm',
@@ -84,23 +83,18 @@ const extraSources: Record = {
alias: {},
},
{
- board: cleanupBoard,
- group: 'Results',
+ board: officeBoard,
+ group: 'Purge results',
states: ['Success', 'Success, automatic purge on'],
alias: {},
},
],
media: [
{
- board: cleanupBoard,
- group: 'Media',
- states: [
- 'Duplicates tab with the button',
- 'Dialog from Media',
- 'Member: button hidden',
- 'Offline: button disabled',
- ],
- alias: { 'Offline: button disabled': 'Offline' },
+ board: officeBoard,
+ group: 'Media duplicates entry',
+ states: ['Duplicates tab with the button', 'Duplicates tab: offline'],
+ alias: {},
},
],
}
diff --git a/web/visual/states.ts b/web/visual/states.ts
index 7c1badb..db5c69d 100644
--- a/web/visual/states.ts
+++ b/web/visual/states.ts
@@ -165,11 +165,6 @@ const verifiedSession: ApiMock = {
}
const updateRunningVersion = 'v2.2.0-beta'
-const newCardAbsentReason = 'new card absent from board frame (dashed placeholder)'
-const homeActivityMock: ApiMock = {
- status: 200,
- body: { items: [], total: 0, page: 1, size: 5 },
-}
const workspaceSettingsBody = {
version: updateRunningVersion,
activity_retention_days: 90,
@@ -304,6 +299,7 @@ function updateApi(
return {
'GET /v1/auth/me': role === 'owner' ? verifiedSession : adminSession,
'GET /v1/settings/': { status: 200, body: workspaceSettingsBody },
+ [purgeSettingsPath]: settingsBody(purgeSettingsBody()),
'GET /v1/system/update': { status: 200, body: status },
'POST /v1/system/update/check': check,
}
@@ -2392,7 +2388,10 @@ function cleanupApi(
return {
'GET /v1/auth/me': sessionWithRole(role),
'GET /v1/settings/': { status: 200, body: workspaceSettingsBody },
- 'GET /v1/system/update': { status: 200, hang: true },
+ 'GET /v1/system/update': {
+ status: 200,
+ body: updateStatusBody({ checked_at: '2026-09-10T09:41:00Z', can_apply: true }),
+ },
[purgeSettingsPath]: settings,
...overrides,
}
@@ -2402,12 +2401,47 @@ function settingsBody(body: unknown): ApiMock {
return { status: 200, body }
}
+async function scrollSettingsToCleanup(page: Page) {
+ const top = (page.viewportSize()?.width ?? 1440) < 768 ? 480 : 300
+ await page.evaluate((top) => {
+ const card = document.querySelector('[data-testid="settings-card"]')
+ if (card?.parentElement && !card.parentElement.querySelector('[data-scroll-room]')) {
+ const room = document.createElement('div')
+ room.setAttribute('data-scroll-room', '')
+ room.style.cssText = 'flex-shrink:0;height:1200px'
+ card.parentElement.append(room)
+ }
+ let node: HTMLElement | null = card
+ while (node) {
+ if (
+ node.scrollHeight > node.clientHeight &&
+ /auto|scroll/.test(getComputedStyle(node).overflowY)
+ ) {
+ node.scrollTop = top
+ return
+ }
+ node = node.parentElement
+ }
+ window.scrollTo(0, top)
+ }, top)
+}
+
function cleanupState(
api: Record,
steps?: (page: Page) => Promise,
exception?: DiffException,
): VisualState {
- return { path: '/settings', api, steps, exception }
+ return {
+ path: '/settings',
+ now: boardNow,
+ api,
+ exception,
+ steps: async (page) => {
+ await scrollSettingsToCleanup(page)
+ await steps?.(page)
+ await scrollSettingsToCleanup(page)
+ },
+ }
}
async function openCleanupDialog(page: Page) {
@@ -2500,11 +2534,7 @@ const cleanupStates: Record = {
await page.getByText('Enter a whole number of days between 1 and 365.').waitFor()
}),
'Read-only (non-admin)': cleanupState(cleanupApi(settingsBody(purgeOnBody), {}, 'member')),
- 'Loading skeleton': cleanupState(cleanupApi({ status: 200, hang: true }), undefined, {
- maxPercent: 17.5,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- }),
+ 'Loading skeleton': cleanupState(cleanupApi({ status: 200, hang: true })),
Offline: cleanupState(cleanupApi(settingsBody(purgeOnBody)), goOffline),
'Loading preview': cleanupState(
cleanupDialogApi({ [purgePreviewPath]: { status: 200, hang: true } }),
@@ -2579,19 +2609,7 @@ const mediaPurgeStates: Record = {
undefined,
mediaDuplicatesPath,
),
- 'Dialog from Media': mediaState(
- mediaDuplicatesApi(undefined, {
- [purgePreviewPath]: { status: 200, body: purgePreviewBody() },
- }),
- openMediaPurgeDialog,
- mediaDuplicatesPath,
- ),
- 'Member: button hidden': mediaState(
- mediaDuplicatesApi(undefined, { 'GET /v1/auth/me': sessionWithRole('member') }),
- undefined,
- mediaDuplicatesPath,
- ),
- 'Offline: button disabled': mediaState(mediaDuplicatesApi(), goOffline, mediaDuplicatesPath),
+ 'Duplicates tab: offline': mediaState(mediaDuplicatesApi(), goOffline, mediaDuplicatesPath),
}
const activityOwnerSession: ApiMock = {
@@ -2869,6 +2887,25 @@ const activityBoardEvents = [
),
]
+const homeActivityTimes = [
+ '2026-09-10T08:58:00Z',
+ '2026-09-10T08:31:00Z',
+ '2026-09-10T07:55:00Z',
+ '2026-09-10T06:55:00Z',
+ '2026-09-10T02:00:00Z',
+]
+const homeActivityMock: ApiMock = {
+ status: 200,
+ body: {
+ items: activityBoardEvents
+ .slice(0, 5)
+ .map((event, index) => ({ ...event, created_at: homeActivityTimes[index] })),
+ total: 5,
+ page: 1,
+ size: 5,
+ },
+}
+
function activityPage(items: unknown[], total: number) {
return { items, total, page: 1, size: 25 }
}
@@ -3121,11 +3158,6 @@ export const visualStates: Record> = {
'Up to date': { path: '/settings', skip: 'clock-sensitive' },
Checking: {
path: '/settings',
- exception: {
- maxPercent: 11.3,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
api: updateApi('owner', updateNeverChecked(), updateCheckHangs),
},
'Check failed': { path: '/settings', skip: 'clock-sensitive' },
@@ -3134,20 +3166,10 @@ export const visualStates: Record> = {
Downloading: {
path: '/settings',
api: updateApi('owner', updateDownloading()),
- exception: {
- maxPercent: 10.6,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
},
Verifying: {
path: '/settings',
api: updateApi('owner', updateJob('verifying')),
- exception: {
- maxPercent: 10.8,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
},
'Ready to install': { path: '/settings', api: updateApi('owner', updateJob('ready')) },
'Restart: confirm': {
@@ -3188,29 +3210,14 @@ export const visualStates: Record> = {
},
'Download failed': {
path: '/settings',
- exception: {
- maxPercent: 10.9,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
api: updateApi('owner', updateJob('failed', { error: 'download' })),
},
'Verification failed': {
path: '/settings',
- exception: {
- maxPercent: 10.5,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
api: updateApi('owner', updateJob('failed', { error: 'verification' })),
},
'Too many requests (429)': {
path: '/settings',
- exception: {
- maxPercent: 11.3,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
api: updateApi('owner', updateNeverChecked(), {
status: 429,
headers: { 'Retry-After': '42' },
@@ -3218,22 +3225,14 @@ export const visualStates: Record> = {
},
'Not prepared': {
path: '/settings',
- exception: {
- maxPercent: 11.9,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
- api: updateApi('owner', updateAvailable()),
+ now: boardNow,
+ api: updateApi('owner', { ...updateAvailable(), checked_at: '2026-09-10T09:41:00Z' }),
},
'Not prepared: command copied': {
path: '/settings',
- exception: {
- maxPercent: 11.9,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
origin: integrationOrigin,
- api: updateApi('owner', updateAvailable()),
+ now: boardNow,
+ api: updateApi('owner', { ...updateAvailable(), checked_at: '2026-09-10T09:41:00Z' }),
steps: async (page) => {
await page.getByRole('button', { name: 'Copy', exact: true }).click()
await page.mouse.move(0, 0)
@@ -3556,11 +3555,6 @@ export const visualStates: Record> = {
home: {
Default: {
path: '/home',
- exception: {
- maxPercent: 13.5,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
@@ -3571,26 +3565,16 @@ export const visualStates: Record> = {
},
Loading: {
path: '/home',
- exception: {
- maxPercent: 18.6,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
- 'GET /v1/activity': homeActivityMock,
+ 'GET /v1/activity': { ...homeActivityMock, hang: true },
'GET /v1/system/update': { status: 200, body: updateStatusBody() },
'GET /v1/article/': { status: 200, body: sixArticlesFixture, hang: true },
},
},
'Empty, first run': {
path: '/home',
- exception: {
- maxPercent: 11.4,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
@@ -3601,11 +3585,6 @@ export const visualStates: Record> = {
},
Error: {
path: '/home',
- exception: {
- maxPercent: 25.3,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
@@ -3616,11 +3595,7 @@ export const visualStates: Record> = {
},
'Update available (owner)': {
path: '/home',
- exception: {
- maxPercent: 11.9,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
+ now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
'GET /v1/activity': homeActivityMock,
@@ -3630,11 +3605,7 @@ export const visualStates: Record> = {
},
'Update ready to install (owner)': {
path: '/home',
- exception: {
- maxPercent: 11.9,
- reason: newCardAbsentReason,
- approvedBy: 'fallen',
- },
+ now: boardNow,
api: {
'GET /v1/auth/me': verifiedSession,
'GET /v1/activity': homeActivityMock,
@@ -4176,27 +4147,3 @@ export const visualStates: Record> = {
media: { ...mediaStates, ...mediaPurgeStates },
'media-picker': pickerStates,
}
-
-const hideCleanupCard = '[data-testid="media-cleanup-card"] { display: none !important }'
-
-function withoutCleanupCard(state: VisualState): VisualState {
- if (state.skip) {
- return state
- }
- return {
- ...state,
- api: { ...state.api, [purgeSettingsPath]: { status: 200, hang: true } },
- steps: async (page) => {
- await page.addStyleTag({ content: hideCleanupCard })
- await state.steps?.(page)
- await page.addStyleTag({ content: hideCleanupCard })
- await page.mouse.move(0, 0)
- },
- }
-}
-
-for (const [name, state] of Object.entries(visualStates.settings!)) {
- if (!(name in cleanupStates)) {
- visualStates.settings![name] = withoutCleanupCard(state)
- }
-}