N°9412 - WIP - adapt unattended XMLs

datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php

@@ -22,6 +22,7 @@ use Dict;
 use Exception;
 use IssueLog;
 use MetaModel;
+use SetupUtils;
 use utils;
 
 class DataFeatureRemovalController extends Controller
@@ -97,6 +98,50 @@ class DataFeatureRemovalController extends Controller
 		$this->aCountClassesToCleanup = $aGetRemovedClasses;
 	}
 
+	public function OperationAnalysisResult(): void
+	{
+		$aParams = [];
+
+		if (SetupUtils::IsSessionSetupTokenValid()) {
+			//from setup wizard/mtp
+			SetupUtils::EraseSetupToken();
+		} else {
+			//from same module
+			$this->ValidateTransactionId();
+		}
+
+		$sSourceEnv = MetaModel::GetEnvironment();
+		$oSetupAudit = new SetupAudit($sSourceEnv);
+		$aGetRemovedClasses = array_keys($oSetupAudit->RunDataAudit());
+		IssueLog::Debug(__METHOD__, null, ['aGetRemovedClasses' => $aGetRemovedClasses]);
+
+		$oDataCleanupService = new DataCleanupService();
+		$aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aGetRemovedClasses);
+		$aColumns = ['Class', 'DeleteCount' , 'UpdateCount', 'IssueCount'];
+		$aRows = [];
+		$iQueryCount = 0;
+		$bHasIssues = false;
+		foreach ($aDeletionPlanSummaryEntities as $oDeletionPlanSummaryEntity) {
+			$aRows[] = [
+				$oDeletionPlanSummaryEntity->sClass,
+				$oDeletionPlanSummaryEntity->iDeleteCount,
+				$oDeletionPlanSummaryEntity->iUpdateCount,
+				$oDeletionPlanSummaryEntity->iIssueCount,
+			];
+			$bHasIssues |= ($oDeletionPlanSummaryEntity->iIssueCount !== 0);
+			$iQueryCount += $oDeletionPlanSummaryEntity->iDeleteCount;
+			$iQueryCount += $oDeletionPlanSummaryEntity->iUpdateCount;
+		}
+
+		$aParams['sTransactionId'] = utils::GetNewTransactionId();
+		$aParams['aDeletionPlanSummary'] = $this->GetTableData('Extensions', $aColumns, $aRows);
+		$aParams['aClasses'] = $aGetRemovedClasses;
+		$aParams['iQueryCount'] = $iQueryCount;
+		$aParams['bDeletionPossible'] = !$bHasIssues;
+
+		$this->DisplayPage($aParams);
+	}
+
 	public function OperationDeletionPlan(): void
 	{
 		$aParams = [];

datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig

@@ -0,0 +1,29 @@
+{# @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 %}

setup/unattended-install/xml_setup/fresh-install.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
   <mode>install</mode>
-  <preinstall>
-  </preinstall>
+  <optional_steps>
+    <log-parameters>1</log-parameters>
+    <migrate-before>1</migrate-before>
+    <migrate-after>1</migrate-after>
+  </optional_steps>
   <source_dir>datamodels/2.x/</source_dir>
-  <datamodel_version>2.7.0</datamodel_version>
-  <previous_configuration_file>/var/www/html/iTop/conf/production/config-itop.php</previous_configuration_file>
+  <datamodel_version>3.3.0</datamodel_version>
   <extensions_dir>extensions</extensions_dir>
   <target_env>production</target_env>
   <workspace_dir></workspace_dir>
@@ -38,4 +40,5 @@
   </selected_modules>
   <selected_extensions type="array">
   </selected_extensions>
+  <use_symbolic_links>off</use_symbolic_links>
 </installation>

setup/unattended-install/xml_setup/itil-fresh-install.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
   <mode>install</mode>
-  <preinstall>
-  </preinstall>
+  <optional_steps>
+    <log-parameters>1</log-parameters>
+    <migrate-before>1</migrate-before>
+    <migrate-after>1</migrate-after>
+  </optional_steps>
   <source_dir>datamodels/2.x/</source_dir>
-  <datamodel_version>2.7.0</datamodel_version>
-  <previous_configuration_file>/var/www/html/iTop/conf/production/config-itop.php</previous_configuration_file>
+  <datamodel_version>3.3.0</datamodel_version>
   <extensions_dir>extensions</extensions_dir>
   <target_env>production</target_env>
   <workspace_dir></workspace_dir>
@@ -50,4 +52,5 @@
     <item>itop-config-mgmt-core</item>
     <item>itop-kown-error-mgmt</item>
   </selected_extensions>
+  <use_symbolic_links>off</use_symbolic_links>
 </installation>

setup/unattended-install/xml_setup/itil-upgrade.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
   <mode>upgrade</mode>
-  <preinstall>
-  </preinstall>
+  <optional_steps>
+    <log-parameters>1</log-parameters>
+    <migrate-before>1</migrate-before>
+    <migrate-after>1</migrate-after>
+  </optional_steps>
   <source_dir>datamodels/2.x/</source_dir>
-  <datamodel_version>2.7.0</datamodel_version>
-  <previous_configuration_file>/var/www/html/iTop/conf/production/config-itop.php</previous_configuration_file>
+  <datamodel_version>3.3.0</datamodel_version>
   <extensions_dir>extensions</extensions_dir>
   <target_env>production</target_env>
   <workspace_dir></workspace_dir>
@@ -50,4 +52,5 @@
     <item>itop-config-mgmt-core</item>
     <item>itop-kown-error-mgmt</item>
   </selected_extensions>
+  <use_symbolic_links>off</use_symbolic_links>
 </installation>

setup/unattended-install/xml_setup/upgrade.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
   <mode>upgrade</mode>
-  <preinstall>
-  </preinstall>
+  <optional_steps>
+    <log-parameters>1</log-parameters>
+    <migrate-before>1</migrate-before>
+    <migrate-after>1</migrate-after>
+  </optional_steps>
   <source_dir>datamodels/2.x/</source_dir>
-  <datamodel_version>2.7.0</datamodel_version>
-  <previous_configuration_file>/var/www/html/iTop/conf/production/config-itop.php</previous_configuration_file>
+  <datamodel_version>3.3.0</datamodel_version>
   <extensions_dir>extensions</extensions_dir>
   <target_env>production</target_env>
   <workspace_dir></workspace_dir>
@@ -38,4 +40,5 @@
   </selected_modules>
   <selected_extensions type="array">
   </selected_extensions>
-</installation>
+  <use_symbolic_links>off</use_symbolic_links>
+</installation>

setup/wizardsteps/WizStepDataAudit.php

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\WebPage\WebPage;
 
 require_once(APPROOT.'setup/sequencers/DataAuditSequencer.php');
@@ -112,11 +113,12 @@ JS);
 	<input type="hidden" name="aExtensions[$sSafeExtCode][enable]" value="on"/>
 INPUT;
 		}
-
+		$sUID = Session::Get('setup_token');
 		$oPage->add(
 			<<<HTML
 <form id="data-feature-removal" class="ibo-setup--wizard ibo-is-hidden" method="post" action="$sApplicationUrl">
-	<input type="hidden" name="operation" value="Analyze"/>
+	<input type="hidden" name="operation" value="AnalysisResult"/>
+	<input type="hidden" name="setup_token" value="$sUID"/>
 	$aHiddenRemovedExtensionInputs
 </form>
 HTML

setup/wizardsteps/WizStepModulesChoice.php

@@ -509,6 +509,7 @@ EOF
 				$sDisplayChoices .= '<li>'.$aChoice['title'].'</li>';
 				if (isset($aChoice['modules'])) {
 					if (count($aChoice['modules']) === 0 && (!isset($aChoice['missing']) || $aChoice['missing'] === false)) {
+						SetupLog::Error(__METHOD__, null, ['choice' => $aChoice]);
 						throw new Exception('Extension '.$aChoice['extension_code'].' does not have any module associated');
 					}
 					foreach ($aChoice['modules'] as $sModuleId) {