-
@@ -18,8 +18,12 @@
},
computed: {
...mapGetters([
- 'clipboard'
- ])
+ 'currentTeamFolder',
+ 'clipboard',
+ ]),
+ teamFolder() {
+ return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0]
+ }
},
}
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 6b72a047..d043070f 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -81,12 +81,6 @@ const FunctionHelpers = {
return '/invoice/' + customer + '/' + id
}
- Vue.prototype.$openImageOnNewTab = function (source) {
- let win = window.open(source, '_blank')
-
- win.focus()
- }
-
Vue.prototype.$uploadFiles = async function (files) {
if (files.length === 0) return
@@ -207,6 +201,19 @@ const FunctionHelpers = {
anchor.click()
}
+ Vue.prototype.$goToFileView = function (id) {
+
+ let locations = {
+ 'Public': {name: 'Public', params: {token: this.$route.params.token, id: id}},
+ 'TeamFolders': {name: 'TeamFolders', params: {id: id}},
+ 'MySharedItems': {name: 'Files', params: {id: id}},
+ 'Trash': {name: 'Trash', params: {id: id}},
+ 'Files': {name: 'Files', params: {id: id}},
+ }
+
+ this.$router.push(locations[this.$router.currentRoute.name])
+ }
+
Vue.prototype.$isThisRoute = function (route, locations) {
return locations.includes(route.name)
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 14be0e1f..21f9994a 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -5,6 +5,7 @@ import fileFunctions from './modules/fileFunctions'
import fileBrowser from './modules/fileBrowser'
import userAuth from './modules/userAuth'
import sharing from './modules/sharing'
+import teams from './modules/teams'
import app from './modules/app'
Vue.use(Vuex)
@@ -15,6 +16,7 @@ export default new Vuex.Store({
fileBrowser,
userAuth,
sharing,
+ teams,
app,
}
})
\ No newline at end of file
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index e46a75e8..526555c7 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -46,35 +46,6 @@ const actions = {
}
})
},
- getTeamFolder: ({commit, getters}, id) => {
- commit('LOADING_STATE', {loading: true, data: []})
-
- axios
- .get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}`)
- .then(response => {
- commit('LOADING_STATE', {loading: false, data: response.data.folders.data})
- commit('SET_CURRENT_FOLDER', response.data.root)
-
- events.$emit('scrollTop')
- })
- .catch(error => {
-
- // Redirect if unauthenticated
- if ([401, 403].includes(error.response.status)) {
-
- commit('SET_AUTHORIZED', false)
- router.push({name: 'SignIn'})
-
- } else {
-
- // Show error message
- events.$emit('alert:open', {
- title: i18n.t('popup_error.title'),
- message: i18n.t('popup_error.message'),
- })
- }
- })
- },
getRecentUploads: ({commit, getters}) => {
commit('LOADING_STATE', {loading: true, data: []})
diff --git a/resources/js/store/modules/teams.js b/resources/js/store/modules/teams.js
new file mode 100644
index 00000000..6531052e
--- /dev/null
+++ b/resources/js/store/modules/teams.js
@@ -0,0 +1,68 @@
+import router from "../../router";
+import {events} from "../../bus";
+import i18n from "../../i18n";
+import axios from "axios";
+
+const defaultState = {
+ currentTeamFolder: undefined,
+}
+
+const actions = {
+ getTeamFolder: ({commit, getters}, id) => {
+ commit('LOADING_STATE', {loading: true, data: []})
+
+ if (typeof id === 'undefined') {
+ commit('SET_CURRENT_TEAM_FOLDER', null)
+ }
+
+ axios
+ .get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}`)
+ .then(response => {
+ let folders = response.data.folders.data
+ let files = response.data.files.data
+
+ commit('LOADING_STATE', {loading: false, data: folders.concat(files)})
+ commit('SET_CURRENT_FOLDER', response.data.root)
+
+ if (! getters.currentTeamFolder || getters.currentTeamFolder.data.id !== response.data.teamFolder.data.id) {
+ commit('SET_CURRENT_TEAM_FOLDER', response.data.teamFolder)
+ }
+
+ events.$emit('scrollTop')
+ })
+ .catch(error => {
+
+ // Redirect if unauthenticated
+ if ([401, 403].includes(error.response.status)) {
+
+ commit('SET_AUTHORIZED', false)
+ router.push({name: 'SignIn'})
+
+ } else {
+
+ // Show error message
+ events.$emit('alert:open', {
+ title: i18n.t('popup_error.title'),
+ message: i18n.t('popup_error.message'),
+ })
+ }
+ })
+ },
+}
+
+const mutations = {
+ SET_CURRENT_TEAM_FOLDER(state, payload) {
+ state.currentTeamFolder = payload
+ }
+}
+
+const getters = {
+ currentTeamFolder: state => state.currentTeamFolder,
+}
+
+export default {
+ state: defaultState,
+ getters,
+ actions,
+ mutations
+}
\ No newline at end of file
diff --git a/resources/js/views/FileView/TeamFolders.vue b/resources/js/views/FileView/TeamFolders.vue
index 5f15a425..80545ad4 100644
--- a/resources/js/views/FileView/TeamFolders.vue
+++ b/resources/js/views/FileView/TeamFolders.vue
@@ -210,6 +210,7 @@
events.$on('context-menu:show', (event, item) => this.item = item)
events.$on('mobile-context-menu:show', item => this.item = item)
+ events.$on('context-menu:current-folder', folder => this.item = folder)
events.$on('action:confirmed', data => {
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index caa60be6..3a9296d1 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -1,18 +1,17 @@
setUpFaker();
}
@@ -743,34 +741,36 @@ class SetupDevEnvironment extends Command
->get();
collect([$members[0]->id, $members[1]->id])
- ->each(fn($id) => DB::table('team_folder_members')
- ->insert([
- 'folder_id' => $companyProjectFolder->id,
- 'user_id' => $id,
- 'permission' => 'can-edit',
- ])
+ ->each(
+ fn ($id) => DB::table('team_folder_members')
+ ->insert([
+ 'folder_id' => $companyProjectFolder->id,
+ 'user_id' => $id,
+ 'permission' => 'can-edit',
+ ])
);
collect([$members[2]->id, $members[3]->id])
- ->each(fn($id) => DB::table('team_folder_members')
- ->insert([
- 'folder_id' => $financeDocumentsFolder->id,
- 'user_id' => $id,
- 'permission' => 'can-edit',
- ])
+ ->each(
+ fn ($id) => DB::table('team_folder_members')
+ ->insert([
+ 'folder_id' => $financeDocumentsFolder->id,
+ 'user_id' => $id,
+ 'permission' => 'can-edit',
+ ])
);
// Create invitations
collect([$members[4], $members[5]])
- ->each(fn($user) => TeamFolderInvitation::factory()
- ->create([
- 'email' => $user->email,
- 'folder_id' => $companyProjectFolder->id,
- 'status' => 'pending',
- 'permission' => 'can-edit',
- ])
+ ->each(
+ fn ($user) => TeamFolderInvitation::factory()
+ ->create([
+ 'email' => $user->email,
+ 'folder_id' => $companyProjectFolder->id,
+ 'status' => 'pending',
+ 'permission' => 'can-edit',
+ ])
);
-
}
private function create_share_records(): void
diff --git a/src/App/Users/Models/User.php b/src/App/Users/Models/User.php
index 2d370f1a..b05f61c7 100644
--- a/src/App/Users/Models/User.php
+++ b/src/App/Users/Models/User.php
@@ -1,5 +1,4 @@
$this->usedCapacity,
'used_formatted' => Metric::bytes($this->usedCapacity)->format(),
@@ -104,7 +103,7 @@ class User extends Authenticatable implements MustVerifyEmail
}
return [
- 'used' => (float)get_storage_fill_percentage($this->usedCapacity, $this->settings->storage_capacity),
+ 'used' => (float) get_storage_fill_percentage($this->usedCapacity, $this->settings->storage_capacity),
'used_formatted' => get_storage_fill_percentage($this->usedCapacity, $this->settings->storage_capacity) . '%',
'capacity' => $this->settings->storage_capacity,
'capacity_formatted' => format_gigabytes($this->settings->storage_capacity),
@@ -117,7 +116,7 @@ class User extends Authenticatable implements MustVerifyEmail
public function getUsedCapacityAttribute(): int
{
return $this->filesWithTrashed
- ->map(fn($item) => $item->getRawOriginal())->sum('filesize');
+ ->map(fn ($item) => $item->getRawOriginal())->sum('filesize');
}
/**
diff --git a/src/App/Users/Models/UserSettings.php b/src/App/Users/Models/UserSettings.php
index 9e095087..fd20bb04 100644
--- a/src/App/Users/Models/UserSettings.php
+++ b/src/App/Users/Models/UserSettings.php
@@ -3,7 +3,6 @@ namespace App\Users\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
class UserSettings extends Model
{
diff --git a/src/Domain/Browsing/Controllers/BrowseFolderController.php b/src/Domain/Browsing/Controllers/BrowseFolderController.php
index 5a72838b..41553a36 100644
--- a/src/Domain/Browsing/Controllers/BrowseFolderController.php
+++ b/src/Domain/Browsing/Controllers/BrowseFolderController.php
@@ -1,16 +1,14 @@
fakeUploadFile)($request);
}
diff --git a/src/Domain/Files/Resources/FileResource.php b/src/Domain/Files/Resources/FileResource.php
index 68119d0f..e63f55ec 100644
--- a/src/Domain/Files/Resources/FileResource.php
+++ b/src/Domain/Files/Resources/FileResource.php
@@ -1,5 +1,4 @@
[
- $this->mergeWhen($this->shared, fn() => [
+ $this->mergeWhen($this->shared, fn () => [
'shared' => new ShareResource($this->shared),
]),
- $this->mergeWhen($this->parent, fn() => [
+ $this->mergeWhen($this->parent, fn () => [
'parent' => [
'data' => [
'type' => 'folder',
@@ -54,7 +53,7 @@ class FileResource extends JsonResource
],
],
]),
- ]
+ ],
],
];
}
diff --git a/src/Domain/Folders/Controllers/CreateFolderController.php b/src/Domain/Folders/Controllers/CreateFolderController.php
index 90b4ddca..22a7396a 100644
--- a/src/Domain/Folders/Controllers/CreateFolderController.php
+++ b/src/Domain/Folders/Controllers/CreateFolderController.php
@@ -2,9 +2,9 @@
namespace Domain\Folders\Controllers;
use Auth;
-use Domain\Folders\Resources\FolderResource;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
+use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\Folders\Requests\CreateFolderRequest;
use Support\Demo\Actions\FakeCreateFolderAction;
diff --git a/src/Domain/Folders/Models/Folder.php b/src/Domain/Folders/Models/Folder.php
index cc8ecd0c..8a03e94b 100644
--- a/src/Domain/Folders/Models/Folder.php
+++ b/src/Domain/Folders/Models/Folder.php
@@ -203,6 +203,16 @@ class Folder extends Model
->withPivot('permission');
}
+ public function parents(): HasMany
+ {
+ return $this->hasMany(Folder::class, 'id', 'parent_id');
+ }
+
+ public function teamRoot(): HasMany
+ {
+ return $this->parents()->with('teamRoot');
+ }
+
// Delete all folder children
public static function boot()
{
@@ -214,30 +224,28 @@ class Folder extends Model
static::deleting(function ($item) {
if ($item->isForceDeleting()) {
- $item->trashedChildren()->each(function ($folder) {
- $folder->forceDelete();
- });
+ $item
+ ->trashedChildren()
+ ->each(fn ($folder) => $folder->forceDelete());
} else {
- $item->children()->each(function ($folder) {
- $folder->delete();
- });
+ $item
+ ->children()
+ ->each(fn ($folder) => $folder->delete());
- $item->files()->each(function ($file) {
- $file->delete();
- });
+ $item
+ ->files()
+ ->each(fn ($file) => $file->delete());
}
});
+ // Restore children folders and files
static::restoring(function ($item) {
- // Restore children folders
- $item->trashedChildren()->each(function ($folder) {
- $folder->restore();
- });
-
- // Restore children files
- $item->trashedFiles()->each(function ($files) {
- $files->restore();
- });
+ $item
+ ->trashedChildren()
+ ->each(fn ($folder) => $folder->restore());
+ $item
+ ->trashedFiles()
+ ->each(fn ($files) => $files->restore());
});
}
}
diff --git a/src/Domain/Folders/Resources/FolderResource.php b/src/Domain/Folders/Resources/FolderResource.php
index 2b26d622..2f7dac96 100644
--- a/src/Domain/Folders/Resources/FolderResource.php
+++ b/src/Domain/Folders/Resources/FolderResource.php
@@ -1,11 +1,10 @@
[
- $this->mergeWhen($this->teamMembers, fn() => [
+ $this->mergeWhen($this->teamMembers, fn () => [
'members' => new TeamMembersCollection($this->teamMembers),
]),
- $this->mergeWhen($this->teamInvitations, fn() => [
+ $this->mergeWhen($this->teamInvitations, fn () => [
'invitations' => new TeamInvitationsCollection($this->teamInvitations),
]),
- $this->mergeWhen($this->shared, fn() => [
+ $this->mergeWhen($this->shared, fn () => [
'shared' => new ShareResource($this->shared),
]),
- $this->mergeWhen($this->parent, fn() => [
+ $this->mergeWhen($this->parent, fn () => [
'parent' => [
'data' => [
'type' => 'folder',
diff --git a/src/Domain/Items/Actions/RenameFileOrFolderAction.php b/src/Domain/Items/Actions/RenameFileOrFolderAction.php
index 495289ab..f98c1eff 100644
--- a/src/Domain/Items/Actions/RenameFileOrFolderAction.php
+++ b/src/Domain/Items/Actions/RenameFileOrFolderAction.php
@@ -1,8 +1,6 @@
input('type'), $id);
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index ad5014cc..7dd218f9 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -25,7 +25,7 @@ class RenameFileOrFolderController extends Controller
public function __invoke(
RenameItemRequest $request,
string $id,
- ): FileResource|FolderResource|array {
+ ): FileResource | FolderResource | array {
if (is_demo_account(Auth::user()->email)) {
return ($this->fakeRenameFileOrFolder)($request, $id);
}
diff --git a/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php
index 844cdacd..3c3e92ac 100644
--- a/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php
@@ -1,12 +1,11 @@
$this->permission,
'protected' => $this->is_protected,
'item_id' => $this->item_id,
- 'expire_in' => (int)$this->expire_in,
+ 'expire_in' => (int) $this->expire_in,
'token' => $this->token,
'link' => $this->link,
'type' => $this->type,
diff --git a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
index 1afea588..b61a306c 100644
--- a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
+++ b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
@@ -16,7 +16,7 @@ class BrowseSharedWithMeController
$relations = [
'parent:id,name',
- 'shared:token,id,item_id,permission,is_protected,expire_in'
+ 'shared:token,id,item_id,permission,is_protected,expire_in',
];
if ($rootId) {
diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
index 146cefb5..1a7a10ce 100644
--- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
+++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
@@ -1,11 +1,11 @@
update([
'team_folder' => 1,
'parent_id' => null,
diff --git a/src/Domain/Teams/Controllers/InvitationsController.php b/src/Domain/Teams/Controllers/InvitationsController.php
index 3f673f23..77bdc151 100644
--- a/src/Domain/Teams/Controllers/InvitationsController.php
+++ b/src/Domain/Teams/Controllers/InvitationsController.php
@@ -10,11 +10,9 @@ use Illuminate\Contracts\Routing\ResponseFactory;
class InvitationsController extends Controller
{
-
public function update(
TeamFolderInvitation $invitation
- ): ResponseFactory|Response {
-
+ ): ResponseFactory | Response {
$user = User::where('email', $invitation->email)
->firstOrFail();
@@ -34,7 +32,7 @@ class InvitationsController extends Controller
public function destroy(
TeamFolderInvitation $invitation
- ): ResponseFactory|Response {
+ ): ResponseFactory | Response {
$invitation->update([
'status' => 'rejected',
]);
diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php
index f1b31dfe..852e3562 100644
--- a/src/Domain/Teams/Controllers/TeamFoldersController.php
+++ b/src/Domain/Teams/Controllers/TeamFoldersController.php
@@ -1,25 +1,23 @@
where('parent_id', $rootId)
- ->where('team_folder', $isHomepage)
+ $rootId = Str::isUuid($id) ? $id : null;
+ $requestedFolder = $rootId ? Folder::findOrFail($rootId) : null;
+
+ $folders = Folder::where('parent_id', $rootId)
+ ->where('team_folder', ! Str::isUuid($id))
->where('user_id', Auth::id())
->sortable()
->get();
- if (Str::isUuid($id)) {
- $files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
- ->where('folder_id', $rootId)
+ if ($requestedFolder) {
+ // Get root team folder
+ $teamRootIdResults = recursiveFind(
+ $requestedFolder->teamRoot->toArray(),
+ 'id'
+ );
+
+ $teamRootId = end($teamRootIdResults);
+
+ $teamRootFolder = $teamRootId
+ ? Folder::findOrFail($teamRootId)
+ : $requestedFolder;
+
+ // Get files
+ $files = File::where('folder_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
@@ -57,15 +62,16 @@ class TeamFoldersController extends Controller
// Collect folders and files to single array
return [
- 'folders' => new FolderCollection($folders),
- 'files' => new FilesCollection($files),
- 'root' => $requestedFolder,
+ 'folders' => new FolderCollection($folders),
+ 'files' => new FilesCollection($files),
+ 'root' => $requestedFolder ? new FolderResource($requestedFolder) : null,
+ 'teamFolder' => $teamRootFolder ? new FolderResource($teamRootFolder) : null,
];
}
public function store(
CreateTeamFolderRequest $request,
- ): ResponseFactory|Response {
+ ): ResponseFactory | Response {
$data = CreateTeamFolderData::fromRequest($request);
$folder = Folder::create([
@@ -85,7 +91,7 @@ class TeamFoldersController extends Controller
Folder $folder,
UpdateInvitationsAction $updateInvitations,
UpdateMembersAction $updateMembers,
- ): ResponseFactory|Response {
+ ): ResponseFactory | Response {
$updateInvitations(
$folder,
$request->input('invitations')
@@ -99,7 +105,7 @@ class TeamFoldersController extends Controller
return response(new FolderResource($folder), 201);
}
- public function destroy(Folder $folder): ResponseFactory|Response
+ public function destroy(Folder $folder): ResponseFactory | Response
{
// Delete existing invitations
DB::table('team_folder_invitations')
diff --git a/src/Domain/Teams/DTO/CreateTeamFolderData.php b/src/Domain/Teams/DTO/CreateTeamFolderData.php
index e3d51344..c3f30547 100644
--- a/src/Domain/Teams/DTO/CreateTeamFolderData.php
+++ b/src/Domain/Teams/DTO/CreateTeamFolderData.php
@@ -1,5 +1,4 @@
'shared',
'attributes' => [
'permission' => $share->permission,
- 'protected' => false,
+ 'protected' => false,
'item_id' => $share->item_id,
'expire_in' => $share->expire_in,
'token' => $share->token,
diff --git a/tests/Domain/Teams/TeamsTest.php b/tests/Domain/Teams/TeamsTest.php
index b92d6a29..ce0dd805 100644
--- a/tests/Domain/Teams/TeamsTest.php
+++ b/tests/Domain/Teams/TeamsTest.php
@@ -1,5 +1,4 @@
create([
+ 'team_folder' => 1,
+ ]);
+
+ $level_1 = Folder::factory()
+ ->create([
+ 'parent_id' => $teamFolder->id,
+ ]);
+
+ $level_2 = Folder::factory()
+ ->create([
+ 'parent_id' => $level_1->id,
+ ]);
+
+ $teamRoot = recursiveFind($level_2->teamRoot->toArray(), 'id');
+
+ $this->assertEquals($teamFolder->id, end($teamRoot));
+ }
+
/**
* @test
*/