composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8772 - Turbo WIP

Browse Source 
N°8772 - Twig factorization
This commit is contained in:
Eric Espie
2025-10-29 13:59:17 +01:00
parent 98048219e7
commit 1394edc111
5 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -26,6 +26,7 @@ use Combodo\iTop\Application\WebPage\ErrorPage;
use Combodo\iTop\Application\WebPage\iTopWebPage;
use Combodo\iTop\Application\WebPage\WebPage;
use Combodo\iTop\Controller\AbstractController;
use Combodo\iTop\Forms\Block\AbstractFormBlock;
use Combodo\iTop\Forms\Forms;
use Combodo\iTop\Service\InterfaceDiscovery\InterfaceDiscovery;
use Dict;
@@ -58,6 +59,7 @@ abstract class Controller extends AbstractController
const ENUM_PAGE_TYPE_HTML = 'html';
const ENUM_PAGE_TYPE_BASIC_HTML = 'basic_html';
const ENUM_PAGE_TYPE_AJAX = 'ajax';
const ENUM_PAGE_TYPE_TURBO_FORM_AJAX = 'turbo_ajax';
const ENUM_PAGE_TYPE_SETUP = 'setup';
/** @var \Twig\Environment */
@@ -362,7 +364,7 @@ abstract class Controller extends AbstractController
IssueLog::Error($sMsg, null,
[
'sHtmlDecodedToken' => $sDecodedPassedToken,
'conf param ID' => $this->sAccessTokenConfigParamId
'conf param ID' => $this->sAccessTokenConfigParamId,
]
);
throw new Exception("Invalid token");
@@ -480,6 +482,11 @@ abstract class Controller extends AbstractController
$this->DisplayPage($aParams, $sTemplateName, 'setup');
}
public function DisplayTurboAjaxPage ($aParams = array(), $sTemplateName = 'turbo-ajax-update.html.twig')
{
$this->DisplayPage($aParams, $sTemplateName, self::ENUM_PAGE_TYPE_TURBO_FORM_AJAX);
}
/**
* Display the twig page based on the name or the operation
*
@@ -496,13 +503,6 @@ abstract class Controller extends AbstractController
if (empty($sTemplateName)) {
$sTemplateName = $this->m_sOperation;
}
foreach (InterfaceDiscovery::GetInstance()->FindItopClasses(iProfilerExtension::class) as $sExtension) {
/** @var \Combodo\iTop\Application\TwigBase\Controller\iProfilerExtension $oExtensionInstance */
$oExtensionInstance = $sExtension::GetInstance();
if ($oExtensionInstance->IsEnabled()) {
$aParams = array_merge($aParams, $oExtensionInstance->GetDebugParams($aParams));
}
}
$aParams = array_merge($this->GetDefaultParameters(), $aParams);
$this->CreatePage($sPageType);
@@ -530,9 +530,7 @@ abstract class Controller extends AbstractController
$this->AddToPage($this->oTwig->render('application/forms/itop_error.html.twig', ['sControllerError' => $sErrorMsg]));
}
if ($sPageType === 'html') {
$this->ManageDebugExtensions($aParams);
}
$this->ManageDebugExtensions($aParams, $sPageType);
if (!empty($this->aAjaxTabs)) {
$this->oPage->AddTabContainer('TwigBaseTabContainer');
@@ -779,9 +777,9 @@ abstract class Controller extends AbstractController
*
* @return FormBuilderInterface
*/
public function GetFormBuilder(string $type = FormType::class, mixed $data = null, array $options = []): FormBuilderInterface
public function GetFormBuilder(AbstractFormBlock $oFormBlock, mixed $data = null): FormBuilderInterface
{
return $this->oFormFactoryBuilder->getFormFactory()->createBuilder($type, $data,$options);
return $this->oFormFactoryBuilder->getFormFactory()->createNamedBuilder($oFormBlock->GetName(), $oFormBlock->GetFormType(), $data,$oFormBlock->GetOptions());
}
/**
@@ -876,6 +874,11 @@ abstract class Controller extends AbstractController
$this->oPage = new AjaxPage($this->GetOperationTitle());
break;
case self::ENUM_PAGE_TYPE_TURBO_FORM_AJAX:
$this->oPage = new AjaxPage($this->GetOperationTitle());
$this->SetContentType('text/vnd.turbo-stream.html');
break;
case self::ENUM_PAGE_TYPE_SETUP:
$this->oPage = new SetupPage($this->GetOperationTitle());
break;
@@ -994,8 +997,12 @@ abstract class Controller extends AbstractController
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
*/
private function ManageDebugExtensions(array $aParams): void
private function ManageDebugExtensions(array $aParams, string $sPageType): void
{
if (!in_array($sPageType, [self::ENUM_PAGE_TYPE_HTML, self::ENUM_PAGE_TYPE_AJAX, self::ENUM_PAGE_TYPE_TURBO_FORM_AJAX])) {
return;
}
$sContent = '';
foreach (InterfaceDiscovery::GetInstance()->FindItopClasses(iProfilerExtension::class) as $sExtension) {
/** @var \Combodo\iTop\Application\TwigBase\Controller\iProfilerExtension $oExtensionInstance */
$oExtensionInstance = $sExtension::GetInstance();
@@ -1014,8 +1021,17 @@ abstract class Controller extends AbstractController
if (is_array($aSaas)) {
$this->aSaas = array_merge($this->aSaas, $aSaas);
}
$this->AddToPage($this->oTwig->render($sDebugTemplate, $aDebugParams));
$sContent .= $this->oTwig->render($sDebugTemplate, $aDebugParams);
}
}
if ($sContent === '') {
return;
}
if ($sPageType === self::ENUM_PAGE_TYPE_HTML || $sPageType === self::ENUM_PAGE_TYPE_AJAX) {
$this->AddToPage($this->oTwig->render('application/forms/itop_debug.html.twig', ['sProfilerContent' => $sContent]));
} elseif ($sPageType === self::ENUM_PAGE_TYPE_TURBO_FORM_AJAX) {
$this->AddToPage($this->oTwig->render('application/forms/itop_debug_update.html.twig', ['sProfilerContent' => $sContent]));
}
}
}

10
sources/Forms/Block/AbstractFormBlock.php
View File

@@ -255,16 +255,6 @@ abstract class AbstractFormBlock
$this->bIsAdded = $bIsAdded;
}
public function ListBlockNames(): array
{
$aNames = [];
foreach ($this->aSubFormBlocks as $oSubFormBlock) {
$aNames[] = $oSubFormBlock->GetName();
}
return $aNames;
}
/**
* Return the form type.
*

6
templates/application/forms/itop_debug.html.twig Normal file
View File

@@ -0,0 +1,6 @@
{# @copyright Copyright (C) 2010-2025 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
<div id="itop_profiler">
{{ sProfilerContent|raw }}
</div>

8
templates/application/forms/itop_debug_update.html.twig Normal file
View File

@@ -0,0 +1,8 @@
{# @copyright Copyright (C) 2010-2025 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
<turbo-stream action="update" target="itop_profiler">
<template>
{{ sProfilerContent|raw }}
</template>
</turbo-stream>

10
templates/application/forms/turbo-ajax-update.html.twig Normal file
View File

@@ -0,0 +1,10 @@
{# @copyright Copyright (C) 2010-2025 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% for sId in form_diff %}
<turbo-stream action="update" target="block_{{ sId }}">
<template>
{{ form_row(form.(sId)) }}
</template>
</turbo-stream>
{% endfor %}