Merge branch '3.x' into actually-hide-hidden-item-actions

filamentphp · May 8, 2024 · ce966e5 · ce966e5
2 parents feabd9b + c1bb0a9
commit ce966e5
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
         "sortablejs": "^1.15.0",
         "tailwindcss": "^3.4.0",
         "tippy.js": "^6.3.7",
-        "trix": "^1.3.1",
+        "trix": "^2.1.1",
         "uuid-browser": "^3.1.0",
         "vanilla-colorful": "^0.6.2"
     }

diff --git a/packages/actions/src/Exports/Jobs/ExportCsv.php b/packages/actions/src/Exports/Jobs/ExportCsv.php
@@ -64,7 +64,11 @@ public function handle(): void
         /** @var Authenticatable $user */
         $user = $this->export->user;
 
-        auth()->setUser($user);
+        if (method_exists(auth()->guard(), 'login')) {
+            auth()->login($user);
+        } else {
+            auth()->setUser($user);
+        }
 
         $exceptions = [];
 

diff --git a/packages/actions/src/Imports/Jobs/ImportCsv.php b/packages/actions/src/Imports/Jobs/ImportCsv.php
@@ -62,7 +62,11 @@ public function handle(): void
         /** @var Authenticatable $user */
         $user = $this->import->user;
 
-        auth()->setUser($user);
+        if (method_exists(auth()->guard(), 'login')) {
+            auth()->login($user);
+        } else {
+            auth()->setUser($user);
+        }
 
         $exceptions = [];
 

diff --git a/packages/forms/resources/lang/no/components.php b/packages/forms/resources/lang/no/components.php
@@ -405,7 +405,7 @@
 
         'max_items_message' => 'Bare :count kan velges.',
 
-        'no_search_results_message' => 'No alternativer matcher ditt søk.',
+        'no_search_results_message' => 'Ingen alternativer matcher ditt søk.',
 
         'placeholder' => 'Velg et alternativ',
 

diff --git a/packages/forms/resources/views/components/builder.blade.php b/packages/forms/resources/views/components/builder.blade.php
@@ -93,7 +93,7 @@ class="space-y-4"
                         class="fi-fo-builder-item rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-white/5 dark:ring-white/10"
                         x-bind:class="{ 'fi-collapsed overflow-hidden': isCollapsed }"
                     >
-                        @if ($isReorderableWithDragAndDrop || $isReorderableWithButtons || $hasBlockLabels || $isCloneable || $isDeletable || $isCollapsible || count($visibleExtraItemActions))
+                        @if ($isReorderableWithDragAndDrop || $isReorderableWithButtons || $hasBlockLabels || $isCloneable || $isDeletable || $isCollapsible || $visibleExtraItemActions)
                             <div
                                 @if ($isCollapsible)
                                     x-on:click.stop="isCollapsed = !isCollapsed"
@@ -141,7 +141,7 @@ class="fi-fo-builder-item rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 d
                                     </h4>
                                 @endif
 
-                                @if ($isCloneable || $isDeletable || $isCollapsible || count($visibleExtraItemActions))
+                                @if ($isCloneable || $isDeletable || $isCollapsible || $visibleExtraItemActions)
                                     <ul
                                         class="ms-auto flex items-center gap-x-3"
                                     >

diff --git a/packages/forms/resources/views/components/repeater/simple.blade.php b/packages/forms/resources/views/components/repeater/simple.blade.php
@@ -1,4 +1,6 @@
 @php
+    use Filament\Forms\Components\Actions\Action;
+
     $containers = $getChildComponentContainers();
 
     $addAction = $getAction($getAddActionName());
@@ -7,6 +9,7 @@
     $moveDownAction = $getAction($getMoveDownActionName());
     $moveUpAction = $getAction($getMoveUpActionName());
     $reorderAction = $getAction($getReorderActionName());
+    $extraItemActions = $getExtraItemActions();
 
     $isAddable = $isAddable();
     $isCloneable = $isCloneable();
@@ -41,6 +44,13 @@
                     class="gap-4"
                 >
                     @foreach ($containers as $uuid => $item)
+                        @php
+                            $visibleExtraItemActions = array_filter(
+                                $extraItemActions,
+                                fn (Action $action): bool => $action(['item' => $uuid])->isVisible(),
+                            );
+                        @endphp
+
                         <li
                             wire:key="{{ $this->getId() }}.{{ $item->getStatePath() }}.{{ $field::class }}.item"
                             x-sortable-item="{{ $uuid }}"
@@ -50,7 +60,7 @@ class="fi-fo-repeater-item simple flex justify-start gap-x-3"
                                 {{ $item }}
                             </div>
 
-                            @if ($isReorderableWithDragAndDrop || $isReorderableWithButtons || $isCloneable || $isDeletable)
+                            @if ($isReorderableWithDragAndDrop || $isReorderableWithButtons || $isCloneable || $isDeletable || $visibleExtraItemActions)
                                 <ul class="flex items-center gap-x-1">
                                     @if ($isReorderableWithDragAndDrop)
                                         <li x-sortable-handle>
@@ -72,6 +82,12 @@ class="flex items-center justify-center"
                                         </li>
                                     @endif
 
+                                    @foreach ($visibleExtraItemActions as $extraItemAction)
+                                        <li>
+                                            {{ $extraItemAction(['item' => $uuid]) }}
+                                        </li>
+                                    @endforeach
+
                                     @if ($isCloneable)
                                         <li>
                                             {{ $cloneAction(['item' => $uuid]) }}

diff --git a/packages/panels/resources/lang/no/layout.php b/packages/panels/resources/lang/no/layout.php
@@ -52,4 +52,12 @@
 
     ],
 
+    'avatar' => [
+        'alt' => 'Avatar av :name',
+    ],
+
+    'logo' => [
+        'alt' => ':name logo',
+    ],
+
 ];
diff --git a/packages/panels/resources/lang/no/pages/auth/edit-profile.php b/packages/panels/resources/lang/no/pages/auth/edit-profile.php
@@ -7,7 +7,7 @@
     'form' => [
 
         'email' => [
-            'label' => 'E-post adresse',
+            'label' => 'E-postadresse',
         ],
 
         'name' => [

diff --git a/...ages/panels/resources/lang/no/pages/auth/email-verification/email-verification-prompt.php b/...ages/panels/resources/lang/no/pages/auth/email-verification/email-verification-prompt.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'title' => 'Bekreft din e-post adresse',
+    'title' => 'Bekreft din e-postadresse',
 
-    'heading' => 'Bekreft din e-post adresse',
+    'heading' => 'Bekreft din e-postadresse',
 
     'actions' => [
 
@@ -16,7 +16,7 @@
 
     'messages' => [
         'notification_not_received' => 'Ikke mottatt e-posten vi sendte?',
-        'notification_sent' => 'Vi har sendt e-post til :email med informasjon om hvordan du bekrefter din e-post adresse.',
+        'notification_sent' => 'Vi har sendt e-post til :email med informasjon om hvordan du bekrefter din e-postadresse.',
     ],
 
     'notifications' => [

diff --git a/packages/panels/resources/lang/no/pages/auth/login.php b/packages/panels/resources/lang/no/pages/auth/login.php
@@ -22,7 +22,7 @@
     'form' => [
 
         'email' => [
-            'label' => 'E-post adresse',
+            'label' => 'E-postedresse',
         ],
 
         'password' => [

diff --git a/packages/panels/resources/lang/no/pages/auth/password-reset/reset-password.php b/packages/panels/resources/lang/no/pages/auth/password-reset/reset-password.php
@@ -9,7 +9,7 @@
     'form' => [
 
         'email' => [
-            'label' => 'E-post adresse',
+            'label' => 'E-postadresse',
         ],
 
         'password' => [

diff --git a/packages/panels/resources/lang/no/pages/auth/register.php b/packages/panels/resources/lang/no/pages/auth/register.php
@@ -18,7 +18,7 @@
     'form' => [
 
         'email' => [
-            'label' => 'E-post adresse',
+            'label' => 'E-postadresse',
         ],
 
         'name' => [

diff --git a/packages/panels/resources/lang/no/unsaved-changes-alert.php b/packages/panels/resources/lang/no/unsaved-changes-alert.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'body' => 'Du har endringer som ikke er lagret. Er du sikker på at du vil forlate siden?',
+
+];
diff --git a/packages/support/resources/lang/no/components/pagination.php b/packages/support/resources/lang/no/components/pagination.php
@@ -22,10 +22,18 @@
 
     'actions' => [
 
+        'first' => [
+            'label' => 'Første',
+        ],
+
         'go_to_page' => [
             'label' => 'Gå til side :page',
         ],
 
+        'last' => [
+            'label' => 'Siste',
+        ],
+
         'next' => [
             'label' => 'Neste',
         ],

diff --git a/packages/tables/resources/lang/no/table.php b/packages/tables/resources/lang/no/table.php
@@ -13,8 +13,8 @@
         'text' => [
 
             'actions' => [
-                'collapse_list' => 'Vis :count til',
-                'expand_list' => 'Vis :count mindre',
+                'collapse_list' => 'Vis :count mindre',
+                'expand_list' => 'Vis :count til',
             ],
 
             'more_list_items' => 'og :count til',