Merge branch 'filamentphp:3.x' into 3.x

Author: elmergustavo

packages/forms/resources/views/components/field-wrapper/helper-text.blade.php

@@ -1,5 +1,5 @@
 <div
-    {{ $attributes->class(['fi-fo-field-wrp-helper-text break-words text-sm text-gray-500']) }}
+    {{ $attributes->class(['fi-fo-field-wrp-helper-text break-words text-sm text-gray-500 dark:text-gray-400']) }}
 >
     {{ $slot }}
 </div>

packages/forms/resources/views/components/field-wrapper/hint.blade.php

@@ -17,7 +17,7 @@
             @class([
                 'fi-fo-field-wrp-hint-label',
                 match ($color) {
-                    'gray' => 'text-gray-500',
+                    'gray' => 'text-gray-500 dark:text-gray-400',
                     default => 'fi-color-custom text-custom-600 dark:text-custom-400',
                 },
                 is_string($color) ? "fi-color-{$color}" : null,

packages/infolists/resources/views/components/entry-wrapper/helper-text.blade.php

@@ -1,5 +1,5 @@
 <div
-    {{ $attributes->class(['fi-in-entry-wrp-helper-text break-words text-sm text-gray-500']) }}
+    {{ $attributes->class(['fi-in-entry-wrp-helper-text break-words text-sm text-gray-500 dark:text-gray-400']) }}
 >
     {{ $slot }}
 </div>

packages/infolists/resources/views/components/entry-wrapper/hint.blade.php

@@ -17,7 +17,7 @@
             @class([
                 'fi-in-entry-wrp-hint-label',
                 match ($color) {
-                    'gray' => 'text-gray-500',
+                    'gray' => 'text-gray-500 dark:text-gray-400',
                     default => 'fi-color-custom text-custom-600 dark:text-custom-400',
                 },
                 is_string($color) ? "fi-color-{$color}" : null,

packages/support/src/helpers.php

@@ -166,26 +166,38 @@ function generate_search_column_expression(string $column, ?bool $isSearchForced
         $column = match ($driverName) {
             'pgsql' => (
                 str($column)->contains('->')
-                    ? (
-                        // Handle `table.field` part with double quotes
-                        str($column)
-                            ->before('->')
-                            ->explode('.')
-                            ->map(fn (string $part): string => (string) str($part)->wrap('"'))
-                            ->implode('.')
-                    ) . collect(str($column)->after('->')->explode('->')) // Handle JSON path parts
-                        ->map(function ($segment, $index) use ($column): string {
-                            $totalParts = substr_count($column, '->');
-
-                            return ($index === ($totalParts - 1))
-                                ? "->>'{$segment}'"
-                                : "->'{$segment}'";
-                        })
-                        ->implode('')
-                    : str($column)
-                        ->explode('.')
-                        ->map(fn (string $part): string => (string) str($part)->wrap('"'))
-                        ->implode('.')
+                            ? (
+                                // Handle `table.field` part with double quotes
+                                str($column)
+                                    ->before('->')
+                                    ->explode('.')
+                                    ->map(fn (string $part): string => (string) str($part)->wrap('"'))
+                                    ->implode('.')
+                            ) . collect(str($column)->after('->')->explode('->')) // Handle JSON path parts
+                                ->map(function ($segment, $index) use ($column): string {
+                                    // If segment already starts with `>` (from `->>` operator), preserve it
+                                    $isExplicitOperatorPrefixed = str($segment)->startsWith('>');
+                                    $segment = $isExplicitOperatorPrefixed ? (string) str($segment)->after('>') : $segment;
+
+                                    // Remove single quotes from segment if present to avoid redundant quoting
+                                    $isWrappedWithSingleQuotes = str($segment)->startsWith("'") && str($segment)->endsWith("'");
+                                    $segment = $isWrappedWithSingleQuotes ? (string) str($segment)->trim("'") : $segment;
+
+                                    if ($isExplicitOperatorPrefixed) {
+                                        return "->>'{$segment}'";
+                                    }
+
+                                    $totalParts = substr_count($column, '->');
+
+                                    return ($index === ($totalParts - 1))
+                                        ? "->>'{$segment}'"
+                                        : "->'{$segment}'";
+                                })
+                                ->implode('')
+                            : str($column)
+                                ->explode('.')
+                                ->map(fn (string $part): string => (string) str($part)->wrap('"'))
+                                ->implode('.')
             ) . '::text',
             default => $column,
         };

tests/src/Support/helpersTest.php

@@ -112,3 +112,51 @@
         ['blog:posts.title', 'lower("blog:posts"."title"::text)'],
         ['blog:posts:comments.author.name', 'lower("blog:posts:comments"."author"."name"::text)'],
     ]);
+
+it('will generate a JSON search column expression for Postgres with explicit ->> operator', function () {
+    $column = 'data->>name';
+    $isSearchForcedCaseInsensitive = true;
+
+    $databaseConnection = Mockery::mock(Connection::class);
+    $databaseConnection->shouldReceive('getDriverName')->andReturn('pgsql');
+    $databaseConnection->shouldReceive('getConfig')->with('search_collation')->andReturn(null);
+
+    $grammar = new PostgresGrammar($databaseConnection);
+
+    $expression = generate_search_column_expression($column, $isSearchForcedCaseInsensitive, $databaseConnection);
+
+    expect($expression->getValue($grammar))
+        ->toBe("lower(\"data\"->>'name'::text)");
+});
+
+it('will generate a nested JSON search column expression for Postgres with explicit ->> operator on the last segment', function () {
+    $column = 'data->name->>ar';
+    $isSearchForcedCaseInsensitive = true;
+
+    $databaseConnection = Mockery::mock(Connection::class);
+    $databaseConnection->shouldReceive('getDriverName')->andReturn('pgsql');
+    $databaseConnection->shouldReceive('getConfig')->with('search_collation')->andReturn(null);
+
+    $grammar = new PostgresGrammar($databaseConnection);
+
+    $expression = generate_search_column_expression($column, $isSearchForcedCaseInsensitive, $databaseConnection);
+
+    expect($expression->getValue($grammar))
+        ->toBe("lower(\"data\"->'name'->>'ar'::text)");
+});
+
+it('will generate a JSON search column expression for Postgres with explicit ->> operator and simple key', function () {
+    $column = 'name->>\'en\'';
+    $isSearchForcedCaseInsensitive = true;
+
+    $databaseConnection = Mockery::mock(Connection::class);
+    $databaseConnection->shouldReceive('getDriverName')->andReturn('pgsql');
+    $databaseConnection->shouldReceive('getConfig')->with('search_collation')->andReturn(null);
+
+    $grammar = new PostgresGrammar($databaseConnection);
+
+    $expression = generate_search_column_expression($column, $isSearchForcedCaseInsensitive, $databaseConnection);
+
+    expect($expression->getValue($grammar))
+        ->toBe("lower(\"name\"->>'en'::text)");
+});