N°9567 - Extension Mgmt : Run setup

datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php

@@ -21,6 +21,7 @@
 	'DataFeatureRemoval:Helper:Desc2' => 'Analyze if there are any data or dependency preventing you from enabling/disabling a feature.',
 
 	'DataFeatureRemoval:Features:Title' => 'Features',
+	'DataFeatureRemoval:Execution:Title' => 'Deletion Executions',
 	'DataFeatureRemoval:Analysis:Title' => 'Analysis result',
 	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s element(s) to clean before continuing',
 
@@ -35,6 +36,9 @@
 	'DataFeatureRemoval:Table:Analysis:Module' => 'Module name',
 	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence',
 
+	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
+	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
+
 	'UI:Button:Analyze' => 'Analyze',
 	'UI:Button:ModifyChoices' => 'Modify Choices',
 	'UI:Button:AnalyzeAndSetup' => 'Analyze and go to setup',

datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php

@@ -21,6 +21,7 @@
 	'DataFeatureRemoval:Helper:Desc2' => 'Analyse si des données ou des dépendances empêchent l’activation ou la désactivation d’une fonctionnalité.',
 
 	'DataFeatureRemoval:Features:Title' => 'Fonctionnalités',
+	'DataFeatureRemoval:Execution:Title' => 'Suppressions',
 	'DataFeatureRemoval:Analysis:Title' => 'Résultat de l’analyse',
 	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s élément(s) à nettoyer avant de poursuivre',
 
@@ -35,6 +36,9 @@
 	'DataFeatureRemoval:Table:Analysis:Module' => 'Module',
 	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence',
 
+	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
+	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
+
 	'UI:Button:Analyze' => 'Analyser',
 	'UI:Button:ModifyChoices' => 'Modifier les choix',
 	'UI:Button:AnalyzeAndSetup' => 'Analyser et ouvrir l’assistant de configuration',

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

@@ -13,10 +13,12 @@
 use Combodo\iTop\Application\TwigBase\Controller\Controller;
 use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException;
 use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalHelper;
+use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
 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;
@@ -26,9 +28,11 @@
 
 class DataFeatureRemovalController extends Controller
 {
-	private array $aSelectedExtensionsForCheck = [];
+	private array $aRemovedExtensionsForCheck = [];
 	private array $aCountClassesToCleanup = [];
 	private array $aAnalysisDataTable = [];
+	private array $aDeletionExecutionSummary = [];
+
 	private int $iCount = 0;
 
 	public function OperationMain($sErrorMessage = null): void
@@ -75,7 +79,7 @@ public function OperationAnalyze(): void
 		$this->m_sOperation = 'Main';
 
 		try {
-			if (count($this->aSelectedExtensionsForCheck) > 0) {
+			if (count($this->aRemovedExtensionsForCheck) > 0) {
 				$this->Analyze();
 			}
 			$this->OperationMain();
@@ -87,10 +91,8 @@ public function OperationAnalyze(): void
 
 	private function Analyze(): void
 	{
+		$this->Compile($this->aRemovedExtensionsForCheck);
 		$sSourceEnv = MetaModel::GetEnvironment();
-		$oDryRemovalRuntimeEnvironment = new DryRemovalRuntimeEnvironment($sSourceEnv, $this->aSelectedExtensionsForCheck);
-		$oDryRemovalRuntimeEnvironment->CompileFrom($sSourceEnv);
-
 		$oSetupAudit = new SetupAudit($sSourceEnv);
 		$aGetRemovedClasses = $oSetupAudit->RunDataAudit();
 		IssueLog::Debug(__METHOD__, null, ['aGetRemovedClasses' => $aGetRemovedClasses]);
@@ -106,23 +108,114 @@ public function OperationAnalysisResult(): void
 			SetupUtils::EraseSetupToken();
 		} else {
 			//from same module
-			$this->ValidateTransactionId();
+			//$this->ValidateTransactionId();
 		}
 
 		// Display changed extensions
-		$aAddedExtensions = utils::ReadPostedParam('aAddedExtensions', []);
-		$aRemovedExtensions = utils::ReadPostedParam('aRemovedExtensions', []);
+		$aHiddenInputNames = [
+			'selected_modules',
+			'selected_extensions',
+			'display_choices',
+			'added_extensions',
+			'removed_extensions',
+			'extensions_not_uninstallable',
+		];
+
+		$aHiddenInputs = [];
+		foreach ($aHiddenInputNames as $sInputName) {
+			$aHiddenInputs[$sInputName] = utils::ReadPostedParam($sInputName, "[]", utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
+		}
+		$aParams['aHiddenInputs'] = $aHiddenInputs;
+
+		$aAddedExtensions = json_decode($aHiddenInputs['added_extensions'], true);
+		$aRemovedExtensions = json_decode($aHiddenInputs['removed_extensions'], true);
 
-		IssueLog::Info(__METHOD__.' Extensions given in parameter', null, ['aAddedExtensions' => $aAddedExtensions, 'aRemovedExtensions' => $aRemovedExtensions]);
+		$aParams['aAddedExtensions'] = $aAddedExtensions;
+		$aParams['aRemovedExtensions'] = $aRemovedExtensions;
+
+		IssueLog::Info(__METHOD__.' Extensions given in parameter', null, [
+			'added_extensions' => $aAddedExtensions,
+			'removed_extensions' => $aRemovedExtensions]);
+
+		$this->Compile(array_keys($aRemovedExtensions), false);
 
 		$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['aExtensions'] = $this->GetExtensionsTableDiff($aAddedExtensions, $aRemovedExtensions);
+
+		new ContextTag(ContextTag::TAG_SETUP);
+		$aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
+		$aParams['aSetupParams'] = array_merge([
+			"_class" => "WizStepLandingBeforeAudit",
+			"_params[authent]" => SetupUtils::CreateSetupToken(),
+			"operation" => "next",
+		], $aHiddenInputs);
+
+		[$aParams['aDeletionPlanSummary'], $aParams['iQueryCount'], $aParams['bDeletionPossible']] = $this->GetDeletionPlanSummaryTable($aGetRemovedClasses);
+		[$aParams['aDeletionExecutionSummary'], $aParams['bHasDeletionExecution']] = $this->GetExecutionSummaryTable();
+		$aParams['bDeletionNeeded'] = ($aParams['iQueryCount'] > 0);
+
+		$this->DisplayPage($aParams, 'AnalysisResult');
+	}
+
+	private function Compile(array $aRemovedExtensions, bool $bForceCompilation = true): void
+	{
+		$sSourceEnv = MetaModel::GetEnvironment();
+		$sBuildDir = APPROOT."/env-$sSourceEnv-build";
+		if (! is_dir($sBuildDir)) {
+			SetupUtils::builddir($sBuildDir);
+		}
+		$bIsDirEmpty = count(scandir($sBuildDir)) === 2;
+
+		if ($bIsDirEmpty || $bForceCompilation) {
+			$oRuntimeEnvironment = new DryRemovalRuntimeEnvironment($sSourceEnv, $aRemovedExtensions);
+			DataFeatureRemovalLog::Info(
+				__METHOD__,
+				null,
+				['sSourceEnv' => $sSourceEnv, 'sBuildDir' => $sBuildDir, 'bIsDirEmpty' => $bIsDirEmpty, glob("$sBuildDir/*")]
+			);
+			$oRuntimeEnvironment->CompileFrom($sSourceEnv);
+		}
+	}
+
+	private function GetExecutionSummaryTable(): array
+	{
+		$sName = 'ExcutionSummary';
+
+		$aTableData = [];
+		if (count($this->aDeletionExecutionSummary) === 0) {
+			return [$aTableData, false];
+		}
+
+		$aColumns = ['Class', 'Total Deleted Count' , 'Total Updated Count', 'Deleted Count' , 'Updated Count'];
+		$aRows = [];
+		foreach ($this->aDeletionExecutionSummary as $sClass => $oDeletionPlanSummaryEntity) {
+			$aRows[] = [
+				$sClass,
+				$oDeletionPlanSummaryEntity->iTotalDeletedCount,
+				$oDeletionPlanSummaryEntity->iTotalUpdatedCount,
+				$oDeletionPlanSummaryEntity->iDeletedCount,
+				$oDeletionPlanSummaryEntity->iUpdatedCount,
+			];
+		}
+
+		$aTableData = $this->GetTableData($sName, $aColumns, $aRows);
+
+		return [$aTableData, true];
+
+	}
+
+	private function GetDeletionPlanSummaryTable(array $aRemovedClasses): array
+	{
+		$sName = 'DeletionPlanSummary';
 		$oDataCleanupService = new DataCleanupService();
-		$aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aGetRemovedClasses);
-		$aColumns = ['Class', 'DeleteCount' , 'UpdateCount', 'IssueCount'];
+		$aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aRemovedClasses);
+		$aColumns = ['Class', 'Delete Count' , 'Update Count', 'Issue Count'];
 		$aRows = [];
 		$iQueryCount = 0;
 		$bHasIssues = false;
@@ -137,17 +230,7 @@ public function OperationAnalysisResult(): void
 			$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;
-		$aParams['aAddedExtensions'] = $aAddedExtensions;
-		$aParams['aRemovedExtensions'] = $aRemovedExtensions;
-		$aParams['aExtensions'] = $this->GetExtensionsTableDiff($aAddedExtensions, $aRemovedExtensions);
-
-		$this->DisplayPage($aParams);
+		return [$this->GetTableData($sName, $aColumns, $aRows), $iQueryCount, !$bHasIssues];
 	}
 
 	public function OperationDeletionPlan(): void
@@ -186,27 +269,14 @@ public function OperationDeletionPlan(): void
 
 	public function OperationDoDeletion(): void
 	{
-		$aParams = [];
 		$this->ValidateTransactionId();
 
 		$aClasses = utils::ReadPostedParam('classes', null, utils::ENUM_SANITIZATION_FILTER_CLASS);
 
 		$oDataCleanupService = new DataCleanupService();
-		$aDeletionExecutionSummary = $oDataCleanupService->ExecuteCleanup($aClasses);
-		$aColumns = ['Class', 'DeletedCount' , 'UpdatedCount'];
-		$aRows = [];
-		foreach ($aDeletionExecutionSummary as $oDeletionExecutionSummaryEntity) {
-			$aRows[] = [
-				$oDeletionExecutionSummaryEntity->sClass,
-				$oDeletionExecutionSummaryEntity->iDeleteCount,
-				$oDeletionExecutionSummaryEntity->iUpdateCount,
-			];
-		}
+		$this->aDeletionExecutionSummary = $oDataCleanupService->ExecuteCleanup($aClasses, $this->aDeletionExecutionSummary);
 
-		$aParams['sTransactionId'] = utils::GetNewTransactionId();
-		$aParams['aDeletionExecutionSummary'] = $this->GetTableData('Extensions', $aColumns, $aRows);
-
-		$this->DisplayPage($aParams);
+		$this->OperationAnalysisResult();
 	}
 
 	private function GetExtensionsTableDiff(array $aAddedExtensions, array $aRemovedExtensions): array
@@ -256,7 +326,7 @@ private function GetExtensionsTableToSelect(): array
 			if ($oExtension->bRemovedFromDisk) {
 				$sDisabledHtml = 'disabled=""';
 				$sChecked = 'checked';
-			} elseif (in_array($sCode, $this->aSelectedExtensionsForCheck)) {
+			} elseif (in_array($sCode, $this->aRemovedExtensionsForCheck)) {
 				$sChecked = 'checked';
 			}
 
@@ -322,22 +392,22 @@ private function ValidateTransactionId(): void
 	 */
 	public function ReadRemovedExtensions(): void
 	{
-		if (count($this->aSelectedExtensionsForCheck) > 0) {
+		if (count($this->aRemovedExtensionsForCheck) > 0) {
 			return;
 		}
 
 		$aSelectedExtensionsFromUI = utils::ReadPostedParam('aExtensions', []);
 		foreach ($aSelectedExtensionsFromUI as $sCode => $aData) {
 			$sValue = $aData['enable'] ?? 'off';
 			if (($sValue) === 'on') {
-				$this->aSelectedExtensionsForCheck[] = $sCode;
+				$this->aRemovedExtensionsForCheck[] = $sCode;
 			}
 		}
 
 		// Add source removed to check
 		foreach (DataFeatureRemoverExtensionService::GetInstance()->ReadItopExtensions() as $sCode => $oExtension) {
 			if ($oExtension->bRemovedFromDisk) {
-				$this->aSelectedExtensionsForCheck[] = $sCode;
+				$this->aRemovedExtensionsForCheck[] = $sCode;
 			}
 		}
 	}

datamodels/2.x/combodo-data-feature-removal/src/Entity/DataCleanupSummaryEntity.php

@@ -8,6 +8,8 @@ class DataCleanupSummaryEntity
 	public int $iIssueCount = 0;
 	public int $iUpdateCount = 0;
 	public int $iDeleteCount = 0;
+	public int $iTotalUpdateCount = 0;
+	public int $iTotalDeleteCount = 0;
 
 	/**
 	 * @param string $sClass

datamodels/2.x/combodo-data-feature-removal/src/Service/DataCleanupService.php

@@ -35,7 +35,7 @@ public function __construct(int $iMaxExecutionTime = 30, int $iMaxMemoryPercent
 	 */
 	public function GetCleanupSummary(?array $aClasses): array
 	{
-		return $this->ExecuteCleanup($aClasses ?? [], oObjectService: new ObjectServiceSummary());
+		return $this->ExecuteCleanup($aClasses ?? [], [], oObjectService: new ObjectServiceSummary());
 	}
 
 	private function GetNextObjectToDelete(array $aClasses): ?DBObject
@@ -56,6 +56,7 @@ private function GetNextObjectToDelete(array $aClasses): ?DBObject
 
 	/**
 	 * @param array $aClasses
+	 * @param array $aPreviousExecutionSummary
 	 * @param \Combodo\iTop\DataFeatureRemoval\Service\iObjectService|null $oObjectService
 	 *
 	 * @return array execution summary
@@ -65,9 +66,10 @@ private function GetNextObjectToDelete(array $aClasses): ?DBObject
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
 	 */
-	public function ExecuteCleanup(array $aClasses, ?iObjectService $oObjectService = null): array
+	public function ExecuteCleanup(array $aClasses, array $aPreviousExecutionSummary, ?iObjectService $oObjectService = null): array
 	{
 		$this->oObjectService = $oObjectService ?? new ObjectService();
+		$this->oObjectService->SetSummary($aPreviousExecutionSummary);
 
 		$this->aVisited = [];
 

datamodels/2.x/combodo-data-feature-removal/src/Service/ObjectServiceSummary.php

@@ -23,27 +23,29 @@ class ObjectServiceSummary implements iObjectService
 	public function Update(DBObject $oToUpdate, string $sAttCode, $value): void
 	{
 		$sClass = get_class($oToUpdate);
-		DataFeatureRemovalLog::Info('Object to update', null, ['class' => $sClass, 'id' => $oToUpdate->GetKey(), 'code' => $sAttCode, 'value' => "$value"]);
+		DataFeatureRemovalLog::Debug('Object to update', null, ['class' => $sClass, 'id' => $oToUpdate->GetKey(), 'code' => $sAttCode, 'value' => "$value"]);
 		if (! array_key_exists($sClass, $this->aSummary)) {
 			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
 		}
 		$oDeletionPlanSummaryEntity = $this->aSummary[$sClass];
 		$oDeletionPlanSummaryEntity->iUpdateCount++;
+		$oDeletionPlanSummaryEntity->iTotalUpdateCount++;
 	}
 
 	public function Delete(string $sClass, string $sId): void
 	{
-		DataFeatureRemovalLog::Info('Object to delete', null, ['class' => $sClass, 'id' => $sId]);
+		DataFeatureRemovalLog::Debug('Object to delete', null, ['class' => $sClass, 'id' => $sId]);
 		if (!array_key_exists($sClass, $this->aSummary)) {
 			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
 		}
 		$oDeletionPlanSummaryEntity = $this->aSummary[$sClass];
 		$oDeletionPlanSummaryEntity->iDeleteCount++;
+		$oDeletionPlanSummaryEntity->iTotalDeleteCount++;
 	}
 
 	public function SetIssue(string $sClass): void
 	{
-		DataFeatureRemovalLog::Info('Issue on object', null, ['class' => $sClass]);
+		DataFeatureRemovalLog::Debug('Issue on object', null, ['class' => $sClass]);
 		if (!array_key_exists($sClass, $this->aSummary)) {
 			$this->aSummary[$sClass] = new DataCleanupSummaryEntity($sClass);
 		}
@@ -55,4 +57,16 @@ public function GetSummary(): array
 	{
 		return $this->aSummary;
 	}
+
+	public function SetSummary(array $aSummary): void
+	{
+		$this->aSummary = [];
+		foreach ($aSummary as $sClass => $oPreviousSummaryEntity) {
+			$oSummaryEntity = new DataCleanupSummaryEntity($sClass);
+			$oSummaryEntity->iTotalUpdateCount = $oPreviousSummaryEntity->iTotalUpdateCount;
+			$oSummaryEntity->iTotalDeleteCount = $oPreviousSummaryEntity->iTotalDeleteCount;
+
+			$this->aSummary[$sClass] = $oSummaryEntity;
+		}
+	}
 }