From 9f028c6452e5946cd84a7a0d0a023fb462aef18a Mon Sep 17 00:00:00 2001 From: odain Date: Tue, 12 May 2026 11:50:59 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B09567=20-=20link=20from=20ext=20mgt=20to?= =?UTF-8?q?=20setup=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataFeatureRemovalController.php | 36 +++++++++++++++++++ .../templates/AnalysisResult.html.twig | 7 ++++ 2 files changed, 43 insertions(+) diff --git a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php index 8e6854fdf8..5e0dccd80a 100644 --- a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php +++ b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php @@ -18,6 +18,7 @@ use Combodo\iTop\DataFeatureRemoval\Service\DataCleanupService; use Combodo\iTop\DataFeatureRemoval\Service\DataFeatureRemoverExtensionService; use Combodo\iTop\Setup\FeatureRemoval\DryRemovalRuntimeEnvironment; use Combodo\iTop\Setup\FeatureRemoval\SetupAudit; +use ContextTag; use Dict; use Exception; use IssueLog; @@ -130,6 +131,38 @@ class DataFeatureRemovalController extends Controller $aParams['aRemovedExtensions'] = $aRemovedExtensions; $aParams['aExtensions'] = $this->GetExtensionsTableDiff($aAddedExtensions, $aRemovedExtensions); + new ContextTag(ContextTag::TAG_SETUP); + $aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot(). 'setup/wizard.php'; + $aParams['aSetupParams']= [ + 'choice[_0]' => "_0", + 'choice[_1]' => "_1", + "_class" => "WizStepModulesChoice", + "_state" => "4", + "_params[authent]" => SetupUtils::CreateSetupToken(), + "_params[graphviz_path]" => "/usr/bin/dot", + "_params[previous_version_dir]" => "/var/www/html/iTopLegacy/", + "_params[db_server]" => "localhost", + "_params[db_user]" => "iTop", + "_params[db_pwd]" => "blob99", + "_params[db_name]" => "gabuzomeuuninstall", + "_params[db_prefix]" => "", + "_params[db_tls_enabled]" => "", + "_params[db_tls_ca]" => "", + "_params[install_mode]" => "upgrade", + "_params[display_license]" => "", + "_params[mode]" => "upgrade", + "_params[upgrade_type]" => "use-compatible", + "_params[source_dir]" => "/var/www/html/iTopLegacy/datamodels/2.x/", + "_params[datamodel_version]" => "3.3.0", + "_params[application_url]" => "https://odain.itop-saas.dev/iTopLegacy/", + "_params[use_symbolic_links]" => "", + "_params[force-uninstall]" => "", + "_params[additional_extensions_modules]" => "[]", + "_params[selected_components]" => '[{"_0":"_0","_1":"_1","_2":"_2","_3":"_3","_4":"_4"},{"_0":"_0"},{"_0":"_0","_0_0":"_0_0"},{"_0":"_0"},{"_0":"_0","_1":"_1"}]', + "_steps" => '[{"class":"WizStepWelcome","state":""},{"class":"WizStepInstallOrUpgrade","state":""},{"class":"WizStepDetectedInfo","state":""},{"class":"WizStepUpgradeMiscParams","state":""},{"class":"WizStepModulesChoice","state":"start_upgrade"},{"class":"WizStepModulesChoice","state":"1"},{"class":"WizStepModulesChoice","state":"2"},{"class":"WizStepModulesChoice","state":"3"}]', + "operation" => "next", + ]; + [$aParams['aDeletionPlanSummary'], $aParams['iQueryCount'], $aParams['bDeletionPossible']] = $this->GetDeletionPlanSummaryTable($aGetRemovedClasses); [$aParams['aDeletionExecutionSummary'], $aParams['bHasDeletionExecution']] = $this->GetExecutionSummaryTable(); $aParams['bDeletionNeeded'] = ($aParams['iQueryCount'] > 0); @@ -141,6 +174,9 @@ class DataFeatureRemovalController extends Controller { $sSourceEnv = MetaModel::GetEnvironment(); $sBuildDir = APPROOT."/env-$sSourceEnv-build"; + if (! is_dir($sBuildDir)) { + SetupUtils::builddir($sBuildDir); + } $bIsDirEmpty = count(scandir($sBuildDir)) === 2; if ($bIsDirEmpty || $bForceCompilation) { diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig index 61a4847ac2..37f7cd6a61 100644 --- a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig +++ b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig @@ -35,6 +35,13 @@ {% endif %} {% else %} {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:CleanupComplete:Title'|dict_s, sContent:'DataFeatureRemoval:CompilComplete'|dict_s, sId:value } %}{% EndUIAlert %} + + {% UIForm Standard {'sId':'launch-setup-form', Action:sLaunchSetupUrl} %} + {% for sKey, sValue in aSetupParams %} + {% UIInput ForHidden { sName:sKey, sValue:sValue } %} + {% endfor %} + {% UIButton ForPrimaryAction {sLabel:'UI:Button:Setup'|dict_s, sName:'btn_setup', sId:'btn_setup', bIsSubmit:true} %} + {% EndUIForm %} {% endif %} {% if bHasDeletionExecution %}