- gate implementation

- protected shared view fix
This commit is contained in:
Čarodej
2021-09-24 10:52:19 +02:00
parent d40108f6a9
commit 19cc01131b
84 changed files with 876 additions and 406 deletions
@@ -2,10 +2,10 @@
namespace Domain\Teams\Actions;
use Domain\Folders\Models\Folder;
use Spatie\QueueableAction\QueueableAction;
use Illuminate\Support\Facades\Notification;
use Domain\Teams\Models\TeamFolderInvitation;
use Domain\Teams\Notifications\InvitationIntoTeamFolder;
use Spatie\QueueableAction\QueueableAction;
class InviteMembersIntoTeamFolderAction
{
@@ -21,7 +21,7 @@ class InviteMembersIntoTeamFolderAction
$invitation = TeamFolderInvitation::create([
'permission' => $member['permission'],
'email' => $member['email'],
'folder_id' => $folder->id,
'parent_id' => $folder->id,
]);
// Invite user
@@ -37,7 +37,7 @@ class UpdateInvitationsAction
// Delete invite from team folder
if ($removed->isNotEmpty()) {
DB::table('team_folder_invitations')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->whereIn('email', $removed)
->delete();
}
@@ -47,7 +47,7 @@ class UpdateInvitationsAction
->each(
fn ($invitation) =>
DB::table('team_folder_invitations')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->where('email', $invitation['email'])
->update([
'permission' => $invitation['permission'],
@@ -20,7 +20,7 @@ class UpdateMembersAction
// Remove team members from team folder
if ($deletedMembers->isNotEmpty()) {
DB::table('team_folder_members')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->whereIn('user_id', $deletedMembers->toArray())
->delete();
}
@@ -30,7 +30,7 @@ class UpdateMembersAction
->each(
fn ($member) =>
DB::table('team_folder_members')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->where('user_id', $member['id'])
->update([
'permission' => $member['permission'],
@@ -26,7 +26,7 @@ class BrowseSharedWithMeController
->get();
$files = File::with($relations)
->where('folder_id', $id)
->where('parent_id', $id)
->sortable()
->get();
}
@@ -34,7 +34,7 @@ class BrowseSharedWithMeController
if (! $rootId) {
$folderIds = DB::table('team_folder_members')
->where('user_id', Auth::id())
->pluck('folder_id');
->pluck('parent_id');
$folders = Folder::with($relations)
->whereIn('id', $folderIds)
@@ -22,7 +22,7 @@ class InvitationsController extends Controller
DB::table('team_folder_members')
->insert([
'folder_id' => $invitation->folder_id,
'parent_id' => $invitation->parent_id,
'user_id' => $user->id,
'permission' => 'can-edit',
]);
@@ -54,7 +54,7 @@ class TeamFoldersController extends Controller
: $requestedFolder;
// Get files
$files = File::where('folder_id', $rootId)
$files = File::where('parent_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
@@ -109,12 +109,12 @@ class TeamFoldersController extends Controller
{
// Delete existing invitations
DB::table('team_folder_invitations')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->delete();
// Delete attached members from folder
DB::table('team_folder_members')
->where('folder_id', $folder->id)
->where('parent_id', $folder->id)
->delete();
$folder->update([
@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @method static create(array $array)
* @property string id
* @property string folder_id
* @property string parent_id
* @property string email
* @property string status
* @property string created_at