Init

mslaursen · mslaursen · commit 27afa0be0078 · 2025-04-04T03:01:20.000+02:00
diff --git a/fastapi_forge/frontend/constants.py b/fastapi_forge/frontend/constants.py
@@ -1,5 +1,8 @@
 from typing import Any
 
+from fastapi_forge.dtos import ModelField
+from fastapi_forge.enums import FieldDataType
+
 SELECTED_MODEL_TEXT_COLOR = "text-black-500 dark:text-amber-300"
 
 FIELD_COLUMNS: list[dict[str, Any]] = [
@@ -46,3 +49,17 @@
     {"name": "index", "label": "Index", "field": "index", "align": "center"},
     {"name": "unique", "label": "Unique", "field": "unique", "align": "center"},
 ]
+
+
+DEFAULT_AUTH_USER_FIELDS: list[ModelField] = [
+    ModelField(
+        name="email",
+        type=FieldDataType.STRING,
+        unique=True,
+        index=True,
+    ),
+    ModelField(
+        name="password",
+        type=FieldDataType.STRING,
+    ),
+]
diff --git a/fastapi_forge/frontend/modals/field_modal.py b/fastapi_forge/frontend/modals/field_modal.py
@@ -122,6 +122,10 @@ def remove_row():
 
     def _show_field_preview(self) -> None:
         if not self.field_name.value:
+            ui.notify("Set a field name first", type="warning")
+            return
+        if not self.field_type.value:
+            ui.notify("Select a field type first", type="warning")
             return
         try:
             with ui.dialog() as modal, ui.card().classes("no-shadow border-[1px]"):
diff --git a/fastapi_forge/frontend/panels/model_editor_panel.py b/fastapi_forge/frontend/panels/model_editor_panel.py
@@ -5,7 +5,11 @@
 
 from fastapi_forge.dtos import Model, ModelField, ModelFieldMetadata, ModelRelationship
 from fastapi_forge.enums import FieldDataType
-from fastapi_forge.frontend.constants import FIELD_COLUMNS, RELATIONSHIP_COLUMNS
+from fastapi_forge.frontend.constants import (
+    DEFAULT_AUTH_USER_FIELDS,
+    FIELD_COLUMNS,
+    RELATIONSHIP_COLUMNS,
+)
 from fastapi_forge.frontend.modals import (
     AddFieldModal,
     AddRelationModal,
@@ -28,6 +32,7 @@ def __init__(self):
         state.select_model_fn = self.set_selected_model
         state.deselect_model_fn = self.deselect_model
         state.render_model_editor_fn = self.refresh
+        state.render_actions_fn = self._render_action_group
 
         self.add_field_modal: AddFieldModal = AddFieldModal(
             on_add_field=self._handle_modal_add_field,
@@ -56,6 +61,63 @@ def _show_code_preview(self) -> None:
                 ui.code(code).classes("w-full")
                 modal.open()
 
+    def _toggle_auth_model(self) -> None:
+        if not state.selected_model or not state.use_builtin_auth:
+            return
+
+        if not state.selected_model.metadata.is_auth_model and any(
+            m.metadata.is_auth_model for m in state.models
+        ):
+            ui.notify(
+                "Cannot have more than one authentication model.", type="negative"
+            )
+            return
+
+        model = state.selected_model
+        model.metadata.is_auth_model = not model.metadata.is_auth_model
+
+        if not model.metadata.is_auth_model:
+            self._remove_auth_fields(model)
+            if state.render_model_editor_fn:
+                state.render_model_editor_fn()
+
+        if state.render_models_fn:
+            state.render_models_fn()
+        self._render_action_group.refresh()
+
+        if model.metadata.is_auth_model:
+            self._setup_auth_model_fields(model)
+
+    def _remove_auth_fields(self, model: Model) -> None:
+        for field_name in ("email", "password"):
+            if field := next((f for f in model.fields if f.name == field_name), None):
+                model.fields.remove(field)
+
+    def _setup_auth_model_fields(self, model: Model) -> None:
+        self._remove_auth_fields(model)
+        id_index = 0
+        insert_position = id_index + 1 if id_index >= 0 else 0
+        for field in reversed(DEFAULT_AUTH_USER_FIELDS):
+            model.fields.insert(insert_position, field)
+
+        self._refresh_table(model.fields)
+
+    @ui.refreshable
+    def _render_action_group(self) -> None:
+        ui.button(
+            icon="security",
+            on_click=self._toggle_auth_model,
+            color=(
+                "green"
+                if state.use_builtin_auth
+                and state.selected_model
+                and state.selected_model.metadata.is_auth_model
+                else "grey"
+            ),
+        ).tooltip("Authentication model").bind_visibility_from(
+            state, "use_builtin_auth"
+        )
+
     def _build(self) -> None:
         with self:
             with ui.row().classes("w-full justify-between items-center"):
@@ -67,6 +129,7 @@ def _build(self) -> None:
                     ).tooltip("Preview SQLAlchemy model code")
 
                 with ui.row().classes("gap-2 items-center"):
+                    self._render_action_group()
                     with (
                         ui.button(icon="menu").tooltip("Generate"),
                         ui.menu(),
@@ -373,22 +436,30 @@ def _deselect_relation(self) -> None:
         self.relationship_table.selected = []
 
     def _on_select_field(self, selection: list[dict[str, Any]]) -> None:
-        if not state.selected_model:
+        if not state.selected_model or not selection:
+            self._deselect_field()
             return
-        if not selection:
+
+        name = selection[0].get("name")
+
+        if (
+            state.selected_model.metadata.is_auth_model
+            and state.use_builtin_auth
+            and name in ("password", "email")
+        ):
+            ui.notify(
+                f"Cannot edit {name} field in authentication model.", type="warning"
+            )
             self._deselect_field()
             return
-        if selection[0].get("name") == "id":
+
+        if name == "id":
             self._deselect_field()
-        else:
-            state.selected_field = next(
-                (
-                    field
-                    for field in state.selected_model.fields
-                    if field.name == selection[0]["name"]
-                ),
-                None,
-            )
+            return
+
+        state.selected_field = next(
+            (field for field in state.selected_model.fields if field.name == name), None
+        )
 
     def _on_select_relation(self, selection: list[dict[str, Any]]) -> None:
         if not state.selected_model:
@@ -424,6 +495,17 @@ def _handle_update_field(
         ):
             return
 
+        if state.selected_model.metadata.is_auth_model and name == "password":
+            ui.notify(
+                "Cannot rename password field in authentication model.", type="negative"
+            )
+            return
+        if state.selected_model.metadata.is_auth_model and name == "email":
+            ui.notify(
+                "Cannot rename email field in authentication model.", type="negative"
+            )
+            return
+
         if state.selected_field.name != name and self._field_name_exists(name):
             notify_field_exists(name, state.selected_model.name)
             return
diff --git a/fastapi_forge/frontend/panels/project_config_panel.py b/fastapi_forge/frontend/panels/project_config_panel.py
@@ -12,6 +12,7 @@
 )
 from fastapi_forge.enums import FieldDataType
 from fastapi_forge.forge import build_project
+from fastapi_forge.frontend.constants import DEFAULT_AUTH_USER_FIELDS
 from fastapi_forge.frontend.notifications import notify_validation_error
 from fastapi_forge.frontend.state import state
 
@@ -166,16 +167,7 @@ def _handle_builtin_auth_change(self, event: ValueChangeEventArguments) -> None:
                             unique=True,
                             index=True,
                         ),
-                        ModelField(
-                            name="email",
-                            type=FieldDataType.STRING,
-                            unique=True,
-                            index=True,
-                        ),
-                        ModelField(
-                            name="password",
-                            type=FieldDataType.STRING,
-                        ),
+                        *DEFAULT_AUTH_USER_FIELDS,
                         ModelField(
                             name="created_at",
                             type=FieldDataType.DATETIME,
diff --git a/fastapi_forge/frontend/state.py b/fastapi_forge/frontend/state.py
@@ -27,6 +27,7 @@ class ProjectState(BaseModel):
 
     render_models_fn: Callable | None = None
     render_model_editor_fn: Callable | None = None
+    render_actions_fn: Callable | None = None
     select_model_fn: Callable[[Model], None] | None = None
     deselect_model_fn: Callable | None = None
 
@@ -177,6 +178,8 @@ def _trigger_ui_refresh(self) -> None:
             self.render_models_fn()
         if self.render_model_editor_fn:
             self.render_model_editor_fn()
+        if self.render_actions_fn:
+            self.render_actions_fn.refresh()
 
 
 state: ProjectState = ProjectState()
