diff --git a/dev/docker/ocis.web-federated.config.json b/dev/docker/ocis.web-federated.config.json index 45564242109..28f96171d13 100644 --- a/dev/docker/ocis.web-federated.config.json +++ b/dev/docker/ocis.web-federated.config.json @@ -9,11 +9,6 @@ "scope": "openid profile email" }, "options": { - "sidebar": { - "shares": { - "showAllOnLoad": true - } - }, "contextHelpersReadMore": true }, "apps": [ diff --git a/dev/docker/ocis.web.config.json b/dev/docker/ocis.web.config.json index ab8739bf936..1bb559ba936 100644 --- a/dev/docker/ocis.web.config.json +++ b/dev/docker/ocis.web.config.json @@ -9,11 +9,6 @@ "scope": "openid profile email" }, "options": { - "sidebar": { - "shares": { - "showAllOnLoad": true - } - }, "contextHelpersReadMore": true }, "apps": [ diff --git a/docs/getting-started.md b/docs/getting-started.md index 124eb35d400..bfc7f703cf1 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -57,7 +57,6 @@ Depending on the backend you are using, there are sample config files provided i - `options.feedbackLink.description` Provide any description you want to see as tooltip and as accessible description. Defaults to `Provide your feedback: We'd like to improve the web design and would be happy to hear your feedback. Thank you! Your ownCloud team.` - `options.sharingRecipientsPerPage` Sets the amount of users shown as recipients in the dropdown when sharing resources. Default amount is 200. - `options.sidebar` This accepts an object with the following fields to customize the right sidebar behaviour: - - `options.sidebar.shares.showAllOnLoad` Sets the list of (link) shares list in the sidebar to be initially expanded (default is a collapsed state, only showing the first three shares). - `options.sidebar.exif.showLocation` Sets the `location` data in the exif panel to visible or hidden. One might want to hide the location info when a map view of the location is available from another app (the GPX Viewer app provides such a sidebar panel). - `options.runningOnEos` Set this option to `true` if running on an [EOS storage backend](https://eos-web.web.cern.ch/eos-web/) to enable its specific features. Defaults to `false`, and we recommend reaching out to [the ownCloud web team](https://talk.owncloud.com/channel/web) if you're not CERN and thinking about enabling this feature flag. - `options.cernFeatures` Enabling this will activate CERN-specific features. Defaults to `false`. diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue index 614d7f03ecd..07352f6f41b 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue @@ -64,14 +64,9 @@
- - - - +
@@ -173,9 +167,8 @@ export default defineComponent({ const space = inject>('space') const resource = inject>('resource') - const initialLinkListCollapsed = !configStore.options.sidebar.shares.showAllOnLoad - const linkListCollapsed = ref(initialLinkListCollapsed) - const indirectLinkListCollapsed = ref(initialLinkListCollapsed) + const linkListCollapsed = ref(true) + const indirectLinkListCollapsed = ref(true) const directLinks = computed(() => unref(linkShares) .filter((l) => !l.indirect && !l.isQuickLink) @@ -280,17 +273,11 @@ export default defineComponent({ }, computed: { collapseButtonTitle() { - return this.linkListCollapsed ? this.$gettext('Show all') : this.$gettext('Show less') - }, - collapseButtonIcon() { - return this.linkListCollapsed ? 'arrow-down-s' : 'arrow-up-s' + return this.linkListCollapsed ? this.$gettext('Show more') : this.$gettext('Show less') }, indirectCollapseButtonTitle() { return this.indirectLinkListCollapsed ? this.$gettext('Show') : this.$gettext('Hide') }, - indirectCollapseButtonIcon() { - return this.indirectLinkListCollapsed ? 'arrow-down-s' : 'arrow-up-s' - }, quicklink() { return this.linkShares.find(({ isQuickLink, indirect }) => isQuickLink === true && !indirect) diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue index 24dc5334d64..51f5c12f388 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue @@ -162,11 +162,11 @@ export default defineComponent({ const resource = inject>('resource') const space = inject>('space') - const sharesListCollapsed = ref(!configStore.options.sidebar.shares.showAllOnLoad) + const sharesListCollapsed = ref(true) const toggleShareListCollapsed = () => { sharesListCollapsed.value = !unref(sharesListCollapsed) } - const memberListCollapsed = ref(!configStore.options.sidebar.shares.showAllOnLoad) + const memberListCollapsed = ref(true) const toggleMemberListCollapsed = () => { memberListCollapsed.value = !unref(memberListCollapsed) } diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts index d47ff5d6d09..2307e92be40 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts @@ -52,8 +52,9 @@ vi.mock('@ownclouders/web-pkg', async (importOriginal) => ({ describe('FileLinks', () => { describe('links', () => { describe('when links list is not empty', () => { - it('should render a list of direct and indirect links', () => { + it('should render a list of direct and indirect links', async () => { const { wrapper } = getWrapper() + await wrapper.find('.indirect-link-list-toggle').trigger('click') const linkListItems = wrapper.findAllComponents(linkListItemNameAndCopy) const linkListItemsDetails = wrapper.findAll(linkListItemDetailsAndEdit) @@ -78,21 +79,15 @@ describe('FileLinks', () => { createdDateTime: '2020-01-01' }) - it('shows all links if showAllOnLoad config is set', () => { + it('shows only 3 links initially', () => { const links = [link, link, link, link] - const { wrapper } = getWrapper({ links, showAllOnLoad: true }) - - expect(wrapper.findAll(linkListItemNameAndCopy).length).toBe(links.length) - }) - it('shows only 3 links if showAllOnLoad config is not set', () => { - const links = [link, link, link, link] - const { wrapper } = getWrapper({ links, showAllOnLoad: false }) + const { wrapper } = getWrapper({ links }) expect(wrapper.findAll(linkListItemNameAndCopy).length).toBe(3) }) it('button toggles to show all links', async () => { const links = [link, link, link, link] - const { wrapper } = getWrapper({ links, showAllOnLoad: false }) + const { wrapper } = getWrapper({ links }) await wrapper.find(selectors.indirectToggle).trigger('click') expect(wrapper.findAll(linkListItemNameAndCopy).length).toBe(links.length) @@ -161,15 +156,13 @@ function getWrapper({ resource = mockDeep({ isFolder: false, canShare: () => true }), links = defaultLinksList, abilities = [{ action: 'create-all', subject: 'PublicLink' }], - canShare = true, - showAllOnLoad = true + canShare = true }: { resource?: Resource links?: typeof defaultLinksList abilities?: AbilityRule[] defaultLinkPermissions?: number canShare?: boolean - showAllOnLoad?: boolean } = {}) { const createLinkMock = vi.fn() vi.mocked(useCanShare).mockReturnValue({ canShare: () => canShare }) @@ -199,7 +192,6 @@ function getWrapper({ abilities, piniaOptions: { capabilityState: { capabilities }, - configState: { options: { sidebar: { shares: { showAllOnLoad } } } }, sharesState: { linkShares: links } } }) diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts index fdf65e682e0..4ee70ec1995 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts @@ -58,8 +58,9 @@ describe('FileShares', () => { collaborators = [getCollaborator(), getCollaborator(), getCollaborator(), getCollaborator()] }) - it('renders sharedWithLabel and sharee list', () => { + it('renders sharedWithLabel and sharee list', async () => { const { wrapper } = getWrapper({ collaborators }) + await wrapper.find('.toggle-shares-list-btn').trigger('click') expect(wrapper.find('#files-collaborators-list').exists()).toBeTruthy() expect(wrapper.findAll('#files-collaborators-list li').length).toBe(collaborators.length) expect(wrapper.html()).toMatchSnapshot() @@ -86,11 +87,10 @@ describe('FileShares', () => { expect(listItemStub.props('modifiable')).toBeFalsy() }) it('toggles the share list', async () => { - const showAllOnLoad = true const { wrapper } = getWrapper({ mountType: mount, collaborators }) - expect(wrapper.vm.sharesListCollapsed).toBe(!showAllOnLoad) + expect(wrapper.vm.sharesListCollapsed).toBe(true) await wrapper.find('.toggle-shares-list-btn').trigger('click') - expect(wrapper.vm.sharesListCollapsed).toBe(showAllOnLoad) + expect(wrapper.vm.sharesListCollapsed).toBe(false) }) it('share should be modifiable if its personal space share', () => { const space = mock({ driveType: 'personal' }) @@ -165,7 +165,6 @@ function getWrapper({ collaborators = [], spaceMembers = [], user = undefined, - showAllOnLoad = true, ancestorMetaData = {}, canShare = true }: { @@ -175,7 +174,6 @@ function getWrapper({ collaborators?: CollaboratorShare[] spaceMembers?: CollaboratorShare[] user?: User - showAllOnLoad?: boolean ancestorMetaData?: AncestorMetaData canShare?: boolean } = {}) { @@ -196,7 +194,7 @@ function getWrapper({ spacesState: { spaceMembers }, capabilityState: { capabilities }, configState: { - options: { contextHelpers: true, sidebar: { shares: { showAllOnLoad } } } + options: { contextHelpers: true } }, sharesState: { collaboratorShares: collaborators }, resourcesStore: { ancestorMetaData } diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts index 519968fc3dd..6621940985a 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts @@ -142,7 +142,7 @@ function getWrapper({ userState: { user }, spacesState: { spaceMembers }, configState: { - options: { contextHelpers: true, sidebar: { shares: { showAllOnLoad: true } } } + options: { contextHelpers: true } } } }) diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap index d598e7f96b8..7d84bb7727a 100644 --- a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap +++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap @@ -11,7 +11,7 @@ exports[`FileShares > collaborators list > renders sharedWithLabel and sharee li

Shared with

- +
  • @@ -25,7 +25,7 @@ exports[`FileShares > collaborators list > renders sharedWithLabel and sharee li
    • - +