fix e2e

frontend/src/app/Settings/Facility/FacilityForm.tsx

@@ -27,6 +27,7 @@ import { deviceRequiredErrMsg, facilityInfoErrMsgs } from "./constants";
 
 export type FacilityFormData = {
   facility: {
+    id?: string;
     name: string;
     phone: string;
     email: string | null;
@@ -51,7 +52,6 @@ export type FacilityFormData = {
     phone: string | null;
   };
   devices: string[];
-  id?: string;
 };
 
 type AddressOptions = "facility" | "provider";

frontend/src/app/Settings/Facility/FacilityFormContainer.tsx

@@ -33,11 +33,23 @@ const FacilityFormContainer: any = (props: Props) => {
   const [addFacilityMutation] = useAddFacilityMutation();
 
   const [saveSuccess, updateSaveSuccess] = useState(false);
-  const [facilityData, setFacilityData] = useState<any | undefined>(undefined);
+  const [facilityData, setFacilityData] = useState<
+    FacilityFormData | undefined
+  >(undefined);
   const dispatch = useDispatch();
 
+  if (loading) {
+    return <p> Loading... </p>;
+  }
+  if (error) {
+    return error;
+  }
+  if (!data) {
+    return <p>Error: facility not found</p>;
+  }
+
   if (saveSuccess) {
-    dispatch(updateFacility(facilityData));
+    dispatch(updateFacility(facilityData?.facility));
 
     showSuccess(
       "The settings for the facility have been updated",
@@ -52,16 +64,6 @@ const FacilityFormContainer: any = (props: Props) => {
     );
   }
 
-  if (loading) {
-    return <p> Loading... </p>;
-  }
-  if (error) {
-    return error;
-  }
-  if (!data) {
-    return <p>Error: facility not found</p>;
-  }
-
   const saveFacility = async (facilityData: FacilityFormData) => {
     if (appInsights) {
       appInsights.trackEvent({ name: "Save Settings" });
@@ -104,10 +106,9 @@ const FacilityFormContainer: any = (props: Props) => {
           (response) => response?.data?.addFacility?.id
         );
 
-    setFacilityData({
-      ...facility,
-      id: savedFacilityId as string,
-    });
+    facilityData.facility.id = savedFacilityId;
+
+    setFacilityData(facilityData);
     updateSaveSuccess(true);
   };