[Magento Community Engineering] Community Contributions - 2.4-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -14,9 +14,6 @@
  */
 class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
 {
-    /**
-     * Api URL
-     */
     const API_URL = 'https://image-charts.com/chart';
 
     /**
@@ -190,8 +187,8 @@ public function getChartUrl($directUrl = true)
         $params = [
             'cht' => 'lc',
             'chls' => '7',
-            'chf'  => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
-            'chm'  => 'B,f4d4b2,0,0,0',
+            'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
+            'chm' => 'B,f4d4b2,0,0,0',
             'chco' => 'db4814',
             'chxs' => '0,0,11|1,0,11',
             'chma' => '15,15,15,15'
@@ -237,7 +234,7 @@ public function getChartUrl($directUrl = true)
                 case '1y':
                 case '2y':
                     $d = $dateStart->format('Y-m');
-                    $dateStart->modify('+1 month');
+                    $dateStart->modify('first day of next month');
                     break;
                 default:
                     $d = $dateStart->format('Y-m-d H:00');
@@ -300,20 +297,23 @@ public function getChartUrl($directUrl = true)
         $minvalue = min($localminvalue);
 
         // default values
-        $yLabels = [];
         $miny = 0;
         $maxy = 0;
         $yorigin = 0;
+        $xAxis = 'x';
+        $xAxisIndex = 0;
+        $yAxisIndex = 1;
 
         if ($minvalue >= 0 && $maxvalue >= 0) {
             if ($maxvalue > 10) {
-                $p = pow(10, $this->_getPow((int) $maxvalue));
+                $p = pow(10, $this->_getPow((int)$maxvalue));
                 $maxy = ceil($maxvalue / $p) * $p;
-                $yLabels = range($miny, $maxy, $p);
+                $yRange = "$yAxisIndex,$miny,$maxy,$p";
             } else {
                 $maxy = ceil($maxvalue + 1);
-                $yLabels = range($miny, $maxy, 1);
+                $yRange = "$yAxisIndex,$miny,$maxy,1";
             }
+            $params['chxr'] = $yRange;
             $yorigin = 0;
         }
 
@@ -341,22 +341,11 @@ public function getChartUrl($directUrl = true)
 
         $params['chd'] .= $buffer;
 
-        $valueBuffer = [];
-
         if (count($this->_axisLabels) > 0) {
             $params['chxt'] = implode(',', array_keys($this->_axisLabels));
-            $indexid = 0;
-            foreach ($this->_axisLabels as $idx => $labels) {
-                if ($idx == 'x') {
-                    $this->formatAxisLabelDate((string) $idx, (string) $timezoneLocal);
-                    $tmpstring = implode('|', $this->_axisLabels[$idx]);
-                    $valueBuffer[] = $indexid . ":|" . $tmpstring;
-                } elseif ($idx == 'y') {
-                    $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
-                }
-                $indexid++;
-            }
-            $params['chxl'] = implode('|', $valueBuffer);
+            $this->formatAxisLabelDate($xAxis, (string)$timezoneLocal);
+            $customAxisLabels = $xAxisIndex . ":|" . implode('|', $this->_axisLabels[$xAxis]);
+            $params['chxl'] = $customAxisLabels . $dataSetdelimiter;
         }
 
         // chart size
@@ -368,7 +357,7 @@ public function getChartUrl($directUrl = true)
             foreach ($params as $name => $value) {
                 $p[] = $name . '=' . urlencode($value);
             }
-            return (string) self::API_URL . '?' . implode('&', $p);
+            return (string)self::API_URL . '?' . implode('&', $p);
         }
         $gaData = urlencode(base64_encode(json_encode($params)));
         $gaHash = $this->_dashboardData->getChartDataHash($gaData);
@@ -392,7 +381,7 @@ private function formatAxisLabelDate($idx, $timezoneLocal)
                 switch ($this->getDataHelper()->getParam('period')) {
                     case '24h':
                         $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
-                            $period->setTime((int) $period->format('H'), 0, 0),
+                            $period->setTime((int)$period->format('H'), 0, 0),
                             \IntlDateFormatter::NONE,
                             \IntlDateFormatter::SHORT
                         );

app/code/Magento/Catalog/Model/Product/Webapi/ProductOutputProcessor.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Webapi;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Webapi\Request;
+use Magento\Framework\Webapi\Rest\Request\DeserializerInterface;
+
+/**
+ * Class for checking empty array and remove it from the output result
+ */
+class ProductOutputProcessor
+{
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var DeserializerInterface
+     */
+    private $deserializer;
+
+    /**
+     * @param Request $request
+     * @param DeserializerInterface $deserializer
+     */
+    public function __construct(
+        Request $request,
+        DeserializerInterface $deserializer
+    ) {
+        $this->request = $request;
+        $this->deserializer = $deserializer;
+    }
+
+    /**
+     * Removing attribute from the result array if its null or empty
+     *
+     * @param ProductInterface $product
+     * @param array $result
+     * @return array
+     */
+    public function execute(
+        ProductInterface $product,
+        array $result
+    ): array {
+        $requestContent = $this->request->getContent() ?? [];
+        if (empty($requestContent)) {
+            return $result;
+        }
+        $requestContentDetails = (array)$this->deserializer->deserialize($requestContent);
+        $requestProductList = $this->extractProductList($requestContentDetails);
+
+        $requestProductList = array_filter(
+            $requestProductList,
+            function ($requestProduct) use ($product) {
+                return isset($requestProduct['sku']) && $requestProduct['sku'] === $product->getSku();
+            }
+        );
+
+        if (empty($requestProductList)) {
+            return $result;
+        }
+
+        $requestProduct = current($requestProductList);
+
+        if (empty($product->getTierPrices()) && !array_key_exists('tier_prices', $requestProduct)) {
+            unset($result['tier_prices']);
+        }
+
+        if (empty($product->getProductLinks()) && !array_key_exists('product_links', $requestProduct)) {
+            unset($result['product_links']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Extract product list from the request content details
+     *
+     * @param array $contentDetails
+     * @return array
+     */
+    private function extractProductList(array $contentDetails): array
+    {
+        $productList = [];
+        $arrayIterator = new \RecursiveArrayIterator($contentDetails);
+        $iterator = new \RecursiveIteratorIterator($arrayIterator, \RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iterator as $iteratorKey => $iteratorValue) {
+            if ($iteratorKey === 'product') {
+                array_push($productList, $iteratorValue);
+            }
+        }
+        return $productList;
+    }
+}