update: modal required field error messages

Author: mslaursen

fastapi_forge/frontend/modals/enum_modal.py

@@ -4,6 +4,7 @@
 from nicegui import ui
 
 from fastapi_forge.dtos import CustomEnumValue
+from fastapi_forge.frontend.notifications import notify_value_error
 from fastapi_forge.frontend.state import state
 
 
@@ -55,11 +56,19 @@ def _build_action_buttons(self) -> None:
         ui.button("Cancel", on_click=self.close)
         ui.button(
             self.title,
-            on_click=lambda: self.on_add_value(
+            on_click=self._handle_add,
+        )
+
+    def _handle_add(self) -> None:
+        try:
+            self.on_add_value(
                 name=self.value_name.value,
                 value=self.value_value.value,
-            ),
-        )
+            )
+            self.close()
+        except ValueError as exc:
+            notify_value_error(exc)
+            return
 
 
 class UpdateEnumValueModal(BaseEnumValueModal):
@@ -79,12 +88,15 @@ def _build_action_buttons(self) -> None:
     def _handle_update(self) -> None:
         if not state.selected_enum_value:
             return
-
-        self.on_update_value(
-            name=self.value_name.value,
-            value=self.value_value.value,
-        )
-        self.close()
+        try:
+            self.on_update_value(
+                name=self.value_name.value,
+                value=self.value_value.value,
+            )
+            self.close()
+        except ValueError as exc:
+            notify_value_error(exc)
+            return
 
     def _set_value(self, enum_value: CustomEnumValue) -> None:
         state.selected_enum_value = enum_value

fastapi_forge/frontend/modals/field_modal.py

@@ -6,7 +6,10 @@
 
 from fastapi_forge.dtos import ModelField, ModelFieldMetadata
 from fastapi_forge.enums import FieldDataTypeEnum
-from fastapi_forge.frontend.notifications import notify_validation_error
+from fastapi_forge.frontend.notifications import (
+    notify_validation_error,
+    notify_value_error,
+)
 from fastapi_forge.frontend.state import state
 from fastapi_forge.jinja_utils import generate_field
 
@@ -298,43 +301,47 @@ def _handle_update(self) -> None:
         if not state.selected_field:
             return
 
-        self.on_update_field(
-            name=self.field_name.value,
-            type=self.field_type.value,
-            type_enum=(
-                next(
-                    (
-                        e.name
-                        for e in state.custom_enums
-                        if e.name == self.enum_selector.value
-                    ),
-                    None,
-                )
-                if self.show_enum_selector
-                else None
-            ),
-            primary_key=self.primary_key.value,
-            nullable=self.nullable.value,
-            unique=self.unique.value,
-            index=self.index.value,
-            default_value=(
-                self.default_value_select.value
-                if self.show_enum_defaults
-                else self.default_value_input.value
-            )
-            or None,
-            extra_kwargs=self.extra_kwargs or None,
-            metadata=ModelFieldMetadata(
-                is_created_at_timestamp=(
-                    self.created_at.value if self.show_metadata else False
+        try:
+            self.on_update_field(
+                name=self.field_name.value,
+                type=self.field_type.value,
+                type_enum=(
+                    next(
+                        (
+                            e.name
+                            for e in state.custom_enums
+                            if e.name == self.enum_selector.value
+                        ),
+                        None,
+                    )
+                    if self.show_enum_selector
+                    else None
                 ),
-                is_updated_at_timestamp=(
-                    self.updated_at.value if self.show_metadata else False
+                primary_key=self.primary_key.value,
+                nullable=self.nullable.value,
+                unique=self.unique.value,
+                index=self.index.value,
+                default_value=(
+                    self.default_value_select.value
+                    if self.show_enum_defaults
+                    else self.default_value_input.value
+                )
+                or None,
+                extra_kwargs=self.extra_kwargs or None,
+                metadata=ModelFieldMetadata(
+                    is_created_at_timestamp=(
+                        self.created_at.value if self.show_metadata else False
+                    ),
+                    is_updated_at_timestamp=(
+                        self.updated_at.value if self.show_metadata else False
+                    ),
+                    is_foreign_key=False,
                 ),
-                is_foreign_key=False,
-            ),
-        )
-        self.close()
+            )
+            self.close()
+        except ValueError as exc:
+            notify_value_error(exc)
+            return
 
     def _set_field(self, field: ModelField) -> None:
         state.selected_field = field

fastapi_forge/frontend/modals/relation_modal.py

@@ -5,6 +5,7 @@
 
 from fastapi_forge.dtos import Model, ModelRelationship
 from fastapi_forge.enums import OnDeleteEnum
+from fastapi_forge.frontend.notifications import notify_value_error
 
 
 class BaseRelationModal(ui.dialog, ABC):
@@ -74,16 +75,19 @@ def _build_action_buttons(self) -> None:
         )
 
     def _add_relation(self) -> None:
-        self.on_add_relation(
-            field_name=self.field_name.value,
-            target_model=self.target_model.value,
-            back_populates=self.back_populates.value or None,
-            nullable=self.nullable.value,
-            index=self.index.value,
-            unique=self.unique.value,
-            on_delete=self.on_delete.value,
-        )
-        self.close()
+        try:
+            self.on_add_relation(
+                field_name=self.field_name.value,
+                target_model=self.target_model.value,
+                back_populates=self.back_populates.value or None,
+                nullable=self.nullable.value,
+                index=self.index.value,
+                unique=self.unique.value,
+                on_delete=self.on_delete.value,
+            )
+            self.close()
+        except ValueError as exc:
+            notify_value_error(exc)
 
     def open(self, models: list[Model]) -> None:
         self.target_model.options = [model.name for model in models]
@@ -110,16 +114,19 @@ def _update_relation(self) -> None:
         if not self.selected_relation:
             return
 
-        self.on_update_relation(
-            field_name=self.field_name.value,
-            target_model=self.target_model.value,
-            back_populates=self.back_populates.value,
-            nullable=self.nullable.value,
-            index=self.index.value,
-            unique=self.unique.value,
-            on_delete=self.on_delete.value,
-        )
-        self.close()
+        try:
+            self.on_update_relation(
+                field_name=self.field_name.value,
+                target_model=self.target_model.value,
+                back_populates=self.back_populates.value,
+                nullable=self.nullable.value,
+                index=self.index.value,
+                unique=self.unique.value,
+                on_delete=self.on_delete.value,
+            )
+            self.close()
+        except ValueError as exc:
+            notify_value_error(exc)
 
     def _set_relation(self, relation: ModelRelationship) -> None:
         self.selected_relation = relation

fastapi_forge/frontend/notifications.py

@@ -7,6 +7,10 @@ def notify_validation_error(e: ValidationError) -> None:
     ui.notify(msg, type="negative")
 
 
+def notify_value_error(e: ValueError) -> None:
+    ui.notify(str(e), type="negative")
+
+
 def notify_model_exists(model_name: str) -> None:
     ui.notify(
         f"Model '{model_name}' already exists.",

fastapi_forge/frontend/panels/enum_editor_panel.py

@@ -4,6 +4,7 @@
 from pydantic import ValidationError
 
 from fastapi_forge.dtos import CustomEnum, CustomEnumValue
+from fastapi_forge.frontend import validation
 from fastapi_forge.frontend.constants import ENUM_COLUMNS
 from fastapi_forge.frontend.modals import (
     AddEnumValueModal,
@@ -116,6 +117,11 @@ def _handle_modal_add_value(self, *, name: str, value: str) -> None:
         if state.selected_enum is None:
             return
 
+        try:
+            validation.raise_if_missing_fields([("Name", name), ("Value", value)])
+        except ValueError as exc:
+            raise exc
+
         if self._enum_value_exists(name):
             notify_enum_value_exists(name, state.selected_enum.name)
             return
@@ -135,6 +141,11 @@ def _handle_update_value(self, *, name: str, value: str) -> None:
         if state.selected_enum is None or state.selected_enum_value is None:
             return
 
+        try:
+            validation.raise_if_missing_fields([("Name", name), ("Value", value)])
+        except ValueError as exc:
+            raise exc
+
         if self._enum_value_exists(name):
             notify_enum_value_exists(name, state.selected_enum.name)
             return

fastapi_forge/frontend/panels/model_editor_panel.py

@@ -10,6 +10,7 @@
     ModelRelationship,
 )
 from fastapi_forge.enums import FieldDataTypeEnum, OnDeleteEnum
+from fastapi_forge.frontend import validation
 from fastapi_forge.frontend.constants import (
     DEFAULT_AUTH_USER_FIELDS,
     FIELD_COLUMNS,
@@ -24,6 +25,7 @@
 from fastapi_forge.frontend.notifications import (
     notify_field_exists,
     notify_validation_error,
+    notify_value_error,
 )
 from fastapi_forge.frontend.state import state
 from fastapi_forge.jinja import render_model_to_model
@@ -309,21 +311,32 @@ def _handle_modal_add_field(
             self._add_field(**kwargs)
             self.add_field_modal.close()
         except ValueError as exc:
-            ui.notify(str(exc), type="negative")
+            notify_value_error(exc)
 
     def _handle_modal_add_relation(
         self,
         field_name: str,
         target_model: str,
+        on_delete: OnDeleteEnum,
         nullable: bool,
         index: bool,
         unique: bool,
-        on_delete: OnDeleteEnum,
         back_populates: str | None = None,
     ) -> None:
         if not state.selected_model:
             return
 
+        try:
+            validation.raise_if_missing_fields(
+                [
+                    ("Field Name", field_name),
+                    ("Target Model", target_model),
+                    ("On Delete", on_delete),
+                ]
+            )
+        except ValueError as exc:
+            raise exc
+
         target_model_instance = next(
             (model for model in state.models if model.name == target_model),
             None,
@@ -408,6 +421,13 @@ def _add_field(
         if state.selected_model is None:
             return
 
+        try:
+            validation.raise_if_missing_fields(
+                [("Field Name", name), ("Field Type", type)]
+            )
+        except ValueError as exc:
+            raise exc
+
         if self._field_name_exists(name):
             notify_field_exists(name, state.selected_model.name)
             return
@@ -519,6 +539,13 @@ def _handle_update_field(
         if name in exclude_set:
             return
 
+        try:
+            validation.raise_if_missing_fields(
+                [("Field Name", name), ("Field Type", type)]
+            )
+        except ValueError as exc:
+            raise exc
+
         if state.selected_field.name != name and self._field_name_exists(name):
             notify_field_exists(name, state.selected_model.name)
             return
@@ -561,6 +588,17 @@ def _handle_update_relation(
         if not state.selected_model or not state.selected_relation:
             return
 
+        try:
+            validation.raise_if_missing_fields(
+                [
+                    ("Field Name", field_name),
+                    ("Target Model", target_model),
+                    ("On Delete", on_delete),
+                ]
+            )
+        except ValueError as exc:
+            raise exc
+
         target_model_instance = next(
             (model for model in state.models if model.name == target_model),
             None,

fastapi_forge/frontend/panels/project_config_panel.py

@@ -162,10 +162,10 @@ def _update_taskiq_state(self, *_) -> None:
             self.use_taskiq.value = False
             state.use_taskiq = False
 
-    async def _create_auth_model_dialog(self) -> bool:
+    async def _auth_dialog(self) -> bool:
         dialog = ui.dialog()
         with dialog, ui.card().classes("w-full max-w-md p-6 text-center"):
-            ui.icon("check_circle", color="green-500").classes("text-4xl self-center")
+            ui.icon("security", color="green-500").classes("text-4xl self-center")
             ui.markdown(
                 "JWT Auth needs a model with 'email' and 'password' fields. "
                 "Select any model as auth model later, or create one now (optional)."
@@ -176,9 +176,9 @@ async def _create_auth_model_dialog(self) -> bool:
             ).classes("w-full mt-4")
 
             with ui.row().classes("w-full justify-center gap-4 mt-4"):
-                ui.button("Cancel", color="negative", on_click=dialog.close)
+                ui.button("Close", color="negative", on_click=dialog.close)
                 ui.button(
-                    "Enable JWT Auth",
+                    "Proceed",
                     color="primary",
                     on_click=lambda: dialog.submit(create_model_checkbox.value),
                 )
@@ -203,9 +203,9 @@ async def _handle_builtin_auth_change(
                 state.render_actions_fn.refresh()
             return
 
-        create_model_dialog = await self._create_auth_model_dialog()
+        proceed = await self._auth_dialog()
 
-        if not create_model_dialog:
+        if not proceed:
             return
 
         if any(model.name == "auth_user" for model in state.models):