Merge branch 'main' into patch-3

Author: melamriD365

.openpublishing.redirection.json

@@ -6269,6 +6269,11 @@
       "source_path": "powerapps-docs/sample-apps/return-to-workplace/app-for-employee.md",
       "redirect_url": "/dynamics365/industry/return-to-workplace/app-for-employee",
       "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/developer-resources-page.md",
+      "redirect_url": "/powerapps/developer/data-platform/view-download-developer-resources",
+      "redirect_document_id": "false"
     }
   ]
 }

powerapps-docs/developer/data-platform/developer-resources-page.md

@@ -85,7 +85,7 @@ More information: [Image columns](image-attributes.md), [Sample: Set and retriev
 
 ## Types of tables
 
-The capabilities and behavior of tables depends on several table properties. Most of these properties are relatively simple and have descriptive names. Four that require some additional explanation are: *Ownership*, *Activity tables*, *Activityparty table* and *Child tables*.
+The capabilities and behavior of tables depends on several table properties. Most of these properties are relatively simple and have descriptive names. Among four properties that require some additional explanation are: *Ownership*, *Activity tables*, *Activityparty table* and *Child tables*.
 
 ### Table ownership
 

powerapps-docs/developer/data-platform/entity-metadata.md

@@ -22,8 +22,6 @@ search.app:
 
 # View or download developer resources
 
-[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
-
 This article provides resources for developers and information about the specific environment you're working with.
 
 ## View the Developer Resources page for your environment
@@ -72,6 +70,8 @@ You can download the WSDL for this service here, but usually you will use the Cr
 - [Create early bound table classes with the code generation tool (CrmSvcUtil.exe)](/powerapps/developer/data-platform/org-service/generate-early-bound-classes)
 - [Use the Organization Service](/powerapps/developer/data-platform/org-service/overview)
 
+[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
+
 ### Instance Reference Information
 
 This information uniquely describes your instance. There is a GUID **ID** and a **Unique Name**.
@@ -92,4 +92,3 @@ More information: [Discover the URL for your organization using the Web API](/po
 This is the endpoint address for the SOAP version of the Discovery service to use for your instance. You can also download the service document here.
 More information: [Discover the URL for your organization using the Organization service](/powerapps/developer/data-platform/org-service/discovery-service)
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/view-download-developer-resources.md

@@ -1,6 +1,10 @@
+<!--
+
 > [!NOTE]
 > Effective November 2020:
 > - Common Data Service has been renamed to Microsoft Dataverse. [Learn more](https://aka.ms/PAuAppBlog)
 > - Some terminology in Microsoft Dataverse has been updated. For example, *entity* is now *table* and *field* is now *column*. [Learn more](https://go.microsoft.com/fwlink/?linkid=2147247)
 >
 > This article will be updated soon to reflect the latest terminology.
+
+-->

powerapps-docs/includes/cc-data-platform-banner.md

@@ -1393,6 +1393,8 @@
                   href: ./portals/use-code-editor.md
                 - name: Add Power BI
                   href: ./portals/add-powerbi.md
+                - name: Add a chatbot (Preview)
+                  href: ./portals/add-chatbot.md
         - name: Work with templates
           href: ./portals/work-with-templates.md
         - name: Work with themes

powerapps-docs/maker/TOC.yml

@@ -101,8 +101,8 @@ The return value for both **IsBlank** and **IsEmpty** is a Boolean **true** or *
 | Formula | Description | Result |
 | --- | --- | --- |
 | **Coalesce( Blank(), 1 )** |Tests the return value from the **Blank** function, which always returns a *blank* value. Because the first argument is *blank*, evaluation continues with the next argument until a non-*blank* value and non-empty string is found. |**1** |
-| **Coalesce( "", 2 )** |Tests the first argument which is an empty string. Because the first argument is an empty string, evaluation continues with the next argument until a non-*blank* value and non-empty string is found. |**2** |
-| **Coalesce( Blank(), "", Blank(), "", 3, 4 )** |**Coalesce** starts at the beginning of the argument list and evaluates each argument in turn until a non-*blank* value and non-empty string is found.  In this case, the first four arguments all return *blank* or an empty string, so evaluation continues to the fifth argument. The fifth argument is non-*blank* and non-empty string, so evaluation stops here. The value of the fifth argument is returned, and the sixth argument isn't evaluated. |**3** |
+| **Coalesce( "", "2" )** |Tests the first argument which is an empty string. Because the first argument is an empty string, evaluation continues with the next argument until a non-*blank* value and non-empty string is found. |**2** |
+| **Coalesce( Blank(), "", Blank(), "", "3", "4" )** |**Coalesce** starts at the beginning of the argument list and evaluates each argument in turn until a non-*blank* value and non-empty string is found.  In this case, the first four arguments all return *blank* or an empty string, so evaluation continues to the fifth argument. The fifth argument is non-*blank* and non-empty string, so evaluation stops here. The value of the fifth argument is returned, and the sixth argument isn't evaluated. |**3** |
 | **Coalesce( "" )** | Tests the first argument which is an empty string. Because the first argument is an empty string, and there are no more arguments, the function returns *blank*.   |*blank* |
 
 ### IsBlank
@@ -164,4 +164,4 @@ You can also use **IsEmpty** to test whether a calculated table is empty, as the
 
 
 
-[!INCLUDE[footer-include](../../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../../includes/footer-banner.md)]

powerapps-docs/maker/canvas-apps/functions/function-isblank-isempty.md

@@ -0,0 +1,121 @@
+---
+title: Add chatbot to a page (Preview)
+description: Learn about how to add Power Virtual Agents chatbot to Power Apps portals page to answer questions using a bot.
+author: neerajnandwana-msft
+ms.service: powerapps
+ms.topic: conceptual
+ms.custom: 
+ms.date: 05/18/2021
+ms.author: nenandw
+ms.reviewer: tapanm
+contributors:
+    - neerajnandwana-msft
+    - tapanm-msft
+---
+
+# Add chatbot to a page (Preview)
+
+[This article is pre-release documentation and is subject to change.]
+
+Power Apps portals allows you to add a [Power Virtual Agents chatbot](/power-virtual-agents/fundamentals-what-is-power-virtual-agents) to answer questions posted by a visitor on your portal page. A chatbot (bot) configured with different topics, and trigger phrases, can automatically respond to questions posted by a visitor in a chat conversation.
+
+> [!IMPORTANT]
+> - This is a preview feature.
+> - [!INCLUDE[cc_preview_features_definition](../../includes/cc-preview-features-definition.md)]
+
+## Prerequisites
+
+Before you add a Power Virtual Agents bot to a Power Apps portals page, you must create a bot first. If you don't have any available bots, you'll have the option in portals to go to Power Virtual Agents to create a bot. To learn about how to create a bot, go to [Create and delete Power Virtual Agents bots](/power-virtual-agents/authoring-first-bot).
+
+> [!IMPORTANT]
+> This feature requires the following versions for starter portal package and portal host:
+> - Portal host version [9.3.4.x](versions/version-9.3.4.x.md) or later.
+> - Starter portal package version [9.2.2103.x](versions/package-version-9.2.2103.md) or later. More information: [additional considerations](#additional-considerations)
+
+## Add chatbot component
+
+To add a chatbot component to portal page:
+
+1. Go to [Power Apps](https://make.powerapps.com).
+
+1. Select **Apps** from the left pane.
+
+1. Select your portal.
+
+1. Select **Edit** to open the portals Studio.
+
+1. Select **Components** from the left pane.
+
+1. Select **Chatbot** component.
+
+    ![Add chatbot component to a page](media/add-chatbot/add-chatbot.png "Add chatbot component to a page")
+
+1. Select your bot.
+
+    ![Select your bot](media/add-chatbot/select-your-bot.png "Select your bot")
+
+    > [!NOTE]
+    > If you don't have a bot already created, or want to create a new bot to use in portals, select **Power Virtual Agents**. After you create bot, select **Sync configuration** inside portals Studio to reflect the bot changes.
+
+1. Select whether the bot appears on all pages in your portal, or the selected pages.
+
+1. If you select **Specific pages**, use **Manage bots in pages** to control pages that can use this bot.
+
+You can add more bots from your environment across different pages in a portal. For example, a bot that answers questions related to workplace such as "Back to work" can be added to HR page. Or, a bot that answers to basic queries for payroll, such as "Payroll questions" can be added to Finance page. However, you can't have one page use more than one bot.
+
+## Advanced configuration
+
+Chatbot component is rendered using a web template called **Power Virtual Agents**.
+
+![Chatbot web template](media/add-chatbot/pva-web-template.png "Chatbot web template")
+
+You can change the values for the following parameters inside the "window.PvaEmbeddedWebChat.renderWebChat()" function.
+
+| Parameter | Value |
+| - | - |
+| width | Uses variable "chatWidth". To change width, update the width in pixel: <br> `let chatWidth = "320px";` |
+| height | Uses variable "chatHeight". To change height, update the height in pixel: <br> `let chatHeight =  "480px";` |
+| headerText | Title of the bot. By default, uses the bot's name. To change, add "headerText" parameter with the bot header value: <br> `"headerText": 'Contoso chatbot';` | 
+| webChatHeaderStyleOptions | Determines header style for the chatbot component, such as the color of font, and background. To change, update "webChatHeaderStyleOptions" parameter with the values for "fontColor", and "backgroundColor" properties: <br> `"webChatHeaderStyleOptions": {"fontColor":'black',"backgroundColor":'white',}`
+
+After changing the web template, ensure you select **Sync configuration** to update the configuration in open Studio session and reflect the changes.
+
+> [!NOTE]
+> Any changes to the Power Virtual Agents web template other than the parameters explained above are not supported.
+
+## Additional considerations
+
+Consider the following when using Power Virtual Agents chatbot inside portals.
+
+### Portal template version
+
+This feature requires starter portal package version [9.2.2103.x](versions/package-version-9.2.2103.md) or later. If your portal template isn't upgraded to add support for chatbot component, you'll see following message when you try to add the component.
+
+"Portal upgrade required" <br>
+"An upgrade is required to use this feature on your portal. If you upgrade the portal, ensure you Sync Configuration to refresh your current portals Studio session with new portals package."
+
+When this message appears, upgrade your portal package. More information: [Update portals solution](admin/update-portal-solution.md)
+
+> [!NOTE]
+> Upgrading starter portal package will enable any additional portals in your environment with the capability to use chatbot component. More information: [Starter portal package updates](release-updates.md#starter-portal-package-updates)
+
+### Solution deletion
+
+This feature comes with a portal solution called **MicrosoftPortalBot** with display name of **Dynamics 365 Portals - Bot**. Your portal will stop working if you delete this solution, and do not perform the following action.
+
+If you delete **MicrosoftPortalBot** solution, you must restart your portal to ensure the portal works correctly.
+
+To restart your portal:
+
+1. Open [Power Platform admin center](admin/admin-overview.md) for your portal.
+1. On the left-pane, select **Portal Actions**.
+1. Select **Restart** to restart the portal.
+
+    > [!IMPORTANT]
+    > Restarting the portal will make it unavailable for several minutes and users won’t be able to access the portal URL during this time..
+
+1. Select **Restart** to confirm restarting the portal.
+
+### See also
+
+- [Add the bot to your live website](/power-virtual-agents/publication-connect-bot-to-web-channels)

powerapps-docs/maker/portals/add-chatbot.md

@@ -5,7 +5,7 @@ author: neerajnandwana-msft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 04/21/2021
+ms.date: 05/13/2021
 ms.author: nenandw
 ms.reviewer: tapanm
 contributors:
@@ -33,8 +33,6 @@ To add a Power BI component to a web page:
 
 1. From Portal components section, select **Power BI**. The Power BI placeholder is added to the canvas:
 
-    ![Components](media/components-powerbi.png)
-
 1. In the properties pane on the right side of the screen, enter the following information:
 
     1. **Access type**: Select appropriate option from the drop-down as per your requirement.

powerapps-docs/maker/portals/add-powerbi.md

@@ -5,7 +5,7 @@ author: neerajnandwana-msft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 04/21/2021
+ms.date: 05/10/2021
 ms.author: nenandw
 ms.reviewer: tapanm
 contributors:
@@ -50,15 +50,14 @@ To use the WYSIWYG editor:
 
 5.  Select the component to be added.
 
-    > [!div class=mx-imgBorder]
-    > ![components pane](media/components-pane.png "Components pane")  
+    ![components pane](media/components-pane.png "Components pane")  
 
     The selected component is added to the canvas inside the editable element.
 
 6.  To delete a component, select the component on the canvas and then select **Delete** on the command bar at the top of the page.
 
     > [!div class=mx-imgBorder]
-    > ![delete component](media/delete-component.png "Delete component")  
+    ![delete component](media/delete-component.png "Delete component")  
 
 ## Next steps