Clean up

Author: compulim

packages/component/src/Activity/ActivityFeedback.tsx

@@ -2,11 +2,10 @@ import { hooks } from 'botframework-webchat-api';
 import { getOrgSchemaMessage, OrgSchemaAction, parseAction, WebChatActivity } from 'botframework-webchat-core';
 import classNames from 'classnames';
 import React, { memo, useCallback, useMemo, useState } from 'react';
-import { defaultFeedbackEntities } from './private/DefaultFeedbackEntities';
-import { hasFeedbackLoop, getDisclaimer } from './private/feedbackActivity.util';
 import useStyleSet from '../hooks/useStyleSet';
-import Feedback from './private/Feedback';
 import dereferenceBlankNodes from '../Utils/JSONLinkedData/dereferenceBlankNodes';
+import Feedback from './private/Feedback';
+import { getDisclaimer, hasFeedbackLoop } from './private/feedbackActivity.util';
 import FeedbackForm from './private/FeedbackForm';
 
 const { useStyleOptions } = hooks;
@@ -18,9 +17,29 @@ type ActivityFeedbackProps = Readonly<{
 const parseActivity = (entities?: WebChatActivity['entities']) => {
   const graph = dereferenceBlankNodes(entities || []);
   const messageThing = getOrgSchemaMessage(graph);
+
   return { graph, messageThing };
 };
 
+const defaultFeedbackEntities = {
+  '@context': 'https://schema.org',
+  '@id': '',
+  '@type': 'Message',
+  type: 'https://schema.org/Message',
+
+  keywords: [],
+  potentialAction: [
+    {
+      '@type': 'LikeAction',
+      actionStatus: 'PotentialActionStatus'
+    },
+    {
+      '@type': 'DislikeAction',
+      actionStatus: 'PotentialActionStatus'
+    }
+  ]
+};
+
 function ActivityFeedback({ activity }: ActivityFeedbackProps) {
   const [{ feedbackActionsPlacement }] = useStyleOptions();
   const [{ feedbackForm }] = useStyleSet();
@@ -33,6 +52,7 @@ function ActivityFeedback({ activity }: ActivityFeedbackProps) {
     if (isFeedbackLoopSupported) {
       return parseActivity([defaultFeedbackEntities]);
     }
+
     return parseActivity(activity.entities);
   }, [activity.entities, isFeedbackLoopSupported]);
 
@@ -58,10 +78,8 @@ function ActivityFeedback({ activity }: ActivityFeedbackProps) {
   }, [graph, messageThing?.potentialAction]);
 
   const handleFeedbackActionClick = useCallback(
-    (action?: OrgSchemaAction) => {
-      setSelectedAction(action === selectedAction ? undefined : action);
-    },
-    [selectedAction]
+    (action?: OrgSchemaAction) => setSelectedAction(action === selectedAction ? undefined : action),
+    [selectedAction, setSelectedAction]
   );
 
   const FeedbackComponent = useMemo(

packages/component/src/Activity/private/DefaultFeedbackEntities.ts

@@ -1,18 +1,16 @@
 import { type WebChatActivity } from 'botframework-webchat-core';
-import { literal, object, safeParse, string } from 'valibot';
+import { literal, object, safeParse, string, type InferOutput } from 'valibot';
 
 const activityWithFeedbackLoopSchema = object({
   channelData: object({
     feedbackLoop: object({
-      type: literal('default'),
-      disclaimer: string()
+      disclaimer: string(),
+      type: literal('default')
     })
   })
 });
 
-type FeedbackActivity = WebChatActivity & {
-  channelData: typeof activityWithFeedbackLoopSchema;
-};
+type FeedbackActivity = WebChatActivity & InferOutput<typeof activityWithFeedbackLoopSchema>;
 
 export const hasFeedbackLoop = (activity: WebChatActivity): activity is FeedbackActivity =>
   safeParse(activityWithFeedbackLoopSchema, activity).success;