Browse Source

Merge pull request #7162 from nocodb/fix/filter-preview

fix: filter mimetypes to preview in browser
pull/7177/head
Pranav C 12 months ago committed by GitHub
parent
commit
622254951f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      packages/nocodb/src/controllers/attachments-secure.controller.ts
  2. 18
      packages/nocodb/src/controllers/attachments.controller.ts
  3. 8
      packages/nocodb/src/services/attachments.service.ts

6
packages/nocodb/src/controllers/attachments-secure.controller.ts

@ -75,7 +75,11 @@ export class AttachmentsSecureController {
path: path.join('nc', 'uploads', fpath), path: path.join('nc', 'uploads', fpath),
}); });
res.sendFile(file.path); if (this.attachmentsService.previewAvailable(file.type)) {
res.sendFile(file.path);
} else {
res.download(file.path);
}
} catch (e) { } catch (e) {
res.status(404).send('Not found'); res.status(404).send('Not found');
} }

18
packages/nocodb/src/controllers/attachments.controller.ts

@ -68,7 +68,11 @@ export class AttachmentsController {
path: path.join('nc', 'uploads', filename), path: path.join('nc', 'uploads', filename),
}); });
res.sendFile(file.path); if (this.attachmentsService.previewAvailable(file.type)) {
res.sendFile(file.path);
} else {
res.download(file.path);
}
} catch (e) { } catch (e) {
res.status(404).send('Not found'); res.status(404).send('Not found');
} }
@ -94,7 +98,11 @@ export class AttachmentsController {
), ),
}); });
res.sendFile(file.path); if (this.attachmentsService.previewAvailable(file.type)) {
res.sendFile(file.path);
} else {
res.download(file.path);
}
} catch (e) { } catch (e) {
res.status(404).send('Not found'); res.status(404).send('Not found');
} }
@ -109,7 +117,11 @@ export class AttachmentsController {
path: path.join('nc', 'uploads', fpath), path: path.join('nc', 'uploads', fpath),
}); });
res.sendFile(file.path); if (this.attachmentsService.previewAvailable(file.type)) {
res.sendFile(file.path);
} else {
res.download(file.path);
}
} catch (e) { } catch (e) {
res.status(404).send('Not found'); res.status(404).send('Not found');
} }

8
packages/nocodb/src/services/attachments.service.ts

@ -161,6 +161,14 @@ export class AttachmentsService {
return { path: filePath, type }; return { path: filePath, type };
} }
previewAvailable(mimetype: string) {
const available = ['image', 'pdf', 'text/plain'];
if (available.some((type) => mimetype.includes(type))) {
return true;
}
return false;
}
sanitizeUrlPath(paths) { sanitizeUrlPath(paths) {
return paths.map((url) => url.replace(/[/.?#]+/g, '_')); return paths.map((url) => url.replace(/[/.?#]+/g, '_'));
} }

Loading…
Cancel
Save