chore: Merge main to feature/telephony

.eslintrc.json

@@ -1,6 +1,7 @@
 {
   "env": {
-    "es6": true,
+    "es2017": true,
+    "mocha": true,
     "node": true
   },
   "extends": ["eslint:recommended"],

.github/ISSUE_TEMPLATE/components-bug-report.md

@@ -0,0 +1,35 @@
+---
+name: "Bug"
+about: Create a report for a bug you found in the Bot Framework Components projects (including documentation).
+title: ""
+labels: "needs-triage, bug"
+assignees: ""
+---
+
+<!-- Please search for your issue before creating a new one. >
+<!-- Complete the necessary portions of this template and delete the rest. -->
+
+## Describe the bug
+
+<!-- Give a clear and concise description of what the bug is. -->
+
+## Version
+
+<!-- What version of the component? What version of the SDK? -->
+<!-- If applicable, what version of Composer are you using? In Composer, go to Help > About > Copy and paste the contents below.-->
+
+## To Reproduce
+
+<!-- Steps to reproduce the behavior. -->
+
+## Expected behavior
+
+<!-- Give a clear and concise description of what you expected to happen. -->
+
+## Screenshots
+
+<!-- If applicable, add screenshots/gif/video to help explain your problem. -->
+
+## Additional context
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/components-feature-request.md

@@ -0,0 +1,25 @@
+---
+name: "Feature Request"
+about: Suggest an idea a Bot Framework Components project.
+title: ""
+labels: "needs-triage, feature-request"
+assignees: ""
+---
+
+<!-- Please search for your feature request before creating a new one. -->
+
+## Is your feature request related to a problem? Please describe.
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+## Describe the solution you'd like
+
+<!-- A clear and concise description of what you want to happen. -->
+
+## Describe alternatives you've considered
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/components-other.md

@@ -0,0 +1,7 @@
+---
+name: Other
+about: An empty issue template.
+title: ""
+labels: "needs-triage"
+assignees: ""
+---

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url: https://stackoverflow.com/questions/tagged/botframework
+    about: The issue tracker is not for questions, please ask general "how-to" questions on Stack Overflow.

.github/ISSUE_TEMPLATE/feature-spec.md → .github/ISSUE_TEMPLATE/prebuilt-experience-user-story.md

@@ -1,8 +1,8 @@
 ---
-name: "Feature spec"
-about: Detailed feature definition.
+name: "Prebuilt Experiences User Story"
+about: Detailed user story spec for prebuilt experiences.
 title: ""
-labels: ""
+labels: "Owner: PBX"
 assignees: ""
 ---
 
@@ -14,22 +14,22 @@ assignees: ""
 ## Description
 
 ## Conversation Design
-Links to conversation design diagrams and documents
+<!-- Links to conversation design diagrams and documents. -->
 
 ## Language Understanding
 | Intent | Sample Utterances | Prebuilt Entities | Custom Entities | Patterns |
 | ------ | ----------------------| ----------------- | ----------------- | --------- |
 
 ## Dialogs
-Describe the different dialogs to be created as part of the feature and what each will do
+<!-- Describe the different dialogs to be created as part of the feature and what each will do. -->
 
 ## Custom Actions
-Describe any custom actions that will need to be created to support the feature
+<!-- Describe any custom actions that will need to be created to support the feature. -->
 | Name | Input | Output | Notes |
 | ------ | ------ | -------- | ------- |
 
 ## Channels
-Describe any channel specific functionality or limitations that will need to be taken into consideration
+<!-- Describe any channel specific functionality or limitations that will need to be taken into consideration. -->
 
 ## Acceptance Criteria
 - [ ] Flow should work in both Direct mode (connecting to the skill bot directly

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,20 @@
-<!--- This repository only accepts pull requests related to open issues, please link the open issue in description below. See https://help.github.com/articles/closing-issues-using-keywords/ to learn about automation. 
-For example - Close #123: Description goes here. -->
+<!-- This repository only accepts pull requests related to open issues, please link the open issue in description below. -->
+<!-- See https://help.github.com/articles/closing-issues-using-keywords/ to learn about automation. -->
+<!-- For example - Close #123: Description goes here. -->
+
 ### Purpose
-*What is the context of this pull request? Why is it being done?*
+
+<!--What is the context of this pull request? Why is it being done? -->
 
 ### Changes
-*Are there any changes that need to be called out as significant or particularly difficult to grasp? (Include illustrative screenshots for context if applicable.)*
+
+<!-- Are there any changes that need to be called out as significant or particularly difficult to grasp? (Include illustrative screenshots for context if applicable.) -->
 
 ### Tests
-*Is this covered by existing tests or new ones? If no, why not?*
+
+<!-- Is this covered by existing tests or new ones? If no, why not? -->
 
 ### Feature Plan
-*Are there any remaining steps or dependencies before this issue can be fully resolved? If so, describe and link to any relevant pull requests or issues.*
 
-### Checklist
+<!-- Are there any remaining steps or dependencies before this issue can be fully resolved? If so, describe and link to any relevant pull requests or issues. -->
 
-#### General
-- [ ] I have commented my code, particularly in hard-to-understand areas	
-- [ ] I have added or updated the appropriate tests	
-- [ ] I have updated related documentation

.github/labeler.yml

@@ -11,10 +11,10 @@
  - generators/generator-bot-core-assistant/**/*
 
 "Area: Generators: Core Language":
- - generators/generator-core-language/**/*
+ - generators/generator-bot-core-language/**/*
 
 "Area: Generators: Core QnA":
- - generators/generator-bot-qna/**/*
+ - generators/generator-bot-core-qna/**/*
 
 "Area: Generators: Empty":
  - generators/generator-bot-empty/**/*
@@ -25,6 +25,9 @@
 "Area: Generators: Enterprise Calendar":
  - generators/generator-bot-enterprise-calendar/**/*
 
+"Area: Generators: Enterprise People":
+ - generators/generator-bot-enterprise-people/**/*
+
 "Area: Packages: Adaptive Cards":
  - packages/AdaptiveCards/**/*
 

README.md

@@ -8,7 +8,7 @@ You'll primarily use components through [**Bot Framework Composer**](https://git
 
 ## Creating your own components
 
-You can also create your own packages and templates for use from Composer. We document creating components [here](/docs/overview.md). You can use this repository as examples for building your own components.
+You can also create your own packages and templates for use from Composer. We document creating components [here](https://docs.microsoft.com/composer/concept-packages). You can also check out [our samples](https://github.com/microsoft/BotBuilder-Samples/tree/main/composer_samples).
 
 ## Index of Content
 
@@ -18,13 +18,13 @@ Templates are pre-built bot projects designed for specific scenarios. We use [ye
 
 | Name         | npm | Description |
 |:------------:|:---:|:------------|
-|[Empty Bot](/generators/generator-bot-empty) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-empty.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-empty) | The base empty bot. |
-|[Core Bot with Language](/generators/generator-bot-core-language) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-language.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-language) | Basic conversational bot with NLP. |
-|[Core Assistant Bot](/generators/generator-bot-core-assistant) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-assistant.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-assistant) | Basic assistant bot with no skills. |
-|[Enterprise Assistant Bot](/generators/generator-bot-enterprise-assistant) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-assistant.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-assistant) | Assistant Core + Calendar & People as skills. |
-|[Enterprise Calendar Bot](/generators/generator-bot-enterprise-calendar) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-calendar.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-calendar) | A bot for working with Calendars. |
-|[Enterprise People Bot](/generators/generator-bot-enterprise-people) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people) | A bot for searching for people on the MS Graph. |
-|[Adaptive](/generators/generator-bot-adaptive) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive) | Used by other generators to scaffold web app or functions project. |
+|[Empty Bot](/generators/generator-bot-empty) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-empty.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-empty) | A simple bot with a root dialog and greeting dialog. |
+|[Core Bot with Azure Language Understanding](/generators/generator-bot-core-language) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-language.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-language) | A simple bot with Azure Language Understanding (LUIS) and common trigger phrases used to direct the conversation flow. |
+|[Core Assistant Bot](/generators/generator-bot-core-assistant) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-assistant.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-core-assistant) | A bot with Azure Language Understanding (LUIS) and common trigger phrases used to direct the conversation flow and help customers accomplish basic tasks. Designed to be extended with skills. |
+|[Enterprise Assistant Bot](/generators/generator-bot-enterprise-assistant) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-assistant.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-assistant) | A Core Assistant Bot with Calendar & People as skills. |
+|[Enterprise Calendar Bot](/generators/generator-bot-enterprise-calendar) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-calendar.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-calendar) | A bot with the ability to interact with M365 Calendar using Microsoft Graph. |
+|[Enterprise People Bot](/generators/generator-bot-enterprise-people) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-enterprise-people) | A bot with the ability to search for people within Azure Active Directory using Microsoft Graph.|
+|[Adaptive Bot Generator](/generators/generator-bot-adaptive) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive.svg)](https://badge.fury.io/js/%40microsoft%2Fgenerator-bot-adaptive) | Used by other generators to scaffold web app or functions project. |
 
 ### Packages
 

build/templates/template-app-insights-resources.json

@@ -0,0 +1,35 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "appInsightsName": {
+            "type": "string",
+            "defaultValue": "bfcfnappinsights",
+            "metadata": {
+                "description": "The name of the Application Insights instance."
+            }
+        },
+        "location": {
+            "type": "string",
+            "defaultValue": "[resourceGroup().location]",
+            "metadata": {
+                "description": "Specifies the Azure location where the key vault should be created."
+            }
+        }
+    },
+    "resources": [
+        {
+            "type": "Microsoft.Insights/components",
+            "apiVersion": "2020-02-02-preview",
+            "name": "[parameters('appInsightsName')]",
+            "location": "[parameters('location')]",
+            "kind": "web",
+            "properties": {
+                "Application_Type":"web",
+                "IngestionMode": "ApplicationInsights",
+                "publicNetworkAccessForIngestion": "Enabled",
+                "publicNetworkAccessForQuery": "Enabled"
+            }
+        }
+    ]
+}