5.1.4

laravelwebdev · laravelwebdev · commit 396cfa79ea56 · 2025-01-17T06:37:11.000+08:00
diff --git a/bun.lockb b/bun.lockb
diff --git a/composer.json b/composer.json
@@ -161,5 +161,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.1.3"
+  "version": "5.1.4"
 }
diff --git a/config/nova.php b/config/nova.php
@@ -205,13 +205,4 @@
         'stopped' => '/',
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Initial Years in Year Option On login form
-    |--------------------------------------------------------------------------
-    |
-    */
-
-    'initialyear' => env('NOVA_INITIAL_YEAR', 2024),
-
 ];
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "laravel-mix": "^6.0.49",
     "lodash": "^4.17.21",
     "nprogress": "^0.2.0",
-    "postcss": "^8.4.44",
+    "postcss": "^8.5.0",
     "postcss-import": "^14.1.0",
     "postcss-rtlcss": "^3.7.2",
     "prettier": "^3.3.3",
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=4231e5c47e47aec50ae21a339ed479c6",
+    "/app.js": "/app.js?id=e80e9505944733061e76773f8a73dda3",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=4979b631c5ac542d792aa697845f8e1d",
diff --git a/resources/js/fields/Form/SelectField.vue b/resources/js/fields/Form/SelectField.vue
@@ -23,10 +23,12 @@
         :dusk="`${field.attribute}-search-input`"
         :autocomplete="currentField.autocomplete"
       >
-        <!-- The Selected Option Slot -->
-        <div v-if="selectedOption" class="flex items-center">
-          {{ selectedOption.label }}
-        </div>
+        <template #default>
+          <!-- The Selected Option Slot -->
+          <div v-if="selectedOption" class="flex items-center">
+            {{ selectedOption.label }}
+          </div>
+        </template>
 
         <template #option="{ selected, option }">
           <!-- Options List Slot -->
@@ -233,7 +235,7 @@ export default {
      * @return {Object}
      */
     selectedOption() {
-      return this.field.options.find(
+      return this.currentField.options.find(
         o => this.value === o.value || this.value === o.value.toString()
       )
     },
diff --git a/src/Actions/ActionCollection.php b/src/Actions/ActionCollection.php
@@ -21,7 +21,7 @@ class ActionCollection extends Collection
     public function authorizedToSeeOnIndex(NovaRequest $request)
     {
         return $this->filter->shownOnIndex()
-            ->filter(function ($action) use ($request) {
+            ->filter(static function ($action) use ($request) {
                 if ($action->sole === true) {
                     return ! $request->allResourcesSelected()
                         && $request->selectedResourceIds()->count() <= 1
@@ -62,9 +62,9 @@ public function authorizedToSeeOnTableRow(NovaRequest $request)
      */
     public function withAuthorizedToRun(NovaRequest $request, $model)
     {
-        return $this->each(
-            fn (Action $action) => $action->authorizedToRun($request, $model)
-        );
+        return $this->each(static function ($action) use ($request, $model) {
+            $action->authorizedToRun($request, $model);
+        });
     }
 
     /**
diff --git a/src/Auth/Actions/LoginViewResponse.php b/src/Auth/Actions/LoginViewResponse.php
@@ -16,7 +16,7 @@ class LoginViewResponse implements Responsable
      */
     public function toResponse($request)
     {
-        $initialYear = config('nova.initialyear', date('Y'));
+        $initialYear = config('app.initialyear', date('Y'));
         $currentYear = date('Y');
         $years = $initialYear <= $currentYear ? range($initialYear, $currentYear) : [];
         return Inertia::render('Nova.Login', [
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
@@ -53,13 +53,6 @@ abstract class Field extends FieldElement implements JsonSerializable, Resolvabl
      */
     public $attribute;
 
-    /**
-     * Indicates whether the field should be saved on action relation.
-     *
-     * @var bool
-     */
-    public $saveOnActionRelation = true;
-
     /**
      * The value displayed to the user.
      *
@@ -346,18 +339,6 @@ public function displayUsing(callable $displayCallback)
         return $this;
     }
 
-    /**
-     * Prevents the field from being saved when performing an action on a related model.
-     *
-     * @return $this
-     */
-    public function doNotSaveOnActionRelation()
-    {
-        $this->saveOnActionRelation = false;
-
-        return $this;
-    }
-
     /**
      * Define the callback that should be used to resolve the field's value.
      *
diff --git a/src/Fields/HasOne.php b/src/Fields/HasOne.php
@@ -451,7 +451,7 @@ public function getResourceCreationRules(NovaRequest $request, Resource $resourc
             ->mapWithKeys(fn ($field) => $field->getCreationRules($request))
             ->mapWithKeys(function ($field, $attribute) use ($replacements) {
                 if ($this->nullable === true) {
-                    array_push($field, 'sometimes');
+                    $field[] = 'sometimes';
                 }
 
                 return ["{$this->attribute}.{$attribute}" => collect($field)->transform(function ($rule) use ($replacements) {
@@ -487,7 +487,7 @@ public function getResourceUpdateRules(NovaRequest $request, Resource $resource)
             ->mapWithKeys(fn ($field) => $field->getUpdateRules($request))
             ->mapWithKeys(function ($field, $attribute) use ($replacements) {
                 if ($this->nullable === true) {
-                    array_push($field, 'sometimes');
+                    $field[] = 'sometimes';
                 }
 
                 return ["{$this->attribute}.{$attribute}" => collect($field)->transform(function ($rule) use ($replacements) {
diff --git a/src/Fields/SupportsDependentFields.php b/src/Fields/SupportsDependentFields.php
@@ -20,7 +20,7 @@ trait SupportsDependentFields
      */
     public function dependsOn(Field|array|string $attributes, callable|string $mixin)
     {
-        array_push($this->fieldDependencies, new Dependent($attributes, $mixin));
+        $this->fieldDependencies[] = new Dependent($attributes, $mixin);
 
         return $this;
     }
@@ -34,7 +34,7 @@ public function dependsOn(Field|array|string $attributes, callable|string $mixin
      */
     public function dependsOnCreating(Field|array|string $attributes, callable|string $mixin)
     {
-        array_push($this->fieldDependencies, new Dependent($attributes, $mixin, 'create'));
+        $this->fieldDependencies[] = new Dependent($attributes, $mixin, 'create');
 
         return $this;
     }
@@ -48,7 +48,7 @@ public function dependsOnCreating(Field|array|string $attributes, callable|strin
      */
     public function dependsOnUpdating($attributes, $mixin)
     {
-        array_push($this->fieldDependencies, new Dependent($attributes, $mixin, 'update'));
+        $this->fieldDependencies[] = new Dependent($attributes, $mixin, 'update');
 
         return $this;
     }
diff --git a/src/ResolvesActions.php b/src/ResolvesActions.php
@@ -144,7 +144,7 @@ protected function getPivotActions(NovaRequest $request): array
     {
         $resource = Nova::resourceInstanceForKey($request->viaResource);
 
-        $field = $resource->availableFields($request)->first(function ($field) use ($request) {
+        $field = $resource->availableFields($request)->first(static function ($field) use ($request) {
             return isset($field->resourceName) &&
                    $field->resourceName == $request->resource &&
                    ($field instanceof BelongsToMany || $field instanceof MorphToMany) &&
diff --git a/src/ResolvesFields.php b/src/ResolvesFields.php
@@ -780,8 +780,11 @@ protected function resolvePanelsFromFields(NovaRequest $request, FieldCollection
                     $fields = $panel->meta['fields'];
 
                     $relationshipUnderTabs
-                        ->filter(fn ($relation) => $fields[0]->panel === $relation->meta['fields'][0]->panel)
-                        ->each(fn ($relation) => $fields[] = $relation->meta['fields'][0]);
+                        ->filter(static function ($relation) use ($fields) {
+                            return $fields[0]->panel === $relation->meta['fields'][0]->panel;
+                        })->each(static function ($relation) use ($fields) {
+                            $fields[] = $relation->meta['fields'][0];
+                        });
 
                     TabsGroup::hydrate($panel, $fields);
                 }
diff --git a/src/Support/FluentDecorator.php b/src/Support/FluentDecorator.php
@@ -14,6 +14,8 @@
  *
  * @implements \Illuminate\Contracts\Support\Arrayable<TKey, TValue>
  * @implements \ArrayAccess<TKey, TValue>
+ *
+ * @mixin \Illuminate\Support\Fluent
  */
 abstract class FluentDecorator implements Arrayable, ArrayAccess, Jsonable, JsonSerializable
 {

Original file line number	Diff line number	Diff line change
`@@ -161,5 +161,5 @@`
`161`	`161`	`},`
`162`	`162`	`"minimum-stability": "dev",`
`163`	`163`	`"prefer-stable": true,`
`164`		`- "version": "5.1.3"`
	`164`	`+ "version": "5.1.4"`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "/app.js": "/app.js?id=4231e5c47e47aec50ae21a339ed479c6",`
	`2`	`+ "/app.js": "/app.js?id=e80e9505944733061e76773f8a73dda3",`
`3`	`3`	`"/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",`
`4`	`4`	`"/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",`
`5`	`5`	`"/app.css": "/app.css?id=4979b631c5ac542d792aa697845f8e1d",`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class LoginViewResponse implements Responsable`
`16`	`16`	`*/`
`17`	`17`	`public function toResponse($request)`
`18`	`18`	`{`
`19`		`- $initialYear = config('nova.initialyear', date('Y'));`
	`19`	`+ $initialYear = config('app.initialyear', date('Y'));`
`20`	`20`	`$currentYear = date('Y');`
`21`	`21`	`$years = $initialYear <= $currentYear ? range($initialYear, $currentYear) : [];`
`22`	`22`	`return Inertia::render('Nova.Login', [`