From 599bfdd1247e4e19b511488560f75e1ed41b5e13 Mon Sep 17 00:00:00 2001
From: Thomas Chung <thomas.chung@live.com>
Date: Tue, 22 Jun 2021 11:40:04 -0700
Subject: [PATCH 1/2] Add back NameEntity to the dialog invoke

---
 .../GetManagerDialog/GetManagerDialog.dialog  |  3 +-
 .../GetManagerDialog.dialog.schema            | 42 +------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog b/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog
index d8dc9fee58..7110bc2ca4 100644
--- a/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog
+++ b/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog
@@ -33,7 +33,8 @@
           "dialog": "ResolveUserDialog",
           "resultProperty": "turn.UserFound",
           "options": {
-            "UserIdFound": "=$UserIdFound"
+            "UserIdFound": "=$UserIdFound",
+            "NameEntity": "=$NameEntity"
           }
         },
         {
diff --git a/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema b/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
index ac2a461eab..2c4cd0de9d 100644
--- a/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
+++ b/skills/declarative/People/People/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
@@ -3,49 +3,9 @@
   "$role": "implements(Microsoft.IDialog)",
   "title": "GetManagerDialog",
   "type": "object",
-  "properties": {
-    "nameEntity": {
-      "description": "Name of the entity to search",
-      "$ref": "#/definitions/stringExpression",
-      "title": "Name Entity"
-    }
-  },
+  "properties": {},
   "$result": {
     "type": "object",
     "properties": {}
-  },
-  "definitions": {
-    "equalsExpression": {
-      "$role": "expression",
-      "type": "string",
-      "title": "Equals Expression",
-      "description": "Expression starting with =.",
-      "pattern": "^=.*\\S.*",
-      "examples": [
-        "=user.name"
-      ]
-    },
-    "stringExpression": {
-      "$role": "expression",
-      "title": "String or expression",
-      "description": "Interpolated string or expression to evaluate.",
-      "oneOf": [
-        {
-          "type": "string",
-          "title": "String",
-          "description": "Interpolated string",
-          "pattern": "^(?!(=)).*",
-          "examples": [
-            "Hello ${user.name}"
-          ]
-        },
-        {
-          "$ref": "#/definitions/equalsExpression",
-          "examples": [
-            "=concat('x','y','z')"
-          ]
-        }
-      ]
-    }
   }
 }

From 93f1f894a378f02275dc19d61fc4ec2e7a0249a1 Mon Sep 17 00:00:00 2001
From: Thomas Chung <thomas.chung@live.com>
Date: Tue, 22 Jun 2021 11:42:30 -0700
Subject: [PATCH 2/2] Update People template

---
 .../GetManagerDialog/GetManagerDialog.dialog  |  3 +-
 .../GetManagerDialog.dialog.schema            | 44 +------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog
index ad01d4f737..1e4f4643c7 100644
--- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog
+++ b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog
@@ -33,7 +33,8 @@
           "dialog": "ResolveUserDialog",
           "resultProperty": "turn.UserFound",
           "options": {
-            "UserIdFound": "=$UserIdFound"
+            "UserIdFound": "=$UserIdFound",
+            "NameEntity": "=$NameEntity"
           }
         },
         {
diff --git a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
index ac2a461eab..20c0b9ba43 100644
--- a/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
+++ b/generators/generator-bot-enterprise-people/generators/app/templates/dialogs/GetManagerDialog/GetManagerDialog.dialog.schema
@@ -3,49 +3,9 @@
   "$role": "implements(Microsoft.IDialog)",
   "title": "GetManagerDialog",
   "type": "object",
-  "properties": {
-    "nameEntity": {
-      "description": "Name of the entity to search",
-      "$ref": "#/definitions/stringExpression",
-      "title": "Name Entity"
-    }
-  },
+  "properties": {},
   "$result": {
     "type": "object",
     "properties": {}
-  },
-  "definitions": {
-    "equalsExpression": {
-      "$role": "expression",
-      "type": "string",
-      "title": "Equals Expression",
-      "description": "Expression starting with =.",
-      "pattern": "^=.*\\S.*",
-      "examples": [
-        "=user.name"
-      ]
-    },
-    "stringExpression": {
-      "$role": "expression",
-      "title": "String or expression",
-      "description": "Interpolated string or expression to evaluate.",
-      "oneOf": [
-        {
-          "type": "string",
-          "title": "String",
-          "description": "Interpolated string",
-          "pattern": "^(?!(=)).*",
-          "examples": [
-            "Hello ${user.name}"
-          ]
-        },
-        {
-          "$ref": "#/definitions/equalsExpression",
-          "examples": [
-            "=concat('x','y','z')"
-          ]
-        }
-      ]
-    }
   }
-}
+}
\ No newline at end of file