🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #21455: Infinite redirects in Magento admin #21454 (by @Jitheesh)
 - #21303: Fix-issue-21292 Google Analytics isAnonymizedIpActive always true (by @Nazar65)
 - #21079: Fixes for product tabbing issue (by @prakash2jcommerce)
 - #20818: 14857: prevent cache drop for frontend caches on sitemap generation (by @david-fuehr)
 - #20129: Issue fixed #20128 : Date range returns the same start and end date (by @milindsingh)
 - #20079: [2.3] Add support for validation message callback (by @floorz)


Fixed GitHub Issues:
 - #21454: Infinite redirects in Magento admin (reported by @Jitheesh) has been fixed in #21455 by @Jitheesh in 2.3-develop branch
   Related commits:
     1. 11cfe04

 - #21292: Google Analytics isAnonymizedIpActive always true (reported by @apomili) has been fixed in #21303 by @Nazar65 in 2.3-develop branch
   Related commits:
     1. edb9c6e
     2. 1e86f88
     3. 67ea734

 - #21077: Tabbing issue on product detail page (reported by @prakash2jcommerce) has been fixed in #21079 by @prakash2jcommerce in 2.3-develop branch
   Related commits:
     1. 7fc0ff7
     2. 01d7f51
     3. c034338

 - #14857: Sitemap generation cron job flushes entire cache (reported by @scottsb) has been fixed in #20818 by @david-fuehr in 2.3-develop branch
   Related commits:
     1. b9190b3
     2. ebc266b
     3. 28a9720

 - #20128: Magento\Reports\Model\ResourceModel\Order\Collection->getDateRange() - Error in code? (reported by @realJustmike) has been fixed in #20129 by @milindsingh in 2.3-develop branch
   Related commits:
     1. b1b6c3c
     2. 92dd7df

 - #20078: Magento Ui form validator message callback not supported (reported by @floorz) has been fixed in #20079 by @floorz in 2.3-develop branch
   Related commits:
     1. be02c1e
     2. dc8d2d5
     3. 5cefe94

Author: magento-engcom-team

app/code/Magento/Backend/App/Request/BackendValidator.php

@@ -146,8 +146,9 @@ private function createException(
                 $exception = new InvalidRequestException($response);
             } else {
                 //For regular requests.
+                $startPageUrl = $this->backendUrl->getStartupPageUrl();
                 $response = $this->redirectFactory->create()
-                    ->setUrl($this->backendUrl->getStartupPageUrl());
+                    ->setUrl($this->backendUrl->getUrl($startPageUrl));
                 $exception = new InvalidRequestException(
                     $response,
                     [

app/code/Magento/GoogleAnalytics/Block/Ga.php

@@ -75,7 +75,8 @@ public function getPageName()
     }
 
     /**
-     * Render regular page tracking javascript code
+     * Render regular page tracking javascript code.
+     *
      * The custom "page name" may be set from layout or somewhere else. It must start from slash.
      *
      * @param string $accountId

app/code/Magento/GoogleAnalytics/Helper/Data.php

@@ -46,6 +46,6 @@ public function isGoogleAnalyticsAvailable($store = null)
      */
     public function isAnonymizedIpActive($store = null)
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
+        return (bool)$this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
     }
 }

app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php

@@ -445,7 +445,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 break;
 
             case 'custom':
-                $dateStart = $customStart ? $customStart : $dateEnd;
+                $dateStart = $customStart ? $customStart : $dateStart;
                 $dateEnd = $customEnd ? $customEnd : $dateEnd;
                 break;
 

app/code/Magento/Robots/Model/Config/Value.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Robots\Model\Config;
 
 use Magento\Framework\App\Cache\TypeListInterface;
@@ -32,12 +33,11 @@ class Value extends ConfigValue implements IdentityInterface
     const CACHE_TAG = 'robots';
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [self::CACHE_TAG];
 
     /**
      * @var StoreManagerInterface

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sitemap\Model;
 
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
@@ -15,6 +16,8 @@
 use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource;
 
 /**
+ * Sitemap model.
+ *
  * @method string getSitemapType()
  * @method \Magento\Sitemap\Model\Sitemap setSitemapType(string $value)
  * @method string getSitemapFilename()
@@ -154,12 +157,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     protected $dateTime;
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [Value::CACHE_TAG];
 
     /**
      * Item resolver

app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js

@@ -48,6 +48,10 @@ define([
                 params :
                 [params];
 
+            if (typeof message === 'function') {
+                message = message.call(rule);
+            }
+
             message = params.reduce(function (msg, param, idx) {
                 return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param);
             }, message);

lib/web/mage/tabs.js

@@ -72,7 +72,7 @@ define([
 
             if (anchor && isValid) {
                 $.each(self.contents, function (i) {
-                    if ($(this).attr('id') === anchorId) {
+                    if ($(this).attr('id') === anchorId || $(this).find('#' + anchorId).length) {
                         self.collapsibles.not(self.collapsibles.eq(i)).collapsible('forceDeactivate');
 
                         return false;