N°3581 - Dashlet: Remove coupling with DashletText in DashletHeaderStatic

This commit is contained in:
Molkobain
2021-03-18 16:26:47 +01:00
parent 912f6bb376
commit a28c9c896d
3 changed files with 28 additions and 37 deletions

View File

@@ -8,19 +8,24 @@
namespace Combodo\iTop\Application\UI\Base\Component\Dashlet;
/**
* Class DashletFactory
*
* @author Eric Espie <eric.espie@combodo.com>
* @package Combodo\iTop\Application\UI\Base\Component\Dashlet
* @since 3.0.0
* @internal
*/
class DashletFactory
{
public static function MakeForDashletBadge(
string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, ?string $sCreateActionUrl = '',
?string $sCreateActionLabel = '', array $aRefreshParams = []
)
public static function MakeForDashletBadge(string $sClassIconUrl, string $sHyperlink, string $iCount, string $sClassLabel, ?string $sCreateActionUrl = '', ?string $sCreateActionLabel = '', array $aRefreshParams = []): DashletBadge
{
return new DashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl, $sCreateActionLabel, $aRefreshParams);
}
public static function MakeForDashletHeaderStatic(string $sTitle, string $sIconUrl)
public static function MakeForDashletHeaderStatic(string $sTitle, string $sIconUrl, string $sId = null): DashletHeaderStatic
{
return new DashletHeaderStatic(null, $sTitle, $sIconUrl);
return new DashletHeaderStatic($sTitle, $sIconUrl, $sId);
}
public static function MakeForDashletPlainText(string $sText, string $sId = null): DashletPlainText

View File

@@ -8,8 +8,17 @@
namespace Combodo\iTop\Application\UI\Base\Component\Dashlet;
/**
* Class DashletHeaderStatic
*
* @internal
* @author Eric Espie <eric.espie@combodo.com>
* @since 3.0.0
* @package Combodo\iTop\Application\UI\Base\Component\Dashlet
*/
class DashletHeaderStatic extends DashletContainer
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-dashlet-header-static';
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashlet-header-static';
@@ -17,23 +26,20 @@ class DashletHeaderStatic extends DashletContainer
protected $sTitle;
/** @var string */
protected $sIconUrl;
/** @var string */
protected $sText;
/**
* DashletHeaderStatic constructor.
*
* @param string $sTitle
* @param string $sIconUrl
* @param string $sText
* @param string|null $sId
*/
public function __construct(string $sId = null, string $sTitle, string $sIconUrl, string $sText = '')
public function __construct(string $sTitle, string $sIconUrl, string $sId = null)
{
parent::__construct($sId);
$this->sTitle = $sTitle;
$this->sIconUrl = $sIconUrl;
$this->sText = $sText;
}
@@ -48,11 +54,12 @@ class DashletHeaderStatic extends DashletContainer
/**
* @param string $sTitle
*
* @return DashletHeaderStatic
* @return $this
*/
public function SetTitle(string $sTitle): DashletHeaderStatic
public function SetTitle(string $sTitle)
{
$this->sTitle = $sTitle;
return $this;
}
@@ -67,32 +74,12 @@ class DashletHeaderStatic extends DashletContainer
/**
* @param string $sIconUrl
*
* @return DashletHeaderStatic
* @return $this
*/
public function SetIconUrl(string $sIconUrl): DashletHeaderStatic
public function SetIconUrl(string $sIconUrl)
{
$this->sIconUrl = $sIconUrl;
return $this;
}
/**
* @return string
*/
public function GetText(): string
{
return $this->sText;
}
/**
* @param string $sText
*
* @return DashletHeaderStatic
*/
public function SetText(string $sText): DashletHeaderStatic
{
$this->sText = $sText;
return $this;
}
}

View File

@@ -11,7 +11,6 @@
{% if oUIBlock.GetTitle() is not empty %}
<div class="ibo-dashlet-header-static--title">{{ oUIBlock.GetTitle() }}</div>
{% endif %}
<div class="ibo-dashlet-header-static--text">{{ oUIBlock.GetText() }}</div>
</div>
</div>
{% endapply %}