validation rules

joecampo · Aug 27, 2018 · 60fbea1 · 60fbea1
1 parent 8f27d1f
commit 60fbea1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/Permission.php b/src/Permission.php
@@ -2,6 +2,7 @@
 
 namespace Vyuldashev\NovaPermission;
 
+use Illuminate\Validation\Rule;
 use Laravel\Nova\Resource;
 use Laravel\Nova\Fields\ID;
 use Illuminate\Http\Request;
@@ -68,9 +69,14 @@ public function fields(Request $request)
         return [
             ID::make()->sortable(),
 
-            Text::make(__('nova-permission-tool::permissions.name'), 'name'),
+            Text::make(__('nova-permission-tool::permissions.name'), 'name')
+                ->rules(['required', 'string', 'max:255'])
+                ->creationRules('unique:' . config('permission.table_names.permissions'))
+                ->updateRules('unique:' . config('permission.table_names.permissions') . ',name,{{resourceId}}'),
 
-            Select::make(__('nova-permission-tool::permissions.guard_name'), 'guard_name')->options($guardOptions->toArray()),
+            Select::make(__('nova-permission-tool::permissions.guard_name'), 'guard_name')
+                ->options($guardOptions->toArray())
+                ->rules(['required', Rule::in($guardOptions)]),
 
             DateTime::make(__('nova-permission-tool::permissions.created_at'), 'created_at')->exceptOnForms(),
             DateTime::make(__('nova-permission-tool::permissions.updated_at'), 'updated_at')->exceptOnForms(),
@@ -82,7 +88,7 @@ public function fields(Request $request)
     /**
      * Get the cards available for the request.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return array
      */
     public function cards(Request $request)
@@ -93,7 +99,7 @@ public function cards(Request $request)
     /**
      * Get the filters available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return array
      */
     public function filters(Request $request)
@@ -104,7 +110,7 @@ public function filters(Request $request)
     /**
      * Get the lenses available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return array
      */
     public function lenses(Request $request)
@@ -115,7 +121,7 @@ public function lenses(Request $request)
     /**
      * Get the actions available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request $request
      * @return array
      */
     public function actions(Request $request)

diff --git a/src/Role.php b/src/Role.php
@@ -2,6 +2,7 @@
 
 namespace Vyuldashev\NovaPermission;
 
+use Illuminate\Validation\Rule;
 use Laravel\Nova\Resource;
 use Laravel\Nova\Fields\ID;
 use Illuminate\Http\Request;
@@ -68,9 +69,14 @@ public function fields(Request $request)
         return [
             ID::make()->sortable(),
 
-            Text::make(__('nova-permission-tool::roles.name'), 'name'),
+            Text::make(__('nova-permission-tool::roles.name'), 'name')
+                ->rules(['required', 'string', 'max:255'])
+                ->creationRules('unique:' . config('permission.table_names.roles'))
+                ->updateRules('unique:' . config('permission.table_names.roles') . ',name,{{resourceId}}'),
 
-            Select::make(__('nova-permission-tool::roles.guard_name'), 'guard_name')->options($guardOptions->toArray()),
+            Select::make(__('nova-permission-tool::roles.guard_name'), 'guard_name')
+                ->options($guardOptions->toArray())
+                ->rules(['required', Rule::in($guardOptions)]),
 
             DateTime::make(__('nova-permission-tool::roles.created_at'), 'created_at')->exceptOnForms(),
             DateTime::make(__('nova-permission-tool::roles.updated_at'), 'updated_at')->exceptOnForms(),