Merge branch 'release/v2.5.0'

alexusmai · Jun 29, 2020 · 22abfc9 · 22abfc9
2 parents 2ccf062 + ee968f4
commit 22abfc9
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,6 @@
 
 **Vue.js Frontend:** [alexusmai/vue-laravel-file-manager](https://github.com/alexusmai/vue-laravel-file-manager)
 
-**--- Laravel 7 support added but not fully tested!! ---**
-
 ## Documentation
 
 [Laravel File Manager Docs](./docs/index.md)
@@ -66,32 +64,25 @@
 * Events (v2.2)
 * Thumbnails lazy load
 * Dynamic configuration (v2.4)
-* Supported locales : ru, en, ar, sr, cs, de, es, nl, zh-CN, fa, it, tr, fr, pt_BR
-
-## In a new version 2.4
+* Supported locales : ru, en, ar, sr, cs, de, es, nl, zh-CN, fa, it, tr, fr, pt-BR, zh-TW
 
-Now you can create your own config repositories, it will allow to change your configuration dynamically.
+## In a new version 2.5
 
-How to do it:
-
-Create new class - example - TestConfigRepository
+You can change Route prefix (default - 'file-manager')
 
 ```php
-namespace App\Http;
-
-use Alexusmai\LaravelFileManager\Services\ConfigService\ConfigRepository;
-
-class TestConfigRepository implements ConfigRepository
-{
-    // implement all methods from interface
-}
+/**
+ * LFM Route prefix
+ * !!! WARNING - if you change it, you should compile frontend with new prefix(baseUrl) !!!
+ */
+'routePrefix' => 'file-manager',
 ```
 
-For example see [src/Services/ConfigService/DefaultConfigRepository.php](https://github.com/alexusmai/laravel-file-manager/blob/master/src/Services/ConfigService/DefaultConfigRepository.php)
+Open PDF files in a new tab (test) - use 'double-click'
 
-## Upgrading to version 2.4
+## Upgrading to version 2.5
 
-Update pre-compiled css and js files and config file - file-manager.php 
+Update pre-compiled css and js files and config file (backup your settings first!!) - file-manager.php 
 
 
 ```php
@@ -101,23 +92,3 @@ php artisan vendor:publish --tag=fm-config --force
 php artisan vendor:publish --tag=fm-assets --force
 ```
 
-If you use the ACL, now you don't need to add the acl middleware to configuration.
-
-```php
-//======= In old versions ==========
-'acl' => true,
-
-// add acl middleware to your array
-'middleware' => ['web', 'fm-acl'],
-
-//======= In a new version =========
-'acl' => true,
-
-'middleware' => ['web'],
-```
-
-## Contributors
-
-[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/0)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/0)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/1)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/1)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/2)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/2)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/3)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/3)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/4)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/4)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/5)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/5)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/6)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/6)[![](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/images/7)](https://sourcerer.io/fame/alexusmai/alexusmai/laravel-file-manager/links/7)
-
-
diff --git a/docs/events.md b/docs/events.md
@@ -119,6 +119,7 @@ Example:
             $event->disk(),
             $event->newName(),
             $event->oldName(),
+            $event->type(), // 'file' or 'dir'
         ]);
     }
 );

diff --git a/resources/assets/css/file-manager.css b/resources/assets/css/file-manager.css
diff --git a/resources/assets/js/file-manager.js b/resources/assets/js/file-manager.js
diff --git a/resources/assets/js/file-manager.js.map b/resources/assets/js/file-manager.js.map
diff --git a/src/Controllers/FileManagerController.php b/src/Controllers/FileManagerController.php
@@ -21,6 +21,8 @@
 use Illuminate\Routing\Controller;
 use Illuminate\Http\Request;
 
+use function GuzzleHttp\Promise\all;
+
 class FileManagerController extends Controller
 {
     /**

diff --git a/src/Events/Rename.php b/src/Events/Rename.php
@@ -3,6 +3,7 @@
 namespace Alexusmai\LaravelFileManager\Events;
 
 use Illuminate\Http\Request;
+use Storage;
 
 class Rename
 {
@@ -21,6 +22,11 @@ class Rename
      */
     private $oldName;
 
+    /**
+     * @var string
+     */
+    private $type;
+
     /**
      * Rename constructor.
      *
@@ -31,6 +37,11 @@ public function __construct(Request $request)
         $this->disk = $request->input('disk');
         $this->newName = $request->input('newName');
         $this->oldName = $request->input('oldName');
+
+        $info = Storage::disk($request->input('disk'))
+            ->getMetadata($request->input('oldName'));
+
+        $this->type = $info['type'];
     }
 
     /**
@@ -56,4 +67,12 @@ public function oldName()
     {
         return $this->oldName;
     }
+
+    /**
+     * @return string
+     */
+    public function type()
+    {
+        return $this->type;
+    }
 }
diff --git a/src/Middleware/FileManagerACL.php b/src/Middleware/FileManagerACL.php
@@ -58,8 +58,8 @@ class FileManagerACL
     /**
      * FileManagerACL constructor.
      *
-     * @param Request $request
-     * @param ACL     $acl
+     * @param  Request  $request
+     * @param  ACL  $acl
      */
     public function __construct(Request $request, ACL $acl)
     {
@@ -74,8 +74,8 @@ public function __construct(Request $request, ACL $acl)
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $next
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
      *
      * @return mixed
      */
@@ -84,13 +84,13 @@ public function handle($request, Closure $next)
         $routeName = $request->route()->getName();
 
         // if ACL is OFF or route name wasn't found
-        if (!resolve(ConfigRepository::class)->getAcl()
-            || !array_key_exists($routeName, self::CHECKERS)
+        if ( ! resolve(ConfigRepository::class)->getAcl()
+            || ! array_key_exists($routeName, self::CHECKERS)
         ) {
             return $next($request);
         }
 
-        if (!call_user_func([$this, self::CHECKERS[$routeName]])) {
+        if ( ! call_user_func([$this, self::CHECKERS[$routeName]])) {
             return $this->errorMessage();
         }
 
@@ -207,8 +207,7 @@ protected function checkDelete()
         $firstFall = Arr::first($this->request->input('items'),
             function ($value) {
                 // need r/w access
-                return $this->acl->getAccessLevel($this->disk, $value['path'])
-                    !== 2;
+                return $this->acl->getAccessLevel($this->disk, $value['path']) !== 2;
             }, null);
 
         if ($firstFall) {
@@ -234,14 +233,12 @@ protected function checkPaste()
         // can user copy or cut selected files and folders
         $checkDirs = Arr::first($clipboard['directories'],
             function ($value) use ($clipboard, $getLevel) {
-                return $this->acl->getAccessLevel($clipboard['disk'], $value)
-                    < $getLevel;
+                return $this->acl->getAccessLevel($clipboard['disk'], $value) < $getLevel;
             }, null);
 
         $checkFiles = Arr::first($clipboard['files'],
             function ($value) use ($clipboard, $getLevel) {
-                return $this->acl->getAccessLevel($clipboard['disk'], $value)
-                    < $getLevel;
+                return $this->acl->getAccessLevel($clipboard['disk'], $value) < $getLevel;
             }, null);
 
         // can user write to selected folder?

diff --git a/src/Services/ConfigService/ConfigRepository.php b/src/Services/ConfigService/ConfigRepository.php
@@ -9,6 +9,14 @@
  */
 interface ConfigRepository
 {
+    /**
+     * LFM Route prefix
+     * !!! WARNING - if you change it, you should compile frontend with new prefix(baseUrl) !!!
+     *
+     * @return string
+     */
+    public function getRoutePrefix(): string;
+
     /**
      * Get disk list
      *

diff --git a/src/Services/ConfigService/DefaultConfigRepository.php b/src/Services/ConfigService/DefaultConfigRepository.php
@@ -9,6 +9,17 @@
  */
 class DefaultConfigRepository implements ConfigRepository
 {
+    /**
+     * LFM Route prefix
+     * !!! WARNING - if you change it, you should compile frontend with new prefix(baseUrl) !!!
+     *
+     * @return string
+     */
+    public function getRoutePrefix(): string
+    {
+        return config('file-manager.routePrefix');
+    }
+
     /**
      * Get disk list
      *

diff --git a/src/routes.php b/src/routes.php
@@ -16,7 +16,7 @@
 
 Route::group([
     'middleware' => $middleware,
-    'prefix'     => 'file-manager',
+    'prefix'     => $config->getRoutePrefix(),
     'namespace'  => 'Alexusmai\LaravelFileManager\Controllers',
 ], function () {