Merge pull request #4 from asdoria/develop

Develop

README.md

@@ -98,7 +98,7 @@ class Product extends BaseProduct
 ## Usage
 
 1. In the back office, under `Catalog`, enter `Pictogram Groups`. Create a group using a unique code
-2. In `Pictogram Groups`, click `Modify Pictograms` to create/delete images for this group
+2. In `Pictogram Groups`, click `Managing Pictograms` to create/delete images for this group
 3. Go to a product's edit page, then click the `Pictograms` tab in the sidebar. Here you can toggle which pictograms you wish to display
 
 

composer.json

@@ -1,11 +1,8 @@
 {
     "name": "asdoria/sylius-pictogram-plugin",
     "type": "sylius-plugin",
-    "description": "Pictogram Bundle for Asdoria",
-    "keywords": [
-        "sylius",
-        "sylius-plugin"
-    ],
+    "description": "A Pictogram plugin for Sylius",
+    "keywords": ["asdoria", "sylius", "sylius-plugin", "monofony", "pictogram"],
     "authors": [
         {
             "name": "Asdoria",
@@ -53,9 +50,10 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.10-dev"
+            "dev-master": "0.1.0-dev"
         }
     },
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Asdoria\\SyliusPictogramPlugin\\": "src/"
@@ -75,6 +73,10 @@
         ],
         "post-create-project-cmd": [
             "php bin/create_node_symlink.php"
-        ]
+        ],
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+        }
     }
 }

recipes/0.1.0/manifest.json

@@ -0,0 +1,10 @@
+{
+  "bundles": {
+    "Asdoria\\SyliusPictogramPlugin\\AsdoriaSyliusPictogramPlugin": [
+      "all"
+    ]
+  },
+  "copy-from-recipe": {
+    "config/": "%CONFIG_DIR%/"
+  }
+}

recipes/0.1.0/packages/asdoria_sylius_pictogram_plugin.yaml

@@ -0,0 +1,2 @@
+imports:
+    - { resource: "@AsdoriaSyliusPictogramPlugin/Resources/config/config.yaml"}

recipes/0.1.0/routes/asdoria_sylius_pictogram_plugin.yaml

@@ -0,0 +1,3 @@
+asdoria_sylius_pictogram_plugin:
+    resource: "@AsdoriaSyliusPictogramPlugin/Resources/config/routing.yaml"
+    prefix: '/%sylius_admin.path_name%'

src/Controller/PictogramController.php

@@ -3,8 +3,8 @@
 
 namespace Asdoria\SyliusPictogramPlugin\Controller;
 
+use Asdoria\SyliusPictogramPlugin\Model\PictogramInterface;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
-use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Resource\ResourceActions;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -41,7 +41,7 @@ public function updatePositionsAction(Request $request): Response
                     );
                 }
 
-                /** @var ProductVariantInterface $pictogram */
+                /** @var PictogramInterface $pictogram */
                 $pictogram = $this->repository->findOneBy(['id' => $pictogramToUpdate['id']]);
                 $pictogram->setPosition((int) $pictogramToUpdate['position']);
                 $this->manager->flush();

src/Controller/PictogramGroupController.php

@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+
+namespace Asdoria\SyliusPictogramPlugin\Controller;
+
+use Asdoria\SyliusPictogramPlugin\Model\PictogramGroupInterface;
+use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
+use Sylius\Component\Core\Model\ProductVariantInterface;
+use Sylius\Component\Resource\ResourceActions;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+/**
+ * Class PictogramController
+ * @package Asdoria\SyliusPictogramPlugin\Controller
+ *
+ * @author  Hugo Duval <[email protected]>
+ */
+class PictogramGroupController extends ResourceController
+{
+    /**
+     * @throws HttpException
+     */
+    public function updatePositionsAction(Request $request): Response
+    {
+        $configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
+        $this->isGrantedOr403($configuration, ResourceActions::UPDATE);
+        $pictogramGroupsToUpdate = $request->get('pictogramGroups');
+
+        if ($configuration->isCsrfProtectionEnabled() && !$this->isCsrfTokenValid('update-pictogram-group-position', $request->request->get('_csrf_token'))) {
+            throw new HttpException(Response::HTTP_FORBIDDEN, 'Invalid csrf token.');
+        }
+
+        if (in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true) && null !== $pictogramGroupsToUpdate) {
+            foreach ($pictogramGroupsToUpdate as $pictogramGroupToUpdate) {
+                if (!is_numeric($pictogramGroupToUpdate['position'])) {
+                    throw new HttpException(
+                        Response::HTTP_NOT_ACCEPTABLE,
+                        sprintf('The pictogramGroup position "%s" is invalid.', $pictogramGroupToUpdate['position'])
+                    );
+                }
+
+                /** @var PictogramGroupInterface $pictogramGroup */
+                $pictogramGroup = $this->repository->findOneBy(['id' => $pictogramGroupToUpdate['id']]);
+                $pictogramGroup->setPosition((int) $pictogramGroupToUpdate['position']);
+                $this->manager->flush();
+            }
+        }
+
+        return new JsonResponse();
+    }
+}

src/DependencyInjection/Configuration.php

@@ -4,6 +4,7 @@
 namespace Asdoria\SyliusPictogramPlugin\DependencyInjection;
 
 use Asdoria\SyliusPictogramPlugin\Controller\PictogramController;
+use Asdoria\SyliusPictogramPlugin\Controller\PictogramGroupController;
 use Asdoria\SyliusPictogramPlugin\Entity\Pictogram;
 use Asdoria\SyliusPictogramPlugin\Entity\PictogramGroup;
 use Asdoria\SyliusPictogramPlugin\Entity\PictogramGroupTranslation;
@@ -69,7 +70,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
                                     ->addDefaultsIfNotSet()
                                     ->children()
                                         ->scalarNode('model')->defaultValue(PictogramGroup::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(PictogramGroupController::class)->cannotBeEmpty()->end()
                                         ->scalarNode('repository')->defaultValue(PictogramGroupRepository::class)->end()
                                         ->scalarNode('factory')->defaultValue(Factory::class)->end()
                                         ->scalarNode('form')->defaultValue(PictogramGroupType::class)->cannotBeEmpty()->end()

src/Entity/PictogramGroup.php

@@ -23,7 +23,6 @@ class PictogramGroup implements PictogramGroupInterface
 {
     use ResourceTrait;
     use PictogramsTrait;
-    use NamingTrait;
     use CodeTrait;
     use SortableTrait;
 
@@ -41,6 +40,18 @@ public function __construct()
         $this->initializePictogramsCollection();
     }
 
+    /**
+     * @return string|null
+     */
+    public function __toString() {
+        return $this->getName();
+    }
+
+    public function getName(): ?string
+    {
+        return $this->getTranslation()->getName();
+    }
+
     /**
      * @param null|string $locale
      *

src/Form/DataTransformer/ProductsToPictogramGroupsTransformer.php

@@ -0,0 +1,177 @@
+<?php
+declare(strict_types=1);
+
+namespace Asdoria\SyliusPictogramPlugin\Form\DataTransformer;
+
+use App\Model\PictogramGroupInterface;
+use App\Model\PictogramInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Sylius\Component\Core\Model\ProductInterface;
+use Sylius\Component\Core\Model\ProductVariantInterface;
+use Sylius\Component\Product\Repository\ProductRepositoryInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Form\DataTransformerInterface;
+
+/**
+ * Class ProductsToPictogramGroupsTransformer
+ * @package Asdoria\SyliusPictogramPlugin\Form\DataTransformer
+ *
+ * @author  Philippe Vesin <[email protected]>
+ */
+class ProductsToPictogramGroupsTransformer implements DataTransformerInterface
+{
+    /** @var FactoryInterface */
+    private $pictogramFactory;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var RepositoryInterface */
+    private $pictogramGroupRepository;
+
+    /** @var Collection */
+    private $pictograms;
+
+    /**
+     * ProductsToPictogramsTransformer constructor.
+     *
+     * @param FactoryInterface           $pictogramFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param RepositoryInterface        $pictogramGroupRepository
+     */
+    public function __construct(
+        FactoryInterface $pictogramFactory,
+        ProductRepositoryInterface $productRepository,
+        RepositoryInterface $pictogramGroupRepository
+    )
+    {
+        $this->pictogramFactory        = $pictogramFactory;
+        $this->productRepository                = $productRepository;
+        $this->pictogramGroupRepository = $pictogramGroupRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function transform($pictograms)
+    {
+        $this->setPictograms($pictograms);
+
+        if (null === $pictograms) {
+            return '';
+        }
+
+        $values = [];
+
+        /** @var PictogramInterface $pictogram */
+        foreach ($pictograms as $pictogram) {
+            $values[$pictogram->getPictogramGroup()->getCode()] = $pictogram->getCode();
+        }
+
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reverseTransform($values): ?Collection
+    {
+        if (null === $values || '' === $values || !is_array($values)) {
+            return null;
+        }
+
+        $pictograms = new ArrayCollection();
+        foreach ($values as $pictogramGroupCode => $productCodes) {
+            if (null === $productCodes) {
+                continue;
+            }
+
+            /** @var PictogramInterface $pictogram */
+            $pictogram = $this->getPictogramByGroupCode($pictogramGroupCode);
+            $this->setAssociatedProductsByProductCodes($pictogram, $productCodes);
+            $pictograms->add($pictogram);
+        }
+
+        $this->setPictograms(null);
+
+        return $pictograms;
+    }
+
+    /**
+     * @param Collection $products
+     *
+     * @return string|null
+     */
+    private function getCodesAsStringFromProducts(Collection $products): ?string
+    {
+        if ($products->isEmpty()) {
+            return null;
+        }
+
+        $codes = [];
+
+        /** @var ProductInterface|ProductVariantInterface $product */
+        foreach ($products as $product) {
+            $codes[] = $product->getCode();
+        }
+
+        return implode(',', $codes);
+    }
+
+    /**
+     * @param string $pictogramGroupCode
+     *
+     * @return PictogramInterface
+     */
+    private function getPictogramByGroupCode(string $pictogramGroupCode): PictogramInterface
+    {
+        /** @var PictogramInterface $pictogram */
+        foreach ($this->pictograms as $pictogram) {
+            if ($pictogramGroupCode === $pictogram->getPictogramGroup()->getCode()) {
+                return $pictogram;
+            }
+        }
+
+        /** @var PictogramGroupInterface $pictogramGroup */
+        $pictogramGroup = $this->pictogramGroupRepository->findOneBy([
+            'code' => $pictogramGroupCode,
+        ]);
+
+        /** @var PictogramInterface $pictogram */
+        $pictogram = $this->pictogramFactory->createNew();
+        $pictogram->setPictogramGroup($pictogramGroup);
+
+        return $pictogram;
+    }
+
+    /**
+     * @param PictogramInterface $pictogram
+     * @param string                      $productCodes
+     */
+    private function setAssociatedProductsByProductCodes(
+        PictogramInterface $pictogram,
+        string $productCodes
+    ): void
+    {
+        $products = $this->productRepository->findBy(['code' => explode(',', $productCodes)]);
+
+        foreach ($pictogram->getProducts() as $product) {
+            $pictogram->removeProduct($product);
+        }
+
+        /** @var ProductInterface $product */
+        foreach ($products as $product) {
+            $pictogram->addProduct($product);
+        }
+    }
+
+    /**
+     * @param Collection|null $pictograms
+     */
+    private function setPictograms(?Collection $pictograms): void
+    {
+        $this->pictograms = $pictograms;
+    }
+}

src/Menu/AdminMenuListener.php

@@ -40,7 +40,7 @@ private function addChild(ItemInterface $item): void
             ->addChild('pictogram_groups', [
                 'route' => 'asdoria_admin_pictogram_group_index',
             ])
-            ->setLabel('asdoria.ui.pictogram_groups')
+            ->setLabel('asdoria.menu.admin.main.pictogram_groups.header')
             ->setLabelAttribute('icon', 'building');
     }
 }

src/Model/PictogramGroupInterface.php

@@ -22,11 +22,6 @@ interface PictogramGroupInterface extends ResourceInterface, PictogramsAwareInte
      */
     public function getName(): ?string;
 
-    /**
-     * @param string|null $name
-     */
-    public function setName(?string $name): void;
-
     /**
      * @return int|null
      */

src/Resources/config/app/ui.yaml

@@ -32,7 +32,11 @@ sylius_ui:
                     template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
                     priority: 10
 
-
+        asdoria.admin.pictogram_group.index.javascripts:
+            blocks:
+                asdoria_pictogram_groups_javascripts:
+                    template: "@AsdoriaSyliusPictogramPlugin/Admin/_javascripts.html.twig"
+                    priority: 10
 
         sylius.shop.product.show.content:
             blocks: