fix: cannot upload attachment files in docker (#241)
This commit is contained in:
3
backend/.gitignore
vendored
3
backend/.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
node_modules/
|
node_modules/
|
||||||
.env
|
.env
|
||||||
public/uploads/
|
public/uploads/*
|
||||||
|
!public/uploads/dummy.txt
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
up: async (queryInterface) => {
|
||||||
|
// Rename column 'path' to 'filename' in 'Attachments' table
|
||||||
|
await queryInterface.renameColumn('Attachments', 'path', 'filename');
|
||||||
|
},
|
||||||
|
|
||||||
|
down: async (queryInterface) => {
|
||||||
|
// Revert column name from 'filename' back to 'path'
|
||||||
|
await queryInterface.renameColumn('Attachments', 'filename', 'path');
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -8,7 +8,7 @@ function defineAttachment(sequelize, DataTypes) {
|
|||||||
type: DataTypes.STRING,
|
type: DataTypes.STRING,
|
||||||
allowNull: true,
|
allowNull: true,
|
||||||
},
|
},
|
||||||
path: {
|
filename: {
|
||||||
type: DataTypes.STRING,
|
type: DataTypes.STRING,
|
||||||
allowNull: false,
|
allowNull: false,
|
||||||
},
|
},
|
||||||
|
|||||||
0
backend/public/uploads/dummy.txt
Normal file
0
backend/public/uploads/dummy.txt
Normal file
@@ -1,9 +1,9 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const path = require('path');
|
|
||||||
const fs = require('fs');
|
|
||||||
const defineAttachment = require('../../models/attachments');
|
|
||||||
const { DataTypes } = require('sequelize');
|
const { DataTypes } = require('sequelize');
|
||||||
|
const defineAttachment = require('../../models/attachments');
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const Attachment = defineAttachment(sequelize, DataTypes);
|
const Attachment = defineAttachment(sequelize, DataTypes);
|
||||||
@@ -21,9 +21,7 @@ module.exports = function (sequelize) {
|
|||||||
|
|
||||||
// delete file from folder
|
// delete file from folder
|
||||||
const uploadDir = path.join(__dirname, '../../public/uploads');
|
const uploadDir = path.join(__dirname, '../../public/uploads');
|
||||||
const url = attachment.path;
|
const filePath = path.join(uploadDir, attachment.filename);
|
||||||
const fileName = url.substring(url.lastIndexOf('/') + 1);
|
|
||||||
const filePath = path.join(uploadDir, fileName);
|
|
||||||
fs.unlink(filePath, (err) => {
|
fs.unlink(filePath, (err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.error('Error deleting file:', err);
|
console.error('Error deleting file:', err);
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const path = require('path');
|
|
||||||
const fs = require('fs');
|
|
||||||
const defineAttachment = require('../../models/attachments');
|
|
||||||
const { DataTypes } = require('sequelize');
|
const { DataTypes } = require('sequelize');
|
||||||
|
const defineAttachment = require('../../models/attachments');
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const Attachment = defineAttachment(sequelize, DataTypes);
|
const Attachment = defineAttachment(sequelize, DataTypes);
|
||||||
@@ -16,8 +16,7 @@ module.exports = function (sequelize) {
|
|||||||
return res.status(404).send('Attachment not found');
|
return res.status(404).send('Attachment not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
const filename = attachment.path.split('/').pop();
|
const filePath = path.join(__dirname, `../../public/uploads/${attachment.filename}`);
|
||||||
const filePath = path.join(__dirname, `../../public/uploads/${filename}`);
|
|
||||||
|
|
||||||
if (!fs.existsSync(filePath)) {
|
if (!fs.existsSync(filePath)) {
|
||||||
return res.status(404).json({ error: 'File not found' });
|
return res.status(404).json({ error: 'File not found' });
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const path = require('path');
|
|
||||||
const fs = require('fs');
|
|
||||||
const multer = require('multer');
|
const multer = require('multer');
|
||||||
|
const { DataTypes } = require('sequelize');
|
||||||
const defineAttachment = require('../../models/attachments');
|
const defineAttachment = require('../../models/attachments');
|
||||||
const defineCaseAttachment = require('../../models/caseAttachments');
|
const defineCaseAttachment = require('../../models/caseAttachments');
|
||||||
const { DataTypes } = require('sequelize');
|
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const Attachment = defineAttachment(sequelize, DataTypes);
|
const Attachment = defineAttachment(sequelize, DataTypes);
|
||||||
@@ -55,11 +55,9 @@ module.exports = function (sequelize) {
|
|||||||
return res.status(400).json({ error: 'No files uploaded' });
|
return res.status(400).json({ error: 'No files uploaded' });
|
||||||
}
|
}
|
||||||
|
|
||||||
const host = req.get('host');
|
|
||||||
const protocol = req.protocol;
|
|
||||||
const attachmentsData = files.map((file) => ({
|
const attachmentsData = files.map((file) => ({
|
||||||
title: file.originalname,
|
title: file.originalname,
|
||||||
path: `${protocol}://${host}/uploads/${file.filename}`,
|
filename: file.filename,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const newAttachments = await Attachment.bulkCreate(attachmentsData, {
|
const newAttachments = await Attachment.bulkCreate(attachmentsData, {
|
||||||
@@ -74,6 +72,7 @@ module.exports = function (sequelize) {
|
|||||||
await t.commit();
|
await t.commit();
|
||||||
res.json(newAttachments);
|
res.json(newAttachments);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
await t.rollback();
|
await t.rollback();
|
||||||
res.status(500).json({ error: 'Internal server error' });
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -550,19 +550,18 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const backendOrigin = process.env.BACKEND_ORIGIN || 'http://localhost:8001';
|
|
||||||
await queryInterface.bulkInsert('attachments', [
|
await queryInterface.bulkInsert('attachments', [
|
||||||
{
|
{
|
||||||
title: 'Selenium logo',
|
title: 'Selenium logo',
|
||||||
detail: '',
|
detail: '',
|
||||||
path: `${backendOrigin}/uploads/861px-Selenium_Logo.png`,
|
filename: '861px-Selenium_Logo.png',
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'vitest logo',
|
title: 'vitest logo',
|
||||||
detail: '',
|
detail: '',
|
||||||
path: `${backendOrigin}/uploads/logo-shadow.svg`,
|
filename: 'logo-shadow.svg',
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ services:
|
|||||||
- IS_DEMO=false # set to true to seed the database
|
- IS_DEMO=false # set to true to seed the database
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/app/backend/database
|
- db-data:/app/backend/database
|
||||||
|
- ./backend/public/uploads:/app/backend/public/uploads
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
db-data:
|
db-data:
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
import { Image, Button, Tooltip, Card, CardBody } from '@heroui/react';
|
import { Image, Button, Tooltip, Card, CardBody } from '@heroui/react';
|
||||||
import { AttachmentType, CaseMessages } from '@/types/case';
|
|
||||||
import { Trash, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
|
import { Trash, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
|
||||||
import { isImage } from './isImage';
|
|
||||||
import { ChangeEvent, DragEvent } from 'react';
|
import { ChangeEvent, DragEvent } from 'react';
|
||||||
|
import { isImage } from './isImage';
|
||||||
|
import { AttachmentType, CaseMessages } from '@/types/case';
|
||||||
|
import Config from '@/config/config';
|
||||||
|
|
||||||
|
const apiServer = Config.apiServer;
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
isDisabled: boolean;
|
isDisabled: boolean;
|
||||||
@@ -23,8 +26,8 @@ export default function CaseAttachmentsEditor({
|
|||||||
onFilesInput,
|
onFilesInput,
|
||||||
messages,
|
messages,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
let images: AttachmentType[] = [];
|
const images: AttachmentType[] = [];
|
||||||
let others: AttachmentType[] = [];
|
const others: AttachmentType[] = [];
|
||||||
|
|
||||||
attachments.forEach((attachment) => {
|
attachments.forEach((attachment) => {
|
||||||
if (isImage(attachment)) {
|
if (isImage(attachment)) {
|
||||||
@@ -39,7 +42,11 @@ export default function CaseAttachmentsEditor({
|
|||||||
{images.map((image, index) => (
|
{images.map((image, index) => (
|
||||||
<Card key={index} radius="sm" className="mt-2 me-2 max-w-md">
|
<Card key={index} radius="sm" className="mt-2 me-2 max-w-md">
|
||||||
<CardBody>
|
<CardBody>
|
||||||
<Image alt={image.title} src={image.path} className="object-cover h-40 w-40" />
|
<Image
|
||||||
|
alt={image.title}
|
||||||
|
src={`${apiServer}/uploads/${image.filename}`}
|
||||||
|
className="object-cover h-40 w-40"
|
||||||
|
/>
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<p>{image.title}</p>
|
<p>{image.title}</p>
|
||||||
<Tooltip content={messages.delete}>
|
<Tooltip content={messages.delete}>
|
||||||
|
|||||||
@@ -22,16 +22,16 @@ describe('attachment control', () => {
|
|||||||
id: 1,
|
id: 1,
|
||||||
title: '',
|
title: '',
|
||||||
detail: '',
|
detail: '',
|
||||||
path: '',
|
filename: '',
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
caseAttachments: sampleCaseAttachment,
|
caseAttachments: sampleCaseAttachment,
|
||||||
};
|
};
|
||||||
|
|
||||||
sampleAttachment.path = 'public/uploads/abc.png';
|
sampleAttachment.filename = 'abc.png';
|
||||||
expect(isImage(sampleAttachment)).toBe(true);
|
expect(isImage(sampleAttachment)).toBe(true);
|
||||||
|
|
||||||
sampleAttachment.path = 'public/uploads/abc.mp3';
|
sampleAttachment.filename = 'abc.mp3';
|
||||||
expect(isImage(sampleAttachment)).toBe(false);
|
expect(isImage(sampleAttachment)).toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { AttachmentType } from '@/types/case';
|
import { AttachmentType } from '@/types/case';
|
||||||
|
|
||||||
function isImage(attachmentFile: AttachmentType) {
|
function isImage(attachmentFile: AttachmentType) {
|
||||||
let path = attachmentFile.path;
|
const filename = attachmentFile.filename;
|
||||||
let extension = path.substring(path.lastIndexOf('.') + 1).toLowerCase();
|
const extension = filename.substring(filename.lastIndexOf('.') + 1).toLowerCase();
|
||||||
if (
|
if (
|
||||||
extension === 'png' ||
|
extension === 'png' ||
|
||||||
extension === 'jpg' ||
|
extension === 'jpg' ||
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ type AttachmentType = {
|
|||||||
id: number;
|
id: number;
|
||||||
title: string;
|
title: string;
|
||||||
detail: string;
|
detail: string;
|
||||||
path: string;
|
filename: string;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
caseAttachments: CaseAttachmentType;
|
caseAttachments: CaseAttachmentType;
|
||||||
|
|||||||
Reference in New Issue
Block a user