Merge branch 'main' into JimDaly-patch-5

Author: phecke

.gitignore

@@ -7,6 +7,7 @@ _repo.*/
 
 .openpublishing.buildcore.ps1
 settings.json
+.DS_Store
 
 # Folder config file
 [Dd]esktop.ini

.openpublishing.publish.config.json

@@ -63,7 +63,7 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/powerapps-docs",
-  "git_repository_branch_open_to_public_contributors": "live",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},

.openpublishing.redirection.json

@@ -1,34 +1,35 @@
 ---
-title: Add code components to a field or entity | Microsoft Docs
-description: Process to import code components
+title: Add code components to a column or table in Microsoft Dataverse | Microsoft Docs
+description: Learn how to add code components to a column or table.
 keywords:
 ms.author: nabuthuk
 author: Nkrb
 manager: kvivek
-ms.date: 10/01/2019
+ms.date: 04/01/2021
 ms.service: "powerapps"
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 ---
 
-# Add code components to a field or entity in model-driven apps
+# Add code components to a column or table in model-driven apps
 
-Code components let you transform fields that traditionally contain text into visualizations. Similarly, you can use code components to transform datasets, such as a view, to display in a more visual rendering rather than a list of records. Code components can appear as visualizations on forms, dashboards, views, and homepage grids. 
+Code components let you transform columns that traditionally contain text into visualizations. Similarly, you can use code components to transform datasets, such as a view, to display in a more visual rendering rather than a list of records. Code components can appear as visualizations on forms, dashboards, views, and homepage grids. 
 
+[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
 
    > [!div class="mx-imgBorder"] 
-   > ![Custom slider control](../../maker/model-driven-apps/media/slider-control.PNG "Slider control for a field")
+   > ![Custom slider control](../../maker/model-driven-apps/media/slider-control.PNG "Custom slider control ")
 
-## Add a code component to a field
+## Add a code component to a column
 
-Following the steps below will change the default label and text box field of the **Budget Amount** field to the slider code component on the Opportunity entity. You can use similar steps to replace an existing field with a code component or configure a code component for a custom field.
+Following the steps below will change the default label and text box column of the **Budget Amount** column to the slider code component on the Opportunity table. You can use similar steps to replace an existing column with a code component or configure a code component for a custom column.
 
 1. Navigate to **Settings** > **Customizations** > **Customize the System**.
 
-2. Expand **Entities**, expand the entity that you want, such as the **Opportunity** entity, select **Forms**, and then open a form such as the **Main** form.
+2. Expand **Entities**, expand the table that you want, such as the **Opportunity** table, select **Forms**, and then open a form such as the **Main** form.
 
-3. In the form editor, double-click the field where you want to add a code component, such as the **Budget Amount** field on the opportunity main form. You can also create a custom field.
+3. In the form editor, double-click the column where you want to add a code component, such as the **Budget Amount** column on the opportunity main form. You can also create a custom column.
 
 4. On the **Field Properties** page, select the **Controls** tab, and then select **Add Control**.
 
@@ -53,38 +54,38 @@ Following the steps below will change the default label and text box field of th
    > [!div class="mx-imgBorder"] 
    > ![Add custom control properties](../../maker/model-driven-apps/media/ccf-add-properties.png "Add custom control properties")
 
-   - **Min**. Set the minimum accepted value. You can bind a static value that you enter or bind the value to an existing field. In this example **Bind to static value** is **Currency** and the minimum value that can be entered is *zero*.  
+   - **Min**. Set the minimum accepted value. You can bind a static value that you enter or bind the value to an existing column. In this example **Bind to static value** is **Currency** and the minimum value that can be entered is *zero*.  
 
-       - **Bind to a static value**. Select the data type, such as a whole number (Whole.None), currency, floating point (FP), or decimal. Next, enter a number that represents the minimum accepted value for the field.  
+       - **Bind to a static value**. Select the data type, such as a whole number (Whole.None), currency, floating point (FP), or decimal. Next, enter a number that represents the minimum accepted value for the column.  
 
-       - **Bind to values on a field**. Select a field from the list that will be used as the minimum accepted value.  
+       - **Bind to values on a field**. Select a column from the list that will be used as the minimum accepted value.  
 
-   - **Max**. Set the maximum accepted value for the field. Similar to the Min value, you can bind a static value that you enter or bind the value to an existing field as described earlier. In this example, **Bind to static value** is **Currency** and the maximum value that can be entered is **1 billion**.  
+   - **Max**. Set the maximum accepted value for the column. Similar to the Min value, you can bind a static value that you enter or bind the value to an existing column as described earlier. In this example, **Bind to static value** is **Currency** and the maximum value that can be entered is **1 billion**.  
 
    - **Step**. This represents the unit to increment or decrement when adding to or subtracting from  the current value. For example, for budget amount you can select 100 dollar increments\decrements.  
 
    - **Hide Default Control**. Hides the component so neither the component nor the data is displayed in any of the clients that don't support the code component.   
 
 8. Select **OK**, to close the Field Properties page.  
 
-9. To activate the customization, on the entity form select **Save**, and then select **Publish**.  
+9. To activate the customization, on the table form select **Save**, and then select **Publish**.  
 
 10. Select **Save and Close** to close the form editor.  
 
-## Add code component to an entity
+## 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:
 
   - Navigate to **Settings > Customizations** and click on **Customize the System**.
-  - Click on the arrow next to **Entities** tab a select the entity you want to add the code component. 
+  - Click on the arrow next to **Entities** tab a select the table you want to add the code component. 
   - Click on the **Controls** tab and click on **Add a control**.
   - On the Add Control page, select the component that you want, such as Simple Table component and then select **Add**.
   - Choose the client where you want the component to appear.
 
 
 ## See the code component in action  
 
- Open a record that includes the field with the code component, such as the Opportunity form from the previous example, and view how the field is changed. The field is now rendered as a slider component instead of the text field.  
+ Open a record that includes the column with the code component, such as the Opportunity form from the previous example, and view how the column is changed. The column is now rendered as a slider component instead of the text column.  
 
 > [!div class="mx-imgBorder"] 
 > ![Slider control rendered on form](../../maker/model-driven-apps/media/slider-control.PNG "Slider control rendered on form")  

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

@@ -1,6 +1,6 @@
 ---
-title: Code components for model-driven apps  | Microsoft Docs
-description: Create code components for canvas apps
+title: Code components for canvas apps  | Microsoft Docs
+description: Learn how to create code components using Power Apps component framework for canvas apps
 keywords:
 ms.author: nabuthuk
 author: Nkrb
@@ -15,7 +15,9 @@ ms.assetid: 5d100dc3-bd82-4b45-964c-d90eaebc0735
 
 # Code components for 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 [Power Apps CLI](get-powerapps-cli.md). You can add code components to fields, grids, and sub grids in 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. 
 
 > [!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.
@@ -28,7 +30,7 @@ The [create your first code component](implementing-controls-using-typescript.md
 
 ## Add code components to model-driven apps
 
-To add code components to a field or an entity in model-driven apps, see [Add code components to model-driven apps](add-custom-controls-to-a-field-or-entity.md).
+To add code components to a column or a table in model-driven apps, see [Add code components to model-driven apps](add-custom-controls-to-a-field-or-entity.md).
 
 > [!div class="mx-imgBorder"] 
 > ![Add linear slider control](../../maker/model-driven-apps/media/add-slider.PNG "Add linear slider control")
@@ -38,7 +40,7 @@ To add code components to a field or an entity in model-driven apps, see [Add co
 
 ## Update existing code components
 
-Whenever you update the code components and want to see the changes in runtime, you need to bump the version attribute 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 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.
 
 ## See also
 

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

@@ -14,6 +14,8 @@ ms.topic: "article"
 
 # Community resources for Power Apps component framework
 
+[!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. 
 
 > [!NOTE]            

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

@@ -1,6 +1,6 @@
 ---
 title: Code components for canvas apps  | Microsoft Docs
-description: Create code components for canvas apps
+description: Learn how to create code components using Power Apps component framework for canvas apps.
 keywords:
 ms.author: nabuthuk
 author: Nkrb
@@ -17,6 +17,8 @@ ms.assetid: 5d100dc3-bd82-4b45-964c-d90eaebc0735
 
 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) 
 
+[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
+
 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. 
 
 > [!WARNING]
@@ -94,7 +96,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` attribute 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 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.
 
 > [!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/component-framework-for-canvas-apps.md

@@ -1,6 +1,6 @@
 ---
-title: Create and build a code component| Microsoft Docs
-description: Start creating a component using the Power Apps component framework tooling
+title: Create and build a code component in Microsoft Dataverse| Microsoft Docs
+description: Start creating a component using the Power Apps component framework tooling.
 keywords: Power Apps component framework, code components, Component Framework
 ms.author: nabuthuk
 author: Nkrb
@@ -17,6 +17,8 @@ ms.assetid: d2cbf58a-9112-45c2-b823-2c07a310714c
 
 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).
 
+[!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.
@@ -51,7 +53,7 @@ Finally when you're done implementing the component logic in TypeScript, you nee
 
 [Debug code components](debugging-custom-controls.md)<br/>
 [Package a code component](import-custom-controls.md)<br/>
-[Add code components to a field or entity](add-custom-controls-to-a-field-or-entity.md)<br/>
+[Add code components to a column or table](add-custom-controls-to-a-field-or-entity.md)<br/>
 [Updating existing code components](updating-existing-controls.md)<br/>
 [Power Apps component framework API reference](reference/index.md)<br/>
 [Power Apps component framework overview](overview.md)

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

@@ -4,6 +4,7 @@ description: "Use the Power Apps component framework to create code components t
 manager: kvivek
 ms.date: 09/05/2019
 ms.service: "powerapps"
+ms.custom: "intro-internal"
 ms.topic: "article"
 ms.assetid: 135481cd-4583-4e49-8f58-02f32a9b054a
 ms.author: "nabuthuk"
@@ -14,10 +15,12 @@ author: Nkrb
 
 Code components are a type of solution components, which means they can be included in a solution file and installed in different environments. More information: [Package and distribute extensions using solutions](/dynamics365/customer-engagement/developer/package-distribute-extensions-use-solutions).
 
+[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
+
 > [!div class="mx-imgBorder"] 
 > ![Code components](media/code-components.gif "Code components")
 
-You add code components by including them in a solution and then import it into Microsoft Dataverse. Once the components are in Dataverse, system administrators and system customizers can configure fields, subgrids, views, and dashboard subgrids to use in place of default components. You can add these code components to both **model-driven and canvas apps**. 
+You add code components by including them in a solution and then import it into Microsoft Dataverse. Once the components are in Dataverse, system administrators and system customizers can configure columns, subgrids, views, and dashboard subgrids to use in place of default components. You can add these code components to both **model-driven and canvas apps**. 
 
 Code components consist of three elements:
 
@@ -33,12 +36,12 @@ Code components consist of three elements:
 Manifest is the metadata file that defines a component. It is an XML document that describes:
 
 - The name of the component.
-- The kind of data that can be configured, either a field or a data-set.
+- The kind of data that can be configured, either a `field` or a `data-set`.
 - Any properties that can be configured in the application when the component is added.
 - A list of resource files that the component needs. 
 - The name of the TypeScript function in the component implementation library that returns an object that applies the required component interface.
 
-When a user configures a code component, the data in the manifest file filters out the available components so that only valid components for the context are available for configuration. The properties defined in the manifest file for a component are rendered as configuration fields so that the user configuring the component can specify the values. These property values are then available to the component  at runtime. More information: [Manifest schema reference](manifest-schema-reference/index.md)
+When a user configures a code component, the data in the manifest file filters out the available components so that only valid components for the context are available for configuration. The properties defined in the manifest file for a component are rendered as configuration columns so that the user configuring the component can specify the values. These property values are then available to the component  at runtime. More information: [Manifest schema reference](manifest-schema-reference/index.md)
 
 ## Component implementation
 

powerapps-docs/developer/component-framework/custom-controls-overview.md

@@ -14,6 +14,8 @@ author: Nkrb
 
 After implementing the code component logic, you can start testing and debugging the code component using the `npm start` command. This command builds the code component and opens it in the local test harness.
 
+[!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
+
 > [!div class="mx-imgBorder"]
 > ![Test harness 1](media/test-harness-1.png "Test harness 1")