Merge branch 'master' into v-ljoel-milestonesupdate

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -6279,6 +6279,11 @@
       "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"
+    },
+    {
+      "source_path": "powerapps-docs/maker/data-platform/business-events.md",
+      "redirect_url": "/powerapps/developer/data-platform/business-events",
+      "redirect_document_id": "false"
     }
   ]
 }

powerapps-docs/developer/component-framework/add-custom-controls-to-a-field-or-entity.md

@@ -74,7 +74,7 @@ Following the steps below will change the default label and text box column of t
 
 ## Add code component to a table
 
-To add a code component like data-set component or simple table component to a grid or view, follow the steps below:
+To add a code component like dataset component or simple table component to a grid or view, follow the steps below:
 
   - Navigate to **Settings > Customizations** and click on **Customize the System**.
   - Click on the arrow next to **Entities** tab a select the table you want to add the code component. 

powerapps-docs/developer/component-framework/code-components-model-driven-apps.md

@@ -1,6 +1,6 @@
 ---
-title: Code components for canvas apps  | Microsoft Docs
-description: Learn how to create code components using Power Apps component framework for canvas apps
+title: Code components for model-driven apps  | Microsoft Docs
+description: Learn how to create code components using Power Apps component framework for model-driven apps
 keywords:
 ms.author: nabuthuk
 author: Nkrb
@@ -15,9 +15,7 @@ ms.assetid: 5d100dc3-bd82-4b45-964c-d90eaebc0735
 
 # Code components for model-driven apps
 
-[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
-
-Power Apps component framework gives developers the ability to extend the visualizations in model-driven apps. Professional developers can create, debug, import, and add code components to model-driven apps using [Power Apps CLI](get-powerapps-cli.md). You can add code components to columns, grids, and sub grids in model-driven apps. 
+Power Apps component framework gives developers the ability to extend the visualizations in model-driven apps. Professional developers can create, debug, import, and add code components to model-driven apps using [Microsoft Power Platform CLI](get-powerapps-cli.md). You can add code components to columns, grids, and sub grids in model-driven apps. 
 
 > [!IMPORTANT]
 > Power Apps component framework is enabled for model-driven apps by default. See [Code components for canvas apps](component-framework-for-canvas-apps.md) to learn how to enable Power Apps component framework for canvas apps.

powerapps-docs/developer/component-framework/community-resources.md

@@ -16,7 +16,7 @@ ms.topic: "article"
 
 [!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
 
-The following is a list of some community resources created by the Power Apps community that you can use to create code components in model-driven and canvas apps using Power Apps component framework and Power Apps CLI. 
+The following is a list of some community resources created by the Power Apps community that you can use to create code components in model-driven and canvas apps using Power Apps component framework and Microsoft Power Platform CLI. 
 
 > [!NOTE]            
 > Resources created by the community are not supported by Microsoft. If you have questions or issues with community resources, contact the publisher of the resource. Before using these resources, you must ensure that these community resources meet the Power Apps component framework guidelines and should only be used for reference purpose. 
@@ -76,7 +76,7 @@ The following is the list of blogs created by Power Apps community.
 
 ## Tools
 
-The [Code component builder](https://www.xrmtoolbox.com/plugins/Maverick.PCF.Builder/) is a tool from XrmToolBox that lets you create code components in visual manner using the Power Apps CLI.
+The [Code component builder](https://www.xrmtoolbox.com/plugins/Maverick.PCF.Builder/) is a tool from XrmToolBox that lets you create code components in visual manner using Microsoft Power Platform CLI.
 
 
 [!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/component-framework/component-framework-for-canvas-apps.md

@@ -5,7 +5,7 @@ keywords:
 ms.author: nabuthuk
 author: Nkrb
 manager: kvivek
-ms.date: 11/26/2019
+ms.date: 06/08/2021
 ms.service: "powerapps"
 ms.suite: ""
 ms.tgt_pltfrm: ""
@@ -15,44 +15,54 @@ ms.assetid: 5d100dc3-bd82-4b45-964c-d90eaebc0735
 
 # Code components for canvas apps
 
-Power Apps component framework enables app makers to create code components to use in an app or across the apps. More information: [Power Apps component framework overview](overview.md) 
+Power Apps component framework enables app makers to create code components that can be used in their canvas apps. More information: [Power Apps component framework overview](overview.md) 
 
-[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
+Power Apps component framework enables professional developers to create, import, and add code components to canvas applications using [Microsoft Power Platform CLI](get-powerapps-cli.md). Certain APIs may not be available in canvas Apps. We recommend you check each API to determine where it is available.  
 
-In this public preview, Power Apps component framework enables app makers to create code components, debug, import, and add them to canvas apps using the Power Apps CLI tooling. Only specific APIs are supported in this public preview. We recommend you to check each API to determine whether it supports canvas apps. 
+## Security considerations
 
 > [!WARNING]
-> Code components contain code that may not be generated by Microsoft and can potentially access security tokens and data. When adding code components to an app, make sure that the code component solutions are from a trusted source.
+> Code components contain code that may not be generated by Microsoft and can potentially access security tokens and data when rendered in Power Apps Studio. When adding code components to a canvas app, make sure that the code component solutions are from a trusted source.  This vulnerability does not exist when playing the canvas app.  
+
+When you open a canvas app in Power Apps Studio that contains code components, a dialog shows a warning message about potentially unsafe code. Code components in the Power Apps Studio environment have access to security tokens and hence only components from the trusted sources should be opened. Administrators and system customizers should review and validate all the code components before importing those components in an environment and making them available for makers to use in their apps. The `Default` publisher is shown when you import code components using an unmanaged solution or when you have used `pac pcf push` to install your code component. 
+
+![Safety warning](media/canvas-app-safety-warning.png "Safety warning")  
 
 ## Prerequisites
 
 1. A Power Apps license is required. More information: [Power Apps component framework licensing](overview.md#licensing)
-2. System Administrator privileges are required to enable the Power Apps component feature in the environment.
+2. System administrator privileges are required to enable the Power Apps component feature in the environment.
 
 ## Enable Power Apps component framework feature
 
-To add code components to an app, you need to enable the Power Apps component framework feature in each environment where you want to use them. To enable an environment to use code components inside its apps:
+To add code components to an app, you need to enable the Power Apps component framework feature in each environment where you want to use them. By default Power Apps component feature is enabled for model-driven apps. To enable an environment to use code components inside its apps:
 
 1. Sign in to [Power Apps](https://powerapps.microsoft.com/).
 
 2. Select the **Settings** icon and then select **Admin Center**.
 
-    ![Settings and Admin Center](media/select-admin-center-from-settings.png "Settings and Admin Center") 
+    > [!div class="mx-imgBorder"]
+    > ![Settings and Admin Center](media/select-admin-center-from-settings.png "Settings and Admin Center") 
 
-3. Select the **Environments** tab in the left pane and select the environment where you want to enable this feature, select the ellipsis (**...**), and then select **Settings**.
+3. Select the **Environments** tab in the left pane and select the environment where you want to enable this feature and then select **Settings**.
 
 4. Under the **Products** tab, select **Features**.
 
-   ![Enable Power Apps component framework](media/enable-pcf-feature.png "Enable Power Apps component framework")
+   > [!div class="mx-imgBorder"]
+   > ![Enable Power Apps component framework](media/enable-pcf-feature.png "Enable Power Apps component framework")
 
 5. From the list of available features, set the switch to **On** under **Power Apps component framework for canvas apps** and click **Save**.
 
 6. Now, open the app where you want to add the code component and navigate to **File** > **Settings** and select **Advanced settings**.
 
-   ![Enable components for Power Apps component framework](media/enable-components-for-pcf.png "Enable components for Power Apps component framework")
+   > [!div class="mx-imgBorder"]
+   > ![Enable components for Power Apps component framework](media/enable-components-for-pcf.png "Enable components for Power Apps component framework")
    
 7. Turn the **Components** switch to **On** under the **Experimental feature** section.
 
+    > [!NOTE]
+    > When creating new canvas apps, steps 6 & 7 is enabled by default.
+
 ## Implementing code components
 
 After you enable the Power Apps component framework feature in your environment, you can start implementing the logic for code components.
@@ -67,19 +77,33 @@ To add code components to a canvas app:
 2. Create a new canvas app or edit an existing app to which you want to add the code component.
 
    > [!IMPORTANT]
-   > Make sure the solution zip file is already [imported](../../maker/data-platform/import-update-export-solutions.md) into Microsoft Dataverse before you proceed to the next step.
+   > Make sure the solution zip file containing code components is already [imported](../../maker/data-platform/import-update-export-solutions.md) into Microsoft Dataverse before you proceed to the next step.
 
-3. Go to **Insert** > **Custom** > **Import component**. 
+3. In the left pane select **+** icon and then select **Get more components**. 
 
-    ![Insert components](media/insert-components-import.png "Insert components")
+   > [!div class="mx-imgBorder"]
+   > ![Insert components](media/insert-code-components-using-get-more-components.png "Insert components")
 
-4. Select the **Code** tab, add a component from the list, and then select **Import**. 
+4. Select the **Code** tab, select a component from the list, and then select **Import**. 
 
-    ![Import sample component](media/import-component-add-sample-component.png "Import sample component")
+    > [!div class="mx-imgBorder"]
+    > ![Import sample component](media/insert-component-add-sample-component.png "Import sample component")
 
-5. Click the **+** icon on the left pane and expand the code components tab to add the sample component.
+5. Select the **+** icon on the left pane and expand the code components tab and select to add the sample component.
+
+   > [!div class="mx-imgBorder"]
+   > ![Add sample component](media/add-sample-component-from-list.png "Add sample component")
+
+   > [!NOTE]
+   > You can also add components by selecting **Insert** > **Custom** > **Import component**. This option will be removed in a future release, so we suggest using the flow described above.
+
+6. In the **Properties** tab, you'll notice the code component properties displayed. 
+
+   > [!div class="mx-imgBorder"]
+   > ![Default code component properties pane](media/property-pane-with-parameters.png "Default code components properties pane")
 
-   ![Add sample component](media/add-sample-component-from-list.png "Add sample component")
+   > [!NOTE]
+   > Existing code components can be re-imported by updating the code component's manifest version if you want the properties to be available in the default **Properties** tab. Like in the past the properties will continue to be available in the advanced properties panel.
 
 ## Delete a code component 
 
@@ -96,7 +120,7 @@ To delete a code component from a canvas app:
 
 ## Update existing code components
 
-Whenever you update the code components and want to see the changes in runtime, you need to bump the `version` property in the manifest file. It is recommended to always bump  the version of the component whenever you make changes.
+Whenever you update the code components and want to see the runtime changes, you need to bump the `version` property in the manifest file. It is recommended to always bump  the version of the component whenever you make changes.
 
 > [!NOTE]
 > Existing code components are updated only when the app is closed or reopened in Power Apps Studio. When you reopen the app, it asks you to update the code components. Simply deleting the code components or adding the code component back into the app doesn't update the components.

powerapps-docs/developer/component-framework/create-custom-controls-using-pcf.md

@@ -15,13 +15,13 @@ ms.assetid: d2cbf58a-9112-45c2-b823-2c07a310714c
 
 # Create and build a code component
 
-This article demonstrates how to create and deploy code components using Power Apps CLI. Ensure that you have installed [Microsoft Power Apps CLI](https://aka.ms/PowerAppsCLI).
+This article demonstrates how to create and deploy code components using Microsoft Power Platform CLI. Ensure that you have installed [Microsoft Power Platform CLI](https://aka.ms/PowerAppsCLI).
 
 [!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
 
 ## Create a new component
 
-To begin, open **Developer Command Prompt for VS 2017 or higher** after installing Power Apps CLI.
+To begin, open **Developer Command Prompt for VS 2017 or higher** after installing Microsoft Power Platform CLI.
 
 1. In the Developer Command Prompt, create a new folder on your local machine, for example, *C:\Users\your name\Documents\My_code_Component* using the command `mkdir <Specify the folder name>`.
 2. Go to the newly created folder using the command `cd <specify your new folder path>`.
@@ -32,7 +32,7 @@ To begin, open **Developer Command Prompt for VS 2017 or higher** after installi
     ```
  
    > [!NOTE]
-   > Currently, Power Apps CLI supports two types of components: **field** and **dataset** for model-driven apps.  For canvas apps, only the **field** type is supported for this experimental preview.
+   > Currently, Microsoft Power Platform CLI supports two types of components: **field** and **dataset** for model-driven apps.  For canvas apps, only the **field** type is supported for this experimental preview.
 
 4. To retrieve all the required project dependencies, run the command `npm install`.
 5. Open your project folder `C:\Users\<your name>\Documents\<My_code_Component>` in any developer environment of your choice and get started with your code component development. The quickest way to get started is by running `code .` from your command prompt once you are in the `C:\Users\<your name>\Documents\<My_code_Component>` directory. This command opens your component project in Visual Studio Code.