Skip to content

fix: load indirect shares in editors #3313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredrikblau wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −4
Open

fix: load indirect shares in editors #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/web-pkg/src/composables/shares/useLoadShares.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,11 @@ export const useLoadShares = () => {
})
}

if (includeInheritedShares || isLocationCommonActive(router, 'files-common-search')) {
if (
includeInheritedShares ||
isLocationCommonActive(router, 'files-common-search') ||
!resourcesStore.currentFolder
) {
yield resourcesStore.loadAncestorMetaData({
folder: unref(resource),
space,
Expand Down
36 changes: 33 additions & 3 deletions packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,15 @@ describe('FileSideBar', () => {
).toHaveBeenCalledTimes(2)
})

it('should load ancestor meta data to get indirect shares when on search page', async () => {
it.each([
[
'on the search page',
{ currentRouteName: 'files-common-search', currentFolder: mock<Resource>() }
],
['when the current folder is not loaded', { currentFolder: null }]
])('loads ancestor meta data for indirect shares %s', async (_, options) => {
const resource = mock<Resource>()
const { wrapper, mocks } = createWrapper({ currentRouteName: 'files-common-search' })
const { wrapper, mocks } = createWrapper(options)
const { loadAncestorMetaData } = useResourcesStore()

mocks.$clientService.graphAuthenticated.permissions.listPermissions.mockResolvedValue({
Expand All @@ -178,6 +184,20 @@ describe('FileSideBar', () => {
await (wrapper.vm as any).loadSharesTask.perform({ resource })
expect(loadAncestorMetaData).toHaveBeenCalled()
})
it('does not load ancestor meta data when the current folder is loaded', async () => {
const resource = mock<Resource>()
const { wrapper, mocks } = createWrapper({ currentFolder: mock<Resource>() })
const { loadAncestorMetaData } = useResourcesStore()

mocks.$clientService.graphAuthenticated.permissions.listPermissions.mockResolvedValue({
shares: [],
allowedActions: [],
allowedRoles: []
})

await (wrapper.vm as any).loadSharesTask.perform({ resource })
expect(loadAncestorMetaData).not.toHaveBeenCalled()
})

it('loads inherited shares and project space members when explicitly requested', async () => {
const space = mock<SpaceResource>({ id: 'space-id', driveType: 'project' })
Expand Down Expand Up @@ -303,10 +323,20 @@ function createWrapper({
item = undefined,
isOpen = true,
currentRouteName = 'files-spaces-generic',
currentFolder = undefined,
space = undefined
}: { item?: Resource; isOpen?: boolean; currentRouteName?: string; space?: SpaceResource } = {}) {
}: {
item?: Resource
isOpen?: boolean
currentRouteName?: string
currentFolder?: Resource
space?: SpaceResource
} = {}) {
const plugins = defaultPlugins()

const resourcesStore = useResourcesStore()
resourcesStore.currentFolder = currentFolder

const { requestExtensions } = useExtensionRegistry()
vi.mocked(requestExtensions).mockReturnValue([])

Expand Down