Merge branch 'main' into charankasu-patch-1

Author: charankasu

.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,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/maker/portals/version-9.3.3.x.md",
+      "redirect_url": "versions/version-9.3.3.x",
+      "redirect_document_id": "false"
+    },
     {
       "source_path": "powerapps-docs/maker/model-driven-apps/transition-web-app.md",
       "redirect_url": "../../user/unified-interface",

powerapps-docs/developer/component-framework/reference/paging.md

@@ -31,7 +31,7 @@ Total number of results on the server for the current query.
 
 ### hasNextPage
 
-Whether the result set can be paged backwards.
+Whether the result set can be paged forwards.
 
 **Type**: `boolean`
 
@@ -57,4 +57,4 @@ Whether the result set can be paged backwards.
 [Power Apps component framework API reference](../reference/index.md)<br/>
 [Power Apps component framework overview](../overview.md)
 
-[!INCLUDE[footer-include](../../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../../includes/footer-banner.md)]

powerapps-docs/developer/component-framework/toc.yml

@@ -10,6 +10,8 @@
       href: code-components-model-driven-apps.md
     - name: Code components for canvas apps
       href: component-framework-for-canvas-apps.md
+    - name: Code components for portals (Preview)
+      href: ../../maker/portals/component-framework.md
   - name: Get Power Apps CLI
     href: get-powerapps-cli.md
   - name: Learn Power Apps component framework
@@ -30,6 +32,8 @@
       href: add-custom-controls-to-a-field-or-entity.md
     - name: Add components to canvas apps
       href: component-framework-for-canvas-apps.md#add-components-to-a-canvas-app
+    - name: Add components to portals (Preview)
+      href: ../../maker/portals/component-framework-tutorial.md
     - name: Update existing code components
       href: updating-existing-controls.md
     - name: Publish code components on AppSource

powerapps-docs/developer/data-platform/appendix-app-certification-checklist.md

@@ -17,10 +17,11 @@ search.app:
 ---
 # Appendix: App certification checklist
 
-[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
 
 The following checklist provides the list of validations performed by Microsoft during the certification process after you [submit](next-steps-submit-app-cloud-partner-portal.md) your app. 
 
+[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
+
 <table>
 <tbody>
 <tr>

powerapps-docs/developer/data-platform/appendix-app-design-best-practices-checklist.md

@@ -17,7 +17,7 @@ search.app:
 ---
 # Appendix: App design best practices checklist
 
-[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
+[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
 
 Use the following checklist to evaluate your app design. 
 

powerapps-docs/developer/data-platform/behavior-format-date-time-attribute.md

@@ -17,12 +17,11 @@ search.app:
 ---
 # Behavior and format of the date and time column
 
-[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
-
 If you have users and offices around the world, it is important to properly represent date and time values in multiple time zones. The `DateTimeAttributeMetadata` (<xref href="Microsoft.Dynamics.CRM.DateTimeAttributeMetadata?text=DateTimeAttributeMetadata EntityType" /> or <xref:Microsoft.Xrm.Sdk.Metadata.DateTimeAttributeMetadata> class) is used to define and manage columns of type `DateTime` in Microsoft Dataverse. Use the `DateTimeBehavior` property (For Organization Service see, <xref:Microsoft.Xrm.Sdk.Metadata.DateTimeAttributeMetadata>.<xref:Microsoft.Xrm.Sdk.Metadata.DateTimeAttributeMetadata.DateTimeBehavior>) to define whether to store date and time values with or without time zone information, and use the `DateTimeAttributeMetadata.Format` property to specify the display format of these columns.  
 
-  
- You can also use the customization area in Dataverse to define the behavior and format of the date and time columns. More information: [Behavior and format of the Date and Time column](/dynamics365/customer-engagement/customize/behavior-format-date-time-field).  
+[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
+
+You can also use the customization area in Dataverse to define the behavior and format of the date and time columns. More information: [Behavior and format of the date and time column](/dynamics365/customer-engagement/customize/behavior-format-date-time-field).  
 
 > [!NOTE]
 >  All date and time columns in Dataverse support values as early as 1/1/1753 12:00 AM.  
@@ -42,7 +41,7 @@ If you have users and offices around the world, it is important to properly repr
  The following sample code demonstrates how to set a `UserLocal` behavior for a new date time column:  
 
  ```csharp
-// Create a date time attribute for the Account entity
+// Create a date time attribute for the Account
 // with the UserLocal behavior
 dtAttribute = new DateTimeAttributeMetadata
 {                             
@@ -61,7 +60,7 @@ CreateAttributeRequest createAttributeRequest = new CreateAttributeRequest
     Attribute = dtAttribute
 };
 _serviceProxy.Execute(createAttributeRequest);
-Console.WriteLine("Created attribute '{0}' with UserLocal behavior\nfor the Account entity.\n", 
+Console.WriteLine("Created attribute '{0}' with UserLocal behavior\nfor the Account.\n", 
                             dtAttribute.SchemaName);
 ```
 
@@ -173,13 +172,13 @@ _serviceProxy.Execute(updateRequest);
 Console.WriteLine("Updated the behavior and format of '{0}' to DateOnly.",
     retrievedAttributeMetadata.SchemaName);
 
-// Publish customizations to the account entity
+// Publish customizations to the account 
 PublishXmlRequest pxReq = new PublishXmlRequest
 {
     ParameterXml = String.Format("<importexportxml><entities><entity>account</entity></entities></importexportxml>")
 };
 _serviceProxy.Execute(pxReq);
-Console.WriteLine("Published customizations to the Account entity.\n");
+Console.WriteLine("Published customizations to the Account .\n");
 
 ``` 
 
@@ -271,7 +270,7 @@ To resolve this, a user can either:
 ### See also  
 
  [Sample: Convert date and time values](/dynamics365/customer-engagement/developer/org-service/sample-convert-date-time-behavior.md)   
- [Behavior and format of the Date and Time column](/dynamics365/customer-engagement/developer/customize/behavior-format-date-time-field)   
+ [Behavior and format of the date and time column](/dynamics365/customer-engagement/developer/customize/behavior-format-date-time-field)   
  [Customize column definitions](/dynamics365/customer-engagement/developer/customize-entity-attribute-metadata)          
  <xref:Microsoft.Xrm.Sdk.Messages.ConvertDateAndTimeBehaviorRequest>      
  <xref:Microsoft.Xrm.Sdk.Metadata.DateTimeAttributeMetadata> 

powerapps-docs/developer/data-platform/browse-your-metadata.md

@@ -37,6 +37,7 @@ After you download the solution, you must import it to be able to use it.
 
 
 ## Use the app
+
 After you import the solution successfully, locate the app by selecting **Apps** in the left navigation pane; the app is listed as **Metadata Tools**.
 
 ![Metadata Tools app](media/metadata-tools.png)
@@ -50,24 +51,24 @@ On opening the app, **Entities** is the default view that lets you view all the
 You can perform the following actions:
 
 - **View Entity Details**: Select a table to view using the [**Entity Metadata** view](#entity-metadata-view).
-- **Edit Entity**: Open the selected table form in the default organization, if the table supports this.
-- **Text Search**: Perform a text search to filter displayed entities using the following table properties: <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.SchemaName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.LogicalName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.DisplayName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.ObjectTypeCode>, or <xref:Microsoft.Xrm.Sdk.Metadata.MetadataBase.MetadataId>.
-- **Filter Entities**: Set simple criteria to view a sub-set of entities. All criteria are evaluated using AND logic.
-- **Filter Properties**: Filter the properties displayed for any selected entity. There are nearly 100 properties in the list. Use this to select just the ones you are interested in.
+- **Edit Entity**: Open the selected form in the default organization, if the table supports this.
+- **Text Search**: Perform a text search to filter displayed tables using the following table properties: <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.SchemaName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.LogicalName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.DisplayName>, <xref:Microsoft.Xrm.Sdk.Metadata.EntityMetadata.ObjectTypeCode>, or <xref:Microsoft.Xrm.Sdk.Metadata.MetadataBase.MetadataId>.
+- **Filter Entities**: Set simple criteria to view a sub-set of tables. All criteria are evaluated using AND logic.
+- **Filter Properties**: Filter the properties displayed for any selected table. There are nearly 100 properties in the list. Use this to select just the ones you are interested in.
 
 ## Entity Metadata view
 
-Select **Entity Metadata** to inspect individual entities. 
+Select **Entity Metadata** to inspect individual tables. 
 
-![Entity Metadata view](media/metadata-tools-entity-metadata.png)
+![Metadata view](media/metadata-tools-entity-metadata.png "Metadata view")
 
-You can perform the following actions for a single entity:
+You can perform the following actions for a single table:
 
 - **Entity**: Select the table from the drop-down list that you want to view.
 - **Properties**: View all the properties for the table and filter the properties displayed.
 
     - **Edit Entity**: Open the selected table edit form in the default organization, if the table supports this.
-    - **Filter Properties**: Filter the properties displayed for any selected entity. There are nearly 100 properties in the list. Use this to select just the ones you are interested in.
+    - **Filter Properties**: Filter the properties displayed for any selected table. There are nearly 100 properties in the list. Use this to select just the ones you are interested in.
 
 - **Attributes**: View the table columns in a master/detail view. With this view you can:
 
@@ -102,8 +103,8 @@ You can perform the following actions for a single entity:
 
 ### See also
 
- [Developer Tools for Dataverse](developer-tools.md)<br />
- [Customize table definition](customize-entity-metadata.md)<br />
+ [Developer tools for Dataverse](developer-tools.md)<br />
+ [Customize table definitions](customize-entity-metadata.md)<br />
 
 
 

powerapps-docs/developer/data-platform/calculated-rollup-attributes.md

@@ -17,16 +17,16 @@ search.app:
 ---
 # Calculated and rollup columns
 
-[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
+*Calculated* and *rollup* columns free the user from having to manually perform calculations and focus on their work. System administrators can now easily define a field to contain the value of many common calculations without having to work with a developer. Developers can also leverage the platform capabilities to perform these calculations rather than within their own code.  
 
-*Calculated* and *rollup* column free the user from having to manually perform calculations and focus on their work. System administrators can now easily define a field to contain the value of many common calculations without having to work with a developer. Developers can also leverage the platform capabilities to perform these calculations rather than within their own code.  
+[!INCLUDE[cc-terminology](includes/cc-terminology.md)]
 
- [Video: Rollup and Calculated columns in Microsoft Dynamics CRM 2015](https://youtu.be/RoahCH1p3T8)  
+ [Video: Rollup and Calculated columns in Microsoft Dataverse](https://youtu.be/RoahCH1p3T8)  
 
 <a name="BKMK_CommonElements"></a>   
 
 ## Common elements and characteristics  
- Calculated and rollup column share some common elements and characteristics, for example:  
+ Calculated and rollup columns share some common elements and characteristics, for example:  
 
 - They’re read-only.  
 
@@ -69,7 +69,7 @@ search.app:
 
  Calculated columns are calculated in real-time when they are retrieved. Calculated columns can be composed using different data types. For example, an Integer calculated column may reference values from Decimal or Currency columns. More information: [Define calculated columns](https://docs.microsoft.com/powerapps/maker/data-platform/define-calculated-fields).  
 
- Calculated column values are available in the retrieve plug-in pipeline. Post image of table record update or create contains the calculated column value in stage 40. More information: [Event execution pipeline](event-framework.md#event-execution-pipeline) and [Table Images](understand-the-data-context.md#table-images)
+ Calculated column values are available in the retrieve plug-in pipeline. Post image of table record update or create contains the calculated column value in stage 40. More information: [Event execution pipeline](event-framework.md#event-execution-pipeline) and [Table images](understand-the-data-context.md#table-images)
 
 ### Limitations  
  You can’t use values in calculated columns on a *logical value* in the same table to sort data returned by a query. Although your query can specify that the results should be ordered using a calculated column, the sort direction will be ignored and will not throw an error. If the calculated column references only simple values in the same record, sorting works normally. You can determine the sources used in a calculated column using the `SourceTypeMask` property on the column definitions. More information: [Logical columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes.md#BKMK_LogicalAttributes)  
@@ -186,7 +186,7 @@ search.app:
 ```  
 
 ### See also  
- [Video: Rollup and Calculated columns in Microsoft Dynamics CRM 2015](https://youtu.be/RoahCH1p3T8)   
+ [Video: Rollup and calculated columns in Dataverse](https://youtu.be/RoahCH1p3T8)   
  [Introduction to table columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes)   
  [Define calculated columns](https://docs.microsoft.com/powerapps/maker/data-platform/define-calculated-fields)   
  [Define rollup columns](https://docs.microsoft.com/powerapps/maker/data-platform/define-rollup-fields)

powerapps-docs/developer/data-platform/catalog-catalogassignment.md

@@ -2,7 +2,7 @@
 title: "Catalog and CatalogAssignment tables (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Learn how to use the Catalog and CatalogAssignment tables to expose events in your solution"
 ms.custom: ""
-ms.date: 03/31/2021
+ms.date: 04/01/2021
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -18,6 +18,8 @@ search.app:
 
 # Catalog and CatalogAssignment tables (Preview)
 
+[This article is pre-release documentation and is subject to change.]
+
 Use the [Catalog](reference/entities/catalog.md) and [CatalogAssignment](reference/entities/catalogassignment.md) tables to create a structure to expose actions used in your solution as business events. Microsoft Dataverse Business events is a new capability currently being developed. Business events will enable many scenarios to create integrations with many applications through Dataverse. 
 
 Your catalog will describe those events that are relevant to your solution so that people can use them. If you do not catalog the events relevant to your solution, they may not be available to people using your solution.
@@ -29,8 +31,8 @@ The first level catalog must represent your solution. Use multiple second-level
 For each second-level catalog that represents the categories within your solution, you will use the CatalogAssignment table to specify any Tables, Custom API, or Custom Process actions you want to be available as events. Only Custom API that are configured as Actions can be used.
 
 > [!IMPORTANT]
-> In order for people to use Catalogs and Catalog Assignments, they must be given read access to these these records. Currently only the System Administrator has full access to the Catalog and Catalog Assignment tables.
-> You must grant **Read** access to the security roles assigned to any users who will need to use these records. These tables are found within the **Custom Entities** tab when you edit a security role.
+> In order for people to use Catalogs and Catalog Assignments, they must be given read access to these these tables. Currently only the System Administrator has full access to the Catalog and Catalog Assignment tables.
+> You must grant **Read** access to the security roles assigned to any users who will need to use these tables. These tables are found within the **Custom Entities** tab when you edit a security role.
 > 
 > More information: 
 > - [Edit a security role](/power-platform/admin/create-edit-security-role#edit-a-security-role)
@@ -91,6 +93,28 @@ When you make a CatalogAssignement to a table, any system bound operations for t
 
 With this catalog, the following events will be available:
 
+|Table  |Event  |Why available  |
+|---------|---------|---------|
+|Account|Create<br />Update<br />Delete| Standard Data Operation |
+|Contact|Create<br />Update<br />Delete| Standard Data Operation |
+|Membership|Create<br />Update<br />Delete| Standard Data Operation |
+|N/A|`contoso_CustomerEnteredStore`|Explicit Catalog Assignment|
+|N/A|`contoso_CustomerVisitWebSite`|Explicit Catalog Assignment|
+|N/A|`contoso_CustomerPurchasedProduct`|Explicit Catalog Assignment|
+|N/A|`contoso_CustomerReturnedProduct`|Explicit Catalog Assignment|
+
+Most tables will support **Create**, **Update**, and **Delete** events. There are some exceptions.
+
+> [!NOTE]
+> More specialized events bound to tables are planned. As those events are enabled, your catalog assignments will include those events.
+>
+> For example:
+> - User-owned tables will include **GrantAccess**, **ModifyAccess**, **RevokeAccess** events
+> - Those tables that support the **Merge** action will include that event.
+
+
+
+<!--  Describes events to be enabled in future
 |Table  |Event  |Why available  |
 |---------|---------|---------|
 |Account|Create<br />Update<br />Delete| Standard Data Operation |
@@ -111,6 +135,8 @@ With this catalog, the following events will be available:
 - Certain system tables support special operations, such as Merge.
 - Any custom table will not have any additional events, unless they are user-owned.
 
+-->
+
 Any Custom API or Custom Process Actions, even if they are bound to a table, must be explicitly assigned.
 
 ## Catalog table columns
@@ -483,4 +509,4 @@ For example:
 
 
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]