Cherry-pick LU and Dialog fixes (#1189)

* Replace node fetch to axios to enable proxy in luis and qnamaker build (#1182)

* replace node fetch and luis client to axios to enable proxy in luis and qnamaker build

* fix tests

* Fixes #1184 (#1185)

Treats files with identical content as not being duplicated.  This is because
nuget likes to copy the same files in multiple places.

Co-authored-by: Chris McConnell <chrimc>

* fix axios bug to support https proxy (#1186)

Co-authored-by: Fei Chen <[email protected]>
Co-authored-by: Chris McConnell <[email protected]>

Author: 3 people

common/config/rush/pnpm-lock.yaml

@@ -1424,25 +1424,32 @@ export class SchemaMerger {
         for (const [ext, files] of this.files.entries()) {
             for (const [file, records] of files.entries()) {
                 const winner = records[0]
+                let winnerSrc = ''
                 const same: PathComponent[] = []
                 const conflicts: PathComponent[] = []
                 for (const alt of records) {
                     if (alt.path.endsWith('.schema') || alt.path.endsWith('.uischema')) {
                         alt.node.metadata.includesSchema = true
                     }
                     if (alt !== winner) {
-                        if (winner.node === alt.node) {
-                            same.push(alt)
-                        } else if (ext === '.schema') {
-                            // Check for same content which can happen when project and nuget from project are 
-                            // both being used.
-                            const winnerSrc = await fs.readFile(winner.path, 'utf8')
-                            const altSrc = await fs.readFile(alt.path, 'utf8')
-                            if (winnerSrc !== altSrc) {
+                        if (!winnerSrc) {
+                            winnerSrc = await fs.readFile(winner.path, 'utf8')
+                        }
+                        const altSrc = await fs.readFile(alt.path, 'utf8')
+                        // If content is identical, then don't treat as a duplicate.
+                        // This is mainly about nuget packages which like to have multiple copies of files.
+                        if (winnerSrc !== altSrc) {
+                            if (winner.node === alt.node) {
+                                same.push(alt)
+                            } else if (ext === '.schema') {
+                                const winnerSrc = await fs.readFile(winner.path, 'utf8')
+                                const altSrc = await fs.readFile(alt.path, 'utf8')
+                                if (winnerSrc !== altSrc) {
+                                    conflicts.push(alt)
+                                }
+                            } else if (ext !== '.uischema') {
                                 conflicts.push(alt)
                             }
-                        } else if (ext !== '.uischema') {
-                            conflicts.push(alt)
                         }
                     }
                 }

packages/dialog/src/library/schemaMerger.ts

@@ -0,0 +1,65 @@
+{
+    "$schema": "https://schemas.botframework.com/schemas/component/v1.0/component.schema",
+    "$role": "implements(Microsoft.IDialog)",
+    "title": "Adaptive Dialog",
+    "description": "Flexible, data driven dialog that can adapt to the conversation.",
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "title": "Id",
+            "description": "Optional dialog ID."
+        },
+        "autoEndDialog": {
+            "$ref": "schema:#/definitions/booleanExpression",
+            "title": "Auto end dialog",
+            "description": "If set to true the dialog will automatically end when there are no further actions.  If set to false, remember to manually end the dialog using EndDialog action.",
+            "default": true
+        },
+        "defaultResultProperty": {
+            "type": "string",
+            "title": "Default result property",
+            "description": "Value that will be passed back to the parent dialog.",
+            "default": "dialog.result"
+        },
+        "recognizer": {
+            "$kind": "Microsoft.IRecognizer",
+            "title": "Recognizer",
+            "description": "Input recognizer that interprets user input into intent and entities."
+        },
+        "generator": {
+            "$kind": "Microsoft.ILanguageGenerator",
+            "title": "Language Generator",
+            "description": "Language generator that generates bot responses."
+        },
+        "selector": {
+            "$kind": "Microsoft.ITriggerSelector",
+            "title": "Selector",
+            "description": "Policy to determine which trigger is executed. Defaults to a 'best match' selector (optional)."
+        },
+        "triggers": {
+            "type": "array",
+            "description": "List of triggers defined for this dialog.",
+            "title": "Triggers",
+            "items": {
+                "$kind": "Microsoft.ITrigger",
+                "title": "Event triggers",
+                "description": "Event triggers for handling events."
+            }
+        },
+        "schema": {
+            "title": "Schema",
+            "description": "Schema to fill in.",
+            "anyOf": [
+                {
+                    "$ref": "http://json-schema.org/draft-07/schema#"
+                },
+                {
+                    "type": "string",
+                    "title": "Reference to JSON schema",
+                    "description": "Reference to JSON schema .dialog file."
+                }
+            ]
+        }
+    }
+}

packages/dialog/test/commands/dialog/nuget/nuget3/1.0.0/duplicated/Microsoft.AdaptiveDialog.schema

@@ -0,0 +1,24 @@
+{
+    "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+    "form": {
+        "label": "Adaptive dialog",
+        "description": "This configures a data driven dialog via a collection of events and actions.",
+        "helpLink": "https://aka.ms/bf-composer-docs-dialog",
+        "order": [
+            "recognizer",
+            "*"
+        ],
+        "hidden": [
+            "triggers",
+            "generator",
+            "selector",
+            "schema"
+        ],
+        "properties": {
+            "recognizer": {
+                "label": "Language Understanding",
+                "description": "To understand what the user says, your dialog needs a \"Recognizer\"; that includes example words and sentences that users may use."
+            }
+        }
+    }
+}

packages/dialog/test/commands/dialog/nuget/nuget3/1.0.0/duplicated/Microsoft.AdaptiveDialog.uischema

@@ -0,0 +1,2 @@
+# template
+- template

packages/dialog/test/commands/dialog/nuget/nuget3/1.0.0/duplicated/nuget3.jpg

@@ -0,0 +1,2 @@
+# intent
+- intent

packages/dialog/test/commands/dialog/nuget/nuget3/1.0.0/duplicated/nuget3.lg

@@ -0,0 +1 @@
+{}

packages/dialog/test/commands/dialog/nuget/nuget3/1.0.0/duplicated/nuget3.lu

@@ -33,10 +33,10 @@
     ]
   },
   "dependencies": {
-    "@azure/cognitiveservices-luis-authoring": "4.0.0-preview.1",
-    "@azure/ms-rest-azure-js": "2.0.1",
     "@types/node-fetch": "~2.5.5",
     "antlr4": "~4.8.0",
+    "axios": "~0.21.1",
+    "axios-https-proxy": "^0.1.1",
     "chalk": "2.4.1",
     "console-stream": "^0.1.1",
     "deep-equal": "^1.0.1",