Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Activity Log: default the page to the Table layout and load the upsell-callout stylesheet from the main entry so its flex rules reach the bundle.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import { addQueryArgs } from '@wordpress/url';
import { useCallback } from 'react';
import { useAnalytics } from '../../hooks/use-analytics';
import illustrationUrl from './activity-logs-callout-illustration.svg';
import './upsell-callout.scss';
// Stylesheet is `@use`d from `src/js/style.scss` so the rules ride the
// main entry chunk instead of relying on a side-effect JS import.

const PRODUCT_SLUG = 'jetpack_security_t1_yearly';
const UPSELL_SOURCE = 'activity-log-page-purchase';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,14 @@ const TABLE_LAYOUT = {
};

export const DEFAULT_VIEW: View = {
type: 'activity',
type: 'table',
perPage: 20,
sort: {
field: 'published',
direction: 'desc',
},
fields: [ 'published', 'actor' ],
layout: { density: 'balanced' },
titleField: 'event_title',
mediaField: 'event_icon',
descriptionField: 'event_description',
// Group consecutive events that fall on the same calendar day
// (site timezone) under a "Apr 24, 2026" header. See the matching
// entry in DEFAULT_LAYOUTS.activity below for the full rationale.
groupBy: { field: 'published_date', direction: 'desc', showLabel: false },
fields: [ 'published', 'event', 'actor' ],
layout: TABLE_LAYOUT,
showLevels: false,
};

Expand Down
5 changes: 5 additions & 0 deletions projects/packages/activity-log/src/js/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@use "@automattic/jetpack-base-styles/admin-page-layout" as *;
@use "sass:meta";
// Component styles are forwarded from this main entry rather than
// imported via per-component side-effect imports in each .tsx file —
// that way they live in the same emitted chunk as the wrapper rules
// below and can't get dropped by chunk splitting.
@use "./components/ActivityLog/upsell-callout";

// DataViews is a bundled (not externalized) @wordpress package in
// jetpack-webpack-config, so its stylesheet must be brought in alongside
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Check failure on line 2 in projects/plugins/jetpack/changelog/fix-activity-log-default-and-upsell

View workflow job for this annotation

GitHub Actions / Changelogger validity

Type must be "major", "enhancement", "compat", "bugfix", or "other".

Check failure on line 2 in projects/plugins/jetpack/changelog/fix-activity-log-default-and-upsell

View workflow job for this annotation

GitHub Actions / Changelogger validity

Type must be "major", "enhancement", "compat", "bugfix", or "other".

Activity Log: default the page to the Table layout and fix the free-tier upsell callout's flex layout.
Loading