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.

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

Update grapesjs compatibility (Mautic 4) #50

Open
wants to merge 49 commits into
base: 4.x
Choose a base branch
from
Open

Update grapesjs compatibility (Mautic 4) #50

wants to merge 49 commits into from

Conversation

LordRembo
Copy link
Contributor

@LordRembo LordRembo commented Jan 25, 2024 •
edited

Registering your custom components using the legacy method breaks when updating GrapesJS to release 0.20.1. Need this to be able to upgrade GrapesJS in the GrapesJSBuilderBundle.

there is a PR for M5
there's a PR for M5 with the recent CKE5 changes, this has prio

To test:

  • have a Mautic 4.x running locally
  • replace the package with my forked branch in plugins/GrapesJsBuilderBundle, eg. by running npm i grapesjs-preset- mautic@github:LordRembo/grapesjs-preset-mautic#update-grapesjs-m4 inside that bundle
  • rebuilding GrapesJs bundle by running npm run build
  • Make or edit an email and see that you can still use drag & drop to add/move/edit a Dynamic content Block.
  • You should still be able to save that edited mail

@LordRembo LordRembo mentioned this pull request Jan 26, 2024
Closed
This was referenced Jan 30, 2024
Draft
Merged
mollux and others added 12 commits January 31, 2024 11:28
@mollux
Merge pull request mautic#45 from volha-pivavarchyk/fix/save-buton-al…
b1ee678 
…ways-spinning

Fix the issue the loading spinner is always spinning
@LordRembo
fix breaking change grapesjs 0.20.1, for registering custom components
6527a27
@LordRembo
rebuild
bddac06
@LordRembo
run prettier
53af154
@LordRembo
add fallback if no list of fonts found, use options instead
d43ae89
@LordRembo
remove duplicates
9b50ba6
@LordRembo
Merge branch 'update-grapesjs-compatibility-m5' of github.com:LordRem…
0c35e22 
…bo/grapesjs-preset-mautic into update-grapesjs-compatibility-m5 + fix merge

# Conflicts:
#	dist/buttons/buttonApply.command.js
#	dist/buttons/buttons.service.js
@LordRembo
fix issue with non-existing node being appended when builder loads
7c4b893
@LordRembo
rebuild
25b627c
@LordRembo
replace font icons by svgs from custom blocks
bc86dab
@LordRembo
rebuild
c592112
@LordRembo
override button icons in top bar of the Editor
5cc1128
@LordRembo
rebuild
9c9713a
@LordRembo
undo our previous conditionals and just use the correct class for the…
1c2a461 
… traits instead, so it won't try to use a non-existing Node
@LordRembo
move the general constants together, for the Settings Sector logic, i…
c3d9822 
…s a bit cleaner
@LordRembo
rebuild
c2599b8
@LordRembo
reformat the stopDynamicContentPopup function to fix linting
c9eab80
@LordRembo
correction in syntax
fb67e3e
@LordRembo
move isComponent check to where it should be + improve condition check
f4ee355
@LordRembo
move comment to correct place
720a1da
@LordRembo
replace Dynamic Content icon with an svg to be consistent with the ot…
ede518b 
…her Block icons
@LordRembo
fix spelling of function name to add Dynamic content block
ac2f4c0
@LordRembo
Fix for block getting removed when Editor opens
4b6f8d4
@LordRembo
put back merging of default model properties with the dynamic content…
6218ab7 
… ones, but make it readable
@LordRembo
load default block styling for dynamic content block instead of tryin…
334bf3e 
…g to hardcode padding, so layout matches the other blocks in the email template
@LordRembo
Fix for block getting removed when Editor opens
df78c9d
@LordRembo
move todos to the correct part of the code
84ea898
@LordRembo
don't try to remove item that does not exist
764feb2
@LordRembo
reformat onRender function for clarity
e69c7d4
@LordRembo
format logger variable back to old way of writing but prevent linting…
c9f2aa1 
… error
@LordRembo
make the preview block render in full width so it visually matches th…
524ca93 
…e output of what will be rendered in the mail itself.
@LordRembo
rebuild
253d1d6
@LordRembo
Merge branch 'update-grapesjs-compatibility-m5' into update-grapesjs-…
faeed09 
…compatibility-m4 + fix merge issues (remove the CKE5 stuff)

# Conflicts:
#	dist/blocks.js
#	dist/buttons.js
#	dist/buttons/buttonApply.command.js
#	dist/buttons/buttons.service.js
#	dist/dynamicContent/dynamicContent.blocks.js
#	dist/dynamicContent/dynamicContent.domcomponents.js
#	src/buttons.js
#	src/dynamicContent/dynamicContent.domcomponents.js
@LordRembo
rebuild
6927ea8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LordRembo @mollux @volha-pivavarchyk @escopecz