Merge branch 'BF-11979' into 'master'

Bf 11979 See merge request !2

Merge branch 'BF-11979' into 'master'
Bf 11979 See merge request !2
Michael Jones
Showing 6 changed files with 249 additions and 58 deletions
data/MjmlSetupData.xml
entity/MjmlEntities.xml
screen/MjmlApp.xml
screen/emails/GrapesJsEmail.xml
service/mjml.rest.xml
service/mjml/MjmlServices.xml
--- a/data/MjmlSetupData.xml
View file @384b583
+++ b/data/MjmlSetupData.xml
View file @384b583
@@ -13,6 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entity-facade-xml type="seed">
+    <!-- ========= Screen Theme Resource for GrapesJs / mjml -->
    <moqui.basic.Enumeration description="Mjml Theme Type" enumId="STT_MJML" enumTypeId="ScreenThemeType"/>
    <moqui.screen.ScreenTheme screenThemeId="MJML_DEFAULT" screenThemeTypeEnumId="STT_MJML"
            description="Mjml Default Theme"/>
@@ -26,6 +27,7 @@ along with this software (see the LICENSE.md file). If not, see
    <moqui.screen.ScreenThemeResource screenThemeId="MJML_DEFAULT" sequenceNum="110" resourceTypeEnumId="STRT_HEADER_TITLE"
            resourceValue="Email Editor"/>
+    <!-- ========= DB Resource for storing project and template files -->
    <moqui.resource.DbResource resourceId="GRAPESJS" filename="grapesjs" isFile="N"/>
    <moqui.resource.DbResource resourceId="GRAPESJS_PROJECT" filename="project" isFile="N" parentResourceId="GRAPESJS"/>
    <moqui.resource.DbResource resourceId="GRAPESJS_TEMPLATE" filename="template" isFile="N" parentResourceId="GRAPESJS"/>
@@ -35,4 +37,10 @@ along with this software (see the LICENSE.md file). If not, see
            <fileData><![CDATA[{"assets":[],"styles":[{"selectors":[],"selectorsAdd":"#outlook a","style":{"padding-top":"0px","padding-right":"0px","padding-bottom":"0px","padding-left":"0px"}},{"selectors":[],"selectorsAdd":"body","style":{"margin-top":"0px","margin-right":"0px","margin-bottom":"0px","margin-left":"0px","padding-top":"0px","padding-right":"0px","padding-bottom":"0px","padding-left":"0px","text-size-adjust":"100%"}},{"selectors":[],"selectorsAdd":"table, td","style":{"border-collapse":"collapse"}},{"selectors":[],"selectorsAdd":"img","style":{"border-top-width":"0px","border-right-width":"0px","border-bottom-width":"0px","border-left-width":"0px","border-top-style":"initial","border-right-style":"initial","border-bottom-style":"initial","border-left-style":"initial","border-top-color":"initial","border-right-color":"initial","border-bottom-color":"initial","border-left-color":"initial","border-image-source":"initial","border-image-slice":"initial","border-image-width":"initial","border-image-outset":"initial","border-image-repeat":"initial","height":"auto","line-height":"100%","outline-color":"initial","outline-style":"none","outline-width":"initial","text-decoration-line":"none","text-decoration-thickness":"initial","text-decoration-style":"initial","text-decoration-color":"initial"}},{"selectors":[],"selectorsAdd":"p","style":{"display":"block","margin-top":"13px","margin-right":"0px","margin-bottom":"13px","margin-left":"0px"}},{"selectors":["mj-column-per-100"],"style":{"width":"100% !important","max-width":"100%"},"mediaText":"only screen and (min-width: 480px)","atRuleType":"media"},{"selectors":[],"selectorsAdd":".moz-text-html .mj-column-per-100","style":{"width":"100% !important","max-width":"100%"}},{"selectors":["mj-column-per-50"],"style":{"width":"50% !important","max-width":"50%"},"mediaText":"only screen and (min-width: 480px)","atRuleType":"media"},{"selectors":[],"selectorsAdd":".moz-text-html .mj-column-per-50","style":{"width":"50% !important","max-width":"50%"}},{"selectors":["mj-column-per-33-333333333333336"],"style":{"width":"33.3333% !important","max-width":"33.3333%"},"mediaText":"only screen and (min-width: 480px)","atRuleType":"media"},{"selectors":[],"selectorsAdd":".moz-text-html .mj-column-per-33-333333333333336","style":{"width":"33.3333% !important","max-width":"33.3333%"}}],"pages":[{"frames":[{"component":{"type":"wrapper","stylable":["background","background-color","background-image","background-repeat","background-attachment","background-position","background-size"],"components":[{"tagName":"mjml","type":"mjml","components":[{"tagName":"mj-head","type":"mj-head","components":[{"tagName":"mj-font","type":"mj-font","style":{"name":"Barlow","href":"https://fonts.googleapis.com/css?family=Barlow"},"attributes":{"name":"Barlow","href":"https://fonts.googleapis.com/css?family=Barlow","style":"name:Barlow;href:https://fonts.googleapis.com/css?family=Barlow;"}},{"tagName":"mj-style","type":"mj-style","components":[{"type":"textnode","content":"\n                            .slogan {\n                            background: #000;\n                            }\n                        "}]}]},{"tagName":"mj-body","type":"mj-body","style":{"width":"600px"},"attributes":{"width":"600px","style":"width:600px;"},"components":[{"type":"comment","content":" Company Header "},{"tagName":"mj-section","type":"mj-section","style":{"background-color":"#f0f0f0","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-color":"#f0f0f0","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-color:#f0f0f0;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"border":"10px solid #F45E43","vertical-align":"top"},"attributes":{"border":"10px solid #F45E43","vertical-align":"top","style":"border:10px solid #F45E43;vertical-align:top;"},"components":[{"tagName":"mj-text","type":"mj-text","style":{"font-family":"Barlow","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left"},"attributes":{"font-family":"Barlow","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left","style":"font-family:Barlow;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;font-size:13px;line-height:22px;align:left;"},"components":[{"type":"textnode","content":"A first line of text"}]},{"tagName":"mj-spacer","type":"mj-spacer","style":{"height":"50px"},"attributes":{"height":"50px","style":"height:50px;"},"components":[{"type":"textnode","content":"\n                            "}]}]}]},{"type":"comment","content":" Image Header "},{"tagName":"mj-section","type":"mj-section","style":{"background-url":"http://1.bp.blogspot.com/-TPrfhxbYpDY/Uh3Refzk02I/AAAAAAAALw8/5sUJ0UUGYuw/s1600/New+York+in+The+1960's+-+70's+(2).jpg","background-size":"cover","background-repeat":"no-repeat","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-url":"http://1.bp.blogspot.com/-TPrfhxbYpDY/Uh3Refzk02I/AAAAAAAALw8/5sUJ0UUGYuw/s1600/New+York+in+The+1960's+-+70's+(2).jpg","background-size":"cover","background-repeat":"no-repeat","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-url:http://1.bp.blogspot.com/-TPrfhxbYpDY/Uh3Refzk02I/AAAAAAAALw8/5sUJ0UUGYuw/s1600/New+York+in+The+1960's+-+70's+(2).jpg;background-size:cover;background-repeat:no-repeat;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-text","type":"mj-text","style":{"css-class":"slogan","align":"center","color":"#fff","font-size":"40px","font-family":"Helvetica Neue","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px"},"attributes":{"css-class":"slogan","align":"center","color":"#fff","font-size":"40px","font-family":"Helvetica Neue","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","style":"css-class:slogan;align:center;color:#fff;font-size:40px;font-family:Helvetica Neue;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;line-height:22px;"},"components":[{"type":"textnode","content":"Slogan here"}]}]}]},{"type":"comment","content":" Intro text "},{"tagName":"mj-wrapper","type":"mj-wrapper","style":{"background-color":"#ffe9f7","padding":"10px"},"attributes":{"background-color":"#ffe9f7","padding":"10px","style":"background-color:#ffe9f7;padding:10px;"},"components":[{"tagName":"mj-section","type":"mj-section","style":{"background-color":"#eaeffa","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-color":"#eaeffa","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-color:#eaeffa;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-group","type":"mj-group","style":{"background-color":"#fffadd","vertical-align":"top"},"attributes":{"background-color":"#fffadd","vertical-align":"top","style":"background-color:#fffadd;vertical-align:top;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-text","type":"mj-text","style":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","align":"left"},"attributes":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","align":"left","style":"font-style:italic;font-size:20px;font-family:Helvetica Neue;color:#626262;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;line-height:22px;align:left;"},"components":[{"type":"textnode","content":"My Awesome Text"}]},{"tagName":"mj-text","type":"mj-text","style":{"color":"#525252","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left"},"attributes":{"color":"#525252","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left","style":"color:#525252;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;font-size:13px;line-height:22px;align:left;"},"components":[{"type":"textnode","content":"\n                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin rutrum enim eget magna efficitur, eu semper augue semper.\n                                            Aliquam erat volutpat. Cras id dui lectus. Vestibulum sed finibus lectus, sit amet suscipit nibh. Proin nec\n                                            commodo purus. Sed eget nulla elit. Nulla aliquet mollis faucibus.\n                                        "}]},{"tagName":"mj-button","type":"mj-button","style":{"background-color":"#F45E43","href":"#","border-radius":"3px","font-size":"13px","font-weight":"400","color":"#ffffff","vertical-align":"middle","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"background-color":"#F45E43","href":"#","border-radius":"3px","font-size":"13px","font-weight":"400","color":"#ffffff","vertical-align":"middle","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"background-color:#F45E43;href:#;border-radius:3px;font-size:13px;font-weight:400;color:#ffffff;vertical-align:middle;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"Learn more"}]}]}]}]}]},{"type":"comment","content":" Side image "},{"tagName":"mj-section","type":"mj-section","style":{"background-color":"white","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-color":"white","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-color:white;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-image","type":"mj-image","style":{"width":"200px","src":"https://designspell.files.wordpress.com/2012/01/sciolino-paris-bw.jpg","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"width":"200px","src":"https://designspell.files.wordpress.com/2012/01/sciolino-paris-bw.jpg","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"width:200px;src:https://designspell.files.wordpress.com/2012/01/sciolino-paris-bw.jpg;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"\n                            "}]}]},{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-text","type":"mj-text","style":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","align":"left"},"attributes":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","align":"left","style":"font-style:italic;font-size:20px;font-family:Helvetica Neue;color:#626262;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;line-height:22px;align:left;"},"components":[{"type":"textnode","content":"\n                                    Find amazing places ...\n                                "}]},{"tagName":"mj-text","type":"mj-text","style":{"color":"#525252","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left"},"attributes":{"color":"#525252","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","font-size":"13px","line-height":"22px","align":"left","style":"color:#525252;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;font-size:13px;line-height:22px;align:left;"},"components":[{"type":"textnode","content":"\n                                    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin rutrum enim eget magna efficitur, eu semper augue semper.\n                                    Aliquam erat volutpat. Cras id dui lectus. Vestibulum sed finibus lectus."}]}]}]},{"tagName":"mj-section","type":"mj-section","style":{"padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-text","type":"mj-text","style":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","align":"center","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px"},"attributes":{"font-style":"italic","font-size":"20px","font-family":"Helvetica Neue","color":"#626262","align":"center","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","line-height":"22px","style":"font-style:italic;font-size:20px;font-family:Helvetica Neue;color:#626262;align:center;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;line-height:22px;"},"components":[{"type":"textnode","content":"\n                                    ... with real-life images\n                                "}]}]}]},{"tagName":"mj-raw","type":"mj-raw","components":[{"classes":["container"],"components":[{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x141?random","alt":"Example image"}},{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x142?random","alt":"Example image"}},{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x143?random","alt":"Example image"}},{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x144?random","alt":"Example image"}},{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x145?random","alt":"Example image"}},{"type":"image","resizable":{"ratioDefault":1},"classes":["item"],"attributes":{"src":"https://source.unsplash.com/random/200x146?random","alt":"Example image"}}]}]},{"type":"comment","content":" Icons "},{"tagName":"mj-section","type":"mj-section","style":{"background-color":"#fbfbfb","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-color":"#fbfbfb","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-color:#fbfbfb;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-image","type":"mj-image","style":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x0l.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x0l.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"width:100px;src:http://191n.mj.am/img/191n/3s/x0l.png;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"\n                            "}]}]},{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-image","type":"mj-image","style":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x01.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x01.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"width:100px;src:http://191n.mj.am/img/191n/3s/x01.png;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"\n                            "}]}]},{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-image","type":"mj-image","style":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x0s.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"width":"100px","src":"http://191n.mj.am/img/191n/3s/x0s.png","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"width:100px;src:http://191n.mj.am/img/191n/3s/x0s.png;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"\n                            "}]}]}]},{"type":"comment","content":" Footer "},{"tagName":"mj-section","type":"mj-section","style":{"background-color":"#e7e7e7","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center"},"attributes":{"background-color":"#e7e7e7","padding-left":"0px","padding-right":"0px","padding-top":"10px","padding-bottom":"10px","text-align":"center","style":"background-color:#e7e7e7;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;text-align:center;"},"components":[{"tagName":"mj-column","type":"mj-column","style":{"vertical-align":"top"},"attributes":{"vertical-align":"top","style":"vertical-align:top;"},"components":[{"tagName":"mj-button","type":"mj-button","style":{"href":"#","background-color":"#414141","border-radius":"3px","font-size":"13px","font-weight":"400","color":"#ffffff","vertical-align":"middle","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center"},"attributes":{"href":"#","background-color":"#414141","border-radius":"3px","font-size":"13px","font-weight":"400","color":"#ffffff","vertical-align":"middle","padding-top":"10px","padding-bottom":"10px","padding-right":"25px","padding-left":"25px","align":"center","style":"href:#;background-color:#414141;border-radius:3px;font-size:13px;font-weight:400;color:#ffffff;vertical-align:middle;padding-top:10px;padding-bottom:10px;padding-right:25px;padding-left:25px;align:center;"},"components":[{"type":"textnode","content":"Hello There!"}]},{"tagName":"mj-social","type":"mj-social","style":{"font-size":"15px","icon-size":"30px","mode":"horizontal","align":"center","line-height":"22px"},"attributes":{"font-size":"15px","icon-size":"30px","mode":"horizontal","align":"center","line-height":"22px","style":"font-size:15px;icon-size:30px;mode:horizontal;align:center;line-height:22px;"},"components":[{"tagName":"mj-social-element","type":"mj-social-element","style":{"name":"facebook","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle"},"attributes":{"name":"facebook","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle","style":"name:facebook;href:https://mjml.io/;align:center;font-size:13px;line-height:22px;vertical-align:middle;"},"components":[{"type":"textnode","content":"\n                                        Facebook\n                                    "}]},{"tagName":"mj-social-element","type":"mj-social-element","style":{"name":"google","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle"},"attributes":{"name":"google","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle","style":"name:google;href:https://mjml.io/;align:center;font-size:13px;line-height:22px;vertical-align:middle;"},"components":[{"type":"textnode","content":"\n                                        Google\n                                    "}]},{"tagName":"mj-social-element","type":"mj-social-element","style":{"name":"twitter","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle"},"attributes":{"name":"twitter","href":"https://mjml.io/","align":"center","font-size":"13px","line-height":"22px","vertical-align":"middle","style":"name:twitter;href:https://mjml.io/;align:center;font-size:13px;line-height:22px;vertical-align:middle;"},"components":[{"type":"textnode","content":"\n                                        Twitter\n                                    "}]}]}]}]},{"type":"comment","content":" Footer "}]}]}]},"id":"7pDRO7cKTwWhWIrx"}],"id":"56s2G6UdUXG2Zbvx"}]}]]></fileData>
        </file>
    </dbResources>
+    <!-- ========= Service Jobs -->
+    <moqui.service.job.ServiceJob jobName="remove_ExcessMjmlEmailResourceHistories" description="Remove any excess mjml resource histories for email templates"
+            serviceName="mjml.MjmlServices.remove#ExcessMjmlEmailResourceHistories" cronExpression="0 0 * * * ?" paused="N"
+            transactionTimeout="3600"/>
 </entity-facade-xml>
--- a/entity/MjmlEntities.xml
View file @384b583
+++ b/entity/MjmlEntities.xml
View file @384b583
@@ -16,7 +16,9 @@ along with this software (see the LICENSE.md file). If not, see
    <extend-entity entity-name="EmailTemplate" package="moqui.basic.email">
        <field name="grapesLocation" type="text-medium"/>
+        <field name="grapesPublishedVersionName" type="text-short"/>
        <field name="htmlLocation" type="text-medium"/>
+        <field name="htmlPublishedVersionName" type="text-short"/>
    </extend-entity>
    <view-entity entity-name="ProductStoreEmailDetail" package="mantle.product.store">
        <member-entity entity-alias="PSE" entity-name="mantle.product.store.ProductStoreEmail"/>
--- a/screen/MjmlApp.xml
View file @384b583
+++ b/screen/MjmlApp.xml
View file @384b583
@@ -69,17 +69,6 @@ along with this software (see the LICENSE.md file). If not, see
                            </mj-column>
                        </mj-section>
-                        <!-- Image Header -->
-                        <mj-section background-url="http://1.bp.blogspot.com/-TPrfhxbYpDY/Uh3Refzk02I/AAAAAAAALw8/5sUJ0UUGYuw/s1600/New+York+in+The+1960's+-+70's+(2).jpg"
-                                    background-size="cover" background-repeat="no-repeat">
-                            <mj-column>
-                                <mj-text css-class="slogan" align="center" color="#fff" font-size="40px" font-family="Helvetica Neue">Slogan here</mj-text>
-                                <mj-button background-color="#F63A4D" href="#">
-                                    Promotion
-                                </mj-button>
-                            </mj-column>
-                        </mj-section>
                        <!-- Intro text -->
                        <mj-wrapper background-color="#ffe9f7" padding="10px">
                            <mj-section background-color="#eaeffa">
@@ -100,9 +89,6 @@ along with this software (see the LICENSE.md file). If not, see
                        <!-- Side image -->
                        <mj-section background-color="white">
                            <mj-column>
-                                <mj-image width="200px" src="https://designspell.files.wordpress.com/2012/01/sciolino-paris-bw.jpg" />
-                            </mj-column>
-                            <mj-column>
                                <mj-text font-style="italic" font-size="20px" font-family="Helvetica Neue" color="#626262">
                                    Find amazing places ...
                                </mj-text>
@@ -118,41 +104,19 @@ along with this software (see the LICENSE.md file). If not, see
                                </mj-text>
                            </mj-column>
                        </mj-section>
-                        <mj-raw>
-                            <div class="container">
-                                <img class="item" src="https://source.unsplash.com/random/200x141?random" alt="Example image">
-                                <img class="item" src="https://source.unsplash.com/random/200x142?random" alt="Example image">
-                                <img class="item" src="https://source.unsplash.com/random/200x143?random" alt="Example image">
-                                <img class="item" src="https://source.unsplash.com/random/200x144?random" alt="Example image">
-                                <img class="item" src="https://source.unsplash.com/random/200x145?random" alt="Example image">
-                                <img class="item" src="https://source.unsplash.com/random/200x146?random" alt="Example image">
-                            </div>
-                        </mj-raw>
-                        <!-- Icons -->
-                        <mj-section background-color="#fbfbfb">
-                            <mj-column>
-                                <mj-image width="100px" src="http://191n.mj.am/img/191n/3s/x0l.png" />
-                            </mj-column>
-                            <mj-column>
-                                <mj-image width="100px" src="http://191n.mj.am/img/191n/3s/x01.png" />
-                            </mj-column>
-                            <mj-column>
-                                <mj-image width="100px" src="http://191n.mj.am/img/191n/3s/x0s.png" />
-                            </mj-column>
-                        </mj-section>
                        <!-- Footer -->
                        <mj-section background-color="#e7e7e7">
                            <mj-column>
                                <mj-button href="#">Hello There!</mj-button>
                                <mj-social font-size="15px" icon-size="30px" mode="horizontal">
-                                    <mj-social-element name="facebook" href="https://mjml.io/">
+                                    <mj-social-element name="facebook" href="https://moqui.org/">
                                        Facebook
                                    </mj-social-element>
-                                    <mj-social-element name="google" href="https://mjml.io/">
+                                    <mj-social-element name="google" href="https://moqui.org/">
                                        Google
                                    </mj-social-element>
-                                    <mj-social-element name="twitter" href="https://mjml.io/">
+                                    <mj-social-element name="twitter" href="https://moqui.org/">
                                        Twitter
                                    </mj-social-element>
                                </mj-social>
@@ -180,7 +144,11 @@ along with this software (see the LICENSE.md file). If not, see
                    }
                    // console.log('response ', response)
                    window.htmlLocation = response.htmlLocation;
+                    window.htmlVersionName = response.htmlVersionName;
+                    window.htmlPublishedVersionName = response.htmlPublishedVersionName;
                    window.grapesLocation = response.grapesLocation;
+                    window.grapesVersionName = response.grapesVersionName;
+                    window.grapesPublishedVersionName = response.grapesPublishedVersionName;
                    // const url = new URL(window.location.href)
                    // url.searchParams.set('htmlLocation', response.htmlLocation);
                    // url.searchParams.set('grapesLocation', response.grapesLocation);
@@ -191,6 +159,67 @@ along with this software (see the LICENSE.md file). If not, see
                    const projectData = JSON.parse(response.data);
                    // console.log('window.projectData ', window.projectData)
+                    function moquiPlugin(editor) {
+                        // Use the API: https://grapesjs.com/docs/api/
+                        window.moquiPublishText = 'moqui-publish';
+                        editor.Commands.add(window.moquiPublishText, () => {
+                            const request = new XMLHttpRequest();
+                            request.open("POST", "${baseLinkUrl}/rest/s1/moqui-mjml/mjml?emailTemplateId="+window.emailTemplateId, false); // `false` makes the request synchronous
+                            request.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+                            request.setRequestHeader("X-CSRF-Token", document.getElementById('confMoquiSessionToken').value);
+                            request.send(JSON.stringify({ publish:true, data: window.editor.getProjectData(), moquiVars:window.moquiVars, html:window.editor.runCommand('mjml-code-to-html')?.html }));
+                            // console.log('request ', request)
+                            if (request.status === 200) {
+                                const result = JSON.parse(request.responseText);
+                                window.htmlLocation = result.htmlLocation;
+                                window.htmlVersionName = result.htmlVersionName;
+                                window.htmlPublishedVersionName = result.htmlPublishedVersionName;
+                                window.grapesLocation = result.grapesLocation;
+                                window.grapesVersionName = result.grapesVersionName;
+                                window.grapesPublishedVersionName = result.grapesPublishedVersionName;
+                                if (window.grapesVersionName !== window.grapesPublishedVersionName && window.htmlVersionName !== window.htmlPublishedVersionName) {
+                                    editor.Panels.addButton('options', window.moquiPublishButtonSettings);
+                                } else {
+                                    editor.Panels.removeButton('options', window.moquiPublishText);
+                                }
+                            }
+                        });
+                        editor.on('storage:end:store', () => {
+                            // console.log('Storage store request ended');
+                            const request = new XMLHttpRequest();
+                            request.open("GET", "${baseLinkUrl}/rest/s1/moqui-mjml/mjml/afterMjmlStore?emailTemplateId="+window.emailTemplateId, false); // `false` makes the request synchronous
+                            request.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+                            request.setRequestHeader("X-CSRF-Token", document.getElementById('confMoquiSessionToken').value);
+                            request.send();
+                            if (request.status === 200) {
+                                const result = JSON.parse(request.responseText);
+                                window.htmlLocation = result.htmlLocation;
+                                window.htmlVersionName = result.htmlVersionName;
+                                window.htmlPublishedVersionName = result.htmlPublishedVersionName;
+                                window.grapesLocation = result.grapesLocation;
+                                window.grapesVersionName = result.grapesVersionName;
+                                window.grapesPublishedVersionName = result.grapesPublishedVersionName;
+                                if (window.grapesVersionName !== window.grapesPublishedVersionName && window.htmlVersionName !== window.htmlPublishedVersionName) {
+                                    editor.Panels.addButton('options', window.moquiPublishButtonSettings);
+                                } else {
+                                    editor.Panels.removeButton('options', window.moquiPublishText);
+                                }
+                            }
+                        });
+                        // Add Publish button
+                        window.moquiPublishButtonSettings = {
+                            id: window.moquiPublishText,
+                            command: 'moqui-publish',
+                            attributes: { title: 'publish' },
+                            label: `<div style="background-color: #f45e43; color:#2c2e35; padding: 0px 10px; border: none; border-radius: 10px; cursor: pointer;">Publish</div>`,
+                        };
+                        if (window.grapesVersionName !== window.grapesPublishedVersionName && window.htmlVersionName !== window.htmlPublishedVersionName) {
+                            editor.Panels.addButton('options', window.moquiPublishButtonSettings);
+                        }
+                    }
                    window.editor = grapesjs.init({
                        projectData: projectData,
                        height: '100%',
@@ -226,11 +255,19 @@ along with this software (see the LICENSE.md file). If not, see
                                            // url.searchParams.set('htmlLocation', result.htmlLocation);
                                            // url.searchParams.set('emailTemplateId', result.emailTemplateId);
                                            window.history.pushState({}, '', url)
-                                            window.grapesLocation = result.grapesLocation;
                                            window.htmlLocation = result.htmlLocation;
+                                            window.htmlVersionName = result.htmlVersionName;
+                                            window.htmlPublishedVersionName = result.htmlPublishedVersionName;
+                                            window.grapesLocation = result.grapesLocation;
+                                            window.grapesVersionName = result.grapesVersionName;
+                                            window.grapesPublishedVersionName = result.grapesPublishedVersionName;
                                            window.emailTemplateId = result.emailTemplateId;
                                            window.moquiVars = result.moquiVars;
-                                            // console.log('onLoad window.moquiVars ', window.moquiVars)
+                                            if (window.grapesVersionName !== window.grapesPublishedVersionName && window.htmlVersionName !== window.htmlPublishedVersionName) {
+                                                editor.Panels.addButton('options', window.moquiPublishButtonSettings);
+                                            } else {
+                                                editor.Panels.removeButton('options', window.moquiPublishText);
+                                            }
                                        }
                                        // console.log('onLoad ', result)
                                        return result.data
@@ -241,7 +278,7 @@ along with this software (see the LICENSE.md file). If not, see
                        fromElement: true,
                        container: '#gjs',
-                        plugins: ['grapesjs-mjml'],
+                        plugins: ['grapesjs-mjml',moquiPlugin],
                        pluginsOpts: {
                            'grapesjs-mjml': {}
                        }
--- a/screen/emails/GrapesJsEmail.xml
View file @384b583
+++ b/screen/emails/GrapesJsEmail.xml
View file @384b583
@@ -17,11 +17,34 @@ along with this software (see the LICENSE.md file). If not, see
    <actions>
        <entity-find-one entity-name="moqui.basic.email.EmailTemplate" value-field="emailTemplate" auto-field-map="[emailTemplateId:emailTemplateId]"/>
-        <if condition="!emailTemplate">
+        <if condition="!emailTemplate || !emailTemplate.htmlLocation">
            <return error="true" message="Email Template not found"/>
        </if>
+        <set field="dataPre" from="ec.resource.getLocationReference(emailTemplate.htmlLocation).getText(emailTemplate.htmlPublishedVersionName)"/>
+        <script><![CDATA[
+            String location = "template.ftl";
-        <set field="renderedText" from="ec.resource.template(emailTemplate.htmlLocation, 'ftl')"/>
+            freemarker.template.Template newTemplate;
+            Reader templateReader = null;
+            try {
+                templateReader = new StringReader(context.dataPre);
+                // Use the getFtlConfiguration method from ec.resource.templateRenderers.ftl
+                newTemplate = new freemarker.template.Template(location, templateReader, ec.resource.templateRenderers.ftl.getFtlConfiguration());
+            } catch (Exception e) {
+                throw new org.moqui.BaseArtifactException("Error while initializing template at " + location, e);
+            } finally {
+                if (templateReader != null) {
+                    try { templateReader.close(); }
+                    catch (Exception e) { logger.error("Error closing template reader", e); }
+                }
+            }
+            StringWriter sw = new StringWriter()
+            try {
+                newTemplate.createProcessingEnvironment(ec.contextStack, sw).process();
+            } catch (Exception e) { throw new org.moqui.BaseArtifactException("Error rendering template at " + location, e); }
+            context.renderedText = sw.toString();
+            ]]></script>
    </actions>
    <widgets>
--- a/service/mjml.rest.xml
View file @384b583
+++ b/service/mjml.rest.xml
View file @384b583
@@ -21,6 +21,9 @@ along with this software (see the LICENSE.md file). If not, see
    <resource name="mjml">
        <method type="get"><service name="mjml.MjmlServices.load#GrapeJs"/></method>
        <method type="post"><service name="mjml.MjmlServices.store#GrapeJs"/></method>
+        <resource name="afterMjmlStore">
+            <method type="get"><service name="mjml.MjmlServices.get#AfterMjmlStore"/></method>
+        </resource>
    </resource>
 </resource>
--- a/service/mjml/MjmlServices.xml
View file @384b583
+++ b/service/mjml/MjmlServices.xml
View file @384b583
@@ -34,7 +34,11 @@ along with this software (see the LICENSE.md file). If not, see
        </in-parameters>
        <out-parameters>
            <parameter name="grapesLocation"/>
+            <parameter name="grapesVersionName"/>
+            <parameter name="grapesPublishedVersionName"/>
            <parameter name="htmlLocation"/>
+            <parameter name="htmlVersionName"/>
+            <parameter name="htmlPublishedVersionName"/>
            <parameter name="data"/>
            <parameter name="emailTemplateId"/>
            <parameter name="moquiVars"/>
@@ -45,7 +49,9 @@ along with this software (see the LICENSE.md file). If not, see
            <entity-find-one entity-name="moqui.basic.email.EmailTemplate" value-field="emailTemplate" auto-field-map="[emailTemplateId:emailTemplateId]"/>
            <if condition="!emailTemplate"><return error="true" message="Resource not found"/></if>
            <set field="grapesLocation" from="emailTemplate?.grapesLocation"/>
+            <set field="grapesPublishedVersionName" from="emailTemplate?.grapesPublishedVersionName"/>
            <set field="htmlLocation" from="emailTemplate?.htmlLocation"/>
+            <set field="htmlPublishedVersionName" from="emailTemplate?.htmlPublishedVersionName"/>
            <set field="grapesJsResource" from="ec.resource.getLocationReference('dbresource://grapesjs/project')"/>
            <if condition="!grapesLocation &amp;&amp; !htmlLocation">
@@ -54,7 +60,8 @@ along with this software (see the LICENSE.md file). If not, see
                    <set field="grapesFile" from="grapesJsResource.makeFile(java.util.UUID.randomUUID().toString()+'.json')"/>
                    <service-call name="mjml.MjmlServices.get#GlobalGrapeVarList" out-map="context"/>
-                    <set field="dataRaw" from="ec.resource.getLocationReference('dbresource://grapesjs/template/default.json').getText()"/>
+                    <set field="defaultLocation" value="dbresource://grapesjs/template/default.json"/>
+                    <set field="dataRaw" from="ec.resource.getLocationReference(defaultLocation).getText()"/>
                    <set field="htmlLocation" from="grapesJsResource.location + '/' + htmlFile?.dbResourceId + '.html'"/>
                    <set field="grapesLocation" from="grapesJsResource.location + '/' + grapesFile?.dbResourceId + '.json'"/>
                    <script><![CDATA[
@@ -62,6 +69,8 @@ along with this software (see the LICENSE.md file). If not, see
                        grapesFile.putText(dataRaw)
                        grapesFile.move(grapesLocation)
                        ]]></script>
+                    <set field="htmlVersionName" from="htmlFile?.getCurrentVersion()?.getVersionName() ?: htmlFile?.getRootVersion()?.getVersionName() ?: '01'"/>
+                    <set field="grapesVersionName" from="grapesFile?.getCurrentVersion()?.getVersionName() ?: grapesFile?.getRootVersion()?.getVersionName() ?: '01'"/>
                    <service-call name="update#moqui.basic.email.EmailTemplate" in-map="[emailTemplateId:emailTemplateId,grapesLocation:grapesLocation,htmlLocation:htmlLocation]"/>
                    <service-call name="mjml.MjmlServices.get#GlobalGrapeVarList" out-map="globalGrapeVarList"/>
@@ -76,7 +85,7 @@ along with this software (see the LICENSE.md file). If not, see
                            }
                        }
-                        context.allVarsRegexPattern = /\$\{[a-zA-Z_]\w*\}/
+                        context.allVarsRegexPattern = /\$\{[a-zA-Z_][a-zA-Z0-9_.]*\}/
                        context.errorVarList = context.dataRaw.findAll(context.allVarsRegexPattern).unique().collect { it - '${' - '}' } - globalGrapeVarList*.key
                        context.errorTemplateRegexPattern = errorVarList.collect { '\\\$\\{'+it+'\\}' }.join('|')
                        if (context.errorTemplateRegexPattern) {
@@ -88,7 +97,7 @@ along with this software (see the LICENSE.md file). If not, see
                        ]]></script>
 <!--                    <log level="warn" message="dataPre is ${dataPre}"/>-->
                    <script><![CDATA[
-                        String location = "template.ftl";
+                        String location = defaultLocation;
                        freemarker.template.Template newTemplate;
                        Reader templateReader = null;
@@ -120,6 +129,10 @@ along with this software (see the LICENSE.md file). If not, see
                    <if condition="!grapesFile || grapesFile.parent?.location != grapesJsResource.location">
                        <return error="true" message="Resource not found"/>
                    </if>
+                    <set field="grapesVersionName" from="grapesFile?.getCurrentVersion()?.getVersionName() ?: grapesFile?.getRootVersion()?.getVersionName() ?: '01'"/>
+                    <set field="tempHtmlFile" from="ec.resource.getLocationReference(htmlLocation)"/>
+                    <set field="htmlVersionName" from="tempHtmlFile?.getCurrentVersion()?.getVersionName() ?: tempHtmlFile?.getRootVersion()?.getVersionName() ?: '01'"/>
+                    <set field="tempHtmlFile" from="null"/>
                    <service-call name="mjml.MjmlServices.get#GlobalGrapeVarList" out-map="globalGrapeVarList"/>
                    <set field="dataRaw" from="grapesFile.getText()"/>
@@ -134,7 +147,7 @@ along with this software (see the LICENSE.md file). If not, see
                            }
                        }
-                        context.allVarsRegexPattern = /\$\{[a-zA-Z_]\w*\}/
+                        context.allVarsRegexPattern = /\$\{[a-zA-Z_][a-zA-Z0-9_.]*\}/
                        context.errorVarList = context.dataRaw.findAll(context.allVarsRegexPattern).unique().collect { it - '${' - '}' } - globalGrapeVarList*.key
                        context.errorTemplateRegexPattern = errorVarList.collect { '\\\$\\{'+it+'\\}' }.join('|')
                        if (context.errorTemplateRegexPattern) {
@@ -146,7 +159,7 @@ along with this software (see the LICENSE.md file). If not, see
                        ]]></script>
 <!--                    <log level="warn" message="dataPre is ${dataPre}"/>-->
                    <script><![CDATA[
-                        String location = "template.ftl";
+                        String location = grapesFile.location;
                        freemarker.template.Template newTemplate;
                        Reader templateReader = null;
@@ -183,14 +196,19 @@ along with this software (see the LICENSE.md file). If not, see
        <in-parameters>
            <parameter name="htmlLocation"/>
            <parameter name="grapesLocation"/>
-            <parameter name="emailTemplateId"/>
+            <parameter name="emailTemplateId" required="true"/>
-            <parameter name="data"/>
+            <parameter name="data" required="true"/>
-            <parameter name="moquiVars"/>
+            <parameter name="moquiVars" required="true"/>
-            <parameter name="html" allow-html="any"/>
+            <parameter name="html" allow-html="any" required="true"/>
+            <parameter name="publish" default="false" type="Boolean" required="true"/>
        </in-parameters>
        <out-parameters>
            <parameter name="htmlLocation"/>
+            <parameter name="htmlVersionName"/>
+            <parameter name="htmlPublishedVersionName"/>
            <parameter name="grapesLocation"/>
+            <parameter name="grapesVersionName"/>
+            <parameter name="grapesPublishedVersionName"/>
        </out-parameters>
        <actions>
            <if condition="htmlLocation == 'null'"><set field="htmlLocation" from="null"/></if>
@@ -198,7 +216,9 @@ along with this software (see the LICENSE.md file). If not, see
            <entity-find-one entity-name="moqui.basic.email.EmailTemplate" value-field="emailTemplate" auto-field-map="[emailTemplateId:emailTemplateId]"/>
            <if condition="!emailTemplate"><return error="true" message="Resource not found"/></if>
            <set field="grapesLocation" from="emailTemplate?.grapesLocation"/>
+            <set field="grapesPublishedVersionName" from="emailTemplate?.grapesPublishedVersionName"/>
            <set field="htmlLocation" from="emailTemplate?.htmlLocation"/>
+            <set field="htmlPublishedVersionName" from="emailTemplate?.htmlPublishedVersionName"/>
            <set field="dataMap" from="new groovy.json.JsonSlurper().parseText(ec.web.secureRequestParameters._requestBodyText).data"/>
 <!--            <log level="warn" message="dataMap is ${dataMap}"/>-->
            <set field="moquiVars" from="new groovy.json.JsonSlurper().parseText(ec.web.secureRequestParameters._requestBodyText).moquiVars"/>
@@ -243,10 +263,7 @@ along with this software (see the LICENSE.md file). If not, see
                        }
                    ]]></script>
                    <script>grapesFile.putText(dataPre)</script>
+                    <set field="grapesVersionName" from="grapesFile?.getCurrentVersion()?.getVersionName()"/>
-<!--                    <set field="dataRaw" from="grapesFile.getText()"/>-->
-<!--                    <set field="dataRawMap" from="new groovy.json.JsonSlurper().parseText(dataRaw)"/>-->
-<!--                    <script>grapesFile.putText(data)</script>-->
                    <set field="htmlFile" from="null"/>
                    <if condition="htmlLocation"><then>
@@ -269,7 +286,14 @@ along with this software (see the LICENSE.md file). If not, see
                    <if condition="!htmlFile || htmlFile.parent?.location != grapesJsResource.location">
                        <return error="true" message="Resource not found"/>
                    </if>
-<!--                    <script><![CDATA[htmlFile.putText(html)]]></script>-->
+                    <script><![CDATA[htmlFile.putText(html)]]></script>
+                    <set field="htmlVersionName" from="htmlFile?.getCurrentVersion()?.getVersionName()"/>
+                    <if condition="publish">
+                        <service-call name="update#moqui.basic.email.EmailTemplate" in-map="[emailTemplateId:emailTemplateId,
+                            htmlPublishedVersionName:htmlVersionName,grapesPublishedVersionName:grapesVersionName]"/>
+                        <set field="htmlPublishedVersionName" from="htmlVersionName"/>
+                        <set field="grapesPublishedVersionName" from="grapesVersionName"/>
+                    </if>
                </else-if>
                <else>
                    <return error="true" message="Resource not found"/>
@@ -277,6 +301,100 @@ along with this software (see the LICENSE.md file). If not, see
            </if>
        </actions>
    </service>
+    <service verb="get" noun="AfterMjmlStore">
+        <description>Get the data after storing the MJML data</description>
+        <in-parameters>
+            <parameter name="emailTemplateId" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="htmlLocation"/>
+            <parameter name="htmlVersionName"/>
+            <parameter name="htmlPublishedVersionName"/>
+            <parameter name="grapesLocation"/>
+            <parameter name="grapesVersionName"/>
+            <parameter name="grapesPublishedVersionName"/>
+        </out-parameters>
+        <actions>
+            <entity-find-one entity-name="moqui.basic.email.EmailTemplate" value-field="emailTemplate" auto-field-map="[emailTemplateId:emailTemplateId]"/>
+            <if condition="!emailTemplate"><return error="true" message="Resource not found"/></if>
+            <set field="grapesLocation" from="emailTemplate?.grapesLocation"/>
+            <set field="grapesVersionName" from="ec.resource.getLocationReference(grapesLocation)?.getCurrentVersion()?.getVersionName()"/>
+            <set field="grapesPublishedVersionName" from="emailTemplate?.grapesPublishedVersionName"/>
+            <set field="htmlLocation" from="emailTemplate?.htmlLocation"/>
+            <set field="htmlVersionName" from="ec.resource.getLocationReference(htmlLocation)?.getCurrentVersion()?.getVersionName()"/>
+            <set field="htmlPublishedVersionName" from="emailTemplate?.htmlPublishedVersionName"/>
+        </actions>
+    </service>
+    <service verb="remove" noun="ExcessMjmlEmailResourceHistories">
+        <in-parameters>
+            <parameter name="runDate" default="Timestamp.from(java.time.Instant.now())" required="true" type="Timestamp"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="removedHistoryList"/>
+        </out-parameters>
+        <actions>
+            <entity-find entity-name="moqui.basic.email.EmailTemplate" list="emailTemplateList">
+                <econdition field-name="grapesLocation" operator="is-not-null"/>
+                <econdition field-name="htmlLocation" operator="is-not-null"/>
+                <select-field field-name="emailTemplateId,grapesLocation,htmlLocation,grapesPublishedVersionName,htmlPublishedVersionName"/>
+                <order-by field-name="-lastUpdatedStamp"/>
+            </entity-find>
+            <set field="resourceList" from="[]"/>
+            <iterate list="emailTemplateList" entry="emailTemplate">
+                <set field="grapesFile" from="ec.resource.getLocationReference(emailTemplate.grapesLocation)"/>
+                <if condition="grapesFile">
+                    <script><![CDATA[
+                        def versionWhitelist = []
+                        if (grapesFile?.getCurrentVersion()?.getVersionName()) versionWhitelist.add(grapesFile.getCurrentVersion().getVersionName())
+                        if (emailTemplate?.grapesPublishedVersionName) versionWhitelist.add(emailTemplate.grapesPublishedVersionName)
+                        resourceList.add([location:grapesFile.location,resourceId:grapesFile.dbResourceId,versionWhitelist:versionWhitelist.size()>0?versionWhitelist:null])]]></script>
+                </if>
+                <set field="htmlFile" from="ec.resource.getLocationReference(emailTemplate.htmlLocation)"/>
+                <if condition="htmlFile">
+                    <script><![CDATA[
+                        def versionWhitelist = []
+                        if (htmlFile?.getCurrentVersion()?.getVersionName()) versionWhitelist.add(htmlFile.getCurrentVersion().getVersionName())
+                        if (emailTemplate?.htmlPublishedVersionName) versionWhitelist.add(emailTemplate.htmlPublishedVersionName)
+                        resourceList.add([location:htmlFile.location,resourceId:htmlFile.dbResourceId,versionWhitelist:versionWhitelist.size()>0?versionWhitelist:null])]]></script>
+                </if>
+            </iterate>
+            <set field="oneHourAgo" from="Timestamp.from(runDate.toInstant().minus(1, java.time.temporal.ChronoUnit.HOURS))"/>
+            <set field="removedHistoryList" from="[]"/>
+            <iterate list="resourceList" entry="resource">
+                <entity-find entity-name="moqui.resource.DbResourceFileHistory" list="resourceHistoryPreList">
+                    <econdition field-name="resourceId" from="resource.resourceId"/>
+                    <econdition field-name="versionDate" operator="greater" from="oneHourAgo"/>
+                    <econdition field-name="versionDate" operator="less-equals" from="runDate"/>
+                    <select-field field-name="resourceId,versionName,versionDate,previousVersionName,userId"/>
+                    <order-by field-name="-versionDate"/>
+                </entity-find>
+                <set field="skippedUserIds" from="[]"/>
+                <set field="resourceHistoryList" from="[]"/>
+                <iterate list="resourceHistoryPreList" entry="resourceHistory">
+                    <!-- Add all but the single latest history per userId to resourceHistoryList -->
+                    <if condition="resource.versionWhitelist.contains(resourceHistory.versionName) || !skippedUserIds.contains(resourceHistory.userId)">
+<!--                        <log level="warn" message="${resource.resourceId} ${resourceHistory.versionName} userId ${resourceHistory.userId}"/>-->
+                        <set field="skippedUserIds" from="skippedUserIds + [resourceHistory.userId]"/><continue/></if>
+                    <set field="resourceHistoryList" from="resourceHistoryList + [resourceHistory]"/>
+                </iterate>
+                <iterate list="resourceHistoryList" entry="resourceHistory">
+                    <entity-find-one entity-name="moqui.resource.DbResourceFileHistory" value-field="usedResourceHistory" auto-field-map="[resourceId:resource.resourceId,previousVersionName:resourceHistory.versionName]" for-update="true">
+                        <select-field field-name="resourceId,versionName,versionDate,previousVersionName,userId"/></entity-find-one>
+<!--                    <log level="warn" message="set versionName ${usedResourceHistory.versionName} of previousVersionName ${usedResourceHistory.previousVersionName} to ${resourceHistory.previousVersionName}"/>-->
+                    <set field="usedResourceHistory.previousVersionName" from="resourceHistory.previousVersionName"/>
+                    <log level="info" message="Removed resource history ${resourceHistory.resourceId} version ${resourceHistory.versionName}"/>
+                    <set field="removedHistoryList" from="removedHistoryList + [resourceId:resource.resourceId, versionName:resourceHistory.versionName,versionDate:resourceHistory.versionDate,userId:resourceHistory.userId]"/>
+                    <entity-update value-field="usedResourceHistory"/>
+                    <entity-delete value-field="resourceHistory"/>
+                </iterate>
+            </iterate>
+        </actions>
+    </service>
 </services>