Relax upsert conflict violation rule from error to warning (#5674)

* Relax upsert conflict checks

* Update PR number

* Fix tests

* Update token server URL

Author: compulim

CHANGELOG.md

@@ -384,6 +384,7 @@ Breaking changes in this release:
 - Fixed activity sorting introduced in PR [#5622](https://github.com/microsoft/BotFramework-WebChat/pull/5622), part grouping, and livestreaming, by [@compulim](https://github.com/compulim) in PR [#5635](https://github.com/microsoft/BotFramework-WebChat/pull/5635)
 - Fixed Content Security Policy documentation and sample in PR, by [@compulim](https://github.com/compulim) in PR [#5648](https://github.com/microsoft/BotFramework-WebChat/pull/5648)
    - Added `img-src data:`, required for icons
+- Downgraded graph upsert conflict checks, by [@compulim](https://github.com/compulim) in PR [#5674](https://github.com/microsoft/BotFramework-WebChat/pull/5674)
 
 ## [4.18.0] - 2024-07-10
 

__tests__/html2/simple/contentSecurityPolicy.html

@@ -9,15 +9,15 @@
       Outside of the CSP defined in our /docs/CONTENT_SECURITY_POLICY.md, this test added limited number rules to enable the test case.
 
       - connect-src
-        - https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directline to fetching Direct Line token
+        - https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directline to fetching Direct Line token
       - script-src
         - 'nonce-TEST_PAGE_NONCE' to loading test related assets
       - style-src
         - 'nonce-TEST_PAGE_NONCE' to loading test related assets
     -->
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'none'; base-uri 'none'; connect-src blob: https://directline.botframework.com https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directline wss://directline.botframework.com; img-src blob: data:; script-src 'strict-dynamic' 'nonce-TEST_PAGE_NONCE'; style-src 'nonce-WEB_CHAT_NONCE' 'nonce-TEST_PAGE_NONCE'"
+      content="default-src 'none'; base-uri 'none'; connect-src blob: https://directline.botframework.com https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directline wss://directline.botframework.com; img-src blob: data:; script-src 'strict-dynamic' 'nonce-TEST_PAGE_NONCE'; style-src 'nonce-WEB_CHAT_NONCE' 'nonce-TEST_PAGE_NONCE'"
     />
   </head>
   <body>

__tests__/html2/skipped/speech.customAudioConfig.skip.html

@@ -11,7 +11,7 @@
     <script>
       run(async function () {
         const { authorizationToken, region } = await fetch(
-          'https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/speech',
+          'https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/speech',
           {
             method: 'POST'
           }

__tests__/html2/skipped/speechRecognition.simple.js

@@ -32,7 +32,7 @@ describe.each([
 
     const { token } = await (
       await fetch(
-        'https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directline',
+        'https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directline',
         { method: 'POST' }
       )
     ).json();

packages/core-graph/src/private/Graph.ts

@@ -90,7 +90,9 @@ class Graph<TInput extends GraphNode, TOutput extends GraphNode = TInput> implem
               const id = node['@id'];
 
               if (upsertedNodes.has(id)) {
-                throw new Error(`Cannot upsert a node multiple times in a single transaction (@id = "${id}")`);
+                console.warn(
+                  `botframework-webchat: Should NOT upsert a node multiple times in a single transaction (@id = "${id}")`
+                );
               }
 
               upsertedNodes.set(id, node);

packages/core-graph/src/private/Graph.upsert.spec.ts

@@ -1,4 +1,4 @@
-import { expect } from '@jest/globals';
+import { expect, jest } from '@jest/globals';
 import { scenario } from '@testduet/given-when-then';
 import Graph from './Graph';
 import './schemas/private/expectExtendValibot';
@@ -36,24 +36,26 @@ scenario('Graph.upsert()', bdd => {
     );
 
   bdd
-    .given(
-      'a Graph object',
-      () => new Graph<{ readonly '@id': Identifier; readonly name: string }>(() => () => request => request)
-    )
-    .when('act().upsert() is called twice with node of same @id', graph => {
-      try {
-        graph.act(graph => graph.upsert({ '@id': '_:b1', name: 'John Doe' }, { '@id': '_:b1', name: 'Mary Doe' }));
-      } catch (error) {
-        return error;
-      }
+    .given('a Graph object', () => ({
+      graph: new Graph<{ readonly '@id': Identifier; readonly name: string }>(() => () => request => request)
+    }))
+    .and(
+      'spying console.warn()',
+      precondition => {
+        const warn = jest.spyOn(console, 'warn');
 
-      return undefined;
+        return { ...precondition, warn };
+      },
+      ({ warn }) => {
+        warn.mockRestore();
+      }
+    )
+    .when('act().upsert() is called twice with node of same @id', ({ graph }) => {
+      graph.act(graph => graph.upsert({ '@id': '_:b1', name: 'John Doe' }, { '@id': '_:b1', name: 'Mary Doe' }));
     })
-    .then('should throw', (_, error) => {
-      expect(() => {
-        if (error) {
-          throw error;
-        }
-      }).toThrow('Cannot upsert a node multiple times in a single transaction (@id = "_:b1")');
+    .then('should throw', ({ warn }) => {
+      expect(warn).toHaveBeenCalledWith(
+        'botframework-webchat: Should NOT upsert a node multiple times in a single transaction (@id = "_:b1")'
+      );
     });
 });

packages/embed/hostDevServer.mjs

@@ -9,7 +9,7 @@ const DEFAULT_BOT_ID = 'webchat-mockbot';
 const app = express();
 
 app.get('/', async (_, res) => {
-  const tokenRes = await fetch('https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directline', { method: 'POST' });
+  const tokenRes = await fetch('https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directline', { method: 'POST' });
 
   if (!tokenRes.ok) {
     return res.send(500);

packages/test/page-object/src/globals/testHelpers/token/fetchDirectLineAppServiceExtensionToken.js

@@ -1,6 +1,6 @@
 export default async function fetchDirectLineAppServiceExtensionToken() {
   const res = await fetch(
-    'https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directlinease',
+    'https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directlinease',
     { method: 'POST' }
   );
 

packages/test/page-object/src/globals/testHelpers/token/fetchDirectLineSpeechCredentials.js

@@ -6,7 +6,7 @@ function createFetchDirectLineSpeechCredentials() {
     if (!resultPromise || Date.now() > expireAfter) {
       expireAfter = Date.now() + 5000;
       resultPromise = fetch(
-        'https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/speech',
+        'https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/speech',
         {
           method: 'POST'
         }

packages/test/page-object/src/globals/testHelpers/token/fetchDirectLineToken.js

@@ -1,5 +1,5 @@
 export default async function fetchDirectLineToken(
-  url = 'https://hawo-mockbot4-token-app.blueriver-ce85e8f0.westus.azurecontainerapps.io/api/token/directline'
+  url = 'https://hawo-mockbot4-token-app.ambitiousflower-67725bfd.westus.azurecontainerapps.io/api/token/directline'
 ) {
   const res = await fetch(url, { method: 'POST' });