N°9167 Use ExtensionDetails UIBlocks instead of table (#910)

This commit is contained in:
Timmy38
2026-05-21 09:48:33 +02:00
committed by GitHub
parent 03e1806f9a
commit 77a820105f
29 changed files with 237 additions and 129 deletions

View File

@@ -62,4 +62,15 @@ $ibo-extension-details--actions--button--padding-x: $ibo-button--padding-x !defa
.ibo-extension-details--actions:has(.toggler-install:not(:disabled)) .ibo-popover-menu--section a[data-resource-id="force_uninstall"] { .ibo-extension-details--actions:has(.toggler-install:not(:disabled)) .ibo-popover-menu--section a[data-resource-id="force_uninstall"] {
display: none; display: none;
} }
.ibo-extension-details .ibo-popover-menu ~ .ibo-button{
visibility: hidden;
}
.ibo-extension-details .ibo-popover-menu:has(.ibo-popover-menu--item) ~ .ibo-button{
visibility: visible;
}
.ibo-extension-details .ibo-toggler--wrapper:has(.ibo-toggler.ibo-is-hidden){
visibility: hidden;
}

View File

@@ -31,20 +31,23 @@ use utils;
class DataFeatureRemovalController extends Controller class DataFeatureRemovalController extends Controller
{ {
private array $aRemovedExtensionsForCheck = []; private array $aRemovedExtensionsForCheck = [];
private ?array $aExtensionsToCheck = null;
private bool $bForcedUninstallation = false;
private array $aCountClassesToCleanup = []; private array $aCountClassesToCleanup = [];
private array $aAnalysisDataTable = []; private array $aAnalysisDataTable = [];
private array $aDeletionExecutionSummary = []; private array $aDeletionExecutionSummary = [];
private int $iCount = 0; private int $iCount = 0;
private int $iColumnCount = 2;
public function OperationMain($sErrorMessage = null): void public function OperationMain($sErrorMessage = null): void
{ {
$aParams = []; $aParams = [];
$this->ReadRemovedExtensions();
$this->AddAnalyzeParams(); $this->AddAnalyzeParams();
$aParams['sTransactionId'] = utils::GetNewTransactionId(); $aParams['sTransactionId'] = utils::GetNewTransactionId();
$aParams['aExtensions'] = $this->GetExtensionsTableToSelect(); $aParams['iColumnCount'] = $this->iColumnCount;
$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetAvailableExtensions(), $this->iColumnCount);
$aParams['aAnalysisDataTable'] = $this->aAnalysisDataTable; $aParams['aAnalysisDataTable'] = $this->aAnalysisDataTable;
$aParams['aClasses'] = array_keys($this->aCountClassesToCleanup); $aParams['aClasses'] = array_keys($this->aCountClassesToCleanup);
$aParams['DataFeatureRemovalErrorMessage'] = $sErrorMessage; $aParams['DataFeatureRemovalErrorMessage'] = $sErrorMessage;
@@ -76,12 +79,11 @@ class DataFeatureRemovalController extends Controller
public function OperationAnalyze(): void public function OperationAnalyze(): void
{ {
$this->ReadRemovedExtensions(); $iCount = $this->ReadExtensionsDiff();
$this->m_sOperation = 'Main'; $this->m_sOperation = 'Main';
try { try {
if (count($this->aRemovedExtensionsForCheck) > 0) { if ($iCount > 0) {
$this->Analyze(); $this->Analyze();
} }
$this->OperationMain(); $this->OperationMain();
@@ -93,7 +95,8 @@ class DataFeatureRemovalController extends Controller
private function Analyze(): void private function Analyze(): void
{ {
$this->Compile($this->aRemovedExtensionsForCheck); //TODO : Run data audit with added extension too, not just removed ones
$this->Compile($this->aExtensionsToCheck['to_be_removed']);
$sSourceEnv = MetaModel::GetEnvironment(); $sSourceEnv = MetaModel::GetEnvironment();
$oSetupAudit = new SetupAudit($sSourceEnv); $oSetupAudit = new SetupAudit($sSourceEnv);
$aGetRemovedClasses = $oSetupAudit->RunDataAudit(); $aGetRemovedClasses = $oSetupAudit->RunDataAudit();
@@ -148,7 +151,8 @@ class DataFeatureRemovalController extends Controller
$aParams['sTransactionId'] = utils::GetNewTransactionId(); $aParams['sTransactionId'] = utils::GetNewTransactionId();
$aParams['aClasses'] = $aGetRemovedClasses; $aParams['aClasses'] = $aGetRemovedClasses;
$aParams['aExtensions'] = $this->GetExtensionsTableDiff($aAddedExtensions, $aRemovedExtensions); $aParams['iColumnCount'] = $this->iColumnCount;
$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions), $this->iColumnCount);
new ContextTag(ContextTag::TAG_SETUP); new ContextTag(ContextTag::TAG_SETUP);
$aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php'; $aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
@@ -261,72 +265,51 @@ class DataFeatureRemovalController extends Controller
$this->OperationAnalysisResult(); $this->OperationAnalysisResult();
} }
private function GetExtensionsTableDiff(array $aAddedExtensions, array $aRemovedExtensions): array private function GetAvailableExtensions(bool $bIncludePackageExtensions = false): array
{ {
$aExtensions = []; $aExtensionsData = [];
$aColumns = ['', 'Name', 'code', 'Badge' ]; if ($bIncludePackageExtensions) {
$aExtensionsRef = DataFeatureRemoverExtensionService::GetInstance()->GetExtensionMap()->GetAllExtensionsWithPreviouslyInstalled();
foreach ($aAddedExtensions as $sAddedExtensionCode => $sAddedExtensionLabel) { } else {
$aExtensions[] = [ $aExtensionsRef = DataFeatureRemoverExtensionService::GetInstance()->ReadItopExtensions();
<<<HTML
<input type="checkbox" disabled class="extension_check" checked/>
HTML,
$sAddedExtensionLabel,
$sAddedExtensionCode,
Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled'),
];
} }
foreach ($aRemovedExtensions as $sAddedExtensionCode => $sAddedExtensionLabel) {
$aExtensions[] = [ foreach ($aExtensionsRef as $oExtension) {
<<<HTML /** @var \iTopExtension $oExtension */
<input type="checkbox" disabled class="extension_check"/> $aExtensionsData[$oExtension->sCode] = [
HTML, 'version' => $oExtension->sVersion,
$sAddedExtensionLabel, 'label' => $oExtension->sLabel,
$sAddedExtensionCode, 'code' => $oExtension->sCode,
Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeUninstalled'), 'description' => $oExtension->sDescription,
'source' => $oExtension->GetExtensionSourceLabel(),
'installed' => $oExtension->bInstalled,
'extra_flags' => [
'uninstallable' => $oExtension->CanBeUninstalled(),
'remote' => $oExtension->IsRemote(),
'missing' => $oExtension->bRemovedFromDisk,
],
]; ];
} }
return $this->GetTableData('Extensions', $aColumns, $aExtensions); return $aExtensionsData;
} }
/** private function GetExtensionsDiff(array $aAddedExtensions, array $aRemovedExtensions): array
* Get installed extensions from disk
*
* @return array structure for twig datatable
*/
private function GetExtensionsTableToSelect(): array
{ {
$aExtensions = []; $aExtensions = [];
$aColumns = ['', 'Version', 'Name', 'Code']; foreach ($this->GetAvailableExtensions(true) as $sCode => $aExtension) {
$aExtension['extra_flags']['disabled'] = true;
foreach (DataFeatureRemoverExtensionService::GetInstance()->ReadItopExtensions() as $sCode => $oExtension) { if (isset($aAddedExtensions[$sCode])) {
/** @var \iTopExtension $oExtension */ $aExtension['extra_flags']['selected'] = true;
$aExtensions[$sCode] = $aExtension;
$sChecked = ''; } elseif (isset($aRemovedExtensions[$sCode])) {
$sDisabledHtml = ''; $aExtension['extra_flags']['selected'] = false;
if ($oExtension->bRemovedFromDisk) { $aExtensions[$sCode] = $aExtension;
$sDisabledHtml = 'disabled=""';
$sChecked = 'checked';
} elseif (in_array($sCode, $this->aRemovedExtensionsForCheck)) {
$sChecked = 'checked';
} }
$sLabel = $oExtension->sLabel;
$sVersion = $oExtension->sVersion;
$sIdEnable = "aExtensions[$sCode][enable]";
$aExtensions[] = [
<<<HTML
<input type="checkbox" $sDisabledHtml class="extension_check" $sChecked id="$sIdEnable" name="$sIdEnable"/>
HTML,
$sVersion,
$sLabel,
$sCode,
];
} }
return $this->GetTableData('Extensions', $aColumns, $aExtensions); return $aExtensions;
} }
private function GetTableData(string $sTableName, array $aColumns, array $aData): array private function GetTableData(string $sTableName, array $aColumns, array $aData): array
@@ -370,27 +353,56 @@ HTML,
} }
/** /**
* @return void * Read extensions selected from posted parameters
* @return int Number of extensions to be added or removed
*/ */
public function ReadRemovedExtensions(): void public function ReadExtensionsDiff(): int
{ {
if (count($this->aRemovedExtensionsForCheck) > 0) { if (!is_null($this->aExtensionsToCheck)) {
return; return count($this->aExtensionsToCheck['to_be_installed']) + count($this->aExtensionsToCheck['to_be_removed']);
} }
$aSelectedExtensionsFromUI = utils::ReadPostedParam('aExtensions', []); $aAvailableExtensions = $this->GetAvailableExtensions();
foreach ($aSelectedExtensionsFromUI as $sCode => $aData) { $aSelectedExtensionsFromUI = utils::ReadPostedParam('aSelectedExtensions', []);
$sValue = $aData['enable'] ?? 'off'; $this->aExtensionsToCheck = [
if (($sValue) === 'on') { 'to_be_installed' => [],
$this->aRemovedExtensionsForCheck[] = $sCode; 'to_be_removed' => [],
];
foreach ($aAvailableExtensions as $sCode => &$aExtensionData) {
if (!isset($aSelectedExtensionsFromUI[$sCode])) {
continue;
} }
}
// Add source removed to check if ($aExtensionData['installed'] && $aSelectedExtensionsFromUI[$sCode] !== 'on') {
foreach (DataFeatureRemoverExtensionService::GetInstance()->ReadItopExtensions() as $sCode => $oExtension) { $aExtensionData['extra_flags']['selected'] = false;
if ($oExtension->bRemovedFromDisk) { $this->aExtensionsToCheck['to_be_removed'][] = $sCode;
$this->aRemovedExtensionsForCheck[] = $sCode; if (!$aExtensionData['extra_flags']['uninstallable'] || $aExtensionData['extra_flags']['remote']) {
$this->bForcedUninstallation = true;
}
} elseif (!$aExtensionData['installed'] && $aSelectedExtensionsFromUI[$sCode] === 'on') {
$aExtensionData['extra_flags']['selected'] = true;
$this->aExtensionsToCheck['to_be_installed'][] = $sCode;
} }
} }
return count($this->aExtensionsToCheck['to_be_installed']) + count($this->aExtensionsToCheck['to_be_removed']);
}
/**
* Divide an array into several sub arrays, distributing elements so that every sub array has an equal amount of elements
* @param mixed[] $aInput
* @param int $iColNumber
*
* @return array[]
*/
private function SplitArrayIntoColumns(array $aInput, int $iColNumber)
{
$aOutput = array_fill(0, $iColNumber, []);
$iIndex = 0;
foreach ($aInput as $mItem) {
//Split extensions in $iColNumber columns
$aOutput[$iIndex % $this->iColumnCount][] = $mItem;
$iIndex++;
}
return $aOutput;
} }
} }

View File

@@ -14,7 +14,7 @@ use MetaModel;
class DataFeatureRemoverExtensionService class DataFeatureRemoverExtensionService
{ {
private static DataFeatureRemoverExtensionService $oInstance; private static DataFeatureRemoverExtensionService $oInstance;
private ?iTopExtensionsMap $oMap = null;
private array $aItopExtensions = []; private array $aItopExtensions = [];
private array $aIncludingExtensionsByModuleName = []; private array $aIncludingExtensionsByModuleName = [];
@@ -60,15 +60,25 @@ class DataFeatureRemoverExtensionService
return $this->aIncludingExtensionsByModuleName[$sModuleName] ?? []; return $this->aIncludingExtensionsByModuleName[$sModuleName] ?? [];
} }
/**
* @return \iTopExtensionsMap
*/
public function GetExtensionMap(): iTopExtensionsMap
{
if (is_null($this->oMap)) {
$this->oMap = new iTopExtensionsMap();
$this->oMap->LoadInstalledExtensionsFromDatabase(MetaModel::GetConfig());
}
return $this->oMap;
}
/** /**
* @return iTopExtension[] * @return iTopExtension[]
*/ */
public function ReadItopExtensions(): array public function ReadItopExtensions(): array
{ {
if (count($this->aItopExtensions) === 0) { if (count($this->aItopExtensions) === 0) {
$oExtensionsMap = new iTopExtensionsMap(); $this->aItopExtensions = $this->GetExtensionMap()->GetAllExtensionsToDisplayInSetup(true);
$oExtensionsMap->LoadInstalledExtensionsFromDatabase(MetaModel::GetConfig());
$this->aItopExtensions = $oExtensionsMap->GetAllExtensionsToDisplayInSetup(true);
uasort($this->aItopExtensions, function (iTopExtension $oiTopExtension1, iTopExtension $oiTopExtension2) { uasort($this->aItopExtensions, function (iTopExtension $oiTopExtension1, iTopExtension $oiTopExtension2) {
return strcmp($oiTopExtension1->sLabel, $oiTopExtension2->sLabel); return strcmp($oiTopExtension1->sLabel, $oiTopExtension2->sLabel);

View File

@@ -4,10 +4,21 @@
{% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s} %} {% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s} %}
{% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
{% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Features:Title'|dict_s} %} {% UIMultiColumn Standard {} %}
{% UIDataTable ForForm { sRef:'aExtensions', aColumns:aExtensions.Columns, aData:aExtensions.Data} %}{% EndUIDataTable %} {% for iColumnIndex in 0..iColumnCount-1 %}
{% EndUIFieldSet %} {% 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 bDeletionNeeded %} {% if bDeletionNeeded %}
{% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %} {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %}

View File

@@ -6,9 +6,21 @@
{% UIInput ForHidden {sName:'operation', sValue:'Analyze'} %} {% UIInput ForHidden {sName:'operation', sValue:'Analyze'} %}
{% UIInput ForHidden {sName:'transaction_id', sValue:sTransactionId} %} {% UIInput ForHidden {sName:'transaction_id', sValue:sTransactionId} %}
{% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Features:Title'|dict_s} %} {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
{% UIDataTable ForForm { sRef:'aExtensions', aColumns:aExtensions.Columns, aData:aExtensions.Data} %}{% EndUIDataTable %} {% UIMultiColumn Standard {} %}
{% EndUIFieldSet %} {% 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 %}
{% UIToolbar ForButton {} %} {% UIToolbar ForButton {} %}
{% UIButton ForPrimaryAction {sLabel:'UI:Button:Analyze'|dict_s, sName:'btn_apply', sId:'btn_apply', bIsSubmit:true} %} {% UIButton ForPrimaryAction {sLabel:'UI:Button:Analyze'|dict_s, sName:'btn_apply', sId:'btn_apply', bIsSubmit:true} %}

View File

@@ -20,4 +20,5 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -18,4 +18,5 @@ Dict::Add('EN US', 'English', 'English', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('FR FR', 'French', 'Français', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'À propos de %1$s', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'À propos de %1$s',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'Plus d\'informations', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'Plus d\'informations',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Forcer la désinstallation', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Forcer la désinstallation',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Plus d\'actions',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -20,4 +20,5 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~', 'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~', 'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~', 'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
'UI:Layout:ExtensionsDetails:MoreActions' => 'Show more actions~~',
]); ]);

View File

@@ -486,7 +486,7 @@ class iTopExtensionsMap
'default' => true, // by default offer to install all modules 'default' => true, // by default offer to install all modules
'modules' => $oExtension->aModules, 'modules' => $oExtension->aModules,
'mandatory' => $oExtension->bMandatory, 'mandatory' => $oExtension->bMandatory,
'source_label' => $this->GetExtensionSourceLabel($oExtension->sSource), 'source_label' => $oExtension->GetExtensionSourceLabel(),
'uninstallable' => $oExtension->CanBeUninstalled(), 'uninstallable' => $oExtension->CanBeUninstalled(),
'missing' => $oExtension->bRemovedFromDisk, 'missing' => $oExtension->bRemovedFromDisk,
'version' => $oExtension->sVersion, 'version' => $oExtension->sVersion,
@@ -496,22 +496,6 @@ class iTopExtensionsMap
return $aRes; return $aRes;
} }
protected function GetExtensionSourceLabel($sSource)
{
$sResult = '';
switch ($sSource) {
case iTopExtension::SOURCE_MANUAL:
$sResult = 'Local extensions folder';
break;
case iTopExtension::SOURCE_REMOTE:
$sResult = (ITOP_APPLICATION == 'iTop') ? 'iTop Hub' : 'ITSM Designer';
break;
}
return $sResult;
}
/** /**
* Mark the given extension as chosen * Mark the given extension as chosen
* @param string $sExtensionCode The code of the extension (code without version number) * @param string $sExtensionCode The code of the extension (code without version number)

View File

@@ -8,7 +8,7 @@ use SetupUtils;
class DryRemovalRuntimeEnvironment extends RunTimeEnvironment class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
{ {
protected array $aExtensionsByCode; protected array $aExtensionsToRemoveByCode;
/** /**
* Toolset for building a run-time environment * Toolset for building a run-time environment
@@ -18,7 +18,7 @@ class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
public function __construct($sSourceEnv = 'production', array $aExtensionCodesToRemove = []) public function __construct($sSourceEnv = 'production', array $aExtensionCodesToRemove = [])
{ {
parent::__construct($sSourceEnv, false); parent::__construct($sSourceEnv, false);
$this->aExtensionsByCode = $aExtensionCodesToRemove; $this->aExtensionsToRemoveByCode = $aExtensionCodesToRemove;
$this->Prepare($sSourceEnv, $this->sBuildEnv); $this->Prepare($sSourceEnv, $this->sBuildEnv);
} }
@@ -34,7 +34,7 @@ class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
SetupUtils::copydir(APPROOT."/data/$sSourceEnv-modules", APPROOT."/data/$sBuildEnv-modules"); SetupUtils::copydir(APPROOT."/data/$sSourceEnv-modules", APPROOT."/data/$sBuildEnv-modules");
SetupUtils::copydir(APPROOT."/conf/$sSourceEnv", APPROOT."/conf/$sBuildEnv"); SetupUtils::copydir(APPROOT."/conf/$sSourceEnv", APPROOT."/conf/$sBuildEnv");
$this->DeclareExtensionAsRemoved($this->aExtensionsByCode); $this->DeclareExtensionAsRemoved($this->aExtensionsToRemoveByCode);
} }
private function DeclareExtensionAsRemoved(array $aExtensionCodes): void private function DeclareExtensionAsRemoved(array $aExtensionCodes): void

View File

@@ -169,4 +169,18 @@ class iTopExtension
return json_encode($this->__serialize(), JSON_PRETTY_PRINT); return json_encode($this->__serialize(), JSON_PRETTY_PRINT);
} }
public function GetExtensionSourceLabel(): string
{
return match ($this->sSource) {
self::SOURCE_MANUAL => 'Local extensions folder',
self::SOURCE_REMOTE => (ITOP_APPLICATION == 'iTop') ? 'iTop Hub' : 'ITSM Designer',
self::SOURCE_WIZARD => 'iTop package',
default => '',
};
}
public function IsRemote(): string
{
return $this->sSource === self::SOURCE_REMOTE;
}
} }

View File

@@ -33,7 +33,7 @@ class ExtensionDetails extends UIContentBlock
$this->sCode = $sCode; $this->sCode = $sCode;
$this->sLabel = $sLabel; $this->sLabel = $sLabel;
$this->sDescription = $sDescription; $this->sDescription = $sDescription;
$this->aMetaData = $aMetaData; $this->aMetaData = array_filter($aMetaData);
$this->aBadges = $aBadges; $this->aBadges = $aBadges;
$this->sAbout = $sAbout; $this->sAbout = $sAbout;
$this->InitializeToggler(); $this->InitializeToggler();
@@ -105,7 +105,7 @@ class ExtensionDetails extends UIContentBlock
*/ */
public function SetMetaData(array $aMetaData): static public function SetMetaData(array $aMetaData): static
{ {
$this->aMetaData = $aMetaData; $this->aMetaData = array_filter($aMetaData);
return $this; return $this;
} }
@@ -179,32 +179,37 @@ class ExtensionDetails extends UIContentBlock
protected function InitializeToggler() protected function InitializeToggler()
{ {
$sName = 'aSelectedExtensions['.$this->GetCode().']';
$this->oToggler = new Toggler(); $this->oToggler = new Toggler();
$this->oToggler->SetName('ExtensionToggler'); $this->oToggler->SetName($sName);
$this->oToggler->AddCSSClass('toggler-install'); $this->oToggler->AddCSSClass('toggler-install');
} }
protected function InitializePopoverMenu() protected function InitializePopoverMenu()
{ {
$sModalLabel = Dict::Format('UI:Layout:ExtensionsDetails:MenuAboutTitle', $this->sLabel); $this->oPopoverMenu = new PopoverMenu();
$sModalText = $this->sAbout; $oPopoverOpenButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', Dict::S('UI:Layout:ExtensionsDetails:MoreActions'));
$oModifyButton = new JSButtonItem( $this->oPopoverMenu->SetTogglerFromBlock($oPopoverOpenButton);
'extension_details', $this->oMoreActions = new UIContentBlock();
Dict::S('UI:Layout:ExtensionsDetails:MenuAbout'), $this->oMoreActions->AddSubBlock($this->oPopoverMenu);
<<<JS $this->oMoreActions->AddSubBlock($oPopoverOpenButton);
if (mb_strlen($this->sAbout) > 0) {
$sModalLabel = Dict::Format('UI:Layout:ExtensionsDetails:MenuAboutTitle', $this->sLabel);
$sModalText = $this->sAbout;
$oModifyButton = new JSButtonItem(
'extension_details',
Dict::S('UI:Layout:ExtensionsDetails:MenuAbout'),
<<<JS
CombodoModal.OpenModal({ CombodoModal.OpenModal({
title: '$sModalLabel', title: '$sModalLabel',
content: '$sModalText', content: '$sModalText',
}); });
JS, JS,
); );
$this->oPopoverMenu = new PopoverMenu(); $this->oPopoverMenu->AddItem('more-details', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItem($oModifyButton));
$this->oPopoverMenu->AddItem('more-actions', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItem($oModifyButton)); }
$oPopoverOpenButton = ButtonUIBlockFactory::MakeIconAction('fas fa-ellipsis-v', 'Show more actions');
$this->oPopoverMenu->SetTogglerFromBlock($oPopoverOpenButton);
$this->oMoreActions = new UIContentBlock();
$this->oMoreActions->AddSubBlock($this->oPopoverMenu);
$this->oMoreActions->AddSubBlock($oPopoverOpenButton);
} }
public function AllowForceUninstall() public function AllowForceUninstall()
@@ -213,10 +218,11 @@ JS,
'force_uninstall', 'force_uninstall',
Dict::S('UI:Layout:ExtensionsDetails:MenuForce'), Dict::S('UI:Layout:ExtensionsDetails:MenuForce'),
<<<JS <<<JS
this.closest('.ibo-extension-details').querySelector('input[type=checkbox]').disabled = false this.closest('.ibo-extension-details').querySelector('input[type=checkbox]').disabled = false;
this.remove();
JS, JS,
); );
$this->oPopoverMenu->AddItem('more-actions', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItem($oForceUninstallButton)); $this->oPopoverMenu->AddItem('force-uninstall', PopoverMenuItemFactory::MakeFromApplicationPopupMenuItem($oForceUninstallButton));
} }
} }

View File

@@ -18,6 +18,9 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
$aBadges = []; $aBadges = [];
$bUninstallable = $aExtraFlags['uninstallable'] ?? true; $bUninstallable = $aExtraFlags['uninstallable'] ?? true;
$bMissingFromDisk = $aExtraFlags['missing'] ?? false; $bMissingFromDisk = $aExtraFlags['missing'] ?? false;
$bSelected = $aExtraFlags['selected'] ?? true;
$bDisabled = $aExtraFlags['disabled'] ?? false;
$bRemote = $aExtraFlags['remote'] ?? false;
self::AddExtraBadges($aBadges, $bUninstallable, $bMissingFromDisk); self::AddExtraBadges($aBadges, $bUninstallable, $bMissingFromDisk);
$oBadgeInstalled = BadgeUIBlockFactory::MakeGreen(Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled')); $oBadgeInstalled = BadgeUIBlockFactory::MakeGreen(Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled'));
$oBadgeInstalled->AddCSSClass('checked'); $oBadgeInstalled->AddCSSClass('checked');
@@ -28,10 +31,22 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
$oExtensionDetails = new ExtensionDetails($sCode, $sLabel, $sDescription, $aMetaData, $aBadges, $sAbout); $oExtensionDetails = new ExtensionDetails($sCode, $sLabel, $sDescription, $aMetaData, $aBadges, $sAbout);
$oExtensionDetails->GetToggler()->SetIsToggled(true); $oExtensionDetails->GetToggler()->SetIsToggled(true);
if (!$bUninstallable) { if ($bMissingFromDisk) {
$oExtensionDetails->GetToggler()->SetIsToggled(false);
$oExtensionDetails->GetToggler()->SetIsDisabled(true);
} elseif (!$bUninstallable || $bRemote) {
$oExtensionDetails->AllowForceUninstall(); $oExtensionDetails->AllowForceUninstall();
$oExtensionDetails->GetToggler()->SetIsDisabled(true); $oExtensionDetails->GetToggler()->SetIsDisabled(true);
} }
if (!$bSelected) {
$oExtensionDetails->GetToggler()->SetIsToggled(false);
}
if ($bDisabled) {
$oExtensionDetails->GetToggler()->SetIsDisabled(true);
$oExtensionDetails->GetToggler()->AddCSSClass('ibo-is-hidden');
}
return $oExtensionDetails; return $oExtensionDetails;
} }
@@ -39,6 +54,8 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
{ {
$aBadges = []; $aBadges = [];
$bUninstallable = $aExtraFlags['uninstallable'] ?? true; $bUninstallable = $aExtraFlags['uninstallable'] ?? true;
$bSelected = $aExtraFlags['selected'] ?? false;
$bDisabled = $aExtraFlags['disabled'] ?? false;
self::AddExtraBadges($aBadges, $bUninstallable, false); self::AddExtraBadges($aBadges, $bUninstallable, false);
$oBadgeInstalled = BadgeUIBlockFactory::MakeGrey(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled')); $oBadgeInstalled = BadgeUIBlockFactory::MakeGrey(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled'));
$oBadgeInstalled->AddCSSClass('unchecked'); $oBadgeInstalled->AddCSSClass('unchecked');
@@ -46,8 +63,17 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
$oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled')); $oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled'));
$oBadgeToBeUninstalled->AddCSSClass('checked'); $oBadgeToBeUninstalled->AddCSSClass('checked');
$aBadges[] = $oBadgeToBeUninstalled; $aBadges[] = $oBadgeToBeUninstalled;
$oExtensionDetails = new ExtensionDetails($sCode, $sLabel, $sDescription, $aMetaData, $aBadges, $sAbout);
return new ExtensionDetails($sCode, $sLabel, $sDescription, $aMetaData, $aBadges, $sAbout); if ($bSelected) {
$oExtensionDetails->GetToggler()->SetIsToggled(true);
}
if ($bDisabled) {
$oExtensionDetails->GetToggler()->SetIsDisabled(true);
$oExtensionDetails->GetToggler()->AddCSSClass('ibo-is-hidden');
}
return $oExtensionDetails;
} }
private static function AddExtraBadges(array &$aBadges, bool $bUninstallable, bool $bMissingFromDisk) private static function AddExtraBadges(array &$aBadges, bool $bUninstallable, bool $bMissingFromDisk)

View File

@@ -1,7 +1,8 @@
{% extends "base/components/input/layout.html.twig" %} {% extends "base/components/input/layout.html.twig" %}
{% block iboInput %} {% block iboInput %}
<span class="ibo-toggler--wrapper"> <span class="ibo-toggler--wrapper">
{{ parent() }} {{ parent() }}
<span class="ibo-toggler--slider"></span> <span class="ibo-toggler--slider"></span>
<input class="ibo-toggler--hidden" type="hidden" name="{{ oUIBlock.GetName() }}" value="{% if oUIBlock.IsChecked() %}on{% else %}off{% endif %}"/>
</span> </span>
{% endblock %} {% endblock %}

View File

@@ -1,8 +1,10 @@
$('#{{ oUIBlock.GetId() }}').parent().on('click', function() { $('#{{ oUIBlock.GetId() }}').parent().on('click', function() {
let oInput = $(this).find('.ibo-toggler'); let oInput = $(this).find('.ibo-toggler');
let oHiddenInput = $(this).find('.ibo-toggler--hidden');
if (!oInput.prop('disabled')) { if (!oInput.prop('disabled')) {
oInput.prop('checked', !oInput.prop('checked')); oInput.prop('checked', !oInput.prop('checked'));
oHiddenInput.val(oInput.prop('checked') ? 'on' : 'off');
oInput.trigger('change'); oInput.trigger('change');
} }
}); });

View File

@@ -639,6 +639,9 @@ $oPage->AddUiBlock($oMultiCol);
$oExtensionDetailInstalledFromFactory = ExtensionDetailsUIBlockFactory::MakeInstalled('itop-sample', 'My extension v2', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false,'missing' => true]); $oExtensionDetailInstalledFromFactory = ExtensionDetailsUIBlockFactory::MakeInstalled('itop-sample', 'My extension v2', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false,'missing' => true]);
$oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory); $oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory);
$oExtensionDetailInstalledFromFactory = ExtensionDetailsUIBlockFactory::MakeInstalled('itop-not-uninstallable', 'You cannot uninstall me', 'Click force uninstall to uninstall me', ['v9.9.9', 'Void', '12/12/2012'], ['uninstallable' => false,'missing' => false]);
$oColumnLeft->AddSubBlock($oExtensionDetailInstalledFromFactory);
$oExtensionDetailInstalledWithLongTitle = ExtensionDetailsUIBlockFactory::MakeNotInstalled('itop-sample', 'My extension with a very long title', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false]); $oExtensionDetailInstalledWithLongTitle = ExtensionDetailsUIBlockFactory::MakeNotInstalled('itop-sample', 'My extension with a very long title', 'This is for test only', ['v1.1.1', 'Designer', '12/12/2012'], ['uninstallable' => false]);
$oColumnRight->AddSubBlock($oExtensionDetailInstalledWithLongTitle); $oColumnRight->AddSubBlock($oExtensionDetailInstalledWithLongTitle);
$oPage->add('<hr id="page_bottom"/>'); $oPage->add('<hr id="page_bottom"/>');