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 04b6c9c2a3..e87b496482 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
@@ -21,10 +21,12 @@ use Combodo\iTop\DataFeatureRemoval\Service\DataFeatureRemoverExtensionService;
use Combodo\iTop\Setup\FeatureRemoval\DryRemovalRuntimeEnvironment;
use Combodo\iTop\Setup\FeatureRemoval\SetupAudit;
use ContextTag;
+use CoreException;
use Dict;
use Exception;
use IssueLog;
use MetaModel;
+use MissingDependencyException;
use SetupUtils;
use utils;
@@ -55,6 +57,7 @@ class DataFeatureRemovalController extends Controller
$aParams['sSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup';
$aParams['iCount'] = $this->iCount;
+ Session::Set('bForceCompilation', true);
$this->AddLinkedStylesheet(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/css/DataFeatureRemoval.css');
$this->AddLinkedScript(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/js/DataFeatureRemoval.js');
$this->DisplayPage($aParams);
@@ -77,6 +80,7 @@ class DataFeatureRemovalController extends Controller
$this->aAnalysisDataTable = $this->GetTableData('Analysis', $aColumns, $aData);
}
+ /*
public function OperationAnalyze(): void
{
$iCount = $this->ReadExtensionsDiff();
@@ -103,6 +107,7 @@ class DataFeatureRemovalController extends Controller
IssueLog::Debug(__METHOD__, null, ['aGetRemovedClasses' => $aGetRemovedClasses]);
$this->aCountClassesToCleanup = $aGetRemovedClasses;
}
+ */
public function OperationAnalysisResult(): void
{
@@ -133,7 +138,14 @@ class DataFeatureRemovalController extends Controller
$aParams['aHiddenInputs'] = $aHiddenInputs;
$aAddedExtensions = json_decode($aHiddenInputs['added_extensions'], true);
+
$aRemovedExtensions = json_decode($aHiddenInputs['removed_extensions'], true);
+ if (count($aRemovedExtensions) == 0) {
+ $this->ReadExtensionsDiff();
+ $aRemovedExtensions = $this->aRemovedExtensionsForCheck;
+ }
+
+ $aRemoveExtensionCodes = array_keys($aRemovedExtensions);
$aParams['aAddedExtensions'] = $aAddedExtensions;
$aParams['aRemovedExtensions'] = $aRemovedExtensions;
@@ -142,17 +154,29 @@ class DataFeatureRemovalController extends Controller
'added_extensions' => $aAddedExtensions,
'removed_extensions' => $aRemovedExtensions]);
- $this->Compile(array_keys($aRemovedExtensions), false);
+ $aParams['sTransactionId'] = utils::GetNewTransactionId();
+ $aParams['iColumnCount'] = $this->iColumnCount;
+ $aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions), $this->iColumnCount);
+
+ $bForceCompilation = Session::Get('bForceCompilation', false);
+ try {
+ $this->Compile($aRemoveExtensionCodes, $bForceCompilation);
+ } catch (CoreException $e) {
+ $aParams['DataFeatureRemovalErrorMessage'] = $e->getHtmlDesc();
+ $this->DisplayPage($aParams, 'AnalysisResult');
+ return;
+ } catch (Exception $e) {
+ $aParams['DataFeatureRemovalErrorMessage'] = $e->getMessage();
+ $this->DisplayPage($aParams, 'AnalysisResult');
+ return;
+ }
$sSourceEnv = MetaModel::GetEnvironment();
$oSetupAudit = new SetupAudit($sSourceEnv);
$aGetRemovedClasses = array_keys($oSetupAudit->RunDataAudit());
IssueLog::Debug(__METHOD__, null, ['aGetRemovedClasses' => $aGetRemovedClasses]);
- $aParams['sTransactionId'] = utils::GetNewTransactionId();
$aParams['aClasses'] = $aGetRemovedClasses;
- $aParams['iColumnCount'] = $this->iColumnCount;
- $aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions), $this->iColumnCount);
new ContextTag(ContextTag::TAG_SETUP);
$aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
@@ -170,6 +194,13 @@ class DataFeatureRemovalController extends Controller
$this->DisplayPage($aParams, 'AnalysisResult');
}
+ /**
+* @param array $aRemovedExtensions
+* @param bool $bForceCompilation
+* @return void
+* @throws \ConfigException
+* @throws \CoreException
+ */
private function Compile(array $aRemovedExtensions, bool $bForceCompilation = true): void
{
$sSourceEnv = MetaModel::GetEnvironment();
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 2ce1f409f1..8bebc67108 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
@@ -4,64 +4,87 @@
{% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s} %}
- {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
- {% UIMultiColumn Standard {} %}
- {% for iColumnIndex in 0..iColumnCount-1 %}
- {% UIColumn Standard {} %}
- {% for aExtension in aAvailableExtensions[iColumnIndex] %}
- {% if aExtension['installed'] %}
- {% UIExtensionDetails Installed { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
- {% else %}
- {% UIExtensionDetails NotInstalled { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
- {% endif %}
- {% endfor %}
- {% EndUIColumn %}
- {% endfor %}
- {% EndUIMultiColumn %}
- {% EndUIPanel %}
+ {% if null != DataFeatureRemovalErrorMessage %}
+
+ {% UIAlert ForFailure { sTitle:'DataFeatureRemoval:Failure:Title'|dict_s, sId: 'feature_removal_error_msg', sContent:DataFeatureRemovalErrorMessage } %}
+ {% EndUIAlert %}
+
- {% if bDeletionNeeded %}
- {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %}
- {% UIDataTable ForForm { sRef:'aDeletionPlanSummary', aColumns:aDeletionPlanSummary.Columns, aData:aDeletionPlanSummary.Data} %}{% EndUIDataTable %}
- {% EndUIFieldSet %}
- {% if bDeletionPossible %}
- {% UIForm Standard {} %}
- {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
- {% UIInput ForHidden { sName:'operation', sValue:'DoDeletion'} %}
- {% for sKey, sClass in aClasses %}
- {% UIInput ForHidden { sName:"classes[" ~ sKey ~ "]", sValue:sClass } %}
+ {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
+ {% UIMultiColumn Standard {} %}
+ {% for iColumnIndex in 0..iColumnCount-1 %}
+ {% UIColumn Standard {} %}
+ {% for aExtension in aAvailableExtensions[iColumnIndex] %}
+ {% if aExtension['installed'] %}
+ {% UIExtensionDetails Installed { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+ {% else %}
+ {% UIExtensionDetails NotInstalled { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+ {% endif %}
+ {% endfor %}
+ {% EndUIColumn %}
{% endfor %}
- {% for sCode, sLabel in aAddedExtensions %}
- {% UIInput ForHidden { sName:"aAddedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
- {% endfor %}
- {% for sCode, sLabel in aRemovedExtensions %}
- {% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
- {% endfor %}
- {% for sInputName, sValue in aHiddenInputs %}
- {% UIInput ForHidden { sName:sInputName, sValue:sValue } %}
- {% endfor %}
- {% UIToolbar ForButton {} %}
- {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
- {% EndUIToolbar %}
- {% EndUIForm %}
- {% else %}
- {% UIAlert ForFailure { sContent: 'DataFeatureRemoval:DeletionPlan:Error:Issues'|dict_s } %}{% EndUIAlert %}
- {% endif %}
+ {% EndUIMultiColumn %}
+ {% EndUIPanel %}
{% else %}
- {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:CleanupComplete:Title'|dict_s, sContent:'DataFeatureRemoval:CompilComplete'|dict_s, sId:value } %}{% EndUIAlert %}
+ {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
+ {% UIMultiColumn Standard {} %}
+ {% for iColumnIndex in 0..iColumnCount-1 %}
+ {% UIColumn Standard {} %}
+ {% for aExtension in aAvailableExtensions[iColumnIndex] %}
+ {% if aExtension['installed'] %}
+ {% UIExtensionDetails Installed { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+ {% else %}
+ {% UIExtensionDetails NotInstalled { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+ {% endif %}
+ {% endfor %}
+ {% EndUIColumn %}
+ {% endfor %}
+ {% EndUIMultiColumn %}
+ {% EndUIPanel %}
- {% UIForm Standard {'sId':'launch-setup-form', Action:sLaunchSetupUrl, 'EncType': 'application/x-www-form-urlencoded'} %}
- {% 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 bDeletionNeeded %}
+ {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %}
+ {% UIDataTable ForForm { sRef:'aDeletionPlanSummary', aColumns:aDeletionPlanSummary.Columns, aData:aDeletionPlanSummary.Data} %}{% EndUIDataTable %}
+ {% EndUIFieldSet %}
+ {% if bDeletionPossible %}
+ {% UIForm Standard {} %}
+ {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
+ {% UIInput ForHidden { sName:'operation', sValue:'DoDeletion'} %}
+ {% for sKey, sClass in aClasses %}
+ {% UIInput ForHidden { sName:"classes[" ~ sKey ~ "]", sValue:sClass } %}
+ {% endfor %}
+ {% for sCode, sLabel in aAddedExtensions %}
+ {% UIInput ForHidden { sName:"aAddedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
+ {% endfor %}
+ {% for sCode, sLabel in aRemovedExtensions %}
+ {% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
+ {% endfor %}
+ {% for sInputName, sValue in aHiddenInputs %}
+ {% UIInput ForHidden { sName:sInputName, sValue:sValue } %}
+ {% endfor %}
+ {% UIToolbar ForButton {} %}
+ {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
+ {% EndUIToolbar %}
+ {% EndUIForm %}
+ {% else %}
+ {% UIAlert ForFailure { sContent: 'DataFeatureRemoval:DeletionPlan:Error:Issues'|dict_s } %}{% EndUIAlert %}
+ {% endif %}
+ {% else %}
+ {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:CleanupComplete:Title'|dict_s, sContent:'DataFeatureRemoval:CompilComplete'|dict_s, sId:value } %}{% EndUIAlert %}
- {% if bHasDeletionExecution %}
- {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Execution:Title'|dict_s} %}
- {% UIDataTable ForForm { sRef:'aDeletionExecutionSummary', aColumns:aDeletionExecutionSummary.Columns, aData:aDeletionExecutionSummary.Data} %}{% EndUIDataTable %}
- {% EndUIFieldSet %}
+ {% UIForm Standard {'sId':'launch-setup-form', Action:sLaunchSetupUrl, 'EncType': 'application/x-www-form-urlencoded'} %}
+ {% 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 %}
+ {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Execution:Title'|dict_s} %}
+ {% UIDataTable ForForm { sRef:'aDeletionExecutionSummary', aColumns:aDeletionExecutionSummary.Columns, aData:aDeletionExecutionSummary.Data} %}{% EndUIDataTable %}
+ {% EndUIFieldSet %}
+ {% endif %}
{% endif %}
{% UIForm Standard {} %}
diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/DeletionPlan.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/DeletionPlan.html.twig
deleted file mode 100644
index c37bff85a6..0000000000
--- a/datamodels/2.x/combodo-data-feature-removal/templates/DeletionPlan.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{# @copyright Copyright (C) 2010-2026 Combodo SARL #}
-{# @license http://opensource.org/licenses/AGPL-3.0 #}
-
-{% UIPanel ForInformation { sTitle:'DataFeatureRemoval:DeletionPlan:Title'|dict_s, sSubTitle: 'DataFeatureRemoval:DeletionPlan:SubTitle'|dict_format(iQueryCount) } %}
- {% UIDataTable ForForm { sRef:'aDeletionPlanSummary', aColumns:aDeletionPlanSummary.Columns, aData:aDeletionPlanSummary.Data} %}{% EndUIDataTable %}
-{% EndUIPanel %}
-
-{% if bDeletionPossible %}
- {% UIForm Standard {} %}
- {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
- {% UIInput ForHidden { sName:'operation', sValue:'DoDeletion'} %}
- {% for sKey, sClass in aClasses %}
- {% UIInput ForHidden { sName:"classes[" ~ sKey ~ "]", sValue:sClass } %}
- {% endfor %}
- {% UIToolbar ForButton {} %}
- {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
- {% EndUIToolbar %}
- {% EndUIForm %}
-{% else %}
- {{ 'DataFeatureRemoval:DeletionPlan:Error:Issues'|dict_s }}
-{% endif %}
-
-{% UIForm Standard {} %}
- {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
- {% UIInput ForHidden { sName:'operation', sValue:'Main'} %}
- {% UIToolbar ForButton {} %}
- {% UIButton ForPrimaryAction {sLabel:'UI:Button:BackToMain'|dict_s, sName:'btn_back', sId:'btn_back', bIsSubmit:true} %}
- {% EndUIToolbar %}
-{% EndUIForm %}
\ No newline at end of file
diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/ExtensionRemovalData.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/ExtensionRemovalData.html.twig
deleted file mode 100644
index 2cce0e9ff4..0000000000
--- a/datamodels/2.x/combodo-data-feature-removal/templates/ExtensionRemovalData.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{# @copyright Copyright (C) 2010-2024 Combodo SAS #}
-{# @license http://opensource.org/licenses/AGPL-3.0 #}
-
-{% if bHasData %}
- {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s, sSubTitle: 'DataFeatureRemoval:Analysis:SubTitle'|dict_format(iCount) } %}
- {% UIDataTable ForForm { sRef:'aAnalysisDataTable', aColumns:aAnalysisDataTable.Columns, aData:aAnalysisDataTable.Data} %}{% EndUIDataTable %}
- {% EndUIPanel %}
-
- {% UIForm Standard {} %}
- {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
- {% UIInput ForHidden { sName:'operation', sValue:'DeletionPlan'} %}
- {% for sKey, sClass in aClasses %}
- {% UIInput ForHidden { sName:"classes[" ~ sKey ~ "]", sValue:sClass } %}
- {% endfor %}
- {% UIToolbar ForButton {} %}
- {% UIButton ForPrimaryAction {sLabel:'UI:Button:PlanDeletion'|dict_s, sName:'btn_plandeletion', sId:'btn_plandeletion', bIsSubmit:true} %}
- {% EndUIToolbar %}
- {% EndUIForm %}
-{% endif %}
diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/Features.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/Features.html.twig
index 71b06b6b64..a2c2c84f18 100644
--- a/datamodels/2.x/combodo-data-feature-removal/templates/Features.html.twig
+++ b/datamodels/2.x/combodo-data-feature-removal/templates/Features.html.twig
@@ -3,7 +3,7 @@
{% UIForm Standard {} %}
- {% UIInput ForHidden {sName:'operation', sValue:'Analyze'} %}
+ {% UIInput ForHidden {sName:'operation', sValue:'AnalysisResult'} %}
{% UIInput ForHidden {sName:'transaction_id', sValue:sTransactionId} %}
{% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig
index 89c6fa5798..04ae95101c 100644
--- a/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig
+++ b/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig
@@ -15,21 +15,5 @@
{{ 'DataFeatureRemoval:Helper:Desc2'|dict_s }}
{% EndUIAlert %}
- {% if null != DataFeatureRemovalErrorMessage %}
-
- {% UIAlert ForFailure { sTitle:'DataFeatureRemoval:Failure:Title'|dict_s, sId: 'feature_removal_error_msg', sContent:DataFeatureRemovalErrorMessage } %}
- {% EndUIAlert %}
-
- {% endif %}
-
{% include 'Features.html.twig' %}
- {% include 'ExtensionRemovalData.html.twig' %}
-
- {% if not bHasData %}
- {% UIToolbar ForButton {} %}
-
- {% UIButton ForPrimaryAction {sLabel:'UI:Button:Setup'|dict_s, sName:'btn_setup', sId:'btn_setup', bIsSubmit:false} %}
-
- {% EndUIToolbar %}
- {% endif %}
{% EndUIPanel %}
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index fa9e1b087d..0b592eb81a 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -1634,7 +1634,6 @@ class RunTimeEnvironment
protected function GetModulesToLoad(string $sSourceEnv, array $aSearchDirs): ?array
{
if (is_null($this->GetExtensionMap())) {
- SetupLog::Error(__METHOD__ . '================' . __LINE__);
return null;
}
@@ -1642,7 +1641,6 @@ class RunTimeEnvironment
$aChoices = $this->GetExtensionMap()->GetChoicesFromDatabase($oSourceConfig);
if (false === $aChoices) {
- SetupLog::Error(__METHOD__ . '================' . __LINE__);
return null;
}
$sSourceDir = $oSourceConfig->Get('source_dir');
@@ -1668,7 +1666,6 @@ class RunTimeEnvironment
$aModulesToLoad[] = $sModuleName;
}
- SetupLog::Error(__METHOD__ . '================' . __LINE__, null, [$aChoices, $aModuleIdsToLoad]);
return $aModulesToLoad;
}