Merge branch 'develop' into feature/94738

SnowdogApps · Aug 1, 2024 · 606e1cb · 606e1cb
2 parents 3f5c7eb + 0024ff2
commit 606e1cb
Show file tree

Hide file tree

Showing 30 changed files with 233 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - `width` and `height` attributes to menu node images (DEV-102271)
 - Option to specify customer groups for each node (DEV-94738)
+- Snowdog branding in admin panel (DEV-105762)
+- Automatically open collapsed menu node when dragging another node inside (DEV-101986)
+- Duplicate node functionality (DEV-104364)
+### Fixed
+- Impossible to change Cms block, Cms page link after selecting displayed block (DEV-104546)
+- Submenu template name issue ([#321](https://github.com/SnowdogApps/magento2-menu/pull/321)) (DEV-105672)
+### Updated
+- vue-select to 3.20.0 (DEV-104546)
 
 ## [2.26.0] - 2024-03-29
 ### Fixed

diff --git a/Controller/Adminhtml/Menu/Edit.php b/Controller/Adminhtml/Menu/Edit.php
@@ -63,7 +63,7 @@ public function execute(): ResultInterface
  $resultPage = $this->resultPageFactory->create();
  $title = $menuId ? __('Edit Menu %1', $menu->getTitle()) : __('New Menu');
  $this->initPage($resultPage)->addBreadcrumb($title, $title);
- $resultPage->getConfig()->getTitle()->prepend(__('Menus'));
+ $resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
  $resultPage->getConfig()->getTitle()->prepend($menu->getId() ? $menu->getTitle() : __('New Menu'));
 
  return $resultPage;

diff --git a/Controller/Adminhtml/Menu/Import.php b/Controller/Adminhtml/Menu/Import.php
@@ -36,6 +36,7 @@ public function execute()
  $this->messageManager->addNoticeMessage($this->importExportHelper->getMaxUploadSizeMessage());
 
  $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+ $resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
  $resultPage->getConfig()->getTitle()->prepend(__('Menu Import'));
 
  return $resultPage;

diff --git a/Controller/Adminhtml/Menu/ImportCategories.php b/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 ($depth != 'NaN' && !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;

diff --git a/Controller/Adminhtml/Menu/Index.php b/Controller/Adminhtml/Menu/Index.php
@@ -16,7 +16,7 @@ class Index extends Action
  public function execute()
  {
  $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
- $resultPage->getConfig()->getTitle()->prepend(__('Menus'));
+ $resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
  return $resultPage;
  }
 }
diff --git a/Model/TemplateResolver.php b/Model/TemplateResolver.php
@@ -39,12 +39,12 @@ class TemplateResolver
  * @var Registry
  */
  private $registry;
- 
+
  /**
  * @var Validator
  */
  private $validator;
- 
+
  /**
  * @var AssetRepository
  */
@@ -164,7 +164,7 @@ private function getTemplateList($nodeType = '', $defaultTemplateLabel = '')
  continue;
  }
 
- $fileName = str_replace([$themeDir, '.' . $extension], '', $file);
+ $fileName = $this->ioFile->getPathInfo($file)['filename'];
  if (!in_array($fileName, array_column($result, 'id'))) {
  $result[] = ['id' => $fileName];
  }

diff --git a/Service/Menu/SaveRequestProcessor.php b/Service/Menu/SaveRequestProcessor.php
@@ -215,17 +215,22 @@ private function processImageParameters(array $nodeData, NodeInterface &$nodeObj
  {
  $nodeObject->setImageAltText($nodeData[NodeInterface::IMAGE_ALT_TEXT] ?? null);
 
- if ($nodeObject->getImage() && empty($nodeData['image'])) {
- $this->nodeImageFile->delete($nodeObject->getImage());
- }
-
  if (empty($nodeData[NodeInterface::IMAGE])) {
  $nodeObject->setImageWidth(null);
  $nodeObject->setImageHeight(null);
  $nodeObject->setImage(null);
+
+ if ($nodeObject->getImage()) {
+ $this->nodeImageFile->delete($nodeObject->getImage());
+ }
+
  return;
  }
 
+ if (!$nodeObject->getImage()) {
+ $nodeObject->setImage($nodeData[NodeInterface::IMAGE]);
+ }
+
  if (empty($nodeData[NodeInterface::IMAGE_WIDTH])
  || empty($nodeData[NodeInterface::IMAGE_HEIGHT])
  ) {

diff --git a/view/adminhtml/layout/snowmenu_menu_create.xml b/view/adminhtml/layout/snowmenu_menu_create.xml
@@ -2,5 +2,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
+ <head>
+ <css src="Snowdog_Menu::css/lib/v-select.css"/>
+ </head>
  <update handle="snowmenu_menu_edit"/>
 </page>
diff --git a/view/adminhtml/layout/snowmenu_menu_edit.xml b/view/adminhtml/layout/snowmenu_menu_edit.xml
@@ -2,6 +2,9 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
+ <head>
+ <css src="Snowdog_Menu::css/lib/v-select.css"/>
+ </head>
  <body>
  <referenceContainer name="content">
  <uiComponent name="snowmenu_menu_form"/>

diff --git a/view/adminhtml/templates/menu/nodes.phtml b/view/adminhtml/templates/menu/nodes.phtml
@@ -52,6 +52,7 @@ $vueComponents = $block->getVueComponents();
  "createSubNode" : "<?= __('to create sub node or drag and drop other nodes here.') ?>",
  "append" : "<?= __('Append') ?>",
  "edit" : "<?= __('Edit') ?>",
+ "duplicate" : "<?= __('Duplicate') ?>",
  "delete" : "<?= __('Delete') ?>",
  "addNode" : "<?= __('New node') ?>",
  "nodeType" : "<?= __('Node Type') ?>",

diff --git a/view/adminhtml/ui_component/snowmenu_menu_form.xml b/view/adminhtml/ui_component/snowmenu_menu_form.xml
@@ -203,6 +203,7 @@
  </field>
  <field name="depth" formElement="input">
  <settings>
+ <elementTmpl>Snowdog_Menu/form/element/depth-input</elementTmpl>
  <dataType>int</dataType>
  <label translate="true">Level of depth</label>
  <validation>

diff --git a/view/adminhtml/web/css/lib/v-select.css b/view/adminhtml/web/css/lib/v-select.css
diff --git a/view/adminhtml/web/css/source/_module.less b/view/adminhtml/web/css/source/_module.less
@@ -1,4 +1,3 @@
-@import './lib/_v-select.less';
 @import './lib/_vue-treeselect.less';
 
 @import './blocks/_image-upload';
@@ -9,3 +8,5 @@
 @import './blocks/_vue-treeselect.less';
 @import './blocks/_var.less';
 @import './blocks/_vddl-base.less';
+
+@import 'module/menu/_menu';
diff --git a/view/adminhtml/web/css/source/blocks/_panel.less b/view/adminhtml/web/css/source/blocks/_panel.less
@@ -64,7 +64,7 @@
  padding-left: 5px;
  }
 
- &__buttom {
+ &__button {
  border-color: transparent;
  color: @primary__color;
  background-color: transparent;
@@ -107,6 +107,12 @@
  content: @icon-delete__content;
  }
  }
+
+ &--duplicate {
+ height: @snow-menu__item-height;
+ padding-top: 4px;
+ vertical-align: middle;
+ }
  }
 
  &__collapse {

diff --git a/view/adminhtml/web/css/source/lib/_v-select.less b/view/adminhtml/web/css/source/lib/_v-select.less
diff --git a/view/adminhtml/web/css/source/module/menu/_menu.less b/view/adminhtml/web/css/source/module/menu/_menu.less
@@ -0,0 +1,9 @@
+.admin__menu [data-ui-id^='menu-snowdog-menu-menus'] span:before {
+ background: url('@{baseDir}Snowdog_Menu/images/logo-menu.svg') no-repeat center;
+ content: '';
+ display: inline-block;
+ margin-right: 10px;
+ vertical-align: top;
+ width: 19px;
+ height: 19px;
+}