Fix for button click tracking not working #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RCheesley
previously requested changes
Aug 13, 2021
There was a problem hiding this comment.
Superficial review for grammar etc.
A few suggestions to make sure the messages we show to users/output to logs are consistent with our style guide. Main things to look for (as some I could not update with this review) are:
- Capitalise the first word
- Capitalise any Mautic features, for example Dynamic Content, and ensure they are written out fully and correctly (a few places have used DynamicContent without a space)
- Capitalise any abbreviations such as HTML and MJML
dist/commands.js
Outdated
| }); // {token} to slot | ||
| editor.Commands.add('preset-mautic:dynamic-content-components-to-tokens', { | ||
| run: edtr => dynamicContentCmd.convertDynamicContentComponentsToTokens(edtr) | ||
| }); // Link store to compoennt |
There was a problem hiding this comment.
Suggested change
| }); // Link store to compoennt | |
| }); // Link store to component |
|
|
||
| dynamicContent.set('content', dynConToken); | ||
| if (!decId) { | ||
| this.logger.debug('Expected a dynamic content component', { |
There was a problem hiding this comment.
Suggested change
| this.logger.debug('Expected a dynamic content component', { | |
| this.logger.debug('Expected a Dynamic Content component', { |
| this.logger.debug('Expected a dynamic content component', { | ||
| dynamicContent | ||
| }); | ||
| throw new Error('no dynamic content component'); |
There was a problem hiding this comment.
Suggested change
| throw new Error('no dynamic content component'); | |
| throw new Error('No Dynamic Content component'); |
| this.logger.debug('Created a new dynamic content item', { | ||
| dcName, | ||
| component.set('content', `Dynamic Content ${decId}`); | ||
| this.logger.debug('Created a new dynamic content item in store', { |
There was a problem hiding this comment.
Suggested change
| this.logger.debug('Created a new dynamic content item in store', { | |
| this.logger.debug('Created a new Dynamic Content item in store', { |
dist/mjml/mjml.service.js
Outdated
| @@ -46,12 +49,14 @@ export default class MjmlService { | |||
|
|
|||
| static mjmlToHtml(mjml) { | |||
| try { | |||
| if (typeof mjml !== 'string') { | |||
| if (typeof mjml !== 'string' || !mjml.includes('<mjml>')) { | |||
| throw new Error('no valid mjml string'); | |||
There was a problem hiding this comment.
Suggested change
| throw new Error('no valid mjml string'); | |
| throw new Error('No valid MJML string'); |
dist/buttons/buttonClose.command.js
Outdated
| @@ -18,7 +18,7 @@ export default class ButtonCloseCommands { | |||
| throw new Error('no email-html editor'); | |||
There was a problem hiding this comment.
Suggested change
| throw new Error('no email-html editor'); | |
| throw new Error('No email-HTML editor'); |
dist/buttons/buttonClose.command.js
Outdated
| @@ -31,7 +31,7 @@ export default class ButtonCloseCommands { | |||
| throw new Error('no email-mjml editor'); | |||
There was a problem hiding this comment.
Suggested change
| throw new Error('no email-mjml editor'); | |
| throw new Error('No email-MJML editor'); |
| const dynConToken = `{dynamiccontent="${dynConName}"}`; // Clear id because it's reloaded by Mautic and this prevent slot to be destroyed by GrapesJs destroy event on close. | ||
| // dynamicContent.addAttributes({ 'data-param-dec-id': '' }); | ||
|
|
||
| this.logger.debug('Replaced components content with its token', { |
There was a problem hiding this comment.
Suggested change
| this.logger.debug('Replaced components content with its token', { | |
| this.logger.debug('Replaced component's content with its token', { |
added 2 commits
August 14, 2021 07:48
added 2 commits
August 14, 2021 08:09
Merged
dennisameling
approved these changes
Aug 14, 2021
dennisameling
dismissed
RCheesley’s stale review
Suggestions applied by Adrian
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes: mautic/mautic#10323