nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- refactored user_scope to author

Browse Source 
- added author_id for future teams implementation
This commit is contained in:
Peter Papp
2021-03-19 11:27:58 +01:00
parent 19a75d2fb1
commit aa51484303
17 changed files with 176 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/Console/Commands/SetupDevEnvironment.php
View File

@@ -174,7 +174,7 @@ class SetupDevEnvironment extends Command
$shared_folder = Folder::factory(Folder::class) $shared_folder = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Shared Folder', 'name' => 'Shared Folder',
'emoji' => [ 'emoji' => [
"codes" => "1F680", "codes" => "1F680",
@@ -200,17 +200,17 @@ class SetupDevEnvironment extends Command
$peters_files = Folder::factory(Folder::class) $peters_files = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $shared_folder->id, 'parent_id' => $shared_folder->id,
'user_scope' => 'editor', 'author' => 'visitor',
'name' => "Peter's Files", 'name' => "Peter's Files",
]); ]);
// 2. // 2.
$random_pics = Folder::factory(Folder::class) $random_pics = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Random Pics', 'name' => 'Random Pics',
'emoji' => [ 'emoji' => [
'codes' => '1F4F7', 'codes' => '1F4F7',
@@ -225,11 +225,11 @@ class SetupDevEnvironment extends Command
$nature = Folder::factory(Folder::class) $nature = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $random_pics->id, 'parent_id' => $random_pics->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Nature", 'name' => "Nature",
'emoji' => [ 'emoji' => [
'codes' => '26F0', 'codes' => '26F0',
'char' => '⛰', 'char' => '⛰',
'name' => 'mountain', 'name' => 'mountain',
@@ -241,11 +241,11 @@ class SetupDevEnvironment extends Command
$apartments = Folder::factory(Folder::class) $apartments = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $random_pics->id, 'parent_id' => $random_pics->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Apartments", 'name' => "Apartments",
'emoji' => [ 'emoji' => [
'codes' => '1F3E0', 'codes' => '1F3E0',
'char' => '🏠', 'char' => '🏠',
'name' => 'house', 'name' => 'house',
@@ -259,65 +259,65 @@ class SetupDevEnvironment extends Command
$playable_media = Folder::factory(Folder::class) $playable_media = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Playable Media', 'name' => 'Playable Media',
'created_at' => Carbon::now()->subMinutes(2), 'created_at' => Carbon::now()->subMinutes(2),
]); ]);
$video = Folder::factory(Folder::class) $video = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $playable_media->id, 'parent_id' => $playable_media->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Video", 'name' => "Video",
]); ]);
$audio = Folder::factory(Folder::class) $audio = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $playable_media->id, 'parent_id' => $playable_media->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Audio", 'name' => "Audio",
]); ]);
// 4. // 4.
$multi_level = Folder::factory(Folder::class) $multi_level = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Multi Level Folder', 'name' => 'Multi Level Folder',
'created_at' => Carbon::now()->subMinutes(3), 'created_at' => Carbon::now()->subMinutes(3),
]); ]);
$first_level = Folder::factory(Folder::class) $first_level = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $multi_level->id, 'parent_id' => $multi_level->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "First Level", 'name' => "First Level",
]); ]);
$second_level = Folder::factory(Folder::class) $second_level = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $first_level->id, 'parent_id' => $first_level->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Second Level", 'name' => "Second Level",
]); ]);
$third_level = Folder::factory(Folder::class) $third_level = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $second_level->id, 'parent_id' => $second_level->id,
'user_scope' => 'master', 'author' => 'user',
'name' => "Third Level", 'name' => "Third Level",
]); ]);
// 5. // 5.
$documents = Folder::factory(Folder::class) $documents = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Documents', 'name' => 'Documents',
'created_at' => Carbon::now()->subMinutes(4), 'created_at' => Carbon::now()->subMinutes(4),
]); ]);
@@ -337,7 +337,7 @@ class SetupDevEnvironment extends Command
$videohive = Folder::factory(Folder::class) $videohive = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
'name' => 'Videohive by MakingCG', 'name' => 'Videohive by MakingCG',
'created_at' => Carbon::now()->subMinutes(5), 'created_at' => Carbon::now()->subMinutes(5),
]); ]);
@@ -388,7 +388,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'], 'name' => $file['name'],
'basename' => $basename, 'basename' => $basename,
'type' => 'file', 'type' => 'file',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => $file['mimetype'], 'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -432,7 +432,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'], 'name' => $file['name'],
'basename' => $basename, 'basename' => $basename,
'type' => 'file', 'type' => 'file',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => $file['mimetype'], 'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -466,7 +466,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'], 'name' => $file['name'],
'basename' => $basename, 'basename' => $basename,
'type' => 'file', 'type' => 'file',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => $file['mimetype'], 'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -525,7 +525,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'], 'name' => $file['name'],
'basename' => $basename, 'basename' => $basename,
'type' => 'file', 'type' => 'file',
'user_scope' => 'editor', 'author' => 'visitor',
'mimetype' => $file['mimetype'], 'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -553,7 +553,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'video', 'type' => 'video',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'mp4', 'mimetype' => 'mp4',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -578,7 +578,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'video', 'type' => 'video',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'mp4', 'mimetype' => 'mp4',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -603,7 +603,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'audio', 'type' => 'audio',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'mp3', 'mimetype' => 'mp3',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)), 'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -641,7 +641,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'image', 'type' => 'image',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'jpg', 'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id), 'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),
@@ -675,7 +675,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'image', 'type' => 'image',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'jpg', 'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id), 'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),
@@ -713,7 +713,7 @@ class SetupDevEnvironment extends Command
'name' => $file, 'name' => $file,
'basename' => $basename, 'basename' => $basename,
'type' => 'image', 'type' => 'image',
'user_scope' => 'master', 'author' => 'user',
'mimetype' => 'jpg', 'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000), 'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id), 'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),

2
app/Http/Controllers/FileManager/BrowseController.php
View File

@@ -162,7 +162,7 @@ class BrowseController extends Controller
{ {
return File::with(['parent']) return File::with(['parent'])
->where('user_id', Auth::id()) ->where('user_id', Auth::id())
->whereUserScope('editor') ->whereAuthor('visitor')
->sortable() ->sortable()
->get(); ->get();
} }

4
app/Models/File.php
View File

@@ -34,6 +34,10 @@ class File extends Model
'metadata' => 'array', 'metadata' => 'array',
]; ];
protected $hidden = [
'author_id'
];
/** /**
* Sortable columns * Sortable columns
* *

4
app/Models/Folder.php
View File

@@ -31,6 +31,10 @@ class Folder extends Model
'emoji' => 'array', 'emoji' => 'array',
]; ];
protected $hidden = [
'author_id'
];
/** /**
* Sortable columns * Sortable columns
* *

17
app/Services/DemoService.php
View File

@@ -29,20 +29,16 @@ class DemoService
*/ */
function create_folder($request) function create_folder($request)
{ {
// Get variables
$user_scope = $request->user() ? $request->user()->token()->scopes[0] : 'editor';
$name = $request->has('name') ? $request->input('name') : 'New Folder';
return [ return [
'user_id' => 1, 'user_id' => 1,
'id' => Str::uuid(), 'id' => Str::uuid(),
'parent_id' => random_int(1000, 9999), 'parent_id' => random_int(1000, 9999),
'name' => $name, 'name' => $request->name,
'type' => 'folder', 'type' => 'folder',
'user_scope' => $user_scope, 'author' => $request->user() ? 'user' : 'visitor',
'items' => '0', 'items' => '0',
'color' => isset($request->icon['color']) ? $request->icon['color'] : null, 'color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null, 'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
'updated_at' => Carbon::now()->format('j M Y \a\t H:i'), 'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
'created_at' => Carbon::now()->format('j M Y \a\t H:i'), 'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
]; ];
@@ -97,9 +93,6 @@ class DemoService
*/ */
function upload($request) function upload($request)
{ {
// Get user data
$user_scope = $request->user() ? $request->user()->token()->scopes[0] : 'editor';
// File // File
$file = $request->file('file'); $file = $request->file('file');
$filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName()); $filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName());
@@ -117,7 +110,7 @@ class DemoService
'filesize' => Metric::bytes($filesize)->format(), 'filesize' => Metric::bytes($filesize)->format(),
'type' => $filetype, 'type' => $filetype,
'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg', 'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg',
'user_scope' => $user_scope, 'author' => $request->user() ? 'user' : 'visitor',
'created_at' => Carbon::now()->format('j M Y \a\t H:i'), 'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
'updated_at' => Carbon::now()->format('j M Y \a\t H:i'), 'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
]; ];

46
app/Services/FileManagerService.php
View File

@@ -166,21 +166,13 @@ class FileManagerService
*/ */
public function create_folder($request, $shared = null) public function create_folder($request, $shared = null)
{ {
// Get variables
//$user_scope = is_null($shared) ? $request->user()->token()->scopes[0] : 'editor';
$user_scope = is_null($shared) ? 'master' : 'editor';
$name = $request->has('name') ? $request->input('name') : 'New Folder';
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
return Folder::create([ return Folder::create([
'parent_id' => $request->parent_id, 'parent_id' => $request->parent_id,
'user_scope' => $user_scope, 'author' => $shared ? 'visitor' : 'user',
'user_id' => $user_id, 'user_id' => $shared ? $shared->user_id : Auth::id(),
'type' => 'folder', 'name' => $request->name,
'name' => $name, 'color' => $request->color ?? null,
'color' => $request->color ?? null, 'emoji' => $request->emoji ?? null,
'emoji' => $request->emoji ?? null,
]);; ]);;
} }
@@ -196,7 +188,7 @@ class FileManagerService
public function rename_item($request, $id, $shared = null) public function rename_item($request, $id, $shared = null)
{ {
// Get user id // Get user id
$user_id = is_null($shared) ? Auth::id() : $shared->user_id; $user_id = $shared ? $shared->user_id : Auth::id();
// Get item // Get item
$item = get_item($request->type, $id, $user_id); $item = get_item($request->type, $id, $user_id);
@@ -396,9 +388,7 @@ class FileManagerService
$disk_local = Storage::disk('local'); $disk_local = Storage::disk('local');
// Get user data // Get user data
//$user_scope = is_null($shared) ? $request->user()->token()->scopes[0] : 'editor'; $user_id = $shared ? $shared->user_id : Auth::id();
$user_scope = is_null($shared) ? 'master' : 'editor';
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
// File Info // File Info
$file_size = $disk_local->size('chunks/' . $temp_filename); $file_size = $disk_local->size('chunks/' . $temp_filename);
@@ -427,16 +417,16 @@ class FileManagerService
// Return new file // Return new file
return UserFile::create([ return UserFile::create([
'mimetype' => get_file_type_from_mimetype($file_mimetype), 'mimetype' => get_file_type_from_mimetype($file_mimetype),
'type' => get_file_type($file_mimetype), 'type' => get_file_type($file_mimetype),
'folder_id' => $request->folder_id, 'folder_id' => $request->folder_id,
'metadata' => $metadata, 'metadata' => $metadata,
'name' => $user_file_name, 'name' => $user_file_name,
'basename' => $disk_file_name, 'basename' => $disk_file_name,
'user_scope' => $user_scope, 'author' => $shared ? 'visitor' : 'user',
'thumbnail' => $thumbnail, 'thumbnail' => $thumbnail,
'filesize' => $file_size, 'filesize' => $file_size,
'user_id' => $user_id, 'user_id' => $user_id,
]); ]);
} }
} }

16
database/factories/FileFactory.php
View File

@@ -32,24 +32,12 @@ class FileFactory extends Factory
'type' => $this->faker->randomElement( 'type' => $this->faker->randomElement(
['image', 'file', 'video', 'audio'] ['image', 'file', 'video', 'audio']
), ),
'user_scope' => $this->faker->randomElement( 'author' => $this->faker->randomElement(
['master', 'editor', 'visitor'] ['user', 'member', 'visitor']
), ),
'created_at' => $this->faker->dateTimeBetween( 'created_at' => $this->faker->dateTimeBetween(
$startDate = '-36 months', $endDate = 'now', $timezone = null $startDate = '-36 months', $endDate = 'now', $timezone = null
), ),
]; ];
} }
/**
* Configure the model factory.
*
* @return $this
*/
public function configure()
{
return $this->afterCreating(function (File $file) {
// TODO: add fake files
});
}
} }

4
database/factories/FolderFactory.php
View File

@@ -25,8 +25,8 @@ class FolderFactory extends Factory
'id' => $this->faker->uuid, 'id' => $this->faker->uuid,
'user_id' => $this->faker->uuid, 'user_id' => $this->faker->uuid,
'name' => $this->faker->word, 'name' => $this->faker->word,
'user_scope' => $this->faker->randomElement( 'author' => $this->faker->randomElement(
['master', 'editor', 'visitor'] ['user', 'member', 'visitor']
), ),
'created_at' => $this->faker->dateTimeBetween( 'created_at' => $this->faker->dateTimeBetween(
$startDate = '-36 months', $endDate = 'now', $timezone = null $startDate = '-36 months', $endDate = 'now', $timezone = null

5
database/migrations/2019_08_15_171328_create_file_manager_folders.php
View File

@@ -21,8 +21,9 @@ class CreateFileManagerFolders extends Migration
$table->string('color')->nullable(); $table->string('color')->nullable();
$table->longText('emoji')->nullable(); $table->longText('emoji')->nullable();
// TODO: upravit user scope $table->enum('author', ['user', 'member', 'visitor'])->default('user');
$table->enum('user_scope', ['master', 'editor', 'visitor'])->default('master'); $table->uuid('author_id')->nullable();
$table->softDeletes(); $table->softDeletes();
$table->timestamps(); $table->timestamps();
}); });

6
database/migrations/2019_08_15_171345_create_file_manager_files.php
View File

@@ -20,7 +20,7 @@ class CreateFileManagerFiles extends Migration
$table->text('thumbnail')->nullable(); $table->text('thumbnail')->nullable();
$table->text('name'); $table->text('name');
$table->text('basename'); $table->string('basename')->index();
$table->text('mimetype')->nullable(); $table->text('mimetype')->nullable();
$table->text('filesize'); $table->text('filesize');
@@ -28,8 +28,8 @@ class CreateFileManagerFiles extends Migration
$table->text('type')->nullable(); $table->text('type')->nullable();
$table->longText('metadata')->nullable(); $table->longText('metadata')->nullable();
// TODO: upravit user scope $table->enum('author', ['user', 'member', 'visitor'])->default('user');
$table->enum('user_scope', ['master', 'editor', 'visitor'])->default('master'); $table->uuid('author_id')->nullable();
$table->softDeletes(); $table->softDeletes();
$table->timestamps(); $table->timestamps();

17
public/mix-manifest.json
View File

@@ -35,8 +35,8 @@
"/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=7525a5201f806293a60a", "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=7525a5201f806293a60a",
"/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js?id=3e43db9b38c83dd03a3b", "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js?id=3e43db9b38c83dd03a3b",
"/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js?id=68e8dbc0e27e1906a855", "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js?id=68e8dbc0e27e1906a855",
"/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=263e85f5dcb402029ca3", "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=aacbc63eccff01afeada",
"/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=90193de08263e128d31a", "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=18ff204697459dad268d",
"/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=3b49ff66accb15109d71", "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=3b49ff66accb15109d71",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7f6474e743f5e147705a", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7f6474e743f5e147705a",
"/chunks/homepage.js": "/chunks/homepage.js?id=0851a272cec4302a3247", "/chunks/homepage.js": "/chunks/homepage.js?id=0851a272cec4302a3247",
@@ -88,16 +88,5 @@
"/chunks/users.js": "/chunks/users.js?id=9085e0306eafce8f9fce", "/chunks/users.js": "/chunks/users.js?id=9085e0306eafce8f9fce",
"/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js?id=b490efdc8470a6c2f625", "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js?id=b490efdc8470a6c2f625",
"/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js?id=be99c10088b00578891b", "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js?id=be99c10088b00578891b",
"/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=66afa0e341251a68c3d3", "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=66afa0e341251a68c3d3"
"/js/main.723fdf599ac2ecb35271.hot-update.js": "/js/main.723fdf599ac2ecb35271.hot-update.js",
"/js/main.4a8fc01e2ff5a4e6ad28.hot-update.js": "/js/main.4a8fc01e2ff5a4e6ad28.hot-update.js",
"/js/main.83e4a1fba24fb3ed581d.hot-update.js": "/js/main.83e4a1fba24fb3ed581d.hot-update.js",
"/js/main.4cd1727b0d5ad436dba4.hot-update.js": "/js/main.4cd1727b0d5ad436dba4.hot-update.js",
"/js/main.7e6541d1cbf9901a3e5a.hot-update.js": "/js/main.7e6541d1cbf9901a3e5a.hot-update.js",
"/js/main.51418924870a080afea3.hot-update.js": "/js/main.51418924870a080afea3.hot-update.js",
"/js/main.869d3fad73dd6fe243f9.hot-update.js": "/js/main.869d3fad73dd6fe243f9.hot-update.js",
"/js/main.d7f2bec845fc64b7d5e4.hot-update.js": "/js/main.d7f2bec845fc64b7d5e4.hot-update.js",
"/js/main.c788f898c265d85a0089.hot-update.js": "/js/main.c788f898c265d85a0089.hot-update.js",
"/chunks/shared/single-file.8964da50e977b3d7d554.hot-update.js": "/chunks/shared/single-file.8964da50e977b3d7d554.hot-update.js",
"/chunks/shared/single-file.c59a56c2ba7f3c2998b8.hot-update.js": "/chunks/shared/single-file.c59a56c2ba7f3c2998b8.hot-update.js"
} }

2
resources/js/components/FilesView/FileInfoPanel.vue
View File

@@ -27,7 +27,7 @@
:content="fileInfoDetail[0].filesize"> :content="fileInfoDetail[0].filesize">
</ListInfoItem> </ListInfoItem>
<ListInfoItem v-if="$checkPermission(['master']) && fileInfoDetail[0].user_scope !== 'master'" <ListInfoItem v-if="$checkPermission(['master']) && fileInfoDetail[0].author !== 'user'"
:title="$t('file_detail.author')" :title="$t('file_detail.author')"
:content="$t('file_detail.author_participant')"> :content="$t('file_detail.author_participant')">
</ListInfoItem> </ListInfoItem>

2
resources/js/components/FilesView/FileItemGrid.vue
View File

@@ -44,7 +44,7 @@
</div> </div>
<!--Participant owner Icon--> <!--Participant owner Icon-->
<div v-if="$checkPermission('master') && item.user_scope !== 'master'" class="item-shared"> <div v-if="$checkPermission('master') && item.author !== 'user'" class="item-shared">
<user-plus-icon size="12" class="shared-icon"></user-plus-icon> <user-plus-icon size="12" class="shared-icon"></user-plus-icon>
</div> </div>

2
resources/js/components/FilesView/FileItemList.vue
View File

@@ -48,7 +48,7 @@
</div> </div>
<!--Participant owner Icon--> <!--Participant owner Icon-->
<div v-if="$checkPermission('master') && item.user_scope !== 'master'" class="item-shared"> <div v-if="$checkPermission('master') && item.author !== 'user'" class="item-shared">
<user-plus-icon size="12" class="shared-icon"></user-plus-icon> <user-plus-icon size="12" class="shared-icon"></user-plus-icon>
</div> </div>

88
tests/Feature/FileManager/BrowseTest.php
View File

@@ -28,33 +28,33 @@ class BrowseTest extends TestCase
$folder_level_1 = Folder::factory(Folder::class) $folder_level_1 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 1', 'name' => 'level 1',
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$folder_level_2 = Folder::factory(Folder::class) $folder_level_2 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 2', 'name' => 'level 2',
'parent_id' => $folder_level_1->id, 'parent_id' => $folder_level_1->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$folder_level_3 = Folder::factory(Folder::class) $folder_level_3 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 3', 'name' => 'level 3',
'parent_id' => $folder_level_2->id, 'parent_id' => $folder_level_2->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$folder_level_2_sibling = Folder::factory(Folder::class) $folder_level_2_sibling = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 2 Sibling', 'name' => 'level 2 Sibling',
'parent_id' => $folder_level_1->id, 'parent_id' => $folder_level_1->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$this->getJson("/api/browse/navigation") $this->getJson("/api/browse/navigation")
@@ -87,7 +87,7 @@ class BrowseTest extends TestCase
"name" => "level 3", "name" => "level 3",
"color" => null, "color" => null,
"emoji" => null, "emoji" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $folder_level_3->created_at, "created_at" => $folder_level_3->created_at,
"updated_at" => $folder_level_3->updated_at->toJson(), "updated_at" => $folder_level_3->updated_at->toJson(),
@@ -132,21 +132,21 @@ class BrowseTest extends TestCase
$folder = Folder::factory(Folder::class) $folder = Folder::factory(Folder::class)
->create([ ->create([
'parent_id' => $root->id, 'parent_id' => $root->id,
'name' => 'Documents', 'name' => 'Documents',
"user_scope" => "master", "author" => "user",
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$file = File::factory(File::class) $file = File::factory(File::class)
->create([ ->create([
'folder_id' => $root->id, 'folder_id' => $root->id,
'name' => 'Document', 'name' => 'Document',
'basename' => 'document.pdf', 'basename' => 'document.pdf',
"mimetype" => "application/pdf", "mimetype" => "application/pdf",
"user_scope" => "master", "author" => "user",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$this->getJson("/api/browse/folders/$root->id") $this->getJson("/api/browse/folders/$root->id")
@@ -159,7 +159,7 @@ class BrowseTest extends TestCase
"name" => "Documents", "name" => "Documents",
"color" => null, "color" => null,
"emoji" => null, "emoji" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $folder->created_at, "created_at" => $folder->created_at,
"updated_at" => $folder->updated_at->toJson(), "updated_at" => $folder->updated_at->toJson(),
@@ -186,7 +186,7 @@ class BrowseTest extends TestCase
"filesize" => $file->filesize, "filesize" => $file->filesize,
"type" => "file", "type" => "file",
"metadata" => null, "metadata" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $file->created_at, "created_at" => $file->created_at,
"updated_at" => $file->updated_at->toJson(), "updated_at" => $file->updated_at->toJson(),
@@ -225,7 +225,7 @@ class BrowseTest extends TestCase
'name' => 'Document 1', 'name' => 'Document 1',
'basename' => 'document-1.pdf', 'basename' => 'document-1.pdf',
"mimetype" => "application/pdf", "mimetype" => "application/pdf",
"user_scope" => "master", "author" => "user",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
'created_at' => Carbon::now(), 'created_at' => Carbon::now(),
@@ -239,7 +239,7 @@ class BrowseTest extends TestCase
'name' => 'Document 2', 'name' => 'Document 2',
'basename' => 'document-2.pdf', 'basename' => 'document-2.pdf',
"mimetype" => "application/pdf", "mimetype" => "application/pdf",
"user_scope" => "master", "author" => "user",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
'created_at' => Carbon::now(), 'created_at' => Carbon::now(),
@@ -259,7 +259,7 @@ class BrowseTest extends TestCase
"filesize" => $file_2->filesize, "filesize" => $file_2->filesize,
"type" => "file", "type" => "file",
"metadata" => null, "metadata" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $file_2->created_at, "created_at" => $file_2->created_at,
"updated_at" => $file_2->updated_at->toJson(), "updated_at" => $file_2->updated_at->toJson(),
@@ -283,7 +283,7 @@ class BrowseTest extends TestCase
"filesize" => $file_1->filesize, "filesize" => $file_1->filesize,
"type" => "file", "type" => "file",
"metadata" => null, "metadata" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $file_1->created_at, "created_at" => $file_1->created_at,
"updated_at" => $file_1->updated_at->toJson(), "updated_at" => $file_1->updated_at->toJson(),
@@ -311,9 +311,9 @@ class BrowseTest extends TestCase
$file = File::factory(File::class) $file = File::factory(File::class)
->create([ ->create([
"user_scope" => "editor", "author" => "visitor",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$this->getJson("/api/browse/participants") $this->getJson("/api/browse/participants")
@@ -338,7 +338,7 @@ class BrowseTest extends TestCase
'parent_id' => null, 'parent_id' => null,
'name' => 'root', 'name' => 'root',
'user_id' => $user->id, 'user_id' => $user->id,
"user_scope" => "master", "author" => "user",
'deleted_at' => Carbon::now(), 'deleted_at' => Carbon::now(),
]); ]);
@@ -348,7 +348,7 @@ class BrowseTest extends TestCase
'name' => 'Document', 'name' => 'Document',
'basename' => 'document.pdf', 'basename' => 'document.pdf',
"mimetype" => "application/pdf", "mimetype" => "application/pdf",
"user_scope" => "master", "author" => "user",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
'deleted_at' => Carbon::now(), 'deleted_at' => Carbon::now(),
@@ -371,7 +371,7 @@ class BrowseTest extends TestCase
"name" => "root", "name" => "root",
"color" => null, "color" => null,
"emoji" => null, "emoji" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => $folder->deleted_at, "deleted_at" => $folder->deleted_at,
"created_at" => $folder->created_at, "created_at" => $folder->created_at,
"updated_at" => $folder->updated_at->toJson(), "updated_at" => $folder->updated_at->toJson(),
@@ -391,7 +391,7 @@ class BrowseTest extends TestCase
"filesize" => $file->filesize, "filesize" => $file->filesize,
"type" => "file", "type" => "file",
"metadata" => null, "metadata" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => $file->deleted_at, "deleted_at" => $file->deleted_at,
"created_at" => $file->created_at, "created_at" => $file->created_at,
"updated_at" => $file->updated_at->toJson(), "updated_at" => $file->updated_at->toJson(),
@@ -453,8 +453,8 @@ class BrowseTest extends TestCase
$file = File::factory(File::class) $file = File::factory(File::class)
->create([ ->create([
'name' => 'Document', 'name' => 'Document',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$this->getJson("/api/browse/search?query=doc") $this->getJson("/api/browse/search?query=doc")
@@ -476,8 +476,8 @@ class BrowseTest extends TestCase
$folder = Folder::factory(Folder::class) $folder = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'Documents', 'name' => 'Documents',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$this->getJson("/api/browse/search?query=doc") $this->getJson("/api/browse/search?query=doc")

56
tests/Feature/Share/VisitorBrowseTest.php
View File

@@ -443,21 +443,21 @@ class VisitorBrowseTest extends TestCase
$folder = Folder::factory(Folder::class) $folder = Folder::factory(Folder::class)
->create([ ->create([
'parent_id' => $root->id, 'parent_id' => $root->id,
'name' => 'Documents', 'name' => 'Documents',
"user_scope" => "master", "author" => "user",
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$file = File::factory(File::class) $file = File::factory(File::class)
->create([ ->create([
'folder_id' => $root->id, 'folder_id' => $root->id,
'name' => 'Document', 'name' => 'Document',
'basename' => 'document.pdf', 'basename' => 'document.pdf',
"mimetype" => "application/pdf", "mimetype" => "application/pdf",
"user_scope" => "master", "author" => "user",
"type" => "file", "type" => "file",
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$json = [ $json = [
@@ -468,7 +468,7 @@ class VisitorBrowseTest extends TestCase
"name" => "Documents", "name" => "Documents",
"color" => null, "color" => null,
"emoji" => null, "emoji" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $folder->created_at, "created_at" => $folder->created_at,
"updated_at" => $folder->updated_at->toJson(), "updated_at" => $folder->updated_at->toJson(),
@@ -487,7 +487,7 @@ class VisitorBrowseTest extends TestCase
"filesize" => $file->filesize, "filesize" => $file->filesize,
"type" => "file", "type" => "file",
"metadata" => null, "metadata" => null,
"user_scope" => "master", "author" => "user",
"deleted_at" => null, "deleted_at" => null,
"created_at" => $file->created_at, "created_at" => $file->created_at,
"updated_at" => $file->updated_at->toJson(), "updated_at" => $file->updated_at->toJson(),
@@ -533,9 +533,9 @@ class VisitorBrowseTest extends TestCase
$folder_level_1 = Folder::factory(Folder::class) $folder_level_1 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 1', 'name' => 'level 1',
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$share = Share::factory(Share::class) $share = Share::factory(Share::class)
@@ -550,26 +550,26 @@ class VisitorBrowseTest extends TestCase
$folder_level_2 = Folder::factory(Folder::class) $folder_level_2 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 2', 'name' => 'level 2',
'parent_id' => $folder_level_1->id, 'parent_id' => $folder_level_1->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$folder_level_3 = Folder::factory(Folder::class) $folder_level_3 = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 3', 'name' => 'level 3',
'parent_id' => $folder_level_2->id, 'parent_id' => $folder_level_2->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$folder_level_2_sibling = Folder::factory(Folder::class) $folder_level_2_sibling = Folder::factory(Folder::class)
->create([ ->create([
'name' => 'level 2 Sibling', 'name' => 'level 2 Sibling',
'parent_id' => $folder_level_1->id, 'parent_id' => $folder_level_1->id,
'user_scope' => 'master', 'author' => 'user',
'user_id' => $user->id, 'user_id' => $user->id,
]); ]);
$tree = [ $tree = [

12
tests/Feature/Share/VisitorManipulatingTest.php
View File

@@ -224,9 +224,9 @@ class VisitorManipulatingTest extends TestCase
} }
$this->assertDatabaseHas('folders', [ $this->assertDatabaseHas('folders', [
'name' => 'Awesome New Folder', 'name' => 'Awesome New Folder',
'parent_id' => $folder->id, 'parent_id' => $folder->id,
'user_scope' => 'editor', 'author' => 'visitor',
]); ]);
}); });
} }
@@ -326,8 +326,8 @@ class VisitorManipulatingTest extends TestCase
$folder = Folder::factory(Folder::class) $folder = Folder::factory(Folder::class)
->create([ ->create([
'user_id' => $user->id, 'user_id' => $user->id,
'user_scope' => 'master', 'author' => 'user',
]); ]);
$share = Share::factory(Share::class) $share = Share::factory(Share::class)
@@ -374,7 +374,7 @@ class VisitorManipulatingTest extends TestCase
]); ]);
$this->assertDatabaseHas('files', [ $this->assertDatabaseHas('files', [
'user_scope' => 'editor', 'author' => 'visitor',
]); ]);
Storage::disk('local') Storage::disk('local')