diff --git a/src/test-utils/fixtures.ts b/src/test-utils/fixtures.ts index 21a879cf..957856ff 100644 --- a/src/test-utils/fixtures.ts +++ b/src/test-utils/fixtures.ts @@ -16,6 +16,8 @@ interface MakeNodeOptions { favorite?: boolean mtime?: Date basename?: string + /** Folder the file sits in, relative to the owner's root; '/' for the root. */ + dirname?: string /** Outgoing share-type numbers; stored in the nested shape DAV returns. */ shareTypes?: number[] } @@ -33,12 +35,14 @@ export function makeNode({ favorite = false, mtime = new Date('2024-01-01T00:00:00Z'), basename = `file-${id}.odt`, + dirname = '/', shareTypes, }: MakeNodeOptions = {}): Node { const ownerSegment = owner ?? 'nobody' + const folder = dirname === '/' ? '' : dirname return new File({ id, - source: `https://cloud.example.com/remote.php/dav/files/${ownerSegment}/${basename}`, + source: `https://cloud.example.com/remote.php/dav/files/${ownerSegment}${folder}/${basename}`, root: `/files/${ownerSegment}`, owner, mime, diff --git a/src/views/OfficeOverview.spec.ts b/src/views/OfficeOverview.spec.ts index 0a655e63..7917363f 100644 --- a/src/views/OfficeOverview.spec.ts +++ b/src/views/OfficeOverview.spec.ts @@ -257,6 +257,33 @@ describe('OfficeOverview > rendering states', () => { expect(wrapper.findComponent({ name: 'NcListItem' }).props('name')).toBe('report.odt') expect(wrapper.findComponent({ name: 'FileCard' }).exists()).toBe(false) }) + + it('shows the folder of each file in grid view, "/" for the root', async () => { + getTemplatesMock.mockResolvedValue([makeCreator()]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([ + makeNode({ owner: 'alice', basename: 'report.odt', dirname: '/Projects/2024' }), + makeNode({ owner: 'alice', basename: 'report.odt' }), + ])) + + const wrapper = await mountOverview({ FileCard: stubRenderingAllSlots('FileCard') }) + + const subnames = wrapper.findAllComponents({ name: 'FileCard' }).map(card => card.text()) + expect(subnames[0]).toContain('/Projects/2024') + expect(subnames[1]).toContain('/') + expect(subnames[1]).not.toContain('/Projects') + }) + + it('shows the folder of each file in list view', async () => { + localStorage.setItem('office.overview.gridView', 'false') + getTemplatesMock.mockResolvedValue([makeCreator()]) + getAllOfficeFilesMock.mockResolvedValue(officeFilesResult([ + makeNode({ owner: 'alice', basename: 'report.odt', dirname: '/Projects/2024' }), + ])) + + const wrapper = await mountOverview({ NcListItem: stubRenderingAllSlots('NcListItem', ['name']) }) + + expect(wrapper.findComponent({ name: 'NcListItem' }).text()).toContain('/Projects/2024') + }) }) describe('OfficeOverview > creator on the URL', () => { diff --git a/src/views/OfficeOverview.vue b/src/views/OfficeOverview.vue index 38304615..230b9db7 100644 --- a/src/views/OfficeOverview.vue +++ b/src/views/OfficeOverview.vue @@ -51,6 +51,12 @@ type ViewMode = 'list' | 'grid' const currentUid = getCurrentUser()?.uid ?? null +/** Folder the file lives in, shown next to the date so same-named files can be told apart. */ +function folderLabel(file: Node): string { + const dir = (file.dirname ?? '/').replace(/\/+$/, '') + return dir === '' ? '/' : dir +} + const route = useRoute() const router = useRouter() @@ -401,7 +407,7 @@ fetchAll() @@ -429,7 +435,7 @@ fetchAll()