Merge pull request #1069 from joshunrau/fix-session-form

Author: joshunrau

apps/web/src/features/session/pages/StartSessionPage.tsx

@@ -15,18 +15,23 @@ export const StartSessionPage = () => {
   const currentGroup = useAppStore((store) => store.currentGroup);
   const currentSession = useAppStore((store) => store.currentSession);
   const startSession = useAppStore((store) => store.startSession);
-  const [key, setKey] = useState(0);
   const location = useLocation() as Location<{
     initialValues?: FormTypes.PartialNullableData<StartSessionFormData>;
   } | null>;
+  const defaultInitialValues = {
+    sessionType: 'IN_PERSON',
+    subjectIdentificationMethod: currentGroup?.settings.defaultIdentificationMethod ?? 'CUSTOM_ID'
+  } as const;
+  const [initialValues, setInitialValues] = useState<FormTypes.PartialNullableData<StartSessionFormData>>(
+    location.state?.initialValues ?? defaultInitialValues
+  );
 
   const { t } = useTranslation('session');
   const createSessionMutation = useCreateSession();
 
-  // this is to force reset the form when the session changes, if on the same page
   useEffect(() => {
     if (currentSession === null) {
-      setKey(key + 1);
+      setInitialValues(defaultInitialValues);
     }
   }, [currentSession]);
 
@@ -39,17 +44,11 @@ export const StartSessionPage = () => {
       </PageHeader>
       <StartSessionForm
         currentGroup={currentGroup}
-        initialValues={
-          location.state?.initialValues ?? {
-            sessionType: 'IN_PERSON',
-            subjectIdentificationMethod: currentGroup?.settings.defaultIdentificationMethod ?? 'CUSTOM_ID'
-          }
-        }
-        key={key}
+        initialValues={initialValues}
         readOnly={currentSession !== null}
-        onSubmit={async (data) => {
-          const session = await createSessionMutation.mutateAsync(data);
-          startSession(session);
+        onSubmit={async (formData) => {
+          const session = await createSessionMutation.mutateAsync(formData);
+          startSession({ ...session, type: formData.type });
         }}
       />
     </React.Fragment>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opendatacapture",
   "type": "module",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "private": true,
   "packageManager": "[email protected]",
   "license": "Apache-2.0",