return to previous position in parent

Citizen-Knowledge-Graph · Jun 25, 2024 · f0f4660 · f0f4660
1 parent e47aad8
commit f0f4660
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/screens/profile-section/ProfileSectionScreen.js b/src/screens/profile-section/ProfileSectionScreen.js
@@ -28,8 +28,6 @@ const ProfileSectionScreen = () => {
         setCompleted(false);
     }, [id]);
 
-    console.log("we are back here: ", profileSectionData)
-
     return (
         <Layout>
             {profileSectionData ? (

diff --git a/src/screens/profile-section/components/ProfileSectionList.js b/src/screens/profile-section/components/ProfileSectionList.js
@@ -9,6 +9,7 @@ const ProfileSectionList = ({profileSectionData, mode, setCompleted}) => {
     const [currentIndex, setCurrentIndex] = useState(0);
     const [entityData, setEntityData] = useState({});
     const retrieveCurrentEntityData = useProfileSectionStore((state) => state.retrieveCurrentEntityData);
+    const retrieveCurrentDatafield = useProfileSectionStore((state) => state.retrieveCurrentDatafield);
     const {
         handleConfirm,
         handleBack,
@@ -17,8 +18,16 @@ const ProfileSectionList = ({profileSectionData, mode, setCompleted}) => {
 
     useEffect(() => {
         setEntityData(retrieveCurrentEntityData());
-        setCurrentIndex(0);
-    }, [profileSectionData, retrieveCurrentEntityData]);
+        const datafield = retrieveCurrentDatafield();
+        if (datafield) {
+            const index = profileSectionData.fields.findIndex((field) => field.datafield === datafield);
+            if (index !== -1) {
+                setCurrentIndex(index);
+            }
+        } else {
+            setCurrentIndex(0);
+        }
+    }, [profileSectionData, retrieveCurrentDatafield, retrieveCurrentEntityData]);
 
     const currentField = profileSectionData.fields[currentIndex];
     return (

diff --git a/src/storage/useProfileSectionStore.js b/src/storage/useProfileSectionStore.js
@@ -17,6 +17,11 @@ export const useProfileSectionStore = create((set, get) => ({
         console.log(`STATE UPDATE: We are retrieving the current profile section`);
         return findDeepestProfileSection(data);
     },
+    retrieveCurrentDatafield() {
+        const data = get().sectionStore;
+        console.log(`STATE UPDATE: We are retrieving the current datafield`);
+        return findDeepestDatafield(data);
+    },
     updateDeepestDatafield: (newDatafield) =>
         console.log('STATE UPDATE: We are updating the deepest datafield') ||
         set((state) => ({
@@ -55,6 +60,13 @@ const findDeepestEntityData = (section) => {
     return findDeepestEntityData(section.nestedSection);
 };
 
+const findDeepestDatafield = (section) => {
+    if (!section.nestedSection) {
+        return section.datafield;
+    }
+    return findDeepestDatafield(section.nestedSection);
+};
+
 const findDeepestProfileSection = (section) => {
     if (!section.nestedSection) {
         return section.profileSection;