nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-06 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed backspace functionality for team folder and sharedwithme homepage

Browse Source
This commit is contained in:
Čarodej
2022-03-15 11:21:14 +01:00
parent d0b4b729c9
commit dfeef6fdf8
22 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/mix-manifest.json
View File

@@ -1,7 +1,7 @@
{ {
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=6e899824be266ea6", "/chunks/request.js": "/chunks/request.js?id=7fbca8efa74213a9",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=838bc706adb900ab", "/chunks/request-upload.js": "/chunks/request-upload.js?id=b6be860c5c652907",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=0bcc38e60d97631d", "/chunks/status-check.js": "/chunks/status-check.js?id=0bcc38e60d97631d",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8ce2150648a811b5", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8ce2150648a811b5",
@@ -9,13 +9,13 @@
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=7f6a9af36bfcd706", "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=7f6a9af36bfcd706",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=0df2494d2269a949", "/chunks/app-setup.js": "/chunks/app-setup.js?id=0df2494d2269a949",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=2d131d1d784c98b9", "/chunks/admin-account.js": "/chunks/admin-account.js?id=2d131d1d784c98b9",
"/chunks/shared.js": "/chunks/shared.js?id=e68646d339b36632", "/chunks/shared.js": "/chunks/shared.js?id=2140427cf582d1d5",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=7bb384461baaf4f2", "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=aa4494b47b60f41d",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=34e05a8b937a1436", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=6e70e37a5bd397e7",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=2b7cf12984397d27", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=2b7cf12984397d27",
"/chunks/not-found.js": "/chunks/not-found.js?id=36763aa314e00327", "/chunks/not-found.js": "/chunks/not-found.js?id=36763aa314e00327",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=a3906226272982b1", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=a3906226272982b1",
"/chunks/admin.js": "/chunks/admin.js?id=c3eb2a10ca6f09b8", "/chunks/admin.js": "/chunks/admin.js?id=52367df35e517b67",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=0ba6b75f07f739e2", "/chunks/dashboard.js": "/chunks/dashboard.js?id=0ba6b75f07f739e2",
"/chunks/invoices.js": "/chunks/invoices.js?id=f89964a5a55ace45", "/chunks/invoices.js": "/chunks/invoices.js?id=f89964a5a55ace45",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=62582c26b6288d7d", "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=62582c26b6288d7d",
@@ -57,18 +57,18 @@
"/chunks/sign-up.js": "/chunks/sign-up.js?id=849c274b322f055b", "/chunks/sign-up.js": "/chunks/sign-up.js?id=849c274b322f055b",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=3c5ba5865e21da37", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=3c5ba5865e21da37",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8654bf89e7d9685b", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8654bf89e7d9685b",
"/chunks/settings.js": "/chunks/settings.js?id=10aae65b59430310", "/chunks/settings.js": "/chunks/settings.js?id=34a196f29c305031",
"/chunks/profile.js": "/chunks/profile.js?id=4ba370c98d374788", "/chunks/profile.js": "/chunks/profile.js?id=4ba370c98d374788",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=11e766eb42e485cf", "/chunks/settings-password.js": "/chunks/settings-password.js?id=11e766eb42e485cf",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=90ba712f3728443b", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=90ba712f3728443b",
"/chunks/billing.js": "/chunks/billing.js?id=f04fe6a3e9fb5c13", "/chunks/billing.js": "/chunks/billing.js?id=f04fe6a3e9fb5c13",
"/chunks/platform.js": "/chunks/platform.js?id=2fc77f79e9101e15", "/chunks/platform.js": "/chunks/platform.js?id=0f6d63f00679c031",
"/chunks/files.js": "/chunks/files.js?id=6f7a94e2ce0d29d2", "/chunks/files.js": "/chunks/files.js?id=795ef414190c7252",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=84e3cbbe6b2225e7", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=e6bcf3ac01a82fad",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6f9959c2b460d9e8", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=27e473fb14361bc5",
"/chunks/trash.js": "/chunks/trash.js?id=0e983296c0297aee", "/chunks/trash.js": "/chunks/trash.js?id=52c4811a507473ce",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=7e8b7a3637b13831", "/chunks/team-folders.js": "/chunks/team-folders.js?id=b6463710d1a2d1f3",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=4671542d649a73a9", "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=3c1c097efc1d9b61",
"/chunks/invitation.js": "/chunks/invitation.js?id=d9f64dbf0aad8554", "/chunks/invitation.js": "/chunks/invitation.js?id=d9f64dbf0aad8554",
"/css/tailwind.css": "/css/tailwind.css", "/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css" "/css/app.css": "/css/app.css"

8
resources/js/components/FilePreview/FilePreviewToolbar.vue
View File

@@ -48,7 +48,7 @@
@click.native="$shareFileOrFolder(currentFile)" @click.native="$shareFileOrFolder(currentFile)"
:title="sharingTitle" :title="sharingTitle"
icon="share" icon="share"
v-if="!$isThisRoute($route, ['Public', 'RequestUpload', 'SharedWithMe'])" v-if="!$isThisRoute(['Public', 'RequestUpload', 'SharedWithMe'])"
/> />
<Option <Option
@click.native="$deleteFileOrFolder(currentFile)" @click.native="$deleteFileOrFolder(currentFile)"
@@ -57,7 +57,7 @@
class="menu-option" class="menu-option"
/> />
</OptionGroup> </OptionGroup>
<OptionGroup v-if="!$isThisRoute($route, ['RequestUpload'])"> <OptionGroup v-if="!$isThisRoute(['RequestUpload'])">
<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" /> <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
</OptionGroup> </OptionGroup>
</PopoverItem> </PopoverItem>
@@ -79,7 +79,7 @@
<div class="ml-5"> <div class="ml-5">
<ToolbarButton <ToolbarButton
v-if="!$isThisRoute($route, ['RequestUpload'])" v-if="!$isThisRoute(['RequestUpload'])"
@click.native="downloadItem" @click.native="downloadItem"
source="download" source="download"
:action="$t('actions.download')" :action="$t('actions.download')"
@@ -165,7 +165,7 @@ export default {
return activeIndex return activeIndex
}, },
canShareItem() { canShareItem() {
return this.$isThisRoute(this.$route, ['Files', 'RecentUploads', 'MySharedItems']) return this.$isThisRoute(['Files', 'RecentUploads', 'MySharedItems'])
}, },
}, },
methods: { methods: {

30
resources/js/components/FilesView/DesktopToolbar.vue
View File

@@ -60,7 +60,7 @@
<!--File Controls--> <!--File Controls-->
<div class="ml-5 flex items-center xl:ml-8"> <div class="ml-5 flex items-center xl:ml-8">
<!--Team Heads--> <!--Team Heads-->
<PopoverWrapper v-if="$isThisRoute($route, ['TeamFolders', 'SharedWithMe'])"> <PopoverWrapper v-if="$isThisRoute(['TeamFolders', 'SharedWithMe'])">
<TeamMembersButton <TeamMembersButton
@click.stop.native="showTeamFolderMenu" @click.stop.native="showTeamFolderMenu"
size="32" size="32"
@@ -70,7 +70,7 @@
<PopoverItem name="team-folder" side="left"> <PopoverItem name="team-folder" side="left">
<TeamFolderPreview /> <TeamFolderPreview />
<OptionGroup v-if="$isThisRoute($route, ['TeamFolders'])" :title="$t('Options')"> <OptionGroup v-if="$isThisRoute(['TeamFolders'])" :title="$t('Options')">
<Option <Option
@click.native="$updateTeamFolder(teamFolder)" @click.native="$updateTeamFolder(teamFolder)"
:title="$t('Edit Members')" :title="$t('Edit Members')"
@@ -83,7 +83,7 @@
/> />
</OptionGroup> </OptionGroup>
<OptionGroup v-if="$isThisRoute($route, ['SharedWithMe'])" :title="$t('Options')"> <OptionGroup v-if="$isThisRoute(['SharedWithMe'])" :title="$t('Options')">
<Option <Option
@click.native="$detachMeFromTeamFolder(teamFolder)" @click.native="$detachMeFromTeamFolder(teamFolder)"
:title="$t('Leave the Team Folder')" :title="$t('Leave the Team Folder')"
@@ -105,7 +105,7 @@
:action="$t('actions.convert_into_team_folder')" :action="$t('actions.convert_into_team_folder')"
/> />
<ToolbarButton <ToolbarButton
v-if="!$isThisRoute($route, ['SharedWithMe', 'Public'])" v-if="!$isThisRoute(['SharedWithMe', 'Public'])"
@click.native="$shareFileOrFolder(clipboard[0])" @click.native="$shareFileOrFolder(clipboard[0])"
:class="{ :class="{
'is-inactive': canShareInView, 'is-inactive': canShareInView,
@@ -213,41 +213,41 @@ export default {
return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0] return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0]
}, },
isTeamFolderHomepage() { isTeamFolderHomepage() {
return this.$isThisRoute(this.$route, ['TeamFolders']) && !this.$route.params.id return this.$isThisRoute(['TeamFolders']) && !this.$route.params.id
}, },
isSharedWithMe() { isSharedWithMe() {
return this.$isThisRoute(this.$route, ['SharedWithMe']) return this.$isThisRoute(['SharedWithMe'])
}, },
isSharedWithMeHomepage() { isSharedWithMeHomepage() {
return this.$isThisRoute(this.$route, ['SharedWithMe']) && !this.$route.params.id return this.$isThisRoute(['SharedWithMe']) && !this.$route.params.id
}, },
canCreateFolder() { canCreateFolder() {
return !this.$isThisRoute(this.$route, ['Files', 'Public', 'TeamFolders', 'SharedWithMe']) return !this.$isThisRoute(['Files', 'Public', 'TeamFolders', 'SharedWithMe'])
}, },
canShowConvertToTeamFolder() { canShowConvertToTeamFolder() {
return this.$isThisRoute(this.$route, ['Files', 'MySharedItems']) return this.$isThisRoute(['Files', 'MySharedItems'])
}, },
canUploadInView() { canUploadInView() {
return !this.$isThisRoute(this.$route, ['Files', 'RecentUploads', 'Public', 'TeamFolders', 'SharedWithMe']) return !this.$isThisRoute(['Files', 'RecentUploads', 'Public', 'TeamFolders', 'SharedWithMe'])
}, },
canUploadFolderInView() { canUploadFolderInView() {
return !this.$isThisRoute(this.$route, ['Files', 'Public', 'TeamFolders', 'SharedWithMe']) return !this.$isThisRoute(['Files', 'Public', 'TeamFolders', 'SharedWithMe'])
}, },
canDeleteInView() { canDeleteInView() {
let routes = ['TeamFolders', 'SharedWithMe', 'RecentUploads', 'MySharedItems', 'Trash', 'Public', 'Files'] let routes = ['TeamFolders', 'SharedWithMe', 'RecentUploads', 'MySharedItems', 'Trash', 'Public', 'Files']
return !this.$isThisRoute(this.$route, routes) || this.clipboard.length === 0 return !this.$isThisRoute(routes) || this.clipboard.length === 0
}, },
canMoveInView() { canMoveInView() {
let routes = ['SharedWithMe', 'RecentUploads', 'MySharedItems', 'Public', 'Files', 'TeamFolders'] let routes = ['SharedWithMe', 'RecentUploads', 'MySharedItems', 'Public', 'Files', 'TeamFolders']
return !this.$isThisRoute(this.$route, routes) || this.clipboard.length === 0 return !this.$isThisRoute(routes) || this.clipboard.length === 0
}, },
canShareInView() { canShareInView() {
let routes = ['TeamFolders', 'RecentUploads', 'MySharedItems', 'Public', 'Files'] let routes = ['TeamFolders', 'RecentUploads', 'MySharedItems', 'Public', 'Files']
return !this.$isThisRoute(this.$route, routes) || this.clipboard.length > 1 || this.clipboard.length === 0 return !this.$isThisRoute(routes) || this.clipboard.length > 1 || this.clipboard.length === 0
}, },
canCreateTeamFolder() { canCreateTeamFolder() {
return ( return (
this.$isThisRoute(this.$route, ['MySharedItems', 'Files']) && this.$isThisRoute(['MySharedItems', 'Files']) &&
this.clipboard.length === 1 && this.clipboard.length === 1 &&
this.clipboard[0].data.type === 'folder' this.clipboard[0].data.type === 'folder'
) )

19
resources/js/components/FilesView/FileBrowser.vue
View File

@@ -38,7 +38,7 @@ export default {
ItemHandler, ItemHandler,
}, },
computed: { computed: {
...mapGetters(['isVisibleSidebar', 'currentFolder', 'itemViewType', 'clipboard', 'entries', 'config']), ...mapGetters(['isVisibleSidebar', 'currentFolder', 'itemViewType', 'clipboard', 'entries', 'config', 'currentTeamFolder', 'user']),
draggedItems() { draggedItems() {
// Set opacity for dragged items // Set opacity for dragged items
if (!this.clipboard.includes(this.draggingId)) { if (!this.clipboard.includes(this.draggingId)) {
@@ -58,10 +58,27 @@ export default {
}, },
methods: { methods: {
deleteItems() { deleteItems() {
// Prevent delete in SharedWithMe and TeamFolders homepage
if ((this.$isThisRoute(['SharedWithMe', 'TeamFolders']) && !this.$route.params.id)) return
// Prevent delete in SharedWithMe with visit privileges
if ((this.$isThisRoute(['SharedWithMe']) && ! this.canEdit())) return
if ((this.clipboard.length > 0 && this.$checkPermission('master')) || this.$checkPermission('editor')) { if ((this.clipboard.length > 0 && this.$checkPermission('master')) || this.$checkPermission('editor')) {
this.$store.dispatch('deleteItem') this.$store.dispatch('deleteItem')
} }
}, },
canEdit() {
if (this.currentTeamFolder && this.user) {
let member = this.currentTeamFolder.data.relationships.members.data.find(
(member) => member.data.id === this.user.data.id
)
return member.data.attributes.permission === 'can-edit'
}
return false
},
uploadDroppedItems(event) { uploadDroppedItems(event) {
this.$uploadDraggedFiles(event, this.currentFolder.data.id) this.$uploadDraggedFiles(event, this.currentFolder.data.id)

12
resources/js/components/FilesView/FileFilterMobile.vue
View File

@@ -6,28 +6,28 @@
@click.native="goToFiles" @click.native="goToFiles"
:title="$t('sidebar.home')" :title="$t('sidebar.home')"
icon="hard-drive" icon="hard-drive"
:is-active="$isThisRoute($route, 'Files')" :is-active="$isThisRoute('Files')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
<Option <Option
@click.native="goToLatest" @click.native="goToLatest"
:title="$t('menu.latest')" :title="$t('menu.latest')"
icon="upload-cloud" icon="upload-cloud"
:is-active="$isThisRoute($route, 'RecentUploads')" :is-active="$isThisRoute('RecentUploads')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
<Option <Option
@click.native="goToShared" @click.native="goToShared"
:title="$t('sidebar.my_shared')" :title="$t('sidebar.my_shared')"
icon="share" icon="share"
:is-active="$isThisRoute($route, 'MySharedItems')" :is-active="$isThisRoute('MySharedItems')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
<Option <Option
@click.native="goToTrash" @click.native="goToTrash"
:title="$t('menu.trash')" :title="$t('menu.trash')"
icon="trash" icon="trash"
:is-active="$isThisRoute($route, 'Trash')" :is-active="$isThisRoute('Trash')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
</OptionGroup> </OptionGroup>
@@ -36,14 +36,14 @@
@click.native="goToTeamFolders" @click.native="goToTeamFolders"
:title="$t('Team Folders')" :title="$t('Team Folders')"
icon="users" icon="users"
:is-active="$isThisRoute($route, 'TeamFolders')" :is-active="$isThisRoute('TeamFolders')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
<Option <Option
@click.native="goToSharedWithMe" @click.native="goToSharedWithMe"
:title="$t('Shared with Me')" :title="$t('Shared with Me')"
icon="user-check" icon="user-check"
:is-active="$isThisRoute($route, 'SharedWithMe')" :is-active="$isThisRoute('SharedWithMe')"
:is-hover-disabled="true" :is-hover-disabled="true"
/> />
</OptionGroup> </OptionGroup>

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

@@ -158,7 +158,7 @@ import { mapGetters } from 'vuex'
}, },
canShowAuthor() { canShowAuthor() {
return ( return (
this.$isThisRoute(this.$route, ['SharedWithMe', 'TeamFolders']) && this.$isThisRoute(['SharedWithMe', 'TeamFolders']) &&
this.clipboard[0].data.type !== 'folder' && this.clipboard[0].data.type !== 'folder' &&
this.user.data.id !== this.clipboard[0].data.relationships.owner.data.id this.user.data.id !== this.clipboard[0].data.relationships.owner.data.id
) )

6
resources/js/components/FilesView/ItemGrid.vue
View File

@@ -189,7 +189,7 @@ export default {
canEditName() { canEditName() {
return ( return (
!this.$isMobile() && !this.$isMobile() &&
!this.$isThisRoute(this.$route, ['Trash', 'SharedSingleFile']) && !this.$isThisRoute(['Trash', 'SharedSingleFile']) &&
!this.$checkPermission('visitor') !this.$checkPermission('visitor')
) )
}, },
@@ -200,13 +200,13 @@ export default {
}, },
canShowAuthor() { canShowAuthor() {
return ( return (
this.$isThisRoute(this.$route, ['SharedWithMe', 'TeamFolders']) && this.$isThisRoute(['SharedWithMe', 'TeamFolders']) &&
!this.isFolder && !this.isFolder &&
this.user.data.id !== this.entry.data.relationships.owner.data.id this.user.data.id !== this.entry.data.relationships.owner.data.id
) )
}, },
canShowLinkIcon() { canShowLinkIcon() {
return this.entry.data.relationships.shared && !this.$isThisRoute(this.$route, ['SharedSingleFile']) return this.entry.data.relationships.shared && !this.$isThisRoute(['SharedSingleFile'])
}, },
canDrag() { canDrag() {
return !this.isDeleted && this.$checkPermission(['master', 'editor']) return !this.isDeleted && this.$checkPermission(['master', 'editor'])

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

@@ -162,7 +162,7 @@ export default {
canEditName() { canEditName() {
return ( return (
!this.$isMobile() && !this.$isMobile() &&
!this.$isThisRoute(this.$route, ['Trash']) && !this.$isThisRoute(['Trash']) &&
!this.$checkPermission('visitor') && !this.$checkPermission('visitor') &&
!(this.sharedDetail && this.sharedDetail.attributes.type === 'file') !(this.sharedDetail && this.sharedDetail.attributes.type === 'file')
) )

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

@@ -6,7 +6,7 @@
<div class="relative flex items-center"> <div class="relative flex items-center">
<TeamMembersButton <TeamMembersButton
v-if="$isThisRoute($route, ['TeamFolders', 'SharedWithMe'])" v-if="$isThisRoute(['TeamFolders', 'SharedWithMe'])"
size="28" size="28"
@click.stop.native="$showMobileMenu('team-menu')" @click.stop.native="$showMobileMenu('team-menu')"
class="absolute right-9" class="absolute right-9"

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

@@ -54,7 +54,7 @@ export default {
computed: { computed: {
...mapGetters(['isVisibleNavigationBars', 'currentFolder', 'sharedDetail']), ...mapGetters(['isVisibleNavigationBars', 'currentFolder', 'sharedDetail']),
isNotHomepage() { isNotHomepage() {
if (this.$isThisRoute(this.$route, ['Public'])) { if (this.$isThisRoute(['Public'])) {
return this.sharedDetail && this.sharedDetail.data.attributes.item_id !== this.$route.params.id return this.sharedDetail && this.sharedDetail.data.attributes.item_id !== this.$route.params.id
} }

2
resources/js/components/Others/Forms/MultiEmailInput.vue
View File

@@ -60,7 +60,7 @@ export default {
events.$emit('emailsInputValues', this.emails) events.$emit('emailsInputValues', this.emails)
}, },
removeLastEmail(event) { removeLastEmail(event) {
// If is input empty and presse backspace remove last email from array // If is input empty and press backspace remove last email from array
if (event.code === 'Backspace' && this.email === '') this.emails.pop() if (event.code === 'Backspace' && this.email === '') this.emails.pop()
}, },
handleEmail() { handleEmail() {

2
resources/js/components/Others/MoveItemPopup.vue
View File

@@ -126,7 +126,7 @@ export default {
this.isLoadingTree = true this.isLoadingTree = true
// Get folder tree and hide spinner // Get folder tree and hide spinner
if (this.$isThisRoute(this.$route, ['SharedWithMe'])) { if (this.$isThisRoute(['SharedWithMe'])) {
this.$store.dispatch('getTeamFolderTree').then(() => { this.$store.dispatch('getTeamFolderTree').then(() => {
this.isLoadingTree = false this.isLoadingTree = false
}) })

2
resources/js/components/Others/ThumbnailItem.vue
View File

@@ -119,7 +119,7 @@ export default {
canEditName() { canEditName() {
return ( return (
!this.$isMobile() && !this.$isMobile() &&
!this.$isThisRoute(this.$route, ['Trash']) && !this.$isThisRoute(['Trash']) &&
!this.$checkPermission('visitor') && !this.$checkPermission('visitor') &&
!(this.sharedDetail && this.sharedDetail.attributes.type === 'file') !(this.sharedDetail && this.sharedDetail.attributes.type === 'file')
) )

6
resources/js/components/Spotlight/Spotlight.vue
View File

@@ -62,7 +62,7 @@
<!--Show tips--> <!--Show tips-->
<div <div
v-if="isEmptyQuery && !activeFilter && !$isThisRoute($route, ['Public']) && isAdmin" v-if="isEmptyQuery && !activeFilter && !$isThisRoute(['Public']) && isAdmin"
class="relative z-50 px-4 pb-4" class="relative z-50 px-4 pb-4"
> >
<CategoryName> <CategoryName>
@@ -587,7 +587,7 @@ export default {
} }
// Return commands for public page // Return commands for public page
if (this.$isThisRoute(this.$route, ['Public'])) { if (this.$isThisRoute(['Public'])) {
return [].concat.apply([], [functionList]) return [].concat.apply([], [functionList])
} }
@@ -779,7 +779,7 @@ export default {
openItem(file) { openItem(file) {
// Show folder // Show folder
if (file.data.type === 'folder') { if (file.data.type === 'folder') {
if (this.$isThisRoute(this.$route, ['Public'])) { if (this.$isThisRoute(['Public'])) {
this.$router.push({ this.$router.push({
name: 'Public', name: 'Public',
params: { params: {

2
resources/js/components/Teams/CreateTeamFolderPopup.vue
View File

@@ -168,7 +168,7 @@ export default {
axios axios
.post(route, payload) .post(route, payload)
.then((response) => { .then((response) => {
let isTeamFoldersLocation = this.$isThisRoute(this.$route, ['TeamFolders']) let isTeamFoldersLocation = this.$isThisRoute(['TeamFolders'])
// Redirect into newly created team folder // Redirect into newly created team folder
if (isTeamFoldersLocation && this.$route.params.id) { if (isTeamFoldersLocation && this.$route.params.id) {

4
resources/js/helpers/functionHelpers.js vendored
View File

@@ -437,8 +437,8 @@ const FunctionHelpers = {
this.$router.push(locations[this.$router.currentRoute.name]) this.$router.push(locations[this.$router.currentRoute.name])
} }
Vue.prototype.$isThisRoute = function (route, locations) { Vue.prototype.$isThisRoute = function (locations) {
return locations.includes(route.name) return locations.includes(router.currentRoute.name)
} }
// TODO: not working correctly in share page // TODO: not working correctly in share page

2
resources/js/store/modules/app.js vendored
View File

@@ -33,7 +33,7 @@ const actions = {
}) })
// Update user settings // Update user settings
if (!Vue.prototype.$isThisRoute(router.currentRoute, ['Public'])) { if (!Vue.prototype.$isThisRoute(['Public'])) {
Vue.prototype.$updateText('/user/settings', 'theme_mode', mode) Vue.prototype.$updateText('/user/settings', 'theme_mode', mode)
} }
}, },

4
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -80,7 +80,7 @@ const actions = {
if (item.type === 'folder') dispatch('getAppData') if (item.type === 'folder') dispatch('getAppData')
if (Vue.prototype.$isThisRoute(router.currentRoute, ['Public'])) dispatch('getFolderTree') if (Vue.prototype.$isThisRoute(['Public'])) dispatch('getFolderTree')
}) })
}) })
.catch(() => Vue.prototype.$isSomethingWrong()) .catch(() => Vue.prototype.$isSomethingWrong())
@@ -272,7 +272,7 @@ const actions = {
restoreItem: ({ commit, getters }, item) => { restoreItem: ({ commit, getters }, item) => {
let itemToRestore = [] let itemToRestore = []
let items = [item] let items = [item]
let restoreToHome = Vue.prototype.$isThisRoute(router.currentRoute, ['Trash']) let restoreToHome = Vue.prototype.$isThisRoute(['Trash'])
// If coming no selected item dont get items to restore from clipboard // If coming no selected item dont get items to restore from clipboard
if (!item) items = getters.clipboard if (!item) items = getters.clipboard

2
resources/js/store/modules/sharing.js vendored
View File

@@ -90,7 +90,7 @@ const actions = {
// Remove item from file browser // Remove item from file browser
if ( if (
getters.currentFolder && getters.currentFolder &&
Vue.prototype.$isThisRoute(router.currentRoute, ['MySharedItems']) Vue.prototype.$isThisRoute(['MySharedItems'])
) { ) {
commit('REMOVE_ITEM', item.data.id) commit('REMOVE_ITEM', item.data.id)
} }

2
resources/js/views/FileView/SharedWithMe.vue
View File

@@ -215,7 +215,7 @@ export default {
return false return false
}, },
isTeamFolderHomepage() { isTeamFolderHomepage() {
return this.$isThisRoute(this.$route, ['SharedWithMe']) && !this.$route.params.id return this.$isThisRoute(['SharedWithMe']) && !this.$route.params.id
}, },
isFolder() { isFolder() {
return this.item && this.item.data.type === 'folder' return this.item && this.item.data.type === 'folder'

2
resources/js/views/FileView/TeamFolders.vue
View File

@@ -270,7 +270,7 @@ export default {
return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0] return this.currentTeamFolder ? this.currentTeamFolder : this.clipboard[0]
}, },
isTeamFolderHomepage() { isTeamFolderHomepage() {
return this.$isThisRoute(this.$route, ['TeamFolders']) && !this.$route.params.id return this.$isThisRoute(['TeamFolders']) && !this.$route.params.id
}, },
isFolder() { isFolder() {
return this.item && this.item.data.type === 'folder' return this.item && this.item.data.type === 'folder'

2
src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php
View File

@@ -13,7 +13,7 @@ class FakeRenameFileOrFolderAction
public function __invoke( public function __invoke(
RenameItemRequest $request, RenameItemRequest $request,
string $id, string $id,
): array { ): array|File {
// Get item // Get item
if ($request->input('type') === 'folder') { if ($request->input('type') === 'folder') {
$item = Folder::where('id', $id) $item = Folder::where('id', $id)