From 59e956a2f484ff04bf795595c9e4830f0eb674d7 Mon Sep 17 00:00:00 2001 From: Ash Monsh Date: Fri, 8 Mar 2024 21:59:59 +0300 Subject: [PATCH 1/4] add support for state formatting --- composer.lock | 90 ++++++++++++++++++------------------ src/Tables/PopoverColumn.php | 2 + 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index 2ab86a9..28fa6ac 100644 --- a/composer.lock +++ b/composer.lock @@ -8,28 +8,28 @@ "packages": [ { "name": "anourvalar/eloquent-serialize", - "version": "1.2.19", + "version": "1.2.20", "source": { "type": "git", "url": "https://github.com/AnourValar/eloquent-serialize.git", - "reference": "7ab1be9b9d9a2369643b5e58796cd43717b9b5c3" + "reference": "f8408e92768ff295990e3a1edb7e47950e008c63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/7ab1be9b9d9a2369643b5e58796cd43717b9b5c3", - "reference": "7ab1be9b9d9a2369643b5e58796cd43717b9b5c3", + "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/f8408e92768ff295990e3a1edb7e47950e008c63", + "reference": "f8408e92768ff295990e3a1edb7e47950e008c63", "shasum": "" }, "require": { - "laravel/framework": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "laravel/framework": "^8.0|^9.0|^10.0|^11.0", "php": "^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.26", "laravel/legacy-factories": "^1.1", - "orchestra/testbench": "~3.6.0|~3.7.0|~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", + "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^9.5|^10.5", "psalm/plugin-laravel": "^2.8", "squizlabs/php_codesniffer": "^3.7" }, @@ -68,9 +68,9 @@ ], "support": { "issues": "https://github.com/AnourValar/eloquent-serialize/issues", - "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.19" + "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.20" }, - "time": "2024-03-03T05:05:13+00:00" + "time": "2024-03-08T14:48:54+00:00" }, { "name": "blade-ui-kit/blade-heroicons", @@ -1168,16 +1168,16 @@ }, { "name": "filament/actions", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/actions.git", - "reference": "3a859410aaf76fb5bf1c549da9cca2ac652f26f5" + "reference": "bfc139b1be968f89eeb3dc39b01c244e960d2cd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/actions/zipball/3a859410aaf76fb5bf1c549da9cca2ac652f26f5", - "reference": "3a859410aaf76fb5bf1c549da9cca2ac652f26f5", + "url": "https://api.github.com/repos/filamentphp/actions/zipball/bfc139b1be968f89eeb3dc39b01c244e960d2cd4", + "reference": "bfc139b1be968f89eeb3dc39b01c244e960d2cd4", "shasum": "" }, "require": { @@ -1217,20 +1217,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-03-07T13:17:38+00:00" + "time": "2024-03-08T12:54:20+00:00" }, { "name": "filament/filament", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/panels.git", - "reference": "8fd6884b47810d82e26300caf13cd7e28957d44f" + "reference": "49eecdab45610b42877e8e4af4e3f6b409be599a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/panels/zipball/8fd6884b47810d82e26300caf13cd7e28957d44f", - "reference": "8fd6884b47810d82e26300caf13cd7e28957d44f", + "url": "https://api.github.com/repos/filamentphp/panels/zipball/49eecdab45610b42877e8e4af4e3f6b409be599a", + "reference": "49eecdab45610b42877e8e4af4e3f6b409be599a", "shasum": "" }, "require": { @@ -1282,11 +1282,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-03-07T13:17:55+00:00" + "time": "2024-03-08T12:54:21+00:00" }, { "name": "filament/forms", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", @@ -1342,7 +1342,7 @@ }, { "name": "filament/infolists", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/infolists.git", @@ -1393,7 +1393,7 @@ }, { "name": "filament/notifications", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", @@ -1445,16 +1445,16 @@ }, { "name": "filament/support", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "f60a06fc11ce0520bf8296c350fa6e3ba2556632" + "reference": "811a57072a6e8677e42d1b745291def5f26a8d62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/f60a06fc11ce0520bf8296c350fa6e3ba2556632", - "reference": "f60a06fc11ce0520bf8296c350fa6e3ba2556632", + "url": "https://api.github.com/repos/filamentphp/support/zipball/811a57072a6e8677e42d1b745291def5f26a8d62", + "reference": "811a57072a6e8677e42d1b745291def5f26a8d62", "shasum": "" }, "require": { @@ -1498,20 +1498,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-03-07T13:18:04+00:00" + "time": "2024-03-08T12:54:38+00:00" }, { "name": "filament/tables", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "2c2587a71b0e3fe3c5c0fae9dc9f70e74005b1c9" + "reference": "21a53af2fdfbed6ded3bf659eeb0dfbcd8addf90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/2c2587a71b0e3fe3c5c0fae9dc9f70e74005b1c9", - "reference": "2c2587a71b0e3fe3c5c0fae9dc9f70e74005b1c9", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/21a53af2fdfbed6ded3bf659eeb0dfbcd8addf90", + "reference": "21a53af2fdfbed6ded3bf659eeb0dfbcd8addf90", "shasum": "" }, "require": { @@ -1551,11 +1551,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-03-07T13:18:08+00:00" + "time": "2024-03-08T12:54:38+00:00" }, { "name": "filament/widgets", - "version": "v3.2.45", + "version": "v3.2.46", "source": { "type": "git", "url": "https://github.com/filamentphp/widgets.git", @@ -2860,16 +2860,16 @@ }, { "name": "livewire/livewire", - "version": "v3.4.7", + "version": "v3.4.8", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "05f25dab062cd6a1ec24d8df9e889f890c832cb0" + "reference": "0335b8f022ac535fc3cf29fd8a8fcb275353a470" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/05f25dab062cd6a1ec24d8df9e889f890c832cb0", - "reference": "05f25dab062cd6a1ec24d8df9e889f890c832cb0", + "url": "https://api.github.com/repos/livewire/livewire/zipball/0335b8f022ac535fc3cf29fd8a8fcb275353a470", + "reference": "0335b8f022ac535fc3cf29fd8a8fcb275353a470", "shasum": "" }, "require": { @@ -2923,7 +2923,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.4.7" + "source": "https://github.com/livewire/livewire/tree/v3.4.8" }, "funding": [ { @@ -2931,7 +2931,7 @@ "type": "github" } ], - "time": "2024-03-05T15:54:03+00:00" + "time": "2024-03-08T13:01:50+00:00" }, { "name": "masterminds/html5", @@ -7093,16 +7093,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", "shasum": "" }, "require": { @@ -7144,7 +7144,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.2" }, "funding": [ { @@ -7160,7 +7160,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-03-07T15:38:35+00:00" }, { "name": "composer/semver", diff --git a/src/Tables/PopoverColumn.php b/src/Tables/PopoverColumn.php index 6b90c89..321c8f8 100644 --- a/src/Tables/PopoverColumn.php +++ b/src/Tables/PopoverColumn.php @@ -4,6 +4,7 @@ use Filament\Support\Concerns; use Filament\Tables\Columns\Column; +use Filament\Tables\Columns\Concerns\CanFormatState; use Filament\Tables\Columns\Concerns\CanWrap; use Filament\Tables\Columns\Concerns\HasDescription; use LaraZeus\Popover\Concerns\HasPopover; @@ -14,6 +15,7 @@ class PopoverColumn extends Column use Concerns\HasIcon; use HasDescription; use HasPopover; + use CanFormatState; protected string $view = 'zeus-popover::popover-column'; From b3c5c821a169b275f8e055efaec9f4c3ca028380 Mon Sep 17 00:00:00 2001 From: atmonshi Date: Fri, 8 Mar 2024 19:00:33 +0000 Subject: [PATCH 2/4] Fix styling --- src/Tables/PopoverColumn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tables/PopoverColumn.php b/src/Tables/PopoverColumn.php index 321c8f8..918313d 100644 --- a/src/Tables/PopoverColumn.php +++ b/src/Tables/PopoverColumn.php @@ -11,11 +11,11 @@ class PopoverColumn extends Column { + use CanFormatState; use CanWrap; use Concerns\HasIcon; use HasDescription; use HasPopover; - use CanFormatState; protected string $view = 'zeus-popover::popover-column'; From 52195aa75c220af5daf66eb3025cabada82e7d5a Mon Sep 17 00:00:00 2001 From: Ash Monsh Date: Fri, 8 Mar 2024 22:03:41 +0300 Subject: [PATCH 3/4] Update PopoverEntry.php --- src/Infolists/PopoverEntry.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Infolists/PopoverEntry.php b/src/Infolists/PopoverEntry.php index 9c4673d..2247d03 100644 --- a/src/Infolists/PopoverEntry.php +++ b/src/Infolists/PopoverEntry.php @@ -2,6 +2,7 @@ namespace LaraZeus\Popover\Infolists; +use Filament\Infolists\Components\Concerns\CanFormatState; use Filament\Infolists\Components\Concerns\HasIcon; use Filament\Infolists\Components\Entry; use LaraZeus\Popover\Concerns\HasPopover; @@ -10,6 +11,7 @@ class PopoverEntry extends Entry { use HasIcon; use HasPopover; + use CanFormatState; protected string $view = 'zeus-popover::popover-entry'; } From 2a348f97a75321a9051e91b4060c836fc0d32152 Mon Sep 17 00:00:00 2001 From: atmonshi Date: Fri, 8 Mar 2024 19:04:03 +0000 Subject: [PATCH 4/4] Fix styling --- src/Infolists/PopoverEntry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infolists/PopoverEntry.php b/src/Infolists/PopoverEntry.php index 2247d03..7b71424 100644 --- a/src/Infolists/PopoverEntry.php +++ b/src/Infolists/PopoverEntry.php @@ -9,9 +9,9 @@ class PopoverEntry extends Entry { + use CanFormatState; use HasIcon; use HasPopover; - use CanFormatState; protected string $view = 'zeus-popover::popover-entry'; }