#102271 Adding image size (width and height) to nodes

Api/Data/NodeInterface.php

@@ -18,6 +18,8 @@ interface NodeInterface
  const TARGET = 'target';
  const IMAGE = 'image';
  const IMAGE_ALT_TEXT = 'image_alt_text';
+ const IMAGE_WIDTH = 'image_width';
+ const IMAGE_HEIGHT = 'image_heigth';
  const CREATION_TIME = 'creation_time';
  const UPDATE_TIME = 'update_time';
  const IS_ACTIVE = 'is_active';
@@ -192,18 +194,40 @@ public function setImage($image);
  /**
  * Get image alt text
  *
- * @return string
+ * @return string|null
  */
  public function getImageAltText();
 
  /**
  * Set image alt text
  *
- * @param string $altText
+ * @param string|null $altText
  * @return $this
  */
  public function setImageAltText($altText);
 
+ /**
+ * @return int|null
+ */
+ public function getImageWidth();
+
+ /**
+ * @param int|null $width
+ * @return $this
+ */
+ public function setImageWidth($width);
+
+ /**
+ * @return int|null
+ */
+ public function getImageHeight();
+
+ /**
+ * @param int|null $height
+ * @return $this
+ */
+ public function setImageHeight($height);
+
  /**
  * Get creation time
  *

Block/Adminhtml/Edit/Tab/Nodes.php

@@ -182,6 +182,8 @@ private function renderNodeList($level, $parent, $data)
  'image' => $node->getImage(),
  'image_url' => $node->getImage() ? $this->imageFile->getUrl($node->getImage()) : null,
  'image_alt_text' => $node->getImageAltText(),
+ 'image_width' => $node->getImageWidth(),
+ 'image_height' => $node->getImageHeight(),
  'columns' => $this->renderNodeList($level + 1, $node->getId(), $data) ?: [],
  'selected_item_id' => $node->getSelectedItemId()
  ];

Block/Menu.php

@@ -9,6 +9,7 @@
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\Event\Manager as EventManager;
 use Magento\Framework\Escaper;
+use Snowdog\Menu\Api\Data\NodeInterface;
 use Snowdog\Menu\Api\MenuRepositoryInterface;
 use Snowdog\Menu\Api\NodeRepositoryInterface;
 use Snowdog\Menu\Model\Menu\Node\Image\File as ImageFile;
@@ -268,7 +269,7 @@ public function isViewAllLinkAllowed($nodeType)
  }
 
  /**
- * @param NodeRepositoryInterface $node
+ * @param NodeInterface $node
  * @return string
  */
  public function renderViewAllLink($node)
@@ -279,7 +280,7 @@ public function renderViewAllLink($node)
  }
 
  /**
- * @param NodeRepositoryInterface $node
+ * @param NodeInterface $node
  * @return string
  */
  public function renderMenuNode($node)
@@ -381,7 +382,7 @@ public function getMenuCssClass($defaultClass = '')
  }
 
  /**
- * @param NodeRepositoryInterface $node
+ * @param NodeInterface $node
  * @return Template
  */
  private function getMenuNodeBlock($node)
@@ -404,6 +405,9 @@ private function getMenuNodeBlock($node)
  ->setImage($node->getImage())
  ->setImageUrl($node->getImage() ? $this->imageFile->getUrl($node->getImage()) : null)
  ->setImageAltText($node->getImageAltText())
+ ->setImageWidth($node->getImageWidth())
+ ->setImageHeight($node->getImageHeight())
+ ->setImageAltText($node->getImageAltText())
  ->setCustomTemplate($node->getNodeTemplate())
  ->setAdditionalData($node->getAdditionalData())
  ->setSelectedItemId($node->getSelectedItemId());

Model/GraphQl/Resolver/DataProvider/Node.php

@@ -105,6 +105,8 @@ private function convertData(NodeInterface $node): array
  NodeInterface::TARGET => (bool) $node->getTarget(),
  NodeInterface::IMAGE => $node->getImage(),
  NodeInterface::IMAGE_ALT_TEXT => $node->getImageAltText(),
+ NodeInterface::IMAGE_WIDTH => $node->getImageWidth(),
+ NodeInterface::IMAGE_HEIGHT => $node->getImageHeight(),
  self::TEMPLATE_FIELD => $node->getNodeTemplate(),
  self::SUBMENU_TEMPLATE_FIELD => $node->getSubmenuTemplate(),
  NodeInterface::CREATION_TIME => $node->getCreationTime(),

Model/Menu/Node.php

@@ -214,6 +214,38 @@ public function setImageAltText($altText)
  return $this->setData(NodeInterface::IMAGE_ALT_TEXT, $altText);
  }
 
+ /**
+ * @inheritdoc
+ */
+ public function getImageWidth()
+ {
+ return $this->_getData(NodeInterface::IMAGE_WIDTH);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setImageWidth($width)
+ {
+ return $this->setData(NodeInterface::IMAGE_WIDTH, $width);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getImageHeight()
+ {
+ return $this->_getData(NodeInterface::IMAGE_HEIGHT);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setImageHeight($height)
+ {
+ return $this->setData(NodeInterface::IMAGE_HEIGHT, $height);
+ }
+
  /**
  * @inheritdoc
  */

Model/Menu/Node/Image/File.php

@@ -14,6 +14,7 @@
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
+use Snowdog\Menu\Api\Data\NodeInterface;
 
 class File
 {
@@ -72,7 +73,11 @@ public function upload(): array
 
  $result = $uploader->save($this->getAbsolutePath());
 
- return ['file' => $result['file'], 'url' => $this->getUrl($result['file'])];
+ return [
+ 'file' => $result['file'],
+ 'url' => $this->getUrl($result['file']),
+ 'size' => $this->getReadableImageSizes($this->getImageSize($result['file']))
+ ];
  }
 
  public function getUrl(string $file): string
@@ -113,9 +118,25 @@ public function clone(string $file): string
  return $fileClonePath;
  }
 
+ public function getImageSize(string $file): array
+ {
+ $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+ $fileFullPath = $mediaDirectory->getAbsolutePath(self::PATH . $file);
+
+ return getimagesize($fileFullPath);
+ }
+
  private function getAbsolutePath(): string
  {
  $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
  return $mediaDirectory->getAbsolutePath(self::PATH);
  }
+
+ private function getReadableImageSizes(array $imageSize): array
+ {
+ return [
+ NodeInterface::IMAGE_WIDTH => $imageSize[0],
+ NodeInterface::IMAGE_HEIGHT => $imageSize[1]
+ ];
+ }
 }

Model/Menu/Node/Image/Node.php

@@ -51,6 +51,11 @@ public function updateNodeImage(int $nodeId, ?string $image): void
 
  try {
  $node->setImage($image);
+ if (!$image) {
+ $node
+ ->setImageWidth(null)
+ ->setImageHeight(null);
+ }
  $this->nodeRepository->save($node);
  } catch (CouldNotSaveException $exception) {
  // Normally, this error should never happen.

Model/MenuManagement.php

@@ -101,6 +101,8 @@ private function getCategoriesNodeList($level, $parent, array $data): array
  'node_template' => null,
  'image' => null,
  'image_alt_text' => null,
+ 'image_width' => null,
+ 'image_height' => null,
  'submenu_template' => null,
  'columns' => $this->getCategoriesNodeList($level + 1, $nodeId, $data) ?: []
  ];

Service/Menu/SaveRequestProcessor.php

@@ -202,14 +202,46 @@ private function processNodeObject(
  $nodeObject->setLevel((string) $level);
  $nodeObject->setPosition((string) $position);
 
+ $this->processImageParameters($nodeData, $nodeObject);
+
+ $nodeObject->setSelectedItemId($nodeData['selected_item_id'] ?? null);
+ }
+
+ private function processImageParameters(array $nodeData, NodeInterface &$nodeObject): void
+ {
+ $nodeObject->setImageAltText($nodeData[NodeInterface::IMAGE_ALT_TEXT] ?? null);
+
  if ($nodeObject->getImage() && empty($nodeData['image'])) {
  $this->nodeImageFile->delete($nodeObject->getImage());
  }
 
- $nodeObject->setImage($nodeData['image'] ?? null);
- $nodeObject->setImageAltText($nodeData['image_alt_text'] ?? null);
+ if (empty($nodeData[NodeInterface::IMAGE])) {
+ $nodeObject->setImageWidth(null);
+ $nodeObject->setImageHeight(null);
+ $nodeObject->setImage(null);
+ return;
+ }
 
- $nodeObject->setSelectedItemId($nodeData['selected_item_id'] ?? null);
+ if (empty($nodeData[NodeInterface::IMAGE_WIDTH])
+ || empty($nodeData[NodeInterface::IMAGE_HEIGHT])
+ ) {
+ $imageSize = $this->nodeImageFile->getImageSize($nodeData[NodeInterface::IMAGE]);
+
+ if (!empty($imageSize)) {
+ $nodeObject
+ ->setImageWidth(
+ !empty($nodeData[NodeInterface::IMAGE_WIDTH])
+ ? $nodeData[NodeInterface::IMAGE_WIDTH]
+ : $imageSize[0]
+ );
+ $nodeObject
+ ->setImageHeight(
+ !empty($nodeData[NodeInterface::IMAGE_HEIGHT])
+ ? $nodeData[NodeInterface::IMAGE_HEIGHT]
+ : $imageSize[1]
+ );
+ }
+ }
  }
 
  /**

Setup/UpgradeSchema.php

@@ -22,6 +22,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
  /**
  * {@inheritdoc}
  * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  */
  public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
  {
@@ -59,6 +60,10 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
  $this->addNodeSelectedItemId($setup);
  }
 
+ if (version_compare($context->getVersion(), '0.2.7', '<')) {
+ $this->addNodeImageSizeFields($setup);
+ }
+
  $setup->endSetup();
  }
 
@@ -298,4 +303,37 @@ private function addNodeSelectedItemId(SchemaSetupInterface $setup)
 
  return $this;
  }
+
+ /**
+ * @return $this
+ */
+ private function addNodeImageSizeFields(SchemaSetupInterface $setup)
+ {
+ $connection = $setup->getConnection();
+ $table = $setup->getTable('snowmenu_node');
+
+ $connection->addColumn(
+ $table,
+ NodeInterface::IMAGE_WIDTH,
+ [
+ 'type' => Table::TYPE_INTEGER,
+ 'nullable' => true,
+ 'after' => NodeInterface::IMAGE_ALT_TEXT,
+ 'comment' => 'Image Width'
+ ]
+ );
+
+ $connection->addColumn(
+ $table,
+ NodeInterface::IMAGE_HEIGHT,
+ [
+ 'type' => Table::TYPE_INTEGER,
+ 'nullable' => true,
+ 'after' => NodeInterface::IMAGE_WIDTH,
+ 'comment' => 'Image Height'
+ ]
+ );
+
+ return $this;
+ }
 }

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
- <module name="Snowdog_Menu" setup_version="0.2.6">
+ <module name="Snowdog_Menu" setup_version="0.2.7">
  <sequence>
  <module name="Magento_GraphQl"/>
  </sequence>

view/adminhtml/templates/menu/nodes.phtml

@@ -70,6 +70,8 @@ $vueComponents = $block->getVueComponents();
  "product" : "<?= __('Product') ?>",
  "productId" : "<?= __('Product ID') ?>",
  "imageAltText" : "<?= __('Image Alt text') ?>",
+ "imageWidth" : "<?= __('Image Width') ?>",
+ "imageHeight" : "<?= __('Image Height') ?>",
  "selectedItemId" : "<?= __('Selected Item Id') ?>"
  }
  }

view/adminhtml/web/vue/app.vue

@@ -131,6 +131,8 @@
  content: null,
  image: null,
  image_alt_text: '',
+ image_width: null,
+ image_height: null,
  node_template: null,
  submenu_template: null,
  columns: [],