feat: team creation & team switcher functionality

forms_pro/api/team.py

@@ -1,7 +1,7 @@
 import frappe
 
 from forms_pro.forms_pro.doctype.fp_team.fp_team import FPTeam, GetTeamMembersResponse
-from forms_pro.utils.teams import GetTeamFormsResponseSchema
+from forms_pro.utils.teams import GetTeamFormsResponseSchema, set_current_team
 from forms_pro.utils.teams import get_team_forms as get_team_forms_utils
 
 
@@ -35,9 +35,43 @@ def get_team_members(team_id: str) -> list[GetTeamMembersResponse]:
         user=frappe.session.user,
         throw=True,
     )
-    print("team_id", team_id)
 
     team: FPTeam = frappe.get_doc("FP Team", team_id)
     members = team.team_members
 
     return members
+
+
+@frappe.whitelist(methods=["POST"])
+def create_team(team_name: str) -> FPTeam:
+    """
+    Create a new team
+
+    Args:
+        team_name: Name of the team
+
+    Returns:
+        FPTeam - The created team
+    """
+
+    team: FPTeam = frappe.new_doc("FP Team")
+    team.team_name = team_name
+    team.insert()
+    return team
+
+
+@frappe.whitelist(methods=["POST"])
+def switch_team(team_id: str) -> None:
+    """
+    Switch to a new team
+    """
+
+    if not frappe.has_permission(
+        doctype="FP Team",
+        ptype="read",
+        doc=team_id,
+        user=frappe.session.user,
+    ):
+        raise frappe.PermissionError("You do not have permission to switch to this team")
+
+    set_current_team(team_id, frappe.session.user)

forms_pro/forms_pro/doctype/fp_team/fp_team.py

@@ -1,12 +1,13 @@
 # Copyright (c) 2025, harsh@buildwithhussain.com and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
-from frappe.utils import cached_property
+from frappe.share import add_docshare
 from pydantic import BaseModel, EmailStr
 
 from forms_pro.api.user import get_user
+from forms_pro.utils.teams import set_current_team
 
 
 class GetTeamMembersResponse(BaseModel):
@@ -30,7 +31,7 @@ class FPTeam(Document):
         users: DF.TableMultiSelect[FPTeamMember]
     # end: auto-generated types
 
-    @cached_property
+    @property
     def team_members(self) -> list[GetTeamMembersResponse]:
         """
         Get the list of team members
@@ -60,4 +61,36 @@ def is_team_member(self, user: str) -> bool:
         Returns:
             bool - True if the user is a member of the team, False otherwise
         """
-        return user in self.team_members
+        return user in [member["email"] for member in self.team_members]
+
+    def after_insert(self) -> None:
+        self.add_to_team(self.owner)
+        set_current_team(self.name, self.owner)
+        self.save()
+
+    def add_to_team(self, user: str) -> None:
+        """
+        Add a user to the team
+
+        Args:
+            user: The user email address
+        """
+        if user == "Administrator":
+            return
+
+        if self.is_team_member(user):
+            frappe.throw(
+                frappe._("User is already a member of the team"),
+                frappe.DuplicateEntryError,
+            )
+
+        self.append("users", {"user": user})
+        add_docshare(
+            self.doctype,
+            self.name,
+            user,
+            read=1,
+            write=1,
+            share=1,
+            flags={"ignore_share_permission": True},
+        )

forms_pro/forms_pro/doctype/fp_team/test_fp_team.py

@@ -1,9 +1,12 @@
 # Copyright (c) 2025, harsh@buildwithhussain.com and Contributors
 # See license.txt
 
-# import frappe
+import frappe
+from frappe.defaults import get_user_default
 from frappe.tests import IntegrationTestCase
 
+from forms_pro.tests import FORMS_PRO_TEST_USER
+
 # On IntegrationTestCase, the doctype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
@@ -17,4 +20,58 @@ class IntegrationTestFPTeam(IntegrationTestCase):
     Use this class for testing interactions between multiple components.
     """
 
-    pass
+    def setUp(self):
+        super().setUp()
+        self.test_user = FORMS_PRO_TEST_USER
+
+    def tearDown(self):
+        frappe.set_user("Administrator")
+        super().tearDown()
+
+    def test_add_owner_to_team(self):
+        """
+        Test that after a user creates a team, that owner user is added to the team and the team is shared with the owner user
+        """
+
+        frappe.set_user(self.test_user)
+
+        team = frappe.new_doc("FP Team")
+        team.team_name = "Test Team"
+        team.insert()
+        team.reload()
+
+        frappe.set_user("Administrator")
+
+        # Check that the user is added to the team
+        self.assertTrue(team.is_team_member(self.test_user))
+
+        # Check that the user is added to the team
+        self.assertIsNotNone(
+            frappe.db.exists(
+                "FP Team Member",
+                {
+                    "parent": team.name,
+                    "parentfield": "users",
+                    "parenttype": "FP Team",
+                    "user": self.test_user,
+                },
+            )
+        )
+
+        # Check that the user is added to the team's docshare
+        self.assertTrue(
+            frappe.db.exists(
+                "DocShare",
+                {
+                    "share_doctype": "FP Team",
+                    "share_name": team.name,
+                    "user": self.test_user,
+                    "read": 1,
+                    "write": 1,
+                    "share": 1,
+                },
+            )
+        )
+
+        # Check that the user's current team is set to the team
+        self.assertEqual(get_user_default("current_team", self.test_user), team.name)

forms_pro/install.py

@@ -2,6 +2,7 @@
 from frappe.core.doctype.user.user import User
 
 from forms_pro.roles import FORMS_PRO_ROLE
+from forms_pro.tests import FORMS_PRO_TEST_USER
 
 
 def after_install():
@@ -30,13 +31,11 @@ def give_admin_forms_pro_role():
 
 
 def create_test_user():
-    test_user = "test_forms_pro_user@example.com"
-
-    if frappe.db.exists("User", test_user):
+    if frappe.db.exists("User", FORMS_PRO_TEST_USER):
         return
 
     user: User = frappe.new_doc("User")
-    user.email = test_user
+    user.email = FORMS_PRO_TEST_USER
     user.first_name = "Test"
     user.last_name = "Forms Pro User"
     user.insert(ignore_permissions=True)

forms_pro/overrides/roles.py

@@ -2,7 +2,7 @@
 from frappe.core.doctype.user.user import User
 
 from forms_pro.roles import FORMS_PRO_ROLE
-from forms_pro.utils.teams import get_user_teams, set_current_team
+from forms_pro.utils.teams import get_user_teams
 
 
 def has_forms_pro_permission() -> bool:
@@ -48,4 +48,3 @@ def create_default_team_for_user(user: User) -> None:
         },
     )
     team.save(ignore_permissions=True)
-    set_current_team(team.name, user.name)

forms_pro/tests/__init__.py

@@ -0,0 +1,2 @@
+# Test user email address
+FORMS_PRO_TEST_USER = "test_forms_pro_user@example.com"

frontend/src/components/team/CreateTeamDialog.vue

@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Dialog, ErrorMessage, FormControl } from "frappe-ui";
+import * as z from "zod";
+import { reactive, ref, watch } from "vue";
+import { useUser } from "@/stores/user";
+
+const user = useUser();
+
+const model = defineModel<boolean>({
+    type: Boolean,
+    required: true,
+});
+
+const formErrors = ref<string>("");
+
+const formSchema = z.object({
+    team_name: z
+        .string()
+        .min(2, "Team name must be at least 2 characters long")
+        .max(140, "Team name must be less than 140 characters long"),
+});
+
+type Form = z.infer<typeof formSchema>;
+
+const form = reactive<Form>({
+    team_name: "",
+});
+
+watch(
+    () => form,
+    (newVal) => {
+        const result = formSchema.safeParse(newVal);
+        if (!result.success) {
+            formErrors.value = result.error.issues.map((issue) => issue.message).join(", ");
+        } else {
+            formErrors.value = "";
+        }
+    },
+    { deep: true }
+);
+
+function createTeam() {
+    const result = formSchema.safeParse(form);
+    if (!result.success) {
+        formErrors.value = result.error.issues.map((issue) => issue.message).join(", ");
+        return;
+    }
+    formErrors.value = "";
+    user.createTeam(form.team_name);
+    model.value = false;
+}
+</script>
+<template>
+    <Dialog
+        v-model="model"
+        :options="{
+            title: 'Create New Team',
+            icon: 'users',
+        }"
+    >
+        <template #body-content>
+            <div class="flex flex-col gap-4">
+                <FormControl
+                    v-model="form.team_name"
+                    label="Team Name"
+                    variant="outline"
+                    type="text"
+                    required
+                />
+                <ErrorMessage :message="formErrors" />
+                <Button @click="createTeam" :disabled="formErrors !== ''" variant="subtle">
+                    Create Team
+                </Button>
+            </div>
+        </template>
+    </Dialog>
+</template>

frontend/src/components/ui/Avatar.vue

@@ -11,11 +11,13 @@ const props = withDefaults(
         variant?: "default" | "outline" | "filled";
         shape?: "circle" | "square";
         className?: string;
+        disabled?: boolean;
     }>(),
     {
         size: "md",
         variant: "default",
         shape: "circle",
+        disabled: false,
     }
 );
 
@@ -29,11 +31,16 @@ onMounted(async () => {
 </script>
 
 <template>
-    <Tooltip v-if="user?.full_name" :text="user?.full_name" placement="bottom">
+    <Tooltip
+        v-if="user?.full_name"
+        :disabled="disabled"
+        :text="user?.full_name"
+        placement="bottom"
+    >
         <FrappeAvatar
             :size="size"
             :shape="shape"
-            :image="user?.user_image"
+            :image="user?.user_image ?? undefined"
             :label="user?.full_name"
         />
     </Tooltip>