[Payment due @linhvovan29546] Create company agents

src/components/Search/SearchRouter/useNavigationSuggestions.tsx

@@ -49,6 +49,7 @@ import {isAdminSelector} from '@src/selectors/Domain';
 import {lastExpensesSearchQuerySelector} from '@src/selectors/SearchFilters';
 import {emailSelector} from '@src/selectors/Session';
 import type * as OnyxTypes from '@src/types/onyx';
+import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 import type {ReactNode} from 'react';
@@ -134,6 +135,9 @@ type BuildWorkspaceNavigationItemsParams = {
     /** Login used to evaluate Workspace membership and permissions. */
     currentUserLogin: string | undefined;
 
+    /** Personal details used to evaluate Workspace membership and permissions. */
+    currentUserPersonalDetails: CurrentUserPersonalDetails;
+
     /** Icons consumed by the shared Workspace menu source. */
     icons: Parameters<typeof getWorkspaceMenuItems>[0]['icons'];
 
@@ -295,6 +299,7 @@ function buildWorkspaceNavigationItems({
     policies,
     policyCategories,
     currentUserLogin,
+    currentUserPersonalDetails,
     icons,
     isOffline,
     isVendorMatchingBetaEnabled,
@@ -316,6 +321,7 @@ function buildWorkspaceNavigationItems({
                 policy,
                 policyID: policy.id,
                 currentUserLogin,
+                currentUserPersonalDetails,
                 icons,
                 policyCategories: policyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`],
                 isVendorMatchingBetaEnabled,
@@ -454,6 +460,7 @@ function useNavigationSuggestions(query: string, shouldWatchForApprovals = true)
         policies: allPolicies,
         policyCategories,
         currentUserLogin,
+        currentUserPersonalDetails,
         icons,
         isOffline: !!isOffline,
         isVendorMatchingBetaEnabled: isBetaEnabled(CONST.BETAS.VENDOR_MATCHING),

src/hooks/useAgents.ts

@@ -78,14 +78,14 @@ function useAgents() {
         let ownerDisplayName: string | undefined;
         let ownerPolicyID: string | undefined;
         if (agent.ownerType === CONST.AGENTS.OWNER_TYPE.PERSON) {
-            const ownerDetails = personalDetailsList?.[agent.ownerAccountID];
+            const ownerDetails = agent.ownerAccountID ? personalDetailsList?.[agent.ownerAccountID] : undefined;
             ownerDisplayName = ownerDetails?.displayName ?? ownerDetails?.login;
         } else if (agent.ownerType === CONST.AGENTS.OWNER_TYPE.WORKSPACE) {
-            const policy = policiesByAccountID.get(agent.ownerAccountID);
+            const policy = agent.ownerAccountID ? policiesByAccountID.get(agent.ownerAccountID) : undefined;
             ownerDisplayName = policy?.name;
             ownerPolicyID = policy?.id;
         } else if (agent.ownerType === CONST.AGENTS.OWNER_TYPE.DOMAIN) {
-            const ownerDetails = personalDetailsList?.[agent.ownerAccountID];
+            const ownerDetails = agent.ownerAccountID ? personalDetailsList?.[agent.ownerAccountID] : undefined;
             ownerDisplayName = ownerDetails?.login ? Str.extractEmailDomain(ownerDetails.login) : undefined;
         }
 

src/hooks/useWorkspaceMembers.ts

@@ -16,6 +16,9 @@ import useNetwork from './useNetwork';
 import {usePersonalDetailsByLogins} from './usePersonalDetailByLogin';
 import {useAllPersonalDetails} from './usePersonalDetails';
 
+/**
+ * Hook that returns a workspace's members joined with personal details, filling in fallback identities when details haven't loaded and filtering out Expensify team members on Expensify-owned policies.
+ */
 function useWorkspaceMembers(policy: OnyxEntry<Policy>) {
     const policyID = policy?.id;
     const policyOwner = policy?.owner;

src/libs/API/parameters/CreateCompanyAgentParams.ts

@@ -0,0 +1,19 @@
+import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
+
+import type CONST from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
+type CreateCompanyAgentParams = {
+    prompt: string;
+    policyID: string;
+    role: ValueOf<typeof CONST.POLICY.ROLE>;
+    firstName?: string;
+    customExpensifyAvatarID?: string;
+    file?: File | CustomRNImageManipulatorResult;
+    optimisticAccountID: number;
+    optimisticReportID: string;
+    createdReportActionID: string;
+};
+
+export default CreateCompanyAgentParams;

src/libs/API/parameters/index.ts

@@ -713,6 +713,7 @@ export type {default as UpdateDomainSecurityGroupParams} from './UpdateDomainSec
 export type {default as SetDefaultDomainSecurityGroupParams} from './SetDefaultDomainSecurityGroupParams';
 export type {default as DeleteDomainSecurityGroupParams} from './DeleteDomainSecurityGroupParams';
 export type {default as CreateAgentParams} from './CreateAgentParams';
+export type {default as CreateCompanyAgentParams} from './CreateCompanyAgentParams';
 export type {default as CreateDomainSecurityGroupParams} from './CreateDomainSecurityGroupParams';
 export type {default as UpdateAgentNameParams} from './UpdateAgentNameParams';
 export type {default as UpdateAgentPromptParams} from './UpdateAgentPromptParams';

src/libs/API/types.ts

@@ -786,6 +786,7 @@ const WRITE_COMMANDS = {
     SET_DEFAULT_DOMAIN_SECURITY_GROUP: 'SetDefaultDomainSecurityGroup',
     DELETE_DOMAIN_SECURITY_GROUP: 'DeleteDomainSecurityGroup',
     CREATE_AGENT: 'CreateAgent',
+    CREATE_COMPANY_AGENT: 'CreateCompanyAgent',
     CREATE_DOMAIN_SECURITY_GROUP: 'CreateDomainSecurityGroup',
     UPDATE_AGENT_NAME: 'UpdateAgentName',
     UPDATE_AGENT_PROMPT: 'UpdateAgentPrompt',
@@ -1610,6 +1611,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP]: Parameters.SetDefaultDomainSecurityGroupParams;
     [WRITE_COMMANDS.DELETE_DOMAIN_SECURITY_GROUP]: Parameters.DeleteDomainSecurityGroupParams;
     [WRITE_COMMANDS.CREATE_AGENT]: Parameters.CreateAgentParams;
+    [WRITE_COMMANDS.CREATE_COMPANY_AGENT]: Parameters.CreateCompanyAgentParams;
     [WRITE_COMMANDS.UPDATE_AGENT_NAME]: Parameters.UpdateAgentNameParams;
     [WRITE_COMMANDS.UPDATE_AGENT_PROMPT]: Parameters.UpdateAgentPromptParams;
     [WRITE_COMMANDS.UPDATE_AGENT_AVATAR]: Parameters.UpdateAgentAvatarParams;

src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx

@@ -4,6 +4,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import createSplitNavigator from '@libs/Navigation/AppNavigator/createSplitNavigator';
 import useSplitNavigatorScreenOptions from '@libs/Navigation/AppNavigator/useSplitNavigatorScreenOptions';
+import withAgentAccessDenied from '@libs/Navigation/AppNavigator/withAgentAccessDenied';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {WorkspaceNavigatorParamList, WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 
@@ -23,7 +24,7 @@ const CENTRAL_PANE_WORKSPACE_SCREENS = {
     [SCREENS.WORKSPACE.WORKFLOWS]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceWorkflowsPageRevamp').default,
     [SCREENS.WORKSPACE.INVOICES]: () => require<ReactComponentModule>('../../../../pages/workspace/invoices/WorkspaceInvoicesPage').default,
     [SCREENS.WORKSPACE.MEMBERS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceMembersPage').default,
-    [SCREENS.WORKSPACE.AGENTS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceAgentsPage').default,
+    [SCREENS.WORKSPACE.AGENTS]: withAgentAccessDenied(() => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceAgentsPage').default),
     [SCREENS.WORKSPACE.ROOMS]: () => require<ReactComponentModule>('../../../../pages/workspace/rooms/WorkspaceRoomsPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/PolicyAccountingPage').default,
     [SCREENS.WORKSPACE.HR]: () => require<ReactComponentModule>('../../../../pages/workspace/hr/WorkspaceHRPage').default,

src/libs/Navigation/AppNavigator/withAgentAccessDenied.tsx

@@ -3,8 +3,10 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import useIsAgentAccount from '@hooks/useIsAgentAccount';
 import useOnyx from '@hooks/useOnyx';
 
+import getTopmostFullScreenRoute from '@libs/Navigation/helpers/getTopmostFullScreenRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
+import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
@@ -46,6 +48,13 @@ function withAgentAccessDenied(getComponent: () => React.ComponentType): () => R
                                 forceReplace: true,
                             });
                         };
+                        const resetWorkspaceTabAndNavigateToHome = () => {
+                            Navigation.popRootToTop();
+                            Navigation.navigate(ROUTES.WORKSPACES_LIST.getRoute(), {
+                                forceReplace: true,
+                                afterTransition: () => Navigation.navigate(ROUTES.HOME),
+                            });
+                        };
 
                         // The guarded screen can be open inside a modal/RHP (e.g. the agent-edit page the owner was
                         // on when they tapped "Copilot into account"), or an unguarded RHP (e.g. the agent DM) can be
@@ -59,6 +68,12 @@ function withAgentAccessDenied(getComponent: () => React.ComponentType): () => R
                             return;
                         }
 
+                        const topmostFullScreenRoute = getTopmostFullScreenRoute();
+                        if (topmostFullScreenRoute?.name === NAVIGATORS.WORKSPACE_NAVIGATOR || topmostFullScreenRoute?.name === NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR) {
+                            resetWorkspaceTabAndNavigateToHome();
+                            return;
+                        }
+
                         redirectToProfile();
                     });
                 }, [isAgent]);

src/libs/actions/Agent.ts

@@ -21,6 +21,7 @@ import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type {AnyOnyxUpdate} from '@src/types/onyx/Request';
 
 import type {OnyxCollection, OnyxCollectionInputValue, OnyxUpdate} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 
 import Onyx from 'react-native-onyx';
 
@@ -40,15 +41,14 @@ function openProfilePage() {
     read(READ_COMMANDS.OPEN_PROFILE_PAGE, null);
 }
 
-function createAgent(
-    firstName: string | undefined,
+function prepareNewAgentOnyxData(
+    currentUserAccountID: number,
+    currentUserLogin: string | undefined,
     prompt: string,
-    ownerAccountID: number,
-    ownerLogin: string | undefined,
+    policy?: Policy,
+    firstName?: string,
     customExpensifyAvatarID?: string,
-    file?: File | CustomRNImageManipulatorResult,
     optimisticAvatarURI?: string,
-    policyID?: string,
 ) {
     const optimisticAccountID = Number(generateReportID());
 
@@ -59,7 +59,7 @@ function createAgent(
         avatarURI = optimisticAvatarURI;
     }
 
-    // Optimistic row for Settings > Agents until CREATE_AGENT responds. Omit `login` (server-assigned).
+    // Optimistic row for Settings > Agents until BE responds. Omit `login` (server-assigned).
     const optimisticPersonalDetail = {
         accountID: optimisticAccountID,
         displayName: firstName,
@@ -71,24 +71,29 @@ function createAgent(
     // Generate the DM report ID client-side so it can be written to Onyx and opened immediately.
     const optimisticReportID = generateReportID();
     const optimisticChatReport = buildOptimisticChatReport({
-        participantList: [ownerAccountID, optimisticAccountID],
-        ownerAccountID,
+        participantList: [currentUserAccountID, optimisticAccountID],
+        ownerAccountID: currentUserAccountID,
         optimisticReportID,
-        currentUserAccountID: ownerAccountID,
+        currentUserAccountID,
     });
+
     // Reuse the client-generated CREATED action ID when CreateAgent creates the DM.
     const createdReportActionID = rand64();
     const optimisticCreatedAction = buildOptimisticCreatedReportAction({
-        emailCreatingAction: ownerLogin ?? CONST.REPORT.OWNER_EMAIL_FAKE,
-        currentUserAccountID: ownerAccountID,
+        emailCreatingAction: currentUserLogin ?? CONST.REPORT.OWNER_EMAIL_FAKE,
+        currentUserAccountID,
         optimisticReportActionID: createdReportActionID,
     });
 
     const optimisticData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`,
-            value: {prompt, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+            value: {
+                prompt,
+                ownerAccountID: policy?.policyAccountID,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            },
         },
         {
             onyxMethod: Onyx.METHOD.SET,
@@ -128,8 +133,6 @@ function createAgent(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.AGENT}${optimisticAccountID}`,
             value: {
-                prompt,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 errors: getMicroSecondOnyxErrorWithTranslationKey('agentsPage.error.genericAdd'),
             },
         },
@@ -150,11 +153,63 @@ function createAgent(
         },
     ];
 
+    return {optimisticData, successData, failureData, optimisticAccountID, avatarURI, optimisticReportID, createdReportActionID, optimisticPersonalDetailPromise};
+}
+
+function createAgent(
+    firstName: string | undefined,
+    prompt: string,
+    currentUserAccountID: number,
+    currentUserLogin: string | undefined,
+    customExpensifyAvatarID?: string,
+    file?: File | CustomRNImageManipulatorResult,
+    optimisticAvatarURI?: string,
+) {
+    const {optimisticData, successData, failureData, optimisticAccountID, avatarURI, optimisticReportID, createdReportActionID, optimisticPersonalDetailPromise} = prepareNewAgentOnyxData(
+        currentUserAccountID,
+        currentUserLogin,
+        prompt,
+        undefined,
+        firstName,
+        customExpensifyAvatarID,
+        optimisticAvatarURI,
+    );
+
     write(
         // Flag this as the user's personal agent; the backend makes personal agents a full co-pilot of the creator.
         // optimisticReportID is the owner<->agent DM's optimistic reportID; CreateAgent creates the DM under this exact ID.
         WRITE_COMMANDS.CREATE_AGENT,
-        {firstName, prompt, customExpensifyAvatarID, file, policyID, optimisticAccountID: String(optimisticAccountID), isPersonalAgent: true, optimisticReportID, createdReportActionID},
+        {firstName, prompt, customExpensifyAvatarID, file, optimisticAccountID: String(optimisticAccountID), isPersonalAgent: true, optimisticReportID, createdReportActionID},
+        {optimisticData, successData, failureData},
+    );
+
+    return {optimisticAccountID, avatarURI, optimisticReportID, optimisticPersonalDetailPromise};
+}
+
+function createCompanyAgent(
+    currentUserAccountID: number,
+    currentUserLogin: string | undefined,
+    prompt: string,
+    policy: Policy,
+    role: ValueOf<typeof CONST.POLICY.ROLE>,
+    firstName?: string,
+    customExpensifyAvatarID?: string,
+    file?: File | CustomRNImageManipulatorResult,
+    optimisticAvatarURI?: string,
+) {
+    const {optimisticData, successData, failureData, optimisticAccountID, avatarURI, optimisticReportID, createdReportActionID, optimisticPersonalDetailPromise} = prepareNewAgentOnyxData(
+        currentUserAccountID,
+        currentUserLogin,
+        prompt,
+        policy,
+        firstName,
+        customExpensifyAvatarID,
+        optimisticAvatarURI,
+    );
+
+    write(
+        WRITE_COMMANDS.CREATE_COMPANY_AGENT,
+        {prompt, policyID: policy.id, role, firstName, customExpensifyAvatarID, file, optimisticAccountID, optimisticReportID, createdReportActionID},
         {optimisticData, successData, failureData},
     );
 
@@ -433,6 +488,7 @@ export {
     openAgentsPage,
     openProfilePage,
     createAgent,
+    createCompanyAgent,
     setNewAgentTemplate,
     clearNewAgentTemplate,
     clearAgentError,