Skip to content

Commit 091c2d0

Browse files
committed
Merge branch 'master' into portals-2072317
2 parents 20fb6c5 + 38d7e77 commit 091c2d0

File tree

5 files changed

+105
-55
lines changed

5 files changed

+105
-55
lines changed

powerapps-docs/developer/common-data-service/webapi/retrieve-related-entities-query.md

Lines changed: 94 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Retrieve related entity records with a query (Microsoft Dataverse)| Microsoft Docs"
33
description: "Read how you can retrieve related entity records by expanding the navigation properties."
44
ms.custom: ""
5-
ms.date: 06/27/2020
5+
ms.date: 11/16/2020
66
ms.service: powerapps
77
ms.suite: ""
88
ms.tgt_pltfrm: ""
@@ -207,9 +207,11 @@ OData-Version: 4.0
207207

208208
## Retrieve related entities by expanding collection-valued navigation properties
209209

210-
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.
210+
If you expand on collection-valued navigation parameters to retrieve related entities for entity sets, only one level of depth is returned if there is data. Otherwise the collection will return an empty array.
211211

212-
The following example retrieves the tasks assigned to the top 2 account records.
212+
In either case an `@odata.nextLink` property will be returned for the related entities. If you want to retrieve the collection separately, you can use the value of the `@odata.nextLink` property with a new `GET` request to return the required data.
213+
214+
The following example retrieves the tasks assigned to the top 2 account records. One has related tasks, the other does not.
213215

214216
**Request**
215217

@@ -229,24 +231,46 @@ HTTP/1.1 200 OK
229231
Content-Type: application/json; odata.metadata=minimal
230232
OData-Version: 4.0
231233
232-
{
233-
"@odata.context":"[Organization URI]/api/data/v9.1/$metadata#accounts(name,Account_Tasks,Account_Tasks(subject,scheduledstart))",
234-
"value":[
235-
{
236-
"@odata.etag":"W/\"513475\"",
237-
"name":"Fourth Coffee (sample)",
238-
"accountid":"36dbf27c-8efb-e511-80d2-00155db07c77",
239-
"Account_Tasks":[],
240-
"[email protected]":"[Organization URI]/api/data/v9.1/accounts(36dbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select%20=%20subject,%20scheduledstart"
241-
},
242-
{
243-
"@odata.etag":"W/\"513477\"",
244-
"name":"Litware, Inc. (sample)",
245-
"accountid":"38dbf27c-8efb-e511-80d2-00155db07c77",
246-
"Account_Tasks":[],
247-
"[email protected]":"[Organization URI]/api/data/v9.1/accounts(38dbf27c-8efb-e511-80d2-00155db07c77)/Account_Tasks?$select%20=%20subject,%20scheduledstart"
248-
}
249-
]
234+
{
235+
"@odata.context": "[Organization URI]/api/data/v9.1/$metadata#accounts(name,Account_Tasks(subject,scheduledstart))",
236+
"value": [
237+
{
238+
"@odata.etag": "W/\"37867294\"",
239+
"name": "Contoso, Ltd. (sample)",
240+
"accountid": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
241+
"Account_Tasks": [
242+
{
243+
"@odata.etag": "W/\"28876919\"",
244+
"subject": "Task 1 for Contoso, Ltd.",
245+
"scheduledstart": null,
246+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
247+
"activityid": "7b4814f9-b0b8-ea11-a812-000d3a122b89"
248+
},
249+
{
250+
"@odata.etag": "W/\"28876923\"",
251+
"subject": "Task 2 for Contoso, Ltd.",
252+
"scheduledstart": null,
253+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
254+
"activityid": "7c4814f9-b0b8-ea11-a812-000d3a122b89"
255+
},
256+
{
257+
"@odata.etag": "W/\"28876927\"",
258+
"subject": "Task 3 for Contoso, Ltd.",
259+
"scheduledstart": null,
260+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
261+
"activityid": "7d4814f9-b0b8-ea11-a812-000d3a122b89"
262+
}
263+
],
264+
"[email protected]": "[Organization URI]/api/data/v9.1/accounts(7a4814f9-b0b8-ea11-a812-000d3a122b89)/Account_Tasks?$select=subject,scheduledstart"
265+
},
266+
{
267+
"@odata.etag": "W/\"37526208\"",
268+
"name": "Fourth Coffee",
269+
"accountid": "ccd685f9-cddd-ea11-a813-000d3a122b89",
270+
"Account_Tasks": [],
271+
"[email protected]": "[Organization URI]/api/data/v9.1/accounts(ccd685f9-cddd-ea11-a813-000d3a122b89)/Account_Tasks?$select=subject,scheduledstart"
272+
}
273+
]
250274
}
251275
252276
```
@@ -255,7 +279,7 @@ OData-Version: 4.0
255279

256280
## Retrieve related entities by expanding both single-valued and collection-valued navigation properties
257281

258-
The following example demonstrates how you can expand related entities 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.
282+
The following example demonstrates how you can expand related entities 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 one level of depth and an `@odata.nextLink` property for the related entities.
259283

260284
In this example, we are retrieving the contact and tasks assigned to the top 2 accounts.
261285

@@ -278,33 +302,54 @@ HTTP/1.1 200 OK
278302
Content-Type: application/json; odata.metadata=minimal
279303
OData-Version: 4.0
280304
281-
{
282-
"@odata.context":"[Organization URI]/api/data/v9.1/$metadata#accounts(name,primarycontactid,Account_Tasks,primarycontactid(contactid,fullname),Account_Tasks(subject,scheduledstart))",
283-
"value":
284-
[
285-
{
286-
"@odata.etag":"W/\"550614\"",
287-
"name":"Fourth Coffee (sample)",
288-
"accountid":"5b9648c3-68f7-e511-80d3-00155db53318",
289-
"primarycontactid":{
290-
"contactid":"c19648c3-68f7-e511-80d3-00155db53318",
291-
"fullname":"Yvonne McKay (sample)"
292-
},
293-
"Account_Tasks":[],
294-
"[email protected]":"[Organization URI]/api/data/v9.1/accounts(5b9648c3-68f7-e511-80d3-00155db53318)/Account_Tasks?$select%20=%20subject,%20scheduledstart"
295-
},
296-
{
297-
"@odata.etag":"W/\"550615\"",
298-
"name":"Litware, Inc. (sample)",
299-
"accountid":"5d9648c3-68f7-e511-80d3-00155db53318",
300-
"primarycontactid":{
301-
"contactid":"c39648c3-68f7-e511-80d3-00155db53318",
302-
"fullname":"Susanna Stubberod (sample)"
303-
},
304-
"Account_Tasks":[],
305-
"[email protected]":"[Organization URI]/api/data/v9.1/accounts(5d9648c3-68f7-e511-80d3-00155db53318)/Account_Tasks?$select%20=%20subject,%20scheduledstart"
306-
}
307-
]
305+
{
306+
"@odata.context": "[Organization URI]/api/data/v9.1/$metadata#accounts(name,primarycontactid(contactid,fullname),Account_Tasks(subject,scheduledstart))",
307+
"value": [
308+
{
309+
"@odata.etag": "W/\"37867294\"",
310+
"name": "Contoso, Ltd. (sample)",
311+
"accountid": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
312+
"primarycontactid": {
313+
"contactid": "7e4814f9-b0b8-ea11-a812-000d3a122b89",
314+
"fullname": "Yvonne McKay (sample)"
315+
},
316+
"Account_Tasks": [
317+
{
318+
"@odata.etag": "W/\"28876919\"",
319+
"subject": "Task 1 for Contoso, Ltd.",
320+
"scheduledstart": null,
321+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
322+
"activityid": "7b4814f9-b0b8-ea11-a812-000d3a122b89"
323+
},
324+
{
325+
"@odata.etag": "W/\"28876923\"",
326+
"subject": "Task 2 for Contoso, Ltd.",
327+
"scheduledstart": null,
328+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
329+
"activityid": "7c4814f9-b0b8-ea11-a812-000d3a122b89"
330+
},
331+
{
332+
"@odata.etag": "W/\"28876927\"",
333+
"subject": "Task 3 for Contoso, Ltd.",
334+
"scheduledstart": null,
335+
"_regardingobjectid_value": "7a4814f9-b0b8-ea11-a812-000d3a122b89",
336+
"activityid": "7d4814f9-b0b8-ea11-a812-000d3a122b89"
337+
}
338+
],
339+
"[email protected]": "[Organization URI]/api/data/v9.1/accounts(7a4814f9-b0b8-ea11-a812-000d3a122b89)/Account_Tasks?$select=subject,scheduledstart"
340+
},
341+
{
342+
"@odata.etag": "W/\"37526208\"",
343+
"name": "Fourth Coffee",
344+
"accountid": "ccd685f9-cddd-ea11-a813-000d3a122b89",
345+
"primarycontactid": {
346+
"contactid": "384d0f84-7de6-ea11-a817-000d3a122b89",
347+
"fullname": "Charlie Brown"
348+
},
349+
"Account_Tasks": [],
350+
"[email protected]": "[Organization URI]/api/data/v9.1/accounts(ccd685f9-cddd-ea11-a813-000d3a122b89)/Account_Tasks?$select=subject,scheduledstart"
351+
}
352+
]
308353
}
309354
```
310355

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Navigation/openForm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ search.app:
4444
<li><b>height</b>: (Optional) Number. Height of the form window to be displayed in pixels.</li>
4545
<li><b>navbar</b>: (Optional) String. Controls whether the navigation bar is displayed and whether application navigation is available using the areas and subareas defined in the sitemap. Valid values are: "on", "off", or "entity".<ul><li><code>on</code>: The navigation bar is displayed. This is the default behavior if the <b>navbar</b> parameter is not used.</li>
4646
<li><code>off</code>: The navigation bar is not displayed. People can navigate using other user interface elements or the back and forward buttons.</li><li><code>entity</code>: On an entity form, only the navigation options for related entities are available. After navigating to a related entity, a back button is displayed in the navigation bar to allow returning to the original record.</li></ul></li>
47-
<li><b>openInNewWindow</b>: (Optional) Boolean. Indicates whether to display form in a new window.</li>
47+
<li><b>openInNewWindow</b>: (Optional) Boolean. Indicates whether to display form in a new window or a new tab. If you specify <code>true</code> and do not specify values for height or width, the form will display in a new tab.</li>
4848
<li><b>windowPosition</b>: (Optional) Number. Specify one of the following values for the position of the form on the screen:<ul><li><code>1:center</code></li><li><code>2:side</code></li></ul>
4949
This does not apply to opening a new browser window.
5050
<li><b>relationship</b>: (Optional) Object. Define a relationship object to display the related records on the form. The object has the following attributes.

powerapps-docs/maker/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
href: ./canvas-apps/controls/control-export-import.md
404404
- name: Gallery
405405
href: ./canvas-apps/controls/control-gallery.md
406-
- name: Horizontal container (experimental)
406+
- name: Horizontal container
407407
href: ./canvas-apps/controls/control-horizontal-container.md
408408
- name: HTML text
409409
href: ./canvas-apps/controls/control-html-text.md
@@ -449,7 +449,7 @@
449449
href: ./canvas-apps/controls/control-timer.md
450450
- name: Toggle
451451
href: ./canvas-apps/controls/control-toggle.md
452-
- name: Vertical container (experimental)
452+
- name: Vertical container
453453
href: ./canvas-apps/controls/control-vertical-container.md
454454
- name: Video
455455
href: ./canvas-apps/controls/control-audio-video.md

powerapps-docs/maker/canvas-apps/build-responsive-apps.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ search.app:
1717

1818
# Building responsive apps
1919

20-
[This article is pre-release documentation and is subject to change.]
21-
2220
Responsiveness refers to the ability of an app to automatically align to different screen sizes and form factors to use the available screen space sensibly, providing great UI and UX in every device, form factor, and screen size.
2321

2422
> [!IMPORTANT]

powerapps-docs/maker/canvas-apps/geospatial-overview.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ The following prebuilt components can be used for geospatial and mapping scenari
3232
## Prerequisites
3333

3434
1. An admin must [enable the geospatial features in the Power Platform admin center](#enable-the-geospatial-features-for-the-environment) for the environment. This requires reviewing and agreeing to specific terms of service.
35-
2. [Enable the geospatial features for each app](#enable-the-geospatial-features-for-each-app).
35+
2. An admin must [ensure the geospatial components will not be blocked by the environment's data loss prevention policies](#review-the-environments-data-loss-prevention-policies).
36+
3. [Enable the geospatial features for each app](#enable-the-geospatial-features-for-each-app).
3637

3738
>[!IMPORTANT]
3839
>The components require the default **Organizations** data source to be present. This data source is included whenever you insert the components into an app, but if you manually delete it you'll need to add it before the components will work:
@@ -85,6 +86,12 @@ The geospatial features require additional terms of use that must be reviewed an
8586

8687
![Screenshot of the Save button](./media/geospatial/ppac-save.png "Screenshot of the Save button")
8788

89+
### Review the environment's data loss prevention policies
90+
91+
The geospatial components require the Common Data Service and Spatial Services connectors.
92+
93+
For the components to function properly, these connectors must not have conflicting data loss prevention policies. An admin must review the environment's data loss prevention policies and ensure that these connectors are classified under the same data group, typically the **Business** data group. [Learn more about data loss prevention policies for Power Platform](/power-platform/admin/prevent-data-loss).
94+
8895
### Enable the geospatial features for each app
8996

9097
1. Open the app for editing in Power Apps Studio at [https://create.powerapps.com](https://create.powerapps.com).

0 commit comments

Comments
 (0)