Merge pull request #6177 from MicrosoftDocs/main

Refresh content on Web API query

Author: JimDaly

powerapps-docs/developer/data-platform/webapi/query-data-web-api.md

@@ -1,7 +1,7 @@
 ---
 title: "Query data using the Web API (Microsoft Dataverse)| Microsoft Docs"
 description: "Read about the various ways to query Microsoft Dataverse table data using the Web API and the various system query options that can be applied in these queries."
-ms.date: 04/06/2022
+ms.date: 04/08/2022
 author: divka78
 ms.author: dikamath
 ms.reviewer: jdaly
@@ -698,162 +698,7 @@ Preference-Applied: odata.include-annotations="*"
     }
 } 
 ```  
-  
-<a name="bkmk_expandRelated"></a>
-
-## Retrieve related tables by expanding navigation properties
- 
-<a name="bkmk_retrieverelatedentityexpandcollectionnavprop"></a>
-
-### Retrieve related tables by expanding collection-valued navigation properties
-
-If you expand on collection-valued navigation parameters to retrieve related entities for entity sets, an `@odata.nextLink` property will be returned for the related entities. You should use the value of the `@odata.nextLink` property with a new `GET` request to return the required data.  
-
-The following example retrieves the tasks assigned to the top 5 account records.  
-  
-**Request**
-
-```http 
-GET [Organization URI]/api/data/v9.1/accounts?$top=5
-&$select=name
-&$expand=Account_Tasks($select=subject,scheduledstart) HTTP/1.1  
-Accept: application/json  
-OData-MaxVersion: 4.0  
-OData-Version: 4.0  
-```  
-  
-**Response** 
- 
-```http 
-HTTP/1.1 200 OK  
-Content-Type: application/json; odata.metadata=minimal  
-OData-Version: 4.0  
-  
-{  
-   "@odata.context":"[Organization URI]/api/data/v9.1/$metadata#accounts(name,Account_Tasks,Account_Tasks(subject,scheduledstart))",
-   "value":[  
-      {  
-         "@odata.etag":"W/\"513475\"",
-         "name":"Fourth Coffee (sample)",
-         "accountid":"36dbf27c-8efb-e511-80d2-00155db07c77",
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(36dbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"513477\"",
-         "name":"Litware, Inc. (sample)",
-         "accountid":"38dbf27c-8efb-e511-80d2-00155db07c77",
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(38dbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"514074\"",
-         "name":"Adventure Works (sample)",
-         "accountid":"3adbf27c-8efb-e511-80d2-00155db07c77",
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(3adbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"513481\"",
-         "name":"Fabrikam, Inc. (sample)",
-         "accountid":"3cdbf27c-8efb-e511-80d2-00155db07c77",
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(3cdbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"514057\"",
-         "name":"Blue Yonder Airlines (sample)",
-         "accountid":"3edbf27c-8efb-e511-80d2-00155db07c77",
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(3edbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select=subject,scheduledstart"
-          }
-       ]
-    }
- 
-```  
-
-<a name="bkmk_retrieverelatedentitysingleandcollectionnavprop"></a>
-  
-### Retrieve related rows (records) by expanding both single-valued and collection-valued navigation properties
-
-The following example demonstrates how you can expand related rows (records) for entity sets using both single and collection-valued navigation properties. As explained earlier, expanding on collection-valued navigation properties to retrieve related entities for entity sets returns an `@odata.nextLink` property for the related entities. You should use the value of the `@odata.nextLink` property with a new `GET` request to return the required data.  
-  
-In this example, we are retrieving the contact and tasks assigned to the top 3 accounts.  
-  
-**Request**
 
-```http 
-GET [Organization URI]/api/data/v9.1/accounts?$top=3
-&$select=name
-&$expand=primarycontactid($select=contactid,fullname),Account_Tasks($select=subject,scheduledstart)  HTTP/1.1  
-Accept: application/json  
-OData-MaxVersion: 4.0  
-OData-Version: 4.0  
-```  
-  
-**Response**  
-
-```http 
-HTTP/1.1 200 OK  
-Content-Type: application/json; odata.metadata=minimal  
-OData-Version: 4.0  
-  
-{  
-   "@odata.context":"[Organization URI]/api/data/v9.1/$metadata#accounts(name,primarycontactid,Account_Tasks,primarycontactid(contactid,fullname),Account_Tasks(subject,scheduledstart))",
-   "value":[  
-      {  
-         "@odata.etag":"W/\"550614\"",
-         "name":"Fourth Coffee (sample)",
-         "accountid":"5b9648c3-68f7-e511-80d3-00155db53318",
-         "primarycontactid":{  
-            "contactid":"c19648c3-68f7-e511-80d3-00155db53318",
-            "fullname":"Yvonne McKay (sample)"
-         },
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(5b9648c3-68f7-e511-80d3-00155db53318)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"550615\"",
-         "name":"Litware, Inc. (sample)",
-         "accountid":"5d9648c3-68f7-e511-80d3-00155db53318",
-         "primarycontactid":{  
-            "contactid":"c39648c3-68f7-e511-80d3-00155db53318",
-            "fullname":"Susanna Stubberod (sample)"
-         },
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(5d9648c3-68f7-e511-80d3-00155db53318)/Account_Tasks?$select=subject,scheduledstart"
-      },
-      {  
-         "@odata.etag":"W/\"550616\"",
-         "name":"Adventure Works (sample)",
-         "accountid":"5f9648c3-68f7-e511-80d3-00155db53318",
-         "primarycontactid":{  
-            "contactid":"c59648c3-68f7-e511-80d3-00155db53318",
-            "fullname":"Nancy Anderson (sample)"
-         },
-         "Account_Tasks":[  
-
-         ],
-         "[email protected]":"[Organization URI]/api/data/v9.1/accounts(5f9648c3-68f7-e511-80d3-00155db53318)/Account_Tasks?$select=subject,scheduledstart"
-      }
-   ]
-}
-  
-```  
 <a name="BKMK_changetracking"></a>
 
 ## Use change tracking to synchronize data with external systems

powerapps-docs/developer/data-platform/webapi/retrieve-entity-using-web-api.md

@@ -228,7 +228,7 @@ Use the `$expand` system query option to control what data from related entities
 If you simply include the name of the navigation property, you’ll receive all the properties for related records. You can limit the properties returned for related records using the `$select` system query option in parentheses after the navigation property name. Use this for both single-valued and collection-valued navigation properties.
 
 > [!NOTE]
-> To retrieve related entities for entity sets, see [Retrieve related tables by expanding navigation properties](query-data-web-api.md#bkmk_expandRelated).  
+> To retrieve related entities for entity sets, see [Retrieve related table records with a query](retrieve-related-entities-query.md).  
 
 - **Retrieve related entities for an entity instance by expanding single-valued navigation properties**: <br />The following example demonstrates how to retrieve the contact for an account entity. For the related contact record, we are only retrieving the contactid and fullname.
 
@@ -331,9 +331,6 @@ If you simply include the name of the navigation property, you’ll receive all
      ]
   }
   ```
-  
- > [!NOTE]
- > If you expand on collection-valued navigation parameters to retrieve related entities for *entity sets*, a @odata.nextLink property will be returned instead for the related entities. You should use the value of the @odata.nextLink property with a new GET request to return the required data. More information:[Retrieve related tables by expanding navigation properties](query-data-web-api.md#bkmk_expandRelated)
 
 - **Retrieve related entities for an entity instance by expanding both single-valued and collection-valued navigation properties**: The following example demonstrates how you can expand related entities for an entity instance using both single- and collection-values navigation properties.  
 

powerapps-docs/developer/data-platform/webapi/web-api-query-data-sample.md

@@ -40,7 +40,7 @@ This sample is divided into the following principal sections, containing Web API
 |[Ordering results](#bkmk_orderresults)|[Order results](query-data-web-api.md#bkmk_order)<br /><br /> [Filter results](query-data-web-api.md#bkmk_filter)|
 |[Parameter alias](#bkmk_parameteralias)|[Use parameter aliases with system query options](query-data-web-api.md#bkmk_useParameterAliases)|
 |[Limit results](#bkmk_limitresults)|[Limit results](query-data-web-api.md#bkmk_limitResults)<br /><br /> [Limits on number of rows returned](query-data-web-api.md#bkmk_limits)|
-|[Expanding results](#bkmk_expandresults)|[Retrieve related rows by expanding navigation properties](query-data-web-api.md#bkmk_expandRelated)|
+|[Expanding results](#bkmk_expandresults)|[Retrieve related table records with a query](retrieve-related-entities-query.md)|
 |[Predefined queries](#bkmk_predefinedqueries)|[Retrieve and execute predefined queries](retrieve-and-execute-predefined-queries.md)<br /><br /> <xref:Microsoft.Dynamics.CRM.userquery?text=userquery EntityType/><br /><br /> <xref:Microsoft.Dynamics.CRM.savedquery?text=savedquery EntityType/>|
 <!-- TODO:
 |[FetchXML queries](#bkmk_fetchxml)|[FetchXML schema](../org-service/fetchxml-schema.md)<br /><br /> [Page large result sets with FetchXML](../org-service/page-large-result-sets-with-fetchxml.md)<br /><br /> [Use custom FetchXML](retrieve-and-execute-predefined-queries.md#bkmk_useFetchXML)| -->
@@ -1365,7 +1365,7 @@ Page 2 of 3:
 
 ## Expanding results
 
-To retrieve information on associated table rows, use the `$expand` query option on navigation properties. More information:[Retrieve related rows by expanding navigation properties](query-data-web-api.md#bkmk_expandRelated).  
+To retrieve information on associated table rows, use the `$expand` query option on navigation properties. More information:[Retrieve related table records with a query](retrieve-related-entities-query.md)
 
 ### Expand on single-valued navigation property