Remove as map for simplicity

Author: compulim

packages/api/src/hooks/useGroupActivities.ts

@@ -4,33 +4,10 @@ import useWebChatAPIContext from './internal/useWebChatAPIContext';
 
 type GroupedActivities = readonly (readonly WebChatActivity[])[];
 
-type GroupedActivitiesAsMap = Map<string, GroupedActivities>;
-type GroupedActivitiesAsObject = Readonly<{
-  [key: string]: GroupedActivities;
-}>;
-
-export default function useGroupActivities(
-  as: 'map'
-): ({ activities }: Readonly<{ activities: readonly WebChatActivity[] }>) => GroupedActivitiesAsMap;
-
-export default function useGroupActivities(
-  as?: 'object' | undefined
-): ({ activities }: Readonly<{ activities: readonly WebChatActivity[] }>) => GroupedActivitiesAsObject;
-
-export default function useGroupActivities(
-  as?: 'map' | 'object' | undefined
-): ({
+export default function useGroupActivities(): ({
   activities
-}: Readonly<{ activities: readonly WebChatActivity[] }>) => GroupedActivitiesAsMap | GroupedActivitiesAsObject {
-  const { groupActivities } = useWebChatAPIContext();
-
-  if (as === 'map') {
-    return ({ activities }) => {
-      const result = groupActivities({ activities });
-
-      return new Map<string, GroupedActivities>(Object.entries(result || {}));
-    };
-  }
-
-  return groupActivities;
+}: Readonly<{ activities: readonly WebChatActivity[] }>) => Readonly<{
+  [key: string]: GroupedActivities;
+}> {
+  return useWebChatAPIContext().groupActivities;
 }

packages/component/src/providers/GroupedRenderingActivities/GroupedRenderingActivitiesComposer.tsx

@@ -32,7 +32,7 @@ const GroupedRenderingActivitiesComposer = (props: GroupedRenderingActivitiesCom
   const [{ groupActivitiesBy }] = useStyleOptions();
   const [activities] = useRenderingActivities();
   const getKeyByActivity = useGetKeyByActivity();
-  const groupActivities = useGroupActivities('map');
+  const groupActivities = useGroupActivities();
 
   const numRenderingActivitiesState = useMemo<readonly [number]>(
     () => Object.freeze([activities.length] as const),
@@ -42,7 +42,7 @@ const GroupedRenderingActivitiesComposer = (props: GroupedRenderingActivitiesCom
   const activitiesByGroupMap = useMemo<ReadonlyMap<string, readonly (readonly WebChatActivity[])[]>>(() => {
     const activitiesByGroupMap = new Map<string, readonly (readonly WebChatActivity[])[]>();
 
-    for (const [key, value] of groupActivities({ activities })) {
+    for (const [key, value] of Object.entries(groupActivities({ activities }))) {
       if (!validateAllEntriesTagged(activities, value)) {
         console.warn(
           `botframework-webchat: Not every activities are grouped in the "${key}" property. Please fix "groupActivitiesMiddleware" and group every activities`