fix
This commit is contained in:
parent
30f1e4768a
commit
2fe019ec66
|
|
@ -67,7 +67,6 @@ export const API_ROUTES = {
|
||||||
// Files APIs
|
// Files APIs
|
||||||
GET_FILES: "files",
|
GET_FILES: "files",
|
||||||
UPLOAD_FILE: "files",
|
UPLOAD_FILE: "files",
|
||||||
UPLOAD_USER_FILE: "api/v1/users/files",
|
|
||||||
GET_FILE: (id: string) => `files/${id}`,
|
GET_FILE: (id: string) => `files/${id}`,
|
||||||
UPDATE_FILE: (id: string) => `files/${id}`,
|
UPDATE_FILE: (id: string) => `files/${id}`,
|
||||||
DELETE_FILE: (id: string) => `files/${id}`,
|
DELETE_FILE: (id: string) => `files/${id}`,
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,20 @@ interface UploadResponse {
|
||||||
export const useFileUpload = () => {
|
export const useFileUpload = () => {
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: async (file: File): Promise<{ id: string; url: string; mimeType?: string }> => {
|
mutationFn: async (file: File): Promise<{ id: string; url: string; mimeType?: string }> => {
|
||||||
const contentType =
|
const formData = new FormData();
|
||||||
file.type && file.type.startsWith("video") ? "video/mp4" : "image/png";
|
formData.append("file", file);
|
||||||
|
formData.append("name", "uploaded-file");
|
||||||
|
|
||||||
|
console.log("Uploading file:", file.name);
|
||||||
|
|
||||||
const response = await httpPostRequest<UploadResponse>(
|
const response = await httpPostRequest<UploadResponse>(
|
||||||
APIUrlGenerator(API_ROUTES.UPLOAD_USER_FILE, undefined, undefined, false),
|
APIUrlGenerator(API_ROUTES.UPLOAD_FILE),
|
||||||
file,
|
formData,
|
||||||
{ headers: { "Content-Type": contentType, Accept: "application/json" } }
|
{
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "multipart/form-data",
|
||||||
|
},
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log("Upload response:", response);
|
console.log("Upload response:", response);
|
||||||
|
|
|
||||||
|
|
@ -40,122 +40,116 @@ const productSchema = yup.object({
|
||||||
});
|
});
|
||||||
|
|
||||||
const toPublicUrl = (img: any): ProductImage => {
|
const toPublicUrl = (img: any): ProductImage => {
|
||||||
const rawUrl: string = img?.url || img?.file_url || img?.fileUrl || '';
|
const rawUrl: string = img?.url || img?.file_url || img?.fileUrl || '';
|
||||||
const serveKey: string | undefined = img?.serve_key || img?.serveKey;
|
const serveKey: string | undefined = img?.serve_key || img?.serveKey;
|
||||||
const url = serveKey
|
const url = serveKey
|
||||||
? `${API_GATE_WAY}/${API_ROUTES.DOWNLOAD_FILE(serveKey)}`
|
? `${API_GATE_WAY}/${API_ROUTES.DOWNLOAD_FILE(serveKey)}`
|
||||||
: rawUrl?.startsWith('http')
|
: rawUrl?.startsWith('http')
|
||||||
? rawUrl
|
? rawUrl
|
||||||
: rawUrl
|
: rawUrl
|
||||||
? `${API_GATE_WAY}${rawUrl.startsWith('/') ? '' : '/'}${rawUrl}`
|
? `${API_GATE_WAY}${rawUrl.startsWith('/') ? '' : '/'}${rawUrl}`
|
||||||
: '';
|
: '';
|
||||||
return {
|
return {
|
||||||
id: (img?.id ?? img?.file_id ?? img?.FileID ?? img).toString(),
|
id: (img?.id ?? img?.file_id ?? img?.FileID ?? img).toString(),
|
||||||
url,
|
url,
|
||||||
alt: img?.alt || img?.original_name || '',
|
alt: img?.alt || img?.original_name || '',
|
||||||
order: img?.order ?? 0,
|
order: img?.order ?? 0,
|
||||||
type: img?.mime_type || img?.type || img?.file_type,
|
type: img?.mime_type || img?.type || img?.file_type,
|
||||||
mime_type: img?.mime_type || img?.file_type,
|
mime_type: img?.mime_type || img?.file_type,
|
||||||
size: img?.size,
|
size: img?.size,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const IMAGE_MAX_SIZE = 2 * 1024 * 1024;
|
const IMAGE_MAX_SIZE = 2 * 1024 * 1024;
|
||||||
const VIDEO_MAX_SIZE = 50 * 1024 * 1024;
|
const VIDEO_MAX_SIZE = 25 * 1024 * 1024;
|
||||||
|
|
||||||
const isImageFile = (file: File) => file.type?.startsWith('image/');
|
const isImageFile = (file: File) => file.type?.startsWith('image/');
|
||||||
const isVideoFile = (file: File) => file.type?.startsWith('video/');
|
const isVideoFile = (file: File) => file.type?.startsWith('video/');
|
||||||
|
|
||||||
const ensureSquareImage = (file: File) =>
|
const ensureSquareImage = (file: File) =>
|
||||||
new Promise<void>((resolve, reject) => {
|
new Promise<void>((resolve, reject) => {
|
||||||
const url = URL.createObjectURL(file);
|
const url = URL.createObjectURL(file);
|
||||||
const img = new Image();
|
const img = new Image();
|
||||||
img.onload = () => {
|
img.onload = () => {
|
||||||
URL.revokeObjectURL(url);
|
URL.revokeObjectURL(url);
|
||||||
if (img.width === img.height) {
|
if (img.width === img.height) {
|
||||||
resolve();
|
resolve();
|
||||||
} else {
|
} else {
|
||||||
reject(new Error('ابعاد تصویر Explorer باید ۱ در ۱ باشد'));
|
reject(new Error('ابعاد تصویر Explorer باید ۱ در ۱ باشد'));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
img.onerror = () => {
|
img.onerror = () => {
|
||||||
URL.revokeObjectURL(url);
|
URL.revokeObjectURL(url);
|
||||||
reject(new Error('امکان بررسی ابعاد تصویر وجود ندارد'));
|
reject(new Error('امکان بررسی ابعاد تصویر وجود ندارد'));
|
||||||
};
|
};
|
||||||
img.src = url;
|
img.src = url;
|
||||||
});
|
});
|
||||||
|
|
||||||
const validateMediaFile = async (file: File, options?: { requireSquare?: boolean }) => {
|
const validateMediaFile = async (file: File, options?: { requireSquare?: boolean }) => {
|
||||||
if (isImageFile(file)) {
|
if (isImageFile(file)) {
|
||||||
if (file.size > IMAGE_MAX_SIZE) {
|
if (file.size > IMAGE_MAX_SIZE) {
|
||||||
throw new Error('حجم تصویر نباید بیشتر از ۲ مگابایت باشد');
|
throw new Error('حجم تصویر نباید بیشتر از ۲ مگابایت باشد');
|
||||||
}
|
|
||||||
if (options?.requireSquare) {
|
|
||||||
await ensureSquareImage(file);
|
|
||||||
}
|
|
||||||
} else if (isVideoFile(file)) {
|
|
||||||
if (file.size > VIDEO_MAX_SIZE) {
|
|
||||||
throw new Error('حجم ویدیو نباید بیشتر از ۲۵ مگابایت باشد');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throw new Error('فقط تصاویر یا ویدیو مجاز است');
|
|
||||||
}
|
}
|
||||||
|
if (options?.requireSquare) {
|
||||||
|
await ensureSquareImage(file);
|
||||||
|
}
|
||||||
|
} else if (isVideoFile(file)) {
|
||||||
|
if (file.size > VIDEO_MAX_SIZE) {
|
||||||
|
throw new Error('حجم ویدیو نباید بیشتر از ۲۵ مگابایت باشد');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error('فقط تصاویر یا ویدیو مجاز است');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const validateExplorerFile = async (file: File) => {
|
const validateExplorerFile = async (file: File) => {
|
||||||
if (isImageFile(file)) {
|
if (isImageFile(file)) {
|
||||||
if (file.size > IMAGE_MAX_SIZE) {
|
await ensureSquareImage(file);
|
||||||
throw new Error('حجم تصویر نباید بیشتر از ۲ مگابایت باشد');
|
return;
|
||||||
}
|
}
|
||||||
await ensureSquareImage(file);
|
if (isVideoFile(file)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isVideoFile(file)) {
|
throw new Error('فقط تصاویر یا ویدیو مجاز است');
|
||||||
if (file.size > VIDEO_MAX_SIZE) {
|
|
||||||
throw new Error('حجم ویدیو نباید بیشتر از ۵۰ مگابایت باشد');
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
throw new Error('فقط تصاویر یا ویدیو مجاز است');
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const mapExplorerFiles = (entries: any[]): ProductImage[] => {
|
const mapExplorerFiles = (entries: any[]): ProductImage[] => {
|
||||||
if (!entries || !Array.isArray(entries)) {
|
if (!entries || !Array.isArray(entries)) {
|
||||||
return [];
|
return [];
|
||||||
|
}
|
||||||
|
return entries.map((entry, index) => {
|
||||||
|
if (entry?.file) {
|
||||||
|
const media = toPublicUrl(entry.file);
|
||||||
|
return { ...media, order: index };
|
||||||
}
|
}
|
||||||
return entries.map((entry, index) => {
|
if (entry?.file_id) {
|
||||||
if (entry?.file) {
|
const normalized = toPublicUrl({
|
||||||
const media = toPublicUrl(entry.file);
|
...entry,
|
||||||
return { ...media, order: index };
|
id: entry.file_id,
|
||||||
}
|
url: entry.file_url || entry.url,
|
||||||
if (entry?.file_id) {
|
file_url: entry.file_url || entry.url,
|
||||||
const normalized = toPublicUrl({
|
mime_type: entry.mime_type || entry.file_type,
|
||||||
...entry,
|
type: entry.file_type || entry.type,
|
||||||
id: entry.file_id,
|
original_name: entry.name || entry.original_name,
|
||||||
url: entry.file_url || entry.url,
|
});
|
||||||
file_url: entry.file_url || entry.url,
|
return { ...normalized, order: index };
|
||||||
mime_type: entry.mime_type || entry.file_type,
|
}
|
||||||
type: entry.file_type || entry.type,
|
if (entry?.FileID) {
|
||||||
original_name: entry.name || entry.original_name,
|
const normalized = toPublicUrl({
|
||||||
});
|
...entry,
|
||||||
return { ...normalized, order: index };
|
id: entry.FileID,
|
||||||
}
|
url: entry.file_url || entry.url,
|
||||||
if (entry?.FileID) {
|
file_url: entry.file_url || entry.url,
|
||||||
const normalized = toPublicUrl({
|
});
|
||||||
...entry,
|
return { ...normalized, order: index };
|
||||||
id: entry.FileID,
|
}
|
||||||
url: entry.file_url || entry.url,
|
if (typeof entry === 'number' || typeof entry === 'string') {
|
||||||
file_url: entry.file_url || entry.url,
|
const normalized = toPublicUrl(entry);
|
||||||
});
|
return { ...normalized, order: index };
|
||||||
return { ...normalized, order: index };
|
}
|
||||||
}
|
const normalized = toPublicUrl(entry);
|
||||||
if (typeof entry === 'number' || typeof entry === 'string') {
|
return { ...normalized, order: index };
|
||||||
const normalized = toPublicUrl(entry);
|
});
|
||||||
return { ...normalized, order: index };
|
|
||||||
}
|
|
||||||
const normalized = toPublicUrl(entry);
|
|
||||||
return { ...normalized, order: index };
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const ProductFormPage = () => {
|
const ProductFormPage = () => {
|
||||||
|
|
@ -612,11 +606,11 @@ const ProductFormPage = () => {
|
||||||
onUpload={handleFileUpload}
|
onUpload={handleFileUpload}
|
||||||
onRemove={handleFileRemove}
|
onRemove={handleFileRemove}
|
||||||
acceptedTypes={['image/*', 'video/*']}
|
acceptedTypes={['image/*', 'video/*']}
|
||||||
maxFileSize={50 * 1024 * 1024}
|
maxFileSize={25 * 1024 * 1024}
|
||||||
maxFiles={10}
|
maxFiles={10}
|
||||||
mode="multi"
|
mode="multi"
|
||||||
label=""
|
label=""
|
||||||
description="تصاویر یا ویدیوهای محصول را آپلود کنید (حداکثر ۲ مگ برای تصویر و ۵۰ مگ برای ویدیو)"
|
description="تصاویر یا ویدیوهای محصول را آپلود کنید (حداکثر ۲ مگ برای تصویر و ۲۵ مگ برای ویدیو)"
|
||||||
onUploadStart={() => setIsUploading(true)}
|
onUploadStart={() => setIsUploading(true)}
|
||||||
onUploadComplete={() => setIsUploading(false)}
|
onUploadComplete={() => setIsUploading(false)}
|
||||||
/>
|
/>
|
||||||
|
|
@ -673,11 +667,11 @@ const ProductFormPage = () => {
|
||||||
onUpload={handleExplorerUpload}
|
onUpload={handleExplorerUpload}
|
||||||
onRemove={handleExplorerRemove}
|
onRemove={handleExplorerRemove}
|
||||||
acceptedTypes={['image/*', 'video/*']}
|
acceptedTypes={['image/*', 'video/*']}
|
||||||
maxFileSize={50 * 1024 * 1024}
|
maxFileSize={0}
|
||||||
maxFiles={5}
|
maxFiles={5}
|
||||||
mode="multi"
|
mode="multi"
|
||||||
label=""
|
label=""
|
||||||
description="فایلهای Explorer را آپلود کنید (تصویر: ۲ مگ، ویدیو: ۵۰ مگ، تصاویر باید مربعی باشند)"
|
description="فایلهای Explorer را آپلود کنید (تصاویر باید مربعی باشند)"
|
||||||
onUploadStart={() => setIsExplorerUploading(true)}
|
onUploadStart={() => setIsExplorerUploading(true)}
|
||||||
onUploadComplete={() => setIsExplorerUploading(false)}
|
onUploadComplete={() => setIsExplorerUploading(false)}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue