Merge pull request #421 from AkshataKatwal16/reassign-cohorts

Issue feat:Resolve observation Id issue for first time login user
tekdi · Nov 24, 2024 · 36a13b6 · 36a13b6
2 parents ac195bb + 7bee420
commit 36a13b6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/pages/observation/[observationId]/index.tsx b/src/pages/observation/[observationId]/index.tsx
@@ -70,6 +70,8 @@ const ObservationDetails = () => {
   const [entityData, setEntityData] = useState<any[]>([]);
   const [filteredEntityData, setFilteredEntityData] = useState<any[]>([]);
   const [loading, setLoading] = React.useState(false);
+  const [observationId, setObservationId] = React.useState("");
+
 
 
 
@@ -193,6 +195,7 @@ const ObservationDetails = () => {
           {
             console.log("entityIds?.length", entities?.length);
             const response = await fetchEntities({ solutionId });
+            setObservationId(response?.result?._id)
             setFetchEntityResponse(response?.result?.entities)
             entities = response?.result?.entities?.map(
               (item: any) => item?._id
@@ -274,15 +277,15 @@ setFilteredEntityData(result)
       };
 
       const executeAddEntities = async () => {
-        if (Id) {
-          const observationId = Id;
           if (entity === ObservationEntityType.CENTER && unmatchedCohortIds.length !== 0) {
             await addEntities({ data, observationId });
             const urlPath = window.location.pathname;
 
           const solutionId = urlPath.split('/observation/')[1];
 
           const response = await fetchEntities({ solutionId });
+          setObservationId(response?.result?._id)
+
             setFetchEntityResponse(response?.result?.entities)
           } else if (unmatchedUserIds.length !== 0) {
             await addEntities({ data, observationId });
@@ -291,15 +294,17 @@ setFilteredEntityData(result)
           const solutionId = urlPath.split('/observation/')[1];
 
           const response = await fetchEntities({ solutionId });
+          setObservationId(response?.result?._id)
+
             setFetchEntityResponse(response?.result?.entities)
           }
 
-        }
+
       };
 
       executeAddEntities();
     }
-  }, [entityIds, Data]);
+  }, [entityIds, Data,observationId]);
 
 
 
@@ -420,7 +425,7 @@ setFilteredEntityData(result)
     const { Id } = router.query;
 
 
-    const queryParams = { entityId: cohortId, Id: Id , observationName: observationName };
+    const queryParams = { entityId: cohortId, Id: observationId , observationName: observationName };
     router.push({
       pathname: newFullPath,
       query: queryParams,

diff --git a/src/pages/observation/index.tsx b/src/pages/observation/index.tsx
@@ -81,7 +81,16 @@ const ObservationForms: React.FC = () => {
     const [basePath, queryString] = fullPath.split('?');
     const newRoute = `/${observationId}`;
     let newFullPath = `${basePath}${newRoute}`;
-    const queryParams = { entity: entity, observationName: observationName, Id: id };
+    let queryParams;
+    if(id==="")
+    {
+     queryParams = { entity: entity, observationName: observationName };
+
+    }
+    else{
+      queryParams = { entity: entity, observationName: observationName, Id: id };
+
+    }
     localStorage.setItem("observationDescription", description)
     localStorage.setItem("endDateForSelectedObservation", endDate.toString())