Merge pull request #4 from jianminLee/master

Support localization.

Author: paras-malhotra

README.md

@@ -72,6 +72,13 @@ Finally, add the `ForgetCachedPermissions` class to your `config/nova.php` middl
 	\Insenseanalytics\LaravelNovaPermission\ForgetCachedPermissions::class,
 ],
 ```
+Support for localized permission search, you can enter the display name for permission search,If you don't need this feature, you can remove the `PermissionSearchTranslationTrait` trait from the [Using Custom Permission Resource Classes](https://github.com/insenseanalytics/laravel-nova-permission#using-custom-rolepermission-resource-classes).
+
+You can use the artisan command line tool to publish localization files:
+
+```php
+php artisan vendor:publish --provider="Insenseanalytics\LaravelNovaPermission\NovaPermissionServiceProvider"
+```
 
 ## Using Custom Role/Permission Resource Classes
 

resources/lang/en/navigation.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'sidebar-label' => 'Roles & Permissions',
+];

resources/lang/en/permissions.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'name'         => 'Name',
+    'display_name' => 'Display Name',
+    'guard_name'   => 'Guard Name',
+    'created_at'   => 'Created at',
+    'updated_at'   => 'Updated at',
+];

resources/lang/en/resources.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'Roles'       => 'Roles',
+    'Role'        => 'Role',
+    'Permissions' => 'Permissions',
+    'Permission'  => 'Permission',
+];

resources/lang/en/roles.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'name'       => 'Name',
+    'guard_name' => 'Guard Name',
+    'created_at' => 'Created at',
+    'updated_at' => 'Updated at',
+];

resources/views/navigation.blade.php

@@ -10,7 +10,7 @@
                   d="M7 10V7a5 5 0 1 1 10 0v3h2a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-8c0-1.1.9-2 2-2h2zm2 0h6V7a3 3 0 0 0-6 0v3zm-4 2v8h14v-8H5zm7 2a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0v-2a1 1 0 0 1 1-1z"/>
         </svg>
         <span class="sidebar-label">
-                Roles & Permissions
+                @lang('laravel-nova-permission::navigation.sidebar-label')
         </span>
     </h3>
 
@@ -24,7 +24,7 @@
                     resourceName: 'roles'
                 }
             }" class="text-white ml-8 no-underline dim">
-                Roles
+                @lang('laravel-nova-permission::resources.Roles')
             </router-link>
         </li>
         @endif
@@ -37,7 +37,7 @@
                     resourceName: 'permissions'
                 }
             }" class="text-white ml-8 no-underline dim">
-                Permissions
+                @lang('laravel-nova-permission::resources.Permissions')
             </router-link>
         </li>
         @endif

src/NovaPermissionServiceProvider.php

@@ -12,6 +12,11 @@ class NovaPermissionServiceProvider extends ServiceProvider
 	public function boot()
 	{
 		$this->loadViewsFrom(__DIR__ . '/../resources/views', 'laravel-nova-permission');
+		$this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'laravel-nova-permission');
+
+		$this->publishes([
+			__DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-nova-permission'),
+		], 'laravel-nova-permission-lang');
 	}
 
 	/**

src/Permission.php

@@ -7,7 +7,7 @@
 
 class Permission extends Resource
 {
-	use PermissionResourceTrait;
+	use PermissionResourceTrait,PermissionSearchTranslationTrait;
 
 	/**
 	 * The model the resource corresponds to.
@@ -38,4 +38,25 @@ class Permission extends Resource
 	 * @var bool
 	 */
 	public static $displayInNavigation = false;
+
+	/**
+	 * Get the displayable label of the resource.
+	 *
+	 * @return string
+	 */
+	public static function label()
+	{
+		return __('laravel-nova-permission::resources.Permissions');
+	}
+
+	/**
+	 * Get the displayable singular label of the resource.
+	 *
+	 * @return string
+	 */
+	public static function singularLabel()
+	{
+		return __('laravel-nova-permission::resources.Permission');
+	}
+
 }

src/PermissionResourceTrait.php

@@ -2,6 +2,7 @@
 
 namespace Insenseanalytics\LaravelNovaPermission;
 
+use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Nova;
 use Laravel\Nova\Fields\ID;
 use Illuminate\Http\Request;
@@ -40,18 +41,24 @@ public function fields(Request $request)
 		return [
 			ID::make()->sortable(),
 
-			Text::make('Name', 'name')
+			Text::make(__('laravel-nova-permission::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('Guard Name', 'guard_name')
+			Text::make(__('laravel-nova-permission::permissions.display_name'),function (){
+				return __('laravel-nova-permission::permissions.display_names.'.$this->name);
+			})->canSee(function (){
+				return is_array(__('laravel-nova-permission::permissions.display_names'));
+			}),
+
+			Select::make(__('laravel-nova-permission::permissions.guard_name'), 'guard_name')
 				->options($guardOptions->toArray())
 				->rules(['required', Rule::in($guardOptions)]),
 
-			DateTime::make('Created At', 'created_at')->exceptOnForms(),
+			DateTime::make(__('laravel-nova-permission::permissions.created_at'), 'created_at')->exceptOnForms(),
 
-			DateTime::make('Updated At', 'updated_at')->exceptOnForms(),
+			DateTime::make(__('laravel-nova-permission::permissions.updated_at'), 'updated_at')->exceptOnForms(),
 
 			BelongsToMany::make($roleResource::label(), 'roles', $roleResource)->searchable(),
 

src/PermissionSearchTranslationTrait.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: work
+ * Date: 2018/12/15
+ * Time: 10:26
+ */
+
+namespace Insenseanalytics\LaravelNovaPermission;
+
+
+trait PermissionSearchTranslationTrait {
+
+	use TranslationHandelTrait;
+
+	/**
+	 * Override the applyFilters method,title field translation
+	 */
+	public function title() {
+
+		return __('laravel-nova-permission::permissions.display_names.'.$this->name);
+	}
+
+	/**
+	 * Rewrite the applySearch method to apply translation field search
+	 *
+	 * @param  \Illuminate\Database\Eloquent\Builder  $query
+	 * @param  string  $search
+	 * @return \Illuminate\Database\Eloquent\Builder
+	 */
+	protected static function applySearch($query, $search)
+	{
+		return $query->where(function ($query) use ($search) {
+			if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) {
+				$query->orWhere($query->getModel()->getQualifiedKeyName(), $search);
+			}
+
+			$model = $query->getModel();
+
+			$connectionType = $query->getModel()->getConnection()->getDriverName();
+
+			$likeOperator = $connectionType == 'pgsql' ? 'ilike' : 'like';
+
+			$trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names'))));
+
+			foreach (static::searchableColumns() as $column) {
+				$qualify_column = $model->qualifyColumn($column);
+				foreach ($trans_search as $t_search){
+					$query->orWhere($qualify_column, $likeOperator, '%'.$t_search.'%');
+				}
+				$query->orWhere($qualify_column, $likeOperator, '%'.$search.'%');
+			}
+		});
+	}
+}

src/Role.php

@@ -7,7 +7,7 @@
 
 class Role extends Resource
 {
-	use RoleResourceTrait;
+	use RoleResourceTrait, TranslationHandelTrait;
 
 	/**
 	 * The model the resource corresponds to.
@@ -38,4 +38,24 @@ class Role extends Resource
 	 * @var bool
 	 */
 	public static $displayInNavigation = false;
+
+	/**
+	 * Get the displayable label of the resource.
+	 *
+	 * @return string
+	 */
+	public static function label()
+	{
+		return __('laravel-nova-permission::resources.Roles');
+	}
+
+	/**
+	 * Get the displayable singular label of the resource.
+	 *
+	 * @return string
+	 */
+	public static function singularLabel()
+	{
+		return __('laravel-nova-permission::resources.Role');
+	}
 }

src/RoleResourceTrait.php

@@ -40,18 +40,18 @@ public function fields(Request $request)
 		return [
 			ID::make()->sortable(),
 
-			Text::make('Name', 'name')
+			Text::make(__('laravel-nova-permission::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('Guard Name', 'guard_name')
+			Select::make(__('laravel-nova-permission::roles.guard_name'), 'guard_name')
 				->options($guardOptions->toArray())
 				->rules(['required', Rule::in($guardOptions)]),
 
-			DateTime::make('Created At', 'created_at')->exceptOnForms(),
+			DateTime::make(__('laravel-nova-permission::roles.created_at'), 'created_at')->exceptOnForms(),
 
-			DateTime::make('Updated At', 'updated_at')->exceptOnForms(),
+			DateTime::make(__('laravel-nova-permission::roles.updated_at'), 'updated_at')->exceptOnForms(),
 
 			BelongsToMany::make($permissionResource::label(), 'permissions', $permissionResource)->searchable(),
 

src/TranslationHandelTrait.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: work
+ * Date: 2018/12/14
+ * Time: 16:03
+ */
+
+namespace Insenseanalytics\LaravelNovaPermission;
+
+
+use Laravel\Nova\Http\Requests\NovaRequest;
+
+trait TranslationHandelTrait {
+
+	/**
+	 * Override the applyFilters method to add the guard_name condition when filtering
+	 *
+	 * @param  \Laravel\Nova\Http\Requests\NovaRequest $request
+	 * @param  \Illuminate\Database\Eloquent\Builder $query
+	 * @param  array $filters
+	 *
+	 * @return \Illuminate\Database\Eloquent\Builder
+	 */
+	protected static function applyFilters(NovaRequest $request, $query, array $filters) {
+		$query = parent::applyFilters($request, $query, $filters);
+		if ($model = head($request->__memoized)) {
+			$guard_name = $model->guard_name ?? self::getGuardForModel(get_class($model));
+			$query->where('guard_name', $guard_name);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * @param string model
+	 *
+	 * @return string|null
+	 */
+	public static function getGuardForModel(string $model) {
+
+		return collect(config('auth.guards'))
+			->map(function ($guard) {
+				return config("auth.providers.{$guard['provider']}.model");
+			})->search($model);
+	}
+}