Merge branch 'feature/101741' into test/stage

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Updated eslint version to `8.45.0` and `eslint-plugin-vue` to 9.15.1 (DEV-95002)
 ### Fixed
 - Mobile nav sidebar (DEV-101802)
+- Category Child and CMS block nodes shouldn't have image fields (DEV-94387)
 ## [2.23.1] - 2023-07-28
 ### Fixed
 - Fixed issue with closing } missing

Controller/Adminhtml/Menu/ImportCategories.php

@@ -4,12 +4,12 @@
 
 namespace Snowdog\Menu\Controller\Adminhtml\Menu;
 
+use Exception;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Snowdog\Menu\Api\MenuManagementInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 class ImportCategories extends Action implements HttpPostActionInterface
 {
@@ -47,24 +47,27 @@ public function execute()
     {
         $categoryId = (int) $this->_request->getParam('category_id');
         $depth = $this->_request->getParam('depth');
-        if (!is_numeric($depth)) {
-            $depth = null;
-        }
 
-        $result = $this->resultJsonFactory->create();
         try {
+            if (!is_numeric($depth)) {
+                throw new Exception('Please add a valid number for Level of depth field');
+            }
+
             $categoryTree = $this->menuManagement->getCategoryNodeList($categoryId, $depth);
+
             $output = [
                 'success' => 1,
                 'list' => $categoryTree
             ];
-        } catch (NoSuchEntityException $exception) {
+        } catch (Exception $exception) {
             $output = [
                 'success' => 0,
                 'message' => $exception->getMessage(),
                 'list' => []
             ];
         }
+
+        $result = $this->resultJsonFactory->create();
         $result->setData($output);
 
         return $result;