Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/web-pkg/src/components/SideBar/FileSideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,19 @@ function loadVersions(resource: Resource) {
}

async function loadShares(resource: Resource) {
if (!canListShares({ space, resource })) {
// check again next time, e.g. when a disabled space gets enabled
loadedSharesResourceId.value = undefined
return
}

if (resource.id === unref(loadedSharesResourceId)) {
// don't load shares if already loaded
return
}

loadedSharesResourceId.value = resource.id

if (!canListShares({ space, resource })) {
return
}

if (loadSharesTask.isRunning) {
loadSharesTask.cancelAll()
}
Expand Down
5 changes: 5 additions & 0 deletions packages/web-pkg/src/composables/shares/useCanListShares.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
GraphSharePermission,
isIncomingShareResource,
isProjectSpaceResource,
isPublicSpaceResource,
isTrashResource,
Resource,
Expand Down Expand Up @@ -28,6 +29,10 @@ export const useCanListShares = () => {
if (isTrashResource(resource)) {
return false
}
if (isProjectSpaceResource(resource) && resource.disabled) {
// the server doesn't list the permissions of disabled spaces
return false
}
if (isIncomingShareResource(resource)) {
return resource.sharePermissions.includes(GraphSharePermission.readPermissions)
}
Expand Down
40 changes: 40 additions & 0 deletions packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,46 @@ describe('FileSideBar', () => {
expect(showErrorMessage).not.toHaveBeenCalled()
})
})
describe('when a disabled project space is selected', () => {
it('does not load the shares and shows no error message', async () => {
const space = mock<SpaceResource>({
id: 'space-id',
fileId: 'space-id',
driveType: 'project',
disabled: true
})
const listPermissions = vi.fn().mockRejectedValue(new Error('not found'))
createWrapper({ item: space, listPermissions })
await flushPromises()

expect(listPermissions).not.toHaveBeenCalled()
const { showErrorMessage } = useMessages()
expect(showErrorMessage).not.toHaveBeenCalled()
})
it('loads the shares once the space gets enabled', async () => {
const space = mock<SpaceResource>({
id: 'space-id',
fileId: 'space-id',
driveType: 'project',
disabled: true,
mdate: 'Mon, 02 Nov 2026 10:00:00 GMT'
})
const listPermissions = vi
.fn()
.mockResolvedValue({ shares: [], allowedActions: [], allowedRoles: [] })
createWrapper({ item: space, listPermissions })
await flushPromises()
expect(listPermissions).not.toHaveBeenCalled()

const { selectedResources } = vi.mocked(useSelectedResources)()
selectedResources.value = [
{ ...space, disabled: false, mdate: 'Mon, 02 Nov 2026 10:05:00 GMT' } as SpaceResource
]
await flushPromises()

expect(listPermissions).toHaveBeenCalled()
})
})
describe('loadVersionsTask', () => {
beforeEach(() => {
canListVersionsMock.mockReturnValue(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,32 @@ describe('useCanListShares', () => {
}
})
})
it('returns false for disabled project spaces', () => {
getWrapper({
setup: ({ canListShares }) => {
const resource = mock<SpaceResource>({ driveType: 'project', disabled: true })

const capabilityStore = useCapabilityStore()
vi.mocked(capabilityStore).sharingApiEnabled = true

const canList = canListShares({ space: undefined, resource })
expect(canList).toBeFalsy()
}
})
})
it('returns true for enabled project spaces', () => {
getWrapper({
setup: ({ canListShares }) => {
const resource = mock<SpaceResource>({ driveType: 'project', disabled: false })

const capabilityStore = useCapabilityStore()
vi.mocked(capabilityStore).sharingApiEnabled = true

const canList = canListShares({ space: undefined, resource })
expect(canList).toBeTruthy()
}
})
})
it('returns false in public spaces', () => {
getWrapper({
setup: ({ canListShares }) => {
Expand Down
Loading