From a64635cd37c674d28f80382a6dedbba70ae2f373 Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Sat, 11 Oct 2025 10:29:40 +0530
Subject: [PATCH] Fix: Ensure orgData can be cleared when opening Organization
 Modal

---
 src/components/Organization/OrgPickerFromSPId.jsx | 15 ++++++++++-----
 src/hooks/useOrganization.js                      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/Organization/OrgPickerFromSPId.jsx b/src/components/Organization/OrgPickerFromSPId.jsx
index 69774947..2b6da36f 100644
--- a/src/components/Organization/OrgPickerFromSPId.jsx
+++ b/src/components/Organization/OrgPickerFromSPId.jsx
@@ -10,13 +10,15 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { spridSchema } from "./OrganizationSchema";
 import { OrgCardSkeleton } from "./OrganizationSkeleton";
+import { useQueryClient } from "@tanstack/react-query";
+
 
 // Zod schema: only allow exactly 4 digits
 
 const OrgPickerFromSPId = ({ title, placeholder }) => {
-  const { onClose, startStep, flowType, onOpen, prevStep } =
+  const { onClose, startStep, flowType, onOpen, prevStep,orgData } =
     useOrganizationModal();
-
+ const clientQuery = useQueryClient()
   const {
     register,
     handleSubmit,
@@ -35,8 +37,11 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
   const onSubmit = (formdata) => {
     setSPRID(formdata.spridSearchText);
   };
-
-  const handleOrg = (orgId) => {};
+  
+  const handleCrateOrg = () => {
+     clientQuery.removeQueries({queryKey:["organization"]})
+    onOpen({ startStep: 4,orgData:null })
+  };
   const SP = watch("spridSearchText");
   return (
     <div className="d-block">
@@ -126,7 +131,7 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
         <button
           type="button"
           className="btn btn-sm btn-primary mt-3"
-          onClick={() => onOpen({ startStep: 4 })}
+          onClick={handleCrateOrg}
         >
           <i className="bx bx-plus-circle me-2"></i>
           Create New Organization
diff --git a/src/hooks/useOrganization.js b/src/hooks/useOrganization.js
index ca356936..2afd205d 100644
--- a/src/hooks/useOrganization.js
+++ b/src/hooks/useOrganization.js
@@ -24,7 +24,7 @@ export const useOrganizationModal = () => {
       dispatch(
         openOrgModal({
           isOpen: true,
-          orgData: options.orgData ?? orgData ?? null,
+          orgData: options.hasOwnProperty("orgData") ? options.orgData : orgData,
           startStep: options.startStep ?? startStep ?? 1,
           prevStep: options.prevStep ?? prevStep ?? 1,
           flowType: options.flowType ?? flowType ?? "default",