8000 Fix cancel scheduled campaign event log by kuzmany · Pull Request #8116 · mautic/mautic · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix cancel scheduled campaign event log #8116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Apr 19, 2021
Merged

Fix cancel scheduled campaign event log #8116

merged 6 commits into from
Apr 19, 2021

Conversation

kuzmany
Copy link
Member
@kuzmany kuzmany commented Nov 8, 2019 •
edited
Loading

Please be sure you are submitting this against the staging branch.

Q A
Bug fix? x
New feature?
Automated tests included?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs) Fixes #8867
BC breaks?
Deprecations?

Description:

I noticed schedule campaign actions cannot cancel via timeline. This PR should fixed it.

image

Steps to reproduce the bug:

  1. Create campaign
  2. Setup scheduled event (Change contacts tags for example)
  3. Trigger campaign
  4. Go to contact profile and see schedule campaign event action
  5. Try cancel it
  6. Reload page and see schedule event action still exists

Steps to test this PR:

  1. Load up this PR
  2. Repeat all steps and see If scheduled action is non scheduled now

You should see in timeline

image

@kuzmany kuzmany added the bug Issues or PR's relating to bugs label Nov 8, 2019
@kuzmany kuzmany added this to the 2.16.0 milestone Nov 8, 2019
@kuzmany kuzmany added the ready-to-test PR's that are ready to test label Nov 8, 2019
@npracht npracht requested a review from alanhartless November 8, 2019 09:33
@npracht npracht removed this from the 2.16.0 milestone Jan 23, 2020
@npracht npracht added Triage M2/M3 and removed ready-to-test PR's that are ready to test labels Apr 3, 2020
@npracht
Copy link
Member
npracht commented Apr 3, 2020

Hi there!
It has been decided to not create any extra Mautic 2 versions (except for major security purpose) knowing that Mautic 3 is coming very soon.

We now want to integrate your contribution in the Mautic 3 roadmap as 3.0.1 candidate.

How to do?

  1. Check if the bug still present in Mautic 3
  2. If Yes: rebase your PR against the 3.x branch
  3. If No: please comment on your PR: “This PR only applies to Mautic 2.x”

Please report results by commenting on your PR to make us administration easier.

In case your bugfix only apply to Mautic 2, we'll consider adding it in an extra Mautic 2 version.

You can more information on how to do all of that on this blog post "Getting you PR ready for Mautic 3".

@kuzmany kuzmany force-pushed the fix-remove-schedule-event-from-timeline branch from abb0df1 to 1c5a38f Compare April 12, 2020 08:56
@kuzmany kuzmany changed the base branch from staging to 3.x April 12, 2020 08:57
@kuzmany
Copy link
Member Author
kuzmany commented Apr 12, 2020

Rebased

@kuzmany kuzmany added this to the 3.0.1 milestone Apr 12, 2020
@kuzmany kuzmany added ready-to-test PR's that are ready to test and removed Triage M2/M3 labels Apr 12, 2020
@kuzmany kuzmany mentioned this pull request Apr 16, 2020
Closed
@kuzmany kuzmany mentioned this pull request Jun 2, 2020
Closed
@npracht npracht changed the base branch from 3.x to staging June 17, 2020 07:39
@RCheesley RCheesley force-pushed the fix-remove-schedule-event-from-timeline branch from 1c5a38f to b312a4a Compare June 24, 2020 17:26
@RCheesley
Copy link
Member

Close & reopen for Scrutinizer

@RCheesley RCheesley closed this Jun 26, 2020
@RCheesley RCheesley reopened this Jun 26, 2020
@codecov
Copy link
codecov bot commented Jun 26, 2020 •
edited
Loading

Codecov Report

Merging #8116 (1736174) into 3.3 (77c7ac4) will increase coverage by 0.04%.
The diff coverage is 100.00%.

❗ Current head 1736174 differs from pull request most recent head 6d41504. Consider uploading reports for the commit 6d41504 to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##                3.3    #8116      +/-   ##
============================================
+ Coverage     40.22%   40.27%   +0.04%     
  Complexity    34043    34043              
============================================
  Files          1990     1990              
  Lines        105412   105420       +8     
============================================
+ Hits          42404    42454      +50     
+ Misses        63008    62966      -42
Impacted Files Coverage Δ Complexity Δ
...ndles/CampaignBundle/Controller/AjaxController.php 50.00% <100.00%> (+50.00%) 17.00 <0.00> (ø)
app/bundles/CampaignBundle/Entity/LeadEventLog.php 82.58% <0.00%> (+1.29%) 42.00% <0.00%> (ø%)
app/bundles/CampaignBundle/Entity/Campaign.php 57.06% <0.00%> (+2.61%) 50.00% <0.00%> (ø%)
app/bundles/CampaignBundle/Entity/Event.php 66.77% <0.00%> (+2.93%) 81.00% <0.00%> (ø%)
app/bundles/CampaignBundle/Model/EventLogModel.php 8.53% <0.00%> (+8.53%) 29.00% <0.00%> (ø%)

RCheesley
RCheesley requested changes Jun 27, 2020
View reviewed changes
Copy link
Member
@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR does actually resolve the issue in that the emails are being cancelled, but we seem to lose the message that shows with the notice informing that it was cancelled and the reschedule button:

screenshot-local mautic3-2020 06 27-17_06_26

Screencast: https://youtu.be/CFOg3mqD_9c

@RCheesley RCheesley added the pending-feedback PR's and issues that are awaiting feedback from the author label Jun 27, 2020
@kuzmany
Copy link
Member Author
kuzmany commented Jun 27, 2020

I will add note tomorrow to deleted event.

@dennisameling
Copy link
Member

Moving this to 3.0.2 because we just want to double-check whether the cancellation message should show up. From a user perspective that's a crucial aspect in terms of transparency.

@dennisameling dennisameling modified the milestones: 3.0.1, 3.0.2 Jun 29, 2020
@kuzmany
Copy link
Member Author
kuzmany commented Jul 13, 2020

@RCheesley I've added note for cancelled events

image

@kuzmany kuzmany removed the pending-feedback PR's and issues that are awaiting feedback from the author label Jul 13, 2020
@npracht npracht added this to the 3.2 milestone Oct 19, 2020
@npracht npracht modified the milestones: 3.2.0, 3.2.1 Nov 23, 2020
@dennisameling dennisameling modified the milestones: 3.2.1, 3.2.2 Dec 2, 2020
@npracht npracht modified the milestones: 3.2.2, 3.2.3 Dec 21, 2020
@npracht npracht modified the milestones: 3.2.3, 3.2.5, 3.3.1 Jan 15, 2021
@RCheesley RCheesley modified the milestones: 3.3.1, 3.3.2 Feb 23, 2021
@RCheesley RCheesley modified the milestones: 3.3.2, 3.3.3 Mar 15, 2021
@escopecz escopecz force-pushed the fix-remove-schedule-event-from-timeline branch from a13c52f to 1736174 Compare April 16, 2021 18:06
@escopecz escopecz changed the base branch from 3.1 to 3.3 April 16, 2021 18:09
escopecz
escopecz approved these changes Apr 16, 2021
View reviewed changes
Copy link
Member
@escopecz escopecz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested the fix and it works 👍

I also rebased from 3.1 to 3.3 and added missing functional test.

@escopecz escopecz added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed needs-automated-tests PR's that need automated tests before they can be merged pending-test-confirmation PR's that require one test before they can be merged labels Apr 16, 2021
@RCheesley RCheesley merged commit 53df109 into mautic:3.3 Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@escopecz escopecz escopecz approved these changes

@RCheesley RCheesley RCheesley left review comments

@alanhartless alanhartless Awaiting requested review from alanhartless

Assignees
No one assigned
Labels
bug Issues or PR's relating to bugs cla-signed The PR contributors have signed the contributors agreement ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged
Projects
None yet
Milestone
3.3.3
Development

Successfully merging this pull request may close these issues.

Reschedule event or cancel event in contact's history isn't working
6 participants
@kuzmany @npracht @RCheesley @dennisameling @mautibot @escopecz
0