Merge branch 'main' into marclundgren/dateToLocaleISOString-bufix

microsoft · Apr 7, 2024 · 8d86a1a · 8d86a1a
2 parents 90dcdf7 + 6a623fb
commit 8d86a1a
Show file tree

Hide file tree

Showing 113 changed files with 2,451 additions and 620 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,6 +91,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  Fixes [#4866](https://github.com/microsoft/BotFramework-WebChat/issues/4866). Citation modal show fill screen width on mobile device and various fit-and-finish, by [@compulim](https://github.com/compulim), in PR [#4867](https://github.com/microsoft/BotFramework-WebChat/pull/4867)
 -  Fixes [#4878](https://github.com/microsoft/BotFramework-WebChat/issues/4878). `createStore` should return type of `Redux.Store`, by [@compulim](https://github.com/compulim), in PR [#4877](https://github.com/microsoft/BotFramework-WebChat/pull/4877)
 -  Fixes [#4957](https://github.com/microsoft/BotFramework-WebChat/issues/4957). Native chevron of the accordion in citation should be hidden, by [@compulim](https://github.com/compulim), in PR [#4958](https://github.com/microsoft/BotFramework-WebChat/pull/4958)
+-  Fixes [#4870](https://github.com/microsoft/BotFramework-WebChat/issues/4870). Originator should use `claimInterpreter` instead of `ReplyAction/provider`, by [@compulim](https://github.com/compulim), in PR [#4910](https://github.com/microsoft/BotFramework-WebChat/pull/4910)
 
 ### Added
 

diff --git a/...apshots__/html/badge-js-link-definition-should-display-text-ellipsis-1-snap.png b/...apshots__/html/badge-js-link-definition-should-display-text-ellipsis-1-snap.png
diff --git a/...-accordion-js-citation-accordion-should-expand-and-collapse-on-click-1-snap.png b/...-accordion-js-citation-accordion-should-expand-and-collapse-on-click-1-snap.png
diff --git a/...-accordion-js-citation-accordion-should-expand-and-collapse-on-click-3-snap.png b/...-accordion-js-citation-accordion-should-expand-and-collapse-on-click-3-snap.png
diff --git a/..._/__image_snapshots__/html/citation-basic-js-citation-should-display-1-snap.png b/..._/__image_snapshots__/html/citation-basic-js-citation-should-display-1-snap.png
diff --git a/...-js-citation-modal-dialog-should-close-when-clicking-on-close-button-1-snap.png b/...-js-citation-modal-dialog-should-close-when-clicking-on-close-button-1-snap.png
diff --git a/...-js-citation-modal-dialog-should-close-when-clicking-on-close-button-2-snap.png b/...-js-citation-modal-dialog-should-close-when-clicking-on-close-button-2-snap.png
diff --git a/...ape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-1-snap.png b/...ape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-1-snap.png
diff --git a/...ape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-2-snap.png b/...ape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-2-snap.png
diff --git a/...dal-dialog-should-show-when-clicking-on-citation-in-link-definitions-1-snap.png b/...dal-dialog-should-show-when-clicking-on-citation-in-link-definitions-1-snap.png
diff --git a/...dal-dialog-should-show-when-clicking-on-citation-in-link-definitions-2-snap.png b/...dal-dialog-should-show-when-clicking-on-citation-in-link-definitions-2-snap.png
diff --git a/...ation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-1-snap.png b/...ation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-1-snap.png
diff --git a/...ation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-2-snap.png b/...ation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-2-snap.png
diff --git a/...dal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-1-snap.png b/...dal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-1-snap.png
diff --git a/...dal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-2-snap.png b/...dal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-2-snap.png
diff --git a/...ile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-1-snap.png b/...ile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-1-snap.png
diff --git a/...ile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-2-snap.png b/...ile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-2-snap.png
diff --git a/...c-js-provenance-should-display-1-snap.png → ...aim-interpreter-should-display-1-snap.png b/...c-js-provenance-should-display-1-snap.png → ...aim-interpreter-should-display-1-snap.png
diff --git a/...s-string-js-link-definition-should-display-identifier-of-type-string-1-snap.png b/...s-string-js-link-definition-should-display-identifier-of-type-string-1-snap.png
diff --git a/...napshots__/html/reference-js-link-definition-should-reference-sample-1-snap.png b/...napshots__/html/reference-js-link-definition-should-reference-sample-1-snap.png
diff --git a/...__/html/reply-action-js-originator-using-reply-action-should-display-1-snap.png b/...__/html/reply-action-js-originator-using-reply-action-should-display-1-snap.png
diff --git a/...n-should-word-wrap-pure-identifier-to-next-line-but-not-text-content-1-snap.png b/...n-should-word-wrap-pure-identifier-to-next-line-but-not-text-content-1-snap.png
diff --git a/__tests__/hooks/useRenderMarkdownAsHTML.js b/__tests__/hooks/useRenderMarkdownAsHTML.js
@@ -41,7 +41,7 @@ test('renderMarkdown should add accessibility text for external links', async ()
   await expect(
     pageObjects.runHook('useRenderMarkdownAsHTML', [], fn => fn('Click [here](https://aka.ms/) to find out more.'))
   ).resolves.toMatchInlineSnapshot(`
-          "<p>Click <a href=\\"https://aka.ms/\\" aria-label=\\"here Opens in a new window; external.\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">here<img src=\\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\\" alt class=\\"webchat__render-markdown__external-link-icon\\" title=\\"Opens in a new window; external.\\" /></a> to find out more.</p>
+          "<p>Click \u200B<a href=\\"https://aka.ms/\\" aria-label=\\"here Opens in a new window; external.\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">here<img src=\\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\\" alt class=\\"webchat__render-markdown__external-link-icon\\" title=\\"Opens in a new window; external.\\" /></a>\u200B to find out more.</p>
           "
         `);
 });
@@ -52,7 +52,7 @@ test('renderMarkdown should add accessibility text for external links with yue',
   await expect(
     pageObjects.runHook('useRenderMarkdownAsHTML', [], fn => fn('Click [here](https://aka.ms/) to find out more.'))
   ).resolves.toMatchInlineSnapshot(`
-          "<p>Click <a href=\\"https://aka.ms/\\" aria-label=\\"here 喺新嘅視窗開啟外部連結。\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">here<img src=\\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\\" alt class=\\"webchat__render-markdown__external-link-icon\\" title=\\"喺新嘅視窗開啟外部連結。\\" /></a> to find out more.</p>
+          "<p>Click \u200B<a href=\\"https://aka.ms/\\" aria-label=\\"here 喺新嘅視窗開啟外部連結。\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">here<img src=\\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\\" alt class=\\"webchat__render-markdown__external-link-icon\\" title=\\"喺新嘅視窗開啟外部連結。\\" /></a>\u200B to find out more.</p>
           "
         `);
 });
diff --git a/__tests__/html/accessibility.heroCard.heading.html b/__tests__/html/accessibility.heroCard.heading.html
@@ -25,7 +25,7 @@
 
         expect(document.querySelector('.ac-textBlock[role="heading"]')).toHaveProperty(
           'innerText',
-          'Details about image 1'
+          '\u200BDetails about image 1\u200B'
         );
       });
     </script>

diff --git a/__tests__/html/linkDefinition/badge.html b/__tests__/html/linkDefinition/badge.html
@@ -0,0 +1,148 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <link href="/assets/index.css" rel="stylesheet" type="text/css" />
+    <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>
+  </head>
+  <body>
+    <main id="webchat"></main>
+    <script>
+      run(async function () {
+        const { directLine, store } = testHelpers.createDirectLineEmulator();
+
+        WebChat.renderWebChat(
+          {
+            directLine,
+            store
+          },
+          document.getElementById('webchat')
+        );
+
+        await pageConditions.uiConnected();
+
+        await directLine.emulateIncomingActivity({
+          entities: [
+            {
+              '@context': 'https://schema.org',
+              '@id': '',
+              '@type': 'Message',
+              citation: [
+                {
+                  '@type': 'Claim',
+                  appearance: {
+                    '@type': 'DigitalDocument',
+                    url: 'https://example.com/1/',
+                    usageInfo: {
+                      '@id': '_:1',
+                      '@type': 'CreativeWork',
+                      description:
+                        'Nisi quis ut sint elit est nulla enim eiusmod. Deserunt commodo pariatur nostrud culpa aliquip esse pariatur exercitation nulla do proident. Est qui eiusmod aliquip deserunt labore consequat fugiat. Ullamco reprehenderit nostrud eiusmod nisi nulla esse id. Reprehenderit aliqua quis consectetur sit cupidatat fugiat Lorem ex labore. Eiusmod velit laborum quis tempor incididunt excepteur culpa esse nulla.',
+                      keywords: ['encrypted-content'],
+                      name: 'Sit veniam do irure velit est et quis ut Lorem reprehenderit commodo cillum occaecat',
+                      pattern: {
+                        '@type': 'DefinedTerm',
+                        inDefinedTermSet: 'https://www.w3.org/TR/css-color-4/',
+                        name: 'color',
+                        termCode: 'orange'
+                      }
+                    }
+                  },
+                  position: 1
+                },
+                {
+                  '@type': 'Claim',
+                  appearance: {
+                    '@type': 'DigitalDocument',
+                    text: 'Incididunt amet dolore anim commodo fugiat occaecat elit nulla do consequat. Quis incididunt occaecat labore adipisicing. Cillum sunt velit consequat irure ipsum ullamco sint ea aute. Sunt et eu ut enim aliqua cupidatat non adipisicing dolore commodo dolor magna enim. Commodo reprehenderit excepteur ad nostrud ex id aliquip deserunt eiusmod. Esse non labore nulla voluptate.',
+                    usageInfo: {
+                      '@type': 'CreativeWork',
+                      name: 'Velit exercitation',
+                      pattern: {
+                        '@type': 'DefinedTerm',
+                        inDefinedTermSet: 'https://www.w3.org/TR/css-color-4/',
+                        name: 'color',
+                        termCode: 'Yellow'
+                      }
+                    }
+                  },
+                  position: 3
+                },
+                {
+                  '@type': 'Claim',
+                  appearance: {
+                    '@type': 'DigitalDocument',
+                    text: 'Ea nisi nostrud duis dolore aliqua sit reprehenderit minim est nisi id est sit. Amet mollit ex fugiat sint aliquip Lorem eiusmod incididunt nulla laboris labore nulla. In id exercitation ut non non Lorem consequat cupidatat deserunt do aliqua exercitation. Minim commodo aliquip dolore exercitation officia commodo sint aute aute. Fugiat laborum proident cupidatat quis eiusmod excepteur voluptate commodo. Ullamco minim duis id deserunt laboris ullamco cupidatat dolor est sint ut. Anim pariatur non ea do occaecat dolor sint ad.'
+                  },
+                  position: 4
+                }
+              ],
+              type: 'https://schema.org/Message',
+              usageInfo: { '@id': '_:1' }
+            }
+          ],
+          text: 'Ipsum[1] dolore[2] cupidatat[3] magna[4] consectetur[5] do tempor est excepteur.\n\n[1]: https://example.com/1/ "Sint amet id officia dolor ex eiusmod ipsum ipsum magna fugiat"\n[2]: https://example.com/2/ "Laboris cupidatat voluptate"\n[3]: _:3 "Velit nulla culpa eu ea consectetur consectetur dolore velit"\n[4]: _:4 "Adipisicing enim nulla"\n[5]: https://example.com/5',
+          type: 'message'
+        });
+
+        await host.snapshot();
+
+        const [firstActivityElement] = pageElements.activities();
+
+        const linkDefinitions = firstActivityElement.querySelectorAll('.webchat__link-definitions__list-item');
+
+        expect(linkDefinitions).toHaveProperty('length', 5);
+
+        expect(linkDefinitions[0].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('A');
+        expect(
+          linkDefinitions[0].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Sint amet id officia dolor ex eiusmod ipsum ipsum magna fugiat');
+        expect(
+          linkDefinitions[0].querySelector('.webchat__link-definitions__list-item-badge').getAttribute('title')
+        ).toBe(
+          'Sit veniam do irure velit est et quis ut Lorem reprehenderit commodo cillum occaecat\n\nNisi quis ut sint elit est nulla enim eiusmod. Deserunt commodo pariatur nostrud culpa aliquip esse pariatur exercitation nulla do proident. Est qui eiusmod aliquip deserunt labore consequat fugiat. Ullamco reprehenderit nostrud eiusmod nisi nulla esse id. Reprehenderit aliqua quis consectetur sit cupidatat fugiat Lorem ex labore. Eiusmod velit laborum quis tempor incididunt excepteur culpa esse nulla.'
+        );
+
+        expect(linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('A');
+        expect(
+          linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Laboris cupidatat voluptate');
+        expect(linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-badge')).toBeNull();
+
+        expect(linkDefinitions[2].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('BUTTON');
+        expect(
+          linkDefinitions[2].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Velit nulla culpa eu ea consectetur consectetur dolore velit');
+        expect(
+          linkDefinitions[2].querySelector('.webchat__link-definitions__list-item-badge').getAttribute('title')
+        ).toBe('Velit exercitation');
+
+        expect(linkDefinitions[3].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('BUTTON');
+        expect(
+          linkDefinitions[3].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Adipisicing enim nulla');
+        expect(linkDefinitions[3].querySelector('.webchat__link-definitions__list-item-badge')).toBeNull();
+
+        expect(document.querySelector('.webchat__link-definitions__header-text')).toHaveProperty(
+          'textContent',
+          '5 references'
+        );
+
+        expect(document.querySelector('.webchat__link-definitions__message-sensitivity-label-text')).toHaveProperty(
+          'textContent',
+          'Sit veniam do irure velit est et quis ut Lorem reprehenderit commodo cillum occaecat'
+        );
+
+        expect(document.querySelector('.webchat__link-definitions__message-sensitivity-label')).toHaveProperty(
+          'title',
+          'Sit veniam do irure velit est et quis ut Lorem reprehenderit commodo cillum occaecat\n\nNisi quis ut sint elit est nulla enim eiusmod. Deserunt commodo pariatur nostrud culpa aliquip esse pariatur exercitation nulla do proident. Est qui eiusmod aliquip deserunt labore consequat fugiat. Ullamco reprehenderit nostrud eiusmod nisi nulla esse id. Reprehenderit aliqua quis consectetur sit cupidatat fugiat Lorem ex labore. Eiusmod velit laborum quis tempor incididunt excepteur culpa esse nulla.'
+        );
+
+        expect(
+          document.querySelector('.webchat__link-definitions__message-sensitivity-label--is-encrypted')
+        ).toBeTruthy();
+      });
+    </script>
+  </body>
+</html>
diff --git a/__tests__/html/linkDefinition/badge.js b/__tests__/html/linkDefinition/badge.js
@@ -0,0 +1,5 @@
+/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
+
+describe('link definition', () => {
+  test('should display text ellipsis', () => runHTML('linkDefinition/badge.html'));
+});
diff --git a/__tests__/html/linkDefinition/identifierAsString.html b/__tests__/html/linkDefinition/identifierAsString.html
@@ -0,0 +1,63 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <link href="/assets/index.css" rel="stylesheet" type="text/css" />
+    <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>
+  </head>
+  <body>
+    <main id="webchat"></main>
+    <script>
+      run(async function () {
+        const { directLine, store } = testHelpers.createDirectLineEmulator();
+
+        WebChat.renderWebChat(
+          {
+            directLine,
+            store
+          },
+          document.getElementById('webchat')
+        );
+
+        await pageConditions.uiConnected();
+
+        await directLine.emulateIncomingActivity({
+          text: 'Ipsum[Abc] dolore[DEF] cupidatat[xyz] magna consectetur do tempor est excepteur.\n\n[Abc]: https://example.com/1/ "Sint amet id officia dolor ex eiusmod ipsum ipsum magna fugiat"\n[DEF]: https://example.com/2/ "Laboris cupidatat voluptate"\n[xyz]: https://example.com/3/ "Velit nulla culpa eu ea consectetur consectetur dolore velit"',
+          type: 'message'
+        });
+
+        await host.snapshot();
+
+        const [firstActivityElement] = pageElements.activities();
+
+        const linkDefinitions = firstActivityElement.querySelectorAll('.webchat__link-definitions__list-item');
+
+        expect(linkDefinitions).toHaveProperty('length', 3);
+
+        expect(linkDefinitions[0].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('A');
+        expect(
+          linkDefinitions[0].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Sint amet id officia dolor ex eiusmod ipsum ipsum magna fugiat');
+
+        expect(linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('A');
+        expect(
+          linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Laboris cupidatat voluptate');
+        expect(linkDefinitions[1].querySelector('.webchat__link-definitions__list-item-badge')).toBeNull();
+
+        expect(linkDefinitions[2].querySelector('.webchat__link-definitions__list-item-box').tagName).toBe('A');
+        expect(
+          linkDefinitions[2].querySelector('.webchat__link-definitions__list-item-text').getAttribute('title')
+        ).toBe('Velit nulla culpa eu ea consectetur consectetur dolore velit');
+
+        expect(
+          [].map.call(
+            firstActivityElement.querySelectorAll('.webchat__link-definitions__badge'),
+            ({ textContent }) => textContent
+          )
+        ).toEqual(['Abc', 'DEF', 'xyz']);
+      });
+    </script>
+  </body>
+</html>
diff --git a/__tests__/html/linkDefinition/identifierAsString.js b/__tests__/html/linkDefinition/identifierAsString.js
@@ -0,0 +1,5 @@
+/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
+
+describe('link definition', () => {
+  test('should display identifier of type string', () => runHTML('linkDefinition/identifierAsString.html'));
+});