N°9010 Refactor ComputeChoiceFlags

Author: Timmy38

setup/wizardsteps.class.inc.php

@@ -1941,11 +1941,22 @@ public function ComputeChoiceFlags(array $aChoice, string $sChoiceId, array $aSe
 		$bCanBeUninstalled = isset($aChoice['uninstallable']) ? $aChoice['uninstallable'] === true || $aChoice['uninstallable'] === 'yes' : $oITopExtension->CanBeUninstalled();
 		$bSelected = isset($aSelectedComponents[$sChoiceId]) && ($aSelectedComponents[$sChoiceId] == $sChoiceId);
 		$bMissingFromDisk = isset($aChoice['missing']) && $aChoice['missing'] === true;
-
-		$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']) || $bUpgradeMode && !$bMissingFromDisk && $oITopExtension->bInstalled && !$bCanBeUninstalled && !$bDisableUninstallCheck;
+		$bMandatory = (isset($aChoice['mandatory']) && $aChoice['mandatory']);
 		$bInstalled = $bMissingFromDisk || $oITopExtension->bInstalled;
-		$bDisabled = $bMandatory || $bAllDisabled || $bMissingFromDisk;
-		$bChecked = !$bMissingFromDisk && ($bMandatory || $bSelected);
+
+		$bChecked = $bSelected;
+		$bDisabled = false;
+		if ($bMissingFromDisk) {
+			$bDisabled = true;
+			$bChecked = false;
+		}
+		elseif($bMandatory || $bInstalled && !$bCanBeUninstalled){
+			$bDisabled = true;
+			$bChecked = true;
+		}
+		if($bAllDisabled){
+			$bDisabled = true;
+		}
 
 		if (isset($aChoice['sub_options'])) {
 			$aOptions = $aChoice['sub_options']['options'] ?? [];

tests/php-unit-tests/unitary-tests/setup/WizStepModulesChoiceTest.php

@@ -69,9 +69,6 @@ public function ProviderComputeChoiceFlags()
 			],
 			'A missing extension should be disabled and unchecked' => [
 				'aExtensionsOnDiskOrDb' => [
-					'itop-ext1' => [
-						'installed' => true,
-					],
 				],
 				'aWizardStepDefinition' => [
 					'extension_code' => 'itop-ext1',
@@ -90,9 +87,6 @@ public function ProviderComputeChoiceFlags()
 			],
 			'A missing extension should always be disabled and unchecked, even when mandatory' => [
 				'aExtensionsOnDiskOrDb' => [
-					'itop-ext1' => [
-						'installed' => true,
-					],
 				],
 				'aWizardStepDefinition' => [
 					'extension_code' => 'itop-ext1',
@@ -111,9 +105,6 @@ public function ProviderComputeChoiceFlags()
 			],
 			'A missing extension should always be disabled and unchecked, even when non-uninstallable' => [
 				'aExtensionsOnDiskOrDb' => [
-					'itop-ext1' => [
-						'installed' => true,
-					],
 				],
 				'aWizardStepDefinition' => [
 					'extension_code' => 'itop-ext1',