From 67d659b1830525296abefb37ff594916e413adfd Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sun, 22 Feb 2026 11:52:53 +0530
Subject: [PATCH 01/11] chore: bump lucide-icons

---
 frontend/package.json | 2 +-
 frontend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 138ff02..06cde99 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,7 +17,7 @@
     "dayjs": "^1.11.19",
     "feather-icons": "^4.29.2",
     "frappe-ui": "^0.1.262",
-    "lucide-vue-next": "^0.543.0",
+    "lucide-vue-next": "^0.575.0",
     "pinia": "^3.0.3",
     "socket.io-client": "^4.7.2",
     "vue": "^3.5.13",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 279df47..7fc549c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2355,10 +2355,10 @@ lucide-static@^0.543.0:
   resolved "https://registry.yarnpkg.com/lucide-static/-/lucide-static-0.543.0.tgz#054c14493993452084ed9968a3ad912c58fec90a"
   integrity sha512-k9HUQncNuOThizzuuqvgjpYPHaE3Hae89l/i+Y7BRgOvzWeqQ9Sbllin8m4NO5BP+JaaRHTzn29o4oZJJi/5uQ==
 
-lucide-vue-next@^0.543.0:
-  version "0.543.0"
-  resolved "https://registry.yarnpkg.com/lucide-vue-next/-/lucide-vue-next-0.543.0.tgz#3ac7f63ec60ed485730372513c7fe41e95250d4f"
-  integrity sha512-Az5kpNm/koKAwSNIKjsZ4uHV2tVfmlQlcHwFBygQ8gc5/jFg7An9OrxgDy/aE5m+HLx7VfLYqDxLr8gWecZbQA==
+lucide-vue-next@^0.575.0:
+  version "0.575.0"
+  resolved "https://registry.yarnpkg.com/lucide-vue-next/-/lucide-vue-next-0.575.0.tgz#a782e0c00932dbe16ebf82e12030d9223895b62d"
+  integrity sha512-UHzA3cYMCgBLyGay5R9IQaidwV0NLocx7cIBnFt8vJ9Xhl6IM/oKD0fUhoCUuouFta15SX1rLXVoko9s3TzWMA==
 
 magic-string@^0.30.12, magic-string@^0.30.17, magic-string@^0.30.18:
   version "0.30.19"

From 73c554f2bb1c3caa948537f8ebe156b3159e1c97 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sun, 22 Feb 2026 18:17:06 +0530
Subject: [PATCH 02/11] feat: restructure home dashboard and sidebar

- Introduced a new home dashboard layout with a dedicated Dashboard.vue component.
- Migrated existing dashboard functionality from the previous Dashboard.vue to the new home structure.
- Added sidebar items management through a new sidebarItems.ts file for better organization.
- Updated TeamSwitcher component to conditionally render based on the current team.
- Removed unused code and components to streamline the application.
---
 frontend/src/components/team/TeamSwitcher.vue |   4 +-
 frontend/src/layouts/BaseLayout.vue           |  25 +--
 frontend/src/pages/Dashboard.vue              | 167 ------------------
 frontend/src/pages/home/Dashboard.vue         | 159 +++++++++++++++++
 frontend/src/pages/home/Home.vue              |  14 ++
 frontend/src/pages/home/sidebarItems.ts       |  38 ++++
 frontend/src/pages/team/ManageTeam.vue        |   2 +
 frontend/src/router.ts                        |  16 +-
 8 files changed, 230 insertions(+), 195 deletions(-)
 delete mode 100644 frontend/src/pages/Dashboard.vue
 create mode 100644 frontend/src/pages/home/Dashboard.vue
 create mode 100644 frontend/src/pages/home/Home.vue
 create mode 100644 frontend/src/pages/home/sidebarItems.ts
 create mode 100644 frontend/src/pages/team/ManageTeam.vue

diff --git a/frontend/src/components/team/TeamSwitcher.vue b/frontend/src/components/team/TeamSwitcher.vue
index f4d3750..216ec5e 100644
--- a/frontend/src/components/team/TeamSwitcher.vue
+++ b/frontend/src/components/team/TeamSwitcher.vue
@@ -48,7 +48,7 @@ const groupOptions = computed(() => {
 </script>
 <template>
     <CreateTeamDialog v-model="showCreateTeamDialog" />
-    <Dropdown :options="groupOptions">
+    <Dropdown v-if="userStore.currentTeam" :options="groupOptions">
         <template #default="{ open }">
             <div
                 class="flex items-center gap-2 p-2 rounded cursor-pointer transition-colors duration-150 ease-[cubic-bezier(0.4, 0, 0.2, 1)] hover:bg-surface-gray-2"
@@ -56,7 +56,7 @@ const groupOptions = computed(() => {
             >
                 <TeamLogo
                     v-if="isSidebarCollapsed"
-                    :team-name="userStore.currentTeam!.team_name"
+                    :team-name="userStore.currentTeam?.team_name"
                     :logo-url="userStore.currentTeam?.logo ?? null"
                 />
                 <div v-else class="flex items-center gap-2 justify-between w-full">
diff --git a/frontend/src/layouts/BaseLayout.vue b/frontend/src/layouts/BaseLayout.vue
index 69782fa..f845c69 100644
--- a/frontend/src/layouts/BaseLayout.vue
+++ b/frontend/src/layouts/BaseLayout.vue
@@ -52,9 +52,8 @@
 </template>
 <script setup lang="ts">
 import { session } from "@/data/session";
-import { computed } from "vue";
 import { Popover, Sidebar, type SidebarProps } from "frappe-ui";
-import { EllipsisVertical, LayoutDashboard } from "lucide-vue-next";
+import { EllipsisVertical } from "lucide-vue-next";
 import type { PropType } from "vue";
 import Avatar from "@/components/ui/Avatar.vue";
 import TeamSwitcher from "@/components/team/TeamSwitcher.vue";
@@ -72,26 +71,4 @@ const props = defineProps({
         default: () => [],
     },
 });
-
-const sidebarSections = computed((): SidebarSectionProps[] => {
-    if (props.sidebarSections && props.sidebarSections.length > 0) {
-        return props.sidebarSections;
-    }
-
-    const _sections: SidebarSectionProps[] = [
-        {
-            label: "",
-            items: [
-                {
-                    label: "Dashboard",
-                    to: "/",
-                    isActive: true,
-                    icon: LayoutDashboard,
-                },
-            ],
-        },
-    ];
-
-    return _sections;
-});
 </script>
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
deleted file mode 100644
index ba6655c..0000000
--- a/frontend/src/pages/Dashboard.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-    <BaseLayout>
-        <Dialog
-            v-model="showSelectDoctypeDialog"
-            :options="{
-                title: 'Select DocType',
-            }"
-        >
-            <template #body-content>
-                <div class="flex flex-col gap-2">
-                    <label class="text-sm font-medium">DocType</label>
-                    <Combobox
-                        v-model="selectedDoctype"
-                        :options="doctypesOptions"
-                        label="DocType"
-                        id="doctype"
-                    />
-                </div>
-            </template>
-            <template #actions>
-                <Button
-                    class="w-full"
-                    variant="solid"
-                    :disabled="!selectedDoctype"
-                    @click="
-                        () => {
-                            handleCreateDraftFormWithDoctype();
-                        }
-                    "
-                    >Create</Button
-                >
-            </template>
-        </Dialog>
-        <div class="p-4 flex flex-col gap-4 w-full overflow-y-auto">
-            <div class="flex flex-col gap-2">
-                <h2 class="text-3xl font-bold">Dashboard</h2>
-                <p class="text-base">Manage and create forms</p>
-            </div>
-            <template v-if="user.user?.has_desk_access">
-                <Dropdown
-                    class="w-fit"
-                    :button="{
-                        label: 'Create',
-                        iconLeft: 'plus',
-                        variant: 'solid',
-                    }"
-                    :options="[
-                        {
-                            label: 'Create New',
-                            onClick: handleCreateDraftForm,
-                        },
-                        {
-                            label: 'Create from Existing DocType',
-                            onClick: () => {
-                                showSelectDoctypeDialog = true;
-                            },
-                        },
-                    ]"
-                />
-            </template>
-            <template v-else>
-                <Button
-                    class="w-fit"
-                    variant="solid"
-                    iconLeft="plus"
-                    @click="handleCreateDraftForm"
-                >
-                    Create New
-                </Button>
-            </template>
-            <div class="flex flex-col gap-2">
-                <h3 class="font-medium">Recent</h3>
-                <p class="text-sm" v-if="teamForms.loading">Loading...</p>
-                <p class="text-sm" v-else-if="!teamForms.data || teamForms.data.length === 0">
-                    No forms created yet
-                </p>
-                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4" v-else>
-                    <div v-for="form in teamForms.data" :key="form.name">
-                        <FormPreviewCard :form="form" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </BaseLayout>
-</template>
-
-<script setup lang="ts">
-import BaseLayout from "@/layouts/BaseLayout.vue";
-import { useRouter } from "vue-router";
-import { ref, watch, computed } from "vue";
-import { toast } from "vue-sonner";
-import { useUser } from "@/stores/user";
-import { Dropdown, Dialog, createResource, Combobox } from "frappe-ui";
-import { createNewFormWithDoctype, createNewForm } from "@/utils/form_generator";
-import FormPreviewCard from "@/components/dashboard/FormPreviewCard.vue";
-const router = useRouter();
-const showSelectDoctypeDialog = ref(false);
-const selectedDoctype = ref<string | null>(null);
-
-const user = useUser();
-
-const doctypesList = createResource({
-    url: "forms_pro.api.form.get_doctype_list",
-});
-
-// Ensure doctypesList.data is always an array to prevent Combobox errors
-const doctypesOptions = computed(() => doctypesList.data || []);
-
-const handleCreateDraftFormWithDoctype = async () => {
-    if (!selectedDoctype.value || !user.currentTeam?.name) {
-        toast.error("Error occured while creating form. Check DocType Selected.");
-        return;
-    }
-    const data = await createNewFormWithDoctype(selectedDoctype.value, user.currentTeam.name);
-    router.push({
-        name: "Edit Form",
-        params: {
-            id: data.form_document,
-        },
-    });
-};
-
-const handleCreateDraftForm = async () => {
-    if (!user.currentTeam?.name) {
-        toast.error("Error occured while creating form. User has no default team.");
-        return;
-    }
-    const data = await createNewForm(user.currentTeam.name);
-    router.push({
-        name: "Edit Form",
-        params: {
-            id: data.form_document,
-        },
-    });
-};
-
-const teamForms = createResource({
-    url: "forms_pro.api.team.get_team_forms",
-    makeParams() {
-        return {
-            team_id: user.currentTeam?.name,
-        };
-    },
-    loading: true,
-    cache: "teamForms",
-});
-
-watch(
-    () => user.currentTeam,
-    (currentTeam) => {
-        if (currentTeam) {
-            teamForms.fetch();
-        }
-    },
-    { immediate: true }
-);
-
-watch(
-    () => user.user,
-    (user) => {
-        if (user && user.has_desk_access) {
-            doctypesList.fetch();
-        }
-    },
-    { immediate: true }
-);
-</script>
diff --git a/frontend/src/pages/home/Dashboard.vue b/frontend/src/pages/home/Dashboard.vue
new file mode 100644
index 0000000..2dac030
--- /dev/null
+++ b/frontend/src/pages/home/Dashboard.vue
@@ -0,0 +1,159 @@
+<template>
+    <Dialog
+        v-model="showSelectDoctypeDialog"
+        :options="{
+            title: 'Select DocType',
+        }"
+    >
+        <template #body-content>
+            <div class="flex flex-col gap-2">
+                <label class="text-sm font-medium">DocType</label>
+                <Combobox
+                    v-model="selectedDoctype"
+                    :options="doctypesOptions"
+                    label="DocType"
+                    id="doctype"
+                />
+            </div>
+        </template>
+        <template #actions>
+            <Button
+                class="w-full"
+                variant="solid"
+                :disabled="!selectedDoctype"
+                @click="
+                    () => {
+                        handleCreateDraftFormWithDoctype();
+                    }
+                "
+                >Create</Button
+            >
+        </template>
+    </Dialog>
+    <div class="p-4 flex flex-col gap-4 w-full overflow-y-auto">
+        <div class="flex flex-col gap-2">
+            <h2 class="text-3xl font-bold">Dashboard</h2>
+            <p class="text-base">Manage and create forms</p>
+        </div>
+        <template v-if="user.user?.has_desk_access">
+            <Dropdown
+                class="w-fit"
+                :button="{
+                    label: 'Create',
+                    iconLeft: 'plus',
+                    variant: 'solid',
+                }"
+                :options="[
+                    {
+                        label: 'Create New',
+                        onClick: handleCreateDraftForm,
+                    },
+                    {
+                        label: 'Create from Existing DocType',
+                        onClick: () => {
+                            showSelectDoctypeDialog = true;
+                        },
+                    },
+                ]"
+            />
+        </template>
+        <template v-else>
+            <Button class="w-fit" variant="solid" iconLeft="plus" @click="handleCreateDraftForm">
+                Create New
+            </Button>
+        </template>
+        <div class="flex flex-col gap-2">
+            <h3 class="font-medium">Recent</h3>
+            <p class="text-sm" v-if="teamForms.loading">Loading...</p>
+            <p class="text-sm" v-else-if="!teamForms.data || teamForms.data.length === 0">
+                No forms created yet
+            </p>
+            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4" v-else>
+                <div v-for="form in teamForms.data" :key="form.name">
+                    <FormPreviewCard :form="form" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { useRouter } from "vue-router";
+import { ref, watch, computed } from "vue";
+import { toast } from "vue-sonner";
+import { useUser } from "@/stores/user";
+import { Dropdown, Dialog, createResource, Combobox } from "frappe-ui";
+import { createNewFormWithDoctype, createNewForm } from "@/utils/form_generator";
+import FormPreviewCard from "@/components/dashboard/FormPreviewCard.vue";
+const router = useRouter();
+const showSelectDoctypeDialog = ref(false);
+const selectedDoctype = ref<string | null>(null);
+
+const user = useUser();
+
+const doctypesList = createResource({
+    url: "forms_pro.api.form.get_doctype_list",
+});
+
+// Ensure doctypesList.data is always an array to prevent Combobox errors
+const doctypesOptions = computed(() => doctypesList.data || []);
+
+const handleCreateDraftFormWithDoctype = async () => {
+    if (!selectedDoctype.value || !user.currentTeam?.name) {
+        toast.error("Error occured while creating form. Check DocType Selected.");
+        return;
+    }
+    const data = await createNewFormWithDoctype(selectedDoctype.value, user.currentTeam.name);
+    router.push({
+        name: "Edit Form",
+        params: {
+            id: data.form_document,
+        },
+    });
+};
+
+const handleCreateDraftForm = async () => {
+    if (!user.currentTeam?.name) {
+        toast.error("Error occured while creating form. User has no default team.");
+        return;
+    }
+    const data = await createNewForm(user.currentTeam.name);
+    router.push({
+        name: "Edit Form",
+        params: {
+            id: data.form_document,
+        },
+    });
+};
+
+const teamForms = createResource({
+    url: "forms_pro.api.team.get_team_forms",
+    makeParams() {
+        return {
+            team_id: user.currentTeam?.name,
+        };
+    },
+    loading: true,
+    cache: "teamForms",
+});
+
+watch(
+    () => user.currentTeam,
+    (currentTeam) => {
+        if (currentTeam) {
+            teamForms.fetch();
+        }
+    },
+    { immediate: true }
+);
+
+watch(
+    () => user.user,
+    (user) => {
+        if (user && user.has_desk_access) {
+            doctypesList.fetch();
+        }
+    },
+    { immediate: true }
+);
+</script>
diff --git a/frontend/src/pages/home/Home.vue b/frontend/src/pages/home/Home.vue
new file mode 100644
index 0000000..64f72e7
--- /dev/null
+++ b/frontend/src/pages/home/Home.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import BaseLayout from "@/layouts/BaseLayout.vue";
+import { useUser } from "@/stores/user";
+import { useSidebarItems } from "./sidebarItems";
+const userStore = useUser();
+userStore.initialize();
+
+const sidebarItems = useSidebarItems();
+</script>
+<template>
+    <BaseLayout :sidebar-sections="sidebarItems">
+        <router-view />
+    </BaseLayout>
+</template>
diff --git a/frontend/src/pages/home/sidebarItems.ts b/frontend/src/pages/home/sidebarItems.ts
new file mode 100644
index 0000000..291f1b1
--- /dev/null
+++ b/frontend/src/pages/home/sidebarItems.ts
@@ -0,0 +1,38 @@
+import { Files, UsersRound } from "lucide-vue-next";
+import { computed } from "vue";
+import { useRoute } from "vue-router";
+import type { SidebarProps } from "frappe-ui";
+
+type SidebarSectionProps = NonNullable<
+  SidebarProps["sections"]
+> extends (infer T)[]
+  ? T
+  : never;
+
+export function useSidebarItems() {
+  const route = useRoute();
+  const isActive = (path: string) => route.path === path;
+
+  return computed((): SidebarSectionProps[] => [
+    {
+      items: [
+        {
+          label: "All Forms",
+          to: "/",
+          icon: Files,
+          isActive: isActive("/"),
+        },
+      ],
+    },
+    {
+      items: [
+        {
+          label: "Team",
+          to: "/team",
+          icon: UsersRound,
+          isActive: isActive("/team"),
+        },
+      ],
+    },
+  ]);
+}
diff --git a/frontend/src/pages/team/ManageTeam.vue b/frontend/src/pages/team/ManageTeam.vue
new file mode 100644
index 0000000..11645e0
--- /dev/null
+++ b/frontend/src/pages/team/ManageTeam.vue
@@ -0,0 +1,2 @@
+<script setup lang="ts"></script>
+<template></template>
diff --git a/frontend/src/router.ts b/frontend/src/router.ts
index e08911b..508ce44 100644
--- a/frontend/src/router.ts
+++ b/frontend/src/router.ts
@@ -6,8 +6,20 @@ import { isLoginRequired } from "@/utils/form";
 const routes: RouteRecordRaw[] = [
   {
     path: "/",
-    name: "Dashboard",
-    component: () => import("@/pages/Dashboard.vue"),
+    name: "Home",
+    component: () => import("@/pages/home/Home.vue"),
+    children: [
+      {
+        path: "",
+        name: "Dashboard",
+        component: () => import("@/pages/home/Dashboard.vue"),
+      },
+      {
+        path: "team",
+        name: "Manage Team",
+        component: () => import("@/pages/team/ManageTeam.vue"),
+      },
+    ],
   },
   {
     path: "/manage/:id",

From 7edafaf4a9ed4ec36dcd833f1473165335fc3470 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sun, 22 Feb 2026 18:42:20 +0530
Subject: [PATCH 03/11] refactor: enhance layout structure in BaseLayout and
 Dashboard components

- Wrapped the slot in BaseLayout with a div for improved layout consistency.
- Removed unnecessary padding class from the Dashboard component for a cleaner design.
- Ensured consistent formatting in watch options for better readability.
---
 frontend/src/layouts/BaseLayout.vue   | 4 +++-
 frontend/src/pages/home/Dashboard.vue | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/layouts/BaseLayout.vue b/frontend/src/layouts/BaseLayout.vue
index f845c69..60b3548 100644
--- a/frontend/src/layouts/BaseLayout.vue
+++ b/frontend/src/layouts/BaseLayout.vue
@@ -47,7 +47,9 @@
                 </Popover>
             </template>
         </Sidebar>
-        <slot> </slot>
+        <div class="p-4 flex-1 max-w-screen-lg mx-auto">
+            <slot> </slot>
+        </div>
     </div>
 </template>
 <script setup lang="ts">
diff --git a/frontend/src/pages/home/Dashboard.vue b/frontend/src/pages/home/Dashboard.vue
index 2dac030..0806b75 100644
--- a/frontend/src/pages/home/Dashboard.vue
+++ b/frontend/src/pages/home/Dashboard.vue
@@ -30,7 +30,7 @@
             >
         </template>
     </Dialog>
-    <div class="p-4 flex flex-col gap-4 w-full overflow-y-auto">
+    <div class="flex flex-col gap-4 w-full overflow-y-auto">
         <div class="flex flex-col gap-2">
             <h2 class="text-3xl font-bold">Dashboard</h2>
             <p class="text-base">Manage and create forms</p>

From f8e55afdd4d7f59dadf18ca218a2751b35f2b9b1 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sun, 22 Feb 2026 18:48:11 +0530
Subject: [PATCH 04/11] fix: manageform page layout

---
 frontend/src/pages/manage/ManageForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/manage/ManageForm.vue b/frontend/src/pages/manage/ManageForm.vue
index 671f5e2..d871112 100644
--- a/frontend/src/pages/manage/ManageForm.vue
+++ b/frontend/src/pages/manage/ManageForm.vue
@@ -69,7 +69,7 @@ const breadcrumbItems = computed(() => {
 </script>
 <template>
     <BaseLayout :sidebar-sections="sidebarSections">
-        <div class="p-4 space-y-4 w-full bg-surface-white flex justify-center">
+        <div class="space-y-4 w-full bg-surface-white flex justify-center">
             <div class="max-w-screen-lg mx-auto w-full space-y-4">
                 <Breadcrumbs :items="breadcrumbItems" />
                 <RouterView />

From 2299f8b0b07da12a0dcfbb25c42a65cb77c0944a Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Wed, 4 Mar 2026 11:48:05 +0530
Subject: [PATCH 05/11] feat: team invitations via User Invitations

---
 forms_pro/api/team.py                         |  70 +++-
 .../forms_pro/doctype/fp_team/fp_team.py      |   6 +-
 forms_pro/hooks.py                            |  11 +-
 forms_pro/overrides/invitations.py            |  56 +++
 forms_pro/overrides/roles.py                  |   7 +
 forms_pro/tests/test_invitations.py           | 333 ++++++++++++++++++
 .../components/team/InviteMemberDialog.vue    | 118 +++++++
 .../src/components/team/TeamMemberList.vue    |  72 ++++
 frontend/src/pages/team/ManageTeam.vue        |  27 +-
 9 files changed, 694 insertions(+), 6 deletions(-)
 create mode 100644 forms_pro/overrides/invitations.py
 create mode 100644 forms_pro/tests/test_invitations.py
 create mode 100644 frontend/src/components/team/InviteMemberDialog.vue
 create mode 100644 frontend/src/components/team/TeamMemberList.vue

diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index 86a5c9d..6c22022 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -1,8 +1,15 @@
 import frappe
+from frappe.core.api.user_invitation import invite_by_email
+from frappe.core.doctype.user_invitation.user_invitation import UserInvitation
 
 from forms_pro.forms_pro.doctype.fp_team.fp_team import FPTeam, GetTeamMembersResponse
-from forms_pro.utils.teams import GetTeamFormsResponseSchema, set_current_team
-from forms_pro.utils.teams import get_team_forms as get_team_forms_utils
+from forms_pro.utils.teams import (
+    GetTeamFormsResponseSchema,
+    set_current_team,
+)
+from forms_pro.utils.teams import (
+    get_team_forms as get_team_forms_utils,
+)
 
 
 @frappe.whitelist()
@@ -77,3 +84,62 @@ def switch_team(team_id: str) -> None:
         raise frappe.PermissionError("You do not have permission to switch to this team")
 
     set_current_team(team_id, frappe.session.user)
+
+
+@frappe.whitelist(methods=["POST"])
+def invite_team_members(team_id: str, emails: list[str]) -> None:
+    """
+    Invite team members to a 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 invite team members to this team")
+
+    emails_str = ", ".join(emails)
+
+    invite_by_email(
+        emails=emails_str,
+        roles=["Forms Pro User"],
+        redirect_to_path=f"/api/v2/method/forms_pro.api.team.add_member_to_team_via_invitation?team_id={team_id}",
+        app_name="forms_pro",
+    )
+
+
+@frappe.whitelist()
+def add_member_to_team_via_invitation(team_id: str, invite_id: str | None = None) -> None:
+    """
+    Add a member to a team when an invitation is accepted.
+    Accepts invite_id from query param (URL may send it as 'id').
+    """
+    invite_id = invite_id or frappe.form_dict.get("id")
+    if not invite_id:
+        raise frappe.PermissionError("Invitation id is required")
+
+    invite: UserInvitation = frappe.get_doc("User Invitation", invite_id)
+
+    if invite.status != "Accepted":
+        raise frappe.PermissionError("Invitation not accepted")
+
+    if not frappe.has_permission(
+        doctype="FP Team",
+        ptype="read",
+        doc=team_id,
+        user=invite.invited_by,
+    ):
+        raise frappe.PermissionError("You do not have permission to add a member to this team")
+
+    if not frappe.db.exists("User", invite.email):
+        raise frappe.PermissionError("User not found")
+
+    team: FPTeam = frappe.get_doc("FP Team", team_id)
+    team.add_to_team(invite.email)
+    team.save(ignore_permissions=True)
+    set_current_team(team_id, invite.email)
+
+    frappe.local.response["type"] = "redirect"
+    frappe.local.response["location"] = "/forms"
diff --git a/forms_pro/forms_pro/doctype/fp_team/fp_team.py b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
index 13d1655..c92ff37 100644
--- a/forms_pro/forms_pro/doctype/fp_team/fp_team.py
+++ b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
@@ -14,6 +14,8 @@ class GetTeamMembersResponse(BaseModel):
     full_name: str
     user_image: str | None
     email: EmailStr
+    can_edit_team: bool
+    is_owner: bool
 
 
 class FPTeam(Document):
@@ -48,6 +50,8 @@ def team_members(self) -> list[GetTeamMembersResponse]:
         for member in self.users:
             _user = get_user(member.user)
             _user["email"] = member.user
+            _user["can_edit_team"] = self.has_permission("write", user=member.user)
+            _user["is_owner"] = self.owner == member.user
             members.append(GetTeamMembersResponse.model_validate(_user).model_dump())
 
         return members
@@ -76,7 +80,7 @@ def add_to_team(self, user: str) -> None:
         Args:
             user: The user email address
         """
-        if user == "Administrator":
+        if user == "Administrator" or user == "Guest":
             return
 
         if self.is_team_member(user):
diff --git a/forms_pro/hooks.py b/forms_pro/hooks.py
index 1b36b08..420b49b 100644
--- a/forms_pro/hooks.py
+++ b/forms_pro/hooks.py
@@ -139,7 +139,10 @@
 doc_events = {
     "User": {
         "on_update": "forms_pro.overrides.roles.handle_forms_pro_role_change",
-    }
+    },
+    "User Invitation": {
+        "after_insert": "forms_pro.overrides.invitations.after_insert",
+    },
 }
 
 # Scheduled Tasks
@@ -239,6 +242,12 @@
 # 	"Logging DocType Name": 30  # days to retain logs
 # }
 
+user_invitation = {
+    "allowed_roles": {
+        "Forms Pro User": ["Forms Pro User"],
+    },
+    "after_accept": ["forms_pro.overrides.invitations.after_accept"],
+}
 
 website_route_rules = [
     {"from_route": "/forms/<path:app_path>", "to_route": "forms"},
diff --git a/forms_pro/overrides/invitations.py b/forms_pro/overrides/invitations.py
new file mode 100644
index 0000000..8b174e5
--- /dev/null
+++ b/forms_pro/overrides/invitations.py
@@ -0,0 +1,56 @@
+from urllib.parse import parse_qs, urlparse
+
+import frappe
+from frappe.model.document import Document
+
+from forms_pro.utils.teams import set_current_team
+
+
+def after_accept(invitation: Document, user: Document, user_inserted: bool) -> None:
+    """
+    Called by Frappe after a User Invitation is accepted.
+    Adds the invited user to the team they were invited to and updates the
+    in-memory redirect path so the browser lands on /forms (not the API endpoint).
+    """
+    parsed = urlparse(invitation.redirect_to_path)
+    qs = parse_qs(parsed.query)
+    team_id = qs.get("team_id", [None])[0]
+
+    if not team_id or not frappe.db.exists("FP Team", team_id):
+        return
+
+    from forms_pro.forms_pro.doctype.fp_team.fp_team import FPTeam
+
+    team: FPTeam = frappe.get_doc("FP Team", team_id)
+    if not team.is_team_member(user.name):
+        team.add_to_team(user.name)
+        team.save(ignore_permissions=True)
+
+    set_current_team(team_id, user.name)
+
+    # Update the in-memory path so _accept_invitation redirects the browser to
+    # /forms instead of the API endpoint URL (which breaks when URL-embedded as
+    # a redirect_to query param during the password-reset flow).
+    invitation.redirect_to_path = "/forms"
+
+
+def after_insert(doc: Document, method: str) -> None:
+    """
+    After an invitation is inserted, add the user to the team
+    """
+    if doc.app_name != "forms_pro":
+        return
+
+    role_names = [r.role for r in doc.roles] if doc.roles else []
+    if role_names != ["Forms Pro User"]:
+        return
+
+    parsed = urlparse(doc.redirect_to_path)
+    qs = parse_qs(parsed.query)
+    team_id = qs.get("team_id", [None])[0]
+    if not team_id:
+        return
+
+    # Set the redirect path to add the member to the team (invite_id so API receives it)
+    doc.redirect_to_path = f"/api/v2/method/forms_pro.api.team.add_member_to_team_via_invitation?team_id={team_id}&invite_id={doc.name}"
+    doc.save(ignore_permissions=True)
diff --git a/forms_pro/overrides/roles.py b/forms_pro/overrides/roles.py
index fd73088..b0d0a10 100644
--- a/forms_pro/overrides/roles.py
+++ b/forms_pro/overrides/roles.py
@@ -32,6 +32,13 @@ def handle_forms_pro_role_change(doc, method) -> None:
         if not has_forms_pro_role_before_save and has_forms_pro_role_after_save:
             if len(get_user_teams(user.name)) > 0:
                 return
+            # If the user was invited via Forms Pro, the invitation redirect will
+            # add them to the correct team — don't create a spurious default team.
+            if frappe.db.exists(
+                "User Invitation",
+                {"email": user.name, "app_name": "forms_pro", "status": ["in", ["Pending", "Accepted"]]},
+            ):
+                return
             create_default_team_for_user(user)
 
 
diff --git a/forms_pro/tests/test_invitations.py b/forms_pro/tests/test_invitations.py
new file mode 100644
index 0000000..b2f52ac
--- /dev/null
+++ b/forms_pro/tests/test_invitations.py
@@ -0,0 +1,333 @@
+# Copyright (c) 2025, harsh@buildwithhussain.com and contributors
+# For license information, please see license.txt
+
+import frappe
+from faker import Faker
+from frappe.tests import IntegrationTestCase
+
+from forms_pro.api.team import add_member_to_team_via_invitation, invite_team_members
+from forms_pro.overrides.invitations import after_accept, after_insert
+from forms_pro.roles import FORMS_PRO_ROLE
+
+
+class _StubRole:
+    def __init__(self, role: str):
+        self.role = role
+
+
+class _StubInvitationDoc:
+    """Minimal doc-like object for testing after_insert skip logic without DB."""
+
+    def __init__(self, app_name: str, redirect_to_path: str, roles: list):
+        self.app_name = app_name
+        self.redirect_to_path = redirect_to_path
+        self.roles = roles
+        self.name = "STUB-INV-001"
+
+    def save(self, ignore_permissions: bool = False):
+        pass
+
+
+class TestTeamInvitations(IntegrationTestCase):
+    """Tests for team invitation flow: invite_team_members, after_insert hook, add_member_to_team_via_invitation."""
+
+    def setUp(self):
+        super().setUp()
+        self.fake = Faker()
+        self.teams_created = []
+        self.users_created = []
+        frappe.set_user("Administrator")
+
+    def tearDown(self):
+        frappe.set_user("Administrator")
+        for team_id in self.teams_created:
+            if frappe.db.exists("FP Team", team_id):
+                frappe.delete_doc("FP Team", team_id, force=True, ignore_permissions=True)
+        for email in self.users_created:
+            if frappe.db.exists("User", email):
+                frappe.delete_doc("User", email, force=True, ignore_permissions=True)
+        frappe.db.delete("User Invitation", {"app_name": "forms_pro"})
+        frappe.db.commit()
+        super().tearDown()
+
+    def _create_user(self, email: str | None = None, with_forms_pro_role: bool = True) -> str:
+        email = email or self.fake.email()
+        if frappe.db.exists("User", email):
+            return email
+        user = frappe.get_doc(
+            {
+                "doctype": "User",
+                "email": email,
+                "first_name": self.fake.first_name(),
+                "last_name": self.fake.last_name(),
+            }
+        )
+        user.insert(ignore_permissions=True)
+        if with_forms_pro_role:
+            user.append_roles(FORMS_PRO_ROLE)
+            user.save(ignore_permissions=True)
+        self.users_created.append(email)
+        return email
+
+    def _create_team(self, owner: str, team_name: str | None = None) -> str:
+        frappe.set_user(owner)
+        team = frappe.get_doc(
+            {
+                "doctype": "FP Team",
+                "team_name": team_name or f"{self.fake.word()} Team",
+            }
+        )
+        team.insert()
+        self.teams_created.append(team.name)
+        frappe.set_user("Administrator")
+        return team.name
+
+    def _make_accepted_invitation(self, invitee_email: str, owner: str, team_id: str) -> object:
+        inv_doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": invitee_email,
+                "app_name": "forms_pro",
+                "redirect_to_path": "/forms",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+            }
+        )
+        inv_doc.insert(ignore_permissions=True)
+        inv_doc.db_set("status", "Accepted")
+        inv_doc.db_set("user", invitee_email)
+        frappe.db.commit()
+        return inv_doc
+
+    def _get_team_memberships(self, email: str) -> list:
+        return frappe.get_all("FP Team Member", filters={"user": email})
+
+    # --- invite_team_members ---
+
+    def test_invite_requires_permission(self):
+        """User without read permission on team cannot invite members."""
+        owner = self._create_user()
+        other = self._create_user(with_forms_pro_role=False)
+        team_id = self._create_team(owner)
+
+        frappe.set_user(other)
+        with self.assertRaises(frappe.PermissionError) as ctx:
+            invite_team_members(team_id=team_id, emails=[self.fake.email()])
+        self.assertIn("permission", str(ctx.exception).lower())
+
+    def test_invite_creates_invitation_with_redirect(self):
+        """Inviting creates a User Invitation whose redirect contains team_id and invite_id."""
+        owner = self._create_user()
+        invitee_email = self.fake.email()
+        team_id = self._create_team(owner)
+
+        frappe.set_user(owner)
+        invite_team_members(team_id=team_id, emails=[invitee_email])
+        frappe.db.commit()
+
+        invitations = frappe.get_all(
+            "User Invitation",
+            filters={"email": invitee_email, "app_name": "forms_pro"},
+            fields=["name", "redirect_to_path"],
+        )
+        self.assertEqual(len(invitations), 1)
+        inv = invitations[0]
+        self.assertIn(team_id, inv.redirect_to_path)
+        self.assertIn("add_member_to_team_via_invitation", inv.redirect_to_path)
+        self.assertIn(f"invite_id={inv.name}", inv.redirect_to_path)
+
+    # --- after_insert hook ---
+
+    def test_after_insert_adds_invite_id_to_redirect(self):
+        """after_insert hook rewrites redirect_to_path to include invite_id."""
+        team_id = self._create_team(self._create_user())
+        doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": self.fake.email(),
+                "app_name": "forms_pro",
+                "redirect_to_path": f"/api/v2/method/forms_pro.api.team.add_member_to_team_via_invitation?team_id={team_id}",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+            }
+        )
+        doc.insert(ignore_permissions=True)
+        doc.reload()
+        self.assertIn(team_id, doc.redirect_to_path)
+        self.assertIn(f"invite_id={doc.name}", doc.redirect_to_path)
+        self.assertIn("add_member_to_team_via_invitation", doc.redirect_to_path)
+        frappe.delete_doc("User Invitation", doc.name, force=True)
+
+    def test_after_insert_skips_non_forms_pro_app(self):
+        """after_insert does not modify redirect when app_name is not forms_pro."""
+        original_path = "/some/path?team_id=abc"
+        doc = _StubInvitationDoc(
+            app_name="other_app", redirect_to_path=original_path, roles=[_StubRole(FORMS_PRO_ROLE)]
+        )
+        after_insert(doc, "after_insert")
+        self.assertEqual(doc.redirect_to_path, original_path)
+
+    def test_after_insert_skips_wrong_roles(self):
+        """after_insert does not modify redirect when roles do not include Forms Pro User."""
+        team_id = self._create_team(self._create_user())
+        original_path = f"/api/v2/method/some.method?team_id={team_id}"
+        doc = _StubInvitationDoc(
+            app_name="forms_pro", redirect_to_path=original_path, roles=[_StubRole("System Manager")]
+        )
+        after_insert(doc, "after_insert")
+        self.assertEqual(doc.redirect_to_path, original_path)
+
+    # --- add_member_to_team_via_invitation ---
+
+    def test_add_member_raises_when_invitation_not_accepted(self):
+        """Raises PermissionError when invitation status is not Accepted."""
+        owner = self._create_user()
+        team_id = self._create_team(owner)
+        inv_doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": self.fake.email(),
+                "app_name": "forms_pro",
+                "redirect_to_path": "/forms",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+                "status": "Pending",
+            }
+        )
+        inv_doc.insert(ignore_permissions=True)
+        frappe.db.commit()
+
+        with self.assertRaises(frappe.PermissionError) as ctx:
+            add_member_to_team_via_invitation(team_id=team_id, invite_id=inv_doc.name)
+        self.assertIn("Invitation not accepted", str(ctx.exception))
+
+    def test_add_member_raises_when_user_not_found(self):
+        """Raises PermissionError when the invited email has no User record."""
+        owner = self._create_user()
+        team_id = self._create_team(owner)
+        inv_doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": self.fake.email(),
+                "app_name": "forms_pro",
+                "redirect_to_path": "/forms",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+            }
+        )
+        inv_doc.insert(ignore_permissions=True)
+        inv_doc.db_set("status", "Accepted")
+        frappe.db.commit()
+
+        with self.assertRaises(frappe.PermissionError) as ctx:
+            add_member_to_team_via_invitation(team_id=team_id, invite_id=inv_doc.name)
+        self.assertIn("User not found", str(ctx.exception))
+
+    def test_add_member_adds_user_to_team_and_redirects(self):
+        """Successfully adds user to team and sets redirect response to /forms."""
+        owner = self._create_user()
+        invitee_email = self._create_user(with_forms_pro_role=False)
+        team_id = self._create_team(owner)
+        inv_doc = self._make_accepted_invitation(invitee_email, owner, team_id)
+
+        add_member_to_team_via_invitation(team_id=team_id, invite_id=inv_doc.name)
+
+        team = frappe.get_doc("FP Team", team_id)
+        self.assertIn(invitee_email, [row.user for row in team.users])
+        self.assertEqual(frappe.local.response.get("type"), "redirect")
+        self.assertEqual(frappe.local.response.get("location"), "/forms")
+
+    # --- after_accept hook ---
+
+    def test_after_accept_adds_user_to_inviting_team(self):
+        """after_accept adds the invited user to the team and updates redirect to /forms."""
+        owner = self._create_user()
+        invitee_email = self._create_user(with_forms_pro_role=False)
+        team_id = self._create_team(owner)
+
+        inv_doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": invitee_email,
+                "app_name": "forms_pro",
+                "redirect_to_path": f"/api/v2/method/forms_pro.api.team.add_member_to_team_via_invitation?team_id={team_id}&invite_id=TEST-001",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+            }
+        )
+        inv_doc.insert(ignore_permissions=True)
+        frappe.db.commit()
+
+        invitee_user = frappe.get_doc("User", invitee_email)
+        after_accept(invitation=inv_doc, user=invitee_user, user_inserted=True)
+
+        team = frappe.get_doc("FP Team", team_id)
+        self.assertIn(invitee_email, [row.user for row in team.users])
+        self.assertEqual(inv_doc.redirect_to_path, "/forms")
+        frappe.delete_doc("User Invitation", inv_doc.name, force=True)
+
+    def test_after_accept_skips_when_no_team_id(self):
+        """after_accept is a no-op when redirect_to_path has no team_id."""
+        owner = self._create_user()
+        invitee_email = self._create_user(with_forms_pro_role=False)
+        inv_doc = frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": invitee_email,
+                "app_name": "forms_pro",
+                "redirect_to_path": "/forms",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+            }
+        )
+        inv_doc.insert(ignore_permissions=True)
+        frappe.db.commit()
+
+        invitee_user = frappe.get_doc("User", invitee_email)
+        after_accept(invitation=inv_doc, user=invitee_user, user_inserted=True)
+
+        # redirect_to_path unchanged; no team membership created
+        self.assertEqual(inv_doc.redirect_to_path, "/forms")
+        self.assertEqual(self._get_team_memberships(invitee_email), [])
+        frappe.delete_doc("User Invitation", inv_doc.name, force=True)
+
+    # --- default team creation guard (bug fix) ---
+
+    def test_no_default_team_created_for_invited_user(self):
+        """
+        When a user receives the Forms Pro role but has a pending invitation,
+        the role-change hook must NOT create a default team — the invitation
+        redirect will place them in the correct inviting team instead.
+        """
+        invitee_email = self._create_user(with_forms_pro_role=False)
+        owner = self._create_user()
+        team_id = self._create_team(owner)
+
+        # Simulate a pending invitation (exists before the user accepts)
+        frappe.get_doc(
+            {
+                "doctype": "User Invitation",
+                "email": invitee_email,
+                "app_name": "forms_pro",
+                "redirect_to_path": f"/api/v2/method/forms_pro.api.team.add_member_to_team_via_invitation?team_id={team_id}",
+                "roles": [{"role": FORMS_PRO_ROLE}],
+                "invited_by": owner,
+                "status": "Pending",
+            }
+        ).insert(ignore_permissions=True)
+        frappe.db.commit()
+
+        memberships_before = self._get_team_memberships(invitee_email)
+
+        # Assigning the Forms Pro role is what Frappe does on invitation acceptance;
+        # the hook must skip default team creation here.
+        user = frappe.get_doc("User", invitee_email)
+        user.append_roles(FORMS_PRO_ROLE)
+        user.save(ignore_permissions=True)
+        frappe.db.commit()
+
+        memberships_after = self._get_team_memberships(invitee_email)
+        self.assertEqual(
+            len(memberships_before),
+            len(memberships_after),
+            "A default team must not be created for an invited user",
+        )
diff --git a/frontend/src/components/team/InviteMemberDialog.vue b/frontend/src/components/team/InviteMemberDialog.vue
new file mode 100644
index 0000000..ea4acb2
--- /dev/null
+++ b/frontend/src/components/team/InviteMemberDialog.vue
@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import * as z from "zod";
+import {
+    Dialog,
+    FormControl,
+    ErrorMessage,
+    Button,
+    Avatar as FrappeAvatar,
+    useCall,
+} from "frappe-ui";
+import { useTeam } from "@/stores/team";
+import { toast } from "vue-sonner";
+
+const team = useTeam();
+
+const inviteEmails = ref<string[]>([]);
+const emailInput = ref("");
+const emailInputError = ref<string>("");
+
+const emailSchema = z.email();
+
+function addInviteEmail() {
+    const trimmed = emailInput.value.trim();
+    if (!trimmed) return;
+    const result = emailSchema.safeParse(trimmed);
+    if (!result.success) {
+        emailInputError.value = result.error.issues.map((issue) => issue.message).join(", ");
+        return;
+    }
+    if (inviteEmails.value.includes(result.data)) {
+        emailInputError.value = "Email already added";
+        return;
+    }
+    inviteEmails.value.push(result.data);
+    emailInput.value = "";
+    emailInputError.value = "";
+}
+
+function removeInviteEmail(email: string) {
+    inviteEmails.value = inviteEmails.value.filter((e) => e !== email);
+}
+
+function sendInvitationEmails() {
+    useCall({
+        baseUrl: "/api/v2/method/",
+        url: "forms_pro.api.team.invite_team_members",
+        method: "POST",
+        params: {
+            team_id: team.currentTeam?.name,
+            emails: inviteEmails.value,
+        },
+        onSuccess: () => {
+            toast.success("Invitations sent successfully");
+            open.value = false;
+            inviteEmails.value = [];
+        },
+        onError: (error: Error) => {
+            toast.error("Failed to send invitations", {
+                description: error.message,
+            });
+        },
+    });
+}
+
+const open = defineModel<boolean>({ required: true, default: false });
+</script>
+<template>
+    <Dialog
+        v-model="open"
+        :options="{
+            title: 'Invite members to your team',
+            size: 'lg',
+            actions: [
+                {
+                    label: 'Send Invitations',
+                    disabled: inviteEmails.length === 0,
+                    variant: 'solid',
+                    iconLeft: 'send',
+                    onClick: () => {
+                        sendInvitationEmails();
+                    },
+                },
+            ],
+        }"
+    >
+        <template #body-content>
+            <div class="flex flex-col gap-4">
+                <div class="flex items-center gap-2">
+                    <FormControl
+                        v-model="emailInput"
+                        label="Invite by Email"
+                        type="email"
+                        variant="outline"
+                        class="flex-1"
+                        @keydown.enter.prevent="addInviteEmail"
+                        description="Enter email and press Enter"
+                    />
+                    <Button size="sm" icon-left="plus" @click="addInviteEmail"> Add </Button>
+                </div>
+                <ErrorMessage :message="emailInputError" />
+                <ul v-if="inviteEmails.length" class="flex flex-col gap-2">
+                    <span class="text-base font-medium text-ink-gray-8">Recipients</span>
+                    <li v-for="email in inviteEmails" :key="email" class="flex items-center gap-2">
+                        <FrappeAvatar :label="email" size="sm" />
+                        <span class="text-sm text-ink-gray-6 flex-1">{{ email }}</span>
+                        <Button
+                            icon="trash"
+                            variant="subtle"
+                            size="sm"
+                            @click="removeInviteEmail(email)"
+                        />
+                    </li>
+                </ul>
+            </div>
+        </template>
+    </Dialog>
+</template>
diff --git a/frontend/src/components/team/TeamMemberList.vue b/frontend/src/components/team/TeamMemberList.vue
new file mode 100644
index 0000000..1c1bf85
--- /dev/null
+++ b/frontend/src/components/team/TeamMemberList.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import { useTeam } from "@/stores/team";
+import { ListView, Checkbox, Tooltip, Button } from "frappe-ui";
+import Avatar from "@/components/ui/Avatar.vue";
+import InviteMemberDialog from "./InviteMemberDialog.vue";
+
+const teamStore = useTeam();
+const openInviteMemberDialog = ref<boolean>(false);
+
+const columns = computed(() => [
+    {
+        label: "Name",
+        key: "full_name",
+        width: 3,
+    },
+    {
+        label: "Can Add Members?",
+        key: "can_edit_team",
+        width: 3,
+    },
+    {
+        label: "Actions",
+        key: "actions",
+        width: 1,
+    },
+]);
+</script>
+<template>
+    <InviteMemberDialog v-model="openInviteMemberDialog" />
+    <div class="flex flex-col gap-2">
+        <div class="flex justify-between items-center">
+            <h3 class="font-medium">Team Members</h3>
+            <Button
+                icon-left="plus"
+                label="Invite Member"
+                variant="outline"
+                @click="openInviteMemberDialog = true"
+            />
+        </div>
+        <ListView
+            :selectable="false"
+            :columns="columns"
+            :rows="teamStore.teamMembers"
+            :options="{
+                selectable: false,
+                emptyState: {
+                    title: 'No Team Members Added',
+                    description: 'Add team members to your team to get started',
+                },
+            }"
+        >
+            <!-- @vue-expect-error -->
+            <template #cell="{ item, row, column }">
+                <Checkbox
+                    v-if="column.key === 'can_edit_team'"
+                    :disabled="row.is_owner"
+                    :model-value="row.can_edit_team"
+                />
+                <div v-else-if="column.key === 'actions'">
+                    <Tooltip v-if="row.is_owner" text="Owner cannot be removed from the team">
+                        <span class="text-sm text-ink-gray-5 italic">Owner</span>
+                    </Tooltip>
+                </div>
+                <div class="flex items-center gap-2" v-else>
+                    <Avatar :userId="row.email" />
+                    <span class="text-base">{{ row.full_name }}</span>
+                </div>
+            </template>
+        </ListView>
+    </div>
+</template>
diff --git a/frontend/src/pages/team/ManageTeam.vue b/frontend/src/pages/team/ManageTeam.vue
index 11645e0..a627b4a 100644
--- a/frontend/src/pages/team/ManageTeam.vue
+++ b/frontend/src/pages/team/ManageTeam.vue
@@ -1,2 +1,25 @@
-<script setup lang="ts"></script>
-<template></template>
+<script setup lang="ts">
+import { useTeam } from "@/stores/team";
+import TeamMemberList from "@/components/team/TeamMemberList.vue";
+import { Breadcrumbs, LoadingText } from "frappe-ui";
+
+const teamStore = useTeam();
+teamStore.initialize();
+</script>
+<template>
+    <div v-if="teamStore.teamMembersResource.loading">
+        <LoadingText text="Loading team info..." class="h-5" />
+    </div>
+    <div v-else>
+        <div class="flex flex-col gap-8">
+            <div class="flex flex-col gap-2">
+                <Breadcrumbs :items="[{ label: 'Team', route: '/team' }, { label: 'Manage' }]" />
+                <h2 class="text-3xl font-bold">Manage Team</h2>
+                <p class="text-base">Manage your team and its members</p>
+            </div>
+            <div class="flex flex-col gap-2">
+                <TeamMemberList />
+            </div>
+        </div>
+    </div>
+</template>

From 4c0199a38f251f7f740573b6d96fb0547a1fbdf3 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Fri, 6 Mar 2026 10:33:02 +0530
Subject: [PATCH 06/11] feat: implement team member removal and permission
 toggling

- Added functionality to remove members from a team and toggle their edit permissions.
- Introduced `remove_member_from_team` and `toggle_can_edit_team` API endpoints.
- Created `RemoveMemberDialog` component for user confirmation before removal.
- Updated `TeamMemberList` to include removal actions and permission toggling.
- Enhanced `FPTeam` model to manage team member permissions effectively.
---
 forms_pro/api/team.py                         | 51 +++++++++++++++++++
 .../forms_pro/doctype/fp_team/fp_team.py      | 23 ++++++++-
 .../components/team/RemoveMemberDialog.vue    | 48 +++++++++++++++++
 .../src/components/team/TeamMemberList.vue    | 27 +++++++++-
 frontend/src/stores/team.ts                   | 49 +++++++++++++++++-
 5 files changed, 194 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/team/RemoveMemberDialog.vue

diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index 6c22022..5486014 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -1,6 +1,8 @@
 import frappe
 from frappe.core.api.user_invitation import invite_by_email
+from frappe.core.doctype.docshare.docshare import DocShare
 from frappe.core.doctype.user_invitation.user_invitation import UserInvitation
+from frappe.share import get_share_name
 
 from forms_pro.forms_pro.doctype.fp_team.fp_team import FPTeam, GetTeamMembersResponse
 from forms_pro.utils.teams import (
@@ -43,6 +45,9 @@ def get_team_members(team_id: str) -> list[GetTeamMembersResponse]:
         throw=True,
     )
 
+    # Clear cache so we read fresh DocShare data (e.g. after toggle_can_edit_team)
+    frappe.clear_document_cache("FP Team", team_id)
+
     team: FPTeam = frappe.get_doc("FP Team", team_id)
     members = team.team_members
 
@@ -143,3 +148,49 @@ def add_member_to_team_via_invitation(team_id: str, invite_id: str | None = None
 
     frappe.local.response["type"] = "redirect"
     frappe.local.response["location"] = "/forms"
+
+
+@frappe.whitelist(methods=["POST"])
+def toggle_can_edit_team(team_id: str, member_email: str) -> None:
+    """
+    Toggle the can_edit_team permission for a team member
+    """
+
+    if not frappe.has_permission(
+        doctype="FP Team",
+        ptype="write",
+        doc=team_id,
+        user=frappe.session.user,
+    ):
+        raise frappe.PermissionError(
+            "You do not have permission to toggle the can_edit_team permission for this team member"
+        )
+
+    share_name = get_share_name(doctype="FP Team", name=team_id, user=member_email, everyone=0)
+    if not share_name:
+        raise frappe.PermissionError(
+            "You do not have permission to toggle the can_edit_team permission for this team member"
+        )
+
+    share: DocShare = frappe.get_doc("DocShare", share_name)
+    share.write = not share.write
+    share.share = not share.share
+    share.save(ignore_permissions=True)
+
+
+@frappe.whitelist(methods=["POST"])
+def remove_member_from_team(team_id: str, member_email: str) -> None:
+    """
+    Remove a member from a team
+    """
+
+    if not frappe.has_permission(
+        doctype="FP Team",
+        ptype="write",
+        doc=team_id,
+        user=frappe.session.user,
+    ):
+        raise frappe.PermissionError("You do not have permission to remove a member from this team")
+
+    team: FPTeam = frappe.get_doc("FP Team", team_id)
+    team.remove_from_team(member_email)
diff --git a/forms_pro/forms_pro/doctype/fp_team/fp_team.py b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
index c92ff37..dd13c78 100644
--- a/forms_pro/forms_pro/doctype/fp_team/fp_team.py
+++ b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
@@ -3,7 +3,8 @@
 
 import frappe
 from frappe.model.document import Document
-from frappe.share import add_docshare
+from frappe.share import add_docshare, get_share_name
+from frappe.share import remove as remove_docshare
 from pydantic import BaseModel, EmailStr
 
 from forms_pro.api.user import get_user
@@ -50,7 +51,8 @@ def team_members(self) -> list[GetTeamMembersResponse]:
         for member in self.users:
             _user = get_user(member.user)
             _user["email"] = member.user
-            _user["can_edit_team"] = self.has_permission("write", user=member.user)
+            share_name = get_share_name(doctype="FP Team", name=self.name, user=member.user, everyone=0)
+            _user["can_edit_team"] = frappe.db.get_value("DocShare", share_name, "write")
             _user["is_owner"] = self.owner == member.user
             members.append(GetTeamMembersResponse.model_validate(_user).model_dump())
 
@@ -99,3 +101,20 @@ def add_to_team(self, user: str) -> None:
             share=1,
             flags={"ignore_share_permission": True},
         )
+
+    def remove_from_team(self, user: str) -> None:
+        """
+        Remove a user from the team
+
+        Args:
+            user: The user email address
+        """
+
+        self.users = [member for member in self.users if member.user != user]
+        self.save()
+        remove_docshare(
+            doctype="FP Team",
+            name=self.name,
+            user=user,
+            flags={"ignore_permissions": True},
+        )
diff --git a/frontend/src/components/team/RemoveMemberDialog.vue b/frontend/src/components/team/RemoveMemberDialog.vue
new file mode 100644
index 0000000..128fe45
--- /dev/null
+++ b/frontend/src/components/team/RemoveMemberDialog.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { Dialog } from "frappe-ui";
+import { useTeam } from "@/stores/team";
+import type { TeamMember } from "@/stores/team";
+
+const teamStore = useTeam();
+const open = defineModel<boolean>({ required: true, default: false });
+const memberEmail = defineModel<TeamMember>("memberEmail", { required: true });
+
+function removeMember() {
+    teamStore.removeMemberFromTeam(memberEmail.value.email);
+    open.value = false;
+}
+</script>
+<template>
+    <Dialog
+        v-model="open"
+        :options="{
+            title: 'Confirm Removal',
+            icon: {
+                name: 'alert-triangle',
+                appearance: 'warning',
+            },
+            actions: [
+                {
+                    label: 'Remove',
+                    theme: 'red',
+                    onClick: () => {
+                        removeMember();
+                    },
+                },
+                {
+                    label: 'Cancel',
+                    onClick: () => {
+                        open = false;
+                    },
+                },
+            ],
+        }"
+    >
+        <template #body-content>
+            <div class="text-p-base">
+                Are you sure you want to remove
+                <strong>{{ memberEmail.full_name }}</strong> from the team?
+            </div>
+        </template>
+    </Dialog>
+</template>
diff --git a/frontend/src/components/team/TeamMemberList.vue b/frontend/src/components/team/TeamMemberList.vue
index 1c1bf85..2812db3 100644
--- a/frontend/src/components/team/TeamMemberList.vue
+++ b/frontend/src/components/team/TeamMemberList.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
-import { useTeam } from "@/stores/team";
+import { useTeam, type TeamMember } from "@/stores/team";
 import { ListView, Checkbox, Tooltip, Button } from "frappe-ui";
 import Avatar from "@/components/ui/Avatar.vue";
 import InviteMemberDialog from "./InviteMemberDialog.vue";
+import RemoveMemberDialog from "./RemoveMemberDialog.vue";
 
 const teamStore = useTeam();
 const openInviteMemberDialog = ref<boolean>(false);
+const openRemoveMemberDialog = ref<boolean>(false);
+const memberToRemove = ref<TeamMember | null>(null);
 
 const columns = computed(() => [
     {
@@ -25,9 +28,18 @@ const columns = computed(() => [
         width: 1,
     },
 ]);
+
+function handleMemberRemoval(row: TeamMember) {
+    memberToRemove.value = row;
+    openRemoveMemberDialog.value = true;
+}
 </script>
 <template>
     <InviteMemberDialog v-model="openInviteMemberDialog" />
+    <RemoveMemberDialog
+        v-model="openRemoveMemberDialog"
+        v-model:member-email="memberToRemove as TeamMember"
+    />
     <div class="flex flex-col gap-2">
         <div class="flex justify-between items-center">
             <h3 class="font-medium">Team Members</h3>
@@ -49,6 +61,7 @@ const columns = computed(() => [
                     description: 'Add team members to your team to get started',
                 },
             }"
+            row-key="email"
         >
             <!-- @vue-expect-error -->
             <template #cell="{ item, row, column }">
@@ -56,11 +69,23 @@ const columns = computed(() => [
                     v-if="column.key === 'can_edit_team'"
                     :disabled="row.is_owner"
                     :model-value="row.can_edit_team"
+                    @update:model-value="
+                        () => {
+                            teamStore.toggleEditPermissionForMember(row.email);
+                        }
+                    "
                 />
                 <div v-else-if="column.key === 'actions'">
                     <Tooltip v-if="row.is_owner" text="Owner cannot be removed from the team">
                         <span class="text-sm text-ink-gray-5 italic">Owner</span>
                     </Tooltip>
+                    <Button
+                        v-else
+                        size="sm"
+                        variant="ghost"
+                        icon="trash"
+                        @click="handleMemberRemoval(row)"
+                    />
                 </div>
                 <div class="flex items-center gap-2" v-else>
                     <Avatar :userId="row.email" />
diff --git a/frontend/src/stores/team.ts b/frontend/src/stores/team.ts
index 0f45e7a..18596ce 100644
--- a/frontend/src/stores/team.ts
+++ b/frontend/src/stores/team.ts
@@ -1,12 +1,15 @@
 import { defineStore } from "pinia";
 import { useUser } from "./user";
 import { computed, watch } from "vue";
-import { useCall } from "frappe-ui";
+import { useCall, createResource } from "frappe-ui";
+import { toast } from "vue-sonner";
 
 export type TeamMember = {
   full_name: string;
   user_image: string | null;
   email: string;
+  can_edit_team: boolean;
+  is_owner: boolean;
 };
 
 export const useTeam = defineStore("team", () => {
@@ -31,6 +34,48 @@ export const useTeam = defineStore("team", () => {
     teamMembersResource.fetch();
   }
 
+  function toggleEditPermissionForMember(member_email: string) {
+    createResource({
+      url: "forms_pro.api.team.toggle_can_edit_team",
+      method: "POST",
+      makeParams() {
+        return {
+          team_id: currentTeam.value?.name,
+          member_email: member_email,
+        };
+      },
+      async onSuccess() {
+        await teamMembersResource.fetch();
+        toast.info("Edit Permission Updated");
+      },
+      onError(error: Error) {
+        console.error(error);
+        toast.error(`Failed to update edit permission`);
+      },
+    }).submit();
+  }
+
+  function removeMemberFromTeam(member_email: string) {
+    createResource({
+      url: "forms_pro.api.team.remove_member_from_team",
+      method: "POST",
+      makeParams() {
+        return {
+          team_id: currentTeam.value?.name,
+          member_email: member_email,
+        };
+      },
+      onSuccess() {
+        teamMembersResource.reload();
+        toast.success("Member removed from team");
+      },
+      onError(error: Error) {
+        console.error(error);
+        toast.error(`Failed to remove member from team`);
+      },
+    }).submit();
+  }
+
   watch(currentTeam, () => {
     teamMembersResource.fetch();
   });
@@ -40,5 +85,7 @@ export const useTeam = defineStore("team", () => {
     teamMembers,
     teamMembersResource,
     initialize,
+    toggleEditPermissionForMember,
+    removeMemberFromTeam,
   };
 });

From d297206c1931efc8e6bcd577dfa742fc392188cf Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Fri, 6 Mar 2026 16:16:52 +0530
Subject: [PATCH 07/11] feat: add team details update functionality

- Implemented a new API endpoint `save` to update team fields, allowing modifications to `team_name` and `logo`.
- Created `ManageTeamHeader` component for editing team name and logo upload functionality.
- Integrated the new save functionality into the team store for seamless updates.
- Updated `ManageTeam` page to include the new header component for enhanced team management.
---
 forms_pro/api/team.py                         | 23 ++++++
 .../src/components/team/ManageTeamHeader.vue  | 72 +++++++++++++++++++
 frontend/src/pages/team/ManageTeam.vue        |  2 +
 frontend/src/stores/team.ts                   | 24 ++++++-
 4 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/team/ManageTeamHeader.vue

diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index 5486014..74eaf16 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -178,6 +178,29 @@ def toggle_can_edit_team(team_id: str, member_email: str) -> None:
     share.save(ignore_permissions=True)
 
 
+@frappe.whitelist(methods=["POST"])
+def save(team_id: str, fields: dict) -> None:
+    """
+    Update team fields. Only fields present in the dict are updated.
+    """
+    frappe.has_permission(
+        doctype="FP Team",
+        ptype="write",
+        doc=team_id,
+        user=frappe.session.user,
+        throw=True,
+    )
+
+    ALLOWED_SAVE_FIELDS = ["team_name", "logo"]
+
+    team: FPTeam = frappe.get_doc("FP Team", team_id)
+    for key, value in fields.items():
+        if key not in ALLOWED_SAVE_FIELDS:
+            frappe.throw(f"Field '{key}' is not allowed")
+        setattr(team, key, value)
+    team.save()
+
+
 @frappe.whitelist(methods=["POST"])
 def remove_member_from_team(team_id: str, member_email: str) -> None:
     """
diff --git a/frontend/src/components/team/ManageTeamHeader.vue b/frontend/src/components/team/ManageTeamHeader.vue
new file mode 100644
index 0000000..71e5733
--- /dev/null
+++ b/frontend/src/components/team/ManageTeamHeader.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import TeamLogo from "@/components/team/TeamLogo.vue";
+import { Button } from "frappe-ui";
+import { useTeam } from "@/stores/team";
+import { EditableArea, EditableInput, EditablePreview, EditableRoot } from "reka-ui";
+import { ref, watch } from "vue";
+
+const teamStore = useTeam();
+
+const teamName = ref(teamStore.currentTeam?.team_name ?? "");
+watch(
+    () => teamStore.currentTeam?.team_name,
+    (val) => {
+        teamName.value = val ?? "";
+    }
+);
+
+function onSubmit() {
+    const trimmed = teamName.value?.trim();
+    if (!trimmed || trimmed === teamStore.currentTeam?.team_name) return;
+    teamStore.save({ team_name: trimmed });
+}
+</script>
+<template>
+    <div class="flex gap-4 w-full">
+        <div class="rounded p-4 w-1/6 flex flex-col gap-4 items-center justify-center">
+            <TeamLogo
+                class-names="h-16 rounded-full"
+                :team-name="teamStore.currentTeam!.team_name"
+                :logo-url="teamStore.currentTeam?.logo ?? null"
+            />
+            <Button
+                :label="teamStore.currentTeam?.logo ? 'Change' : 'Upload Logo'"
+                icon-left="upload"
+                variant="outline"
+            />
+        </div>
+        <div class="flex pt-4">
+            <EditableRoot
+                v-slot="{ isEditing, submit, cancel, edit }"
+                v-model="teamName"
+                placeholder="Enter team name..."
+                class="flex flex-col gap-4"
+                auto-resize
+                submit-mode="none"
+                @submit="onSubmit"
+            >
+                <EditableArea class="text-2xl font-semibold text-gray-900">
+                    <EditablePreview />
+                    <EditableInput class="w-full outline-none bg-transparent" />
+                </EditableArea>
+                <Button
+                    v-if="!isEditing"
+                    class="max-w-20"
+                    label="Edit"
+                    variant="outline"
+                    @click="edit"
+                />
+                <div v-else class="flex gap-2">
+                    <Button class="max-w-20" label="Save" variant="solid" @click="submit" />
+                    <Button
+                        class="max-w-20"
+                        label="Cancel"
+                        theme="red"
+                        variant="outline"
+                        @click="cancel"
+                    />
+                </div>
+            </EditableRoot>
+        </div>
+    </div>
+</template>
diff --git a/frontend/src/pages/team/ManageTeam.vue b/frontend/src/pages/team/ManageTeam.vue
index a627b4a..53f226f 100644
--- a/frontend/src/pages/team/ManageTeam.vue
+++ b/frontend/src/pages/team/ManageTeam.vue
@@ -2,6 +2,7 @@
 import { useTeam } from "@/stores/team";
 import TeamMemberList from "@/components/team/TeamMemberList.vue";
 import { Breadcrumbs, LoadingText } from "frappe-ui";
+import ManageTeamHeader from "@/components/team/ManageTeamHeader.vue";
 
 const teamStore = useTeam();
 teamStore.initialize();
@@ -17,6 +18,7 @@ teamStore.initialize();
                 <h2 class="text-3xl font-bold">Manage Team</h2>
                 <p class="text-base">Manage your team and its members</p>
             </div>
+            <ManageTeamHeader />
             <div class="flex flex-col gap-2">
                 <TeamMemberList />
             </div>
diff --git a/frontend/src/stores/team.ts b/frontend/src/stores/team.ts
index 18596ce..9b477df 100644
--- a/frontend/src/stores/team.ts
+++ b/frontend/src/stores/team.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { useUser } from "./user";
 import { computed, watch } from "vue";
-import { useCall, createResource } from "frappe-ui";
+import { useCall, createResource, call } from "frappe-ui";
 import { toast } from "vue-sonner";
 
 export type TeamMember = {
@@ -76,6 +76,27 @@ export const useTeam = defineStore("team", () => {
     }).submit();
   }
 
+  async function save(fields: { team_name?: string; logo?: string }) {
+    createResource({
+      url: "forms_pro.api.team.save",
+      method: "POST",
+      makeParams() {
+        return {
+          team_id: currentTeam.value?.name,
+          fields,
+        };
+      },
+      onSuccess() {
+        toast.success("Team Details Updated");
+        teamMembersResource.fetch();
+      },
+      onError(error: Error) {
+        console.error(error);
+        toast.error("Failed to update team " + error.message);
+      },
+    }).submit();
+  }
+
   watch(currentTeam, () => {
     teamMembersResource.fetch();
   });
@@ -87,5 +108,6 @@ export const useTeam = defineStore("team", () => {
     initialize,
     toggleEditPermissionForMember,
     removeMemberFromTeam,
+    save,
   };
 });

From 9a546da62e2ddf4e888d2a965e8873a2d7569215 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Fri, 6 Mar 2026 16:20:01 +0530
Subject: [PATCH 08/11] refactor: clean up imports in team store

- Removed unused `call` import from the team store file to streamline dependencies.
---
 frontend/src/stores/team.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/stores/team.ts b/frontend/src/stores/team.ts
index 9b477df..c51a62b 100644
--- a/frontend/src/stores/team.ts
+++ b/frontend/src/stores/team.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { useUser } from "./user";
 import { computed, watch } from "vue";
-import { useCall, createResource, call } from "frappe-ui";
+import { useCall, createResource } from "frappe-ui";
 import { toast } from "vue-sonner";
 
 export type TeamMember = {

From 6c18ff6f3f4cf9165c0acba542fec935922b9932 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sat, 7 Mar 2026 21:30:41 +0530
Subject: [PATCH 09/11] chore: better code

- Added checks to prevent duplicate team member invitations and ensure team owners cannot have their permissions toggled.
- Updated `FPTeam` model to prevent removal of the team owner from the team.
- Modified `RemoveMemberDialog` and `TeamMemberList` components to improve member removal functionality and user experience.
---
 forms_pro/api/team.py                               | 10 ++++++++++
 forms_pro/forms_pro/doctype/fp_team/fp_team.py      |  6 ++++++
 forms_pro/tests/test_invitations.py                 |  4 ++--
 frontend/src/components/team/RemoveMemberDialog.vue | 12 +++++++++---
 frontend/src/components/team/TeamMemberList.vue     |  5 +----
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index 74eaf16..f911562 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -142,6 +142,10 @@ def add_member_to_team_via_invitation(team_id: str, invite_id: str | None = None
         raise frappe.PermissionError("User not found")
 
     team: FPTeam = frappe.get_doc("FP Team", team_id)
+
+    if team.is_team_member(invite.email):
+        raise frappe.DuplicateEntryError("User is already a member of the team")
+
     team.add_to_team(invite.email)
     team.save(ignore_permissions=True)
     set_current_team(team_id, invite.email)
@@ -166,6 +170,12 @@ def toggle_can_edit_team(team_id: str, member_email: str) -> None:
             "You do not have permission to toggle the can_edit_team permission for this team member"
         )
 
+    team: FPTeam = frappe.get_doc("FP Team", team_id)
+    if team.owner == member_email:
+        raise frappe.PermissionError(
+            "The team owner always retains full permissions and cannot have edit access toggled"
+        )
+
     share_name = get_share_name(doctype="FP Team", name=team_id, user=member_email, everyone=0)
     if not share_name:
         raise frappe.PermissionError(
diff --git a/forms_pro/forms_pro/doctype/fp_team/fp_team.py b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
index dd13c78..ac31f00 100644
--- a/forms_pro/forms_pro/doctype/fp_team/fp_team.py
+++ b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
@@ -110,6 +110,12 @@ def remove_from_team(self, user: str) -> None:
             user: The user email address
         """
 
+        if user == self.owner:
+            frappe.throw(
+                frappe._("Cannot remove the owner from the team"),
+                frappe.ValidationError,
+            )
+
         self.users = [member for member in self.users if member.user != user]
         self.save()
         remove_docshare(
diff --git a/forms_pro/tests/test_invitations.py b/forms_pro/tests/test_invitations.py
index b2f52ac..203129b 100644
--- a/forms_pro/tests/test_invitations.py
+++ b/forms_pro/tests/test_invitations.py
@@ -82,7 +82,7 @@ def _create_team(self, owner: str, team_name: str | None = None) -> str:
         frappe.set_user("Administrator")
         return team.name
 
-    def _make_accepted_invitation(self, invitee_email: str, owner: str, team_id: str) -> object:
+    def _make_accepted_invitation(self, invitee_email: str, owner: str) -> object:
         inv_doc = frappe.get_doc(
             {
                 "doctype": "User Invitation",
@@ -227,7 +227,7 @@ def test_add_member_adds_user_to_team_and_redirects(self):
         owner = self._create_user()
         invitee_email = self._create_user(with_forms_pro_role=False)
         team_id = self._create_team(owner)
-        inv_doc = self._make_accepted_invitation(invitee_email, owner, team_id)
+        inv_doc = self._make_accepted_invitation(invitee_email, owner)
 
         add_member_to_team_via_invitation(team_id=team_id, invite_id=inv_doc.name)
 
diff --git a/frontend/src/components/team/RemoveMemberDialog.vue b/frontend/src/components/team/RemoveMemberDialog.vue
index 128fe45..522f0dc 100644
--- a/frontend/src/components/team/RemoveMemberDialog.vue
+++ b/frontend/src/components/team/RemoveMemberDialog.vue
@@ -2,13 +2,19 @@
 import { Dialog } from "frappe-ui";
 import { useTeam } from "@/stores/team";
 import type { TeamMember } from "@/stores/team";
+import { toast } from "vue-sonner";
 
 const teamStore = useTeam();
 const open = defineModel<boolean>({ required: true, default: false });
-const memberEmail = defineModel<TeamMember>("memberEmail", { required: true });
+const member = defineModel<TeamMember | null>("member", { required: true, default: null });
 
 function removeMember() {
-    teamStore.removeMemberFromTeam(memberEmail.value.email);
+    if (!member.value) {
+        toast.error("No member selected");
+        return;
+    }
+    teamStore.removeMemberFromTeam(member.value.email);
+    member.value = null;
     open.value = false;
 }
 </script>
@@ -41,7 +47,7 @@ function removeMember() {
         <template #body-content>
             <div class="text-p-base">
                 Are you sure you want to remove
-                <strong>{{ memberEmail.full_name }}</strong> from the team?
+                <strong>{{ member?.full_name }}</strong> from the team?
             </div>
         </template>
     </Dialog>
diff --git a/frontend/src/components/team/TeamMemberList.vue b/frontend/src/components/team/TeamMemberList.vue
index 2812db3..6970b2d 100644
--- a/frontend/src/components/team/TeamMemberList.vue
+++ b/frontend/src/components/team/TeamMemberList.vue
@@ -36,10 +36,7 @@ function handleMemberRemoval(row: TeamMember) {
 </script>
 <template>
     <InviteMemberDialog v-model="openInviteMemberDialog" />
-    <RemoveMemberDialog
-        v-model="openRemoveMemberDialog"
-        v-model:member-email="memberToRemove as TeamMember"
-    />
+    <RemoveMemberDialog v-model="openRemoveMemberDialog" v-model:member="memberToRemove" />
     <div class="flex flex-col gap-2">
         <div class="flex justify-between items-center">
             <h3 class="font-medium">Team Members</h3>

From e950daa6d16b5969115ae0c78baf9154fb65f749 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sat, 7 Mar 2026 21:35:08 +0530
Subject: [PATCH 10/11] fix: tests

---
 forms_pro/tests/test_invitations.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/forms_pro/tests/test_invitations.py b/forms_pro/tests/test_invitations.py
index 203129b..cefd52d 100644
--- a/forms_pro/tests/test_invitations.py
+++ b/forms_pro/tests/test_invitations.py
@@ -1,6 +1,8 @@
 # Copyright (c) 2025, harsh@buildwithhussain.com and contributors
 # For license information, please see license.txt
 
+from unittest.mock import patch
+
 import frappe
 from faker import Faker
 from frappe.tests import IntegrationTestCase
@@ -33,12 +35,17 @@ class TestTeamInvitations(IntegrationTestCase):
 
     def setUp(self):
         super().setUp()
+        self.sendmail_patcher = patch("frappe.sendmail")
+        self.sendmail_patcher.start()
         self.fake = Faker()
         self.teams_created = []
         self.users_created = []
         frappe.set_user("Administrator")
 
     def tearDown(self):
+        patcher = getattr(self, "sendmail_patcher", None)
+        if patcher is not None:
+            patcher.stop()
         frappe.set_user("Administrator")
         for team_id in self.teams_created:
             if frappe.db.exists("FP Team", team_id):

From 545486c54991f5f09b62ff67ac3ec342f67bff8d Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sat, 7 Mar 2026 21:50:40 +0530
Subject: [PATCH 11/11] chore: better code

---
 forms_pro/api/team.py                           | 6 ++++--
 frontend/src/components/team/TeamMemberList.vue | 1 +
 frontend/src/stores/team.ts                     | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index f911562..574795b 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -99,11 +99,13 @@ def invite_team_members(team_id: str, emails: list[str]) -> None:
 
     if not frappe.has_permission(
         doctype="FP Team",
-        ptype="read",
+        ptype="write",
         doc=team_id,
         user=frappe.session.user,
     ):
-        raise frappe.PermissionError("You do not have permission to invite team members to this team")
+        raise frappe.PermissionError(
+            "You do not have write permission on this team; write access is required to invite members"
+        )
 
     emails_str = ", ".join(emails)
 
diff --git a/frontend/src/components/team/TeamMemberList.vue b/frontend/src/components/team/TeamMemberList.vue
index 6970b2d..8704544 100644
--- a/frontend/src/components/team/TeamMemberList.vue
+++ b/frontend/src/components/team/TeamMemberList.vue
@@ -81,6 +81,7 @@ function handleMemberRemoval(row: TeamMember) {
                         size="sm"
                         variant="ghost"
                         icon="trash"
+                        :label="`Remove ${row.full_name} from the team`"
                         @click="handleMemberRemoval(row)"
                     />
                 </div>
diff --git a/frontend/src/stores/team.ts b/frontend/src/stores/team.ts
index c51a62b..14ec042 100644
--- a/frontend/src/stores/team.ts
+++ b/frontend/src/stores/team.ts
@@ -86,9 +86,10 @@ export const useTeam = defineStore("team", () => {
           fields,
         };
       },
-      onSuccess() {
+      async onSuccess() {
         toast.success("Team Details Updated");
-        teamMembersResource.fetch();
+        await teamMembersResource.fetch();
+        user.fetchUserTeams();
       },
       onError(error: Error) {
         console.error(error);