From 596c95a89978ab20f4ff252bd4bdcfe3a31f44dc Mon Sep 17 00:00:00 2001 From: Piyush Date: Tue, 2 Sep 2025 08:09:21 +0000 Subject: [PATCH 1/2] conditionally handled fullscreen view of sharing manage --- src/actions/sharingPopupAction.js | 6 ++++++ src/components/OpenSharingButton.vue | 5 +++++ src/views/SharingPopup.vue | 11 +++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/actions/sharingPopupAction.js b/src/actions/sharingPopupAction.js index 1ff0f8f..19a6678 100644 --- a/src/actions/sharingPopupAction.js +++ b/src/actions/sharingPopupAction.js @@ -67,7 +67,13 @@ export const action = new FileAction({ async exec(node, view, dir) { // You need read permissions to see the sidebar if ((node.permissions & Permission.READ) !== 0) { + setTimeout(() => { + const currentUrl = window.location.search; + if(currentUrl.includes('popup')) { + document.querySelector('#app-sidebar-vue').style.width = '0%'; + } + }) window.OCA.Files.Sidebar.close() window.OCA.Files.Sidebar.setActiveTab('sharing-manage') diff --git a/src/components/OpenSharingButton.vue b/src/components/OpenSharingButton.vue index 2cbeb70..311a5d5 100644 --- a/src/components/OpenSharingButton.vue +++ b/src/components/OpenSharingButton.vue @@ -37,6 +37,11 @@ export default { window.OCA.Files.Sidebar.setActiveTab('sharing') window.OCA.Files.Sidebar.setFullScreenMode(true) + const currentUrl = window.location.search; + if(!currentUrl.includes('openfile')) { + document.querySelector('#app-sidebar-vue').style.width = '0%'; + } + // TODO: migrate Sidebar to use a Node instead window.OCA.Files.Sidebar.open(fileInfoPathName) diff --git a/src/views/SharingPopup.vue b/src/views/SharingPopup.vue index da1b287..5c3062d 100644 --- a/src/views/SharingPopup.vue +++ b/src/views/SharingPopup.vue @@ -209,12 +209,14 @@ export default { closeThisModal() { this.modal = false + const currentUrl = window.location.search if (this.newLinkShare || this.shareSent) { this.openSharingManage() } else { window.OCA.Files.Sidebar.close() - window.OCA.Files.Sidebar.setFullScreenMode(false) + currentUrl.includes('openfile') ? + window.OCA.Files.Sidebar.setFullScreenMode(true) : window.OCA.Files.Sidebar.setFullScreenMode(false) } }, @@ -225,7 +227,12 @@ export default { window.OCA.Files.Sidebar.close() window.OCA.Files.Sidebar.setActiveTab('sharing') window.OCA.Files.Sidebar.setActiveTab('sharing-manage') - window.OCA.Files.Sidebar.setFullScreenMode(false) + document.querySelector('#app-sidebar-vue').style.width = 'var(--app-sidebar-width)'; + + // set setfullscreen sidebar if opened in viewer else not + const currentSearch = window.location.search; + const isTargetSearch = (currentSearch === '?dir=/' || currentSearch === '?dir=/&popup=true'); + isTargetSearch ? window.OCA.Files.Sidebar.setFullScreenMode(false) : window.OCA.Files.Sidebar.setFullScreenMode(true); // TODO: migrate Sidebar to use a Node instead window.OCA.Files.Sidebar.open(fileInfoPathName) From 5d1f0a0992f887e665244380a282774735f1c242 Mon Sep 17 00:00:00 2001 From: Piyush Date: Tue, 2 Sep 2025 08:17:48 +0000 Subject: [PATCH 2/2] resolved lint errors --- src/actions/sharingPopupAction.js | 6 +++--- src/components/OpenSharingButton.vue | 6 +++--- src/views/SharingPopup.vue | 13 ++++++------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/actions/sharingPopupAction.js b/src/actions/sharingPopupAction.js index 19a6678..0aba49b 100644 --- a/src/actions/sharingPopupAction.js +++ b/src/actions/sharingPopupAction.js @@ -68,10 +68,10 @@ export const action = new FileAction({ // You need read permissions to see the sidebar if ((node.permissions & Permission.READ) !== 0) { setTimeout(() => { - const currentUrl = window.location.search; + const currentUrl = window.location.search - if(currentUrl.includes('popup')) { - document.querySelector('#app-sidebar-vue').style.width = '0%'; + if (currentUrl.includes('popup')) { + document.querySelector('#app-sidebar-vue').style.width = '0%' } }) window.OCA.Files.Sidebar.close() diff --git a/src/components/OpenSharingButton.vue b/src/components/OpenSharingButton.vue index 311a5d5..2329f3a 100644 --- a/src/components/OpenSharingButton.vue +++ b/src/components/OpenSharingButton.vue @@ -37,9 +37,9 @@ export default { window.OCA.Files.Sidebar.setActiveTab('sharing') window.OCA.Files.Sidebar.setFullScreenMode(true) - const currentUrl = window.location.search; - if(!currentUrl.includes('openfile')) { - document.querySelector('#app-sidebar-vue').style.width = '0%'; + const currentUrl = window.location.search + if (!currentUrl.includes('openfile')) { + document.querySelector('#app-sidebar-vue').style.width = '0%' } // TODO: migrate Sidebar to use a Node instead diff --git a/src/views/SharingPopup.vue b/src/views/SharingPopup.vue index 5c3062d..7b39af6 100644 --- a/src/views/SharingPopup.vue +++ b/src/views/SharingPopup.vue @@ -215,8 +215,7 @@ export default { this.openSharingManage() } else { window.OCA.Files.Sidebar.close() - currentUrl.includes('openfile') ? - window.OCA.Files.Sidebar.setFullScreenMode(true) : window.OCA.Files.Sidebar.setFullScreenMode(false) + currentUrl.includes('openfile') ? window.OCA.Files.Sidebar.setFullScreenMode(true) : window.OCA.Files.Sidebar.setFullScreenMode(false) } }, @@ -227,12 +226,12 @@ export default { window.OCA.Files.Sidebar.close() window.OCA.Files.Sidebar.setActiveTab('sharing') window.OCA.Files.Sidebar.setActiveTab('sharing-manage') - document.querySelector('#app-sidebar-vue').style.width = 'var(--app-sidebar-width)'; - + document.querySelector('#app-sidebar-vue').style.width = 'var(--app-sidebar-width)' + // set setfullscreen sidebar if opened in viewer else not - const currentSearch = window.location.search; - const isTargetSearch = (currentSearch === '?dir=/' || currentSearch === '?dir=/&popup=true'); - isTargetSearch ? window.OCA.Files.Sidebar.setFullScreenMode(false) : window.OCA.Files.Sidebar.setFullScreenMode(true); + const currentSearch = window.location.search + const isTargetSearch = (currentSearch === '?dir=/' || currentSearch === '?dir=/&popup=true') + isTargetSearch ? window.OCA.Files.Sidebar.setFullScreenMode(false) : window.OCA.Files.Sidebar.setFullScreenMode(true) // TODO: migrate Sidebar to use a Node instead window.OCA.Files.Sidebar.open(fileInfoPathName)