SmythOS Studio: Open-Source Visual AI Agent Builder and deployable runtime stack from SmythOS. Start with an intuitive drag-and-drop workspace, extend with custom code, and deploy your agents anywhere — local, cloud, or edge — with full governance and control.
JavaScript a2aagentic-aiai-agentsdevtoolsmcp-clientn8n-alternativeno-codeopen-sourceorchestrationsmythosvisual-builder
migrate team modules to enterprise
ahmedcoder0173c2e0c64a29
diff --git a/packages/app/src/react/app/routeMap.tsx b/packages/app/src/react/app/routeMap.tsxindex 41025f48..694a37d8 100644--- a/packages/app/src/react/app/routeMap.tsx+++ b/packages/app/src/react/app/routeMap.tsx@@ -13,7 +13,6 @@ import DatasourceLibrary from '../features/data-space/pages/DatasourceLibrary';import DomainsPage from '../features/domains-space/pages/DomainsPage';import { BookAnIntroCallPage } from '../features/onboarding/pages/BookAnIntroCallPage';import { OnboardPage } from '../features/onboarding/pages/OnboardPage';-import { WelcomeInvitePage } from '../features/onboarding/pages/WelcomeInvitePage';import { WelcomePage } from '../features/onboarding/pages/WelcomePage';import { WelcomePayment } from '../features/onboarding/pages/WelcomePayment';import { WelcomeTeamPage } from '../features/onboarding/pages/WelcomeTeamPage';@@ -30,11 +29,7 @@ import {import MultiComponentSubscriptionPage from '../features/subscriptions/pages/MultiComponentSubscriptionPage';import { PlansPricingPage } from '../features/subscriptions/pages/PlansPricingPage';import SinglePriceSubscriptionPage from '../features/subscriptions/pages/SinglePriceSubscriptionPage';-import AcceptInvitationPage from '../features/teams/pages/accept-invitation-page';-import { SpaceSettings } from '../features/teams/pages/space-settings';-import TeamMembersPage from '../features/teams/pages/team-members';-import { TeamsPage } from '../features/teams/pages/teams';-import RolesPage from '../features/teams/pages/teams-roles';+import TemplatesPage from '../features/templates/pages/TemplatesPage';export const routeMap: IPageRoute[] = [@@ -52,46 +47,6 @@ export const routeMap: IPageRoute[] = [},{ path: '/templates', component: TemplatesPage, title: 'Templates' },- {- path: '/teams',- component: TeamsPage,- title: 'Teams',- },- {- path: '/teams/settings',- component: SpaceSettings,- title: 'Space Settings',- },- {- path: '/teams/roles',- component: RolesPage,- access: {- subscriptionBased: true,- checkAccess: (subs) => subs.plan.paid && subs.plan.properties?.limits?.teamMembers > 1,- UpsellContent: <FeaturePageUpsell.Roles />,- },- title: 'Roles',- },- {- path: '/teams/members',- component: TeamMembersPage,- access: {- subscriptionBased: true,- checkAccess: (subs) => subs.plan.paid && subs.plan.properties?.limits?.teamMembers > 1,- UpsellContent: <FeaturePageUpsell.Teams />,- },- title: 'User Management',- },- {- path: '/teams/accept-invitation/:invitationId',- component: AcceptInvitationPage,- title: 'Accept Invitation',- layoutOptions: {- sidebar: false,- topMenu: false,- container: false,- },- },{path: '/plans',@@ -99,7 +54,11 @@ export const routeMap: IPageRoute[] = [title: 'Plans',},{ path: '/partners', component: PartnersPage, title: 'Partners' },- { path: '/subscriptions/:priceId', component: SinglePriceSubscriptionPage, title: 'Subscription' },+ {+ path: '/subscriptions/:priceId',+ component: SinglePriceSubscriptionPage,+ title: 'Subscription',+ },{ path: '/subscriptions', component: MultiComponentSubscriptionPage, title: 'Subscription' },{ path: '/account', component: AccountPage, title: 'Account' },{@@ -195,16 +154,7 @@ export const routeMap: IPageRoute[] = [container: false,},},- {- path: '/welcome/invite',- title: 'Invite team mates',- component: WelcomeInvitePage,- layoutOptions: {- sidebar: false,- topMenu: false,- container: false,- },- },+{path: '/welcome/payment',title: 'Welcome to SmythOS!',diff --git a/packages/app/src/react/features/account/components/userInfoCard.tsx b/packages/app/src/react/features/account/components/userInfoCard.tsxindex 064d1388..0f77e86c 100644--- a/packages/app/src/react/features/account/components/userInfoCard.tsx+++ b/packages/app/src/react/features/account/components/userInfoCard.tsx@@ -1,7 +1,7 @@+import { teamAPI } from '@react/features/teams/clients';import { DeleteAccountType } from '@src/react/features/account/enum';import BlockAccountDeleteModal from '@src/react/features/account/modal/block-account-delete';import DeleteAccountModal from '@src/react/features/account/modals/deleteAccountModal';-import { teamAPI } from '@src/react/features/teams/clients';import { Button as CustomButton } from '@src/react/shared/components/ui/newDesign/button';import { useAuthCtx } from '@src/react/shared/contexts/auth.context';import { useQuery } from '@tanstack/react-query';diff --git a/packages/app/src/react/features/agents/data/onboarding-tasks.ts b/packages/app/src/react/features/agents/data/onboarding-tasks.tsindex f6a6c7a8..39bb0678 100644--- a/packages/app/src/react/features/agents/data/onboarding-tasks.ts+++ b/packages/app/src/react/features/agents/data/onboarding-tasks.ts@@ -25,7 +25,6 @@ export const onboardingTasks: OnboardingTaskProps[] = [],completeDescription: "You've successfully completed the interactive quickstart guide",},- // COMMENTED TEMPORARILY WHILE MIGRATING FROM CE TO SAAS// {// type: OnboardingTaskType.INVITE_TEAM_MEMBERS,// title: 'Invite Team Members',diff --git a/packages/app/src/react/features/analytics/components/subscription-analytics.tsx b/packages/app/src/react/features/analytics/components/subscription-analytics.tsxindex 93bf94c9..65c78bc7 100644--- a/packages/app/src/react/features/analytics/components/subscription-analytics.tsx+++ b/packages/app/src/react/features/analytics/components/subscription-analytics.tsx@@ -15,6 +15,10 @@ import {fetchCurrentCycleUsage,fetchLLMAndApiUsage,} from '@react/features/analytics/client/usageAnalytics';+import {+ useGetTeamSettings,+ useStoreTeamSettings,+} from '@react/features/teams/hooks/useTeamSettings';import { Button as CustomButton } from '@src/react/shared/components/ui/newDesign/button';import { formatDate } from '@src/react/shared/utils/format';import { teamSettingKeys } from '@src/shared/teamSettingKeys';@@ -22,7 +26,6 @@ import classNames from 'classnames';import { Loader2 } from 'lucide-react';import { HiOutlineArrowRight } from 'react-icons/hi';import { useAuthCtx } from '../../../shared/contexts/auth.context';-import { useGetTeamSettings, useStoreTeamSettings } from '../../teams/hooks/useTeamSettings';// eslint-disable-next-line react-refresh/only-export-componentsexport const ENTERPRISE_PLAN_NAMES = [@@ -399,8 +402,8 @@ export default function SubscriptionAnalytics({const freeCredits = subs?.properties?.freeCredits? subs?.properties?.freeCredits: subs?.plan?.isDefaultPlan- ? 5- : 0;+ ? 5+ : 0;useEffect(() => {const fetchData = async () => {@@ -630,8 +633,8 @@ export default function SubscriptionAnalytics({{subs?.plan?.name === 'SmythOS Free'? 'Upgrading...': subs?.plan?.isCustomPlan || ENTERPRISE_PLAN_NAMES.includes(subs?.plan?.name)- ? 'Managing...'- : 'Changing...'}+ ? 'Managing...'+ : 'Changing...'}</span></>) : subs?.plan?.name === 'SmythOS Free' ? (@@ -671,8 +674,9 @@ export default function SubscriptionAnalytics({<div className="flex items-center justify-between"><div><CardTitle className="text-2xl font-bold">Plan Summary</CardTitle>- <CardDescription className="text-base mt-1" data-qa="current-plan-text">{`${subs?.plan- ?.name} ${userDisplayName ? '- ' + userDisplayName : ''}`}</CardDescription>+ <CardDescription className="text-base mt-1" data-qa="current-plan-text">{`${+ subs?.plan?.name+ } ${userDisplayName ? '- ' + userDisplayName : ''}`}</CardDescription></div>{RenderButton({ className: 'hidden md:block' })}</div>diff --git a/packages/app/src/react/features/onboarding/components/agent-onboarding-section/OnboardingTasks.tsx b/packages/app/src/react/features/onboarding/components/agent-onboarding-section/OnboardingTasks.tsxindex 229f54cc..a8d01458 100644--- a/packages/app/src/react/features/onboarding/components/agent-onboarding-section/OnboardingTasks.tsx+++ b/packages/app/src/react/features/onboarding/components/agent-onboarding-section/OnboardingTasks.tsx@@ -1,11 +1,11 @@import { useOnboarding } from '@src/react/features/agents/contexts/OnboardingContext';import OnboardingTask from '@src/react/features/onboarding/components/agent-onboarding-section/OnboardingTask';-import CreateMemberModal from '@src/react/features/teams/modals/create-member';import { Spinner } from '@src/react/shared/components/ui/spinner';import { OnboardingTaskType } from '@src/react/shared/types/onboard.types';import { Suspense, useMemo, useState } from 'react';import { createPortal } from 'react-dom';import { GoChevronDown } from 'react-icons/go';+import CreateMemberModal from 'src/react/features/teams/modals/create-member';const ProgressBar = ({ progress }): JSX.Element => {return (diff --git a/packages/app/src/react/features/onboarding/pages/WelcomeInvitePage.tsx b/packages/app/src/react/features/onboarding/pages/WelcomeInvitePage.tsxdeleted file mode 100644index 644c217f..00000000--- a/packages/app/src/react/features/onboarding/pages/WelcomeInvitePage.tsx+++ /dev/null@@ -1,1261 +0,0 @@-import { errKeys } from '@react/shared/constants';-import { extractError } from '@react/shared/utils/errors';-import { isEmailValid } from '@src/react/features/onboarding/utils';-import { subTeamsAPI, teamAPI } from '@src/react/features/teams/clients';-import { Input as CustomInput } from '@src/react/shared/components/ui/input';-import ConfirmModal from '@src/react/shared/components/ui/modals/ConfirmModal';-import { Button } from '@src/react/shared/components/ui/newDesign/button';-import { Spinner } from '@src/react/shared/components/ui/spinner';-import { useAuthCtx } from '@src/react/shared/contexts/auth.context';-import { FRONTEND_USER_SETTINGS } from '@src/react/shared/enums';-import { queryClient } from '@src/react/shared/query-client';-import * as apiPayloadTypes from '@src/react/shared/types/api-payload.types';-import { SmythAPIError } from '@src/react/shared/types/api-results.types';-import { cn } from '@src/react/shared/utils/general';-import { teamSettingKeys } from '@src/shared/teamSettingKeys';-import { useMutation, useQuery } from '@tanstack/react-query';-import classNames from 'classnames';-import { Tooltip } from 'flowbite-react';-import {- ChangeEvent,- createContext,- Dispatch,- SetStateAction,- useCallback,- useContext,- useEffect,- useMemo,- useRef,- useState,-} from 'react';-import { createPortal } from 'react-dom';-import { FaCheck, FaPlus, FaTriangleExclamation } from 'react-icons/fa6';-import { toast } from 'react-toastify';-import { InviteMemberWarning } from '../../teams/components/teams/invite-member-warning';-import { PageCard } from '../components/PageCard';-interface InviteTeamMemberArgs {- email: string;- roleId: string;- teamId?: string;- spaceId?: string;- spaceMemberId?: number;- orgMemberId?: number;- agentId?: string;- agentName?: string;-}--interface IEmailField {- id: number;- isValid: boolean | null;- email: string;- error?: string;- errorClasses?: string;- roleId?: string | null;- invitationStatus?: 'pending' | 'success' | 'error' | null;- invitationError?: string;- isDisabled?: boolean;-}-const getInitialEmails = (- isShareAgent: boolean,- lastSelectedRoleId?: string | null,-): IEmailField[] => {- const emails = [];- const count = isShareAgent ? 1 : 3;- for (let i = 0; i < count; i++) {- emails.push({- id: i + 1,- isValid: null,- email: '',- roleId: lastSelectedRoleId || '',- invitationStatus: null,- isDisabled: false,- });- }- return emails;-};--// Time crunch. Some bad practices here. Will refactor later.-const InvitationContext = createContext<{- invitationSent: boolean;- setInvitationSent: Dispatch<SetStateAction<boolean>>;-}>({- invitationSent: false,- setInvitationSent: () => {},-});--const useInvitationContext = () => useContext(InvitationContext);--const SpinnerBodyComponent = ({ isShareAgent }: any) => {- return (- <div className="w-full h-full items-center flex flex-wrap justify-center text-center">- <div- className={classNames(- 'w-full my-1 p-3 md:my-3 md:p-4 flex font-inter flex-col text-center rounded-lg md:rounded-xl',- {- 'max-h-[380px] h-auto': isShareAgent,- },- )}- >- <Spinner classes="w-8 h-8 ml-auto mr-auto" />- </div>- </div>- );-};--const BodyComponent = ({- setData,- setIsContinueDisabled,- isShareAgent,- handleContinueEvent,- extraProps,-}) => {- const ref = useRef(null);- const { invitationSent } = useInvitationContext();- const { emailFields, setEmailFields } = extraProps || {};- const maxEmails = isShareAgent ? 10 : 25;- const [lastSelectedRoleId, setLastSelectedRoleId] = useState<string | null>(- extraProps?.defaultCurrentTeamRole !== null && extraProps?.defaultCurrentTeamRole !== undefined- ? extraProps.defaultCurrentTeamRole.toString()- : null,- );- const {- parentTeamMembers,- currentUserTeamMembers,- currentUserTeam,- hasReadOnlyPageAccess,- userInfo,- } = useAuthCtx();-- const canInviteOutsideTeam = useMemo(() => {- return !hasReadOnlyPageAccess('/teams/members', false);- }, [currentUserTeam, hasReadOnlyPageAccess]);-- const canInviteOutsideOrg = useMemo(() => {- return !hasReadOnlyPageAccess('/teams/members', true);- }, [currentUserTeam, hasReadOnlyPageAccess]);-- useEffect(() => {- if (- extraProps?.defaultCurrentTeamRole !== null &&- extraProps?.defaultCurrentTeamRole !== undefined- ) {- setLastSelectedRoleId(extraProps.defaultCurrentTeamRole.toString());- } else if (extraProps?.currTeamRoles?.length > 0) {- // Use the first role from currTeamRoles as default (matching dropdown behavior)- setLastSelectedRoleId(extraProps.currTeamRoles[0].id?.toString() || '');- }- }, [extraProps?.defaultCurrentTeamRole, extraProps?.currTeamRoles]);-- // Update initial email fields that have empty roleId when the correct role becomes available- useEffect(() => {- if (lastSelectedRoleId && setEmailFields) {- setEmailFields((prevFields) => {- if (!prevFields) return prevFields;- let hasEmptyRoleId = false;- const updatedFields = prevFields.map((field) => {- if (!field.roleId || field.roleId === '') {- hasEmptyRoleId = true;- return { ...field, roleId: lastSelectedRoleId };- }- return field;- });- // Only update if there were fields with empty roleId- return hasEmptyRoleId ? updatedFields : prevFields;- });- }- }, [lastSelectedRoleId, setEmailFields]);-- const handleAddEmail = () => {- if (!setEmailFields) return;-- if ((emailFields?.length || 0) < maxEmails) {- const defaultRoleId =- lastSelectedRoleId || extraProps?.currTeamRoles?.[0]?.id?.toString() || '';- setEmailFields((prevFields) => {- if (!prevFields) return prevFields;- return [- ...prevFields,- {- id: prevFields.length + 1,- email: '',- isValid: null,- roleId: defaultRoleId,- invitationStatus: null,- isDisabled: false,- },- ];- });-- setTimeout(() => {- ref.current?.scrollIntoView({ behavior: 'smooth' });- }, 100);- }- };-- const checkAccessForEmail = (email: string) => {- const trimmedEmail = email.trim();- if (trimmedEmail == userInfo?.user?.email) {- return 'You cannot invite yourself';- }- if (!currentUserTeam?.parentId) {- const isUserAlreadyAMember = currentUserTeamMembers?.find(- (member) => member.email === trimmedEmail,- );- if (!isUserAlreadyAMember && !canInviteOutsideTeam) {- return 'You do not have permission to invite outside your team';- }- return null;- } else {- const isUserAlreadyAMember = currentUserTeamMembers?.find(- (member) => member.email === trimmedEmail,- );- const isUserAlreadyAMemberInOrg = parentTeamMembers?.find(- (member) => member.email === trimmedEmail,- );- if (isUserAlreadyAMember) {- return null;- } else if (isUserAlreadyAMemberInOrg && canInviteOutsideTeam) {- return null;- } else if (isUserAlreadyAMemberInOrg && !canInviteOutsideTeam) {- return 'You do not have permission to invite outside your team';- } else if (!isUserAlreadyAMemberInOrg && !isUserAlreadyAMember && canInviteOutsideOrg) {- return null;- }- return 'You do not have permission to invite outside your organization';- }- };-- const handleChange = (e: ChangeEvent<HTMLInputElement>) => {- if (!setEmailFields) return;-- const nameParts = e.target.name.split('-');- const indexStr = nameParts[1];-- if (!indexStr || isNaN(Number(indexStr))) {- console.error('Invalid input name format:', e.target.name);- return;- }-- const index = Number(indexStr);- const email = e.target.value;- const trimmedEmail = email.trim();-- setEmailFields((prevEmails) => {- if (!prevEmails) return prevEmails;- const newEmails = [...prevEmails];- // Don't allow changes if field is disabled or index is invalid- if (index >= newEmails.length || newEmails[index]?.isDisabled) {- return prevEmails;- }-- // Update the email value first- newEmails[index].email = email;-- // Create a map to track the first occurrence of each email- const emailFirstOccurrence = new Map<string, number>();-- // Find the first occurrence of each email- newEmails.forEach((field, fieldIndex) => {- const fieldTrimmedEmail = field.email.trim();- if (fieldTrimmedEmail !== '' && !emailFirstOccurrence.has(fieldTrimmedEmail)) {- emailFirstOccurrence.set(fieldTrimmedEmail, fieldIndex);- }- });-- // Now validate all fields- newEmails.forEach((field, fieldIndex) => {- const fieldTrimmedEmail = field.email.trim();- const accessError = checkAccessForEmail(fieldTrimmedEmail);-- if (!fieldTrimmedEmail.length) {- // Reset all error-related properties when field is cleared- field.isValid = null;- field.error = '';- field.invitationStatus = null;- field.invitationError = '';- } else if (accessError) {- field.isValid = false;- field.error = accessError;- // Reset invitation status when validation changes- field.invitationStatus = null;- field.invitationError = '';- } else if (!isEmailValid(fieldTrimmedEmail)) {- field.isValid = false;- field.error = 'Invalid email';- // Reset invitation status when validation changes- field.invitationStatus = null;- field.invitationError = '';- } else if (- fieldTrimmedEmail !== '' &&- emailFirstOccurrence.get(fieldTrimmedEmail) !== fieldIndex- ) {- // This is a duplicate email and NOT the first occurrence- field.isValid = false;- field.error = 'Email already added';- // Reset invitation status when validation changes- field.invitationStatus = null;- field.invitationError = '';- } else {- field.isValid = true;- field.error = '';- // Reset invitation status when validation changes- field.invitationStatus = null;- field.invitationError = '';- }- });-- return newEmails;- });- };-- const handleRoleChange = (e: ChangeEvent<HTMLSelectElement>) => {- if (!setEmailFields) return;-- const nameParts = e.target.name.split('-');- const indexStr = nameParts[1];-- if (!indexStr || isNaN(Number(indexStr))) {- console.error('Invalid select name format:', e.target.name);- return;- }-- const index = Number(indexStr);- const roleId = e.target.value;-- setEmailFields((prevEmails) => {- if (!prevEmails) return prevEmails;- const newEmails = [...prevEmails];- // Don't allow changes if field is disabled or index is invalid- if (index >= newEmails.length || newEmails[index]?.isDisabled) {- return prevEmails;- }- newEmails[index].roleId = roleId || '';- return newEmails;- });- setLastSelectedRoleId(roleId || null);- };-- useEffect(() => {- if (!setEmailFields) return;-- setData(emailFields || []);- // disable the button if there will be no valid emails (only consider non-disabled fields)- const areSomeEmailsValid = (emailFields || []).some(- (field) => field.isValid === true && !field.isDisabled,- );- // also disable the button if there are any errors in email fields- const hasErrors = (emailFields || []).some(- (field) => field.isValid === false && !field.isDisabled,- );- // disable the button if all fields are empty- const hasNonEmptyFields = (emailFields || []).some(- (field) => field.email.trim() !== '' && !field.isDisabled,- );- setIsContinueDisabled(!areSomeEmailsValid || hasErrors || !hasNonEmptyFields);- }, [emailFields, setData, setIsContinueDisabled, setEmailFields]);-- return (- <div className="w-full h-full items-center flex flex-wrap justify-center text-center">- <div- className={classNames(- 'w-full flex font-inter flex-col text-center rounded-lg md:rounded-xl',- {- 'max-h-[450px] h-auto pb-3 ': isShareAgent,- 'sm:w-[450px] bg-gray-100 my-1 p-3 md:my-3 md:p-4 ': !isShareAgent,- 'h-auto': !invitationSent && !isShareAgent,- 'h-[306px]': invitationSent && !isShareAgent,- },- )}- >- <div- className={classNames({- 'p-1 md:p-3': !isShareAgent,- 'pb-1 md:pb-3': isShareAgent,- })}- >- {invitationSent && isShareAgent && extraProps?.errorOccurred ? (- <div className="flex flex-col items-center justify-center gap-4 mt-10">- <FaTriangleExclamation className="w-8 h-8 md:w-10 md:h-10 text-red-500" />- <p className="text-base text-center font-inter text-black">Invite Limit Reached!</p>- </div>- ) : invitationSent ? (- <div className="flex flex-col items-center justify-center gap-4 mt-10">- <FaCheck className="w-8 h-8 md:w-10 md:h-10 text-green-500" />- <p className="text-base text-center font-inter text-black">Invitations sent!</p>- </div>- ) : (- <>- {!isShareAgent && (- <h1 className="text-lg md:text-xl text-center font-semibold font-inter text-black">- {'Start Inviting your team'}- </h1>- )}- {isShareAgent && (- <p className={classNames('text-left font-inter mb-4 text-[#424242] font-light')}>- {- "Share this agent with your team members. They'll receive an email invitation to collaborate."- }- </p>- )}- {!isShareAgent && (- <p- className={classNames('text-center font-inter text-black pt-5 mb-6', {- 'text-md': isShareAgent,- 'text-xs md:text-sm ': !isShareAgent,- })}- >- {'Invite a team member to collaborate with you.'}- </p>- )}- <InviteMemberWarning- newMemberCount={emailFields?.filter((e) => e.isValid === true).length || 1}- classes={isShareAgent ? 'my-4' : ''}- />- <div className="flex flex-row gap-6 mb-2">- <div className="text-left text-base font-medium text-[#1E1E1E] dark:text-white w-full">- Invite Colleagues <span className="text-red-500">*</span>- </div>- {extraProps?.currTeamRoles?.length > 0 && (- <div className="text-left text-base font-medium text-[#1E1E1E] dark:text-white w-full">- Role{' '}- <Tooltip- content={- <div className="text-sm">- Different roles have different permissions.- {currentUserTeam?.parentId === null && (- <>- <br />- See{' '}- <a- href="/teams/roles"- target="_blank"- rel="noopener noreferrer"- className="hover:underline text-white font-semibold hover:text-gray-200"- onClick={(e) => e.stopPropagation()}- >- manage roles- </a>- </>- )}- </div>- }- trigger="hover"- placement="top"- style="dark"- theme={{- target: 'inline-flex items-center w-5 h-5 align-top',- }}- >- <img src="/img/icons/Info.svg" className="w-5 h-5" alt="Info" />- </Tooltip>- </div>- )}- </div>-- <div- className={classNames('space-y-2 overflow-y-auto', {- 'max-h-32': (emailFields?.length || 0) < maxEmails && isShareAgent,- 'max-h-40': (emailFields?.length || 0) >= maxEmails && isShareAgent,- 'max-h-64': (emailFields?.length || 0) < maxEmails && !isShareAgent,- 'max-h-72': (emailFields?.length || 0) >= maxEmails && !isShareAgent,- })}- >- {emailFields?.map((field, index) => {- const errorMessage =- (field.invitationStatus === 'error' && field.invitationError) ||- (field.isValid === false && field.error);-- return (- <div key={field.id}>- <div className={classNames('flex flex-row gap-6')}>- <div- className="w-full"- ref={(emailFields?.length || 0) - 1 === index ? ref : null}- >- <CustomInput- type="email"- placeholder="Email"- name={`email-${index}`}- onChange={handleChange}- value={emailFields[index].email}- disabled={- field.isDisabled || (!extraProps?.isLoading && extraProps?.freePlan)- }- icon={- field.invitationStatus === 'success' ? (- <FaCheck className="w-3 h-3 md:w-4 md:h-4 text-green-500" />- ) : field.invitationStatus === 'error' ? (- <FaTriangleExclamation className="w-3 h-3 md:w-4 md:h-4 text-red-500" />- ) : field.invitationStatus === 'pending' ? (- <Spinner classes="w-3 h-3 md:w-4 md:h-4" />- ) : field.isValid === null ? null : field.isValid ? (- <FaCheck className="w-3 h-3 md:w-4 md:h-4 text-green-500" />- ) : (- <FaTriangleExclamation className="w-3 h-3 md:w-4 md:h-4 text-red-500" />- )- }- fullWidth- className={classNames('pr-8', {- 'opacity-50':- field.isDisabled ||- (!extraProps?.isLoading && extraProps?.freePlan),- })}- />- </div>- {extraProps?.currTeamRoles?.length > 1 && (- <div className="w-full">- <div className="w-full text-left">- <select- value={emailFields[index].roleId || ''}- id={`role-select-${index}`}- name={`role-${index}`}- disabled={- field.isDisabled ||- (!extraProps?.isLoading && extraProps?.freePlan)- }- className={classNames(- 'py-2 px-3 mb-[1px] border text-gray-900 rounded block w-full outline-none focus:outline-none focus:ring-0 focus:ring-offset-0 focus:ring-shadow-none text-sm font-normal placeholder:text-sm placeholder:font-normal box-border border-gray-300 border-b-gray-500 focus:border-b-2 focus:border-b-blue-500 focus-visible:border-b-2 focus-visible:border-b-blue-500 focus-visible:mb-0 focus:mb-0',- {- 'opacity-50 cursor-not-allowed':- field.isDisabled ||- (!extraProps?.isLoading && extraProps?.freePlan),- },- )}- onChange={(e) => {- handleRoleChange(e);- }}- >- {extraProps?.currTeamRoles?.map((role) => (- <option key={role.id} value={role.id?.toString() || ''}>- {role.name}- </option>- ))}- </select>- </div>- </div>- )}- </div>- {errorMessage && (- <p className="w-[calc(100%_-_4px)] ml-[2px] text-left text-xs text-red-500 mt-1">- {errorMessage}- </p>- )}- </div>- );- })}- </div>- {(emailFields?.length || 0) < maxEmails && !extraProps?.showingUpgradeCTA && (- <div- className={cn(- 'items-center inline-flex gap-2 mt-2 w-auto float-left p-3 cursor-pointer',- 'border border-[#D9D9D9] border-solid rounded-lg',- )}- onClick={handleAddEmail}- >- <FaPlus color="#242424" />- <p className="text-xs md:text-md font-inter select-none text-[#242424] ">- Add More- </p>- </div>- )}- </>- )}- </div>-- {isShareAgent && (- <div className={cn('text-[#616161] font-light text-left mb-2')}>- Please note that new members will be invited to join your team and agent space- </div>- )}- </div>- {isShareAgent && !invitationSent && !extraProps?.showingUpgradeCTA && (- <div- className={classNames(- `w-full ${- (emailFields?.filter((e) => e?.email?.trim?.() && !e.isDisabled)?.length || 0) ===- 0 ||- (emailFields || []).some((field) => field.isValid === false && !field.isDisabled)- ? 'opacity-50 pointer-events-none'- : ''- }`,- {- 'sm:w-[450px] mt-4': !isShareAgent,- '': isShareAgent,- },- )}- >- <Button- handleClick={handleContinueEvent}- fullWidth={!isShareAgent}- variant="primary"- className={isShareAgent ? 'm-auto mr-0 w-[100px] h-[48px] rounded-lg' : ''}- >- {extraProps?.invitationInProgress ? (- <Spinner classes="w-5 h-5" />- ) : isShareAgent ? (- 'Send'- ) : (- 'Send Invitations'- )}- </Button>- </div>- )}- </div>- );-};-const WelcomeInvitePageComponent = ({- isShareAgent = false,- onClose,- agentId = '',- agentName = '',-}) => {- const [progress, setProgress] = useState(90);- const [errorMessage, setErrorMessage] = useState(null);- const { invitationSent, setInvitationSent } = useInvitationContext();- const [invitationInProgress, setInvitationInProgress] = useState(false);- const [emailFields, setEmailFields] = useState<IEmailField[]>(- getInitialEmails(isShareAgent, null),- );-- const searchParams = new URLSearchParams(window.location.search);- const isChatParamPresent = searchParams.has('chat');- const redirectPath = searchParams.get('redirect');-- const [showShareAgentConfirmation, setShowShareAgentConfirmation] = useState(false);- const [emailsToBeSharedWith, setEmailsToBeSharedWith] = useState<any[]>([]);- const [isShareAgentOnly, setIsShareAgentOnly] = useState(false);- const [organizationRoles, setOrganizationRoles] = useState<any[]>([]);- const [organizationMembers, setOrganizationMembers] = useState<any[]>([]);- const [currTeamMembers, setCurrTeamMembers] = useState<any[]>([]);- const { userTeams, userInfo, currentUserTeamRoles, parentTeamRoles, currentUserTeam } =- useAuthCtx();- const [isLoading, setIsLoading] = useState(!!isShareAgent);- const [allAllowedMembers, setAllAllowedMembers] = useState<any[]>([]);- const [canFetchDataForShareAgent, setCanFetchDataForShareAgent] = useState(false);- const [defaultCurrentTeamRole, setDefaultCurrentTeamRole] = useState<any>(null);-- const disableBackButton =- sessionStorage.getItem(FRONTEND_USER_SETTINGS.HIDE_BACK_BUTTON_WELCOME_PAGE) === 'true' ||- window.location.pathname.includes('book-intro-call');-- const organization = userTeams?.find((team) => team.parentId === null);- const currTeam = userTeams?.find((team) => team.id === currentUserTeam?.id);-- useEffect(() => {- async function getSettings() {- try {- const response = await fetch(`/api/app/team-settings/${teamSettingKeys.DEFAULT_ROLE}`);-- if (!response.ok) {- return;- }-- const roleSettings = (await response?.json?.()) || {};- setDefaultCurrentTeamRole(roleSettings?.data?.defaultRoles?.[currTeam?.id].id || null);- } catch (error) {- console.log('Error fetching default role:', error);- }- }- if (currTeam?.id) {- getSettings();- }- }, [currTeam]);-- async function getCurrTeamRoles() {- try {- const result = await subTeamsAPI.getTeamRoles(currTeam?.id);- return result;- } catch (e) {- console.error('Error fetching current team roles:', e);- return Promise.resolve(null);- }- }-- async function getOrgRoles() {- try {- const result = await subTeamsAPI.getTeamRoles(organization.id);- return result;- } catch (e) {- console.error('Error fetching org roles:', e);- return Promise.resolve(null);- }- }-- async function getOrgMembers() {- try {- const result = await subTeamsAPI.getTeamMembers(organization.id);- return result;- } catch (e) {- return Promise.resolve(null);- }- }-- async function getTeamMembers() {- try {- const result = await subTeamsAPI.getTeamMembers(currTeam?.id);- return result;- } catch (e) {- return Promise.resolve(null);- }- }-- useEffect(() => {- async function getData() {- const [organizationMembersFetched, currTeamMembersFetched] = await Promise.all([- getOrgMembers(),- currTeam?.id !== organization?.id ? getTeamMembers() : null,- ]);-- setOrganizationMembers(organizationMembersFetched?.members || []);- setCurrTeamMembers(currTeamMembersFetched?.members || []);-- const teamMembers = (- currTeamMembersFetched?.members || organizationMembersFetched?.members- )?.filter((member) => !member.userTeamRole.isTeamInitiator);- // setAllAllowedMembers(teamMembers || []);- const organizationAccess = organizationMembersFetched?.members?.filter(- (member) => userInfo?.user?.email == member.email,- )?.[0];- const currTeamAccess = currTeamMembersFetched?.members?.filter(- (member) => userInfo?.user?.email == member.email,- )?.[0];- const organizationAccessRole = organizationAccess?.userTeamRole?.sharedTeamRole;- const currTeamAccessRole = currTeamAccess?.userTeamRole?.sharedTeamRole;-- let canCreateTeam =- organizationAccessRole?.isOwnerRole || organizationAccessRole?.canManageTeam;-- if (currTeam?.id !== organization?.id) {- canCreateTeam =- canCreateTeam && (currTeamAccessRole?.isOwnerRole || currTeamAccessRole?.canManageTeam);- }- setIsShareAgentOnly(!canCreateTeam);- setCanFetchDataForShareAgent(true);- }-- if (organization?.id && currTeam?.id) {- if (isShareAgent) {- if (organization?.id !== currTeam?.id) {- getData();- } else {- setIsShareAgentOnly(!userInfo?.user?.userTeamRole?.sharedTeamRole?.canManageTeam);- setCanFetchDataForShareAgent(true);- }- } else {- // When not sharing an agent, we still need to fetch roles- setCanFetchDataForShareAgent(true);- }- }- }, [organization, currTeam]);-- useEffect(() => {- async function getData() {- if (!isShareAgent || !isShareAgentOnly) {- if (organization?.id == currTeam?.id) {- const [organizationRolesFetched] = await Promise.all([getOrgRoles()]);- setOrganizationRoles(organizationRolesFetched?.roles || []);- } else {- const [organizationRolesFetched, currTeamRolesFetched] = await Promise.all([- getOrgRoles(),- getCurrTeamRoles(),- ]);- setOrganizationRoles(organizationRolesFetched?.roles || []);- }- }- setIsLoading(false);- }- if (canFetchDataForShareAgent) {- getData();- }- }, [canFetchDataForShareAgent, isShareAgentOnly]);-- const goForward = useCallback(() => {- const whatAreYouBuilding = sessionStorage.getItem(FRONTEND_USER_SETTINGS.WHAT_ARE_YOU_BUILDING);- sessionStorage.removeItem(FRONTEND_USER_SETTINGS.WHAT_ARE_YOU_BUILDING);- const redirectPath = sessionStorage.getItem(- FRONTEND_USER_SETTINGS.REDIRECT_PATH_KEY_WELCOME_PAGE,- );- sessionStorage.removeItem(FRONTEND_USER_SETTINGS.REDIRECT_PATH_KEY_WELCOME_PAGE);- const whatAreYouBuildingEncoded = whatAreYouBuilding?.trim?.()- ? encodeURIComponent(whatAreYouBuilding)- : '';- if (whatAreYouBuildingEncoded) {- location.href = `/builder?chat=${whatAreYouBuildingEncoded}&from=onboarding`;- } else {- window.location.href = redirectPath || '/agents';- }- }, []);- const handleBackEvent = useCallback(() => {- if (redirectPath) {- sessionStorage.setItem(FRONTEND_USER_SETTINGS.REDIRECT_PATH_KEY_WELCOME_PAGE, redirectPath);- localStorage.setItem(FRONTEND_USER_SETTINGS.SIDEBAR_COLLAPSED, 'true');- }- if (isChatParamPresent) {- window.location.href = '/welcome/jobtype';- } else {- window.location.href = '/welcome/work';- }- }, [isChatParamPresent]);-- const teamRolesQuery = useQuery({- queryKey: ['team_roles'],- queryFn: teamAPI.getTeamRoles,- refetchOnWindowFocus: false,- });-- const shareAgentMutation = useMutation({- mutationFn: ({ email, agentId, agentName }: apiPayloadTypes.ShareAgentWithTeamMemberRequest) =>- teamAPI.shareAgentWithTeamMember({ email, agentId, agentName }),- onError: (error: SmythAPIError) => {- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to invite a new member',- );- },- onSuccess: () => {- queryClient.invalidateQueries({ queryKey: ['share_agent_invitations'] });- },- });-- const inviteMembers = useMutation({- mutationFn: ({- email,- roleId,- teamId = '',- spaceId = '',- agentId = '',- }: InviteTeamMemberArgs) => {- return teamAPI.inviteTeamMember({- email,- roleId: Number(roleId),- teamId,- spaceId,- agentId,- agentName,- });- },-- onError: (error: SmythAPIError) => {- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to invite a new member',- );- },- onSuccess: () => {- queryClient.invalidateQueries({ queryKey: ['team_roles'] });- },- });-- const handleApiError = (error, defaultMsg, unauthorizedMsg) => {- let _errorMessage =- error.status === 403 && extractError(error).toLowerCase().indexOf('unauthorized') !== -1- ? unauthorizedMsg- : extractError(error) || defaultMsg;-- if (error?.error?.errKey === errKeys.QUOTA_EXCEEDED) {- _errorMessage =- 'You have reached the maximum number of invitations allowed on your current plan. Upgrade to invite additional members and unlock more features.';- }-- toast.error(_errorMessage);- setErrorMessage(_errorMessage);- };-- const handleContinueEvent = async (_, data: IEmailField[]) => {- if (!setEmailFields) return;-- const validEmails = data- .filter((field) => field.isValid && !field.isDisabled)- .map((field) => field.email);- const allEmails = data- .filter((field) => field.isValid !== null && field.email.trim() !== '' && !field.isDisabled)- .map((field) => field.email);-- if (validEmails?.length !== allEmails?.length) {- return setErrorMessage('Some email addresses seem incorrect. Please review and update.');- }-- setErrorMessage(null);-- if (validEmails.length === 0) {- return;- }-- // Add proper null checking for teamRolesQuery- if (!teamRolesQuery.data?.roles || teamRolesQuery.data.roles.length === 0) {- setErrorMessage('Unable to load team roles. Please try again.');- return;- }-- const roleId = teamRolesQuery.data.roles[0].id;-- setInvitationInProgress(true);-- // Update email fields to show pending status- setEmailFields((prevFields) => {- return prevFields.map((field) => {- if (validEmails.includes(field.email)) {- return { ...field, invitationStatus: 'pending' as const };- }- return field;- });- });-- const inviteResults = await Promise.allSettled(- validEmails.map(async (email) => {- try {- await inviteMembers.mutateAsync({ email, roleId });- return { email, success: true };- } catch (error) {- return { email, success: false, error };- }- }),- );-- // Update email fields based on results- setEmailFields((prevFields) => {- return prevFields.map((field) => {- const result = inviteResults.find(- (r) => r.status === 'fulfilled' && r.value.email === field.email,- );-- if (result && result.status === 'fulfilled') {- if (result.value.success) {- return {- ...field,- invitationStatus: 'success' as const,- isDisabled: true,- invitationError: undefined,- };- } else {- return {- ...field,- invitationStatus: 'error' as const,- invitationError: extractError(result.value.error) || 'Invitation failed',- };- }- }- return field;- });- });-- // Check if all invitations were successful- const allSuccessful = inviteResults.every(- (result) => result.status === 'fulfilled' && result.value.success,- );-- if (allSuccessful) {- setInvitationSent(true);- setProgress(100);- setTimeout(goForward, 3000);- } else {- // Show summary error if some failed- const failedCount = inviteResults.filter(- (result) => result.status === 'fulfilled' && !result.value.success,- ).length;-- if (failedCount > 0) {- setErrorMessage(- `${failedCount} invitation(s) failed. Please review the errors and try again.`,- );- }- }-- setInvitationInProgress(false);- };- const handleShareAgentEvent = async (_, data: IEmailField[]) => {- if (!setEmailFields) return;-- const validEmails = data- .filter((field) => field.isValid && !field.isDisabled)- .map((field) => {- return { email: field.email, roleId: field.roleId };- });- const allEmails = data- .filter((field) => field.isValid !== null && field.email.trim() !== '' && !field.isDisabled)- .map((field) => field.email);-- if (validEmails?.length !== allEmails?.length) {- return setErrorMessage('Some email addresses seem incorrect. Please review and update.');- }-- setErrorMessage(null);-- if (validEmails.length === 0) {- return;- }-- // Update email fields to show pending status- setEmailFields((prevFields) => {- return prevFields.map((field) => {- if (validEmails.some((v) => v.email === field.email)) {- return { ...field, invitationStatus: 'pending' as const };- }- return field;- });- });-- const invitePromises = validEmails.map(async (field) => {- const { email, roleId: currSpaceRoleId } = field;- if (isShareAgentOnly) {- return { email: email, organizationId: currTeam?.id, agentId };- }- let type = '_EMAIL';- let organizationId = null;- const teamId = null;- let spaceMemberId = null;- let orgMemberId = null;- let roleId = null;- let spaceRoleId = null;- if (currTeam?.id !== organization?.id) {- const currTeamMember = currTeamMembers.find((member) => member.email === email);- const organizationMember = organizationMembers.find((member) => member.email === email);- spaceRoleId = currSpaceRoleId || defaultCurrentTeamRole || currentUserTeamRoles?.[0]?.id;- const isPartOfTeam = currTeamMember;- type = !isPartOfTeam ? '_SUBSPACE' + type : type;- // teamId = currTeam?.id;- spaceMemberId = currTeamMember?.id;- orgMemberId = organizationMember?.id;- }- {- const isPartOfTeam = organizationMembers.some((member) => member.email === email);- const organizationMember = organizationMembers.find((member) => member.email === email);- type = !isPartOfTeam ? '_ORGANIZATION' + type : type;- roleId = currTeam?.id !== organization?.id ? organizationRoles?.[0]?.id : currSpaceRoleId;- organizationId = organization?.id;- orgMemberId = organizationMember?.id;- }- return {- email,- type,- organizationId,- teamId,- spaceMemberId,- orgMemberId,- roleId,- spaceRoleId,- agentId,- };- });-- const invitedResult = await Promise.all(invitePromises);- setEmailsToBeSharedWith(invitedResult);- // if (isShareAgentOnly) {- handleShareAgentConfirmation(invitedResult);- // } else {- // setShowShareAgentConfirmation(true);- // }- // setInvitationSent(true);- setProgress(100);- // setTimeout(goForward, 3000);- };-- async function handleShareAgentConfirmation(data = null) {- if (!setEmailFields) return;-- setShowShareAgentConfirmation(false);- setInvitationInProgress(true);-- const inviteResults = await Promise.allSettled(- (data || emailsToBeSharedWith).map(async (email) => {- try {- if (!isShareAgentOnly) {- if (email.type == '_SUBSPACE_EMAIL') {- await subTeamsAPI.assignMemberToTeam({- teamId: currTeam.id,- memberId: email.orgMemberId,- roleId: email.spaceRoleId,- });- }- await inviteMembers.mutateAsync({- email: email.email,- roleId: email.roleId,- teamId: email.organizationId,- spaceId: email.teamId,- agentId: email.agentId,- });- } else {- await shareAgentMutation.mutateAsync({- email: email.email,- agentId: email.agentId,- agentName,- });- }- return { email: email.email, success: true };- } catch (error) {- console.error('error', error);- return { email: email.email, success: false, error };- }- }),- );-- // Update email fields based on results- setEmailFields((prevFields) => {- return prevFields.map((field) => {- const result = inviteResults.find(- (r) => r.status === 'fulfilled' && r.value.email === field.email,- );-- if (result && result.status === 'fulfilled') {- if (result.value.success) {- return {- ...field,- invitationStatus: 'success' as const,- isDisabled: true,- invitationError: undefined,- };- } else {- return {- ...field,- invitationStatus: 'error' as const,- invitationError: extractError(result.value.error) || 'Invitation failed',- };- }- }- return field;- });- });-- // Check if all invitations were successful- const allSuccessful = inviteResults.every(- (result) => result.status === 'fulfilled' && result.value.success,- );-- if (allSuccessful) {- setInvitationSent(true);- setProgress(100);- } else {- // Show summary error if some failed- const failedCount = inviteResults.filter(- (result) => result.status === 'fulfilled' && !result.value.success,- ).length;-- if (failedCount > 0) {- setErrorMessage(- `${failedCount} invitation(s) failed. Please review the errors and try again.`,- );- }- }-- setInvitationInProgress(false);- }-- // Initialize email fields when component mounts or when defaultCurrentTeamRole changes- useEffect(() => {- if (defaultCurrentTeamRole !== null) {- setEmailFields(getInitialEmails(isShareAgent, defaultCurrentTeamRole?.toString() || null));- }- }, [isShareAgent, defaultCurrentTeamRole, setEmailFields]);- const freePlan = userInfo?.subs?.plan?.name?.toLowerCase().replace(/\s/g, '') === 'smythosfree';-- const showingUpgradeCTA =- !isLoading &&- ((isShareAgent &&- inviteMembers.isError &&- inviteMembers.error?.error?.errKey === errKeys.QUOTA_EXCEEDED) ||- freePlan);-- return (- <div- className={`font-sans text-white w-full h-[100vh] flex gap-10 flex-col md:flex-row items-center justify-center ${- !isShareAgent ? '' : 'bg-gray-800/50'- }`}- >- <PageCard- canGoBack={!disableBackButton && !isShareAgent}- hasSkip={true}- size={isShareAgent ? 'sm' : 'md'}- progress={progress}- closeEvent={isShareAgent ? onClose : () => {}}- skipEvent={goForward}- pageCardClasses="w-full"- hasLogo={isShareAgent ? false : true}- title={isShareAgent ? 'Share Agent' : ''}- backEvent={handleBackEvent}- errorMessage={!showingUpgradeCTA ? errorMessage : ''}- ErrorCTA={showingUpgradeCTA ? () => ErrorCTA(freePlan) : null}- pageCardMainBodyClasses={- isShareAgent && inviteMembers.isError ? 'mb-4' : isShareAgent ? 'mb-0' : ''- }- hideFooter={invitationSent || isShareAgent || showingUpgradeCTA}- BodyComponent={isLoading ? SpinnerBodyComponent : BodyComponent}- continueEvent={isShareAgent ? handleShareAgentEvent : handleContinueEvent}- isShareAgent={isShareAgent}- hasClose={isShareAgent}- extraProps={{- isShareAgentOnly,- invitationInProgress,- errorOccurred: inviteMembers.isError,- showingUpgradeCTA,- currTeamRoles: currentUserTeamRoles,- defaultCurrentTeamRole,- emailFields,- setEmailFields,- isLoading,- freePlan,- }}- continueText="Invite"- />-- {showShareAgentConfirmation &&- createPortal(- <ConfirmModal- onClose={() => setShowShareAgentConfirmation(false)}- handleCancel={() => setShowShareAgentConfirmation(false)}- handleConfirm={() => handleShareAgentConfirmation()}- label="Share"- message="Confirm Share"- lowMsg={- 'You are about to share this agent with additional members. Please note that new members will be invited to join your team and agent space.'- }- />,- document.body,- )}- </div>- );-};--export const WelcomeInvitePage = ({- isShareAgent = false,- onClose,- agentId = '',- agentName = '',-}) => {- const [invitationSent, setInvitationSent] = useState(false);- return (- <InvitationContext.Provider value={{ invitationSent, setInvitationSent }}>- <WelcomeInvitePageComponent- isShareAgent={isShareAgent}- onClose={onClose}- agentId={agentId}- agentName={agentName}- />- </InvitationContext.Provider>- );-};--export const ErrorCTA = (freePlan: boolean) => {- const handleNavigation = (path: string) => {- window.location.href = path;- };-- return (- <>- {freePlan && (- <p className="text-center text-xs text-red-500">- Your subscription of SmythOS Free does not allow members to be invited. Upgrade to invite- additional members and unlock more features.- </p>- )}- <Button- className="mt-3 mx-auto"- variant="primary"- handleClick={() => handleNavigation('/plans')}- >- Upgrade to Invite More- </Button>- </>- );-};diff --git a/packages/app/src/react/features/teams/clients/team-api.ts b/packages/app/src/react/features/teams/clients/team-api.tsindex 309fe822..6940f26c 100644--- a/packages/app/src/react/features/teams/clients/team-api.ts+++ b/packages/app/src/react/features/teams/clients/team-api.ts@@ -9,6 +9,7 @@ export const createTeamRole = (data: apiPayloadTypes.CreateRoleRequest) =>body: JSON.stringify(data),});+// USEDexport const getTeamRoles = async (): Promise<{ roles: apiResultsTypes.TeamRoleWithMembers[] }> => {const result = await fetch('/app/page/teams/roles');const response = await result.json();@@ -26,6 +27,7 @@ export const updateTeamRole = (data: apiPayloadTypes.UpdateRoleRequest) =>});type GetTeamMembersResponse = { members: apiResultsTypes.TeamMemberWithRole[] };+// USEDexport const getTeamMembers = async (): Promise<GetTeamMembersResponse> => {const result = await fetch('/app/page/teams/members?includeRoles=true');return result.json();diff --git a/packages/app/src/react/features/teams/components/common/app-table.tsx b/packages/app/src/react/features/teams/components/common/app-table.tsxdeleted file mode 100644index 710620b4..00000000--- a/packages/app/src/react/features/teams/components/common/app-table.tsx+++ /dev/null@@ -1,123 +0,0 @@-/* eslint-disable @typescript-eslint/no-explicit-any */-import { Fragment, useState } from 'react';--import { RefreshIcon } from '@react/shared/components/svgs';-import TableRowSkeleton from '@react/shared/components/ui/table/table.row.skeleton';--type Props<T extends { id: string }> = {- rows: T[];- isLoading: boolean;- tableHeaders: { name: string }[];- renderRow: (role: T) => JSX.Element; // eslint-disable-line no-unused-vars- pageSize?: number;-};--/**- * Generic table component with optional pagination via load more functionality- * @param props - Component props including rows data, render function, loading state, headers, and optional page size- * @returns JSX table element with optional load more button- */-export const AppTable = <T extends { id: string }>(props: Props<T>) => {- // Track how many rows are currently being displayed- const [currentDisplayCount, setCurrentDisplayCount] = useState<number>(- props.pageSize || props.rows.length,- );-- // Track loading state for load more button- const [isLoadingMore, setIsLoadingMore] = useState<boolean>(false);-- /**- * Renders skeleton loading rows for loading state- * @returns Array of skeleton row components- */- const renderSkeletonLoading = () => {- const skeletonRows = [];- Array.from({ length: 3 }).forEach((_, i) => {- skeletonRows.push(<TableRowSkeleton key={i} className="py-5 my-3" />);- });- return skeletonRows;- };-- /**- * Handles load more button click by increasing display count by page size with loading delay- */- const handleLoadMore = () => {- if (props.pageSize && !isLoadingMore) {- setIsLoadingMore(true);-- // Add 2 second delay for loading animation- setTimeout(() => {- const newCount = Math.min(currentDisplayCount + props.pageSize, props.rows.length);- setCurrentDisplayCount(newCount);- setIsLoadingMore(false);- }, 1200);- }- };-- // Determine which rows to display based on current display count- const visibleRows = props.pageSize ? props.rows.slice(0, currentDisplayCount) : props.rows;-- // Check if there are more rows to load- const hasMoreRows = props.pageSize ? currentDisplayCount < props.rows.length : false;-- // Show load more button only when page size is specified and there are more rows- const shouldShowLoadMore = props.pageSize && hasMoreRows && !props.isLoading;-- /**- * Renders the load more row with loading animation using DataPage design- * @returns JSX table row element for load more functionality- */- const renderLoadMoreRow = () => {- if (!shouldShowLoadMore) return null;-- return (- <tr>- <td colSpan={props.tableHeaders.length} className="p-0">- <div className="px-6 py-4 text-center rounded-lg text-sm">- <button- onClick={handleLoadMore}- type="button"- className="text-gray-500 hover:underline flex items-center justify-center mx-auto"- disabled={isLoadingMore}- >- <RefreshIcon color="text-gray-500" isLoading={isLoadingMore} />- <span className="mx-2">Load More</span>- </button>- </div>- </td>- </tr>- );- };-- if (props.isLoading) {- return renderSkeletonLoading();- }-- return (- <div className="relative sm:rounded-lg border border-solid border-gray-200 overflow-x-auto md:overflow-x-hidden block w-full">- <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">- <thead className="text-xs text-[#242424] uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">- <tr>- {props.tableHeaders.map((header) => {- return (- <th- key={header.name}- scope="col"- className="px-4 sm:px-6 py-3 last:text-right tracking-wider font-semibold"- >- {header.name}- </th>- );- })}- </tr>- </thead>- <tbody>- {visibleRows.map((row) => {- return <Fragment key={row?.id}>{props.renderRow(row)}</Fragment>;- })}- {renderLoadMoreRow()}- </tbody>- </table>- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/common/assign-member-modal.tsx b/packages/app/src/react/features/teams/components/common/assign-member-modal.tsxdeleted file mode 100644index 7ea464fd..00000000--- a/packages/app/src/react/features/teams/components/common/assign-member-modal.tsx+++ /dev/null@@ -1,694 +0,0 @@-/* eslint-disable react-hooks/exhaustive-deps */-import { useMutation } from '@tanstack/react-query';-import { FC, useCallback, useEffect, useRef, useState } from 'react';-import { toast } from 'react-toastify';--import { subTeamsAPI, teamAPI } from '@react/features/teams/clients';-import { InviteMemberWarning } from '@react/features/teams/components/teams';-import { AssignTeamDropdown } from '@react/features/teams/components/teams/assign-team-dropdown';-import { useGetTeamSettings } from '@react/features/teams/hooks';-import Modal from '@react/shared/components/ui/modals/Modal';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { Spinner } from '@react/shared/components/ui/spinner';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings, useStoreUserSettings } from '@react/shared/hooks/useUserSettings';-import { queryClient } from '@react/shared/query-client';-import {- SmythAPIError,- TeamMemberWithRole,- TeamRoleWithMembers,-} from '@react/shared/types/api-results.types';-import { PostHog } from '@shared/posthog';-import { EVENTS } from '@shared/posthog/constants/events';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';-import classNames from 'classnames';-import { Tooltip } from 'flowbite-react';--interface Props {- isOpen: boolean;- onClose: () => void;- newTeamData?: { name: string; id: string; owner: string; organizationId?: string };- editData?: { id: string; name: string; organizationId?: string };- memberData?: {- id: string;- teamId: string;- email: string;- roleId: string;- roleName: string;- removeBeforeUpdate?: boolean;- };- onSubmit: (teamName: string) => void; // eslint-disable-line no-unused-vars- options?: Array<{ name: string; id: string; email: string }> | TeamMemberWithRole[];- excludedOptions?: { key: string; options: string[] };-}--const isValidEmail = (email: string) => {- // RFC 5322 compliant email regex- const emailRegex =- /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/; // eslint-disable-line max-len- return emailRegex.test(email);-};--export const AssignMemberModal: FC<Props> = ({- isOpen,- onClose,- options,- onSubmit,- editData,- newTeamData,- excludedOptions,- memberData,-}) => {- const [selectedMemberId, setSelectedMemberId] = useState<string>('');- const [selectedRoleId, setSelectedRoleId] = useState<string>('');- const [roleData, setRoleData] = useState([]);- const [isLoading, setIsLoading] = useState<boolean>(false);- const [hasRoles, setHasRoles] = useState<boolean>(false);- const [emailError, setEmailError] = useState<string>('');- const [emailInput, setEmailInput] = useState<string>('');- const [isContinuing, setIsContinuing] = useState<boolean>(false);- const [isEmailNewMember, setIsEmailNewMember] = useState<boolean>(false);- const storeUserSettings = useStoreUserSettings(userSettingKeys.USER_TEAM);- const [isAddBtnDisabled, setIsAddBtnDisabled] = useState<boolean>(false);- const validationTimeoutRef = useRef<NodeJS.Timeout>();-- const { refreshUserData, currentUserTeam, getPageAccessParentTeam, getPageAccess } = useAuthCtx();- const membersAccess = getPageAccess('/teams/members');- const parentTeamMembersAccess = getPageAccessParentTeam('/teams/members');- const finalMemberAccess = !currentUserTeam.parentId- ? membersAccess?.write- : parentTeamMembersAccess?.write;-- // Add these hooks for team-specific roles- const { data: userTeamSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const { data: roleSettings } = useGetTeamSettings(teamSettingKeys.DEFAULT_ROLE);- const currentTeamId = userTeamSettings?.userSelectedTeam;-- const modalOriginFromSpaceSettings = !!editData && !newTeamData;-- const isUpdatingRole = memberData?.removeBeforeUpdate;-- const findOwnerRole = useCallback((roles) => roles?.find((r) => r.isOwnerRole), []);-- // Helper function to check if a role exists in current team roles- const isRoleAvailable = useCallback(- (roleId: string) => roleData.some((role) => role.id.toString() === roleId.toString()),- [roleData],- );-- useEffect(() => {- if (emailError) setIsAddBtnDisabled(true);- else if (!(selectedMemberId || emailInput) || isLoading) {- setIsAddBtnDisabled(true);- } else setIsAddBtnDisabled(false);- }, [emailError, selectedMemberId, isLoading, emailInput]);-- const isRoleDefault = useCallback(- (roleId: string, roleName: string) => {- const defaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];-- return (- roleId.toString() === defaultRole?.id.toString() || roleName.toLowerCase() === 'super admin'- );- },- [roleSettings?.data?.defaultRoles, currentTeamId],- );-- const getEffectiveRoleId = useCallback(() => {- if (selectedRoleId && isRoleAvailable(selectedRoleId)) return selectedRoleId;-- // If editing, use the member's current role if it exists- if (memberData?.roleId && isRoleAvailable(memberData.roleId)) return memberData.roleId;-- // Use team-specific default role if available- const defaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];- if (defaultRole?.id && isRoleAvailable(defaultRole.id)) return defaultRole.id.toString();-- // Fallback to owner role- const ownerRole = findOwnerRole(roleData);- return ownerRole?.id?.toString();- }, [- selectedRoleId,- memberData?.roleId,- roleSettings?.data?.defaultRoles,- currentTeamId,- roleData,- isRoleAvailable,- ]);-- useEffect(() => {- if (memberData) {- if (excludedOptions?.options) {- excludedOptions.options = excludedOptions?.options?.filter(- (option) => option !== memberData?.email,- );- }- setSelectedMemberId(memberData.id);- setEmailInput(memberData.email);- setSelectedRoleId(memberData.roleId);- }- }, [memberData]);-- const onCloseModal = async () => {- // Only refresh and redirect if explicitly continuing in space creation flow- if (newTeamData?.id && isContinuing) await refreshUserData();- onClose();- };-- interface CreateAssignMemberMutationProps {- teamId: string;- memberId: string;- roleId: string;- notifyEmail: boolean;- }- const createAssignMemberMutation = useMutation({- mutationFn: async (props: CreateAssignMemberMutationProps) => {- const response = await subTeamsAPI.assignMemberToTeam(props);-- // Parse the response to check for errors- if (response?.error) throw new Error(response.error?.message || 'Failed to assign member');- return response;- },- onSuccess: async () => {- await refreshUserData();- setIsLoading(false);- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_MEMBER_INVITED, {});-- // Only close modal and refresh if we're not in the space creation flow- if (!newTeamData?.id) {- onSubmit('');- onClose();- }-- // Show success message only on confirmed success- toast(editData?.id ? 'Member updated successfully' : 'Member added successfully');- },- // eslint-disable-next-line @typescript-eslint/no-explicit-any- onError: (error: any) => {- toast(error?.message || error?.error?.message || 'Failed to add member');- setIsAddBtnDisabled(false);- setIsLoading(false);- },- });-- const getRolesMutation = useMutation({- mutationFn: (teamId: string) => subTeamsAPI.getTeamRoles(teamId),- onSuccess: async (response) => {- const roles = response?.roles || [];- setRoleData(roles);-- // Check if current default role exists in new team roles- const defaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];- const isCurrentDefaultValid =- defaultRole?.id && roles.some((role) => role.id.toString() === defaultRole.id.toString());-- // If no valid role is selected, set the default role if valid- if (!selectedRoleId && !memberData?.roleId) {- if (isCurrentDefaultValid) setSelectedRoleId(defaultRole.id.toString());- else {- const ownerRole = findOwnerRole(roles);- if (ownerRole) setSelectedRoleId(ownerRole.id.toString());- }- }-- setTimeout(setHasRoles, 1000, true);- return roles;- },- onError: (error: SmythAPIError) => {- // console.error('Error fetching team roles:', error);- toast(error?.error?.message);- },- });-- const getRoles = (teamId: string) => getRolesMutation.mutate(teamId);-- interface InviteMembersMutationProps {- email: string;- roleId: string;- organizationId: string;- spaceId: string;- }- const inviteMembersMutation = useMutation({- mutationFn: async ({ roleId, spaceId, ...others }: InviteMembersMutationProps) => {- const response = await teamAPI.inviteTeamMemberWithSubTeam(- { roleId: Number(roleId), spaceId, ...others },- spaceId,- );-- // Parse response first- const data = await response.json();-- // If response is not ok, throw error with parsed message- if (!response.ok) {- throw new Error(data?.message || data?.error?.message || 'An error occurred');- }-- return data;- },- onError: (error: Error | SmythAPIError) => {- const errorMessage = error instanceof Error ? error.message : error?.error?.message;- toast(errorMessage);- setIsAddBtnDisabled(false);- setIsLoading(false);- },- onSuccess: () => queryClient.invalidateQueries({ queryKey: ['team_invites'] }),- });-- useEffect(() => {- if (newTeamData?.id) {- editData = {- id: newTeamData.id,- name: newTeamData.name,- organizationId: newTeamData?.organizationId,- };- }-- if (editData?.id || newTeamData?.id) getRoles(editData?.id);- }, [newTeamData]);-- const handleSubmit = async () => {- try {- setIsLoading(true);- setIsAddBtnDisabled(true);-- // Force validation if there's a pending timeout- if (validationTimeoutRef.current) {- clearTimeout(validationTimeoutRef.current);- validateEmail(emailInput);- }-- const isAddingMember =- !isUpdatingRole && !options?.find((option) => option.email === emailInput);-- // Check if we should attempt invitation for new member- const shouldInviteNewMember = isAddingMember && emailInput && isValidEmail(emailInput);-- if (shouldInviteNewMember) {- try {- await inviteMembersMutation.mutateAsync({- email: emailInput,- roleId: getEffectiveRoleId(),- spaceId: newTeamData?.id ? newTeamData.id : currentUserTeam.id,- organizationId: currentUserTeam.parentId- ? currentUserTeam.parentId- : currentUserTeam.id,- });-- // Show success message only after confirmed success- toast('Member added successfully');-- // Clear the form for next invitation- setEmailInput('');- setSelectedMemberId('');- setSelectedRoleId('');- setEmailError('');-- await refreshUserData();-- if (!newTeamData?.id) onSubmit('');-- // Reset button state- setIsAddBtnDisabled(false);- setIsLoading(false);- } catch {- return;- }- } else if ((editData?.id || newTeamData?.id) && selectedMemberId) {- const effectiveRoleId = getEffectiveRoleId();-- if (!effectiveRoleId) {- toast('No role selected and no default role available');- setIsAddBtnDisabled(false);- setIsLoading(false);- return;- }-- if (isUpdatingRole) {- const response = await subTeamsAPI.unassignMemberFromTeam({- teamId: memberData?.teamId,- memberId: memberData.id.toString(),- roleId: Number(memberData?.roleId),- });- if (response?.error) {- toast(response?.error);- setIsAddBtnDisabled(false);- setIsLoading(false);- return;- }- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_MEMBER_UPDATED, {});- }-- try {- await createAssignMemberMutation.mutateAsync({- teamId: editData?.id || newTeamData?.id,- memberId: selectedMemberId,- roleId: effectiveRoleId,- notifyEmail: !isUpdatingRole,- });- // Success is handled in mutation's onSuccess- } catch {- // Error is handled in mutation's onError- }- } else {- // Show appropriate error message- if (!emailInput) {- toast('Please enter an email address');- } else if (!isValidEmail(emailInput)) {- toast('Please enter a valid email address');- } else if (!finalMemberAccess) {- toast('You do not have permission to add members to this team');- } else {- toast('Please select a valid member or enter a new email address');- }- setIsAddBtnDisabled(false);- setIsLoading(false);- }- } catch (error) {- // Only log unexpected top-level errors- // eslint-disable-next-line no-console- console.error('Unexpected error in form submission:', error);- }- };-- // Helper function to get role display name- const getRoleDisplayName = useCallback(- (role: TeamRoleWithMembers) => {- const isDefault = isRoleDefault(role.id.toString(), role.name);- const isOwner = role.isOwnerRole;-- return `${role.name}${isDefault ? ' (Default)' : ''}${isOwner ? ' (System Admin)' : ''}`;- },- [isRoleDefault],- );-- // Helper function to get placeholder text- const getPlaceholderText = useCallback(() => {- const effectiveRoleId = getEffectiveRoleId();- if (!effectiveRoleId) return 'Select a role';-- const defaultRole = roleData.find((r) => r.id.toString() === effectiveRoleId);- return `Select a role (default: ${defaultRole?.name})`;- }, [getEffectiveRoleId, roleData]);-- // Optimized email validation with proper debouncing- const validateEmail = useCallback(- (email: string) => {- if (!email) {- setIsEmailNewMember(false);- setEmailError('');- setSelectedMemberId('');- return;- }-- // Check if email exists in options (case-insensitive)- const existingMember = options?.find(- (option) => option.email.toLowerCase() === email.toLowerCase(),- );-- if (existingMember) {- // Email exists in dropdown options- setSelectedMemberId(existingMember.id.toString());- setIsEmailNewMember(false);- setEmailError('');- return;- }-- // Email doesn't exist in options - validate as new member- setSelectedMemberId('');- setIsEmailNewMember(true);-- if (!isValidEmail(email)) {- setEmailError('Please enter a valid email address.');- } else if (!finalMemberAccess) {- setEmailError(- 'Entered email is not part of organization. You do not have access to add members out of your organization.',- );- } else {- setEmailError('');- }- },- [options, finalMemberAccess],- );-- // Handle email input changes with proper debouncing- const handleEmailChange = useCallback(- (email: string) => {- setEmailInput(email);-- // Clear selectedMemberId immediately if user types something different from selected email- if (selectedMemberId) {- const selectedOption = options?.find((option) => option.id.toString() === selectedMemberId);- if (selectedOption && selectedOption.email !== email) {- setSelectedMemberId('');- }- }-- // Clear previous timeout- if (validationTimeoutRef.current) {- clearTimeout(validationTimeoutRef.current);- }-- // Set new timeout for validation- validationTimeoutRef.current = setTimeout(() => {- validateEmail(email);- }, 300);- },- [validateEmail, selectedMemberId, options],- );-- // Handle dropdown selection changes- const handleDropdownChange = useCallback(- (value: string) => {- const selectedOption = options?.find((option) => option.id.toString() === value);-- if (selectedOption) {- // Clear any pending validation- if (validationTimeoutRef.current) {- clearTimeout(validationTimeoutRef.current);- }-- // Update states for selected option- setSelectedMemberId(value);- setEmailInput(selectedOption.email);- setEmailError('');- setIsEmailNewMember(false);- }- },- [options],- );-- // Cleanup timeout on unmount- useEffect(() => {- return () => {- if (validationTimeoutRef.current) {- clearTimeout(validationTimeoutRef.current);- }- };- }, []);-- // Update the continue button handler to only redirect when explicitly clicked- const handleContinue = async () => {- if (newTeamData?.id) {- setIsContinuing(true);- await storeUserSettings.mutateAsync(newTeamData?.id);- window.location.href = '/';- } else onClose();- };-- if (!isOpen) return null;-- return (- <Modal- isOpen={isOpen}- onClose={onCloseModal}- title={- newTeamData?.name- ? 'Space created successfully'- : isUpdatingRole- ? 'Edit Member'- : 'Add member'- }- applyMaxWidth={false}- panelWrapperClasses={'w-[540px]'}- hideCloseIcon={!modalOriginFromSpaceSettings}- showOverflow={true}- // panelClasses={'h-[500px]'}- >- <div- className={`${- createAssignMemberMutation.isLoading ? 'opacity-80 pointer-events-none' : ''- }`}- >- {newTeamData?.name && (- <>- <p className="text-sm text-gray-500">- You will be now redirected to the new space. Would you like to switch to it now and- start collaborating with your team?- </p>- <div className="p-2 bg-gray-100 w-full rounded-lg my-6 flex items-center">- <div className="inline-block w-[40px] align-middle">- <div>- <div- className="w-10 h-10 max-w-10 max-h-10 rounded-full overflow-hidden- bg-orange-400 dark:bg-orange-400 text-white dark:text-white- font-medium flex items-center justify-center"- >- <p className="capitalize text-lg text-center w-full">- {newTeamData?.name- ?.split(' ')- ?.slice(0, 2)- ?.map((t) => t[0])- ?.join('')- ?.toUpperCase()}- </p>- </div>- <div- className="absolute inset-0 transition-opacity duration-300 w-3 h-3- left-[calc(14.6447%_-_6.5px)] top-[calc(14.6447%_-_6.5px)] z-12- rounded-full border border-white border-solid opacity-0 bg-v2-blue"- />- </div>- </div>- <div className="inline-block align-middle pl-4 flex-1 w-0">- <h2 className="overflow-hidden text-ellipsis whitespace-nowrap">- {newTeamData?.name}- </h2>- {newTeamData?.owner && (- <p className="text-sm text-gray-500 overflow-hidden text-ellipsis whitespace-nowrap">- by {newTeamData?.owner}- </p>- )}- </div>- </div>- </>- )}- <p- className={classNames('text-base text-[#1E1E1E] py-3 font-light', {- hidden: isUpdatingRole,- })}- >- {finalMemberAccess- ? `Invite team members to collaborate. If the email entered is not part of the organization,- they will be added automatically.`- : ' Invite a new person to join your team or workspace.'}- </p>- {!hasRoles && (- <div className="w-full h-6 my-20">- <Spinner classes="w-full h-6 mr-10" />- </div>- )}- {hasRoles && isEmailNewMember && <InviteMemberWarning classes="mb-2" />}- {hasRoles && (- <>- <div className="mb-2">- <div className="text-left text-base font-medium text-[#1E1E1E] w-full">- Email <span className="text-red-500">*</span>- </div>-- <div className="w-full">- <AssignTeamDropdown- options={- options- ?.filter(- (option) =>- !excludedOptions ||- !excludedOptions?.options.includes(option[excludedOptions?.key]),- )- ?.map((option) => ({- id: option.id.toString(),- name: option.email,- })) || []- }- dropDownClasses="max-h-[236px] overflow-y-auto"- onChange={handleDropdownChange}- onInputChange={handleEmailChange}- disabled={isUpdatingRole}- value={selectedMemberId}- inputValue={emailInput}- useInputValue={true}- placeholder="Select a member"- isEmailDropdown- />- {emailError && (- <p className="w-[calc(100%_-_4px)] ml-[2px] text-left text-xs text-red-500 mt-1">- {emailError}- </p>- )}- </div>- </div>- <div className="mb-2">- <div className="text-left text-base font-medium text-[#1E1E1E] w-full">- Role{' '}- <Tooltip- content={- <div className="text-sm">- Different roles have different permissions.- {currentUserTeam?.parentId === null && (- <>- <br />- See{' '}- <a- href="/teams/roles"- target="_blank"- rel="noopener noreferrer"- className="hover:underline text-white font-semibold hover:text-gray-200"- onClick={(e) => e.stopPropagation()}- >- manage roles- </a>- </>- )}- </div>- }- trigger="hover"- placement="top"- style="dark"- theme={{- target: 'inline-flex items-center w-5 h-5 align-top',- }}- >- <img src="/img/icons/Info.svg" className="w-5 h-5" alt="Info" />- </Tooltip>- </div>- <div className="w-full">- <AssignTeamDropdown- options={- roleData- ? roleData.map((role) => ({- id: role.id.toString(),- name: getRoleDisplayName(role),- }))- : []- }- dropDownClasses="max-h-[236px] overflow-y-auto"- onChange={(value) => setSelectedRoleId(value)}- value={selectedRoleId}- placeholder={getPlaceholderText()}- />- </div>- </div>- <div className="flex justify-end pt-4">- <Button- handleClick={handleContinue}- disabled={isContinuing || isLoading}- variant="secondary"- className={`mr-2 ${modalOriginFromSpaceSettings ? 'hidden' : ''}`}- label={newTeamData?.name ? 'Go To Space' : 'Cancel'}- loading={isContinuing}- />- <Button- handleClick={handleSubmit}- disabled={isAddBtnDisabled || isContinuing}- variant="primary"- label={isUpdatingRole ? 'Save' : 'Add Member'}- loading={isLoading}- className="px-8 h-[48px] rounded-lg"- />- </div>- </>- )}- </div>- </Modal>- );-};diff --git a/packages/app/src/react/features/teams/components/common/create-space.tsx b/packages/app/src/react/features/teams/components/common/create-space.tsxdeleted file mode 100644index 58186578..00000000--- a/packages/app/src/react/features/teams/components/common/create-space.tsx+++ /dev/null@@ -1,253 +0,0 @@-import { useMutation, useQueryClient } from '@tanstack/react-query';-import React, { ChangeEvent, FormEvent, useEffect, useState } from 'react';-import { Link } from 'react-router-dom';-import { toast } from 'react-toastify';--import { subTeamsAPI } from '@react/features/teams/clients';-import { Input } from '@react/shared/components/ui/input';-import Modal from '@react/shared/components/ui/modals/Modal';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { errKeys } from '@react/shared/constants';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { IMembershipTeam } from '@react/shared/types/entities';-import { PostHog } from '@shared/posthog';-import { EVENTS } from '@shared/posthog/constants/events';--const ENTERPRISE_PLAN_REDIRECT = 'https://smythos.com/enterprise-enquiry/';--// TODO: SHOULD NOT BE HARDEDCODED!!!-const MAX_SPACES = { STARTER: 1, PROFESSIONAL: 3, PREMIUM: 10, ENTERPRISE: 30 };--interface Props {- isOpen: boolean;- // eslint-disable-next-line no-unused-vars- onClose: (data?: IMembershipTeam) => void;- onSubmit: () => void;- editData?: { id: string; name: string };- allTeams?: IMembershipTeam[];- parentTeam?: IMembershipTeam; // TODO: make it required in the future if needed, currently optional-}--type ErrorResponse = { error?: { code: number; message: string; errKey?: string; stack?: string } };-type PlanConfig = { showUpgradeLink: boolean; message: string };--const getPlanQuotaMessage = (- userType: 'premium' | 'enterprise' | 'starter' | 'pro',- maxSpaces: number,- defaultSpaces: typeof MAX_SPACES,-): PlanConfig => {- const configs: Record<string, PlanConfig> = {- premium: {- showUpgradeLink: true,- message: `Limit reached! You've created the maximum of ${- maxSpaces || defaultSpaces.PREMIUM- } spaces.`,- },- enterprise: {- showUpgradeLink: false,- message: `Maximum of ${- maxSpaces || defaultSpaces.ENTERPRISE- } spaces created. Manage your spaces to free up room.`,- },- starter: {- showUpgradeLink: true,- message: `Maximum of ${maxSpaces || defaultSpaces.STARTER} spaces created.`,- },- pro: {- showUpgradeLink: true,- message: `Maximum of ${maxSpaces || defaultSpaces.PROFESSIONAL} spaces created.`,- },- };-- return configs[userType];-};--export const CreateSpace: React.FC<Props> = ({- isOpen,- onSubmit,- editData,- parentTeam,- allTeams,- onClose = () => {},-}) => {- const [teamName, setTeamName] = useState('');- const [teamId, setTeamId] = useState('');- const queryClient = useQueryClient();- const { refreshUserData, isPremiumUser, isEnterpriseUser, isStarterUser, isProUser, userInfo } =- useAuthCtx();- const [quotaExceeded, setQuotaExceeded] = useState(false);-- const maxSpaces = Number(userInfo?.subs?.plan?.properties?.limits?.spaces) + 1;-- function planQuotaMessage(- userIsPremium: boolean,- userIsEnterprise: boolean,- userIsStarter: boolean,- userIsPro: boolean,- ) {- const type = userIsPremium- ? 'premium'- : userIsEnterprise- ? 'enterprise'- : userIsStarter- ? 'starter'- : userIsPro- ? 'pro'- : '';- return (- <>- {type && getPlanQuotaMessage(type, maxSpaces, MAX_SPACES).message}- {type && getPlanQuotaMessage(type, maxSpaces, MAX_SPACES).showUpgradeLink && (- <>- {' Please '}- <Link- to={ENTERPRISE_PLAN_REDIRECT}- target="_blank"- rel="noopener noreferrer"- className="underline text-blue-500 font-semibold"- >- Contact us- </Link>- {' to upgrade.'}- </>- )}- </>- );- }-- const createTeamMutation = useMutation({- mutationFn: (name: string) => subTeamsAPI.createSubTeam({ name, parentTeamId: parentTeam?.id }),- onSuccess: async (data) => {- const res = await data.json();- queryClient.invalidateQueries(['team_roles']);- onSubmit();- setTeamName('');- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_CREATED, {});- onClose(res?.team);- toast('Space created successfully');- setQuotaExceeded(false);- },- onError: (error: ErrorResponse) => {- console.error('Error creating team:', error); // eslint-disable-line no-console- if (error?.error?.errKey === errKeys.QUOTA_EXCEEDED) {- setQuotaExceeded(true);- onClose();- toast("You've reached the maximum space limit for your current plan."); // eslint-disable-line quotes- } else toast(error?.error?.message || 'Error creating team');- },- });- const updateTeamMutation = useMutation({- mutationFn: ({ id, name }: { id: string; name: string }) =>- subTeamsAPI.updateSubTeam({ id, name }),-- onSuccess: async () => {- queryClient.invalidateQueries(['team_roles']);- await refreshUserData(); // Refresh user data after creating a team- onSubmit();- setTeamName('');- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_UPDATED, {});- onClose();- toast('Space updated successfully');- },- onError: (error: ErrorResponse) => {- console.error('Error creating team:', error); // eslint-disable-line no-console- toast(error?.error?.message || 'Error updating team');- },- });-- useEffect(() => {- if (editData) {- setTeamName(editData.name);- setTeamId(editData.id);- }- }, [editData]);-- const handleSubmit = (e: FormEvent<HTMLFormElement>) => {- e.preventDefault();- if (allTeams) {- const isDuplicate = allTeams.some((team) => team.name === teamName);- if (isDuplicate) return toast('Team name already exists');- }- const trimmedTeamName = teamName.trim();- if (trimmedTeamName && !teamId) createTeamMutation.mutate(trimmedTeamName);- else if (teamId) updateTeamMutation.mutate({ id: teamId, name: trimmedTeamName });- };-- const handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {- const value = e.target.value.slice(0, 50);- setTeamName(value);- };-- return (- <Modal- panelWidthClasses="min-w-[460px]"- isOpen={isOpen}- onClose={onClose}- title={teamId ? 'Space Name' : 'Create a space'}- >- <div- className={- createTeamMutation.isLoading || updateTeamMutation.isLoading- ? 'opacity-80 pointer-events-none'- : ''- }- >- <form onSubmit={handleSubmit}>- {!teamId && (- <p className="text-xs pb-6">- Organize your team effortlessly. Collaborate, share Agents, and invite members.- </p>- )}- <div className={`mb-12 ${teamId ? 'mt-6' : ''}`}>- {!teamId && (- <label- htmlFor="space-name"- className="block mb-2 text-base font-medium text-[#1E1E1E] dark:text-white "- >- <>- <span>Space Name</span>- <span className="text-red-500">*</span>- </>- </label>- )}- <Input- type="text"- id="space-name"- className="bg-gray-white border border-gray-300 text-gray-900- text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block- w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400- dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"- placeholder="Enter space name.."- value={teamName}- onChange={handleInputChange}- maxLength={50}- required- fullWidth- disabled={createTeamMutation.isLoading || updateTeamMutation.isLoading}- />- <p className="absolute right-0 bottom-[-20px] text-xs text-gray-500">{`${teamName.length}/50`}</p>- </div>- {quotaExceeded && (- <div className="text-red-600 text-sm mb-2">- {planQuotaMessage(isPremiumUser, isEnterpriseUser, isStarterUser, isProUser)}- </div>- )}- <div className="flex justify-end">- <Button- disabled={- createTeamMutation.isLoading || updateTeamMutation.isLoading || !teamName.trim()- }- type="submit"- className={'w-[100px] h-[48px] rounded-lg'}- >- {(createTeamMutation.isLoading || updateTeamMutation.isLoading) && (- <div id="loader" className="circular-loader mr-1" />- )}- {teamId ? 'Save' : 'Create'}- </Button>- </div>- </form>- </div>- </Modal>- );-};diff --git a/packages/app/src/react/features/teams/components/common/index.ts b/packages/app/src/react/features/teams/components/common/index.tsdeleted file mode 100644index 739bec5b..00000000--- a/packages/app/src/react/features/teams/components/common/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from './app-table';-export * from './assign-member-modal';-export * from './create-space';diff --git a/packages/app/src/react/features/teams/components/members/header.tsx b/packages/app/src/react/features/teams/components/members/header.tsxdeleted file mode 100644index 58139708..00000000--- a/packages/app/src/react/features/teams/components/members/header.tsx+++ /dev/null@@ -1,89 +0,0 @@-import { ChangeEvent, Dispatch, FC, SetStateAction, useCallback } from 'react';-import { Link } from 'react-router-dom';--import { PendingInvite } from '@react/features/teams/hooks';-import HeaderSearch from '@react/shared/components/headerSearch';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { Tabs, TabsList, TabsTrigger } from '@react/shared/components/ui/tabs';-import { useAuthCtx } from '@react/shared/contexts/auth.context';--interface TeamMembersHeaderProps {- tab: string;- isReadOnlyAccess: boolean;- localPendingInvites: PendingInvite[];- setTab: Dispatch<SetStateAction<string>>;- setMembersSearchTerm: Dispatch<SetStateAction<string>>;- setInvitesSearchTerm: Dispatch<SetStateAction<string>>;- handleAddMemberClick: () => void;-}--export const TeamMembersHeader: FC<TeamMembersHeaderProps> = ({- tab,- isReadOnlyAccess,- localPendingInvites,- setTab,- setMembersSearchTerm,- setInvitesSearchTerm,- handleAddMemberClick,-}) => {- // Get page access permissions for team roles management- const { getPageAccess } = useAuthCtx();- const canViewTeamRoles = getPageAccess('/teams/roles')?.read;-- /**- * Handles search input changes based on current tab- * @param e - Change event from search input- */- const handleSearch = useCallback(- (e: ChangeEvent<HTMLInputElement>) => {- const value = e.target.value;- if (tab === 'members') {- setMembersSearchTerm(value);- } else {- setInvitesSearchTerm(value);- }- },- [tab, setMembersSearchTerm, setInvitesSearchTerm],- );-- /**- * Handles tab switching and clears search terms- * @param newTab - The new tab to switch to- */- const handleTabChange = useCallback(- (newTab: string) => {- setTab(newTab);- // Clear search terms when switching tabs- setMembersSearchTerm('');- setInvitesSearchTerm('');- },- [setTab, setMembersSearchTerm, setInvitesSearchTerm],- );-- return (- <div className="flex mb-4 justify-between flex-wrap flex-col sm:flex-row md:flex-nowrap sm:items-center gap-2.5">- <Tabs value={tab} onValueChange={handleTabChange}>- <TabsList className="mr-4 mb-0">- <TabsTrigger value="members">Team Members</TabsTrigger>- <TabsTrigger value="invites">Pending Invites({localPendingInvites.length})</TabsTrigger>- </TabsList>- </Tabs>- <HeaderSearch- key={`${tab}-search`}- handleChange={handleSearch}- handleClick={handleAddMemberClick}- label="Invite Member"- addIcon- search- placeholder={tab === 'members' ? 'Search Members' : 'Search Invites'}- isReadOnlyAccess={isReadOnlyAccess}- />- {/* Only show Manage Roles button if user has permission to view team roles */}- {canViewTeamRoles && (- <Link to="/teams/roles" className="min-w-fit">- <Button variant="secondary">Manage Roles</Button>- </Link>- )}- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/members/index.ts b/packages/app/src/react/features/teams/components/members/index.tsdeleted file mode 100644index 50668798..00000000--- a/packages/app/src/react/features/teams/components/members/index.ts+++ /dev/null@@ -1,5 +0,0 @@-export * from './header';-export * from './pending-invites-table-row';-export * from './row-table-members';-export * from './table';-export * from './team-members-container';diff --git a/packages/app/src/react/features/teams/components/members/pending-invites-table-row.tsx b/packages/app/src/react/features/teams/components/members/pending-invites-table-row.tsxdeleted file mode 100644index 887bd67a..00000000--- a/packages/app/src/react/features/teams/components/members/pending-invites-table-row.tsx+++ /dev/null@@ -1,95 +0,0 @@-import Tooltip from '@react/shared/components/_legacy/ui/tooltip/tooltip';-import { DeleteIcon, RedoIcon } from '@react/shared/components/svgs';-import { Spinner } from '@react/shared/components/ui/spinner';--// Pending Invites Table Row Component-export const PendingInvitesTableRow = ({- invite,- onResend,- onDelete,- loading,- deleting,- fadeOut,- isReadOnlyAccess,- hasPendingInviteForEmail,-}: {- invite: {- id: string;- email: string;- role: string;- expires: string;- status: string;- roleId?: number;- };- onResend: (invite: any) => void;- onDelete: (id: string) => void;- loading: boolean;- deleting: boolean;- fadeOut: boolean;- isReadOnlyAccess: boolean;- hasPendingInviteForEmail: (email: string) => boolean;-}) => {- const canShowResend =- !isReadOnlyAccess && invite.status === 'Expired' && !hasPendingInviteForEmail(invite.email);-- return (- <tr- className={`bg-white hover:bg-gray-50 border-b border-solid border-gray-200 last:border-b-0 text-base -mx-1 transition-opacity duration-500 ${- fadeOut ? 'opacity-0' : 'opacity-100'- }`}- >- <td className="px-6 h-14 font-normal">{invite.email}</td>- <td className="px-6 h-14 font-normal">{invite.role}</td>- <td className="px-6 h-14 font-normal">{invite.expires}</td>- <td className="px-2 h-14 font-normal">- {invite.status === 'Expired' ? (- <span className="bg-red-100 text-red-500 px-2 py-1 rounded-xl text-xs">Expired</span>- ) : invite.status === 'Accepted' ? (- <span className="bg-green-100 text-green-600 px-2 py-1 rounded-xl text-xs">Accepted</span>- ) : (- <span className="bg-blue-100 text-blue-500 px-2 py-1 rounded-xl text-xs">Pending</span>- )}- </td>- <td className="px-6 h-14 font-normal text-right flex items-center gap-2 justify-end">- {canShowResend && (- <Tooltip text="Resend" placement="top">- <button- className="text-gray-500 hover:text-gray-700 ml-2 mr-2 flex items-center justify-center"- title="Resend"- onClick={() => onResend(invite)}- type="button"- disabled={loading || deleting}- >- {loading ? (- <span className="flex items-center justify-center">- <Spinner classes="w-4 h-4" size="sm" />- </span>- ) : (- <RedoIcon className="h-4 w-4" color="#242424" />- )}- </button>- </Tooltip>- )}- {!isReadOnlyAccess && invite.status !== 'Accepted' && (- <Tooltip text="Delete" placement="top">- <button- className="text-gray-500 hover:text-gray-700 flex items-center justify-center"- title="Delete"- onClick={() => onDelete(invite.id)}- type="button"- disabled={loading || deleting}- >- {deleting ? (- <span className="flex items-center justify-center">- <Spinner classes="w-4 h-4" size="sm" />- </span>- ) : (- <DeleteIcon className="h-4 w-4" color="#242424" />- )}- </button>- </Tooltip>- )}- </td>- </tr>- );-};diff --git a/packages/app/src/react/features/teams/components/members/row-table-members.tsx b/packages/app/src/react/features/teams/components/members/row-table-members.tsxdeleted file mode 100644index 1310a826..00000000--- a/packages/app/src/react/features/teams/components/members/row-table-members.tsx+++ /dev/null@@ -1,190 +0,0 @@-import { useMutation } from '@tanstack/react-query';-import { Pencil, Trash2 } from 'lucide-react';-import { useState } from 'react';-import { createPortal } from 'react-dom';-import { toast } from 'react-toastify';--import { subTeamsAPI, teamAPI } from '@react/features/teams/clients';-import CreateMemberModal from '@react/features/teams/modals/create-member';-import Tooltip from '@react/shared/components/_legacy/ui/tooltip/tooltip';-import ConfirmModal from '@react/shared/components/ui/modals/ConfirmModal';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { queryClient } from '@react/shared/query-client';-import { apiResultsTypes } from '@react/shared/types';-import { SmythAPIError } from '@react/shared/types/api-results.types';-import { ITeam } from '@react/shared/types/entities';-import { extractError } from '@react/shared/utils/errors';-import { userSettingKeys } from '@shared/userSettingKeys';--type Props = {- teamMember: apiResultsTypes.TeamMemberWithRole;- setError: (error: string) => void; // eslint-disable-line no-unused-vars-};--export const MembersTableRow = ({ teamMember, setError }: Props) => {- const { userInfo, userTeams, getPageAccess } = useAuthCtx();- const { user } = userInfo || {};- const { data: userSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const pageAccess = getPageAccess('/teams/members');-- const editBtnTooltipText = !pageAccess?.write- ? "You do not have permission to edit user's Role." // eslint-disable-line quotes- : 'Edit Role';- const deleteBtnTooltipText = !pageAccess?.write- ? 'You do not have permission to remove user from team.'- : 'Remove User';-- const currTeam = userTeams.find((team: ITeam) => team.id === userSettings?.userSelectedTeam);-- const [isEditing, setIsEditing] = useState(false);- const [showDeleteMemberDialog, setShowDeleteMemberDialog] = useState(false);- const [isDeleting, setIsDeleting] = useState(false);-- const deleteMemberMutation = useMutation({- mutationFn: teamAPI.deleteTeamMember,-- onError: (error: SmythAPIError) => {- const _errorMessage =- error.status === 403 && extractError(error) === 'Forbidden'- ? 'You are not authorized to delete this member.'- : extractError(error) || 'An error occurred. Please try again later.';- setError(_errorMessage);- },- onSuccess: () => {- toast.success('Member deleted successfully');- queryClient.invalidateQueries({ queryKey: ['team_members_list'] });- },- });-- const deleteMemberHandler = async () => {- // Prevent multiple calls- if (isDeleting) return;-- setIsDeleting(true);- try {- if (currTeam.parentId) {- await subTeamsAPI.unassignMemberFromTeam({- teamId: currTeam.id,- memberId: teamMember.id.toString(),- roleId: teamMember.userTeamRole.sharedTeamRole.id,- });- toast.success('Member Unassigned from current space successfully');- } else {- await deleteMemberMutation.mutateAsync(teamMember.id);- }- // Close modal only after successful operation- setShowDeleteMemberDialog(false);- } catch (error) {- console.error(error); // eslint-disable-line no-console- } finally {- setIsDeleting(false);- }- };-- const shouldShowEditButtons =- user.userTeamRole.sharedTeamRole.canManageTeam &&- user?.id !== teamMember.id &&- !teamMember.userTeamRole.isTeamInitiator;- const tdClasses = 'px-6 h-14';-- return (- <>- <tr- className="bg-white hover:bg-gray-50 dark:bg-gray-800 dark:border-gray-700- border-b border-solid border-gray-200 last:border-b-0 text-base"- >- <th scope="row" className={tdClasses + ' flex items-center'}>- <img- src={teamMember.avatar || '/img/user_default.svg'}- onError={(e) => (e.currentTarget.src = '/img/user_default.svg')}- alt="avatar"- className="h-8 w-8 rounded-full object-cover inline-block"- />-- <span className="ml-2 text-gray-900 whitespace-nowrap dark:text-white font-normal capitalize">- {teamMember.name || teamMember?.email?.split?.('@')?.[0]}{' '}- {teamMember.id === user.id- ? '(You)'- : teamMember.userTeamRole.isTeamInitiator- ? '(Owner)'- : ''}- </span>- </th>- <td className={tdClasses + ' font-normal'}>{teamMember.email}</td>- <td className={tdClasses + ' font-normal'}>- {teamMember.userTeamRole.sharedTeamRole.name}- </td>- {/* {if it is the same user, dont show these edit buttons} */}- <td className={tdClasses + ' text-right'}>- {shouldShowEditButtons && (- <span className="inline-flex gap-4">- <Tooltip- text={editBtnTooltipText}- placement="top-right"- classes={pageAccess?.write ? 'w-28' : 'w-56'}- >- <Pencil- className="h-4 w-4 text-[#242424] cursor-pointer"- onClick={() => {- if (pageAccess?.write) setIsEditing(true);- }}- />- </Tooltip>- <Tooltip- text={deleteBtnTooltipText}- placement="top-right"- classes={pageAccess?.write ? 'w-28' : 'w-56'}- >- <Trash2- onClick={() => {- if (!deleteMemberMutation.isLoading && !isDeleting && pageAccess?.write)- setShowDeleteMemberDialog(true);- }}- className={`h-4 w-4 text-[#242424] ${- isDeleting || deleteMemberMutation.isLoading- ? 'opacity-50 cursor-not-allowed'- : 'cursor-pointer'- }`}- />- </Tooltip>- </span>- )}- </td>- </tr>-- {isEditing &&- createPortal(- <CreateMemberModal- editMode={true}- onClose={() => setIsEditing(false)}- key={teamMember.id}- editData={{- email: teamMember.email,- roleId: teamMember.userTeamRole.sharedTeamRole.id,- memberId: teamMember.id,- }}- />,- document.body,- )}-- {showDeleteMemberDialog &&- createPortal(- <ConfirmModal- onClose={() => {- if (!isDeleting) setShowDeleteMemberDialog(false);- }}- handleConfirm={deleteMemberHandler}- label="Remove"- message={- currTeam.parentId- ? 'Are you sure you want to unassign this member from the current space?'- : 'Are you sure you want to remove this member from this Organization?'- }- isLoading={isDeleting}- />,- document.body,- )}- </>- );-};diff --git a/packages/app/src/react/features/teams/components/members/table.tsx b/packages/app/src/react/features/teams/components/members/table.tsxdeleted file mode 100644index 3c3589b9..00000000--- a/packages/app/src/react/features/teams/components/members/table.tsx+++ /dev/null@@ -1,116 +0,0 @@-/* eslint-disable no-unused-vars, @typescript-eslint/no-explicit-any */--import { Dispatch, FC, SetStateAction, useMemo } from 'react';--import ApiErrorLine from '@react/features/error-pages/components/APIErrorLine';-import { AppTable } from '@react/features/teams/components/common';-import { MembersTableRow, PendingInvitesTableRow } from '@react/features/teams/components/members';-import { PendingInvite } from '@react/features/teams/hooks';-import { Tabs, TabsContent } from '@react/shared/components/ui/tabs';-import { TeamMemberWithRole } from '@react/shared/types/api-results.types';--// Type for members that extends the required AppTable row interface-interface TeamMemberWithStringId extends Omit<TeamMemberWithRole, 'id'> {- id: string;-}--interface MembersTableProps {- tab: string;- setTab: Dispatch<SetStateAction<string>>;- filteredMembersWithStringId: TeamMemberWithStringId[];- filteredPendingInvites: PendingInvite[];- handleError: (error: any) => void;- errorMessage: string;- handleErrorClose: () => void;- // Additional props for invite functionality- handleResendInvite: (invite: PendingInvite) => Promise<void>;- handleDeleteInvite: (id: string) => Promise<void>;- rowLoading: { [id: string]: boolean };- rowDeleting: { [id: string]: boolean };- rowFadeOut: { [id: string]: boolean };- isReadOnlyAccess: boolean;- hasPendingInviteForEmail: (email: string) => boolean;-}--export const MembersTable: FC<MembersTableProps> = ({- tab,- setTab,- filteredMembersWithStringId,- filteredPendingInvites,- handleError,- errorMessage,- handleErrorClose,- handleResendInvite,- handleDeleteInvite,- rowLoading,- rowDeleting,- rowFadeOut,- isReadOnlyAccess,- hasPendingInviteForEmail,-}) => {- // Table headers for members tab- const membersTableHeaders = useMemo(- () => [{ name: 'Name' }, { name: 'Email' }, { name: 'Role' }, { name: 'Actions' }],- [],- );-- // Table headers for invites tab- const invitesTableHeaders = useMemo(- () => [- { name: 'Email' },- { name: 'Role' },- { name: 'Expires' },- { name: '' }, // Status badge column, no heading- { name: 'Actions' },- ],- [],- );-- return (- <Tabs value={tab} onValueChange={setTab}>- <TabsContent value="members">- <div className="py-6">- <AppTable- rows={filteredMembersWithStringId || []}- pageSize={10}- renderRow={(member) => (- <MembersTableRow- teamMember={{ ...member, id: Number(member.id) }}- setError={handleError}- />- )}- isLoading={false}- tableHeaders={membersTableHeaders}- />- <div className="py-4">- {errorMessage && (- <ApiErrorLine fullWidth errorMsg={errorMessage} onClose={handleErrorClose} />- )}- </div>- </div>- </TabsContent>- <TabsContent value="invites">- <div className="py-6">- <AppTable- rows={filteredPendingInvites}- pageSize={10}- renderRow={(invite) => (- <PendingInvitesTableRow- invite={invite}- onResend={handleResendInvite}- onDelete={handleDeleteInvite}- loading={rowLoading[invite.id] || false}- deleting={rowDeleting[invite.id] || false}- fadeOut={rowFadeOut[invite.id] || false}- isReadOnlyAccess={isReadOnlyAccess}- hasPendingInviteForEmail={hasPendingInviteForEmail}- />- )}- isLoading={false}- tableHeaders={invitesTableHeaders}- />- </div>- </TabsContent>- </Tabs>- );-};diff --git a/packages/app/src/react/features/teams/components/members/team-members-container.tsx b/packages/app/src/react/features/teams/components/members/team-members-container.tsxdeleted file mode 100644index 25d45eec..00000000--- a/packages/app/src/react/features/teams/components/members/team-members-container.tsx+++ /dev/null@@ -1,114 +0,0 @@-/* eslint-disable no-unused-vars, @typescript-eslint/no-explicit-any */-import { Dispatch, FC, SetStateAction, useMemo } from 'react';--import { PendingInvite } from '@react/features/teams/hooks/useTeamInvitations';-import { TeamMemberWithRole } from '@react/shared/types/api-results.types';-import { TeamMembersHeader } from './header';-import { MembersTable } from './table';--// Type for members that extends the required AppTable row interface-interface TeamMemberWithStringId extends Omit<TeamMemberWithRole, 'id'> {- id: string;-}--interface TeamMembersContainerProps {- tab: string;- setTab: Dispatch<SetStateAction<string>>;- isReadOnlyAccess: boolean;- localPendingInvites: PendingInvite[];- teamMembers: TeamMemberWithRole[];- membersSearchTerm: string;- invitesSearchTerm: string;- setMembersSearchTerm: Dispatch<SetStateAction<string>>;- setInvitesSearchTerm: Dispatch<SetStateAction<string>>;- handleAddMemberClick: () => void;- handleError: (error: any) => void;- errorMessage: string;- handleErrorClose: () => void;- handleResendInvite: (invite: PendingInvite) => Promise<void>;- handleDeleteInvite: (id: string) => Promise<void>;- rowLoading: { [id: string]: boolean };- rowDeleting: { [id: string]: boolean };- rowFadeOut: { [id: string]: boolean };- hasPendingInviteForEmail: (email: string) => boolean;- getFilteredMembers: (members: TeamMemberWithRole[], searchTerm: string) => TeamMemberWithRole[];- getMembersWithStringId: (members: TeamMemberWithRole[]) => TeamMemberWithStringId[];- getFilteredInvites: (invites: PendingInvite[], searchTerm: string) => PendingInvite[];-}--/**- * Container component that combines header and table functionality for team members management- * @param props - Component props including data, handlers, and state- * @returns JSX element containing the complete team members interface- */-export const TeamMembersContainer: FC<TeamMembersContainerProps> = ({- tab,- setTab,- isReadOnlyAccess,- localPendingInvites,- teamMembers,- membersSearchTerm,- invitesSearchTerm,- setMembersSearchTerm,- setInvitesSearchTerm,- handleAddMemberClick,- handleError,- errorMessage,- handleErrorClose,- handleResendInvite,- handleDeleteInvite,- rowLoading,- rowDeleting,- rowFadeOut,- hasPendingInviteForEmail,- getFilteredMembers,- getMembersWithStringId,- getFilteredInvites,-}) => {- // Get filtered data using the provided functions- const filteredMembers = useMemo(- () => getFilteredMembers(teamMembers, membersSearchTerm),- [teamMembers, membersSearchTerm, getFilteredMembers],- );-- const filteredMembersWithStringId = useMemo(- () => getMembersWithStringId(filteredMembers),- [filteredMembers, getMembersWithStringId],- );-- const filteredPendingInvites = useMemo(- () => getFilteredInvites(localPendingInvites, invitesSearchTerm),- [localPendingInvites, invitesSearchTerm, getFilteredInvites],- );-- return (- <>- <TeamMembersHeader- tab={tab}- setTab={setTab}- isReadOnlyAccess={isReadOnlyAccess}- localPendingInvites={localPendingInvites}- setMembersSearchTerm={setMembersSearchTerm}- setInvitesSearchTerm={setInvitesSearchTerm}- handleAddMemberClick={handleAddMemberClick}- />-- <MembersTable- tab={tab}- setTab={setTab}- filteredMembersWithStringId={filteredMembersWithStringId}- filteredPendingInvites={filteredPendingInvites}- handleError={handleError}- errorMessage={errorMessage}- handleErrorClose={handleErrorClose}- handleResendInvite={handleResendInvite}- handleDeleteInvite={handleDeleteInvite}- rowLoading={rowLoading}- rowDeleting={rowDeleting}- rowFadeOut={rowFadeOut}- isReadOnlyAccess={isReadOnlyAccess}- hasPendingInviteForEmail={hasPendingInviteForEmail}- />- </>- );-};diff --git a/packages/app/src/react/features/teams/components/roles/acl-select-form.tsx b/packages/app/src/react/features/teams/components/roles/acl-select-form.tsxdeleted file mode 100644index 81bbfaf4..00000000--- a/packages/app/src/react/features/teams/components/roles/acl-select-form.tsx+++ /dev/null@@ -1,30 +0,0 @@-import { FC } from 'react';--import { AclSelectRow } from '@react/features/teams/components/roles';-import { AclAccessSymbols } from '@shared/constants/acl.constant';-import templateACLs from '@shared/constants/acl.constant.json';--export type HandleAclChange = { key: string; checked: boolean; ruleSymbol: AclAccessSymbols };-// eslint-disable-next-line no-unused-vars-type Props = { handleAclChange: (props: HandleAclChange) => void; currentAcls: object };-export const AclSelectForm: FC<Props> = ({ handleAclChange, currentAcls }) => {- return (- <div className="p-6 space-y-6 max-h-[400px] overflow-y-auto text-[#1E1E1E]">- <div className="flex justify-between">- <p className="font-semibold w-32">Access</p>- <p className="font-semibold w-11">View</p>- <p className="font-semibold w-11">Edit</p>- </div>-- {Object.keys(currentAcls)- .filter((aclKey) => !currentAcls[aclKey].internal && !templateACLs.page[aclKey]?.internal)- .map((aclKey) => (- <AclSelectRow- key={aclKey}- data={{ key: aclKey, ...currentAcls[aclKey] }}- handleAclChange={handleAclChange}- />- ))}- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/roles/acl-select-row.tsx b/packages/app/src/react/features/teams/components/roles/acl-select-row.tsxdeleted file mode 100644index 481b066c..00000000--- a/packages/app/src/react/features/teams/components/roles/acl-select-row.tsx+++ /dev/null@@ -1,52 +0,0 @@-/* eslint-disable max-len */-import { FC } from 'react';--import { HandleAclChange } from '@react/features/teams/components/roles';-import { AclAccessSymbols, AclRule } from '@shared/constants/acl.constant';--// eslint-disable-next-line no-unused-vars-type Props = { data: AclRule & { key: string }; handleAclChange: (props: HandleAclChange) => void };-export const AclSelectRow: FC<Props> = (props) => {- const aclRuleToBooleans = (aclRule: AclRule) => {- return { canView: aclRule.access.includes('r'), canEdit: aclRule.access.includes('w') };- };- const aclRuleBooleans = aclRuleToBooleans(props.data);-- const handleChange = (checked: boolean, ruleSymbol: AclAccessSymbols) => {- props.handleAclChange({ key: props.data.key, checked, ruleSymbol });- };-- return (- <div className="flex justify-between align-center">- <p className="text-gray-900 dark:text-white w-32">{props.data.name ?? props.data.key}</p>-- <label className="relative inline-flex items-center cursor-pointer">- <input- type="checkbox"- value=""- className="sr-only peer"- checked={aclRuleBooleans.canView}- onChange={(e) => handleChange(e.target.checked, 'r')}- />- <div className="w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600" />- <span className="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300" />- </label>-- <label className="relative inline-flex items-center cursor-pointer">- <input- type="checkbox"- value=""- className="sr-only peer"- checked={aclRuleBooleans.canEdit}- onChange={(e) => {- handleChange(e.target.checked, 'w');- if (!e.target.checked) return;- handleChange(e.target.checked, 'r');- }}- />- <div className="w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600" />- <span className="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300" />- </label>- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/roles/create-modal-role.tsx b/packages/app/src/react/features/teams/components/roles/create-modal-role.tsxdeleted file mode 100644index 214adaea..00000000--- a/packages/app/src/react/features/teams/components/roles/create-modal-role.tsx+++ /dev/null@@ -1,264 +0,0 @@-/* eslint-disable max-len */-import { extractError } from '@react/shared/utils/errors';-import { Analytics } from '@src/shared/posthog/services/analytics';-import { useMutation } from '@tanstack/react-query';-import React, { useState } from 'react';-import { toast } from 'react-toastify';--import { useOnboarding } from '@react/features/agents/contexts/OnboardingContext';-import useMutateOnboardingData from '@react/features/onboarding/hooks/useMutateOnboardingData';-import { teamAPI } from '@react/features/teams/clients';-import { AclSelectForm, HandleAclChange } from '@react/features/teams/components/roles';-import ToolTip from '@react/shared/components/_legacy/ui/tooltip/tooltip';-import { Input } from '@react/shared/components/ui/input';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { queryClient } from '@react/shared/query-client';-import { OnboardingTaskType } from '@react/shared/types/onboard.types';-import { AclAccessSymbols, CombinedAclRules } from '@shared/constants/acl.constant';-import templateAcls from '@shared/constants/acl.constant.json';-import { hasAnyAccess } from '@shared/utils';-import { UserSettingsKey } from '@src/backend/types/user-data';--type Props = {- onClose: () => void;- editMode?: boolean;- editData?: {- roleId: string;- existingAcls?: CombinedAclRules;- name: string;- permissions: { canManageTeam: boolean };- };-};--export const CreateRoleModal = (props: Props) => {- const [roleName, setRoleName] = React.useState(props.editData?.name ?? '');- const [errorMessage, setErrorMessage] = React.useState('');- const [currentAcls, setCurrentAcls] = useState({- ...templateAcls.page,- ...(props.editData?.existingAcls?.page ?? {}), // current applied acls (for edit)- });- const [rolePermissions, setRolePermissions] = React.useState<{ canManageTeam: boolean }>({- canManageTeam: props.editData?.permissions?.canManageTeam ?? false,- });- const saveUserSettingsMutation = useMutateOnboardingData();- const { setTaskCompleted } = useOnboarding();- const createRole = useMutation({- mutationFn: (currentAcls: object) => {- return teamAPI.createTeamRole({- acl: { page: currentAcls, api: {} },- canManageTeam: rolePermissions.canManageTeam,- name: roleName,- });- },-- onError: (error) =>- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to add a new role',- ),-- onSuccess: () => {- toast('Role created', { type: 'success' });- props.onClose();- queryClient.invalidateQueries({ queryKey: ['team_roles'] });- },- });-- // const { userTeams } = useAuthCtx();- // const { data: userSettings, isLoading: isUserSettingsLoading } = useGetUserSettings(- // userSettingKeys.USER_TEAM,- // );- // const currTeam = userTeams.find((team: ITeam) => team.id === userSettings?.userSelectedTeam);- // const organization = userTeams.filter((t) => t.parentId === null)[0];- // const canGiveSpaceAccess = currTeam?.id === organization?.id;-- const updateRole = useMutation({- mutationFn: (currentAcls: object) => {- return teamAPI.updateTeamRole({- acl: { page: currentAcls, api: {} },- canManageTeam: rolePermissions.canManageTeam,- name: roleName,- roleId: props.editData.roleId,- });- },-- onError: (error) =>- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to update this role',- ),-- onSuccess: () => {- toast('Role updated', { type: 'success' });- props.onClose();- queryClient.invalidateQueries({ queryKey: ['team_roles'] });- },- });-- const handleApiError = (error, defaultMsg, unauthorizedMsg) => {- const _errorMessage =- error.status === 403 ? unauthorizedMsg : extractError(error) || defaultMsg;- setErrorMessage(_errorMessage);- };-- const handleAclChange = ({ key, checked, ruleSymbol }: HandleAclChange) => {- setCurrentAcls((prev) => {- const newAccessParts = prev[key].access.split('');-- if (checked) {- if (!newAccessParts.includes(ruleSymbol)) newAccessParts.push(ruleSymbol);- } else {- const ruleIndex = newAccessParts.indexOf(ruleSymbol);- newAccessParts.splice(ruleIndex, 1);- }- return {- ...prev,- [key]: { ...prev[key], access: newAccessParts.sort().join('') as AclAccessSymbols },- };- });- };-- const handleSubmit = async () => {- if (props.editMode) await updateRole.mutateAsync(currentAcls);- else {- if (!hasAnyAccess(currentAcls)) {- return toast('Please select access for role', { type: 'info' });- }-- saveUserSettingsMutation.mutate({- key: UserSettingsKey.OnboardingTasks,- data: {- [OnboardingTaskType.SETUP_TEAM_ROLES]: true,- [OnboardingTaskType.COMPLETED_TASK]: OnboardingTaskType.SETUP_TEAM_ROLES,- },- operation: 'insertOrUpdate',- });- setTaskCompleted(OnboardingTaskType.SETUP_TEAM_ROLES);- await createRole.mutateAsync(currentAcls);- Analytics.track(`onboarding_task_${OnboardingTaskType.SETUP_TEAM_ROLES}`);- }- };-- return (- <div- id="defaultModal"- // @ts-expect-error - TODO: fix this- tabIndex="-1"- className="fixed top-0 left-0 right-0 z-50 w-full p-4- overflow-x-hidden overflow-y-auto md:inset-0 h-screen max-h-full- flex justify-center items-center bg-black bg-opacity-50"- onClick={props.onClose}- >- <div className="relative w-full max-w-xl max-h-full" onClick={(e) => e.stopPropagation()}>- <div className="relative bg-white rounded-lg shadow dark:bg-gray-700">- <div className="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">- <h3 className="text-xl font-semibold text-[#1E1E1E] dark:text-white">- {props.editMode ? 'Edit Role' : 'Create Role'}- </h3>- <button- type="button"- className="text-[#1E1E1E] bg-transparent hover:bg-gray-200 hover:text-gray-900- rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center- dark:hover:bg-gray-600 dark:hover:text-white"- onClick={props.onClose}- >- <svg- className="w-3 h-3"- aria-hidden="true"- xmlns="http://www.w3.org/2000/svg"- fill="none"- viewBox="0 0 14 14"- >- <path- stroke="currentColor"- strokeLinecap="round"- strokeLinejoin="round"- strokeWidth="2"- d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"- />- </svg>- <span className="sr-only">Close modal</span>- </button>- </div>- <div className=" px-6 pt-6 pb-0">- <div className="mb-6 space-y-6">- <Input- fullWidth- type="text"- id="role-name-input"- label="Role Name"- labelClassName="mb-1 text-base font-medium text-[#1E1E1E]"- placeholder="e.g. Admin"- value={roleName}- onChange={(e) => {- setRoleName(e.target.value);- }}- required- />- </div>-- <div className="flex mb-8 mt-6 justify-around">- <div className="flex items-center space-x-2">- <label className="relative inline-flex items-center cursor-pointer">- <input- type="checkbox"- value=""- className="sr-only peer"- checked={rolePermissions.canManageTeam}- onChange={(e) => {- setRolePermissions((prev) => ({ ...prev, canManageTeam: e.target.checked }));- }}- />- <div className="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600" />- <span className="ml-3 text-base font-medium text-[#1E1E1E] dark:text-gray-300">- Manage Team- </span>- </label>- </div>- </div>- </div>-- <div className="px-6 pb-0 pt-0">- {(createRole.isError || updateRole.isError) && errorMessage && (- <p className="text-red-500">{errorMessage}</p>- )}- </div>-- <AclSelectForm handleAclChange={handleAclChange} currentAcls={currentAcls} />-- <ToolTip- text={[- 'Please',- roleName.length === 0 ? 'add a name' : '',- roleName.length === 0 && !hasAnyAccess(currentAcls) ? 'and' : '',- !hasAnyAccess(currentAcls) ? 'enable at least one access' : '',- `to ${props.editMode ? 'update' : 'create'} this role.`,- ].join(' ')}- classes="w-40"- placement="top"- tooltipWrapperClasses={'w-full'}- showTooltip={roleName.length === 0 || !hasAnyAccess(currentAcls)}- >- <div className="w-full flex items-center justify-end p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">- <Button- label={props.editMode ? 'Update' : 'Create'}- variant="primary"- handleClick={handleSubmit}- disabled={- createRole.isLoading ||- roleName.length === 0 ||- !hasAnyAccess(currentAcls) ||- updateRole.isLoading- }- type="button"- className="h-[48px] px-8 rounded-lg"- />- </div>- </ToolTip>- </div>- </div>- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/roles/index.ts b/packages/app/src/react/features/teams/components/roles/index.tsdeleted file mode 100644index a519e5c7..00000000--- a/packages/app/src/react/features/teams/components/roles/index.ts+++ /dev/null@@ -1,4 +0,0 @@-export * from './acl-select-form';-export * from './acl-select-row';-export * from './create-modal-role';-export * from './row-table-roles';diff --git a/packages/app/src/react/features/teams/components/roles/row-table-roles.tsx b/packages/app/src/react/features/teams/components/roles/row-table-roles.tsxdeleted file mode 100644index aabeb6f2..00000000--- a/packages/app/src/react/features/teams/components/roles/row-table-roles.tsx+++ /dev/null@@ -1,229 +0,0 @@-import { useMutation } from '@tanstack/react-query';-import { Avatar, AvatarGroup } from 'flowbite-react';-import { Pencil, Trash2 } from 'lucide-react';-import { ChangeEvent, FC, useMemo, useState } from 'react';-import { createPortal } from 'react-dom';-import { toast } from 'react-toastify';--import { teamAPI } from '@react/features/teams/clients';-import { CreateRoleModal } from '@react/features/teams/components/roles';-import { useStoreTeamSettings } from '@react/features/teams/hooks';-import ToolTip from '@react/shared/components/_legacy/ui/tooltip/tooltip';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { queryClient } from '@react/shared/query-client';-import { apiResultsTypes } from '@react/shared/types';-import { extractError } from '@react/shared/utils/errors';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';--type Props = {- data: apiResultsTypes.TeamRoleWithMembers;- canManage: boolean;- teamMembers: apiResultsTypes.TeamMemberWithRole[] | null;- isDefaultRole: boolean;- setError: (error: string) => void; // eslint-disable-line no-unused-vars-};--export const RolesTableRow: FC<Props> = ({ data: role, canManage, setError, isDefaultRole }) => {- const { userInfo, hasReadOnlyPageAccess } = useAuthCtx();- const user = userInfo?.user;- const { data: userSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const [isEditing, setIsEditing] = useState(false);- const isReadOnlyAccess = hasReadOnlyPageAccess('/teams/roles');-- const editBtnTooltipText = isReadOnlyAccess- ? 'You do not have permission to edit Team Role.'- : 'Edit Role';- const deleteBtnTooltipText = isReadOnlyAccess- ? 'You do not have permission to remove Team Role.'- : 'Remove Team Role';-- const saveTeamSettingsMutation = useStoreTeamSettings(teamSettingKeys.DEFAULT_ROLE);-- const deleteRoleMutation = useMutation({- mutationFn: teamAPI.deleteTeamRole,-- onError: (error: apiResultsTypes.SmythAPIError) => {- const _errorMessage =- error.status === 403 && extractError(error) === 'Forbidden'- ? 'You are not authorized to delete this role.'- : extractError(error) || 'An error occurred. Please try again later.';- setError(_errorMessage);- },- onSuccess: () => {- toast('Role deleted', { type: 'success' });- queryClient.invalidateQueries({ queryKey: ['team_roles'] });- },- });-- const deleteRoleHandler = async () => {- if (!isReadOnlyAccess) await deleteRoleMutation.mutateAsync(role.id);- };-- const roleMembers = useMemo(() => {- if (!role?.userTeamRole) return [];- return role?.userTeamRole- ?.filter((userRole) => userRole.user.id !== user.id)- .map((userRole) => userRole.user);- }, [role.userTeamRole, user]);-- const handleDefaultRoleChange = (event: ChangeEvent<HTMLInputElement>) => {- if (!event.target.checked) return;-- const currentTeamId = userSettings?.userSelectedTeam;- if (!currentTeamId) return;-- saveTeamSettingsMutation.mutate(- {- key: teamSettingKeys.DEFAULT_ROLE,- data: { defaultRoles: { [currentTeamId]: { name: role.name, id: role.id } } },- operation: 'insertOrUpdate',- },- {- onSuccess: () => {- queryClient.setQueryData(['teamSettings', teamSettingKeys.DEFAULT_ROLE], {- data: { defaultRoles: { [currentTeamId]: { name: role.name, id: role.id } } },- });- toast.success('Default role updated successfully');- },- onError: () => setError('Failed to update default role'),- },- );- };- const tdClasses = 'px-6 h-14';- const colArray = ['bg-cyan-400', 'bg-orange-700', 'bg-purple-700', 'bg-cyan-500', 'bg-amber-500'];- return (- <>- <tr- className="bg-white dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50- border-b text-base font-normal border-solid border-gray-100 last:border-b-0"- >- <th- scope="row"- className="px-6 py-4 font-normal text-gray-900 whitespace-nowrap dark:text-white"- >- {role.name}- </th>-- <td className={tdClasses}>- {/* Members */}- {role?.userTeamRole && role.userTeamRole?.length > 0 ? (- <div className="flex flex-wrap gap-2">- <AvatarGroup>- {roleMembers?.slice(0, 4)?.map?.((member) => {- return (- <ToolTip- key={member.id}- text={[member.name, member.email]}- classes="text-nowrap mb-1"- isMultiLine={true}- >- <Avatar- key={member.id}- img={member.avatar}- rounded- stacked- className="w-8 h-8"- size="sm"- theme={{- root: {- base: 'rounded-full w-8 h-8 relative overflow-hidden bg-gray-100 dark:bg-gray-600',- },- }}- />- </ToolTip>- );- })}-- {roleMembers?.length > 4 && (- <Avatar.Counter- className={`w-8 h-8 z-50 pointer-events-none bg-orange-500 ${- colArray[Math.floor(Math.random() * colArray.length)]- }`}- total={roleMembers?.length - 4}- href="#"- theme={{- base: 'relative flex items-center justify-center text-xs font-medium text-white rounded-full',- }}- />- )}- </AvatarGroup>- </div>- ) : (- 'No Member'- )}- </td>-- <td className={tdClasses}>- {role.canManageTeam ? (- <span className="inline-flex text-[#2AAD8E]">Yes</span>- ) : (- <span className="inline-flex text-[#F35063]">No</span>- )}- </td>- <td className={tdClasses}>- <div className="flex items-center">- <input- id="default-role"- type="radio"- checked={isDefaultRole}- onChange={!isReadOnlyAccess ? handleDefaultRoleChange : undefined}- name="default-role"- disabled={isReadOnlyAccess}- className={`w-4 h-4 accent-gray-800 text-gray-800 focus:ring-gray-800 ${- isReadOnlyAccess ? 'cursor-not-allowed opacity-50' : ''- }`}- />- </div>- </td>- <td className={tdClasses + ' text-right'}>- <span className="inline-flex gap-4">- {canManage && !role.isOwnerRole && !role.acl?.default_role && (- <>- <ToolTip- text={editBtnTooltipText}- placement="top-right"- classes={isReadOnlyAccess ? 'w-56' : 'w-28'}- >- <Pencil- className="h-4 w-4 text-[#242424] cursor-pointer"- onClick={() => {- if (!isReadOnlyAccess) setIsEditing(true);- }}- />- </ToolTip>- <ToolTip- text={deleteBtnTooltipText}- placement="top-right"- classes={isReadOnlyAccess ? 'w-56' : 'w-40'}- >- <Trash2- onClick={deleteRoleHandler}- className="h-4 w-4 text-[#242424] cursor-pointer"- />- </ToolTip>- </>- )}- </span>- </td>- </tr>-- {isEditing &&- createPortal(- <CreateRoleModal- editMode={true}- onClose={() => setIsEditing(false)}- key={role.id}- editData={{- roleId: role.id,- name: role.name,- existingAcls: role.acl,- permissions: { canManageTeam: role.canManageTeam },- }}- />,- document.body,- )}- </>- );-};diff --git a/packages/app/src/react/features/teams/components/settings/company-logo.tsx b/packages/app/src/react/features/teams/components/settings/company-logo.tsxdeleted file mode 100644index 14de203d..00000000--- a/packages/app/src/react/features/teams/components/settings/company-logo.tsx+++ /dev/null@@ -1,79 +0,0 @@-import { ChangeEvent, FC, RefObject } from 'react';-import { FiUpload } from 'react-icons/fi';--import { Spinner } from '@react/shared/components/ui/spinner';-import { SMYTHOS_DOCS_URL } from '@src/shared/constants/general';--interface CompanyLogoProps {- canUseWhiteLabel: boolean;- logo: string;- teamsAccess: { write: boolean };- fileInputRef: RefObject<HTMLInputElement>;- handleLogoChange: (event: ChangeEvent<HTMLInputElement>) => void; // eslint-disable-line no-unused-vars- isUploadingLogo: boolean;-}--export const CompanyLogo: FC<CompanyLogoProps> = (props) => {- const { canUseWhiteLabel, logo, teamsAccess, fileInputRef, handleLogoChange, isUploadingLogo } =- props;-- return (- <div className="my-8 border border-solid border-gray-200 rounded-lg overflow-hidden">- <h3 className="text-xl font-medium bg-gray-50 px-8 py-4">Company Branding</h3>-- <div className="flex items-center justify-between gap-4 px-8 py-4">- {canUseWhiteLabel ? (- <>- <div className="w-16 h-16 bg-white rounded-lg flex items-center justify-center overflow-hidden">- {logo ? (- <div className="w-full h-full border border-solid border-gray-300 p-1.5 rounded-lg">- <img src={logo} alt="Company logo" className="w-full h-full object-contain" />- </div>- ) : (- <div className="w-full h-full border border-solid border-gray-300 p-1.5 rounded-lg">- <div className="w-full h-full bg-gray-200 rounded-md" />- </div>- )}- </div>- {teamsAccess.write ? (- <>- <input- type="file"- ref={fileInputRef}- onChange={handleLogoChange}- accept="image/*"- className="hidden"- />- <button- onClick={() => fileInputRef.current?.click()}- className="px-4 py-2 bg-white hover:bg-gray-50 rounded-lg- border border-solid border-[#757575] flex items-center gap-2"- disabled={isUploadingLogo}- >- {isUploadingLogo ? <Spinner classes="w-4 h-4" /> : <FiUpload color="#404040" />}- <span className="text-gray-600">Change logo</span>- </button>- </>- ) : null}- </>- ) : (- <div className="text-gray-600">- To access space customization and{' '}- <a- href={`${SMYTHOS_DOCS_URL}/account-management/spaces-management/#branding-your-space`}- target="_blank"- className="text-blue-500 hover:underline"- >- whitelabeling- </a>{' '}- features,{' '}- <a href="/plans" className="text-blue-500 hover:underline">- upgrade- </a>{' '}- to Scaleup or Enterprise license.- </div>- )}- </div>- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/settings/index.ts b/packages/app/src/react/features/teams/components/settings/index.tsdeleted file mode 100644index 10d63a50..00000000--- a/packages/app/src/react/features/teams/components/settings/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from './modal';-export * from './team-info';-export * from './company-logo';diff --git a/packages/app/src/react/features/teams/components/settings/members.tsx b/packages/app/src/react/features/teams/components/settings/members.tsxdeleted file mode 100644index dc92edb5..00000000--- a/packages/app/src/react/features/teams/components/settings/members.tsx+++ /dev/null@@ -1,230 +0,0 @@-import classNames from 'classnames';-import { AiOutlineSortAscending, AiOutlineSortDescending } from 'react-icons/ai';-import { FaPencil, FaTrashCan } from 'react-icons/fa6';--import { SpaceMember } from '@react/features/teams/pages/space-settings';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { Spinner } from '@react/shared/components/ui/spinner';-import { useAuthCtx } from '@src/react/shared/contexts/auth.context';-import { ChangeEvent, FC, useEffect, useState } from 'react';--interface MembersProps {- handleSearch: (event: ChangeEvent<HTMLInputElement>) => void; // eslint-disable-line no-unused-vars- handleSortChange: (event: ChangeEvent<HTMLSelectElement>) => void; // eslint-disable-line no-unused-vars- toggleSortDirection: () => void;- searchTerm: string;- sortBy: string;- sortDirection: string;- paginatedMembers: any[]; // eslint-disable-line @typescript-eslint/no-explicit-any- handleDeleteMember: (member: SpaceMember) => void; // eslint-disable-line no-unused-vars- handleEditMember: (member: SpaceMember) => void; // eslint-disable-line no-unused-vars-}--const ROWS_PER_PAGE = 4;--export const Members: FC<MembersProps> = (props) => {- const {- sortBy,- searchTerm,- sortDirection,- paginatedMembers,- handleSearch,- handleSortChange,- handleEditMember,- handleDeleteMember,- toggleSortDirection,- } = props;-- const [currentPage, setCurrentPage] = useState(1);- const { userInfo, getPageAccess } = useAuthCtx();- const [totalPages, setTotalPages] = useState(1);-- const membersAccess = getPageAccess('/teams/members');-- useEffect(() => {- const calculatedTotalPages = Math.max(1, Math.ceil(paginatedMembers.length / ROWS_PER_PAGE));- setTotalPages(calculatedTotalPages);- if (currentPage > calculatedTotalPages) setCurrentPage(calculatedTotalPages);- }, [paginatedMembers.length, searchTerm, currentPage]);-- return (- <div- className="w-full md:w-3/4 bg-white rounded-lg p-6 mb-4 border border-solid border-gray-200 flex flex-col"- style={{ height: '500px' }}- >- <div className="flex justify-between items-center mb-4 gap-2">- <h2 className="text-xl font-semibold">Members</h2>- <div className="flex">- <div className="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">- <img className="search-icon" src="/img/home.icons/search.svg" />- </div>- <input- type="text"- placeholder="Member, role access"- className="mr-2 p-2 pl-10 border rounded-md placeholder:text-base placeholder:text-gray-500"- onChange={handleSearch}- value={searchTerm}- />- <select- className="mr-2 p-2 px-3 border rounded-md pr-10"- onChange={handleSortChange}- value={sortBy}- >- <option value="name">Sort by Name</option>- <option value="email">Sort by Email</option>- <option value="role">Sort by Role</option>- </select>- <Button handleClick={toggleSortDirection}>- {sortDirection === 'asc' ? (- <AiOutlineSortAscending size={20} />- ) : (- <AiOutlineSortDescending size={20} />- )}- </Button>- </div>- </div>- <div className="flex-grow">- <table className="w-full text-left">- <thead className="bg-gray-100">- <tr>- <th className="text-left py-2 px-4 w-4/12">Name</th>- <th className="text-left py-2 px-4 w-4/12">Email</th>- <th className="text-left py-2 px-4 w-3/12">Role</th>- <th className="text-left py-2 px-4 w-1/12">Action</th>- </tr>- </thead>- <tbody>- {paginatedMembers- .slice((currentPage - 1) * ROWS_PER_PAGE, currentPage * ROWS_PER_PAGE)- .map((member, index) => (- <tr- key={index}- className={classNames(- 'transition-all duration-300 border-b overflow-hidden h-[72px]',- )}- >- <td className="py-2 px-4">- <div className="flex items-center">- {member.avatar ? (- <img- src={member.avatar}- alt={member.name || ''}- className="w-8 h-8 rounded-full mr-2"- />- ) : (- <div className="w-8 h-8 bg-gray-200 rounded-full mr-2 flex items-center justify-center">- {(member.name || member.email).charAt(0).toUpperCase()}- </div>- )}- <span className="truncate capitalize">- {member.name || member.email?.split?.('@')?.[0]}- </span>- </div>- </td>- <td className="py-2 px-4 truncate">{member.email}</td>- <td className="py-2 px-4 truncate">{member.userTeamRole.sharedTeamRole.name}</td>- <td className="py-2 px-4">- {member.email !== userInfo?.user?.email && (- <div className="flex items-center">- <button- className={classNames(- 'py-2 px-1 mr-2 text-sm rounded-lg text-gray-300 hover:text-v2-blue hover:bg-gray-50',- {- hidden: !membersAccess.write || member?.userTeamRole?.isTeamInitiator,- },- )}- type="button"- onClick={() => handleDeleteMember(member)}- >- {member.isInProgress ? (- <Spinner classes="w-6 h-6 mr-2" />- ) : (- <FaTrashCan />- )}- </button>- <button- className={classNames(- 'py-2 px-1 mr-2 text-sm rounded-lg text-gray-300 hover:text-v2-blue hover:bg-gray-50',- {- hidden: !membersAccess.write || member?.userTeamRole?.isTeamInitiator,- },- )}- type="button"- onClick={() => handleEditMember(member)}- >- <FaPencil />- </button>- </div>- )}- </td>- </tr>- ))}- {Array.from({- length:- ROWS_PER_PAGE -- paginatedMembers.slice(- (currentPage - 1) * ROWS_PER_PAGE,- currentPage * ROWS_PER_PAGE,- ).length,- }).map((_, index) => (- <tr key={`empty-${index}`} className="h-[72px]">- <td colSpan={4} />- </tr>- ))}- </tbody>- </table>- </div>-- {Math.ceil(paginatedMembers.length / ROWS_PER_PAGE) > 1 && (- <div className="mt-4 flex items-center justify-between border-t pt-4">- <div className="text-sm text-gray-500">- Showing {Math.min((currentPage - 1) * ROWS_PER_PAGE + 1, paginatedMembers.length)} to{' '}- {Math.min(currentPage * ROWS_PER_PAGE, paginatedMembers.length)} of{' '}- {paginatedMembers.length} entries- </div>-- <div className="flex items-center space-x-2">- <button- onClick={() => setCurrentPage((prev) => Math.max(prev - 1, 1))}- disabled={currentPage === 1}- className={classNames(- 'px-3 py-1 rounded border',- currentPage === 1- ? 'bg-gray-100 text-gray-400 cursor-not-allowed'- : 'bg-white hover:bg-gray-50',- )}- >- Previous- </button>-- {Array.from({ length: totalPages }, (_, idx) => (- <button- key={idx}- onClick={() => setCurrentPage(idx + 1)}- className={classNames('px-3 py-1 rounded border', {- 'bg-v2-blue text-white': idx + 1 === currentPage,- 'bg-white hover:bg-gray-50': idx + 1 !== currentPage,- })}- >- {idx + 1}- </button>- ))}-- <button- onClick={() => setCurrentPage((prev) => Math.min(prev + 1, totalPages))}- disabled={currentPage === totalPages}- className={classNames(- 'px-3 py-1 rounded border',- currentPage === totalPages- ? 'bg-gray-100 text-gray-400 cursor-not-allowed'- : 'bg-white hover:bg-gray-50',- )}- >- Next- </button>- </div>- </div>- )}- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/settings/modal.tsx b/packages/app/src/react/features/teams/components/settings/modal.tsxdeleted file mode 100644index cf7ac129..00000000--- a/packages/app/src/react/features/teams/components/settings/modal.tsx+++ /dev/null@@ -1,33 +0,0 @@-import { FC } from 'react';--import Modal from '@react/shared/components/ui/modals/Modal';-import { Button } from '@react/shared/components/ui/newDesign/button';--interface SettingsModalProps {- onClose: () => void;- open: boolean;- title: string;- description: string;- onConfirm: () => void;- isLoading: boolean;- btnText: string;-}--export const SettingsModal: FC<SettingsModalProps> = (props) => {- const { onClose, open, title, description, onConfirm, isLoading, btnText } = props;- if (!open) return null;- return (- <Modal onClose={onClose} isOpen={open} title={title} panelClasses="min-w-[460px] md:min-w-[550px]">- <p className="text-base text-[#1E1E1E] font-light pt-3 pb-5">{description}</p>- <Button- className="ml-auto h-[48px] rounded-lg"- handleClick={onConfirm}- label={btnText}- addIcon- Icon={<img className="mr-2" src="/img/icons/Delete-White.svg" />}- disabled={isLoading}- isDelete- />- </Modal>- );-};diff --git a/packages/app/src/react/features/teams/components/settings/team-info.tsx b/packages/app/src/react/features/teams/components/settings/team-info.tsxdeleted file mode 100644index 699aad1e..00000000--- a/packages/app/src/react/features/teams/components/settings/team-info.tsx+++ /dev/null@@ -1,31 +0,0 @@-import classNames from 'classnames';-import { FC } from 'react';-import { AiOutlineEdit } from 'react-icons/ai';--interface TeamInfoProps {- teamName: string;- canDeleteSpace: boolean;- setIsEditing: (isEditing: boolean) => void; // eslint-disable-line no-unused-vars-}--export const TeamInfo: FC<TeamInfoProps> = ({ teamName, canDeleteSpace, setIsEditing }) => {- return (- <div className="bg-white rounded-lg p-6 mb-4 overflow-hidden border border-solid border-gray-200">- <div className="absolute h-[60px] w-full inset-0 bg-v2-blue" />- <div- className="w-16 h-16 bg-blue-600 rounded-full flex items-center justify-center- text-white text-3xl mb-4"- >- {teamName?.slice(0, 2).toUpperCase()}- </div>- <div className="text-xl font-semibold mb-2 mt-8 break-all">- <h2 className="inline-block w-[calc(100%-24px)]">{teamName}</h2>- {canDeleteSpace && (- <button className={classNames('align-middle')} data-qa="edit-space-name-button" onClick={() => setIsEditing(true)}>- <AiOutlineEdit className="mr-1" />- </button>- )}- </div>- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/teams/assign-team-dropdown.tsx b/packages/app/src/react/features/teams/components/teams/assign-team-dropdown.tsxdeleted file mode 100644index bb6de50b..00000000--- a/packages/app/src/react/features/teams/components/teams/assign-team-dropdown.tsx+++ /dev/null@@ -1,149 +0,0 @@-/* eslint-disable max-len */-/* eslint-disable no-unused-vars */-import classNames from 'classnames';-import { FC, FocusEvent, useEffect, useRef, useState } from 'react';-import { FaAngleDown } from 'react-icons/fa6';--type Option = { id: string; name: string };--interface AssignTeamDropdownProps {- options: Option[];- onChange: (value: string) => void;- onInputChange?: (value: string) => void;- inputValue?: string;- useInputValue?: boolean;- value: string;- disabled?: boolean;- placeholder: string;- dropDownClasses?: string;- onBlur?: (value: string) => void;- isEmailDropdown?: boolean;-}--export const AssignTeamDropdown: FC<AssignTeamDropdownProps> = ({- options = [],- onChange,- onInputChange,- inputValue,- useInputValue,- value,- placeholder,- disabled,- dropDownClasses,- onBlur,- isEmailDropdown,-}) => {- const [isOpen, setIsOpen] = useState(false);- const dropdownRef = useRef<HTMLDivElement>(null);- const [searchValue, setSearchValue] = useState(value || '');-- const handleOptionClick = (optionId: string) => {- onChange(optionId);- setIsOpen(false);- setSearchValue(options?.find((option) => option.id === optionId).name);- onInputChange?.(options?.find((option) => option.id === optionId).name);- };-- const toggleDropdown = () => setIsOpen(!isOpen);-- useEffect(() => {- const handleClickOutside = (event: MouseEvent) => {- if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {- setIsOpen(false);- }- };-- document.addEventListener('mousedown', handleClickOutside);- return () => document.removeEventListener('mousedown', handleClickOutside);- }, []);- useEffect(() => {- if (value) {- onChange(value);- setSearchValue(options?.find((option) => option.id === value)?.name || '');- }- }, [value, options]); // eslint-disable-line react-hooks/exhaustive-deps-- const handleBlur = (e: FocusEvent<HTMLInputElement>) => {- if (onBlur) onBlur(e.target.value);- };-- return (- <div className="relative inline-block text-left w-full my-2" ref={dropdownRef}>- <div>- <input- autoComplete="off"- type="text"- className={classNames(- `- h-9 w-full bg-white- border- text-gray-900- rounded- block- outline-none- focus:outline-none- focus:ring-0- focus:ring-offset-0- focus:ring-shadow-none- text-sm- font-normal- placeholder:text-sm- placeholder:font-normal`,- 'pl-2 pr-6 py-2',- 'border-gray-300 border-b-gray-500 focus:border-b-2 focus:border-b-blue-500 focus-visible:border-b-2 focus-visible:border-b-blue-500',- { 'bg-gray-100': disabled },- )}- disabled={disabled}- id="options-menu"- aria-haspopup="true"- aria-expanded="true"- onClick={toggleDropdown}- onChange={(e) => {- setSearchValue(e.target.value);- onInputChange(e.target.value);- }}- value={useInputValue ? inputValue : searchValue}- // value={searchValue}- placeholder={placeholder}- onBlur={handleBlur}- data-qa={isEmailDropdown ? 'create-new-space-email-dropdown' : 'role-dropdown'}- />- <FaAngleDown className="absolute right-2 top-[calc(50%_-_8px)] transition duration-300 pointer-events-none" />- </div>-- {isOpen && (- <div- className={classNames(- 'absolute right-0 z-10 mt-2 w-full origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none',- dropDownClasses,- )}- >- <div- className="py-1"- role="menu"- aria-orientation="vertical"- aria-labelledby="options-menu"- >- {options- ?.filter((option) => option.name.toLowerCase().includes(searchValue.toLowerCase()))- .concat(- options.filter(- (option) => !option.name.toLowerCase().includes(searchValue.toLowerCase()),- ),- )- .map((option) => (- <button- key={option.id}- className="block w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 text-left"- role="menuitem"- onClick={() => handleOptionClick(option.id)}- >- {option.name}- </button>- ))}- </div>- </div>- )}- </div>- );-};diff --git a/packages/app/src/react/features/teams/components/teams/index.ts b/packages/app/src/react/features/teams/components/teams/index.tsdeleted file mode 100644index 48bcc67f..00000000--- a/packages/app/src/react/features/teams/components/teams/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from './assign-team-dropdown';-export * from './invite-member-warning';-export * from './row-table';diff --git a/packages/app/src/react/features/teams/components/teams/invite-member-warning.tsx b/packages/app/src/react/features/teams/components/teams/invite-member-warning.tsxdeleted file mode 100644index 37061e96..00000000--- a/packages/app/src/react/features/teams/components/teams/invite-member-warning.tsx+++ /dev/null@@ -1,167 +0,0 @@-/* eslint-disable max-len */-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { cn } from '@src/react/shared/utils/general';-import { useQuery, useQueryClient } from '@tanstack/react-query';-import { useEffect, useState } from 'react';-import { teamAPI } from '../../clients';-import { useTeamInvitations } from '../../hooks/useTeamInvitations';-import { useTeamMembers } from '../../hooks/useTeamMembers';--export const InviteMemberWarning = ({- classes,- newMemberCount,-}: {- classes?: string;- newMemberCount?: number;-}) => {- const { userInfo, parentTeamMembers, currentUserTeamMembers, currentUserTeam } = useAuthCtx();- const queryClient = useQueryClient();-- // Force refetch team invitations when component mounts- useEffect(() => {- queryClient.invalidateQueries({ queryKey: ['team_invitations'] });- }, [queryClient]);-- // Get team roles data- const { data: teamRolesData } = useQuery({- queryKey: ['team_roles'],- queryFn: teamAPI.getTeamRoles,- refetchOnWindowFocus: false,- refetchOnMount: true, // Enable refetch on mount for fresh data- refetchOnReconnect: false,- staleTime: 0, // Always consider data stale to ensure fresh fetches- });-- const teamRoles = (teamRolesData as any)?.roles || [];-- // Use the same team members source as team-members page- const { teamMembers } = useTeamMembers();-- const { getPendingInvites } = useTeamInvitations(teamRoles, teamMembers);-- const [inviteInfo, setInviteInfo] = useState({- totalSeats: 0,- totalMembers: 0,- remainingSeats: 0,- isWarningShowable: false,- pricePerSeat: 0,- isSmythosFree: false,- });-- useEffect(() => {- const teamSeats = userInfo?.subs?.properties?.['seatsIncluded'] || 1;-- // Filter out staff emails from team members (same logic as before but using consistent data source)- const filteredTeamMembers =- teamMembers?.filter((member) => !member.email.toLowerCase().includes('@smythos.com')) || [];-- // Filter out staff emails from pending invites- const filteredPendingInvites =- getPendingInvites?.filter((invite) => !invite.email.toLowerCase().includes('@smythos.com')) ||- [];-- // Calculate total occupied seats (current members + pending invites)- const totalOccupiedSeats = filteredTeamMembers.length + filteredPendingInvites.length;-- const priceItem =- userInfo?.subs?.object?.['items']?.data?.filter?.(- (item) => item?.price?.metadata?.for === 'user seats',- ) || [];- let price = 0;- if (priceItem.length > 0) {- price = priceItem[0].price?.unit_amount;- }-- setInviteInfo({- totalSeats: teamSeats,- totalMembers: filteredTeamMembers.length,- remainingSeats: teamSeats - totalOccupiedSeats,- pricePerSeat: price / 100,- isSmythosFree: userInfo.subs.plan.name.toLowerCase() === 'smythos free',- isWarningShowable:- // userInfo.subs.plan.name.toLowerCase() === 'smythos free' ||- teamSeats - totalOccupiedSeats - (newMemberCount || 0) < 1 &&- price > 0 &&- typeof userInfo?.subs?.properties?.['seatsIncluded'] === 'number' &&- !isNaN(userInfo.subs.properties['seatsIncluded']) &&- userInfo.subs.properties['seatsIncluded'] > 0 &&- // This Check is to prevent the warning from showing for the Partner plan- // T4 enterprise plan has 200 seats included so the check is 201- userInfo.subs.properties['seatsIncluded'] < 201,- });- }, [userInfo, teamMembers, newMemberCount]);- {- /* Warning block for and check for unlimited seats*/- }- return inviteInfo.isWarningShowable ? (- <div- className={cn(- `bg-[#fffbeb] border border-solid border-[#fde68a] text-[#92400e] text-sm rounded-md px-4 py-3 my-6 ${classes}`,- )}- role="alert"- style={{ fontFamily: 'inherit' }}- >- {/* Inline SVG for info icon */}- <svg- xmlns="http://www.w3.org/2000/svg"- width="16"- height="17"- viewBox="0 0 16 17"- fill="none"- className="inline-block mr-2 align-top mt-[3px]"- >- <g clipPath="url(#clip0_2324_23865)">- <path- d="M0 8.5C0 12.9177 3.5814 16.5 8 16.5C12.4186 16.5 16 12.9177 16 8.5C16 4.0814 12.4186 0.5 8 0.5C3.5814 0.5 0 4.0814 0 8.5Z"- fill="#A16114"- />- <path- d="M8.00507 12.6035V7.82622M8 4.44917V4.37891"- stroke="white"- strokeWidth={1.33333}- strokeLinecap="round"- strokeLinejoin="round"- />- </g>- <defs>- <clipPath id="clip0_2324_23865">- <rect width="16" height="16" fill="white" transform="translate(0 0.5)" />- </clipPath>- </defs>- </svg>- {inviteInfo.isSmythosFree ? (- <span>- Plan seat limit reached.{' '}- <span- className="font-semibold hover:underline cursor-pointer"- onClick={() => {- window.open('/plans', '_blank');- }}- >- Upgrade your plan- </span>{' '}- to add more seats.- </span>- ) : (- <div className="inline-block align-top text-left" style={{ width: 'calc(100% - 24px)' }}>- {inviteInfo.remainingSeats > 0 ? (- <span>- You have {inviteInfo.remainingSeats} seat- {inviteInfo.remainingSeats === 1 ? '' : 's'} remaining. Once all seats are used,- adding members will incur an additional charge of ${inviteInfo.pricePerSeat}- /month per seat.- </span>- ) : (- <span>- Adding a new member while on the{' '}- <span className="font-semibold">{userInfo.subs.plan.name}</span> plan will incur an- additional charge of ${inviteInfo.pricePerSeat}/mo per seat.- </span>- )}- </div>- )}- </div>- ) : (- <div className="px-4 py-3" />- );-};diff --git a/packages/app/src/react/features/teams/components/teams/row-table.tsx b/packages/app/src/react/features/teams/components/teams/row-table.tsxdeleted file mode 100644index c03b3968..00000000--- a/packages/app/src/react/features/teams/components/teams/row-table.tsx+++ /dev/null@@ -1,173 +0,0 @@-import { useMutation } from '@tanstack/react-query';-import { Avatar, AvatarGroup } from 'flowbite-react';-import React from 'react';-import { createPortal } from 'react-dom';-import { AiFillDelete, AiFillEdit, AiOutlineUserAdd } from 'react-icons/ai';-import { toast } from 'react-toastify';--import { subTeamsAPI } from '@react/features/teams/clients';-import { AssignMemberModal, CreateSpace } from '@react/features/teams/components/common';-import ToolTip from '@react/shared/components/_legacy/ui/tooltip/tooltip';-import CircularButton from '@react/shared/components/ui/circular.button';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { apiResultsTypes } from '@react/shared/types';-import { TeamMemberWithRole } from '@react/shared/types/api-results.types';-import { ITeam } from '@react/shared/types/entities';-import { extractError } from '@react/shared/utils/errors';-import { userSettingKeys } from '@shared/userSettingKeys';--type Props = {- data: apiResultsTypes.TeamRoleWithMembers;- canManage: boolean;- teamMembers: TeamMemberWithRole[] | null;- allMembers: TeamMemberWithRole[] | null;-};--export const TeamsTableRow = ({ data: role, canManage, teamMembers, allMembers }: Props) => {- const { userInfo, userTeams } = useAuthCtx();- const user = userInfo?.user;- const { data: userSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const currTeam = userTeams.find((team: ITeam) => team.id === userSettings?.userSelectedTeam);-- const [isEditing, setIsEditing] = React.useState(false);- const [isAssigningMember, setIsAssigningMember] = React.useState(false);-- const deleteSubTeamMutation = useMutation({- mutationFn: subTeamsAPI.deleteSubTeam,- onError: (error: apiResultsTypes.SmythAPIError) => {- let _errorMessage = 'Something went wrong!';- if (error.status === 403) {- if (extractError(error) === 'Forbidden') {- _errorMessage = 'You are not authorized to delete this role.';- } else if (extractError(error) === 'You do not have permission to create a sub-team') {- _errorMessage = 'You are not authorized to delete this role.';- } else if (- extractError(error).indexOf(- 'You cannot join another team because you have existing data in your account',- ) > -1- ) {- const hasAiAgent = extractError(error).toLowerCase().indexOf('ai agent') > -1;- const hasNamespace = extractError(error).toLowerCase().indexOf('namespace') > -1;- _errorMessage = `You need to remove your data from the current team before you can delete it. ${- hasAiAgent ? '(AI Agents)' : ''- } ${hasNamespace ? '(NameSpaces)' : ''}.`;- } else if (extractError(error).length > 0) _errorMessage = extractError(error);- }- toast(_errorMessage);- },- onSuccess: () => {- toast('Team deleted', { type: 'success' });- window.location.reload();- },- });-- const deleteSubTeamHandler = async (id: string) => {- await deleteSubTeamMutation.mutateAsync({ id, userId: user.id, parentId: currTeam.id });- };-- return (- <>- <tr className="bg-white dark:bg-gray-800 dark:border-gray-700">- <th- scope="row"- className="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"- >- {role.name}- </th>- <td className="px-6 py-4">- {/* Members */}- {teamMembers && teamMembers?.length > 0 ? (- <div className="flex flex-wrap gap-2">- <AvatarGroup>- {teamMembers?.slice(0, 4)?.map?.((member) => {- return (- <ToolTip- key={member.id}- text={[member.name, member.email]}- classes="text-nowrap mb-1"- isMultiLine={true}- >- <span>- <Avatar key={member.id} img={member.avatar} rounded stacked />- </span>- </ToolTip>- );- })}- {teamMembers?.length > 4 && (- <Avatar.Counter- className="w-8 h-8 z-50 pointer-events-none"- total={teamMembers?.length - 4}- href="#"- />- )}- </AvatarGroup>- </div>- ) : (- 'No Members'- )}- </td>-- <td className="px-6 py-4">- {role.canManageTeam ? (- <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">- Yes- </span>- ) : (- <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">- No- </span>- )}- </td>- <td className="px-6 py-4 text-right">- <span className="inline-flex gap-2">- {canManage && (- <>- <CircularButton- Icon={AiFillEdit}- className="bg-primary-100"- onClick={() => setIsEditing(true)}- />- <CircularButton- Icon={AiFillDelete}- onClick={() => deleteSubTeamHandler(role.id)}- className="bg-primary-100 disabled:opacity-60"- disabled={deleteSubTeamMutation.isLoading}- />- <CircularButton- Icon={AiOutlineUserAdd}- onClick={() => setIsAssigningMember(true)}- className="bg-primary-100 disabled:opacity-60"- disabled={deleteSubTeamMutation.isLoading}- />- </>- )}- </span>- </td>- </tr>-- {isEditing &&- createPortal(- <CreateSpace- isOpen={isEditing}- onClose={() => setIsEditing(false)}- onSubmit={() => {}}- editData={{ id: role.id, name: role.name }}- />,- document.body,- )}-- {isAssigningMember &&- createPortal(- <AssignMemberModal- isOpen={isAssigningMember}- onClose={() => setIsAssigningMember(false)}- options={(allMembers as []) ?? []}- onSubmit={() => setIsAssigningMember(false)}- editData={{ id: role.id, name: role.name }}- />,- document.body,- )}- </>- );-};diff --git a/packages/app/src/react/features/teams/hooks/index.ts b/packages/app/src/react/features/teams/hooks/index.tsdeleted file mode 100644index 5d553689..00000000--- a/packages/app/src/react/features/teams/hooks/index.ts+++ /dev/null@@ -1,4 +0,0 @@-export * from './useInvitationActions';-export * from './useTeamInvitations';-export * from './useTeamMembers';-export * from './useTeamSettings';diff --git a/packages/app/src/react/features/teams/hooks/useInvitationActions.ts b/packages/app/src/react/features/teams/hooks/useInvitationActions.tsdeleted file mode 100644index edcfa769..00000000--- a/packages/app/src/react/features/teams/hooks/useInvitationActions.ts+++ /dev/null@@ -1,265 +0,0 @@-/* eslint-disable no-unused-vars, @typescript-eslint/no-explicit-any */-import { format } from 'date-fns';-import { useState } from 'react';--import { teamAPI } from '@react/features/teams/clients';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { errorToast, successToast } from '@shared/components/toast';-import { PendingInvite, useTeamInvitations } from './useTeamInvitations';-import { useTeamMembers } from './useTeamMembers';--/**- * Custom hook for managing invitation actions (resend, delete)- * @param teamRoles - Array of available team roles- * @param isReadOnlyAccess - Boolean indicating if user has read-only access- * @returns Object containing action handlers and loading states- */-export const useInvitationActions = (teamRoles: any[] = [], isReadOnlyAccess: boolean = false) => {- // Local state for loading and deleting per invite- const [rowLoading, setRowLoading] = useState<{ [id: string]: boolean }>({});- const [rowDeleting, setRowDeleting] = useState<{ [id: string]: boolean }>({});- const [rowFadeOut, setRowFadeOut] = useState<{ [id: string]: boolean }>({});-- // Modal state for seat limit warning- const [showSeatLimitModal, setShowSeatLimitModal] = useState(false);- const [pendingInvite, setPendingInvite] = useState<{- invite: PendingInvite;- onInviteUpdated: (updater: (prev: PendingInvite[]) => PendingInvite[]) => void;- } | null>(null);-- // Get auth context and team data for seat limit validation- const { userInfo } = useAuthCtx();- const { teamMembers } = useTeamMembers();- const { getPendingInvites } = useTeamInvitations(teamRoles, teamMembers);-- /**- * Calculates seat pricing information- */- const getSeatPricingInfo = () => {- const teamSeats = userInfo?.subs?.properties?.['seatsIncluded'] || 1;- const filteredTeamMembers =- teamMembers?.filter((member) => !member.email.toLowerCase().includes('@smythos.com')) || [];- const filteredPendingInvites =- getPendingInvites?.filter(- (pendingInvite) => !pendingInvite.email.toLowerCase().includes('@smythos.com'),- ) || [];- const totalOccupiedSeats = filteredTeamMembers.length + filteredPendingInvites.length;- const remainingSeats = teamSeats - totalOccupiedSeats;-- const priceItem =- userInfo?.subs?.object?.['items']?.data?.filter?.(- (item) => item?.price?.metadata?.for === 'user seats',- ) || [];- let price = 0;- if (priceItem.length > 0) {- price = priceItem[0].price?.unit_amount;- }- const pricePerSeat = price / 100;-- return {- teamSeats,- remainingSeats,- pricePerSeat,- isSmythosFree: userInfo?.subs?.plan?.name?.toLowerCase() === 'smythos free',- };- };-- /**- * Proceeds with sending the invite after user confirmation- */- const proceedWithInvite = async (- invite?: PendingInvite,- onInviteUpdated?: (updater: (prev: PendingInvite[]) => PendingInvite[]) => void,- ) => {- // Use parameters if provided, otherwise use state- const currentInvite = invite || pendingInvite?.invite;- const onInviteUpdatedToUse = onInviteUpdated || pendingInvite?.onInviteUpdated;-- if (!currentInvite || !onInviteUpdatedToUse) {- return;- }-- setShowSeatLimitModal(false);- setPendingInvite(null);-- setRowLoading((prev) => ({ ...prev, [currentInvite.id]: true }));- try {- if (currentInvite.email && currentInvite.roleId) {- const res = await teamAPI.inviteTeamMember({- email: currentInvite.email,- roleId: currentInvite.roleId,- });- const data = await res.json();- if (data && data.invitation) {- // Find the role name from teamRoles- const roleName =- teamRoles?.find((r) => r.id === data.invitation.teamRoleId)?.name || currentInvite.role;-- onInviteUpdatedToUse((prev) => {- // Remove the specific expired invite being resent- const filtered = prev.filter((i) => i.id !== currentInvite.id);-- // Create the new invite object in the expected format- const newInvite: PendingInvite = {- id: String(data.invitation.id),- email: data.invitation.email,- role: roleName,- expires: data.invitation.expiresAt- ? format(new Date(data.invitation.expiresAt), 'MMMM d, yyyy')- : '',- status: 'Pending',- roleId: data.invitation.teamRoleId,- expiresAt: data.invitation.expiresAt,- };-- // Add the new invite to remaining invites and sort by expiry date (latest first)- const updated = [newInvite, ...filtered].sort((a, b) => {- const aTime = new Date(a.expiresAt).getTime();- const bTime = new Date(b.expiresAt).getTime();- return bTime - aTime;- });-- return updated;- });- }- successToast('Invite resent successfully');- } else {- errorToast('Cannot resend invite: missing email or role');- }- } catch (err) {- let msg = 'Failed to resend invite';- try {- // Handle different error response formats- if (err?.response) {- const errorData = await err.response.json();- if (errorData?.error?.message) {- msg = errorData.error.message;- }- } else if (err?.message) {- msg = err.message;- }- } catch {- // If we can't parse the error, keep the default message- }- errorToast(msg);- } finally {- setRowLoading((prev) => ({ ...prev, [currentInvite.id]: false }));- }- };-- /**- * Handles resending an invitation- * @param invite - The invitation to resend- * @param onInviteUpdated - Callback to update local invites state- */- const handleResendInvite = async (- invite: PendingInvite,- onInviteUpdated: (updater: (prev: PendingInvite[]) => PendingInvite[]) => void,- ) => {- // Check permissions first- if (isReadOnlyAccess) {- errorToast('You do not have permission to resend invitations');- return;- }-- // Check seat limits- const { remainingSeats, isSmythosFree } = getSeatPricingInfo();-- if (remainingSeats < 1) {- if (isSmythosFree) {- errorToast('Plan seat limit reached. Upgrade your plan to add more seats.');- return;- }-- // Show confirmation modal for paid plans- setPendingInvite({ invite, onInviteUpdated });- setShowSeatLimitModal(true);- return;- }-- // Proceed directly if seats are available- proceedWithInvite(invite, onInviteUpdated);- };-- /**- * Handles deleting an invitation- * @param id - The invitation ID to delete- * @param onInviteDeleted - Callback to remove invite from local state- */- const handleDeleteInvite = async (id: string, onInviteDeleted: (id: string) => void) => {- // Check permissions first- if (isReadOnlyAccess) {- errorToast('You do not have permission to delete invitations');- return;- }-- setRowDeleting((prev) => ({ ...prev, [id]: true }));- setRowFadeOut((prev) => ({ ...prev, [id]: false }));- try {- await fetch(`/api/page/teams/invitations/${id}`, { method: 'DELETE' });- successToast('Invite deleted successfully');- setRowFadeOut((prev) => ({ ...prev, [id]: true }));- setTimeout(() => {- onInviteDeleted(id);- setRowDeleting((prev) => ({ ...prev, [id]: false }));- setRowFadeOut((prev) => ({ ...prev, [id]: false }));- }, 500);- } catch (err) {- let msg = 'Failed to delete invite';- try {- // Handle different error response formats- if (err?.response) {- const errorData = await err.response.json();- if (errorData?.error?.message) {- msg = errorData.error.message;- }- } else if (err?.message) {- msg = err.message;- }- } catch {- // If we can't parse the error, keep the default message- }- errorToast(msg);- setRowDeleting((prev) => ({ ...prev, [id]: false }));- }- };-- /**- * Closes the seat limit modal- */- const closeSeatLimitModal = () => {- setShowSeatLimitModal(false);- setPendingInvite(null);- };-- /**- * Gets the modal props for rendering- */- const getSeatLimitModalProps = () => {- if (!showSeatLimitModal) return null;-- const { pricePerSeat } = getSeatPricingInfo();-- return {- onClose: closeSeatLimitModal,- message: 'Seat Limit Reached',- lowMsg: `Adding a new member while on the ${userInfo?.subs?.plan?.name} plan will incur an additional charge of $${pricePerSeat}/mo per seat.`,- label: 'Continue',- handleConfirm: () => proceedWithInvite(),- handleCancel: closeSeatLimitModal,- cancelLabel: 'Cancel',- isLoading: pendingInvite ? rowLoading[pendingInvite.invite.id] : false,- };- };-- return {- rowLoading,- rowDeleting,- rowFadeOut,- handleResendInvite,- handleDeleteInvite,- showSeatLimitModal,- getSeatLimitModalProps,- closeSeatLimitModal,- };-};diff --git a/packages/app/src/react/features/teams/hooks/useTeamInvitations.ts b/packages/app/src/react/features/teams/hooks/useTeamInvitations.tsdeleted file mode 100644index e6f26073..00000000--- a/packages/app/src/react/features/teams/hooks/useTeamInvitations.ts+++ /dev/null@@ -1,143 +0,0 @@-/* eslint-disable @typescript-eslint/no-explicit-any */-import { useQuery } from '@tanstack/react-query';-import { format } from 'date-fns';-import { useCallback, useMemo } from 'react';--import { TeamMemberWithRole } from '@react/shared/types/api-results.types';--export interface PendingInvite {- id: string;- email: string;- role: string;- expires: string;- status: string;- roleId?: number;- expiresAt: string;-}--/**- * API call for fetching invitations- * @returns Promise with invitations data- */-const fetchInvitations = async () => {- const response = await fetch('/api/page/teams/invitations');- if (!response.ok) throw new Error('Failed to fetch invitations');- return response.json();-};--/**- * Custom hook for managing team invitations data and processing- * @param teamRoles - Array of available team roles- * @param currentUserTeamMembers - Array of current team members- * @returns Object containing invitations data and processing functions- */-export const useTeamInvitations = (- teamRoles: any[] = [],- currentUserTeamMembers: TeamMemberWithRole[] = [],-) => {- const { data: invitationsData } = useQuery({- queryKey: ['team_invitations'],- queryFn: fetchInvitations,- refetchOnWindowFocus: false,- refetchOnMount: false,- refetchOnReconnect: false,- staleTime: Infinity,- });-- /**- * Maps, sorts, and deduplicates invites for UI display- * @param invites - Raw invitations data from API- * @returns Processed invitations array- */- const mapSortInvites = useCallback(- (invites: any[]): PendingInvite[] => {- // Sort by expiresAt (latest first), then by id (latest first)- const sorted = invites.sort((a: any, b: any) => {- const aTime = new Date(a.expiresAt).getTime();- const bTime = new Date(b.expiresAt).getTime();- if (bTime !== aTime) return bTime - aTime;- return Number(b.id) - Number(a.id);- });-- // Filter out invites whose roles don't belong to the current team- const currentTeamInvites = sorted.filter((invite: any) => {- const roleId = invite.teamRole?.id || invite.roleId;- return teamRoles?.some((role) => role.id === roleId);- });-- // Filter out invites whose emails are already present in currentUserTeamMembers- const teamMemberEmails = new Set(currentUserTeamMembers?.map((member) => member.email) || []);- const filteredInvites = currentTeamInvites.filter((invite: any) => {- return !teamMemberEmails.has(invite.email);- });-- // Deduplicate by email, keeping only the first (latest) invite for each email- const seen = new Set<string>();- const deduped = filteredInvites.filter((invite: any) => {- if (seen.has(invite.email)) return false;- seen.add(invite.email);- return true;- });-- // Map to UI format- return deduped.map((invite: any) => {- const isExpired = invite.expiresAt && new Date(invite.expiresAt) < new Date();- let status: string;- if (invite.status === 'ACCEPTED') status = 'Accepted';- else if (isExpired) status = 'Expired';- else status = 'Pending';-- return {- id: String(invite.id),- email: invite.email,- role: invite.teamRole?.name || invite.role || '',- expires: invite.expiresAt ? format(new Date(invite.expiresAt), 'MMMM d, yyyy') : '',- status,- roleId: invite.teamRole?.id || invite.roleId,- expiresAt: invite.expiresAt,- };- });- },- [teamRoles, currentUserTeamMembers],- );-- /**- * Gets pending invitations (excluding accepted ones)- * @returns Array of pending invitations- */- const getPendingInvites = useMemo(() => {- const rawInvitations = invitationsData?.invitations || [];- const pendingInvitations = rawInvitations.filter((invite: any) => invite.status !== 'ACCEPTED');- return mapSortInvites(pendingInvitations);- }, [invitationsData?.invitations, mapSortInvites]);-- /**- * Filters invitations based on search term- * @param invites - Array of invitations to filter- * @param searchTerm - Search term to filter by- * @returns Filtered invitations- */- const getFilteredInvites = useCallback((invites: PendingInvite[], searchTerm: string) => {- return invites.filter((invite) =>- invite.email.toLowerCase().includes(searchTerm.toLowerCase()),- );- }, []);-- /**- * Checks if there's a pending invite for a specific email- * @param invites - Array of invitations to check- * @param email - Email to check for- * @returns Boolean indicating if there's a pending invite- */- const hasPendingInviteForEmail = useCallback((invites: PendingInvite[], email: string) => {- return invites.some((invite) => invite.email === email && invite.status === 'Pending');- }, []);-- return {- invitationsData,- getPendingInvites,- getFilteredInvites,- hasPendingInviteForEmail,- mapSortInvites,- };-};diff --git a/packages/app/src/react/features/teams/hooks/useTeamMembers.ts b/packages/app/src/react/features/teams/hooks/useTeamMembers.tsdeleted file mode 100644index daa39008..00000000--- a/packages/app/src/react/features/teams/hooks/useTeamMembers.ts+++ /dev/null@@ -1,78 +0,0 @@-import { useQuery } from '@tanstack/react-query';-import { useCallback } from 'react';--import { teamAPI } from '@react/features/teams/clients';-import { TeamMemberWithRole } from '@react/shared/types/api-results.types';--type TeamMembersResponse = { members: TeamMemberWithRole[] };--/**- * Custom hook for managing team members data and filtering- * @returns Object containing team members data, loading states, and filtering functions- */-export const useTeamMembers = () => {- const {- data: teamMembersData,- isLoading,- isError,- } = useQuery<TeamMembersResponse>({- queryKey: ['team_members_list'],- queryFn: teamAPI.getTeamMembers,- refetchOnWindowFocus: false,- refetchOnMount: true,- refetchOnReconnect: false,- staleTime: Infinity,- });-- const currentUserTeamMembers = teamMembersData?.members || [];-- /**- * Sorts members with team initiators first- * @param members - Array of team members to sort- * @returns Sorted array of team members- */- const sortMembers = useCallback((members: TeamMemberWithRole[]) => {- return [...members].sort((a, b) => {- const roleA = a.userTeamRole.isTeamInitiator ? 0 : 1;- const roleB = b.userTeamRole.isTeamInitiator ? 0 : 1;- return roleA - roleB;- });- }, []);-- /**- * Filters and sorts members based on search term- * @param members - Array of team members- * @param searchTerm - Search term to filter by- * @returns Filtered and sorted members- */- const getFilteredMembers = useCallback(- (members: TeamMemberWithRole[], searchTerm: string) => {- if (!members) return [];- const filtered = members.filter(- (member) =>- member.name?.toLowerCase()?.includes(searchTerm.toLowerCase()) ||- member.email.toLowerCase().includes(searchTerm.toLowerCase()),- );- return sortMembers(filtered);- },- [sortMembers],- );-- /**- * Converts members to have string IDs for table compatibility- * @param members - Array of team members- * @returns Members with string IDs- */- const getMembersWithStringId = useCallback((members: TeamMemberWithRole[]) => {- return members.map((member) => ({ ...member, id: String(member.id) }));- }, []);-- return {- teamMembers: currentUserTeamMembers,- isLoading,- isError,- sortMembers,- getFilteredMembers,- getMembersWithStringId,- };-};diff --git a/packages/app/src/react/features/teams/modals/create-member.tsx b/packages/app/src/react/features/teams/modals/create-member.tsxdeleted file mode 100644index 46c9e5a3..00000000--- a/packages/app/src/react/features/teams/modals/create-member.tsx+++ /dev/null@@ -1,328 +0,0 @@-/* eslint-disable max-len */-import { useMutation, useQuery } from '@tanstack/react-query';-import { useCallback, useEffect, useState } from 'react';-import { toast } from 'react-toastify';--import { useOnboarding } from '@react/features/agents/contexts/OnboardingContext';-import useMutateOnboardingData from '@react/features/onboarding/hooks/useMutateOnboardingData';-import { teamAPI } from '@react/features/teams/clients';-import { InviteMemberWarning } from '@react/features/teams/components/teams';-import { useGetTeamSettings } from '@react/features/teams/hooks';-import { Input } from '@react/shared/components/ui/input';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { queryClient } from '@react/shared/query-client';-import { OnboardingTaskType } from '@react/shared/types/onboard.types';-import { extractError } from '@react/shared/utils/errors';-import { Analytics } from '@shared/posthog/services/analytics';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';-import { UserSettingsKey } from '@src/backend/types/user-data';-import { Tooltip } from 'flowbite-react';-import { X } from 'lucide-react';--type Props = {- onClose: () => void;- editMode?: boolean;- editData?: { roleId: number; email: string; memberId: number };- defaultRole?: number;-};--const CreateMemberModal = (props: Props) => {- const [memberEmail, setMemberEmail] = useState(props.editData?.email ?? '');- const [errorMessage, setErrorMessage] = useState('');- const [selectedRoleId, setSelectedRoleId] = useState(- props.editData?.roleId ?? props.defaultRole ?? -1,- );- const [validationError, setValidationError] = useState('');- const saveUserSettingsMutation = useMutateOnboardingData();- const { setTaskCompleted } = useOnboarding();-- const { data: userTeamSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const { data: roleSettings } = useGetTeamSettings(teamSettingKeys.DEFAULT_ROLE);- const { currentUserTeam } = useAuthCtx();- const currentTeamId = userTeamSettings?.userSelectedTeam;-- const teamRolesQuery = useQuery({ queryKey: ['team_roles'], queryFn: teamAPI.getTeamRoles });-- // Helper function to check if a role exists in available roles- const isRoleAvailable = useCallback(- (roleId: number | string) => {- return teamRolesQuery.data?.roles?.some((role) => role.id.toString() === roleId.toString());- },- [teamRolesQuery.data?.roles],- );-- // Helper function to find the owner role- const findOwnerRole = useCallback(() => {- return teamRolesQuery.data?.roles?.find((r) => r.isOwnerRole);- }, [teamRolesQuery.data?.roles]);-- // Helper function to get the effective role ID- const getEffectiveRoleId = useCallback(() => {- // Use team-specific default role if available- const defaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];- if (defaultRole?.id && isRoleAvailable(defaultRole.id)) {- return Number(defaultRole.id);- }-- // Fallback to owner role- const ownerRole = findOwnerRole();- return ownerRole?.id;- }, [roleSettings, currentTeamId, isRoleAvailable, findOwnerRole]);-- // Update the role selection when default role changes- useEffect(() => {- if (!props.editMode && selectedRoleId === -1) {- const effectiveRoleId = getEffectiveRoleId();- if (effectiveRoleId) {- setSelectedRoleId(Number(effectiveRoleId));- }- }- }, [props.editMode, roleSettings, currentTeamId, getEffectiveRoleId]); // eslint-disable-line react-hooks/exhaustive-deps-- // Update the select element's default option text- const getDefaultRoleText = useCallback(() => {- const effectiveRoleId = getEffectiveRoleId();- if (!effectiveRoleId) return 'Choose a role';-- const roleName = teamRolesQuery.data?.roles?.find((r) => r.id === effectiveRoleId)?.name;-- return `Choose a role (default: ${roleName})`;- }, [getEffectiveRoleId, teamRolesQuery.data?.roles]);-- const inviteMember = useMutation({- mutationFn: () => {- return teamAPI.inviteTeamMember({- email: memberEmail?.trim(),- roleId: Number(selectedRoleId), // Use the effective role ID- });- },-- onError: (error) =>- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to invite a new member',- ),-- onSuccess: () => {- toast('Invitation sent');- props.onClose();- queryClient.invalidateQueries({ queryKey: ['team_roles'] });- queryClient.invalidateQueries({ queryKey: ['team_invitations'] });- },- });-- const updateMemberRole = useMutation({- mutationFn: () => {- return teamAPI.updateTeamMemberRole(props.editData.memberId, {- roleId: Number(selectedRoleId), // Use the effective role ID- });- },-- onError: (error) =>- handleApiError(- error,- 'An error occurred. Please try again later.',- 'You are not authorized to update this member',- ),-- onSuccess: () => {- props.onClose();- queryClient.invalidateQueries({ queryKey: ['team_members_list'] });- },- });-- const handleApiError = (error, defaultMsg, unauthorizedMsg) => {- const _errorMessage =- error.status === 403 && extractError(error).toLowerCase().indexOf('unauthorized') !== -1- ? unauthorizedMsg- : extractError(error) || defaultMsg;- setErrorMessage(_errorMessage);- };-- async function handleSubmit() {- const trimmedEmail = memberEmail?.trim();- const emailRegex = /\S+@\S+\.\S+/;-- if (!emailRegex?.test(trimmedEmail)) {- setValidationError('Invalid email');- return;- }-- // Validate that we have a valid role (either selected or default)- const effectiveRoleId = getEffectiveRoleId();- if (!effectiveRoleId) {- setValidationError('No role selected and no default role available');- return;- }-- if (props.editMode) await updateMemberRole.mutateAsync();- else await inviteMember.mutateAsync();-- saveUserSettingsMutation.mutate({- key: UserSettingsKey.OnboardingTasks,- data: {- [OnboardingTaskType.INVITE_TEAM_MEMBERS]: true,- [OnboardingTaskType.COMPLETED_TASK]: OnboardingTaskType.INVITE_TEAM_MEMBERS,- },- operation: 'insertOrUpdate',- });- setTaskCompleted(OnboardingTaskType.INVITE_TEAM_MEMBERS);-- Analytics.track(`onboarding_task_${OnboardingTaskType.INVITE_TEAM_MEMBERS}`);- }-- return (- <div- id="defaultModal"- // @ts-expect-error tabIndex expects a number but we're passing a string- tabIndex="-1"- className="fixed top-0 left-0 right-0 z-50 w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-screen max-h-full justify-center items-center flex bg-black bg-opacity-50"- onClick={props.onClose}- >- <div className="relative w-full max-w-xl max-h-full" onClick={(e) => e.stopPropagation()}>- <div className="relative bg-white rounded-lg shadow dark:bg-gray-700">- <div className="flex items-start justify-between pt-4 px-6 border-b rounded-t dark:border-gray-600">- <h3 className="text-xl font-semibold text-[#1E1E1E] dark:text-white">- {props.editMode ? 'Edit Member' : 'Invite Member'}- </h3>- <button- type="button"- className="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"- onClick={props.onClose}- >- <X className="w-5 h-5" color="#1E1E1E" />- <span className="sr-only">Close modal</span>- </button>- </div>- {!props.editMode && (- <div className="px-6 pt-2">- <p className="text-base text-[#1E1E1E] font-light block w-full">- Add a new team member to your workspace.- </p>- </div>- )}-- {/* Warning block for and check for unlimited seats*/}- {!props.editMode && <InviteMemberWarning classes="mx-6" newMemberCount={1} />}- <div className="px-6">- <div className="mb-4 flex-grow">- <label- htmlFor="member-email-input"- className="block mb-2 text-base font-medium text-[#1E1E1E] dark:text-white"- >- Email Address <span className="text-red-500">*</span>- </label>- <Input- id="member-email-input"- placeholder="[email protected]"- value={memberEmail}- disabled={props.editMode}- onChange={(e) => {- setValidationError('');- setMemberEmail(e.target.value);- }}- fullWidth- />- </div>- <div className="mb-6 flex-grow">- <label- htmlFor="role-name-input"- className="block mb-2 text-base font-medium text-[#1E1E1E] dark:text-white"- >- Role{' '}- <Tooltip- content={- <div className="text-sm">- Different roles have different permissions.- {currentUserTeam?.parentId === null && (- <>- <br />- See{' '}- <a- href="/teams/roles"- target="_blank"- rel="noopener noreferrer"- className="hover:underline text-white font-semibold hover:text-gray-200"- onClick={(e) => e.stopPropagation()}- >- manage roles- </a>- </>- )}- </div>- }- trigger="hover"- placement="top"- style="dark"- theme={{- target: 'inline-flex items-center w-5 h-5 align-top',- }}- >- <img src="/img/icons/Info.svg" className="w-5 h-5" alt="Info" />- </Tooltip>- </label>- <select- value={selectedRoleId}- id="role-name-input"- className={`py-2 px-3 border text-gray-900 rounded block w-full outline-none- focus:outline-none focus:ring-0 focus:ring-offset-0 focus:ring-shadow-none- text-sm font-normal placeholder:text-sm placeholder:font-normal box-border mb-[1px] focus:mb-0-- ${'border-gray-300 border-b-gray-500 focus:border-b-2 focus:border-b-blue-500 focus-visible:border-b-2 focus-visible:border-b-blue-500'}`}- onChange={(e) => {- setSelectedRoleId(Number(e.target.value));- }}- >- {!props.editMode && selectedRoleId === -1 && (- <option value={-1}>{getDefaultRoleText()}</option>- )}- {!teamRolesQuery.isLoading &&- teamRolesQuery.data?.roles?.map((option) => {- const defaultRoleId = getEffectiveRoleId();- const isDefault = option.id === defaultRoleId;- const isOwner = option.isOwnerRole;-- // Prioritize showing "Default" over "System Admin" when both apply- let suffix = '';- if (isDefault) {- suffix = ' (Default)';- } else if (isOwner) {- suffix = ' (System Admin)';- }-- return (- <option key={option.id} value={option.id}>- {option.name}- {suffix}- </option>- );- })}- </select>- </div>- </div>- <div className="px-6 pb-0 pt-0">- {(inviteMember?.isError || updateMemberRole?.isError) && errorMessage ? (- <p className="text-red-500 text-xs">{errorMessage}</p>- ) : null}- {validationError && <p className="text-red-500">{validationError}</p>}- </div>- <div className="flex items-center justify-end p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600 mt-6">- <Button- handleClick={handleSubmit}- disabled={inviteMember.isLoading || updateMemberRole.isLoading || !memberEmail}- className="px-8 h-[48px] rounded-lg"- >- {props.editMode ? 'Update' : 'Invite'}- </Button>- </div>- </div>- </div>- </div>- );-};--export default CreateMemberModal;diff --git a/packages/app/src/react/features/teams/pages/accept-invitation-page.tsx b/packages/app/src/react/features/teams/pages/accept-invitation-page.tsxdeleted file mode 100644index 1dd67d89..00000000--- a/packages/app/src/react/features/teams/pages/accept-invitation-page.tsx+++ /dev/null@@ -1,238 +0,0 @@-/* eslint-disable max-len, react-hooks/exhaustive-deps*/-import { teamAPI } from '@src/react/features/teams/clients';-import { Button } from '@src/react/shared/components/ui/newDesign/button';-import { Spinner } from '@src/react/shared/components/ui/spinner';-import { useAuthCtx } from '@src/react/shared/contexts/auth.context';-import { FRONTEND_USER_SETTINGS } from '@src/react/shared/enums';-import { saveUserSettings } from '@src/react/shared/hooks/useUserSettings';-import { SmythAPIError } from '@src/react/shared/types/api-results.types';-import { userSettingKeys } from '@src/shared/userSettingKeys';-import { useMutation } from '@tanstack/react-query';-import { useCallback, useEffect, useMemo, useState } from 'react';-import { useParams, useSearchParams } from 'react-router-dom';-import { toast } from 'react-toastify';--const AcceptInvitationPage = () => {- const { invitationId } = useParams();- const {- userInfo: { user },- userTeams,- currentUserTeam,- } = useAuthCtx();- const [searchParams] = useSearchParams();- const [hasAcceptedInvite, setHasAcceptedInvite] = useState(false);- const [isAccepted, setIsAccepted] = useState(false);- const [errorMsg, setErrorMsg] = useState('');- const agentId = searchParams.get('agentId');- const spaceId = searchParams.get('spaceId');- const spaceRoleId = searchParams.get('spaceRoleId');- const [teamHeaderId, setTeamHeaderId] = useState('');-- const isAlreadyAMember = useMemo(() => !user?.userTeamRole?.isTeamInitiator, [user]);-- const acceptInvitation = useMutation({- mutationFn: ({- invitationId,- agentId,- spaceId,- spaceRoleId,- }: {- invitationId: string;- agentId: string;- spaceId: string;- spaceRoleId: string;- }) => {- if (spaceId && spaceRoleId) {- return teamAPI.acceptInvitation(invitationId, null, spaceId, spaceRoleId);- } else {- return teamAPI.acceptInvitation(invitationId, agentId);- }- },- onSuccess: async (data) => {- const logKey = FRONTEND_USER_SETTINGS.ACCEPT_INVITE_LOGGED;- sessionStorage.setItem(logKey, `accepted_${invitationId}_${Date.now()}`);- const jsonData = await data?.json();- setTimeout(async () => {- if (jsonData?.data?.spaceId) {- await saveUserSettings(- userSettingKeys.USER_TEAM,- jsonData?.data?.spaceId,- jsonData?.data?.organizationId,- );- setTeamHeaderId(jsonData?.data?.organizationId);- }-- setIsAccepted(true);- toast('Invitation accepted');- }, 1000);- },-- onError: async (error: SmythAPIError) => {- console.log('error', error); // eslint-disable-line no-console- let shouldSwitchTeam = false;- let shouldNavigateToHome = false;- if (- error?.error?.message.indexOf('Invalid email') === -1 &&- error?.error?.message.indexOf('Invitation Invalid') === -1- ) {- if (userTeams.length > 0 && currentUserTeam && spaceId && agentId) {- const hasAccessToSpace = userTeams.find((team) => team.id === spaceId);- if (hasAccessToSpace) {- if (currentUserTeam?.id !== spaceId) {- shouldSwitchTeam = true;- shouldNavigateToHome = true;- } else {- shouldNavigateToHome = true;- }- }- }- }- if (error?.error?.message.indexOf('ALREADY_PART_OF_TEAM') !== -1 && agentId) {- const teamId = error?.error?.message.split(':')[1].trim();- await saveUserSettings(userSettingKeys.USER_TEAM, teamId);- window.location.href = `/builder/${agentId}`;- } else if (agentId && (shouldSwitchTeam || shouldNavigateToHome)) {- if (shouldSwitchTeam) {- await saveUserSettings(userSettingKeys.USER_TEAM, spaceId);- }- if (shouldNavigateToHome) {- window.location.href = `/builder/${agentId}`;- }- } else {- setErrorMsg(error?.error?.message ?? 'Something went wrong');- }- },- });-- const acceptInvite = useCallback(async () => {- if (!hasAcceptedInvite) {- setHasAcceptedInvite(true);- await acceptInvitation.mutateAsync({ invitationId, agentId, spaceId, spaceRoleId });- }- }, []);-- useEffect(() => {- if (user) {- const t = setTimeout(() => {- const logKey = FRONTEND_USER_SETTINGS.ACCEPT_INVITE_LOGGED;- const [status, id, time] = sessionStorage.getItem(logKey)?.split?.('_') ?? [];- if (id === invitationId && status === 'accepted') {- setIsAccepted(true);- }- if (!isAccepted && !isAlreadyAMember && Date.now() - Number(time || 0) > 5000) {- sessionStorage.setItem(logKey, `started_ ${invitationId}_${Date.now()}`);- setTimeout(acceptInvite, 200);- }- }, 2000);- return () => {- clearTimeout(t);- };- }- }, [user]);-- const getErrorMsg = (msg: string) => {- if (msg == 'Invitation expired' && spaceId) {- return [- 'Oops! This invitation link has expired or has already been used. Please request a new invitation from your space admin.',- ];- } else if (msg == 'Invitation expired' && !spaceId) {- return [- 'Oops! This invitation link has expired or has already been used. Please request a new invitation from your organization admin.',- ];- } else if (msg == 'Invalid email') {- return [- 'The email you used does not match our invitation records. Please create your account using the email address included in your invitation.',- 'You can check your invite email or contact your admin to ensure you are using the correct address.',- ];- } else {- return msg ? [msg] : ['Something went wrong'];- }- };- const navigateToHome = async () => {- if (agentId) {- if (spaceId) {- await saveUserSettings(userSettingKeys.USER_TEAM, spaceId, teamHeaderId);- }- window.location.href = `/builder/${agentId}`;- } else {- window.location.href = '/agents';- }- };-- const handleButtonClick = () => {- const logKey = FRONTEND_USER_SETTINGS.ACCEPT_INVITE_LOGGED;-- // Check if the log has already been printed- const [status, id] = sessionStorage.getItem(logKey)?.split?.('_') ?? [];- if (status == 'accepted' && id == invitationId) {- navigateToHome();- } else {- acceptInvite();- }- };-- return (- <>- {!isAccepted && !isAlreadyAMember && !errorMsg ? (- <section className="w-screen h-screen flex items-center justify-center">- <Spinner />- </section>- ) : (- <div className="font-sans text-white w-full h-[100vh] flex gap-10 flex-col md:flex-row items-center justify-center">- <div className="flex flex-col bg-white shadow-sm border border-solid border-gray-100 p-10 max-w-[455px] w-11/12 rounded-lg text-black">- <header className="flex items-center justify-between mb-8">- <div className="flex items-center justify-center flex-grow transition duration-300">- <img- src="/img/smythos/logo-with-text-dark.png"- className="h-4 w-auto"- alt="SmythOS"- />- </div>- </header>- {errorMsg && !isAccepted ? (- <>- {getErrorMsg(acceptInvitation.error?.error?.message).map((msg, index) => (- <p key={index} className="text-red-800 text-center">- {index > 0 && <br />}- {msg}- </p>- ))}- <footer className="flex w-full mt-4 h-[52px] text-base">- <Button handleClick={navigateToHome} fullWidth>- Back to Home- </Button>- </footer>- </>- ) : (- <>- <div className="flex flex-col gap-2">- <main className="page-card-body text-center">- <img- src="/img/celeb_pop.png"- className="w-[156px] rotate-[30deg] h-auto m-auto"- alt="SmythOS"- />- </main>- <h1 className="text-4xl font-medium text-center">- Welcome to {user?.team?.name}- </h1>- {!isAlreadyAMember && (- <p className="text-center text-base">Thank you for joining SmythOS</p>- )}- </div>- <footer className="flex w-full h-[52px] text-base mt-4">- <Button handleClick={handleButtonClick} fullWidth>- {isAlreadyAMember ? 'Switch Team' : 'Get Started'}- {acceptInvitation.isLoading && <Spinner classes="w-8 h-8 ml-4" />}- </Button>- </footer>- </>- )}- </div>- </div>- )}- </>- );-};--export default AcceptInvitationPage;diff --git a/packages/app/src/react/features/teams/pages/space-settings.tsx b/packages/app/src/react/features/teams/pages/space-settings.tsxdeleted file mode 100644index e3af4727..00000000--- a/packages/app/src/react/features/teams/pages/space-settings.tsx+++ /dev/null@@ -1,429 +0,0 @@-/* eslint-disable react-hooks/exhaustive-deps */-import { useMutation, useQueryClient } from '@tanstack/react-query';-import classNames from 'classnames';-import { ChangeEvent, FC, useEffect, useMemo, useRef, useState } from 'react';-import { AiOutlineDelete } from 'react-icons/ai';-import { FaPlus } from 'react-icons/fa6';-import { toast } from 'react-toastify';--import ApiErrorLine from '@react/features/error-pages/components/APIErrorLine';-import { subTeamsAPI } from '@react/features/teams/clients';-import { AssignMemberModal, CreateSpace } from '@react/features/teams/components/common';-import { CompanyLogo, SettingsModal, TeamInfo } from '@react/features/teams/components/settings';-import { useGetTeamSettings, useStoreTeamSettings } from '@react/features/teams/hooks';-import { Button } from '@react/shared/components/ui/newDesign/button';-import { Spinner } from '@react/shared/components/ui/spinner';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { apiResultsTypes } from '@react/shared/types';-import { ITeam } from '@react/shared/types/entities';-import { extractError } from '@react/shared/utils/errors';-import { PostHog } from '@shared/posthog';-import { EVENTS } from '@shared/posthog/constants/events';-import { Analytics } from '@shared/posthog/services/analytics';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';-import { Members } from '../components/settings/members';--export type SpaceMember = {- id: number;- email: string;- createdAt: string;- name: string | null;- avatar: string | null;- userTeamRole: {- userSpecificAcl: unknown;- isTeamInitiator: boolean;- sharedTeamRole: { name: string; id: number; isOwnerRole: boolean; canManageTeam: boolean };- };-};--// const ROWS_PER_PAGE = 4;--export const SpaceSettings: FC = () => {- const [isEditing, setIsEditing] = useState(false);- const [isAssigningMember, setIsAssigningMember] = useState(false);- const [searchTerm, setSearchTerm] = useState('');- const [sortBy, setSortBy] = useState<'name' | 'email' | 'role'>('name');- const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc');- // const [currentPage, setCurrentPage] = useState(1);- const [errorMessage, setErrorMessage] = useState('');- const [spaceMembers, setSpaceMembers] = useState([]);- const [isOrganizationMembersLoading, setIsOrganizationMembersLoading] = useState(true);- const [organizationMembers, setOrganizationMembers] = useState([]);- const [inActionMember, setInActionMember] = useState(null);- const [isDeleteSpaceOpen, setIsDeleteSpaceOpen] = useState(false);- const [canDeleteSpace, setCanDeleteSpace] = useState(false);- const [isDeleteMemberOpen, setIsDeleteMemberOpen] = useState(false);- const [selectedMember, setSelectedMember] = useState<SpaceMember | null>(null);- const [isDeletingMember, setIsDeletingMember] = useState(false);- const [logo, setLogo] = useState<string | null>(null);- const [isUploadingLogo, setIsUploadingLogo] = useState(false);- const fileInputRef = useRef<HTMLInputElement>(null);- // const [totalPages, setTotalPages] = useState(1);-- const { userTeams, userInfo, getPageAccess, refreshUserData } = useAuthCtx();- const { data: userSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const queryClient = useQueryClient();- const { data: companyLogo } = useGetTeamSettings(teamSettingKeys.COMPANY_LOGO);- const storeTeamSettings = useStoreTeamSettings(teamSettingKeys.COMPANY_LOGO);-- const canUseWhiteLabel = useMemo(() => {- return userInfo?.subs?.plan?.properties?.flags?.whitelabel;- }, [userInfo?.subs]);-- const currTeam = userTeams.find((team: ITeam) => team.id === userSettings?.userSelectedTeam);- const organization = userTeams.filter((t) => t.parentId === null)[0];- const membersAccess = getPageAccess('/teams/members');- const teamsAccess = getPageAccess('/teams');-- const saveCompanyLogoMutation = useMutation({- mutationKey: ['saveCompanyLogo'],- mutationFn: async (formData: FormData) => {- const response = await fetch('/api/page/teams/company-logo/upload', {- method: 'POST',- body: formData,- });- return response.json();- },- onSuccess(data) {- if (data.url) {- setLogo(data.url);- storeTeamSettings.mutate(- { url: data.url },- {- onSuccess: () => {- queryClient.invalidateQueries(['teamSettings', teamSettingKeys.COMPANY_LOGO]);- },- },- );- toast.success('Company logo updated successfully');- }- },- onError: () => toast.error('Failed to upload company logo. Please try again.'),- });-- useEffect(() => {- if (companyLogo?.url) setLogo(companyLogo.url);- }, [companyLogo]);-- const handleSearch = (e: ChangeEvent<HTMLInputElement>) => {- setSearchTerm(e.target.value);- // setCurrentPage(1);- };-- const handleSortChange = (e: ChangeEvent<HTMLSelectElement>) => {- setSortBy(e.target.value as 'name' | 'email' | 'role');- };-- const toggleSortDirection = () => {- setSortDirection((prev) => (prev === 'asc' ? 'desc' : 'asc'));- };-- const deleteSubTeamMutation = useMutation({- mutationFn: subTeamsAPI.deleteSubTeam,- onError: (error: apiResultsTypes.SmythAPIError) => {- let _errorMessage = 'Something went wrong!';- if (error.status === 403) {- if (extractError(error) === 'Forbidden') {- _errorMessage = 'You are not authorized to delete this role.';- } else if (extractError(error) === 'You do not have permission to create a sub-team') {- _errorMessage = 'You are not authorized to delete this role.';- } else if (- extractError(error).indexOf(- 'You cannot join another team because you have existing data in your account',- ) > -1- ) {- const hasAiAgent = extractError(error).toLowerCase().indexOf('ai agent') > -1;- const hasNamespace = extractError(error).toLowerCase().indexOf('namespace') > -1;- _errorMessage = `You need to remove your data from the current team before you can delete it. ${- hasAiAgent ? '(AI Agents)' : ''- } ${hasNamespace ? '(NameSpaces)' : ''}.`;- } else if (extractError(error)) {- _errorMessage = extractError(error);- }- }- toast(_errorMessage);- },- onSuccess: (response) => {- toast('Team deleted', { type: 'success' });- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_DELETED, {});- window.location.href = '/';- return response;- },- });-- const teamMembersQuery = useMutation({- mutationFn: subTeamsAPI.getTeamMembers,- onError: () => setErrorMessage('Failed to fetch team members'),- });-- const getMembers = async () => {- if (currTeam?.id && !spaceMembers.length) {- const response = await teamMembersQuery.mutateAsync(currTeam.id);- setSpaceMembers(response.members || []);-- if (- userInfo?.user?.email ===- response.members.find((m) => m?.userTeamRole?.isTeamInitiator)?.email- ) {- setCanDeleteSpace(true);- }- }-- if (organization?.id && !organizationMembers.length) {- const response = await teamMembersQuery.mutateAsync(organization.id);- setIsOrganizationMembersLoading(false);- setOrganizationMembers(response.members || []);- }- };-- useEffect(() => {- if (currTeam) {- if (window.location.pathname.includes('teams/members') && currTeam.parentId !== null) {- window.location.href = '/teams/settings';- return;- } else if (window.location.pathname.includes('teams/settings') && currTeam.parentId == null) {- window.location.href = '/teams/members';- return;- }- }- getMembers();- }, [currTeam]);-- const paginatedMembers = useMemo(() => {- let result = spaceMembers || [];-- result = result.filter((member) => !member.isHidden);- if (searchTerm) {- const lowerSearchTerm = searchTerm.toLowerCase();- result = result.filter(- (member) =>- (member?.name?.toLowerCase().includes(lowerSearchTerm) ?? false) ||- member?.email.toLowerCase().includes(lowerSearchTerm) ||- member?.userTeamRole?.sharedTeamRole?.name.toLowerCase().includes(lowerSearchTerm),- );- }- result.sort((a, b) => {- let compareA: string;- let compareB: string;- switch (sortBy) {- case 'name':- compareA = a.name ?? a.email;- compareB = b.name || b.email;- break;- case 'email':- compareA = a.email;- compareB = b.email;- break;- case 'role':- compareA = a.userTeamRole.sharedTeamRole.name;- compareB = b.userTeamRole.sharedTeamRole.name;- break;- default:- return 0;- }- return sortDirection === 'asc'- ? compareA.localeCompare(compareB)- : compareB.localeCompare(compareA);- });-- return result;- }, [spaceMembers, searchTerm, sortBy, sortDirection]);-- const setMemberProperty = (id: number, property: string, value: unknown) => {- setSpaceMembers(- spaceMembers.map((member) => (member.id === id ? { ...member, [property]: value } : member)),- );- };-- const handleLogoChange = async (event: ChangeEvent<HTMLInputElement>) => {- const file = event.target.files?.[0];- if (!file) return;-- setIsUploadingLogo(true);- try {- const formData = new FormData();- formData.append('logo', file);- formData.append('teamId', currTeam?.id.toString());-- await saveCompanyLogoMutation.mutateAsync(formData);- Analytics.track('white_label_branding_updated', {- spaceId: currTeam?.id,- userId: userInfo?.user?.id,- });- } catch {- toast.error('Failed to upload logo');- } finally {- setIsUploadingLogo(false);- }- };-- const handleDeleteSpace = () => setIsDeleteSpaceOpen(true);- const handleAddMember = () => {- setInActionMember(null);- setIsAssigningMember(true);- };- const handleDeleteMember = (member: SpaceMember) => {- setSelectedMember(member);- setIsDeleteMemberOpen(true);- };- const handleEditMember = (member: SpaceMember) => {- setInActionMember({- id: member.id.toString(),- email: member.email,- roleId: member?.userTeamRole?.sharedTeamRole?.id,- roleName: member?.userTeamRole?.sharedTeamRole?.name,- teamId: currTeam.id,- removeBeforeUpdate: true,- });- setIsAssigningMember(true);- };-- const handleSpaceDeletion = async () => {- await deleteSubTeamMutation.mutateAsync({- id: currTeam.id,- userId: userInfo?.user?.id,- parentId: organization?.id,- });-- setIsDeleteSpaceOpen(false);- };-- const handleMemberDeletion = async () => {- if (!selectedMember) return;- setIsDeletingMember(true);-- setMemberProperty(selectedMember.id, 'isInProgress', true);- const response = await subTeamsAPI.unassignMemberFromTeam({- teamId: currTeam.id,- memberId: selectedMember.id.toString(),- roleId: Number(selectedMember.userTeamRole?.sharedTeamRole?.id),- });- if (response?.error) {- toast(response?.error, { type: 'error' });- }- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_MEMBER_REMOVED, {});- setMemberProperty(selectedMember.id, 'isInProgress', false);- refreshUserData();-- setIsDeletingMember(false);- setIsDeleteMemberOpen(false);- };-- return (- <div className="h-full">- <div className="mb-10 mt-4 w-full flex items-center">- <h1 className="text-2xl font-semibold inline-block">Space Settings</h1>-- <div className="ml-auto">- <Button- handleClick={handleAddMember}- className={classNames({ hidden: !membersAccess.write })}- disabled={isOrganizationMembersLoading}- >- <FaPlus className="mr-2" /> Add member- </Button>- </div>- </div>-- <div className="flex flex-col md:flex-row gap-6">- <div className="w-full md:w-1/4">- <TeamInfo- teamName={currTeam?.name}- canDeleteSpace={canDeleteSpace}- setIsEditing={setIsEditing}- />-- <CompanyLogo- canUseWhiteLabel={canUseWhiteLabel}- logo={logo}- teamsAccess={teamsAccess}- fileInputRef={fileInputRef}- handleLogoChange={handleLogoChange}- isUploadingLogo={isUploadingLogo}- />-- <button- onClick={handleDeleteSpace}- className={classNames('flex items-center text-gray-500 mt-4 absolute bottom-5 gap-1', {- hidden: !canDeleteSpace,- })}- >- {deleteSubTeamMutation.isLoading ? <Spinner classes="w-4 h-4" /> : <AiOutlineDelete />}{' '}- Delete space- </button>- </div>-- <Members- handleSearch={handleSearch}- handleSortChange={handleSortChange}- toggleSortDirection={toggleSortDirection}- searchTerm={searchTerm}- sortBy={sortBy}- sortDirection={sortDirection}- paginatedMembers={paginatedMembers}- handleDeleteMember={handleDeleteMember}- handleEditMember={handleEditMember}- />- </div>-- {errorMessage && (- <ApiErrorLine fullWidth errorMsg={errorMessage} onClose={() => setErrorMessage('')} />- )}-- {isEditing && (- <CreateSpace- isOpen={isEditing}- onClose={() => setIsEditing(false)}- onSubmit={() => {}}- editData={{ id: currTeam?.id, name: currTeam?.name || '' }}- parentTeam={organization}- />- )}-- {isAssigningMember && (- <AssignMemberModal- isOpen={isAssigningMember}- onClose={() => setIsAssigningMember(false)}- onSubmit={() => setIsAssigningMember(false)}- editData={{- id: currTeam?.id,- name: currTeam?.name || '',- organizationId: organization?.id,- }}- options={organizationMembers || []}- excludedOptions={{- key: 'email',- options: paginatedMembers- .map((member) => member.email)- .filter((e) => e !== inActionMember?.email),- }}- memberData={inActionMember}- />- )}-- <SettingsModal- onConfirm={handleSpaceDeletion}- onClose={() => setIsDeleteSpaceOpen(false)}- open={isDeleteSpaceOpen}- isLoading={deleteSubTeamMutation.isLoading}- btnText="Delete"- title="Confirm Space Deletion"- description="Are you sure you want to delete this space? Deleting space will remove all agents, data, and keys associated."- />-- <SettingsModal- onConfirm={handleMemberDeletion}- onClose={() => setIsDeleteMemberOpen(false)}- open={isDeleteMemberOpen}- isLoading={isDeletingMember}- btnText="Remove"- title="Confirm Member Removal"- description={`Are you sure you want to remove ${- selectedMember?.name ?? selectedMember?.email- } from ${currTeam.name}?`}- />- </div>- );-};diff --git a/packages/app/src/react/features/teams/pages/team-members.tsx b/packages/app/src/react/features/teams/pages/team-members.tsxdeleted file mode 100644index 9d167247..00000000--- a/packages/app/src/react/features/teams/pages/team-members.tsx+++ /dev/null@@ -1,212 +0,0 @@-/* eslint-disable @typescript-eslint/no-explicit-any */--import { useQuery } from '@tanstack/react-query';-import { useCallback, useEffect, useRef, useState } from 'react';--import UpSellModal from '@react/features/subscriptions/components/paywalls/up-sell';-import { teamAPI } from '@react/features/teams/clients';-import { TeamMembersContainer } from '@react/features/teams/components/members';-import {- useGetTeamSettings,- useInvitationActions,- useTeamInvitations,- useTeamMembers,-} from '@react/features/teams/hooks';-import { PendingInvite } from '@react/features/teams/hooks/useTeamInvitations';-import CreateMemberModal from '@react/features/teams/modals/create-member';-import ConfirmModal from '@react/shared/components/ui/modals/ConfirmModal';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';--const TeamMembersPage = () => {- const [isInvitingMember, setIsInvitingMember] = useState(false);- const [upSellModalOpen, setUpSellModalOpen] = useState(false);- const [tab, setTab] = useState('members');- const [membersSearchTerm, setMembersSearchTerm] = useState('');- const [invitesSearchTerm, setInvitesSearchTerm] = useState('');- const [errorMessage, setErrorMessage] = useState('');- const [localPendingInvites, setLocalPendingInvites] = useState<PendingInvite[]>([]);- const prevPendingInvitesRef = useRef<PendingInvite[]>([]);-- const { userInfo, userTeams, hasReadOnlyPageAccess } = useAuthCtx();- const { data: userTeamSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const { data: roleSettings } = useGetTeamSettings(teamSettingKeys.DEFAULT_ROLE);- const currentTeamId = userTeamSettings?.userSelectedTeam;-- // Get team roles data- const { data: teamRolesData } = useQuery({- queryKey: ['team_roles'],- queryFn: teamAPI.getTeamRoles,- refetchOnWindowFocus: true,- refetchOnMount: true,- refetchOnReconnect: false,- staleTime: 0,- });-- // eslint-disable-next-line react-hooks/exhaustive-deps- const teamRoles = (teamRolesData as any)?.roles || [];-- // Use custom hooks for data management- const { teamMembers, getFilteredMembers, getMembersWithStringId } = useTeamMembers();- const { getPendingInvites, getFilteredInvites, hasPendingInviteForEmail } = useTeamInvitations(- teamRoles,- teamMembers,- );- const {- rowLoading,- rowDeleting,- rowFadeOut,- handleResendInvite,- handleDeleteInvite,- showSeatLimitModal,- getSeatLimitModalProps,- } = useInvitationActions(teamRoles, hasReadOnlyPageAccess('/teams/members'));-- // Always sync localPendingInvites with fresh getPendingInvites data- useEffect(() => {- // Only update if the data actually changed (deep comparison)- if (JSON.stringify(prevPendingInvitesRef.current) !== JSON.stringify(getPendingInvites)) {- setLocalPendingInvites(getPendingInvites);- prevPendingInvitesRef.current = getPendingInvites;- }- }, [getPendingInvites]);-- // Helper function to check if a role exists in available roles- const isRoleAvailable = useCallback(- (roleId: string | number) => {- return teamRoles?.some((role: any) => role.id.toString() === roleId.toString());- },- [teamRoles],- );-- // Helper function to find the owner role- const findOwnerRole = useCallback(() => {- return teamRoles?.find((r: any) => r.isOwnerRole);- }, [teamRoles]);-- // Get the default role ID for the current team- const getDefaultRoleId = useCallback(() => {- // Use team-specific default role if available- const defaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];- if (defaultRole?.id && isRoleAvailable(defaultRole.id)) return Number(defaultRole.id);-- // Fallback to owner role- const ownerRole = findOwnerRole();- return ownerRole?.id;- }, [currentTeamId, roleSettings?.data?.defaultRoles, isRoleAvailable, findOwnerRole]);-- const currTeam = userTeams.filter((t) => t.id === userTeamSettings?.userSelectedTeam)[0];-- // Handle team type routing- useEffect(() => {- if (currTeam) {- if (window.location.pathname.includes('teams/members') && currTeam.parentId !== null) {- window.location.href = '/teams/settings';- return;- } else if (window.location.pathname.includes('teams/settings') && currTeam.parentId == null) {- window.location.href = '/teams/members';- return;- }- }- }, [currTeam]);-- const isReadOnlyAccess = hasReadOnlyPageAccess('/teams/members');-- const handleAddMemberClick = () => {- const currentMembersCount = teamMembers?.length || 0;- const quotaLimit = userInfo?.subs?.plan?.properties?.limits?.['teamMembers'] ?? Infinity;-- if (currentMembersCount >= quotaLimit) setUpSellModalOpen(true);- else {- upSellModalOpen && setUpSellModalOpen(false);- setIsInvitingMember(true);- }- };-- const handleError = (error: any) => setErrorMessage(error);- const handleErrorClose = () => setErrorMessage('');-- // Wrapper functions for invitation actions- const handleResendInviteWrapper = useCallback(- async (invite: PendingInvite) => {- await handleResendInvite(invite, setLocalPendingInvites);- },- [handleResendInvite],- );-- const handleDeleteInviteWrapper = useCallback(- async (id: string) => {- await handleDeleteInvite(id, (deletedId) => {- setLocalPendingInvites((prev) => prev.filter((invite) => invite.id !== deletedId));- });- },- [handleDeleteInvite],- );-- // Helper function to check if there's a pending invite for the same email- const hasPendingInviteForEmailWrapper = useCallback(- (email: string) => {- return hasPendingInviteForEmail(localPendingInvites, email);- },- [localPendingInvites, hasPendingInviteForEmail],- );-- // Get modal props for seat limit confirmation- const modalProps = getSeatLimitModalProps();-- return (- <div className="w-full pl-12 md:pl-0">- <TeamMembersContainer- tab={tab}- setTab={setTab}- rowFadeOut={rowFadeOut}- rowLoading={rowLoading}- rowDeleting={rowDeleting}- teamMembers={teamMembers}- errorMessage={errorMessage}- isReadOnlyAccess={isReadOnlyAccess}- membersSearchTerm={membersSearchTerm}- invitesSearchTerm={invitesSearchTerm}- localPendingInvites={localPendingInvites}- handleError={handleError}- handleErrorClose={handleErrorClose}- getFilteredInvites={getFilteredInvites}- getFilteredMembers={getFilteredMembers}- setMembersSearchTerm={setMembersSearchTerm}- setInvitesSearchTerm={setInvitesSearchTerm}- handleAddMemberClick={handleAddMemberClick}- handleResendInvite={handleResendInviteWrapper}- handleDeleteInvite={handleDeleteInviteWrapper}- getMembersWithStringId={getMembersWithStringId}- hasPendingInviteForEmail={hasPendingInviteForEmailWrapper}- />-- {isInvitingMember && (- <CreateMemberModal- onClose={() => setIsInvitingMember(false)}- defaultRole={Number(getDefaultRoleId())}- />- )}- {upSellModalOpen && (- <UpSellModal- onClose={() => setUpSellModalOpen(false)}- analytics={{- page_url: '/teams/members',- source: 'quota limit reached for adding more team members',- }}- >- Upgrade your plan to add more members.- </UpSellModal>- )}-- {/* Seat limit confirmation modal */}- {showSeatLimitModal && modalProps && (- <ConfirmModal width="w-[500px]" hideCancel={true} {...modalProps} />- )}- </div>- );-};--export default TeamMembersPage;diff --git a/packages/app/src/react/features/teams/pages/teams-roles.tsx b/packages/app/src/react/features/teams/pages/teams-roles.tsxdeleted file mode 100644index 0a5a0d2a..00000000--- a/packages/app/src/react/features/teams/pages/teams-roles.tsx+++ /dev/null@@ -1,168 +0,0 @@-import { useQuery, useQueryClient } from '@tanstack/react-query';-import { ChangeEvent, useEffect, useMemo, useState } from 'react';--import { teamAPI } from '@react/features/teams/clients';-import { AppTable } from '@react/features/teams/components/common';-import { CreateRoleModal, RolesTableRow } from '@react/features/teams/components/roles';-import { useGetTeamSettings, useStoreTeamSettings } from '@react/features/teams/hooks';-import HeaderSearch from '@react/shared/components/headerSearch';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { extractError } from '@react/shared/utils/errors';-import { teamSettingKeys } from '@shared/teamSettingKeys';-import { userSettingKeys } from '@shared/userSettingKeys';-import ApiErrorLine from '@src/react/features/error-pages/components/APIErrorLine';--const RolesPage = () => {- const [isCreatingRole, setIsCreatingRole] = useState(false);- const [searchTerm, setSearchTerm] = useState('');- const [errorMessage, setErrorMessage] = useState('');- const [hasSetDefaultRole, setHasSetDefaultRole] = useState(false);-- const { data, error, isLoading, isError } = useQuery({- queryKey: ['team_roles'],- queryFn: teamAPI.getTeamRoles,- });-- const { data: userTeamSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- const { data: roleSettings, isLoading: isUserSettingsLoading } = useGetTeamSettings(- teamSettingKeys.DEFAULT_ROLE,- );- const currentTeamId = userTeamSettings?.userSelectedTeam;-- const saveTeamSettingsMutation = useStoreTeamSettings(teamSettingKeys.DEFAULT_ROLE);- const queryClient = useQueryClient();-- const { userInfo, hasReadOnlyPageAccess } = useAuthCtx();- const user = userInfo?.user;-- const isReadOnlyAccess = hasReadOnlyPageAccess('/teams/roles');-- useEffect(() => {- if (!data?.roles || isUserSettingsLoading || hasSetDefaultRole || !currentTeamId) return;-- const ownerRole = data.roles.find((r) => r.isOwnerRole);- const currentDefaultRole = roleSettings?.data?.defaultRoles?.[currentTeamId];-- if (- ownerRole &&- (!currentDefaultRole || !data.roles.some((role) => role.id === currentDefaultRole.id))- ) {- setHasSetDefaultRole(true);- saveTeamSettingsMutation.mutate(- {- key: teamSettingKeys.DEFAULT_ROLE,- data: { defaultRoles: { [currentTeamId]: { name: ownerRole.name, id: ownerRole.id } } },- operation: 'insertOrUpdate',- },- {- onSuccess: () => {- queryClient.setQueryData(['teamSettings', teamSettingKeys.DEFAULT_ROLE], {- data: {- defaultRoles: { [currentTeamId]: { name: ownerRole.name, id: ownerRole.id } },- },- });- queryClient.invalidateQueries({ queryKey: ['teamSettings'] });- },- onError: () => {- setErrorMessage('Failed to set default role');- setHasSetDefaultRole(false);- },- },- );- }- }, [currentTeamId, data?.roles, roleSettings?.data?.defaultRoles]); // eslint-disable-line react-hooks/exhaustive-deps-- const handleSearch = (e: ChangeEvent<HTMLInputElement>) => setSearchTerm(e.target.value);-- const filteredRoles = useMemo(() => {- if (!data) return [];-- const filteredData = data.roles?.filter((role) =>- role.name.toLowerCase().includes(searchTerm.toLowerCase()),- );-- // Sort the filtered roles- return filteredData.sort((a, b) => {- // Sort owner roles to the top- if (a.isOwnerRole && !b.isOwnerRole) return -1;- if (!a.isOwnerRole && b.isOwnerRole) return 1;-- // Sort default roles (e.g., 'admin', 'edit', 'view') after owner roles but before custom roles- if (a.acl?.default_role && !b.acl?.default_role) return -1;- if (!a.acl?.default_role && b.acl?.default_role) return 1;-- // If roles are of the same type (owner, default, or custom), they will be sorted alphabetically by name- // Sort alphabetically by name if other criteria are equal- return a.name.localeCompare(b.name);- });- }, [data, searchTerm]);-- const teamMembersQuery = useQuery({- queryKey: ['team_members_list'],- queryFn: teamAPI.getTeamMembers,- });-- const handleError = (error) => setErrorMessage(error);- const handleErrorClose = () => setErrorMessage('');-- const tableHeaders = [- { name: 'Name' },- { name: 'Members' },- { name: 'Team Manager' },- { name: 'Default Role' },- { name: 'Actions' },- ];-- return (- <div>- <div className="flex mb-6 justify-between flex-wrap flex-col sm:flex-row md:flex-nowrap sm:items-center">- <HeaderSearch- handleChange={(e) => handleSearch(e)}- handleClick={() => setIsCreatingRole(true)}- label="Add Role"- addIcon- search- placeholder="Search Roles"- isReadOnlyAccess={isReadOnlyAccess}- />- </div>-- <div className="py-2">- <AppTable- rows={filteredRoles || []}- pageSize={10}- renderRow={(role) => {- return (- <RolesTableRow- teamMembers={teamMembersQuery.data?.members}- data={role}- canManage={user.userTeamRole.sharedTeamRole.canManageTeam}- isDefaultRole={- roleSettings?.data?.defaultRoles?.[currentTeamId]- ? roleSettings.data.defaultRoles[currentTeamId].id === role.id- : role.id === data?.roles?.find((r) => r.isOwnerRole)?.id- }- setError={handleError}- />- );- }}- isLoading={isLoading}- tableHeaders={tableHeaders}- />- <div className="py-4">- {(isError && (- <ApiErrorLine fullWidth errorMsg={extractError(error) || 'Error loading roles'} />- )) ||- (errorMessage && (- <ApiErrorLine fullWidth errorMsg={errorMessage} onClose={handleErrorClose} />- ))}- </div>- </div>-- {isCreatingRole && <CreateRoleModal onClose={() => setIsCreatingRole(false)} />}- </div>- );-};--export default RolesPage;diff --git a/packages/app/src/react/features/teams/pages/teams.tsx b/packages/app/src/react/features/teams/pages/teams.tsxdeleted file mode 100644index cf5ad9f2..00000000--- a/packages/app/src/react/features/teams/pages/teams.tsx+++ /dev/null@@ -1,176 +0,0 @@-/* eslint-disable react-hooks/exhaustive-deps */-import { useQuery } from '@tanstack/react-query';-import { ChangeEvent, useEffect, useMemo, useState } from 'react';-import { createPortal } from 'react-dom';--import ApiErrorLine from '@react/features/error-pages/components/APIErrorLine';-import { subTeamsAPI } from '@react/features/teams/clients';-import { AppTable, AssignMemberModal, CreateSpace } from '@react/features/teams/components/common';-import { TeamsTableRow } from '@react/features/teams/components/teams';-import HeaderSearch from '@react/shared/components/headerSearch';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings } from '@react/shared/hooks/useUserSettings';-import { TeamRoleWithMembers } from '@react/shared/types/api-results.types';-import { extractError } from '@react/shared/utils/errors';-import { userSettingKeys } from '@shared/userSettingKeys';--export const TeamsPage = () => {- const [isCreatingTeam, setIsCreatingTeam] = useState(false);- const [searchTerm, setSearchTerm] = useState('');- const [errorMessage, setErrorMessage] = useState('');- const [allAllowedMembers, setAllAllowedMembers] = useState([]);- const [filteredTeamMembers, setFilteredTeamMembers] = useState([]);- const [isAssigningMember, setIsAssigningMember] = useState(false);- const [newTeamData, setNewTeamData] = useState(null);-- const { data, error, isLoading, isError } = useQuery({- queryKey: ['getSubTeams'],- queryFn: subTeamsAPI.getSubTeams,- });- const { userInfo, userTeams } = useAuthCtx();-- const { data: userSettings } = useGetUserSettings(userSettingKeys.USER_TEAM);- // const currTeam = userTeams.filter((t) => t.id === userSettings?.userSelectedTeam)[0];- const organization = userTeams.filter((t) => t.parentId === null)[0];- const isReadOnlyAccess = !userInfo?.user?.userTeamRole?.isTeamInitiator;-- useEffect(() => {- userInfo?.user?.roles?.filter(- (role) => role.sharedTeamRole?.team?.id === userSettings?.userSelectedTeam,- )?.[0];- }, [userInfo]);-- // New query for fetching team members- const organizationMembersQuery = useQuery({- queryKey: ['organizationMembers'],- queryFn: () => subTeamsAPI.getTeamMembers(organization.id),- onSuccess: (response) => {- const teamMembers = response.members.filter((member) => !member.userTeamRole.isTeamInitiator);- setAllAllowedMembers(teamMembers || []);- },- });- const handleSearch = (e: ChangeEvent<HTMLInputElement>) => setSearchTerm(e.target.value);-- // eslint-disable-next-line @typescript-eslint/no-explicit-any- const filteredTeams: any = useMemo(() => {- if (!userInfo?.user?.roles?.length) return [];- return userInfo?.user?.roles- ?.filter((team) => {- return (- team?.sharedTeamRole?.team?.parentId &&- team?.sharedTeamRole?.team?.name.toLowerCase().includes(searchTerm.toLowerCase())- );- })- .map((team) => {- return {- id: team.sharedTeamRole.team.id,- isOwnerRole: team.isTeamInitiator,- canManageTeam: team.sharedTeamRole.canManageTeam,- acl: team.sharedTeamRole.acl,- name: team.sharedTeamRole.team.name,- members: [],- };- });- }, [data, searchTerm, userInfo]);-- useEffect(() => {- const updateMembers = async () => {- filteredTeams.forEach(async (team) => {- const members = await subTeamsAPI.getTeamMembers(team.id);- setFilteredTeamMembers((prev) => {- return {- ...prev,- [team.id]: members?.members,- // members?.members?.filter((member) => !member?.userTeamRole?.isTeamInitiator) || [],- };- });- });- };- updateMembers();- }, [filteredTeams]);-- const handleErrorClose = () => setErrorMessage('');-- const tableHeaders = [- { name: 'Name' },- { name: 'Members' },- { name: 'Manager' },- { name: 'Actions' },- ];-- return (- <div>- <div className="flex mb-4 justify-between flex-wrap flex-col sm:flex-row md:flex-nowrap sm:items-center">- <h2 className="text-2xl font-semibold mb-1">Spaces</h2>-- <HeaderSearch- handleChange={(e) => handleSearch(e)}- handleClick={() => setIsCreatingTeam(true)}- label="Add Team"- addIcon- search- placeholder="Search Spaces"- isReadOnlyAccess={isReadOnlyAccess}- isButtonHidden={true} // due to it being redundant with the add button in dropdown- />- </div>- <div className="py-6">- <AppTable- rows={filteredTeams || []}- renderRow={(team: TeamRoleWithMembers) => {- return (- <TeamsTableRow- teamMembers={filteredTeamMembers?.[team.id] || []}- data={{- id: team.id,- isOwnerRole: team.isOwnerRole,- canManageTeam: team.canManageTeam,- name: team.name,- acl: team.acl,- userTeamRole: team.userTeamRole,- }}- canManage={team.canManageTeam}- allMembers={allAllowedMembers}- />- );- }}- isLoading={isLoading || organizationMembersQuery.isLoading}- tableHeaders={tableHeaders}- />- <div className="py-4">- {(isError || organizationMembersQuery.isError) && (- <ApiErrorLine- fullWidth- errorMsg={- extractError(error || organizationMembersQuery.error) || 'Error loading data'- }- />- )}- {errorMessage && (- <ApiErrorLine fullWidth errorMsg={errorMessage} onClose={handleErrorClose} />- )}- </div>- </div>- <CreateSpace- isOpen={isCreatingTeam}- onSubmit={() => setIsAssigningMember(true)}- onClose={(data) => {- setIsCreatingTeam(false);- setNewTeamData(data);- }}- parentTeam={organization}- />- {isAssigningMember &&- createPortal(- <AssignMemberModal- isOpen={isAssigningMember}- onClose={() => setIsAssigningMember(false)}- onSubmit={() => {}}- newTeamData={{ ...newTeamData, owner: userInfo?.user?.name || userInfo?.user?.email }}- options={allAllowedMembers}- />,- document.body,- )}- </div>- );-};diff --git a/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitch.tsx b/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitch.tsxdeleted file mode 100644index 32d2ee04..00000000--- a/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitch.tsx+++ /dev/null@@ -1,61 +0,0 @@-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { useGetUserSettings, useStoreUserSettings } from '@react/shared/hooks/useUserSettings';-import { ITeam } from '@react/shared/types/entities';-import { userSettingKeys } from '@src/shared/userSettingKeys';-import { useEffect, useState } from 'react';-import { TeamSwitchList } from './TeamSwitchList';---export function TeamSwitch() {- const { userInfo, userTeams, hasReadOnlyPageAccess } = useAuthCtx();- const [canManageCurrentTeam, setCanManageCurrentTeam] = useState(false);- const [teamSwitching, setTeamSwitching] = useState(false);- const { data: userSettings, isLoading: isUserSettingsLoading } = useGetUserSettings(- userSettingKeys.USER_TEAM,- );- const storeUserSettings = useStoreUserSettings(userSettingKeys.USER_TEAM);-- const isReadOnlyAccess = hasReadOnlyPageAccess('/page');- useEffect(() => {- const teamRole = userInfo?.user?.roles?.filter(- (role: any) => role.sharedTeamRole?.team?.id === userSettings?.userSelectedTeam,- )?.[0];- setCanManageCurrentTeam(- !isReadOnlyAccess && (teamRole?.sharedTeamRole?.canManageTeam || false),- );- }, [userInfo, isReadOnlyAccess]);- // Remove console.log for production code- // console.log('SPACE', isUserSettingsLoading, userTeams, userSettings, userInfo);-- /**- * Handles team change and reloads the page- * @param {Team} team - The selected team- */- const handleTeamChange = async (team: ITeam): Promise<void> => {- try {- setTeamSwitching(true);- await storeUserSettings.mutateAsync(team.id);- window.location.href = '/';- } catch (error) {- setTeamSwitching(false);- console.error('Failed to change team:', error);- // TODO: Implement proper error handling- }- };-- const isLoading = isUserSettingsLoading || storeUserSettings.isLoading || teamSwitching;-- return (- <div>- {userTeams && userTeams.length > 0 && (- <TeamSwitchList- teamList={userTeams}- selectedTeam={userSettings?.userSelectedTeam}- onTeamChange={handleTeamChange}- canManageCurrentTeam={canManageCurrentTeam}- isLoading={isLoading}- />- )}- </div>- );-}diff --git a/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitchList.tsx b/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitchList.tsxdeleted file mode 100644index dc460ac0..00000000--- a/packages/app/src/react/shared/components/layouts/topbarPrimary/TeamSwitchList.tsx+++ /dev/null@@ -1,379 +0,0 @@-import { Combobox, Transition } from '@headlessui/react';-import { subTeamsAPI } from '@react/features/teams/clients';-import { Spinner } from '@react/shared/components/ui/spinner';-import { useAuthCtx } from '@react/shared/contexts/auth.context';-import { IMembershipTeam } from '@react/shared/types/entities';-import { EVENTS } from '@shared/posthog/constants/events';-import { CreateSpace } from '@src/react/features/teams/components/common';-import { AssignMemberModal } from '@src/react/features/teams/components/common/assign-member-modal';-import { PRICING_PLANS_V4 } from '@src/react/shared/enums';-import { PostHog } from '@src/shared/posthog';-import { useMutation, useQueryClient } from '@tanstack/react-query';-import classNames from 'classnames';-import React, { Fragment, useEffect, useMemo, useState } from 'react';-import { createPortal } from 'react-dom';-import { FaCheck } from 'react-icons/fa';-import { FaChevronDown, FaChevronUp, FaPlus } from 'react-icons/fa6';--interface TeamSwitchListProps {- teamList: IMembershipTeam[];- selectedTeam: IMembershipTeam['id'];- onTeamChange: (team: IMembershipTeam) => void;- canManageCurrentTeam: boolean;- isLoading?: boolean;-}--export function TeamSwitchList({- teamList,- selectedTeam,- onTeamChange,- canManageCurrentTeam,- isLoading = false,-}: TeamSwitchListProps) {- // const [selectedTeam, setSelectedTeam] = useState(null);- const [query, setQuery] = useState('');- const [isCreatingTeam, setIsCreatingTeam] = useState(false);- const [canCreateTeam, setCanCreateTeam] = useState(false);- const [menuScrollPosition, setMenuScrollPosition] = useState(0);- const [isAssigningMember, setIsAssigningMember] = useState(false);- const {- userInfo,- currentUserTeam,- parentTeamRoles,- parentTeamMembers,- currentUserTeamRoles,- currentUserTeamMembers,- } = useAuthCtx();-- const [allAllowedMembers, setAllAllowedMembers] = React.useState([]);- const [newTeamData, setNewTeamData] = useState(null);- const [allTeams, setAllTeams] = useState([]);-- const filteredTeams = useMemo(() => {- const teams = newTeamData ? [...teamList, newTeamData] : teamList;-- return query === ''- ? teams- : teams.filter((team) => {- return team.name.toLowerCase().includes(query.toLowerCase());- });- }, [query, teamList, newTeamData]);-- const organization = filteredTeams.filter((t) => t.parentId === null)[0];- const currTeam = filteredTeams.filter((t) => t.id === selectedTeam)[0];- useEffect(() => {- const restOfTeams = filteredTeams.filter(- (t) => !(t.id == currTeam.id || t.id == organization.id),- );- if (currTeam?.id == organization?.id) {- setAllTeams([organization, ...restOfTeams]);- } else {- setAllTeams([organization, currTeam, ...restOfTeams]);- }- }, [filteredTeams]);-- const getTeamRoles = useMutation({- mutationFn: async (teamId: string) => {- return await subTeamsAPI.getTeamMembers(teamId);- },- mutationKey: ['getTeamRoles', 'getTeamRoles'],- onSuccess: (response) => {- const teamMembers = response.members.filter((member) => !member.userTeamRole.isTeamInitiator);- setAllAllowedMembers(teamMembers || []);- const organizationAccess = response.members.filter(- (member) => userInfo?.user?.id == member.id,- )?.[0];- const organizationAccessRole = organizationAccess?.userTeamRole?.sharedTeamRole;- const canCreateTeam2 =- organizationAccessRole?.isOwnerRole ||- organizationAccessRole?.acl?.page?.['/subteams']?.access === 'rw';- setCanCreateTeam(canCreateTeam2);- },- });- useEffect(() => {- let members;- if (currentUserTeam?.id) {- members = currentUserTeamMembers || [];- }- if (currTeam?.parentId) {- members = parentTeamMembers || [];- }- if (members) {- setAllAllowedMembers(members || []);- const organizationAccess = members?.filter((member) => userInfo?.user?.id == member.id)?.[0];- const organizationAccessRole = organizationAccess?.userTeamRole?.sharedTeamRole;- const canCreateTeam2 =- organizationAccessRole?.isOwnerRole ||- organizationAccessRole?.acl?.page?.['/subteams']?.access === 'rw';- setCanCreateTeam(canCreateTeam2);- }- }, [currentUserTeam]);-- useEffect(() => {- if (organization?.id) {- getTeamRoles.mutate(organization.id);- }- }, [organization]);-- const isUserOnAllowedPlan = useMemo(() => {- const isPaid = userInfo?.subs?.plan?.paid === true;- const isNotBuilder =- userInfo?.subs?.plan?.name?.toLowerCase() !== PRICING_PLANS_V4.BUILDER.toLowerCase();- return isPaid && isNotBuilder;- }, [userInfo?.subs?.plan]);-- const queryClient = useQueryClient();-- return (- <>- <Combobox- value={currTeam.name}- onChange={(team) => {- if (team == 'CreateTeamBtn') {- setIsCreatingTeam(true);- } else {- PostHog.track(EVENTS.ACCOUNT_HIERARCHY_EVENTS.SPACE_SWITCHED, {});- onTeamChange(filteredTeams.filter((t) => t.id === team)[0]);- }- }}- disabled={isLoading}- >- {({ open }) => (- <div- className={classNames('relative mt-1', {- 'animate-pulse': isLoading,- })}- >- <div className="relative w-40 border border-solid border-gray-300 cursor-default overflow-hidden rounded-lg bg-white text-left focus:outline-none focus-visible:ring-2 focus-visible:ring-white/75 focus-visible:ring-offset-2 focus-visible:ring-offset-teal-300 sm:text-sm">- <Combobox.Input- className="w-[0px] border-none py-2 pl-3 pr-10 text-sm leading-5 text-gray-900 focus:ring-0 pointer-events-none"- displayValue={(team: any) => {- return team;- }}- tabIndex={-1}- readOnly- onChange={(event) => setQuery(event.target.value)}- />- <Combobox.Button className="absolute inset-y-0 right-0 flex items-center pr-9 w-[160px] pl-3 " data-qa="space-dropdown">- {isLoading && <Spinner classes="w-4 h-4 mr-2" />}- <span className="w-fit truncate font-normal text-base text-gray-900">- {currTeam.name}- </span>- {open && (- <FaChevronUp- className="absolute right-3 h-[18px] w-[18px] text-gray-900"- aria-hidden="true"- />- )}- {!open && (- <FaChevronDown- className="absolute right-3 h-[18px] w-[18px] text-gray-900"- aria-hidden="true"- />- )}- </Combobox.Button>- </div>- <Transition- as={Fragment}- leave="transition ease-in duration-100"- leaveFrom="opacity-100"- leaveTo="opacity-0"- afterLeave={() => setQuery('')}- >- <Combobox.Options- className={classNames(- 'z-[60] absolute mt-1 max-h-[22rem] w-[296px] px-2 border border-solid border-gray-200 -ml-[8.5rem] overflow-auto rounded-xl bg-white text-base shadow-lg ring-1 ring-black/5 focus:outline-none sm:text-sm max-md:w-[220px] max-md:-ml-[60px]',- )}- onScroll={(e: any) => {- setMenuScrollPosition(e?.target?.scrollTop || 0);- }}- >- {allTeams.length === 0 && query !== '' ? (- <div className="relative cursor-default select-none px-4 py-1 text-gray-700">- Nothing found.- </div>- ) : (- allTeams.map((team, index) => (- <Combobox.Option- key={index}- className={({ active }) => 'relative select-none p-1 cursor-pointer'}- value={team.id}- >- {({ selected, active }) => {- selected = team.id == currTeam.id;- const isOrganization = team.id == organization.id;- return (- <>- {index === 0 && <div className="h-3 w-full bg-white"></div>}- <div- className={classNames('w-full p-2 rounded-lg', {- 'bg-v2-blue': selected,- 'bg-gray-100': active && !selected,- 'bg-white': !active && !selected,- })}- >- <div className="inline-block align-middle">- <div- className={classNames(- 'w-10 h-10 bg-blue-600 rounded-full flex items-center justify-center text-base ',- {- 'bg-v2-blue/10': isOrganization && !selected,- 'bg-white/90': selected && isOrganization,- 'bg-white': selected && !isOrganization,- 'text-white bg-orange-400':- active && !selected && !isOrganization,- 'text-white bg-indigo-700':- !active && !selected && !isOrganization,- },- )}- >- {isOrganization ? (- <img- src="/img/smythos-logo.png"- alt="Organization"- className="h-6"- />- ) : (- team.name- .split(' ')- .map((word) => word[0])- .slice(0, 2)- .join('')- .toUpperCase()- )}- </div>- </div>- <div className="inline-block px-4 w-[calc(100%-62px)] align-middle">- <div- className={classNames(- 'text-base font-normal break-words text-gray-600 leading-[20px]',- {- 'text-white': selected,- 'text-gray-600': !selected,- },- )}- >- {team.name}- </div>- <span- className={classNames('text-xs font-normal', {- 'text-white': selected,- 'text-gray-500': !selected,- })}- >- {- isOrganization ? 'Organization' : ''- // 'By ' + (teamOwners[team.id][0].name || teamOwners[team.id][0].email)- }- </span>- {/* <span className="text-xs text-gray-500">- by {team.description}- </span> */}- </div>- {team.id === currTeam.id && (- <div className="inline-block w-4 align-middle">- <div className="w-4 h-4 border-2 border-v2-blue rounded bg-white/90">- <FaCheck className="w-full h-full text-v2-blue p-1" />- </div>- </div>- )}- </div>- </>- );- }}- </Combobox.Option>- ))- )}- <>- {canCreateTeam && isUserOnAllowedPlan && (- <Combobox.Option- //fix this option to the bottom of ul- className={classNames(- 'cursor-pointer select-none p-1 bg-white sticky bottom-0',- )}- value={'CreateTeamBtn'}- >- <div- className={classNames(- 'w-full p-2 rounded-lg border border-solid border-gray-300 bg-white hover:bg-gray-100',- )}- >- <div className="inline-block align-middle">- <div- className={classNames(- 'w-10 h-10 rounded-full flex items-center justify-center text-base bg-gray-200',- )}- >- <FaPlus className="w-5 h-5 text-v2-blue p-1" />- </div>- </div>- <div className="inline-block px-4 w-[calc(100%-48px)] align-middle whitespace-nowrap">- <span className="text-base font-normal text-gray-600 leading-[20px]">- Create space- </span>- </div>- </div>- <div className="h-3 w-full bg-white"></div>- </Combobox.Option>- )}- </>- </Combobox.Options>- </Transition>- </div>- )}- </Combobox>-- <CreateSpace- isOpen={isCreatingTeam}- parentTeam={organization}- onSubmit={() => setIsAssigningMember(true)}- onClose={(data) => {- setIsCreatingTeam(false);- setNewTeamData(data);-- if (data) {- queryClient.invalidateQueries(['userTeams']);-- // if (data.id) {- // onTeamChange(data);- // }- }- }}- allTeams={filteredTeams}- />- {isAssigningMember &&- createPortal(- <AssignMemberModal- isOpen={isAssigningMember}- onClose={() => {- setIsAssigningMember(false);- if (newTeamData?.id) {- onTeamChange(newTeamData);- }- }}- onSubmit={(val) => {}}- newTeamData={{ ...newTeamData, owner: userInfo?.user?.name || userInfo?.user?.email }}- options={allAllowedMembers}- />,- document.body,- )}- </>- );-- // return (- // <select- // defaultValue={selectedTeam}- // onChange={(event) => {- // const newTeam = teamList.find((team) => team.id === event.target.value);- // onTeamChange(newTeam);- // }}- // className="border-none focus:outline-none focus:ring-0"- // >- // {teamList.map((team) => (- // <option key={team.id} value={team.id}>- // {team.name}- // </option>- // ))}- // </select>- // );-}diff --git a/packages/app/src/react/shared/components/layouts/topbarPrimary/TopbarPrimary.tsx b/packages/app/src/react/shared/components/layouts/topbarPrimary/TopbarPrimary.tsxindex a10a51b6..f261ebdc 100644--- a/packages/app/src/react/shared/components/layouts/topbarPrimary/TopbarPrimary.tsx+++ b/packages/app/src/react/shared/components/layouts/topbarPrimary/TopbarPrimary.tsx@@ -6,12 +6,9 @@ import { PAGE_TITLE_MAP } from '@shared/constants/general';import { userSettingKeys } from '@shared/userSettingKeys';import { PluginComponents } from '@src/react/shared/plugins/PluginComponents';import { PluginTarget } from '@src/react/shared/plugins/Plugins';-import { FEATURE_FLAGS } from '@src/shared/constants/featureflags';import { ArrowLeft } from 'lucide-react';import { useEffect, useMemo, useState } from 'react';import { useLocation, useNavigate } from 'react-router-dom';-import { FeatureFlagged } from '../../featureFlags';-import { TeamSwitch } from './TeamSwitch';import { UserAvatar } from './UserAvatar';export const TopbarPrimary = () => {@@ -103,19 +100,9 @@ export const TopbarPrimary = () => {</div><div className="flex items-center gap-4 pb-1 md:pb-0">- <FeatureFlagged- featureFlag={FEATURE_FLAGS.TEAMS_UI}- alternateContent={- <UserAvatar- user={userInfo?.user}- profilePages={profilePages.filter((itm) => itm.name !== 'Teams')}- />- }- >- <TeamSwitch />- <UserAvatar user={userInfo?.user} profilePages={profilePages} />- </FeatureFlagged>+ {/* <TeamSwitch /> */}<PluginComponents targetId={PluginTarget.TopMenuItem} />+ <UserAvatar user={userInfo?.user} profilePages={profilePages} /></div></nav>);diff --git a/packages/app/src/react/shared/components/sidebar/Sidebar.tsx b/packages/app/src/react/shared/components/sidebar/Sidebar.tsxindex 4fb99ea6..5269e459 100644--- a/packages/app/src/react/shared/components/sidebar/Sidebar.tsx+++ b/packages/app/src/react/shared/components/sidebar/Sidebar.tsx@@ -1,10 +1,10 @@// src/components/sidebar/Sidebar.tsx+import { useGetTeamSettings } from '@react/features/teams/hooks/useTeamSettings';import { FEATURE_FLAGS } from '@shared/constants/featureflags';import { teamSettingKeys } from '@shared/teamSettingKeys';import { userSettingKeys } from '@shared/userSettingKeys';import ErrorFallback from '@src/react/features/error-pages/components/ErrorFallback';import { ErrorBoundarySuspense } from '@src/react/features/error-pages/higher-order-components/ErrorBoundary';-import { useGetTeamSettings } from '@src/react/features/teams/hooks/useTeamSettings';import {bottomLinks,sidebarMenuItems,@@ -16,8 +16,6 @@ import { useGetUserSettings } from '@src/react/shared/hooks/useUserSettings';import classNames from 'classnames';import React, { useEffect, useRef, useState } from 'react';import { Link, useLocation, useNavigate } from 'react-router-dom';-import { PluginComponents } from '../../plugins/PluginComponents';-import { PluginTarget } from '../../plugins/Plugins';import { useFeatureVisibility } from '../featureFlags';import { CollapseIcon } from '../svgs';import { BottomMenuItem } from './BottomMenuItem';@@ -190,7 +188,7 @@ export const Sidebar: React.FC = () => {isActive={activePage === page.name}/>))}- <PluginComponents targetId={PluginTarget.TopMenuItem} />+ {/* <PluginComponents targetId={PluginTarget.TopMenuItem} /> */}</div></nav><div className="mt-auto border-t border-gray-100 overflow-hidden">diff --git a/packages/app/src/shared/state_stores/auth/slices/base.slice.ts b/packages/app/src/shared/state_stores/auth/slices/base.slice.tsindex 7cd2e132..33f7e422 100644--- a/packages/app/src/shared/state_stores/auth/slices/base.slice.ts+++ b/packages/app/src/shared/state_stores/auth/slices/base.slice.ts@@ -1,12 +1,12 @@-import { PostHog } from '@src/builder-ui/services/posthog';-import { getUserInfo } from '@src/react/features/account/clients';-import { getUserOnboardingInfo } from '@src/react/features/onboarding/clients';-import { getTeamMembers, getTeamRoles } from '@src/react/features/teams/clients/subteam-api';+import { getTeamMembers, getTeamRoles } from '@react/features/teams/clients/subteam-api';import {getProperTeamSubs,getTeamSubs,getUserTeamMembers,-} from '@src/react/features/teams/clients/team-api';+} from '@react/features/teams/clients/team-api';+import { PostHog } from '@src/builder-ui/services/posthog';+import { getUserInfo } from '@src/react/features/account/clients';+import { getUserOnboardingInfo } from '@src/react/features/onboarding/clients';import { getUserSettings } from '@src/react/shared/hooks/useUserSettings';import { IMembershipTeam } from '@src/react/shared/types/entities';import { StateCreator } from 'zustand';