Feature: Jetpack Activity Logs by kean · Pull Request #24597 · wordpress-mobile/WordPress-iOS

kean · 2025-06-19T12:20:19Z

Project

https://linear.app/a8c/project/apple-dataview-in-activity-logs-747664472a7e

Changes

Removals

Screenshots

- Rename PaginatedResponse to DataViewPaginatedResponse for better naming consistency - Move files from Pagination to DataView directory - Update documentation to focus on UI usage with PaginatedForEach - Add comprehensive unit tests for DataViewPaginatedResponse

- Update deleteItem method to properly decrement total when removing items - Update tests to verify total count is correctly maintained after deletion

Replace custom SubscribersPaginatedResponse with generic DataViewPaginatedResponse system. Add notification-based subscriber deletion updates and improve pagination handling with DataViewPaginatedForEach component.

…sion - Rename getSubscribersService() to maketSubscribersService() to better reflect factory pattern - Move deleteSubscriber extension from SubsriberDetailsViewModel to dedicated SubscribersServiceRemote+Extensions file - Update all callers to use the renamed method

dangermattic · 2025-06-19T12:21:18Z

	2 Warnings
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	This PR is assigned to the milestone 26.0. The due date for this milestone has already passed. Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

wpmobilebot · 2025-06-19T12:32:07Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Configuration	Release-Alpha
	Build Number	`27976`
	Version	`PR #24597`
	Bundle ID	`org.wordpress.alpha`
	Commit	`b4a18ae`
	Installation URL	0hqst519j0ts8

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2025-06-19T12:32:30Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Configuration	Release-Alpha
	Build Number	`27976`
	Version	`PR #24597`
	Bundle ID	`com.jetpack.alpha`
	Commit	`b4a18ae`
	Installation URL	2c4euqh5sereo

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

- Implement modern SwiftUI version of Activity Detail screen - Use card-based design system matching SubscriberDetailsView - Add proper localization with NSLocalizedString and reverse-DNS keys - Use WPStyleGuide for consistent icon and color handling - Include activity stats visualization for backup events - Add restore and download backup actions with confirmation dialogs - Integrate with existing Activity model and RewindStatus - Update ContentView with navigation links for testing - Configure MiniatureApp with proper navigation and theming

- Create Activity+Icon.swift with gridiconType, icon, and statusColor properties - Update all references to use new Activity extension methods - Deprecate old WPStyleGuide methods with proper deprecation messages - Remove stringToGridiconTypeMapping from WPStyleGuide - Fix linter warnings for trailing whitespace and shorthand optional binding

- Remove rewindStatus parameter from ActivityLogDetailsView initializer - Remove rewindStatus checks in ActivityActionsCard - Update preview providers to not pass rewindStatus - Update ContentView to not create mock RewindStatus instances - Remove warning card for multisite installations - Simplify restore button enable/disable logic

…eContentView layout

crazytonyli · 2025-06-24T09:41:53Z

Modules/Sources/WordPressUI/Views/CardView.swift

+                        .foregroundStyle(.secondary)
+                }
+                content()
+            }


Is this Group necessary? Does moving the .frame call to VStack and deleting this Group look as expected?

Yeah, it works the same – updated.

crazytonyli · 2025-06-24T09:44:06Z

WordPress/Classes/ViewRelated/Activity/List/ActivityLogsView.swift

+    private func makeRow(with item: ActivityLogRowViewModel) -> some View {
+        ActivityLogRowView(viewModel: item)
+            .onAppear { response.onRowAppeared(item) }
+            .background {


This is the first time I've seen this. Is the intention to hide the chevron added by the NavigationLink?

It won't be necessary when we can switch to iOS 17+ https://stackoverflow.com/questions/77542126/swiftui-how-to-remove-chevron-on-navigation-link-list-in-2023. For now, this seems like the only and very common way to hide the chevrons. I added a TODO: to address it.

crazytonyli · 2025-06-24T09:51:54Z

WordPress/Classes/ViewRelated/Activity/List/ActivityTypeSelectionView.swift

+
+    init(viewModel: ActivityLogsViewModel) {
+        self.viewModel = viewModel
+        self._selectedTypes = State(initialValue: viewModel.parameters.activityTypes)


Does instantiating State like has the same issue you mentioned in #24072 (comment) about StateObject?

In practice, doesn't seem so as it's presented modally, but I move it to onAppear just to be safe.

Could the selectedTypes changes get reverted because the ActivityTypeSelectionView is re-rendered (like going back to this view), which calls .onAppear { selectedTypes = viewModel.parameters.activityTypes } again?

crazytonyli · 2025-06-24T09:53:09Z

WordPress/Classes/ViewRelated/Activity/List/ActivityTypeSelectionView.swift

+        }
+        .onAppear {
+            Task { await fetchActivityGroups() }
+        }


Use .task?

sonarqubecloud · 2025-06-24T20:10:41Z

Quality Gate passed

Issues
30 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

* Add PaginatedResponse * Refactor PaginatedResponse to DataViewPaginatedResponse - Rename PaginatedResponse to DataViewPaginatedResponse for better naming consistency - Move files from Pagination to DataView directory - Update documentation to focus on UI usage with PaginatedForEach - Add comprehensive unit tests for DataViewPaginatedResponse * Fix deleteItem to update total count - Update deleteItem method to properly decrement total when removing items - Update tests to verify total count is correctly maintained after deletion * Rename LoadMoreFooterView * Add DataViewPaginatedForEach component * Add DataViewPaginatedResponseProtocol * Refactor subscribers to use DataViewPaginatedResponse Replace custom SubscribersPaginatedResponse with generic DataViewPaginatedResponse system. Add notification-based subscriber deletion updates and improve pagination handling with DataViewPaginatedForEach component. * Refactor subscribers service creation and move deleteSubscriber extension - Rename getSubscribersService() to maketSubscribersService() to better reflect factory pattern - Move deleteSubscriber extension from SubsriberDetailsViewModel to dedicated SubscribersServiceRemote+Extensions file - Update all callers to use the renamed method * Fix typo in Subscriber * Fix formatting * Fix typos and address comments * Implement new Jetpack Activity Logs screen * Fix SwiftLint warnings * Add Miniature app * Add XcodeTarget_App as a dependency * Configure xcconfig (just use Reader) * Add initial ActivityLogDetailsView * Add ActivityLogDetailsView to Miniature target - Implement modern SwiftUI version of Activity Detail screen - Use card-based design system matching SubscriberDetailsView - Add proper localization with NSLocalizedString and reverse-DNS keys - Use WPStyleGuide for consistent icon and color handling - Include activity stats visualization for backup events - Add restore and download backup actions with confirmation dialogs - Integrate with existing Activity model and RewindStatus - Update ContentView with navigation links for testing - Configure MiniatureApp with proper navigation and theming * Extract Activity icon methods from WPStyleGuide to Activity extension - Create Activity+Icon.swift with gridiconType, icon, and statusColor properties - Update all references to use new Activity extension methods - Deprecate old WPStyleGuide methods with proper deprecation messages - Remove stringToGridiconTypeMapping from WPStyleGuide - Fix linter warnings for trailing whitespace and shorthand optional binding * Remove rewindStatus parameter from ActivityLogDetailsView - Remove rewindStatus parameter from ActivityLogDetailsView initializer - Remove rewindStatus checks in ActivityActionsCard - Update preview providers to not pass rewindStatus - Update ContentView to not create mock RewindStatus instances - Remove warning card for multisite installations - Simplify restore button enable/disable logic * Dev * Add formattedContent * Move the code to the main target * Extract reusable ActivityActorAvatarView * Remove unused code and integrate ActivityLogDetailsView * Fix SwiftLint warnings * Add initial restore/download backup code * Remove JetpackSiteRef usages * Add multisite handling * Remove the new screens and use the existing flows * Add analytics * Cleanup * Add missing analytics * Cleanup * Fix an issue with not all restorable acitivies shown in backups * Fix an issue with restore/download flow layout * Show restore checkpoint in section * Extract reusable CardView and InfoRow components from SubscribersDetailsVIew * Cleanup * Add rewindable * Move restore buttons higher * Add date filtering back * Add Backup tracking * Fix clear background in restore flows * Rework how we do polling * Rework how we manage backup statuss * Revert hasBackup change * Update tests * Update release notes * Remove unused code * Cleanup * Remove Application from list * Remove BackupListViewController and use ActivityLogsViewController instead - Delete BackupListViewController.swift and its extension - Update showBackup() to use ActivityLogsViewController with isBackupMode - Remove BackupListViewController reference from ActivityDetailViewController - Implement displayBackupWithSiteID using ActivityLogsViewController - Add WPAnalytics tracking to ContentCoordinator backup display * Remove JetpackActivityLogViewController and use ActivityLogsViewController - Delete JetpackActivityLogViewController.swift - Update showActivity() methods to use ActivityLogsViewController directly - Update ActivityDetailViewController to check for ActivityLogsViewController - Simplify DashboardActivityLogCardCell to use ActivityLogsViewController * Remove dataViews feature flag - Remove dataViews case from FeatureFlag enum - Remove dataViews from enabled property switch statement - Remove dataViews description The feature flag was already removed from usage in previous commits where we removed JetpackActivityLogViewController and BackupListViewController. * Create separate BackupsViewController and remove isBackupMode from ActivityLogsViewController - Create new BackupsViewController and BackupsView that reuses ActivityLogsView - Remove isBackupMode parameter from ActivityLogsViewController - Update all usages to use BackupsViewController for backups - Update ActivityDetailViewController to recognize BackupsViewController presenter - Keep ActivityLogsView and ActivityLogsViewModel unchanged as implementation details * Remove ActivityListViewModelTests * Remove ActivityTypeSelectorViewController * Remove ActivityListViewModel * Remove BaseActivityListViewController * Fix compilation * Remove RewindStatusRow * Remove RewindStatusTableViewCell * Remove ActivityListRow * Remove ActivityTableViewCell * Remove CalendarViewController * Remove JTAppleCalendar dependency * Remove FilterBarView * Remove FilterChipButton * Remove ActivityDetailViewController * Remove ActivityStore usages * Remove ActivityStoreTests * Fix how isAwaitingCredentials works * Remove ActivityStore * Integrate ActivityContentRouter and FormattableActivity * Update filter icon * Update filters icon * Remove WPStyleGuide+Activity and fix an issue with ActivityFormattableContentView layout * Fix layout of ActivityFormattableContentView * Add placeholders for empty fields * Remove build instructions from CLAUDE.md * Add more instructions for CLAUDE * Handle a scenario where logs are from existing user * Remove obsolete tests * Update UI tests * Fix release build * Use Duration * Simplify CardView * Add TODO for iOS 17 * Move state change to onAppear

kean and others added 14 commits June 17, 2025 15:31

Add PaginatedResponse

c44a4c4

Fix deleteItem to update total count

48d56ee

- Update deleteItem method to properly decrement total when removing items - Update tests to verify total count is correctly maintained after deletion

Rename LoadMoreFooterView

96824f9

Add DataViewPaginatedForEach component

4bd0903

Add DataViewPaginatedResponseProtocol

86903ee

Refactor subscribers to use DataViewPaginatedResponse

a2f5eba

Replace custom SubscribersPaginatedResponse with generic DataViewPaginatedResponse system. Add notification-based subscriber deletion updates and improve pagination handling with DataViewPaginatedForEach component.

Fix typo in Subscriber

d882b55

Fix formatting

9157192

Fix typos and address comments

c07e5bc

Merge branch 'trunk' into task/activity-logs-swiftui

f99f95c

Implement new Jetpack Activity Logs screen

96f9cfd

Extract DataViewPaginatedResponse (#24592)

e61dbf3

kean added this to the 26.0 milestone Jun 19, 2025

kean added Jetpack Activity Log labels Jun 19, 2025

Implement Jetpack Activity Logs screen (list) (#24596)

28352d3

Fix SwiftLint warnings

79dd91c

kean and others added 8 commits June 19, 2025 08:41

Add Miniature app

2b0dba8

Add XcodeTarget_App as a dependency

3063455

Configure xcconfig (just use Reader)

6f94f9e

Add Miniature App (#24598)

bb8ce34

Add initial ActivityLogDetailsView

e220263

kean and others added 9 commits June 20, 2025 12:32

Update icons for filters in DataViews (#24611)

b4ee7ea

Remove WPStyleGuide+Activity and fix an issue with ActivityFormattabl…

c930476

…eContentView layout

Fix layout of ActivityFormattableContentView

0c04776

Add placeholders for empty fields

4ab4e55

Remove build instructions from CLAUDE.md

7b3ccf9

Add more instructions for CLAUDE

348bfb4

Handle a scenario where logs are from existing user

4fa01ef

Remove obsolete tests

84ad407

Update UI tests

156d2a9

kean requested a review from crazytonyli June 20, 2025 18:41

kean marked this pull request as ready for review June 20, 2025 18:42

kean requested a review from a team as a code owner June 20, 2025 18:42

kean added 2 commits June 20, 2025 16:29

Fix release build

521ff21

Use Duration

e636424

crazytonyli reviewed Jun 24, 2025

View reviewed changes

kean force-pushed the feature/jetpack-activity-logs branch from f4a7e5e to e636424 Compare June 24, 2025 12:26

kean added 4 commits June 24, 2025 10:49

Merge branch 'trunk' into logs-merge-test

7bf0c14

Simplify CardView

76ffd88

Add TODO for iOS 17

10dde0e

Move state change to onAppear

b4a18ae

kean requested a review from crazytonyli June 24, 2025 20:08

crazytonyli approved these changes Jun 25, 2025

View reviewed changes

kean added this pull request to the merge queue Jun 25, 2025

Merged via the queue into trunk with commit bcb3e07 Jun 25, 2025
32 of 34 checks passed

kean deleted the feature/jetpack-activity-logs branch June 25, 2025 12:52

crazytonyli mentioned this pull request Jun 26, 2025

Add PostFormatPicker #24620

Merged

Conversation

kean commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project

Changes

Removals

Screenshots

Uh oh!

dangermattic commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jun 24, 2025

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kean commented Jun 19, 2025 •

edited

Loading

dangermattic commented Jun 19, 2025 •

edited

Loading

wpmobilebot commented Jun 19, 2025 •

edited

Loading

wpmobilebot commented Jun 19, 2025 •

edited

Loading