Feature/add textarea node

.gitignore

@@ -2,3 +2,4 @@
 dist/
 db.sqlite3
 db.sqlite3
+.coverage

formkit_ninja/api.py

@@ -359,8 +359,7 @@ def preferred_name(self):
             return disambiguate_name(make_name_valid_id(self.name), self.parent_names)
         elif self.label is not None:
             return disambiguate_name(make_name_valid_id(self.label), self.parent_names)
-        else:
-            return f"{uuid4().hex[:8]}_unnamed"
+        return make_name_valid_id(f"{uuid4().hex[:8]}_unnamed")
 
     class Config:
         allow_population_by_field_name = True

formkit_ninja/formkit_schema.py

@@ -143,6 +143,11 @@ class TextNode(FormKitSchemaProps):
     text: str | None
 
 
+class TextAreaNode(TextNode):
+    formkit: Literal["textarea"] = Field(default="textarea", alias="$formkit")
+    text: str | None
+
+
 class DateNode(TextNode):
     formkit: Literal["date"] = Field(default="date", alias="$formkit")
 
@@ -233,6 +238,7 @@ class GroupNode(TextNode):
 # which do not work with "Annotated" below
 FormKitType = (
     TextNode
+    | TextAreaNode
     | CheckBoxNode
     | PasswordNode
     | SelectNode
@@ -254,6 +260,7 @@ class GroupNode(TextNode):
 FormKitSchemaFormKit = Annotated[
     Union[
         TextNode,
+        TextAreaNode,
         CheckBoxNode,
         PasswordNode,
         SelectNode,
@@ -385,6 +392,7 @@ def handle_data(self, data):
 NODE_TYPE = Literal["condition", "formkit", "element", "component"]
 FORMKIT_TYPE = Literal[
     "text",
+    "textarea",
     "tel",
     "currency",
     "select",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "formkit-ninja"
-version = "0.7.2"
+version = "0.7.4"
 description = "A Django-Ninja backend to specify FormKit schemas"
 authors = ["Josh Brooks <josh@catalpa.io>"]
 license = "GPLv3"
@@ -19,6 +19,7 @@ django-stubs = {extras = ["compatible-mypy"], version = "^4.2.3"}
 django-pgtrigger = "^4.7.0"
 rich = "*"
 django-pghistory = "^3.0.1"
+pytest-cov = "^4.1.0"
 
 [tool.poetry.group.dev]
 optional = true

tests/test_formkit_in.py

@@ -89,3 +89,25 @@ def test_node_create(admin_client: Client):
         content_type="application/json",
     )
     assert node_post_4.json()["node"]["name"] == "name_of_my_input"
+
+
+@pytest.mark.django_db
+def test_textarea_create(admin_client: Client):
+    """
+    Test creation of a Formkit TextArea node through the API
+    """
+    path = reverse("api-1.0.0:create_or_update_node")
+    # Add a group node
+    # This is a 'partisipa' type group node with
+    # an icon and a label
+    group = FormKitNodeIn(
+        **{"$formkit": "textarea"}
+    )
+    data = group.json(exclude_none=True)
+
+    response = admin_client.post(
+        path=path,
+        data=data,
+        content_type="application/json",
+    )
+    assert response.status_code == HTTPStatus.OK

tests/test_pw.py

@@ -8,7 +8,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from playwright.sync_api import Browser, Page
-from pytest_django.fixtures import live_server, live_server_helper
+from pytest_django.fixtures import live_server, live_server_helper, admin_user
 from pytest_playwright.pytest_playwright import page
 
 from formkit_ninja import models
@@ -31,18 +31,12 @@
 os.environ.setdefault("DJANGO_ALLOW_ASYNC_UNSAFE", "true")
 
 
-@pytest.fixture()
-def admin_user():
-    UserModel: Type[User] = get_user_model()
-    user = UserModel.objects.create_superuser(username="admin", email="admin@catalpa.io", password="12341234")
-    return user
-
 
 @pytest.fixture()
 def admin_page(page: Page, live_server: live_server_helper.LiveServer, admin_user: User):
     page.goto(f"{live_server.url}/admin", timeout=1000)
     page.get_by_label("Username:").fill(admin_user.username)
-    page.get_by_label("Password:").fill("12341234")
+    page.get_by_label("Password:").fill("password")
     page.get_by_role("button", name="Log in").click()
     page.context.set_default_timeout(5000)
     yield page

tests/test_textarea.py

@@ -0,0 +1,2 @@
+
+