Merge pull request 'Selected organization should remain visible after navigating back' (#460) from Kartik_Bug#1381 into Issues_Oct_1W

Reviewed-on: #460
Merged

src/components/Organization/OrgPickerFromSPId.jsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import {
   useAssignOrgToTenant,
   useOrganizationBySPRID,
@@ -14,12 +14,14 @@ import { OrgCardSkeleton } from "./OrganizationSkeleton";
 // 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 {
     register,
     handleSubmit,
+    setValue,
     formState: { errors },
     watch,
   } = useForm({
@@ -36,7 +38,24 @@ const OrgPickerFromSPId = ({ title, placeholder }) => {
     setSPRID(formdata.spridSearchText);
   };
 
-  const handleOrg = (orgId) => {};
+// Add this..
+   useEffect(() => {
+    if (orgData?.sprid) {
+      setValue("spridSearchText", orgData.sprid);
+      setSPRID(orgData.sprid);
+    }
+  }, [orgData, setValue]);
+// Add this..
+  useEffect(() => {
+  const subscription = watch((value) => {
+    if (!value.spridSearchText) {
+      setSPRID(""); 
+    }
+  });
+  return () => subscription.unsubscribe();
+}, [watch]);
+
+  const handleOrg = (orgId) => { };
   const SP = watch("spridSearchText");
   return (
     <div className="d-block">