feat(uaa-logging): Fix logging

box · Sep 19, 2024 · f256865 · f256865
1 parent 9636014
commit f256865
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/api/Feed.js b/src/api/Feed.js
@@ -89,6 +89,7 @@ import type {
     Tasks,
     ThreadedComments as ThreadedCommentsType,
 } from '../common/types/feed';
+import { collapseFeedState } from '../elements/content-sidebar/activity-feed/activity-feed/activityFeedUtils';
 
 const TASK_NEW_INITIAL_STATUS = TASK_NEW_NOT_STARTED;
 
@@ -625,7 +626,7 @@ class Feed extends Base {
             annotationsPromise,
         ];
 
-        const fetchV2FeedItems = async (promises: Promise[]) => {
+        const fetchV2FeedItems = async (promises: Promise<FeedItems>[]) => {
             return Promise.all(promises).then(
                 ([versions: ?FileVersions, currentVersion: ?BoxItemVersion, ...feedItems]) => {
                     const versionsWithCurrent = currentVersion
@@ -636,10 +637,17 @@ class Feed extends Base {
             );
         };
 
-        const compareV2AndUaaFeedItems = async uaaFeedItems => {
+        const compareV2AndUaaFeedItems = async (uaaFeedItems, uaaResponse) => {
             fetchV2FeedItems(v2Promises).then(v2FeedItems => {
+                const transformedV2FeedItems = collapseFeedState(v2FeedItems);
+                const transformedUAAFeedItems = collapseFeedState(uaaFeedItems);
+
                 if (logAPIParity) {
-                    logAPIParity({ uaaFeedItems, v2FeedItems });
+                    logAPIParity({
+                        uaaResponse,
+                        uaaFeedItems: transformedUAAFeedItems,
+                        v2FeedItems: transformedV2FeedItems,
+                    });
                 }
             });
         };
@@ -651,7 +659,8 @@ class Feed extends Base {
                 }
 
                 const uaaFeedItems = getParsedFileActivitiesResponse(response);
-                compareV2AndUaaFeedItems(uaaFeedItems);
+                compareV2AndUaaFeedItems(uaaFeedItems, response);
+                handleFeedItems(uaaFeedItems);
             });
         } else {
             fetchV2FeedItems(v2Promises).then(v2FeedItems => {

diff --git a/src/elements/content-sidebar/ActivitySidebar.js b/src/elements/content-sidebar/ActivitySidebar.js
@@ -42,6 +42,7 @@ import {
     ORIGIN_ACTIVITY_SIDEBAR,
     SIDEBAR_VIEW_ACTIVITY,
     TASK_COMPLETION_RULE_ALL,
+    METRIC_TYPE_UAA_PARITY_METRIC,
 } from '../../constants';
 import type {
     TaskCompletionRule,