Merge branch 'master' into pehecke-solutions-update

Author: phecke

.openpublishing.redirection.json

@@ -65,6 +65,11 @@
       "redirect_url": "https://docs.microsoft.com/power-platform/alm/removing-dependencies",
       "redirect_document_id": "false"
     },
+    {
+      "source_path": "powerapps-docs/maker/canvas-apps/dev-appsource-test-drive.md",
+      "redirect_url": "dev-enterprise-intro",
+      "redirect_document_id": "false"
+    }, 
     {
       "source_path": "powerapps-docs/developer/common-data-service/compress-extract-solution-file-solutionpackager.md",
       "redirect_url": "https://docs.microsoft.com/power-platform/alm/solution-packager-tool",

powerapps-docs/chatbots.md

@@ -0,0 +1,25 @@
+---
+title: Create chatbots from Power Apps | Microsoft Docs
+description: Provides information about how you can use AI Builder in Power Apps.
+author: iaanw
+ms.service: powerapps
+ms.topic: conceptual
+ms.custom: 
+ms.date: 06/26/2020
+ms.author: iawilt
+ms.reviewer: mvakoc
+ms.custom: pva, power-apps
+---
+# Create chatbots from Power Apps
+
+Power Virtual Agents allows you to quickly create and maintain intelligent chatbots using a no-code interface. App makers can create and manage their chatbots directly from [Power Apps](https://make.powerapps.com). 
+
+![Chatbots from Power Apps](media/chatbots.png "Chatbots from Power Apps")
+
+You can create and manage your chatbots using the **Chatbots** option in the left navigation pane.
+
+- To create a chatbot, select **Chatbots**, then **Create**, and then select **New chatbot**. This will take you directly to the Power Virtual Agents portal where you can create your chatbot. For more information, see [Create a bot in Power Virtual Agents](https://docs.microsoft.com/power-virtual-agents/authoring-first-bot)
+
+- After you have chatbots in your environment, you'll be able to view them by selecting **Chatbots** and then **List**. You can navigate directly to the Power Virtual Agents portal to update your bot or view analytics.
+
+More information: [Power Virtual Agents docs](https://docs.microsoft.com/power-virtual-agents)

powerapps-docs/maker/TOC.yml

@@ -133,6 +133,8 @@
         href: ../user/export-excel-pivottable.md
       - name: Merge duplicate records
         href: ../user/merge-duplicate-records.md
+      - name: Troubleshoot export to Excel  
+        href: ../user/ts-export-to-excel.md
     - name: Reports
       items:
       - name: Work with reports
@@ -915,6 +917,18 @@
         href: ./canvas-apps/sharepoint-scenario-alerts-flow.md
       - name: Walk through the completed scenario
         href: ./canvas-apps/sharepoint-scenario-summary.md
+      - name: SharePoint integration scenarios
+        items:
+        - name: SharePoint scenarios overview
+          href: ./canvas-apps/sharepoint/scenarios-intro.md
+        - name: How to filter a search list in an app?
+          href: ./canvas-apps/sharepoint/scenarios-filter-search-list.md
+        - name: How to use drop down list with choices from lookup column in a SharePoint list?
+          href: ./canvas-apps/sharepoint/scenarios-choice-to-lookup.md
+        - name: How to customize an app screen baed on column status inside SharePoint list?
+          href: ./canvas-apps/sharepoint/scenarios-customize-view-based-on-column-status.md
+        - name: How to work with permissions in a lookup list from SharePoint site?
+          href: ./canvas-apps/sharepoint/scenarios-lookup-list-permissions.md
     - name: Cognitive Services
       href: ./canvas-apps/cognitive-services-api.md
     - name: Transform your InfoPath forms to Power Apps
@@ -1467,16 +1481,16 @@
   items:
   - name: What is Common Data Service?
     href: ./common-data-service/data-platform-intro.md
-  - name: Why choose Common Data Service? 
-    items:
-      - name: Overview
-        href: ./common-data-service/why-cds-overview.md  
-      - name: Work with any data
-        href: ./common-data-service/why-cds-work-with-data.md
-      - name: Importing and exporting data
-        href: ./common-data-service/why-cds-import-export.md
-      - name: Work with any app
-        href: ./common-data-service/why-cds-any-type-app.md                
+  - name: Why choose Common Data Service? 	
+    items:	
+    - name: Overview	
+      href: ./common-data-service/why-cds-overview.md  	
+    - name: Work with any data	
+      href: ./common-data-service/why-cds-work-with-data.md	
+    - name: Importing and exporting data	
+      href: ./common-data-service/why-cds-import-export.md	
+    - name: Work with any app	
+      href: ./common-data-service/why-cds-any-type-app.md
   - name: Work with entities
     items:
     - name: Entity overview
@@ -1676,6 +1690,8 @@
   - name: For developers
     href: ../developer/common-data-service/overview.md
     # href: ../developer/common-data-service/TOC.yml  changing this to have developer TOC rather than buried in maker toc
+- name: Chatbots
+  href: ../chatbots.md
 - name: AI Builder
   href: ../use-ai-builder.md
 - name: Sample apps and solutions
@@ -1708,6 +1724,18 @@
       href: ../sample-apps/regional-emergency-response/portals-user.md
   - name: Transfer data from hospital to regional
     href: ../sample-apps/emergency-response-data-transfer.md
+  - name: Higher Education Crisis Financial Impact Tracker
+    items:
+    - name: Overview
+      href: ../sample-apps/crisis-financial-impact-tracker/overview.md
+    - name: Deploy the solution
+      href: ../sample-apps/crisis-financial-impact-tracker/deploy-solution.md
+    - name: Use the admin app
+      href: ../sample-apps/crisis-financial-impact-tracker/configure-data.md
+    - name: Use the mobile app
+      href: ../sample-apps/crisis-financial-impact-tracker/use-mobile-app.md
+    - name: Use dashboards
+      href: ../sample-apps/crisis-financial-impact-tracker/configure-dashboards.md
 - name: Learn from others
   items:
   - name: Blog
@@ -1727,4 +1755,4 @@
   - name: Troubleshoot Power Query
     href: ./common-data-service/data-platform-cds-newentity-troubleshooting-mashup.md
   - name: Support
-    href: https://powerapps.microsoft.com/support/
+    href: https://powerapps.microsoft.com/support/

powerapps-docs/maker/canvas-apps/dev-appsource-test-drive.md

@@ -1,37 +1,54 @@
----
-title: Delete a custom entity | Microsoft Docs
-description: Step-by-step instructions for how to delete a custom entity and clear all data in Power Apps
-author: lancedMicrosoft
-manager: kfile
-ms.service: powerapps
-ms.component: cds
-ms.topic: conceptual
-ms.date: 03/21/2018
-ms.author: lanced
-search.audienceType: 
-  - maker
-search.app: 
-  - PowerApps
-  - D365CE
----
-
-# Delete a custom entity
-You can delete custom entities, but you can't delete standard entities.
-
-1. On [powerapps.com](https://make.powerapps.com/?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc), expand the **Data** section and click or tap **Entities** in the left navigation pane.
-
-    ![Entity Details](./media/data-platform-cds-create-entity/entitylist.png "Entity List")
-
-2. In the list of entities, click or tap the entity to delete, and then click or tap the **Delete entity** option from the command bar.
-
-3. In the dialog box that appears, click or tap **Delete** to delete the entity.
-
->[!NOTE]
->When you delete an entity, you delete both the entity definition and all data that the entity contains. Entities and the data within them cannot be recovered if deleted.
-
->[!NOTE]
->You might break an app or flow if you delete an entity that is used in that app.
-
->[!NOTE]
->If entity A has [lookup fields](data-platform-entity-lookup.md) to entity B, you might have to delete entity B before you can delete entity A.
-
+---
+title: Delete an entity | Microsoft Docs
+description: Step-by-step instructions for how to delete a custom entity and clear all data in Power Apps
+author: lancedMicrosoft
+manager: kvivek
+ms.service: powerapps
+ms.component: cds
+ms.topic: conceptual
+ms.date: 06/29/2020
+ms.author: lanced
+ms.reviewer: matp
+search.audienceType: 
+  - maker
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Delete an entity
+You can delete custom entities, but you can't delete standard entities. Notice that you can't delete a custom entity while it has one or more dependent components. More information: [Delete an entity that has dependencies](#delete-an-entity-that-has-dependencies)
+
+> [!WARNING]
+> When you delete an entity, you delete both the entity definition and all data that the entity contains. Entities and the data within them can't be recovered if deleted.
+
+## Delete a custom entity
+1. Sign into [Power Apps](https://make.powerapps.com/?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc), select **Solutions** in the left navigation pane, open the solution that contains the custom entity you want to delete, and then select it.
+
+    ![Entity Details](./media/data-platform-cds-create-entity/entitylist.png "Entity List")
+
+2. On the command bar select **Remove**, and then select from the following choices:  
+   - **Remove from this solution**. Removes the entity from the solution. You can still access the entity from the Default Solution. 
+   - **Delete from this environment**. Deletes the entity and associated data. 
+
+3. In the dialog box that appears, select **Delete** to delete the entity. If you receive a message that the *component cannot be deleted because it is referenced by other components*, see the next section in this article. 
+
+## Delete an entity that has dependencies
+You can’t delete an entity while it has a dependency on another component, such as a business process flow or a model-driven app. 
+
+There are two ways that you can remove a dependency: 
+- Reconfigure the component to remove the dependency. 
+- Delete the component. 
+
+### Remove a dependency
+To find the dependencies for a component, see [View dependencies for a component](view-component-dependencies.md). 
+
+Next, remove the component. For example, if you have a business process flow that references an entity you want to delete, edit the business process flow to remove that entity. Once the business process flow no longer references that entity, the entity will no longer appear in the show dependencies list and can be deleted. More information: [Delete a custom entity](#delete-a-custom-entity)   
+
+> [!IMPORTANT]
+> Removing the dependency, can cause the component to no longer work. For example, removing an entity from a model-driven app may cause the model-driven app to no longer work. 
+
+For more information, see these articles: 
+- [Edit or remove artifacts](../model-driven-apps/add-edit-app-components.md#edit-or-remove-artifacts)
+- [Edit a business process flow](/power-automate/create-business-process-flow#edit-a-business-process-flow)
+- [Delete relationships](create-edit-1n-relationships-portal.md#delete-relationships)

powerapps-docs/maker/common-data-service/data-platform-delete-entity.md

@@ -66,5 +66,9 @@ The error message occurs due to a setting in Excel. To fix the issue, do this:
 4. Select **Protected view** and then clear the check boxes for the first two options.  
 
 5. Select **OK** and then close the **Options** dialog box.  
-  
+
+
+### See also
+
+[Troubleshoot export to excel](ts-export-to-excel.md)