mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 20:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Show all files for Drive Cleaner (!982)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/982

Closes #1033

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
This commit is contained in:
Hazelnoot 2025-05-07 17:14:41 +00:00
commit b66a486036
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/server/api/endpoints/drive/files.ts
View file

@ -46,6 +46,7 @@ export const paramDef = {
type: { type: 'string', nullable: true, pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1) }, type: { type: 'string', nullable: true, pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1) },
sort: { type: 'string', nullable: true, enum: ['+createdAt', '-createdAt', '+name', '-name', '+size', '-size', null] }, sort: { type: 'string', nullable: true, enum: ['+createdAt', '-createdAt', '+name', '-name', '+size', '-size', null] },
searchQuery: { type: 'string', default: '' }, searchQuery: { type: 'string', default: '' },
showAll: { type: 'boolean', default: false },
}, },
required: [], required: [],
} as const; } as const;
@ -63,10 +64,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const query = this.queryService.makePaginationQuery(this.driveFilesRepository.createQueryBuilder('file'), ps.sinceId, ps.untilId) const query = this.queryService.makePaginationQuery(this.driveFilesRepository.createQueryBuilder('file'), ps.sinceId, ps.untilId)
.andWhere('file.userId = :userId', { userId: me.id }); .andWhere('file.userId = :userId', { userId: me.id });
if (ps.folderId) { if (!ps.showAll) {
query.andWhere('file.folderId = :folderId', { folderId: ps.folderId }); if (ps.folderId) {
} else { query.andWhere('file.folderId = :folderId', { folderId: ps.folderId });
query.andWhere('file.folderId IS NULL'); } else {
query.andWhere('file.folderId IS NULL');
}
} }
if (ps.searchQuery.length > 0) { if (ps.searchQuery.length > 0) {

2
packages/frontend/src/pages/settings/drive-cleaner.vue
View file

@ -69,7 +69,7 @@ const sortMode = ref('+size');
const pagination = { const pagination = {
endpoint: 'drive/files' as const, endpoint: 'drive/files' as const,
limit: 10, limit: 10,
params: computed(() => ({ sort: sortMode.value })), params: computed(() => ({ sort: sortMode.value, showAll: true })),
offsetMode: true, offsetMode: true,
}; };