Fixed findroute not to set self.step_points as None

Author: tk42

tsptw/app.py

@@ -16,6 +16,10 @@ def render(self) -> None:
         with st.sidebar:
             user_info = login_button(client_id=AUTH0_CLIENT_ID, domain=AUTH0_DOMAIN)
             if user_info:
+                if not user_info["email_verified"]:
+                    st.error("Email is not verified")
+                    return
+
                 st.session_state["sid"] = user_info["sid"]
             else:
                 if "sid" in st.session_state and st.session_state["sid"] is None:

tsptw/pages/edit.py

@@ -20,7 +20,6 @@ def submit(
         actor: ActorId = ActorId.NONE,
         sp_id: str = "",
         timestamp: int = 0,
-        first_set: bool = False,
         last_delete: bool = False,
     ):
         sid = st.session_state["sid"]
@@ -41,10 +40,7 @@ def submit(
                 end_time,
             )
 
-            if first_set:
-                cont_ref.set({sp.id: sp.to_dict()})
-            else:
-                cont_ref.update({sp.id: sp.to_dict()})
+            cont_ref.set({sp.id: sp.to_dict()}, merge=True)
         elif actor == ActorId.UPDATE:
             sp = StepPoint(sp_id, timestamp, step_name, step_address, staying_min, start_time, end_time)
             cont_ref.update({sp.id: sp.to_dict()})
@@ -137,7 +133,6 @@ def render(self):
                     "actor": ActorId.ADD,
                     "sp_id": self.selected["id"],
                     "timestamp": self.selected["timestamp"],
-                    "first_set": self.selected["id"] == "",
                     "last_delete": contacts is not None and len(contacts) == 1,
                 },
             )
@@ -151,7 +146,6 @@ def render(self):
                     "actor": ActorId.UPDATE,
                     "sp_id": self.selected["id"],
                     "timestamp": self.selected["timestamp"],
-                    "first_set": self.selected["id"] == "",
                     "last_delete": contacts is not None and len(contacts) == 1,
                 },
             )
@@ -165,7 +159,6 @@ def render(self):
                     "actor": ActorId.DELETE,
                     "sp_id": self.selected["id"],
                     "timestamp": self.selected["timestamp"],
-                    "first_set": self.selected["id"] == "",
                     "last_delete": contacts is not None and len(contacts) == 1,
                 },
             )

tsptw/pages/findroute.py

@@ -200,7 +200,7 @@ def render(self):
             st.warning("Please login to continue")
             return
 
-        if "step_points" in st.session_state:
+        if "step_points" in st.session_state and st.session_state["step_points"]:
             self.step_points = st.session_state["step_points"]
 
         contacts = self.sort_data(self.connect_to_database(st.session_state["sid"]))
@@ -215,7 +215,7 @@ def render(self):
             self.step_points = st.multiselect(
                 "経由地点",
                 contacts.values(),
-                self.step_points,
+                default=self.step_points,
                 format_func=lambda contact: contact["name"],
                 key="step_points",
                 disabled=len(self.step_points) > 25,