Merge branch 'main' into remove-activity-listener-composer

OEvgeny · web-flow · commit 888d58ae2ea5 · 2025-04-28T22:12:27.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,7 +85,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
 - Added support of [contentless activity in livestream](https://github.com/microsoft/BotFramework-WebChat/blob/main/docs/LIVESTREAMING.md#scenario-3-interim-activities-with-no-content), in PR [#5430](https://github.com/microsoft/BotFramework-WebChat/pull/5430), by [@compulim](https://github.com/compulim)
 - Added sliding dots typing indicator in Fluent theme, in PR [#5447](https://github.com/microsoft/BotFramework-WebChat/pull/5447) and PR [#5448](https://github.com/microsoft/BotFramework-WebChat/pull/5448), by [@compulim](https://github.com/compulim)
 - (Experimental) Add an ability to pass `completion` prop into Fluent send box and expose the component, in PR [#5466](https://github.com/microsoft/BotFramework-WebChat/pull/5466), by [@OEvgeny](https://github.com/OEvgeny)
-- Added feedback form for like/dislike button when `feedbackActionsPlacement` is `"activity-actions"`, in PR [#5460](https://github.com/microsoft/BotFramework-WebChat/pull/5460), by [@lexi-taylor](https://github.com/lexi-taylor) and [@OEvgeny](https://github.com/OEvgeny)
+- Added feedback form for like/dislike button when `feedbackActionsPlacement` is `"activity-actions"`, in PR [#5460](https://github.com/microsoft/BotFramework-WebChat/pull/5460) and in PR [#5469](https://github.com/microsoft/BotFramework-WebChat/pull/5469), by [@lexi-taylor](https://github.com/lexi-taylor) and [@OEvgeny](https://github.com/OEvgeny)
 
 ### Changed
 
diff --git a/__tests__/html2/fluentTheme/feedbackForm.noDisclaimer.html b/__tests__/html2/fluentTheme/feedbackForm.noDisclaimer.html
@@ -0,0 +1,71 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <link href="/assets/index.css" rel="stylesheet" type="text/css" />
+    <script crossorigin="anonymous" src="https://unpkg.com/@babel/standalone@7.8.7/babel.min.js"></script>
+    <script crossorigin="anonymous" src="https://unpkg.com/react@16.8.6/umd/react.production.min.js"></script>
+    <script crossorigin="anonymous" src="https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js"></script>
+    <script crossorigin="anonymous" src="/test-harness.js"></script>
+    <script crossorigin="anonymous" src="/test-page-object.js"></script>
+    <script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
+    <script crossorigin="anonymous" src="/__dist__/botframework-webchat-fluent-theme.production.min.js"></script>
+  </head>
+
+  <body>
+    <main id="webchat"></main>
+    <script type="text/babel">
+      run(async function () {
+        const {
+          React,
+          ReactDOM: { render },
+          WebChat: { FluentThemeProvider, ReactWebChat }
+        } = window; // Imports in UMD fashion.
+
+        const { directLine, store } = testHelpers.createDirectLineEmulator();
+
+        const App = () => <ReactWebChat directLine={directLine} store={store} />;
+
+        render(
+          <FluentThemeProvider>
+            <App />
+          </FluentThemeProvider>,
+          document.getElementById('webchat')
+        );
+
+        await pageConditions.uiConnected();
+
+        await directLine.emulateIncomingActivity({
+          type: 'message',
+          id: 'a-00001',
+          timestamp: 0,
+          text: 'This is a a test message without a disclaimer',
+          from: {
+            role: 'bot'
+          },
+          locale: 'en-US',
+          entities: [],
+          channelData: {
+            feedbackLoop: {
+              type: 'default'
+            }
+          }
+        });
+
+        pageElements.byTestId('send box text area').focus();
+        await host.sendShiftTab(2);
+
+        await host.sendKeys('ENTER');
+
+        await host.sendKeys('ENTER');
+
+        await pageConditions.became(
+          'feedback form is open',
+          () => document.activeElement === pageElements.byTestId('feedback sendbox'),
+          1000
+        );
+
+        await host.snapshot('local');
+      });
+    </script>
+  </body>
+</html>
diff --git a/__tests__/html2/fluentTheme/feedbackForm.noDisclaimer.html.snap-1.png b/__tests__/html2/fluentTheme/feedbackForm.noDisclaimer.html.snap-1.png
diff --git a/packages/component/src/Activity/private/getDisclaimer.ts b/packages/component/src/Activity/private/getDisclaimer.ts
@@ -1,6 +1,6 @@
 import { type WebChatActivity } from 'botframework-webchat-core';
-import hasFeedbackLoop from './hasFeedbackLoop';
+import { hasDisclaimer } from './hasFeedbackLoop';
 
 export default function getDisclaimer(activity: WebChatActivity): string | undefined {
-  return hasFeedbackLoop(activity) ? activity.channelData.feedbackLoop.disclaimer : undefined;
+  return hasDisclaimer(activity) ? activity.channelData.feedbackLoop.disclaimer : undefined;
 }
diff --git a/packages/component/src/Activity/private/hasFeedbackLoop.ts b/packages/component/src/Activity/private/hasFeedbackLoop.ts
@@ -1,17 +1,36 @@
 import { type WebChatActivity } from 'botframework-webchat-core';
-import { literal, object, safeParse, string, type InferOutput } from 'valibot';
+import { literal, object, optional, safeParse, string, union, type InferOutput } from 'valibot';
 
-const activityWithFeedbackLoopSchema = object({
+const activityWithFeedbackLoopSchemaWithDisclaimer = object({
   channelData: object({
     feedbackLoop: object({
-      disclaimer: string(),
+      disclaimer: optional(string()),
       type: literal('default')
     })
   })
 });
 
-type FeedbackActivity = WebChatActivity & InferOutput<typeof activityWithFeedbackLoopSchema>;
+const activityWithFeedbackLoopSchemaWithOutDisclaimer = object({
+  channelData: object({
+    feedbackLoop: object({
+      type: literal('default')
+    })
+  })
+});
+
+const feedbackLoopSchema = union([
+  activityWithFeedbackLoopSchemaWithDisclaimer,
+  activityWithFeedbackLoopSchemaWithOutDisclaimer
+]);
+
+type FeedbackActivity = WebChatActivity & InferOutput<typeof feedbackLoopSchema>;
+
+export function hasDisclaimer(
+  activity: WebChatActivity
+): activity is WebChatActivity & InferOutput<typeof activityWithFeedbackLoopSchemaWithDisclaimer> {
+  return safeParse(activityWithFeedbackLoopSchemaWithDisclaimer, activity).success;
+}
 
 export default function hasFeedbackLoop(activity: WebChatActivity): activity is FeedbackActivity {
-  return safeParse(activityWithFeedbackLoopSchema, activity).success;
+  return safeParse(feedbackLoopSchema, activity).success;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { type WebChatActivity } from 'botframework-webchat-core';`
`2`		`-import hasFeedbackLoop from './hasFeedbackLoop';`
	`2`	`+import { hasDisclaimer } from './hasFeedbackLoop';`
`3`	`3`
`4`	`4`	`export default function getDisclaimer(activity: WebChatActivity): string \| undefined {`
`5`		`- return hasFeedbackLoop(activity) ? activity.channelData.feedbackLoop.disclaimer : undefined;`
	`5`	`+ return hasDisclaimer(activity) ? activity.channelData.feedbackLoop.disclaimer : undefined;`
`6`	`6`	`}`