From 8ea463c5a53dc75425e31116d7a2b334399354b4 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 17 Mar 2020 11:22:33 +0100 Subject: [PATCH 01/14] Fix admin localized date formatting --- .../Magento/Ui/view/base/web/js/form/element/date.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index 1432372dd75a9..96449ffcb2120 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -114,20 +114,20 @@ define([ return this.shiftedValue(); }, + /** * Prepares and sets date/time value that will be displayed * in the input field. - * - * @param {String} value */ - onValueChange: function (value) { - var shiftedValue; + setInitialValue: function () { + const value = this.getInitialValue(); + let shiftedValue; if (value) { if (this.options.showsTime) { shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone); } else { - shiftedValue = moment(value, this.outputDateFormat); + shiftedValue = moment(value, this.inputDateFormat); } if (!shiftedValue.isValid()) { @@ -141,6 +141,8 @@ define([ if (shiftedValue !== this.shiftedValue()) { this.shiftedValue(shiftedValue); } + + return this._super(); }, /** From 238afa651d2f69a5dcbbdc009859d48c74044611 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 17 Mar 2020 11:23:15 +0100 Subject: [PATCH 02/14] Clean up and add doc --- app/code/Magento/Ui/view/base/web/js/form/element/date.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index 96449ffcb2120..c5da06a91b238 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -114,10 +114,11 @@ define([ return this.shiftedValue(); }, - /** * Prepares and sets date/time value that will be displayed * in the input field. + * + * @inheritDoc */ setInitialValue: function () { const value = this.getInitialValue(); From 27b195bf4367fd632dbc839142769c3a08615ffc Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 17 Mar 2020 12:12:55 +0100 Subject: [PATCH 03/14] Remove unused code block --- app/code/Magento/Ui/view/base/web/js/form/element/date.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index c5da06a91b238..fe0b0150913ca 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -131,9 +131,6 @@ define([ shiftedValue = moment(value, this.inputDateFormat); } - if (!shiftedValue.isValid()) { - shiftedValue = moment(value, this.inputDateFormat); - } shiftedValue = shiftedValue.format(this.pickerDateTimeFormat); } else { shiftedValue = ''; From e76594f38aa7d2abaf885ddce89c06a90273acd3 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Wed, 18 Mar 2020 16:36:42 +0100 Subject: [PATCH 04/14] [MFTF] Add ActionGroup AdminCreateCartPriceRuleWithFromDateActionGroup --- ...teCartPriceRuleWithFromDateActionGroup.xml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithFromDateActionGroup.xml diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithFromDateActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithFromDateActionGroup.xml new file mode 100644 index 0000000000000..d96f604b2cfee --- /dev/null +++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithFromDateActionGroup.xml @@ -0,0 +1,33 @@ + + + + + + + Goes to the Admin Cart Price Rule grid page. Adds the provided Rule (with from date). Validates that the Success Message is present and correct. + + + + + + + + + + + + + + + + + + + + From 5394592cd194e005257bdb78b21c3f24afd855af Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Wed, 18 Mar 2020 16:37:12 +0100 Subject: [PATCH 05/14] [MFTF] Add ability to create localized admin user --- .../Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml | 1 + .../Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml | 2 +- app/code/Magento/User/Test/Mftf/Data/UserData.xml | 6 ++++++ .../Test/Mftf/Section/AdminCreateUserSection.xml | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) rename app/code/Magento/{Customer => User}/Test/Mftf/Section/AdminCreateUserSection.xml (91%) diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml index dd4f181204040..1757dc0d9c541 100644 --- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml +++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleActionGroup.xml @@ -26,6 +26,7 @@ + diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml index 67075eb52a678..bdb324dfbcbb7 100644 --- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml +++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml @@ -21,7 +21,7 @@ - + diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml index 7947c8ee3c161..bc6a9d59ce385 100644 --- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml +++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml @@ -123,6 +123,12 @@ admin 0 + + admin + 1 + nl_NL + Nederlands (Nederland) + admin_user_with_correct_password diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateUserSection.xml similarity index 91% rename from app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml rename to app/code/Magento/User/Test/Mftf/Section/AdminCreateUserSection.xml index 9548fb3175496..ad89f0f477ef1 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml +++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateUserSection.xml @@ -18,6 +18,7 @@ + From 7172c0369c1e6163e085e3be689e3e02e05af7d3 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Wed, 18 Mar 2020 16:38:01 +0100 Subject: [PATCH 06/14] [MFTF] Add test to verify GITHUB_27311 --- ...dFilterDeleteAndVerifyErrorMessageTest.xml | 4 +- .../Test/AdminLocalizedDateElementTest.xml | 76 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml index 3cc120ad98176..087a294c64a6f 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml @@ -11,10 +11,10 @@ - <description value="Test log in to uI and Delete Grid Filter Test"/> + <description value="Test log in to UI and Delete Grid Filter Test"/> <testCaseId value="MC-14272"/> <severity value="CRITICAL"/> - <group value="uI"/> + <group value="ui"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml new file mode 100644 index 0000000000000..a87edc5f3ce5e --- /dev/null +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminLocalizedDateElementTest"> + <annotations> + <stories value="Date element is localized"/> + <title value="Admin user should be able to create active admin user"/> + <description value="Admin date element should be localized."/> + <testCaseId value="GITHUB_27311"/> + <severity value="CRITICAL"/> + <group value="ui"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + </before> + <after> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> + <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser"> + <argument name="user" value="dutchActiveAdmin"/> + </actionGroup> + </after> + + <generateDate date="now" format="m/j/Y" timezone="America/Los_Angeles" stepKey="today"/> + <generateDate date="now" format="d-m-Y" timezone="America/Los_Angeles" stepKey="todayNL"/> + <generateDate date="+1 days" format="m/j/Y" timezone="America/Los_Angeles" stepKey="tomorrow"/> + <generateDate date="+1 days" format="d-m-Y" timezone="America/Los_Angeles" stepKey="tomorrowNL"/> + + <!-- Step 1. Create cart price rule in en_US admin locale --> + + <actionGroup ref="AdminCreateCartPriceRuleWithFromDateActionGroup" stepKey="createCartPriceRule"> + <argument name="ruleName" value="TestSalesRule"/> + <argument name="fromDate" value="$today"/> + </actionGroup> + + <!-- Step 2. Create the Dutch --> + + <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser"> + <argument name="role" value="genericAdminRole"/> + <argument name="user" value="dutchActiveAdmin"/> + </actionGroup> + + <!-- Step 3. Log in as the Dutch. --> + + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDutchAdmin"> + <argument name="username" value="{{dutchActiveAdmin.username}}"/> + <argument name="password" value="{{dutchActiveAdmin.password}}"/> + </actionGroup> + + <!-- Step 4. Check the cart price rule from date, set it to tomorrow and check again. --> + + <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/> + <waitForPageLoad stepKey="waitForPriceList"/> + <click selector="{{AdminCartPriceRulesSection.rowContainingText(TestSalesRule.name)}}" stepKey="openCartPriceRule"/> + <waitForPageLoad stepKey="waitForPriceRuleLoad"/> + + <seeInField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$todayNL" stepKey="checkFromDateBeforeSave"/> + <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButton"/> + + <waitForPageLoad stepKey="waitForPriceRuleSave"/> + <seeInField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$todayNL" stepKey="checkFromDateAfterSave"/> + <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$tomorrowNL" stepKey="fillStartDate"/> + <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButtonAfterChangingFromDate"/> + + <waitForPageLoad stepKey="waitForPriceRuleChangeSave"/> + <seeInField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="$tomorrowNL" stepKey="checkFromDateAfterChangeSaved"/> + </test> +</tests> From 61d28a95120fc2b92150144d8fbc21c9b774c95d Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Wed, 18 Mar 2020 17:14:26 +0100 Subject: [PATCH 07/14] [MFTF] Split up test and add some cleaning --- .../Test/AdminLocalizedDateElementTest.xml | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml index a87edc5f3ce5e..81c0f711c8e6d 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -19,35 +19,48 @@ </annotations> <before> <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + + <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser"> + <argument name="role" value="genericAdminRole"/> + <argument name="user" value="dutchActiveAdmin"/> + </actionGroup> + + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> </before> <after> - <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/> + <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser"> <argument name="user" value="dutchActiveAdmin"/> </actionGroup> + + <actionGroup ref="AdminDeleteCartPriceRuleActionGroup" stepKey="deleteCartPriceRule"> + <argument name="ruleName" value="TestSalesRule"/> + </actionGroup> + + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> </after> + <!-- Step 0. Generate dates, this cannot be done in before section. --> + <generateDate date="now" format="m/j/Y" timezone="America/Los_Angeles" stepKey="today"/> <generateDate date="now" format="d-m-Y" timezone="America/Los_Angeles" stepKey="todayNL"/> <generateDate date="+1 days" format="m/j/Y" timezone="America/Los_Angeles" stepKey="tomorrow"/> <generateDate date="+1 days" format="d-m-Y" timezone="America/Los_Angeles" stepKey="tomorrowNL"/> - <!-- Step 1. Create cart price rule in en_US admin locale --> + <!-- Step 1. Log in as main admin --> + + <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + + <!-- Step 2. Create cart price rule in en_US admin locale. --> <actionGroup ref="AdminCreateCartPriceRuleWithFromDateActionGroup" stepKey="createCartPriceRule"> <argument name="ruleName" value="TestSalesRule"/> <argument name="fromDate" value="$today"/> </actionGroup> - <!-- Step 2. Create the Dutch --> - - <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser"> - <argument name="role" value="genericAdminRole"/> - <argument name="user" value="dutchActiveAdmin"/> - </actionGroup> - - <!-- Step 3. Log in as the Dutch. --> + <!-- Step 3. Log in as Dutch admin. --> <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDutchAdmin"> From 765c31532bce50d987ec94510dae3b77696c4ca8 Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Wed, 8 Apr 2020 12:00:32 +0200 Subject: [PATCH 08/14] Remove @inheritedDoc from js docblock --- app/code/Magento/Ui/view/base/web/js/form/element/date.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index fe0b0150913ca..5a67cddf6ca15 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -117,8 +117,6 @@ define([ /** * Prepares and sets date/time value that will be displayed * in the input field. - * - * @inheritDoc */ setInitialValue: function () { const value = this.getInitialValue(); From 77e484755d993fcc11cf02bdb077d21a34654f9c Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com> Date: Tue, 11 Aug 2020 13:13:47 +0200 Subject: [PATCH 09/14] Update Test Case ID --- .../Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml index 81c0f711c8e6d..fcd68e57b3259 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -13,7 +13,7 @@ <stories value="Date element is localized"/> <title value="Admin user should be able to create active admin user"/> <description value="Admin date element should be localized."/> - <testCaseId value="GITHUB_27311"/> + <testCaseId value="MC-29484"/> <severity value="CRITICAL"/> <group value="ui"/> </annotations> From d00ec4d014842033394885f36b819a457243fdb7 Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Fri, 23 Oct 2020 16:07:42 +0200 Subject: [PATCH 10/14] Use AdminLoginActionGroup instead of LoginAsAdmin Co-authored-by: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com> --- .../Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml index fcd68e57b3259..a0e2cf416e23c 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -18,7 +18,7 @@ <group value="ui"/> </annotations> <before> - <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser"> <argument name="role" value="genericAdminRole"/> From 02d8c5d0f041a43ff09cf2829959523fe344a13a Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Fri, 23 Oct 2020 16:07:53 +0200 Subject: [PATCH 11/14] Use AdminLoginActionGroup instead of LoginAsAdmin Co-authored-by: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com> --- .../Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml index a0e2cf416e23c..c74813414b8a5 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -30,7 +30,7 @@ <after> <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/> - <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser"> <argument name="user" value="dutchActiveAdmin"/> </actionGroup> From f860252d68f1abf3bb6327a2460c2b6891e5341e Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Fri, 23 Oct 2020 16:08:00 +0200 Subject: [PATCH 12/14] Use AdminLoginActionGroup instead of LoginAsAdmin Co-authored-by: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com> --- .../Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml index c74813414b8a5..e1484ea83a3d4 100644 --- a/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml +++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminLocalizedDateElementTest.xml @@ -51,7 +51,7 @@ <!-- Step 1. Log in as main admin --> - <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> <!-- Step 2. Create cart price rule in en_US admin locale. --> From 7f094af91b685152aadb45159dbe7f0abb57c4e0 Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Thu, 12 Nov 2020 16:52:33 +0100 Subject: [PATCH 13/14] Fix tests and UI date filter --- .../Ui/view/base/web/js/form/element/date.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index 5a67cddf6ca15..367c8ad29433a 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -31,6 +31,10 @@ define([ * Used only in date picker mode * (this.options.showsTime == false). * + * Locale examples: + * - (en_US): YYYY-MM-DD + * - (nl_NL): YYYY-MM-DD + * * @type {String} */ inputDateFormat: 'y-MM-dd', @@ -42,6 +46,10 @@ define([ * Used only in date picker mode * (this.options.showsTime == false). * + * Locale examples: + * - (en_US): MM/DD/YYYY + * - (nl_NL): DD-MM-YYYY + * * @type {String} */ outputDateFormat: 'MM/dd/y', @@ -126,7 +134,16 @@ define([ if (this.options.showsTime) { shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone); } else { - shiftedValue = moment(value, this.inputDateFormat); + if (this.parentScope.startsWith('filters.')) { + /* + * Date element in filter will get date value in outputDateFormat, + * because the server does not convert it from client format to + * server format when saving UI bookmark data. + */ + shiftedValue = moment(value, this.outputDateFormat); + } else { + shiftedValue = moment(value, this.inputDateFormat); + } } shiftedValue = shiftedValue.format(this.pickerDateTimeFormat); From 921a1fc14a88b84828b3811001a2c8c080ce21e7 Mon Sep 17 00:00:00 2001 From: Timon de Groot <timon@mooore.nl> Date: Mon, 18 Jan 2021 14:49:16 +0100 Subject: [PATCH 14/14] Moment.js strict mode --- app/code/Magento/Ui/view/base/web/js/form/element/date.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js index 5ef2a106f3070..6887afbf9c2a8 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js @@ -142,7 +142,7 @@ define([ */ shiftedValue = moment(value, this.outputDateFormat, true); } else { - shiftedValue = moment(value, this.inputDateFormat); + shiftedValue = moment(value, this.inputDateFormat, true); } }