Skip to content
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.

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

ENH CMS 6 compatibility #346

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Mar 4, 2025

Issue https://github.com/silverstripeltd/product-issues/issues/895

Requirement is in framework so we don't need to include it here as well

It's also the CMS 5 version of the plugin so means that campaign-admin currently isn't installable with CMS 6

@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from dcbe5be to 7391e6f Compare March 4, 2025 06:08
@emteknetnz emteknetnz changed the title DEP Remove vendor-plugin requirement ENH CMS 6 compatibility Mar 4, 2025
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch 3 times, most recently from b2062e7 to a2826ba Compare March 5, 2025 03:09
@@ -1,59 +0,0 @@
/* global jest, jasmine, describe, it, expect, beforeEach */

import configureMockStore from 'redux-mock-store';
Copy link
Member Author

Choose a reason for hiding this comment

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

This test was removed because 'redux-mock-store' wasn't compatible with latest version of redux. There was a link in the failed test to a page where the maintainers or redux recommend testing with react-testing-library instead. Since that kind of acts like a quasi behat test, and the fact we already have behat tests for campaign admin, I think we can safety just delete this test without a replacement

@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from a2826ba to fca2c46 Compare March 5, 2025 03:59
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from fca2c46 to 5e7ba3e Compare March 5, 2025 04:42
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from 5e7ba3e to da63674 Compare March 5, 2025 05:11
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from da63674 to ecab072 Compare March 5, 2025 05:25
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch 2 times, most recently from 5aa1456 to 5ccd01c Compare March 6, 2025 05:13
@emteknetnz emteknetnz marked this pull request as ready for review March 7, 2025 04:16
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch 2 times, most recently from b2d8424 to 9d4cfab Compare March 9, 2025 23:22
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

Tested locally - functionality all seems to be working as expected.

Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

Just noticed the draft label displayed next to records in the campaigns doesn't have the correct styling - it's likely not using the new status badge API to get the markup for those.

@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from 9d4cfab to 02cbef4 Compare March 10, 2025 22:24
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

Just the one change - sorry, should have noticed it last time

@GuySartorelli
Copy link
Member

Also please respond to #346 (review)

@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from 02cbef4 to b61b41f Compare March 11, 2025 01:38
@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from b61b41f to a6bdde7 Compare March 11, 2025 01:46
@emteknetnz
Copy link
Member Author

Just noticed the draft label displayed next to records in the campaigns doesn't have the correct styling - it's likely not using the new status badge API to get the markup for those.

Have updated styling

@emteknetnz emteknetnz force-pushed the pulls/3.0/campaign-admin branch from a6bdde7 to 9836a98 Compare March 11, 2025 02:44
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit be808b5 into silverstripe:3.0 Mar 11, 2025
9 of 11 checks passed
@GuySartorelli GuySartorelli deleted the pulls/3.0/campaign-admin branch March 11, 2025 03:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants