Move normalisation logic and remove unnecessary tests

Author: ravikiranvm

packages/blocks/slack/src/lib/actions/request-action-message.ts

@@ -17,7 +17,7 @@ import {
   username,
   usersAndChannels,
 } from '../common/props';
-import { normalizeEmojiString, slackSendMessage } from '../common/utils';
+import { slackSendMessage } from '../common/utils';
 import {
   onReceivedInteraction,
   waitForInteraction,
@@ -72,7 +72,7 @@ export const requestActionMessageAction = createAction({
 
     const actions = context.propsValue.actions as SlackActionDefinition[];
     const actionLabels = actions.map((action) => {
-      return normalizeEmojiString(action.buttonText);
+      return action.buttonText;
     });
 
     return await onReceivedInteraction(

packages/blocks/slack/src/lib/common/utils.ts

@@ -455,7 +455,3 @@ export function createMessageBlocksWithActions(
 export function normalizeEmojiString(str: string): string {
   return emoji.unemojify(str);
 }
-
-export function emojifyString(str: string): string {
-  return emoji.emojify(str);
-}

packages/blocks/slack/src/lib/common/wait-for-interaction.ts

@@ -12,7 +12,7 @@ import {
   UserSelection,
 } from './message-interactions';
 import { MessageInfo } from './message-result';
-import { emojifyString, slackUpdateMessage } from './utils';
+import { normalizeEmojiString, slackUpdateMessage } from './utils';
 
 export interface WaitForInteractionResult {
   user: string;
@@ -77,9 +77,16 @@ export async function onReceivedInteraction(
 
   const userSelection = JSON.parse(resumePayload.actionClicked);
 
-  const isResumeForActionOnThisMessage =
-    actions.includes(resumePayload.actionType) ||
-    actions.includes((userSelection as UserSelection)?.value);
+  const targetValues = [
+    resumePayload.actionType,
+    (userSelection as UserSelection)?.value,
+  ].filter(Boolean);
+
+  const matchedOriginalAction = actions.find((original) =>
+    targetValues.includes(normalizeEmojiString(original)),
+  );
+
+  const isResumeForActionOnThisMessage = Boolean(matchedOriginalAction);
 
   const isResumeForThisMessage =
     resumePayload.path === currentExecutionPath &&
@@ -115,13 +122,11 @@ export async function onReceivedInteraction(
     resumePayload.userName,
   );
 
-  const emojifiedAction = Array.isArray(userSelection)
-    ? userSelection.map((opt) => emojifyString(opt.value))
-    : emojifyString(userSelection.value);
-
   return {
     user: resumePayload.userName,
-    action: emojifiedAction,
+    action: Array.isArray(userSelection)
+      ? userSelection.map((opt) => opt.value)
+      : matchedOriginalAction || '',
     message: updatedMessage,
     userSelection,
     isExpired: false,

packages/blocks/slack/test/request-action-message.test.ts

@@ -397,99 +397,6 @@ describe('requestActionMessageAction', () => {
       expect(mockContextWithHeader.store.put).not.toHaveBeenCalled();
     });
   });
-
-  describe('emoji normalization', () => {
-    test('should normalize action labels when button text contains emojis', async () => {
-      onReceivedInteractionMock.mockResolvedValue({
-        user: 'a user',
-        action: ':game_die: Reroll',
-        isExpired: false,
-        message: 'aaaa',
-        userSelection: {
-          value: ':game_die: Reroll',
-          displayText: ':game_die: Reroll',
-        },
-      });
-
-      const mockContext = buildMockContext('Header', true);
-      mockContext.propsValue.actions = [
-        {
-          buttonText: '🎲 Reroll',
-          buttonStyle: 'primary',
-          confirmationPrompt: false,
-          confirmationPromptText: '',
-        },
-      ];
-      mockContext.store.get.mockResolvedValueOnce('aaaa');
-      mockContext.executionType = ExecutionType.RESUME;
-
-      await requestActionMessageAction.run(mockContext);
-
-      expect(onReceivedInteractionMock).toHaveBeenCalledWith(
-        'aaaa',
-        [':game_die: Reroll'],
-        mockContext,
-        mockContext.currentExecutionPath,
-      );
-    });
-
-    test('should normalize action labels when button text contains custom emojis', async () => {
-      onReceivedInteractionMock.mockResolvedValue({
-        user: 'a user',
-        action: ':custom_emoji: Action',
-        isExpired: false,
-        message: 'aaaa',
-        userSelection: {
-          value: ':custom_emoji: Action',
-          displayText: ':custom_emoji: Action',
-        },
-      });
-
-      const mockContext = buildMockContext('Header', true);
-      mockContext.propsValue.actions = [
-        {
-          buttonText: ':custom_emoji: Action',
-          buttonStyle: 'primary',
-          confirmationPrompt: false,
-          confirmationPromptText: '',
-        },
-      ];
-      mockContext.store.get.mockResolvedValueOnce('aaaa');
-      mockContext.executionType = ExecutionType.RESUME;
-
-      await requestActionMessageAction.run(mockContext);
-
-      expect(onReceivedInteractionMock).toHaveBeenCalledWith(
-        'aaaa',
-        [':custom_emoji: Action'],
-        mockContext,
-        mockContext.currentExecutionPath,
-      );
-    });
-
-    test('should normalize action labels when button text has no emojis', async () => {
-      onReceivedInteractionMock.mockResolvedValue({
-        user: 'a user',
-        action: 'Approve',
-        isExpired: false,
-        message: 'aaaa',
-        userSelection: { value: 'Approve', displayText: 'Approve' },
-      });
-
-      const mockContext = buildMockContext('Header', true);
-      mockContext.store.get.mockResolvedValueOnce('aaaa');
-      mockContext.executionType = ExecutionType.RESUME;
-
-      await requestActionMessageAction.run(mockContext);
-
-      expect(onReceivedInteractionMock).toHaveBeenCalledWith(
-        'aaaa',
-        ['Approve'],
-        mockContext,
-        mockContext.currentExecutionPath,
-      );
-    });
-  });
 });
 
 function buildMockContext(header: string, containsActions: boolean): any {