navigation after created team folder

This commit is contained in:
Peter Papp
2021-08-31 14:36:40 +02:00
parent a3516769de
commit c916916a4d
5 changed files with 31 additions and 7 deletions

View File

@@ -58,7 +58,7 @@
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
"/chunks/plans.js": "/chunks/plans.js?id=e93cd9c42177eadc8825",
"/chunks/platform.js": "/chunks/platform.js?id=7ec7f91183a9e46e3f41",
"/chunks/platform.js": "/chunks/platform.js?id=39e4ea880516add24c59",
"/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=6000d49dae81f57df3d0",
"/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
@@ -136,5 +136,17 @@
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.69b50aa8397c39fb3a7b.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.69b50aa8397c39fb3a7b.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.855b1071699829b8ef36.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.855b1071699829b8ef36.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.cbd5b81577bd1e5f68df.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.cbd5b81577bd1e5f68df.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.f8708232f16a94aada33.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.f8708232f16a94aada33.hot-update.js"
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.f8708232f16a94aada33.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.f8708232f16a94aada33.hot-update.js",
"/chunks/platform.86d7387fabe8e1ceb6e3.hot-update.js": "/chunks/platform.86d7387fabe8e1ceb6e3.hot-update.js",
"/chunks/platform.651526a58941da39ccac.hot-update.js": "/chunks/platform.651526a58941da39ccac.hot-update.js",
"/chunks/platform.c90443ff84fc323356ac.hot-update.js": "/chunks/platform.c90443ff84fc323356ac.hot-update.js",
"/chunks/platform.e02ad54c96972da3c2e5.hot-update.js": "/chunks/platform.e02ad54c96972da3c2e5.hot-update.js",
"/chunks/platform.6faad1c8e9dcb9b48d77.hot-update.js": "/chunks/platform.6faad1c8e9dcb9b48d77.hot-update.js",
"/chunks/platform.62067c279f0b6fe953cb.hot-update.js": "/chunks/platform.62067c279f0b6fe953cb.hot-update.js",
"/chunks/platform.d163e0ce72441f0c848d.hot-update.js": "/chunks/platform.d163e0ce72441f0c848d.hot-update.js",
"/chunks/platform.c03895b2209c2fcffeb9.hot-update.js": "/chunks/platform.c03895b2209c2fcffeb9.hot-update.js",
"/chunks/platform.add54d9080a4c72facb3.hot-update.js": "/chunks/platform.add54d9080a4c72facb3.hot-update.js",
"/chunks/platform.b270ed5302710d2d9b4d.hot-update.js": "/chunks/platform.b270ed5302710d2d9b4d.hot-update.js",
"/chunks/platform.a3857edeaf0f1b1262f2.hot-update.js": "/chunks/platform.a3857edeaf0f1b1262f2.hot-update.js",
"/chunks/platform.3f5a03ca3df53bb04c5e.hot-update.js": "/chunks/platform.3f5a03ca3df53bb04c5e.hot-update.js"
}

View File

@@ -135,11 +135,20 @@
axios
.post(route, payload)
.then(response => {
// todo: push to team folder
//this.$router.push({name: 'TeamFolders', params: {id: response.data.id}})
let isTeamFoldersLocation = this.$isThisRoute(this.$route, ['TeamFolders'])
if (! this.$isThisRoute(this.$route, ['TeamFolders']))
// Redirect into newly created team folder
if (isTeamFoldersLocation && this.$route.params.id) {
this.$router.push({name: 'TeamFolders', params: {id: response.data.data.id}})
// Add created team folder into Team Folder homepage view
} else if (isTeamFoldersLocation && ! this.$route.params.id) {
this.$store.commit('ADD_NEW_FOLDER', response.data)
// Redirect to Team Folders after converting simple folder
} else if (! isTeamFoldersLocation) {
this.$router.push({name: 'TeamFolders'})
}
this.$store.dispatch('getAppData')
})

View File

@@ -5,9 +5,12 @@ use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Notification;
use Domain\Teams\Models\TeamFolderInvitation;
use Domain\Teams\Notifications\InvitationIntoTeamFolder;
use Spatie\QueueableAction\QueueableAction;
class InviteMembersIntoTeamFolderAction
{
use QueueableAction;
public function __invoke(
array $members,
Folder $folder,

View File

@@ -31,7 +31,7 @@ class UpdateInvitationsAction
// Invite team members
if ($newbies->isNotEmpty()) {
($this->inviteMembers)($newbies->toArray(), $folder);
$this->inviteMembers->onQueue()->execute($newbies->toArray(), $folder);
}
// Delete invite from team folder

View File

@@ -81,7 +81,7 @@ class TeamFoldersController extends Controller
]);
// Invite team members
($this->inviteMembers)($data->invitations, $folder);
$this->inviteMembers->onQueue()->execute($data->invitations, $folder);
return response(new FolderResource($folder), 201);
}