Merge pull request #95934 from s77rt/deleteAgent-handle-error

Display DeleteAgent error on failure

Author: yuwenmemon

src/libs/actions/Agent.ts

@@ -301,7 +301,7 @@ function deleteAgent(accountID: number, agentLogin?: string, allPolicies?: OnyxC
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`,
             value: {
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                pendingAction: null,
                 errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
             },
         },

src/pages/settings/Agents/AgentsPage.tsx

@@ -79,9 +79,6 @@ function AgentsPage() {
         }
     };
 
-    const shouldShowErrors = (pendingAction: PendingAction | null | undefined) =>
-        pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-
     const agents: AgentRowData[] = Object.entries(agentPrompts ?? {}).flatMap(([key, agentPrompt]) => {
         const accountID = Number(key.slice(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT.length));
         const details = personalDetailsList?.[accountID];
@@ -96,7 +93,7 @@ function AgentsPage() {
         }
 
         const mergedErrors = {
-            ...(shouldShowErrors(pendingAction) ? getLatestError(agentPrompt?.errors ?? undefined) : {}),
+            ...getLatestError(agentPrompt?.errors ?? undefined),
             ...getLatestError(agentPrompt?.nameErrors ?? undefined),
             ...getLatestError(agentPrompt?.promptErrors ?? undefined),
             ...getLatestError(agentPrompt?.avatarErrors ?? undefined),

tests/unit/AgentActionTest.ts

@@ -428,14 +428,14 @@ describe('deleteAgent', () => {
         expect((personalDetailUpdate?.value as Record<string, unknown>)[TEST_ACCOUNT_ID]).toBeNull();
     });
 
-    it('failure data merges pendingAction DELETE and errors on the prompt key', () => {
+    it('failure data clears the pendingAction and merges errors on the prompt key', () => {
         deleteAgent(TEST_ACCOUNT_ID);
 
         const {failureData} = getWriteOptions();
         const promptUpdate = failureData.find((u) => u.key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`);
 
         expect(promptUpdate?.onyxMethod).toBe('merge');
-        expect(promptUpdate?.value).toMatchObject({pendingAction: 'delete'});
+        expect(promptUpdate?.value).toMatchObject({pendingAction: null});
         expect((promptUpdate?.value as Record<string, unknown>)?.errors).toBeTruthy();
     });