feat: handle message positioning during part grouping

Author: OEvgeny

packages/api/src/providers/GroupActivities/private/createDefaultGroupActivitiesMiddleware.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-magic-numbers */
 import { getOrgSchemaMessage, type GlobalScopePonyfill, type WebChatActivity } from 'botframework-webchat-core';
 
 import type GroupActivitiesMiddleware from '../../../types/GroupActivitiesMiddleware';
@@ -99,9 +100,12 @@ export default function createDefaultGroupActivitiesMiddleware({
                 part: bin(
                   messages,
                   ([last], [current]) =>
-                    typeof last?.isPartOf?.[0]?.['@id'] === 'string' &&
-                    last.isPartOf[0]['@id'] === current?.isPartOf?.[0]?.['@id']
-                ).map(bin => bin.map(([, activity]) => activity))
+                    typeof last?.isPartOf?.['@id'] === 'string' && last.isPartOf['@id'] === current?.isPartOf?.['@id']
+                ).map(bin =>
+                  bin
+                    .toSorted(([m1], [m2]) => (m1.position < m2.position ? -1 : m1.position > m2.position ? 1 : 0))
+                    .map(([, activity]) => activity)
+                )
               };
             }
         : undefined

packages/component/src/Middleware/ActivityGrouping/ui/PartGrouping/PartGrouping.tsx

@@ -44,7 +44,7 @@ function PartGrouping(props: PartGroupingProps) {
     [activities, lastActivity]
   );
 
-  const isGroup = activities.length > 1 || !!lastMessage?.isPartOf?.[0]?.['@id'];
+  const isGroup = activities.length > 1 || !!lastMessage?.isPartOf?.['@id'];
 
   return isGroup ? (
     <PartGroupingActivity activities={activities}>{children}</PartGroupingActivity>

packages/core/src/types/external/OrgSchema/CreativeWork.ts

@@ -1,4 +1,4 @@
-import { lazy, literal, object, parse, string, union, type ObjectEntries } from 'valibot';
+import { lazy, literal, number, object, parse, string, union, type ObjectEntries } from 'valibot';
 
 import { definedTerm, type DefinedTerm } from './DefinedTerm';
 import orgSchemaProperties from './private/orgSchemaProperties';
@@ -61,6 +61,13 @@ export type CreativeWork = Thing & {
    */
   pattern?: DefinedTerm | undefined;
 
+  /**
+   * The position of an item in a series or sequence of items.
+   *
+   * @see https://schema.org/position
+   */
+  position?: number;
+
   /**
    * The textual content of this CreativeWork.
    *
@@ -104,6 +111,7 @@ export const creativeWork = <TEntries extends ObjectEntries>(entries?: TEntries
     isBasedOn: orgSchemaProperty(lazy(() => creativeWork())),
     keywords: orgSchemaProperties(union([lazy(() => definedTerm()), string()])),
     pattern: orgSchemaProperty(lazy(() => definedTerm())),
+    position: orgSchemaProperty(number()),
     text: orgSchemaProperty(string()),
     usageInfo: orgSchemaProperty(lazy(() => creativeWork())),
 

packages/core/src/types/external/OrgSchema/Thing.ts

@@ -4,7 +4,6 @@ import { lazy, literal, looseObject, optional, parse, pipe, string, type ObjectE
 import { action, type Action } from './Action';
 import orgSchemaProperties from './private/orgSchemaProperties';
 import orgSchemaProperty from './private/orgSchemaProperty';
-import type OneOrMany from '../../OneOrMany';
 import { creativeWork, type CreativeWork } from './CreativeWork';
 
 /**
@@ -66,7 +65,7 @@ export type Thing = {
    *
    * @see https://schema.org/isPartOf
    */
-  isPartOf?: OneOrMany<CreativeWork> | undefined;
+  isPartOf?: CreativeWork | undefined;
 };
 
 const thingEntries = {
@@ -80,7 +79,7 @@ const thingEntries = {
   name: orgSchemaProperty(string()),
   potentialAction: orgSchemaProperties(lazy(() => action())),
   url: orgSchemaProperty(string()),
-  isPartOf: orgSchemaProperties(lazy(() => creativeWork()))
+  isPartOf: orgSchemaProperty(lazy(() => creativeWork()))
 };
 
 export const thing = <TEntries extends ObjectEntries>(entries?: TEntries | undefined) =>