Merge pull request #3409 from magento-honey-badgers/2.3.0-qwerty-sync

[honey] MC-4323: Cannot Add Slider WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved

Author: cpartica

app/code/Magento/Customer/etc/db_schema.xml

@@ -506,7 +506,7 @@
         <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Customer Id"/>
         <column xsi:type="varchar" name="session_id" nullable="true" length="64" comment="Session ID"/>
-        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
+        <column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Last Visit Time"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="visitor_id"/>

app/code/Magento/Integration/etc/adminhtml/system.xml

@@ -54,7 +54,7 @@
                     <label>Maximum Login Failures to Lock Out Account</label>
                     <comment>Maximum Number of authentication failures to lock out account.</comment>
                 </field>
-                <field id="timeout" translate="label" type="text comment" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lockout Time (seconds)</label>
                     <comment>Period of time in seconds after which account will be unlocked.</comment>
                 </field>

app/code/Magento/Integration/etc/db_schema.xml

@@ -136,7 +136,7 @@
                 comment="User type (admin or customer)"/>
         <column xsi:type="smallint" name="failures_count" padding="5" unsigned="true" nullable="true" identity="false"
                 default="0" comment="Number of failed authentication attempts in a row"/>
-        <column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
+        <column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Lock expiration time"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="log_id"/>

app/code/Magento/Sales/etc/db_schema.xml

@@ -769,7 +769,7 @@
         <column xsi:type="varchar" name="order_increment_id" nullable="false" length="32" comment="Order Increment Id"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Order Id"/>
-        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="true"
+        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="false"
                 default="CURRENT_TIMESTAMP" comment="Order Increment Id"/>
         <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml

@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <checkbox>
             <selector>div[contains(@class,"field choice") and label[contains(.,"%product_name%")]]//input</selector>
             <strategy>xpath</strategy>

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml

@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <attribute>
             <selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
             <strategy>xpath</strategy>

dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml

@@ -7,7 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <qty />
         <link>
             <selector>//*[@id="downloadable-links-list"]/*[contains(.,"%link_name%")]//input</selector>
             <strategy>xpath</strategy>

dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/System/Config/OauthSectionTest.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+namespace Magento\Integration\Block\Adminhtml\System\Config;
+
+class OauthSectionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * Checks that OAuth Section in the system config is loaded
+     */
+    public function testOAuthSection()
+    {
+        $this->dispatch('backend/admin/system_config/edit/section/oauth/');
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('id="oauth_access_token_lifetime-head"', $body);
+        $this->assertContains('id="oauth_cleanup-head"', $body);
+        $this->assertContains('id="oauth_consumer-head"', $body);
+        $this->assertContains('id="oauth_authentication_lock-head"', $body);
+    }
+}

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -117,7 +117,7 @@ define([
             jQuery.when.apply(jQuery, deferreds).done(function () {
                 tinyMCE4.init(settings);
                 this.getPluginButtons().hide();
-                this.eventBus.attachEventHandler('open_browser_callback', this.openFileBrowser);
+                this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
             }.bind(this));
         },
 
@@ -129,7 +129,7 @@ define([
         removeEvents: function (wysiwygId) {
             var editor;
 
-            if (typeof tinyMceEditors !== 'undefined') {
+            if (typeof tinyMceEditors !== 'undefined' && tinyMceEditors.get(wysiwygId)) {
                 editor = tinyMceEditors.get(wysiwygId);
                 varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
             }