N°8763 refactor

Author: Timmy38

setup/extensionsmap.class.inc.php

@@ -60,6 +60,7 @@ class iTopExtension
 	 * @var bool
 	 */
 	public $bMarkedAsChosen;
+	public ?bool $bUninstallable = null;
 
 	/**
 	 * @var bool
@@ -95,6 +96,10 @@ class iTopExtension
 	 * @var true
 	 */
 	public bool $bInstalled = false;
+	/**
+	 * @var true
+	 */
+	public bool $bRemovedFromDisk = false;
 
 	public function __construct()
 	{
@@ -119,8 +124,11 @@ public function __construct()
 	 * @since 3.3.0
 	 * @return bool
 	 */
-	public function CanBeUninstalled()
+	public function CanBeUninstalled(): bool
 	{
+		if (!is_null($this->bUninstallable)) {
+			return $this->bUninstallable;
+		}
 		foreach ($this->aModuleInfo as $sModuleCode => $aModuleInfo) {
 			$bUninstallable = $aModuleInfo['uninstallable'] === 'yes';
 			if (!$bUninstallable) {
@@ -143,6 +151,7 @@ class iTopExtensionsMap
 	 * @return void
 	 */
 	protected $aExtensions;
+	protected ?array $aInstalledExtensions = null;
 
 	/**
 	 * The list of directories browsed using the ReadDir method when building the map
@@ -263,7 +272,7 @@ protected function AddExtension(iTopExtension $oNewExtension)
 	 *
 	 * @return \iTopExtension|null
 	 */
-	public function Get(string $sExtensionCode): ?iTopExtension
+	public function GetFromExtensionCode(string $sExtensionCode): ?iTopExtension
 	{
 		foreach ($this->aExtensions as $oExtension) {
 			if ($oExtension->sCode === $sExtensionCode) {
@@ -434,6 +443,11 @@ public function GetAllExtensions()
 		return $this->aExtensions;
 	}
 
+	public function GetAllExtensionsWithPreviouslyInstalled()
+	{
+		return array_merge($this->aExtensions, $this->aInstalledExtensions ?? []);
+	}
+
 	/**
 	 * Mark the given extension as chosen
 	 * @param string $sExtensionCode The code of the extension (code without version number)
@@ -503,24 +517,52 @@ public function GetChoices()
 	 */
 	public function LoadChoicesFromDatabase(Config $oConfig)
 	{
-
-		$aInstalledExtensions = $this->GetInstalledExtensionsFromDatabase($oConfig);
-
-		foreach ($aInstalledExtensions as $aDBInfo) {
-			$this->MarkAsChosen($aDBInfo['code']);
-			$this->SetInstalledVersion($aDBInfo['code'], $aDBInfo['version']);
+		foreach ($this->LoadInstalledExtensionsFromDatabase($oConfig) as $oExtension) {
+			$this->MarkAsChosen($oExtension->sCode);
+			$this->SetInstalledVersion($oExtension->sCode, $oExtension->sVersion);
 		}
 		return true;
 	}
 
-	public function GetInstalledExtensionsFromDatabase(Config $oConfig): array|false
+	public function LoadInstalledExtensionsFromDatabase(Config $oConfig): array|false
 	{
+		if (is_array($this->aInstalledExtensions)) {
+			return $this->aInstalledExtensions;
+		}
 		try {
 			if (CMDBSource::DBName() === null) {
 				CMDBSource::InitFromConfig($oConfig);
 			}
 			$sLatestInstallationDate = CMDBSource::QueryToScalar("SELECT max(installed) FROM ".$oConfig->Get('db_subname')."priv_extension_install");
-			return CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->Get('db_subname')."priv_extension_install WHERE installed = '".$sLatestInstallationDate."'");
+			$aDBInfo = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->Get('db_subname')."priv_extension_install WHERE installed = '".$sLatestInstallationDate."'");
+
+			$this->aInstalledExtensions = [];
+			foreach ($aDBInfo as $aExtensionInfo) {
+				$oExtension = new iTopExtension();
+				$oExtension->sCode = $aExtensionInfo['code'];
+				$oExtension->sLabel = $aExtensionInfo['label'];
+				$oExtension->sDescription = $aExtensionInfo['description'] ?? '';
+				$oExtension->sVersion = $aExtensionInfo['version'];
+				$oExtension->sSource = $aExtensionInfo['source'];
+				$oExtension->bMandatory = false;
+				$oExtension->sMoreInfoUrl = '';
+				$oExtension->aModules = [];
+				$oExtension->aModuleVersion = [];
+				$oExtension->aModuleInfo = [];
+				$oExtension->sSourceDir = '';
+				$oExtension->bVisible = true;
+				$oExtension->bInstalled = true;
+				$oExtension->bUninstallable = !isset($aExtensionInfo['uninstallable']) || $aExtensionInfo['uninstallable'] === 'yes';
+				if ($oChoice = $this->GetFromExtensionCode($oExtension->sCode)) {
+					$oChoice->bInstalled = true;
+				} else {
+					$oExtension->bRemovedFromDisk = true;
+				}
+
+				$this->aInstalledExtensions[$oExtension->sCode.'/'.$oExtension->sVersion] = $oExtension;
+			}
+
+			return $this->aInstalledExtensions;
 		} catch (MySQLException $e) {
 			// No database or erroneous information
 			return false;

setup/wizardsteps.class.inc.php

@@ -1848,6 +1848,7 @@ protected function GetStepIndex()
 		}
 		return $index;
 	}
+
 	protected function GetStepInfo($idx = null)
 	{
 		$aStepInfo = null;
@@ -1873,7 +1874,7 @@ protected function GetStepInfo($idx = null)
 				'options' => [],
 			];
 
-			foreach ($this->oExtensionsMap->GetAllExtensions() as $oExtension) {
+			foreach ($this->oExtensionsMap->GetAllExtensionsWithPreviouslyInstalled() as $oExtension) {
 				if (($oExtension->sSource !== iTopExtension::SOURCE_WIZARD) && ($oExtension->bVisible) && (count($oExtension->aMissingDependencies) == 0)) {
 					$aStepDefinition['options'][] = [
 						'extension_code' => $oExtension->sCode,
@@ -1885,31 +1886,11 @@ protected function GetStepInfo($idx = null)
 						'mandatory' => $oExtension->bMandatory || ($oExtension->sSource === iTopExtension::SOURCE_REMOTE),
 						'source_label' => $this->GetExtensionSourceLabel($oExtension->sSource),
 						'uninstallable' => $oExtension->CanBeUninstalled(),
+						'missing' => $oExtension->bRemovedFromDisk,
 					];
 				}
 			}
-			//Listing previously installed extension missing from disk
-			if (!is_null($this->oConfig) && ($aPreviouslyInstalled = $this->oExtensionsMap->GetInstalledExtensionsFromDatabase($this->oConfig))) {
-				foreach ($aPreviouslyInstalled as $aExtension) {
-					if (!$this->oExtensionsMap->Get($aExtension['code'])) {
-						$bUninstallable = $aExtension['uninstallable'] === 'yes';
-						$aStepDefinition['options'][] = [
-							'extension_code' => $aExtension['code'],
-							'title' => $aExtension['label'],
-							'description' => $aExtension['description'] ?? '',
-							'more_info' => '',
-							'default' => true, // by default offer to install all modules
-							'modules' => [],
-							'mandatory' => false,
-							'source_label' => $this->GetExtensionSourceLabel($aExtension['source']),
-							'uninstallable' => $bUninstallable,
-							'missing' => true,
-						];
-					} else {
-						$this->oExtensionsMap->Get($aExtension['code'])->bInstalled = true;
-					}
-				}
-			}
+
 			// Display this step of the wizard only if there is something to display
 			if (count($aStepDefinition['options']) !== 0) {
 				$aSteps[] = $aStepDefinition;
@@ -1983,7 +1964,7 @@ protected function DisplayOptions($oPage, $aStepInfo, $aSelectedComponents, $aDe
 			$sId = utils::EscapeHtml($aChoice['extension_code']);
 			$bIsDefault = array_key_exists($sChoiceId, $aDefaults);
 
-			$oITopExtension = $this->oExtensionsMap->Get($aChoice['extension_code']);
+			$oITopExtension = $this->oExtensionsMap->GetFromExtensionCode($aChoice['extension_code']);
 			$bCanBeUninstalled = isset($aChoice['uninstallable']) ? $aChoice['uninstallable'] : $oITopExtension->CanBeUninstalled();
 			$bSelected = isset($aSelectedComponents[$sChoiceId]) && ($aSelectedComponents[$sChoiceId] == $sChoiceId);
 			$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']) || $this->bUpgrade && $bIsDefault && !$bCanBeUninstalled && !$bDisableUninstallCheck;