13 lauch process without context or input

config/services/twig.yaml

@@ -17,6 +17,12 @@ services:
         tags:
             - { name: 'twig.extension' }
 
+    cleverage_ui_process.twig.process_extension:
+        class: CleverAge\UiProcessBundle\Twig\Extension\ProcessExtension
+        public: false
+        tags:
+            - { name: 'twig.extension' }
+
     cleverage_ui_process.twig.log_level_extension_runtime:
         class: CleverAge\UiProcessBundle\Twig\Runtime\LogLevelExtensionRuntime
         public: false
@@ -37,3 +43,17 @@ services:
         arguments:
             - '@cleverage_ui_process.repository.process_execution'
             - '@cleverage_ui_process.manager.process_configuration'
+
+    cleverage_ui_process.twig.process_extension_runtime:
+        class: CleverAge\UiProcessBundle\Twig\Runtime\ProcessExtensionRuntime
+        public: false
+        tags:
+            - { name: 'twig.runtime' }
+        arguments:
+            - '@cleverage_ui_process.manager.process_configuration'
+
+    cleverage_ui_process.twig.component.bootstrap_modal:
+        class: CleverAge\UiProcessBundle\Twig\Components\BootstrapModal
+        shared: false
+        tags:
+            - { name: 'twig.component', key: 'ui:BootstrapModal', template: '@CleverAgeUiProcess/components/BootstrapModal.html.twig' }

docs/index.md

@@ -33,6 +33,16 @@ Now you can access UI Process via http://your-domain.com/process
 
 ## Features
 
+### Launch process via UI
+From UI "Process List" menu entry you can run a process by clicking on "Rocket" action.
+You can manage this behaviour by setting some ui option `ui_launch_mode`
+
+|      Value      |                          UI behaviour                          |
+|:---------------:|:--------------------------------------------------------------:|
+| modal (default) | On click, open confirmation modal to confirm process execution | 
+|      form       |    On click, open a form to set input and context execution    |
+|      null       |              Run process without any confirmation              | 
+
 ### Launch process via http request
 You can launch a process via http post request
 First you need to generate a token via UI User edit form. The UiProcess generate for you a auth token (keep it in secured area, it will display once).

src/Controller/Admin/Process/LaunchAction.php

@@ -13,6 +13,7 @@
 
 namespace CleverAge\UiProcessBundle\Controller\Admin\Process;
 
+use CleverAge\ProcessBundle\Exception\MissingProcessException;
 use CleverAge\UiProcessBundle\Entity\User;
 use CleverAge\UiProcessBundle\Form\Type\LaunchType;
 use CleverAge\UiProcessBundle\Manager\ProcessConfigurationsManager;
@@ -39,24 +40,43 @@
 #[IsGranted('ROLE_USER')]
 class LaunchAction extends AbstractController
 {
+    public function __construct(private readonly MessageBusInterface $messageBus)
+    {
+    }
+
     public function __invoke(
         RequestStack $requestStack,
-        MessageBusInterface $messageBus,
         string $uploadDirectory,
         ProcessConfigurationsManager $processConfigurationsManager,
         AdminContext $context,
     ): Response {
-        $uiOptions = $processConfigurationsManager->getUiOptions($requestStack->getMainRequest()?->get('process') ?? '');
+        $processCode = $requestStack->getMainRequest()?->get('process');
+        if (null === $processCode) {
+            throw new MissingProcessException();
+        }
+        $uiOptions = $processConfigurationsManager->getUiOptions($processCode);
+        if (null === $uiOptions) {
+            throw new \InvalidArgumentException('Missing UI Options');
+        }
+        if (null === $uiOptions['ui_launch_mode'] || 'modal' === $uiOptions['ui_launch_mode']) {
+            $this->dispatch($processCode);
+            $this->addFlash(
+                'success',
+                'Process has been added to queue. It will start as soon as possible'
+            );
+
+            return $this->redirectToRoute('process', ['routeName' => 'process_list']);
+        }
         $form = $this->createForm(
             LaunchType::class,
             null,
             [
-                'constraints' => $uiOptions['constraints'] ?? [],
-                'process_code' => $requestStack->getMainRequest()?->get('process'),
+                'constraints' => $uiOptions['constraints'],
+                'process_code' => $processCode,
             ]
         );
         if (false === $form->isSubmitted()) {
-            $default = $uiOptions['default'] ?? [];
+            $default = $uiOptions['default'];
             if (false === $form->get('input')->getConfig()->getType()->getInnerType() instanceof TextType
                 && isset($default['input'])
             ) {
@@ -72,16 +92,11 @@ public function __invoke(
                 (new Filesystem())->dumpFile($filename, $input->getContent());
                 $input = $filename;
             }
-
-            $message = new ProcessExecuteMessage(
+            $this->dispatch(
                 $form->getConfig()->getOption('process_code'),
                 $input,
-                array_merge(
-                    ['execution_user' => $this->getUser()?->getEmail()],
-                    $form->get('context')->getData()
-                )
+                $form->get('context')->getData()
             );
-            $messageBus->dispatch($message);
             $this->addFlash(
                 'success',
                 'Process has been added to queue. It will start as soon as possible'
@@ -99,6 +114,22 @@ public function __invoke(
         );
     }
 
+    /**
+     * @param mixed[] $context
+     */
+    protected function dispatch(string $processCode, mixed $input = null, array $context = []): void
+    {
+        $message = new ProcessExecuteMessage(
+            $processCode,
+            $input,
+            array_merge(
+                ['execution_user' => $this->getUser()?->getEmail()],
+                $context
+            )
+        );
+        $this->messageBus->dispatch($message);
+    }
+
     protected function getUser(): ?User
     {
         /** @var User $user */

src/Manager/ProcessConfigurationsManager.php

@@ -24,6 +24,8 @@
  * @phpstan-type UiOptions array{
  *      'source': ?string,
  *      'target': ?string,
+ *      'ui_launch_mode': ?string,
+ *      'run_confirmation_modal': bool,
  *      'entrypoint_type': string,
  *      'constraints': Constraint[],
  *      'run': 'null|bool',
@@ -76,6 +78,7 @@ private function resolveUiOptions(array $options): array
                     'source' => null,
                     'target' => null,
                     'entrypoint_type' => 'text',
+                    'ui_launch_mode' => 'modal',
                     'constraints' => [],
                     'run' => null,
                     'default' => function (OptionsResolver $defaultResolver) {
@@ -95,6 +98,7 @@ private function resolveUiOptions(array $options): array
             );
             $uiResolver->setAllowedValues('entrypoint_type', ['text', 'file']);
             $uiResolver->setNormalizer('constraints', fn (Options $options, array $values): array => (new ConstraintLoader())->buildConstraints($values));
+            $uiResolver->setAllowedValues('ui_launch_mode', ['modal', null, 'form']);
         });
         /**
          * @var array{'ui': UiOptions} $options

src/Twig/Components/BootstrapModal.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the CleverAge/UiProcessBundle package.
+ *
+ * Copyright (c) Clever-Age
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CleverAge\UiProcessBundle\Twig\Components;
+
+class BootstrapModal
+{
+    public ?string $id = null;
+    public ?string $title = null;
+    public ?string $message = null;
+    public ?string $confirmUrl = null;
+}

src/Twig/Extension/ProcessExtension.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the CleverAge/UiProcessBundle package.
+ *
+ * Copyright (c) Clever-Age
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CleverAge\UiProcessBundle\Twig\Extension;
+
+use CleverAge\UiProcessBundle\Twig\Runtime\ProcessExtensionRuntime;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+class ProcessExtension extends AbstractExtension
+{
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction(
+                'resolve_ui_options',
+                [ProcessExtensionRuntime::class, 'getUiOptions']
+            ),
+        ];
+    }
+}

src/Twig/Runtime/ProcessExtensionRuntime.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the CleverAge/UiProcessBundle package.
+ *
+ * Copyright (c) Clever-Age
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CleverAge\UiProcessBundle\Twig\Runtime;
+
+use CleverAge\UiProcessBundle\Manager\ProcessConfigurationsManager;
+use Twig\Extension\RuntimeExtensionInterface;
+
+/**
+ * @phpstan-import-type UiOptions from ProcessConfigurationsManager
+ */
+class ProcessExtensionRuntime implements RuntimeExtensionInterface
+{
+    public function __construct(protected ProcessConfigurationsManager $processConfigurationsManager)
+    {
+    }
+
+    /**
+     * @return UiOptions|array{}
+     */
+    public function getUiOptions(string $code): array
+    {
+        return $this->processConfigurationsManager->getUiOptions($code) ?? [];
+    }
+}

templates/admin/field/report.html.twig

@@ -2,7 +2,5 @@
 {# @var field \EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto #}
 {# @var entity \EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto #}
 <ul>
-    {% for key, item in field.value %}
-        <li class="list-group-item"><span class="badge badge-{{ log_css_class(key) }}">{{ key }}</span> : {{ item }}</li>
-    {% endfor %}
+  {{ field.value }}
 </ul>

templates/admin/process/list.html.twig

@@ -21,6 +21,7 @@
             {# @var process \CleverAge\ProcessBundle\Configuration\ProcessConfiguration #}
             {% for process in processes %}
                 {% set lastExecution = get_last_execution_date(process.code) %}
+                {% set uiOptions = resolve_ui_options(process.code) %}
                 {% set statusClass = '' %}
                 {% if lastExecution is not null %}
                     {% set statusClass = lastExecution.status.value == 'failed' ? 'danger' : 'success' %}
@@ -32,9 +33,15 @@
                     <td>{% if process.options.ui.source is defined %}{{ process.options.ui.source }}{% endif %}</td>
                     <td>{% if process.options.ui.target is defined %}{{ process.options.ui.target }}{% endif %}</td>
                     <td class="text-center">
-                        <a class="px-1" data-toggle="tooltip" data-placement="top" title="{{ 'Launch'|trans }}" href="{{ url('process', {routeName: 'process_launch', process: process.code}) }}">
-                            <i class="fas fa-rocket"></i>
-                        </a>
+                        {% if ('modal' == uiOptions.ui_launch_mode) %}
+                            <a class="px-1" data-toggle="tooltip" data-placement="top" title="{{ 'Launch'|trans }}" data-bs-toggle="modal" data-bs-target="#{{ process.code }}">
+                                <i class="fas fa-rocket"></i>
+                            </a>
+                        {% else %}
+                            <a class="px-1" data-toggle="tooltip" data-placement="top" title="{{ 'Launch'|trans }}" href="{{ url('process', {routeName: 'process_launch', process: process.code}) }}">
+                                <i class="fas fa-rocket"></i>
+                            </a>
+                        {% endif %}
                         <a
                             class="px-1"
                             data-toggle="tooltip"
@@ -58,6 +65,12 @@
                         </a>
                     </td>
                 </tr>
+                <twig:ui:BootstrapModal
+                        id="{{ process.code }}"
+                        title="{{ 'Run process'|trans }} {{ process.code }}"
+                        message="{{ 'Do you really want to run process %process% in background'|trans({'%process%': process.code}) }} ?"
+                        confirmUrl="{{ url('process', {routeName: 'process_launch', process: process.code}) }}"
+                />
             {% endfor %}
         {% endblock %}
         </tbody>

templates/components/BootstrapModal.html.twig

@@ -0,0 +1,37 @@
+<div {{ attributes.defaults({
+    class: 'modal fade',
+    tabindex: '-1',
+    'aria-hidden': 'true',
+    id: id ? id : false,
+}) }}
+        data-controller="bootstrap-modal"
+>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            {% block modal_full_content %}
+                {% if block('modal_header') %}
+                    <div class="modal-header text-center">
+                        {% block modal_header %}
+                            <h5>{{ title }}</h5>
+                        {% endblock %}
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                {% endif %}
+
+                <div class="modal-body">
+                    {% block modal_body %}{{ message }}{% endblock %}
+                </div>
+
+                {% if block('modal_footer') %}
+                    <div class="modal-footer">
+                        {% block modal_footer %}
+                         {% if null != confirmUrl %}
+                             <a href="{{ confirmUrl }}"><button type="button" class="btn btn-primary">{{ 'Confirm'|trans }}</button></a>
+                         {% endif %}
+                        {% endblock %}
+                    </div>
+                {% endif %}
+            {% endblock %}
+        </div>
+    </div>
+</div>