Merge pull request #671 from akeneo/release/104.3.1

Release/104.3.1
akeneo · Dec 29, 2023 · c751341 · c751341
2 parents 685bd65 + 97baff4
commit c751341
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -466,3 +466,6 @@
 
 ### Version 104.0.7 :
 * PGTO-397: Never delete products in a virtual category
+
+### Version 104.3.1 :
+* PGTO-402: Fix admin default value empty name
diff --git a/Job/Product.php b/Job/Product.php
@@ -68,7 +68,6 @@
 use Psr\Http\Message\ResponseInterface;
 use Zend_Db_Exception;
 use Zend_Db_Expr as Expr;
-use Zend_Db_Select;
 use Zend_Db_Statement_Exception;
 use Zend_Db_Statement_Pdo;
 
@@ -315,6 +314,12 @@ class Product extends JobImport
      * @var CollectionFactory $categoryCollectionFactory
      */
     protected $categoryCollectionFactory;
+    /**
+     * The default name value when empty
+     *
+     * @var ?array $defaultNameValue
+     */
+    protected $defaultNameValue = null;
 
     /**
      * Product constructor.
@@ -3677,7 +3682,7 @@ public function setUrlRewrite(): void
                 $productRows = $connection->fetchAll($productsSelect);
 
                 // Retrieve rewrite url at one time only for the current batch of products
-                $productsSelect->reset(Zend_Db_Select::COLUMNS)->columns('_entity_id');
+                $productsSelect->reset(Select::COLUMNS)->columns('_entity_id');
                 $urlRewriteQuery = $connection
                     ->select()
                     ->from($urlRewriteTable)
@@ -5090,7 +5095,21 @@ protected function handleNoName(array $product): array
         if (array_key_exists(ProductInterface::NAME, $product['values'])) {
             return $product;
         }
-        $product['values'][ProductInterface::NAME][0]['data'] = '';
+
+        if ($this->defaultNameValue === null) {
+            try {
+                $attribute = $this->akeneoClient->getAttributeApi()->get(ProductInterface::NAME);
+                $this->defaultNameValue = [
+                    'locale' => ($attribute['localizable'] ?? false) ? $this->storeHelper->getAdminLang() : null,
+                    'scope' => ($attribute['scopable'] ?? false) ? $this->configHelper->getAdminDefaultChannel() : null,
+                    'data' => '',
+                ];
+            } catch (Exception) {
+                $this->defaultNameValue = ['locale' => null, 'scope' => null, 'data' => ''];
+            }
+        }
+
+        $product['values'][ProductInterface::NAME][0] = $this->defaultNameValue;
 
         return $product;
     }

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "nyholm/psr7": "^1.5"
   },
   "type": "magento2-module",
-  "version": "104.0.7",
+  "version": "104.3.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"