Update frontend to show circular refrences from the modal.

controllers/ingredientData.js

@@ -64,11 +64,7 @@ module.exports = {
         name: new name of the ingredient,
         quantity: new quantity of the unit (in grams),
         category: new category of the unit,
-        unit: new default unit of the ingredient,
-        ingredients: [{
-            ingredient: String (Id),
-            quantity: Number
-        }]
+        unit: new default unit of the ingredient
     }
     response = Ingredient
     error response = '$' delimited String
@@ -192,7 +188,7 @@ module.exports = {
                     
                     return res.json(string);
                 }
-                console.log(err);
+                return res.json("ERROR: UNABLE TO UPDATE YOUR SUB-INGREDIENTS");
             });
     },
 

views/dashboardPage/js/modal.js

@@ -236,8 +236,6 @@ let modal = {
                 });
             }
 
-            // console.log(data);
-
             let loader = document.getElementById("loaderContainer");
             loader.style.display = "flex";
 
@@ -251,7 +249,13 @@ let modal = {
                 .then(response => response.json())
                 .then((response)=>{
                     if(typeof(response) === "string"){
-                        controller.createBanner(response, "error");
+                        if(response.includes("$") === true) {
+                            controller.createBanner(response.split("$")[0], "error");
+                            controller.closeModal();
+                            controller.openModal("circularReference", response);
+                        }else{
+                            controller.createBanner(response, "error");
+                        }
                     }else{
                         merchant.removeIngredient(ingredient);
                         merchant.addIngredients([response]);
@@ -262,7 +266,6 @@ let modal = {
                     }
                 })
                 .catch((err)=>{
-                    console.log(err);
                     controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
                 })
                 .finally(()=>{

views/dashboardPage/js/sidebars/editIngredient.js

@@ -73,11 +73,10 @@ let editIngredient = {
             id: ingredient.ingredient.id,
             name: document.getElementById("editIngName").value,
             category: document.getElementById("editIngCategory").value,
-            ingredients: []
+            ingredients: [],
+            quantity: controller.baseUnit(quantity, ingredient.ingredient.unit)
         }
 
-        data.quantity = controller.baseUnit(quantity, ingredient.ingredient.unit);
-
         //Get the measurement unit
         let units = document.getElementById("unitButtons");
         for(let i = 0; i < units.children.length; i++){
@@ -87,15 +86,6 @@ let editIngredient = {
             }
         }
 
-        //Add the sub-ingredients
-        for(let i = 0; i < ingredient.ingredient.subIngredients.length; i++){
-            let subIngredient = ingredient.ingredient.subIngredients[i];
-            data.ingredients.push({
-                ingredient: subIngredient.ingredient.id,
-                quantity: subIngredient.quantity
-            });
-        }
-
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
@@ -109,8 +99,7 @@ let editIngredient = {
         .then(response => response.json())
         .then((response)=>{
             if(typeof(response) === "string"){
-                controller.createBanner("ERROR: CIRCULAR REFERENCE", "error");
-                controller.openModal("circularReference", response);
+                controller.createBanner(response, "error");
             }else{
                 merchant.removeIngredient(merchant.getIngredient(response.ingredient._id));
                 merchant.addIngredients([response]);