From 5de75892a268ab581b6f9c225ff8c79d897b569f Mon Sep 17 00:00:00 2001
From: ramki-bruno <ramki@usebruno.com>
Date: Sat, 8 Mar 2025 19:02:19 +0530
Subject: [PATCH] Fix: Show validation errors in raw-edit mode in manage-cookie
 UI

---
 .../components/Cookies/ModifyCookieModal/index.js  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js b/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
index a5ef2dfe9..e1ed7d173 100644
--- a/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
+++ b/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
@@ -10,6 +10,7 @@ import { IconInfoCircle } from '@tabler/icons';
 import moment from 'moment';
 import 'moment-timezone';
 import { Tooltip } from 'react-tooltip';
+import { isEmpty } from 'lodash';
 
 const removeEmptyValues = (obj) => {
   return Object.fromEntries(Object.entries(obj).filter(([_, value]) => value !== null && value !== undefined));
@@ -111,7 +112,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
           return;
         }
 
-        formik.setValues(
+        const validationErrors = await formik.setValues(
           (values) => ({
             ...values,
             ...modifiedCookie,
@@ -123,6 +124,11 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
           true
         );
 
+        if (!isEmpty(validationErrors)) {
+          toast.error(Object.values(validationErrors).join("\n"));
+          return;
+        }
+
         handleCookieDispatch(cookie, domain, modifiedCookie, onClose);
       } else {
         formik.handleSubmit();
@@ -167,17 +173,17 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
 
     const setParsedCookie = async () => {
       if (!isRawMode && cookieString && !initialParseRef.current) {
+        initialParseRef.current = true;
+
         try {
           const cookieObj = await dispatch(getParsedCookie(cookieString));
 
           if (!cookieObj) return;
 
-          initialParseRef.current = true;
-
           formik.setValues(
             (values) => ({
               ...values,
-              ...cookieObj,
+              ...removeEmptyValues(cookieObj),
               expires:
                 cookieObj?.expires && moment(cookieObj.expires).isValid()
                   ? moment(new Date(cookieObj.expires)).format(moment.HTML5_FMT.DATETIME_LOCAL)