Merge pull request #337 from dew326/ezp-28787-upgrade-alloy-editor

EZP-28787: As a Developer, I want to upgrade AlloyEditor to version 1.5.1

src/bundle/Resources/public/js/alloyeditor/src/base/ez-embeddiscovercontent.js

@@ -17,7 +17,7 @@ export default class EzEmbedDiscoverContentButton extends EzWidgetButton {
 
         ReactDOM.render(React.createElement(eZ.modules.UniversalDiscovery, {
             onConfirm: this[this.props.udwContentDiscoveredMethod].bind(this),
-            onCancel: () => udwContainer.innerHTML = '',
+            onCancel: () => ReactDOM.unmountComponentAtNode(udwContainer),
             confirmLabel: 'Select content',
             title: this.props.udwTitle,
             multiple: false,

src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embed.js

@@ -37,7 +37,7 @@ export default class EzBtnEmbed extends EzEmbedDiscoverContentButton {
         widget.renderEmbedPreview(items[0].ContentInfo.Content.Name);
         widget.setFocused(true);
 
-        document.querySelector('#react-udw').innerHTML = '';
+        ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
     }
 
     /**

src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-embedupdate.js

@@ -24,7 +24,7 @@ export default class EzBtnEmbedUpdate extends EzEmbedDiscoverContentButton {
         widget.setWidgetContent("");
         widget.renderEmbedPreview(items[0].ContentInfo.Content.Name);
 
-        document.querySelector('#react-udw').innerHTML = '';
+        ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
     }
 
     /**

src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-image.js

@@ -36,7 +36,7 @@ export default class EzBtnImage extends EzEmbedImageButton {
         widget.loadImagePreviewFromCurrentVersion(items[0].ContentInfo.Content.CurrentVersion._href);
         widget.setFocused(true);
 
-        document.querySelector('#react-udw').innerHTML = '';
+        ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
     }
 
     /**

src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-imageupdate.js

@@ -24,7 +24,7 @@ export default class EzBtnImageUpdate extends EzEmbedImageButton {
         widget.setWidgetContent("");
         widget.loadImagePreviewFromCurrentVersion(items[0].ContentInfo.Content.CurrentVersion._href);
 
-        document.querySelector('#react-udw').innerHTML = '';
+        ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
     }
 
     /**

src/bundle/Resources/public/js/alloyeditor/src/buttons/ez-btn-linkedit.js

@@ -76,12 +76,12 @@ export default class EzBtnLinkEdit extends Component {
                 );
                 this.focusEditedLink();
 
-                udwContainer.innerHTML = '';
+                ReactDOM.unmountComponentAtNode(udwContainer);
             };
 
             ReactDOM.render(React.createElement(eZ.modules.UniversalDiscovery, {
                 onConfirm: udwOnConfirm,
-                onCancel: () => udwContainer.innerHTML = '',
+                onCancel: () => ReactDOM.unmountComponentAtNode(udwContainer),
                 confirmLabel: 'Select content',
                 title: 'Select content',
                 multiple: false,

src/bundle/Resources/public/js/scripts/admin.contenttype.relation.default.location.js

@@ -3,7 +3,7 @@
     const udwContainer = doc.getElementById('react-udw');
     const token = doc.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (btn, items) => {
         closeUDW();
 

src/bundle/Resources/public/js/scripts/admin.limitation.pick.js

@@ -2,7 +2,7 @@
     const udwContainer = doc.getElementById('react-udw');
     const token = doc.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const selectLocationsConfirm = (target, data) => {
         const selectedItems = data.reduce((total, item) => total + `<li>${item.ContentInfo.Content.Name}</li>`, '');
 

src/bundle/Resources/public/js/scripts/admin.role_assignment.add.js

@@ -3,7 +3,7 @@
     const limitationsRadio = [...doc.querySelectorAll('.ez-limitations__radio')];
     const token = doc.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const selectSubtreeConfirm = (data) => {
         const selectedItems = data.reduce((total, item) => total + `<li>${item.ContentInfo.Content.Name}</li>`, '');
 

src/bundle/Resources/public/js/scripts/admin.section.list.js

@@ -3,7 +3,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (form, content) => {
         const field = form.querySelector('#' + form.getAttribute('name') + '_locations_location');
 

src/bundle/Resources/public/js/scripts/admin.section.view.js

@@ -3,7 +3,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (form, content) => {
         const field = form.querySelector('#' + form.getAttribute('name') + '_locations_location');
 

src/bundle/Resources/public/js/scripts/admin.trash.list.js

@@ -3,7 +3,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (form, content) => {
         const field = form.querySelector('#trash_item_restore_location_location');
 

src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js

@@ -81,7 +81,7 @@
             ? parseInt(relationsContainer.dataset.defaultLocation, 10)
             : window.eZ.adminUiConfig.universalDiscoveryWidget.startingLocationId;
         const allowedContentTypes = relationsContainer.dataset.allowedContentTypes.split(',').filter(item => item.length);
-        const closeUDW = () => udwContainer.innerHTML = '';
+        const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
         const renderRows = (items) => items.forEach((...args) => relationsContainer.insertAdjacentHTML('beforeend', renderRow(...args)));
         const updateInputValue = (items) => {
             sourceInput.value = items.join();

src/bundle/Resources/public/js/scripts/udw/browse.js

@@ -3,7 +3,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (items) => {
         closeUDW();
 

src/bundle/Resources/public/js/scripts/udw/copy.js

@@ -5,7 +5,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (items) => {
         closeUDW();
 

src/bundle/Resources/public/js/scripts/udw/locations.tab.js

@@ -6,7 +6,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (items) => {
         closeUDW();
 

src/bundle/Resources/public/js/scripts/udw/move.js

@@ -5,7 +5,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (items) => {
         closeUDW();
 

src/bundle/Resources/public/js/scripts/udw/swap.js

@@ -5,7 +5,7 @@
     const udwContainer = document.getElementById('react-udw');
     const token = document.querySelector('meta[name="CSRF-Token"]').content;
     const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
-    const closeUDW = () => udwContainer.innerHTML = '';
+    const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
     const onConfirm = (items) => {
         closeUDW();
 

src/bundle/Resources/views/layout.html.twig

@@ -85,11 +85,13 @@
         </div>
 
         {%  javascripts
-            'bundles/ezplatformadminuiassets/vendors/react/dist/react.min.js'
-            'bundles/ezplatformadminuiassets/vendors/react-dom/dist/react-dom.min.js'
+            'bundles/ezplatformadminuiassets/vendors/react/umd/react.production.min.js'
+            'bundles/ezplatformadminuiassets/vendors/react-dom/umd/react-dom.production.min.js'
             'bundles/ezplatformadminuiassets/vendors/jquery/dist/jquery.min.js'
             'bundles/ezplatformadminuiassets/vendors/popper.js/dist/umd/popper.min.js'
             'bundles/ezplatformadminuiassets/vendors/bootstrap/dist/js/bootstrap.min.js'
+            'bundles/ezplatformadminuiassets/vendors/create-react-class/create-react-class.min.js'
+            'bundles/ezplatformadminuiassets/vendors/prop-types/prop-types.min.js'
             'bundles/ezplatformadminuiassets/vendors/alloyeditor/dist/alloy-editor/alloy-editor-no-react-min.js'
             'bundles/ezplatformadminuimodules/js/UniversalDiscovery.module.js'
             'bundles/ezplatformadminui/js/scripts/button.trigger.js'