Skip to content

Commit f4c516a

Browse files
committed
Merge branch 'main' into boost
* main: Bump dependencies Add option to show metrics even when empty (#297) Compile Assets
2 parents 4a7ea1d + 4483d7e commit f4c516a

File tree

11 files changed

+32
-7
lines changed

11 files changed

+32
-7
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"laravel/boost": "^1.0",
4747
"laravel/pail": "^1.1",
4848
"laravel/pint": "^1.24",
49-
"orchestra/testbench": "^9.5.1",
50-
"pestphp/pest": "^3.2",
49+
"orchestra/testbench": "^9.15.1",
50+
"pestphp/pest": "^3.8",
5151
"pestphp/pest-plugin-laravel": "^3.0",
5252
"pestphp/pest-plugin-livewire": "*",
5353
"pestphp/pest-plugin-type-coverage": "^3.3"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
return new class extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*/
12+
public function up(): void
13+
{
14+
Schema::table('metrics', function (Blueprint $table) {
15+
$table->boolean('show_when_empty')->after('display_chart')->default(false);
16+
});
17+
}
18+
};

public/build/assets/cachet-Bq8tafKV.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/cachet-fbpknUM6.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/assets/theme-B5_m998E.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/assets/theme-bq3BwRTn.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"resources/css/cachet.css": {
3-
"file": "assets/cachet-fbpknUM6.css",
3+
"file": "assets/cachet-Bq8tafKV.css",
44
"src": "resources/css/cachet.css",
55
"isEntry": true
66
},
77
"resources/css/dashboard/theme.css": {
8-
"file": "assets/theme-B5_m998E.css",
8+
"file": "assets/theme-bq3BwRTn.css",
99
"src": "resources/css/dashboard/theme.css",
1010
"isEntry": true
1111
},

resources/lang/en/metric.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
'visible_label' => 'Visible',
3737
'display_chart_label' => 'Display Chart',
38+
'show_when_empty_label' => 'Show when empty',
3839
],
3940
'overview' => [
4041
'metric_points_label' => 'Metric Points',

src/Filament/Resources/Metrics/MetricResource.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ public static function form(Schema $schema): Schema
9191
->label(__('cachet::metric.form.display_chart_label'))
9292
->default(true)
9393
->required(),
94+
Toggle::make('show_when_empty')
95+
->label(__('cachet::metric.form.show_when_empty_label'))
96+
->default(true)
97+
->required(),
9498

9599
])->columnSpan(1),
96100
])->columns(4);

src/Models/Metric.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class Metric extends Model
4848
protected $casts = [
4949
'calc_type' => MetricTypeEnum::class,
5050
'display_chart' => 'bool',
51+
'show_when_empty' => 'bool',
5152
'places' => 'int',
5253
'default_view' => MetricViewEnum::class,
5354
'visible' => ResourceVisibilityEnum::class,
@@ -68,6 +69,7 @@ class Metric extends Model
6869
'description',
6970
'calc_type',
7071
'display_chart',
72+
'show_when_empty',
7173
'places',
7274
'default_value',
7375
'default_view',

0 commit comments

Comments
 (0)