Karimaldeen/hijabi-dashboard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Done

Browse Source
This commit is contained in:
KarimAldeen 2024-03-21 01:18:45 +03:00
parent 4b22add13e
commit 9afd1c4437
2 changed files with 85 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Pages/Products/View/Addfn/AddNewVariation.ts
View File

@ -10,12 +10,23 @@ export function AddNewVariation(Varibletaps: any[], data: any, AddVariation: any
}, {}); }, {});
const jsonString = JSON.stringify(convertedArray); const jsonString = JSON.stringify(convertedArray);
const IMages = (varible?.id !== null || varible?.id !== 0) ? {
main_photo: varible?.main_photo,
images: varible?.images, const main_photo = (typeof varible?.main_photo === 'string') ? {
copied_assets: { main_photo: varible?.main_photo },
} : { } : {
copied_assets: { main_photo: varible?.main_photo, images: varible?.images }, main_photo: varible?.main_photo,
} }
const images = (typeof varible?.images === 'string') ? {
copied_assets: { images: varible?.images },
} : {
images: varible?.images,
}
const Newproduct = { const Newproduct = {
@ -30,7 +41,9 @@ export function AddNewVariation(Varibletaps: any[], data: any, AddVariation: any
de: varible?.description_de de: varible?.description_de
}, },
// quantity: varible?.quantity, // quantity: varible?.quantity,
...IMages, ...images,
...main_photo,
info: jsonString, info: jsonString,
price: varible?.price, price: varible?.price,
product_attributes: varible?.attribute?.map((item: any, index: any) => { product_attributes: varible?.attribute?.map((item: any, index: any) => {
@ -41,5 +54,4 @@ export function AddNewVariation(Varibletaps: any[], data: any, AddVariation: any
console.log(Newproduct); console.log(Newproduct);
AddVariation(Newproduct); AddVariation(Newproduct);
}); });
} }

79
src/Pages/Products/View/EditPage.tsx
View File

@ -61,9 +61,9 @@ const ViewProduct = () => {
mutate(newData); mutate(newData);
} }
const validationResults = isvalidation(values.variable, t); const validationResults = isvalidation(values.variable, t);
// if (validationResults.every((result) => result)) { if (validationResults.every((result) => result)) {
// isValid(); isValid();
// } }
}; };
@ -107,13 +107,14 @@ const ViewProduct = () => {
const images_product = foundObject?.images?.map((item: any) => { const images_product = foundObject?.images?.map((item: any) => {
return item?.path return item?.path
}) })
const array1 =images_product; const array1 = images_product;
const array2 =varible?.images; const array2 = varible?.images;
const isEqual2 = array1.length === array2.length && array1.every((value:any, index:any) => value === array2[index]); const isEqual_images = array1.length === array2.length && array1.every((value: any, index: any) => value === array2[index]);
console.log("Arrays are equal:", isEqual2); console.log("Arrays are equal:", isEqual_images);
const images = isEqual_images ? { } : { images: varible?.images }
const Editedproduct = { const Editedproduct = {
name: { name: {
en: varible?.name_en, en: varible?.name_en,
@ -125,9 +126,9 @@ const ViewProduct = () => {
ar: varible?.description_ar, ar: varible?.description_ar,
de: varible?.description_de de: varible?.description_de
}, },
quantity: varible?.quantity, // quantity: varible?.quantity,
main_photo: varible?.main_photo, main_photo: varible?.main_photo,
images: varible?.images, ...images,
info: jsonString, info: jsonString,
price: varible?.price, price: varible?.price,
@ -136,7 +137,10 @@ const ViewProduct = () => {
// return { attribute_value_id: item?.value, attribute_id: item?.id } // return { attribute_value_id: item?.value, attribute_id: item?.id }
// }), // }),
} } as any
if (foundObject) { if (foundObject) {
Object.keys(Editedproduct).forEach((propName: any) => { Object.keys(Editedproduct).forEach((propName: any) => {
if (foundObject.hasOwnProperty(propName)) { if (foundObject.hasOwnProperty(propName)) {
@ -186,35 +190,7 @@ const ViewProduct = () => {
delete Editedproduct?.info; delete Editedproduct?.info;
} }
// if (convertedArray && foundObject.info) {
// const editedInfoKeys = Object.keys(convertedArray);
// const foundInfoKeys = Object.keys(foundObject.info);
// console.log(editedInfoKeys, "editedInfoKeys");
// console.log(foundInfoKeys, "foundInfoKeys");
// // Check if the number of keys is the same
// if (editedInfoKeys.length === foundInfoKeys.length) {
// // Check if all keys and their corresponding values are the same
// const keysAreEqual = editedInfoKeys.every((key: any) => {
// //@ts-ignore
// console.log(convertedArray[key], "convertedArray[key] ");
// console.log(foundObject.info[key], "foundObject.info[key]");
// return convertedArray[key] === foundObject.info[key];
// });
// if (keysAreEqual) {
// // Remove the info property from Editedproduct
// //@ts-ignore
// delete Editedproduct.info;
// }
// }
// if (Object.keys(Editedproduct.info).length === 0) {
// //@ts-ignore
// delete Editedproduct.info;
// }
// }
if (Object.keys(Editedproduct).length > 0) { if (Object.keys(Editedproduct).length > 0) {
//@ts-ignore //@ts-ignore
Editedproduct._method = "PUT"; Editedproduct._method = "PUT";
@ -235,16 +211,21 @@ const ViewProduct = () => {
return acc; return acc;
}, {}); }, {});
const jsonString = JSON.stringify(convertedArray); const jsonString = JSON.stringify(convertedArray);
const IMages =
(typeof varible?.main_photo === 'string' || typeof varible?.images === 'string') ?
{
copied_assets: { main_photo: varible?.main_photo, images: varible?.images }
} :
{
main_photo: varible?.main_photo,
images: varible?.images
};
const main_photo = (typeof varible?.main_photo === 'string') ? {
copied_assets: { main_photo: varible?.main_photo },
} : {
main_photo: varible?.main_photo,
}
const images = (typeof varible?.images === 'string') ? {
copied_assets: { images: varible?.images },
} : {
images: varible?.images,
}
const Newproduct = { const Newproduct = {
name: { name: {
en: varible?.name_en, en: varible?.name_en,
@ -262,7 +243,9 @@ const ViewProduct = () => {
price: varible?.price, price: varible?.price,
base_product_id: id, base_product_id: id,
...IMages, ...main_photo,
...images,