From b438bfc39b07b2a501a0e3f0b4a4b7f340e8f2a1 Mon Sep 17 00:00:00 2001 From: Filipe Varela Date: Tue, 10 Mar 2020 11:20:03 +0000 Subject: [PATCH 1/3] Adds contextual popover menu item to add site credentials --- .../activity/activity-log-item/index.jsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/client/my-sites/activity/activity-log-item/index.jsx b/client/my-sites/activity/activity-log-item/index.jsx index c7be191308076..3e7f44d9f8197 100644 --- a/client/my-sites/activity/activity-log-item/index.jsx +++ b/client/my-sites/activity/activity-log-item/index.jsx @@ -236,11 +236,14 @@ class ActivityLogItem extends Component { renderRewindAction() { const { + activity, + canAutoconfigure, createBackup, createRewind, disableRestore, disableBackup, - activity, + siteId, + siteSlug, translate, } = this.props; @@ -255,6 +258,19 @@ class ActivityLogItem extends Component { { translate( 'Restore to this point' ) } + { disableRestore && ( + + { translate( 'Add server credentials in order to restore your site' ) } + + ) } + Date: Tue, 10 Mar 2020 13:32:15 +0000 Subject: [PATCH 2/3] Update copy with the latest suggestions --- client/my-sites/activity/activity-log-item/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/my-sites/activity/activity-log-item/index.jsx b/client/my-sites/activity/activity-log-item/index.jsx index 3e7f44d9f8197..02b7e7a00c4ce 100644 --- a/client/my-sites/activity/activity-log-item/index.jsx +++ b/client/my-sites/activity/activity-log-item/index.jsx @@ -267,7 +267,7 @@ class ActivityLogItem extends Component { : `/settings/security/${ siteSlug }` } > - { translate( 'Add server credentials in order to restore your site' ) } + { translate( 'Add server credentials to enable restoring' ) } ) } From 9cb6427b625a69e0d2dd6df26c5ad06df2dc933a Mon Sep 17 00:00:00 2001 From: Filipe Varela Date: Tue, 10 Mar 2020 13:44:07 +0000 Subject: [PATCH 3/3] Adds tracking to new option --- client/my-sites/activity/activity-log-item/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/my-sites/activity/activity-log-item/index.jsx b/client/my-sites/activity/activity-log-item/index.jsx index 02b7e7a00c4ce..8b294dc80f6cc 100644 --- a/client/my-sites/activity/activity-log-item/index.jsx +++ b/client/my-sites/activity/activity-log-item/index.jsx @@ -244,6 +244,7 @@ class ActivityLogItem extends Component { disableBackup, siteId, siteSlug, + trackAddCreds, translate, } = this.props; @@ -266,6 +267,7 @@ class ActivityLogItem extends Component { ? `/start/rewind-auto-config/?blogid=${ siteId }&siteSlug=${ siteSlug }` : `/settings/security/${ siteSlug }` } + onClick={ trackAddCreds } > { translate( 'Add server credentials to enable restoring' ) } @@ -487,6 +489,7 @@ const mapDispatchToProps = ( dispatch, { activity: { activityId }, siteId } ) => dispatch( recordTracksEvent( 'calypso_activitylog_event_get_help', { activity_name: activityName } ) ), + trackAddCreds: () => dispatch( recordTracksEvent( 'calypso_activitylog_event_add_credentials' ) ), trackFixCreds: () => dispatch( recordTracksEvent( 'calypso_activitylog_event_fix_credentials' ) ), } );