@@ -93,9 +93,8 @@
import {ChevronLeftIcon, MoreHorizontalIcon} from 'vue-feather-icons'
import SearchBar from '/resources/js/components/FilesView/SearchBar'
import Option from '/resources/js/components/FilesView/Option'
- import {mapGetters} from 'vuex'
import {events} from '/resources/js/bus'
- import {last} from 'lodash'
+ import {mapGetters} from 'vuex'
export default {
name: 'DesktopToolbar',
@@ -119,69 +118,46 @@
computed: {
...mapGetters([
'currentTeamFolder',
- 'isVisibleSidebar',
- 'FilePreviewType',
'currentFolder',
'sharedDetail',
'clipboard',
]),
teamFolder() {
- return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0]
+ return this.currentTeamFolder
+ ? this.currentTeamFolder
+ : this.clipboard[0]
},
- isLoadedFolder() {
+ isNotHomepage() {
if (this.$isThisRoute(this.$route, ['Public'])) {
return this.sharedDetail && this.sharedDetail.data.attributes.item_id === this.$route.params.id
}
return this.$route.params.id
},
- hasCapacity() {
- // Check if storage limitation is set
- if (!this.$store.getters.config.storageLimit) return true
-
- // Check if user is loaded
- if (!this.$store.getters.user) return true
-
- // Check if user has storage
- return this.$store.getters.user.data.attributes.storage.used <= 100
- },
- directoryName() {
- if (this.currentFolder) {
- return this.currentFolder.data.attributes.name
- } else {
- return {
- 'RecentUploads': this.$t('Recent'),
- 'MySharedItems': this.$t('Shared'),
- 'Trash': this.$t('Trash'),
- 'Public': this.$t('Files'),
- 'Files': this.$t('Files'),
- 'TeamFolders': this.$t('Team Folders'),
- }[this.$route.name]
- }
- },
- preview() {
- return this.FilePreviewType === 'list'
- ? 'th'
- : 'th-list'
+ isTeamFolderHomepage() {
+ return this.$isThisRoute(this.$route, ['TeamFolders'])
+ && ! this.$route.params.id
},
canCreateFolderInView() {
- return ! this.$isThisRoute(this.$route, ['Files', 'Public'])
+ return ! this.$isThisRoute(this.$route, ['Files', 'Public', 'TeamFolders'])
+ },
+ canShowConvertToTeamFolder() {
+ return this.$isThisRoute(this.$route, ['Files', 'MySharedItems'])
+ },
+ canUploadInView() {
+ return ! this.$isThisRoute(this.$route, ['Files', 'Public', 'TeamFolders'])
},
canDeleteInView() {
let routes = [
+ 'TeamFolders',
'RecentUploads',
'MySharedItems',
'Trash',
'Public',
'Files',
]
- return !this.$isThisRoute(this.$route, routes) || this.clipboard.length === 0
- },
- canShowConvertToTeamFolder() {
- return this.$isThisRoute(this.$route, ['Files', 'MySharedItems'])
- },
- canUploadInView() {
- return ! this.$isThisRoute(this.$route, ['Files', 'Public'])
+ return !this.$isThisRoute(this.$route, routes)
+ || this.clipboard.length === 0
},
canMoveInView() {
let routes = [
@@ -189,8 +165,10 @@
'MySharedItems',
'Public',
'Files',
+ 'TeamFolders',
]
- return ! this.$isThisRoute(this.$route, routes) || this.clipboard.length === 0
+ return ! this.$isThisRoute(this.$route, routes)
+ || this.clipboard.length === 0
},
canShareInView() {
let routes = [
@@ -200,31 +178,27 @@
'Public',
'Files',
]
- return ! this.$isThisRoute(this.$route, routes) || this.clipboard.length > 1 || this.clipboard.length === 0
+ return ! this.$isThisRoute(this.$route, routes)
+ || this.clipboard.length > 1
+ || this.clipboard.length === 0
},
canCreateTeamFolderInView() {
let routes = [
'MySharedItems',
'Files',
]
- return this.$isThisRoute(this.$route, routes) && this.clipboard.length === 1 && this.clipboard[0].data.type === 'folder'
- }
- },
- data() {
- return {
- members: [
- '/temp/avatar-01.png',
- '/temp/avatar-02.png',
- '/temp/avatar-03.png',
- ],
+
+ return this.$isThisRoute(this.$route, routes)
+ && this.clipboard.length === 1
+ && this.clipboard[0].data.type === 'folder'
}
},
methods: {
goBack() {
- if (this.isLoadedFolder) this.$router.back()
+ if (this.isNotHomepage) this.$router.back()
},
showTeamFolderMenu() {
- if (this.currentTeamFolder || this.clipboard[0])
+ if (this.teamFolder)
events.$emit('popover:open', 'team-folder')
},
showCreateMenu() {
diff --git a/resources/js/components/FilesView/MobileToolbar.vue b/resources/js/components/FilesView/MobileToolbar.vue
index f09d4b6a..553dba14 100644
--- a/resources/js/components/FilesView/MobileToolbar.vue
+++ b/resources/js/components/FilesView/MobileToolbar.vue
@@ -7,7 +7,7 @@
- {{ directoryName }}
+ {{ $getCurrentLocationName() }}
@@ -41,19 +41,6 @@
'FilePreviewType',
'currentFolder',
]),
- directoryName() {
- if (this.currentFolder) {
- return this.currentFolder.data.attributes.name
- } else {
- return {
- 'RecentUploads': this.$t('Recent'),
- 'MySharedItems': this.$t('Shared'),
- 'Trash': this.$t('Trash'),
- 'Public': this.$t('Files'),
- 'Files': this.$t('Files'),
- }[this.$route.name]
- }
- },
isLoadedFolder() {
return this.$route.params.id
},
diff --git a/resources/js/components/Teams/Components/TeamFolderPreview.vue b/resources/js/components/Teams/Components/TeamFolderPreview.vue
index a1a92d48..8b1ece72 100644
--- a/resources/js/components/Teams/Components/TeamFolderPreview.vue
+++ b/resources/js/components/Teams/Components/TeamFolderPreview.vue
@@ -1,7 +1,7 @@
- The Team Project
+ {{ teamFolder.data.attributes.name }}
Last update a week ago
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index d043070f..7ccd9a08 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -201,6 +201,21 @@ const FunctionHelpers = {
anchor.click()
}
+ Vue.prototype.$getCurrentLocationName = function () {
+ if (store.getters.currentFolder) {
+ return store.getters.currentFolder.data.attributes.name
+ } else {
+ return {
+ 'RecentUploads': this.$t('Recent'),
+ 'MySharedItems': this.$t('Shared'),
+ 'Trash': this.$t('Trash'),
+ 'Public': this.$t('Files'),
+ 'Files': this.$t('Files'),
+ 'TeamFolders': this.$t('Team Folders'),
+ }[this.$route.name]
+ }
+ }
+
Vue.prototype.$goToFileView = function (id) {
let locations = {
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 526555c7..b016edbf 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -170,7 +170,7 @@ const mutations = {
},
INCREASE_FOLDER_ITEM(state, id) {
state.entries.map(el => {
- if (el.data.id && el.data.id === id) el.items++
+ if (el.data.id && el.data.id === id) el.data.attributes.items++
})
},
REMOVE_ITEM_FROM_CLIPBOARD(state, item) {
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 8b2530b5..2f1e8ab6 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -73,7 +73,7 @@ const actions = {
.then(() => {
itemsToMove.forEach(item => {
commit('REMOVE_ITEM', item.id)
- commit('INCREASE_FOLDER_ITEM', to_item.id)
+ commit('INCREASE_FOLDER_ITEM', to_item.data.id)
if (item.type === 'folder')
dispatch('getAppData')
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index 3a9296d1..2327d447 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -1,4 +1,5 @@
setUpFaker();
}
@@ -729,6 +731,20 @@ class SetupDevEnvironment extends Command
'name' => 'Company Project',
]);
+ Folder::factory()
+ ->create([
+ 'user_id' => $user->id,
+ 'parent_id' => $companyProjectFolder->id,
+ 'name' => 'Presentation Materials',
+ ]);
+
+ Folder::factory()
+ ->create([
+ 'user_id' => $user->id,
+ 'parent_id' => $companyProjectFolder->id,
+ 'name' => 'Team Gallery',
+ ]);
+
$financeDocumentsFolder = Folder::factory()
->create([
'user_id' => $user->id,
@@ -742,34 +758,34 @@ class SetupDevEnvironment extends Command
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',
- ])
+ 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',
- ])
+ 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',
- ])
+ fn($user) => TeamFolderInvitation::factory()
+ ->create([
+ 'email' => $user->email,
+ 'folder_id' => $companyProjectFolder->id,
+ 'status' => 'pending',
+ 'permission' => 'can-edit',
+ ])
);
}