Skip to content

feat: show disabled delete button for locked files #1366

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

Merged
JammingBen merged 2 commits into from
Oct 14, 2025
Merged

feat: show disabled delete button for locked files #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e29315a
feat: show disabled delete button for locked files
JammingBen Oct 13, 2025
e9a87a8
test(e2e): exclude disabled sidebar actions from clickable ones
JammingBen Oct 14, 2025
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
8 changes: 4 additions & 4 deletions packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ export const useFileActionsDelete = () => {
return false
}

if (resources.length === 1 && resources[0].locked) {
return false
}

if (isLocationCommonActive(router, 'files-common-search')) {
return resources.some(
(r) => r.canBeDeleted() && !r.isShareRoot() && !isProjectSpaceResource(r)
Expand All @@ -81,6 +77,10 @@ export const useFileActionsDelete = () => {
return !resource.canBeDeleted() || isProjectSpaceResource(resource)
})
},
isDisabled: ({ resources }) => {
return resources.length === 1 && resources[0].locked
},
disabledTooltip: () => $gettext("File can't be deleted because it is currently locked."),
class: 'oc-files-actions-delete-trigger'
},
{
Expand Down
32 changes: 23 additions & 9 deletions packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,36 @@ describe('delete', () => {
resources: [{ canBeDeleted: () => false }] as Resource[],
invalidLocation: false,
expectedStatus: false
}
])('should be set correctly', ({ resources, expectedStatus, invalidLocation }) => {
getWrapper({
invalidLocation,
setup: () => {
const { actions } = useFileActionsDelete()
expect(unref(actions)[0].isVisible({ space: null, resources })).toBe(expectedStatus)
}
})
})
})
describe('delete isDisabled property of returned element', () => {
it.each<{ resources: Resource[]; expectedStatus: boolean }>([
{
resources: [{ locked: true } as Resource],
expectedStatus: true
},
{
resources: [{ canBeDeleted: () => true, locked: true }] as Resource[],
invalidLocation: false,
resources: [{ locked: false } as Resource],
expectedStatus: false
},
{
resources: [{ locked: true }, { locked: false }] as Resource[],
expectedStatus: false
}
])('should be set correctly', (inputData) => {
])('should be set correctly', ({ resources, expectedStatus }) => {
getWrapper({
invalidLocation: inputData.invalidLocation,
setup: () => {
const { actions } = useFileActionsDelete()

const resources = inputData.resources
expect(unref(actions)[0].isVisible({ space: null, resources })).toBe(
inputData.expectedStatus
)
expect(unref(actions)[0].isDisabled({ space: null, resources })).toBe(expectedStatus)
}
})
})
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/support/objects/app-files/resource/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const sharesNavigationButtonSelector = '.oc-sidebar-nav [data-nav-name="files-sh
const keepBothButton = '.oc-modal-body-actions-confirm'
const mediaNavigationButton = `//button[contains(@class, "preview-controls-%s")]`
const sideBarActions =
'//ul[@id="oc-files-actions-sidebar"]//span[contains(@class,"oc-files-context-action-label")]/span'
'//ul[@id="oc-files-actions-sidebar"]//button[not(@disabled)]//span[contains(@class,"oc-files-context-action-label")]/span'
const selectAllCheckbox =
'//input[@type="checkbox" and (@id="tiles-view-select-all" or @id="resource-table-select-all")]'
const firstResourceCheckbox =
Expand Down