Skip to content

fix(dashboard): merge cards and widget instead of redefine #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btry merged 2 commits into from
Jun 11, 2026
Merged

fix(dashboard): merge cards and widget instead of redefine #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98d0702
fix(dashboard): merge cards and widget instead of redefine
flegastelois Jun 11, 2026
882c7f0
fix: tests
flegastelois Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Dashboard/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@

class Grid
{
public static function getDashboardCards(): array
public static function getDashboardCards(?array $cards = null): array
{
$cards = [];
$cards ??= [];
// Declare the following cards only if we show / edit the quick report page of the plugin
$in_carbon_report_page = self::in_carbon_report_page();

Expand Down
6 changes: 3 additions & 3 deletions src/Dashboard/Widget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@

class Widget extends GlpiDashboardWidget
{
public static function WidgetTypes(): array
public static function WidgetTypes(?array $types = null): array
{
$types = [
$types = array_merge($types ?? [], [
// Informative
'information_video' => [
'label' => __('Environmental impact information video', 'carbon'),
Expand Down Expand Up @@ -111,7 +111,7 @@ public static function WidgetTypes(): array
'width' => 6,
'height' => 3,
],
];
]);

// Data diagnostic
if (in_array(Computer::class, PLUGIN_CARBON_TYPES)) {
Expand Down