Merge branch 'master' into test-links

Author: adriendupuis

README.md

@@ -1,3 +1,5 @@
+<!-- vale off -->
+
 # Ibexa DXP Developer Documentation
 
 This repository is the source for the [developer documentation for Ibexa](https://doc.ibexa.co/en/latest),

code_samples/api/commerce/src/Command/CartCommand.php

@@ -135,5 +135,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->cartService->deleteCart($cart);
 
         return self::SUCCESS;
+
+        // Get the order with items that should be reordered
+        $order = $this->orderService->getOrderByIdentifier($orderIdentifier);
+
+        // Get the cart to merge
+        $existingCart = $this->cartResolver->resolveCart();
+
+        $reorderCart = $this
+            ->reorderService
+            ->addToCartFromOrder($order, $this->reorderService->createReorderCart($order));
+
+        // Merge the carts into the target cart and delete the merged carts
+        $reorderCart = $this->cartService->mergeCarts($reorderCart, true, $existingCart);
     }
 }

code_samples/api/product_catalog/src/Command/ProductPriceCommand.php

@@ -5,9 +5,15 @@
 use Ibexa\Contracts\Core\Repository\PermissionResolver;
 use Ibexa\Contracts\Core\Repository\UserService;
 use Ibexa\Contracts\ProductCatalog\CurrencyServiceInterface;
+use Ibexa\Contracts\ProductCatalog\PriceResolverInterface;
 use Ibexa\Contracts\ProductCatalog\ProductPriceServiceInterface;
 use Ibexa\Contracts\ProductCatalog\ProductServiceInterface;
 use Ibexa\Contracts\ProductCatalog\Values\Price\Create\Struct\ProductPriceCreateStruct;
+use Ibexa\Contracts\ProductCatalog\Values\Price\PriceContext;
+use Ibexa\Contracts\ProductCatalog\Values\Price\PriceQuery;
+use Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\Currency;
+use Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\CustomerGroup;
+use Ibexa\Contracts\ProductCatalog\Values\Price\Query\Criterion\Product;
 use Money;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -18,6 +24,8 @@ final class ProductPriceCommand extends Command
 {
     private ProductPriceServiceInterface $productPriceService;
 
+    private PriceResolverInterface $priceResolver;
+
     private ProductServiceInterface $productService;
 
     private CurrencyServiceInterface $currencyService;
@@ -26,10 +34,17 @@ final class ProductPriceCommand extends Command
 
     private PermissionResolver $permissionResolver;
 
-    public function __construct(CurrencyServiceInterface $currencyService, ProductServiceInterface $productService, ProductPriceServiceInterface $productPriceService, UserService $userService, PermissionResolver $permissionResolver)
-    {
+    public function __construct(
+        CurrencyServiceInterface $currencyService,
+        ProductServiceInterface $productService,
+        ProductPriceServiceInterface $productPriceService,
+        PriceResolverInterface $priceResolver,
+        UserService $userService,
+        PermissionResolver $permissionResolver
+    ) {
         $this->currencyService = $currencyService;
         $this->productPriceService = $productPriceService;
+        $this->priceResolver = $priceResolver;
         $this->productService = $productService;
         $this->userService = $userService;
         $this->permissionResolver = $permissionResolver;
@@ -82,6 +97,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln($price);
         }
 
+        $priceCriteria = [
+            new Currency('USD'),
+            new CustomerGroup('customer_group_1'),
+            new Product('ergo_desk'),
+        ];
+
+        $priceQuery = new PriceQuery(new LogicalOr(...$priceCriteria));
+        $prices = $this->priceService->findPrices($priceQuery);
+
+        $output->writeln(sprintf('Found %d prices with provided criteria', count($prices)));
+
+        $context = new PriceContext($currency);
+        $price = $this->priceResolver->resolvePrice($product, $context);
+
+        $output->writeln('Price in ' . $currency->getCode() . ' for ' . $product->getName() . ' is ' . $price);
+
         return self::SUCCESS;
     }
 }

code_samples/api/public_php_api/src/Command/TaxonomyCommand.php

@@ -39,14 +39,14 @@ public function execute(InputInterface $input, OutputInterface $output)
         $user = $this->userService->loadUserByLogin('admin');
         $this->permissionResolver->setCurrentUserReference($user);
 
-        $allEntries = $this->taxonomyService->loadAllEntries('tags', 30, 0);
+        $allEntries = $this->taxonomyService->loadAllEntries(null, 50);
 
         $entry = $this->taxonomyService->loadEntryByIdentifier('desks');
 
         $output->writeln($entry->name . ' with parent ' . $entry->parent->name);
 
         // Loads first 10 children
-        $entryChildren = $this->taxonomyService->loadEntryChildren($entry, 10, 0);
+        $entryChildren = $this->taxonomyService->loadEntryChildren($entry, 10);
 
         foreach ($entryChildren as $child) {
             $output->writeln($child->name);

code_samples/back_office/calendar/config/custom_services.yaml

@@ -10,7 +10,7 @@ services:
             $eventType: '@App\Calendar\Holidays\EventType'
 
     App\Calendar\Holidays\EventSource:
-        class: Ibexa\Tests\Calendar\Calendar\EventSource
-        factory: [ '@App\Calendar\Holidays\EventSourceFactory','createEventSource' ]
+        class: Ibexa\Calendar\EventSource\InMemoryEventSource
+        factory: [ '@App\Calendar\Holidays\EventSourceFactory', 'createEventSource' ]
         tags:
             - { name: ibexa.calendar.event.source }

code_samples/data_migration/examples/delete_role.yaml

@@ -0,0 +1,6 @@
+-
+    type: role
+    mode: delete
+    match:
+        field: identifier
+        value: Contributor

code_samples/data_migration/examples/update_role.yaml

@@ -0,0 +1,32 @@
+-
+    type: role
+    mode: update
+    match:
+        field: identifier
+        value: Editor
+    policies:
+        -   module: content
+            function: '*'
+        -   module: user
+            function: login
+            limitations:
+                -   identifier: SiteAccess
+                    values: [ admin ]
+        -   module: url
+            function: '*'
+
+-
+    type: role
+    mode: update
+    match:
+        field: identifier
+        value: Anonymous
+    policies:
+        mode: append
+        list:
+            -
+                module: user
+                function: login
+                limitations:
+                    -   identifier: SiteAccess
+                        values: [ new_siteaccess ]

code_samples/forms/custom_form_attribute/config/custom_services.yaml

@@ -3,7 +3,7 @@
             $fieldIdentifier: checkbox_with_richtext_description
             $formType: 'App\FormBuilder\Form\Type\CheckboxWithRichtextDescriptionType'
         tags:
-            - { name: ibexa.form_builder.field_mapper }
+            - { name: ibexa.form_builder.field.mapper }
 
     ibexa.form_builder.attribute_form_type_mapper.richtext_description:
         class: Ibexa\FormBuilder\Form\Mapper\FieldAttribute\GenericFieldAttributeTypeMapper

code_samples/forms/custom_form_attribute/public/js/formbuilder-richtext-checkbox.js

@@ -1,9 +1,28 @@
-(function(global, doc, ibexa) {
-    const richtext       = new ibexa.BaseRichText();
+(function (global, doc, ibexa) {
+    global.addEventListener('load', (event) => {
+        const richtext = new ibexa.BaseRichText();
 
-    // Enable editor in all ibexa-data-source divs
-    doc.querySelectorAll('.ibexa-data-source').forEach((ibexaDataSource) => {
-        const richtextContainer = ibexaDataSource.querySelector(".ibexa-data-source__richtext");
-        const alloyEditor    = richtext.init(richtextContainer);
+        // Enable editor in all ibexa-data-source divs
+        doc.querySelectorAll('.ibexa-data-source').forEach(
+            (ibexaDataSource) => {
+                const richtextContainer = ibexaDataSource.querySelector(
+                    '.ibexa-data-source__richtext'
+                );
+
+                if (richtextContainer.classList.contains('ck')) {
+                    return;
+                }
+
+                richtext.init(richtextContainer);
+            }
+        );
     });
+
+    const openUdw = (config) => {
+        const openUdwEvent = new CustomEvent('ibexa-open-udw', { detail: config });
+
+        doc.body.dispatchEvent(openUdwEvent);
+    };
+
+    ibexa.addConfig('richText.alloyEditor.callbacks.selectContent', openUdw);
 })(window, window.document, window.ibexa);

code_samples/forms/custom_form_attribute/src/FormBuilder/Form/Type/CheckboxWithRichtextDescriptionType.php

@@ -38,7 +38,9 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     {
         // pass the Dom object of the richtext doc to the template
         $dom = new \DOMDocument();
-        $dom->loadXML($options['richtext_description']);
+        if (!empty($options['richtext_description'])) {
+            $dom->loadXML($options['richtext_description']);
+        }
         $view->vars['richtextDescription'] = $dom;
     }
 }