Skip to content

Commit f6dd2ab

Browse files
authored
Merge branch 'main' into sthapliyal/addClientAppIdToAppDef
2 parents bae441b + d6b5b8b commit f6dd2ab

27 files changed

+639
-42
lines changed

api-reference/beta/api/adminreportsettings-get.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2626
<!-- { "blockType": "permissions", "name": "adminreportsettings_get" } -->
2727
[!INCLUDE [permissions-table](../includes/permissions/adminreportsettings-get-permissions.md)]
2828

29-
> **Note:** For delegated permissions to allow apps to get report settings on behalf of a user, the tenant administrator must have assigned the user the appropriate Microsoft Entra ID limited administrator role. For more details, see [Authorization for APIs to read Microsoft 365 usage reports](/graph/reportroot-authorization).
29+
> **Note:** For delegated permissions to allow apps to get report settings on behalf of a user, the tenant administrator must have assigned the user the appropriate Microsoft Entra ID limited administrator role. For more information, see [Authorization for APIs to read Microsoft 365 usage reports](/graph/reportroot-authorization).
3030
3131
## HTTP request
3232

@@ -36,6 +36,10 @@ Choose the permission or permissions marked as least privileged for this API. Us
3636
GET /admin/reportSettings
3737
```
3838

39+
## Optional query parameters
40+
41+
This method supports the `$select` [OData query parameter](/graph/query-parameters) to help customize the response.
42+
3943
## Request headers
4044

4145
| Name | Description |

api-reference/beta/api/adminreportsettings-update.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2424
<!-- { "blockType": "permissions", "name": "adminreportsettings_update" } -->
2525
[!INCLUDE [permissions-table](../includes/permissions/adminreportsettings-update-permissions.md)]
2626

27-
> **Note:** For delegated permissions to allow apps to update report settings on behalf of a user, the tenant administrator must have assigned the user the appropriate Microsoft Entra ID limited administrator role. For more details, see [Authorization for APIs to read Microsoft 365 usage reports](/graph/reportroot-authorization).
27+
> **Note:** For delegated permissions to allow apps to update report settings on behalf of a user, the tenant administrator must have assigned the user the appropriate Microsoft Entra ID limited administrator role. For more information, see [Authorization for APIs to read Microsoft 365 usage reports](/graph/reportroot-authorization).
2828
2929
## HTTP request
3030
<!-- { "blockType": "ignored" } -->
@@ -45,7 +45,7 @@ PATCH /admin/reportSettings
4545

4646
| Property | Type | Description |
4747
| -------------- | -------------- | ------------------------------------------- |
48-
| displayConcealedNames | Boolean | If set to `true`, all reports will conceal user information such as usernames, groups, and sites. If `false`, all reports will show identifiable information. This property represents a setting in the Microsoft 365 admin center. Required. |
48+
| displayConcealedNames | Boolean | If set to `true`, all reports conceal user information such as usernames, groups, and sites. If `false`, all reports show identifiable information. This property represents a setting in the Microsoft 365 admin center. Required. |
4949

5050
## Response
5151

api-reference/beta/api/identitycontainer-list-identityproviders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,4 @@ Content-type: application/json
313313
}
314314
]
315315
}
316-
```
316+
```

api-reference/beta/api/teamsapp-publish.md

Lines changed: 112 additions & 0 deletions
Large diffs are not rendered by default.

api-reference/beta/resources/adminreportsettings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ Represents the tenant-level settings for Microsoft 365 reports.
1919

2020
|Method|Return type|Description|
2121
|:---|:---|:---|
22-
|[Get](../api/adminreportsettings-get.md)|[adminReportSettings](../resources/adminreportsettings.md)|Get the tenant-level settings for Microsoft 365 Reports.|
23-
|[Update](../api/adminreportsettings-update.md)|[adminReportSettings](../resources/adminreportsettings.md)|Update tenant-level settings for Microsoft 365 Reports.|
22+
|[Get](../api/adminreportsettings-get.md)|[adminReportSettings](../resources/adminreportsettings.md)|Get the tenant-level settings for Microsoft 365 reports.|
23+
|[Update](../api/adminreportsettings-update.md)|[adminReportSettings](../resources/adminreportsettings.md)|Update tenant-level settings for Microsoft 365 reports.|
2424

2525
## Properties
2626

2727
| Property | Type | Description |
2828
| -------------- | -------------- | ------------------------------------------- |
29-
| displayConcealedNames | Boolean | If set to `true`, all reports will conceal user information such as usernames, groups, and sites. If `false`, all reports will show identifiable information. This property represents a setting in the Microsoft 365 admin center. Required. |
29+
| displayConcealedNames | Boolean | If set to `true`, all reports conceal user information such as usernames, groups, and sites. If `false`, all reports show identifiable information. This property represents a setting in the Microsoft 365 admin center. Required. |
3030

3131
## JSON representation
3232

api-reference/beta/resources/bookingschedulingpolicy.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Namespace: microsoft.graph
1515

1616
Represents the set of policies that determine how appointments should be created in a Microsoft Bookings calendar.
1717

18+
> [!NOTE]
19+
>
20+
> If the Default Scheduling Policy is enabled at the service level, the values of this resource are limited to those defined in the policy in the [List services](/graph/api/bookingbusiness-list-services) API response. In this case, the client must fall back to the Default Scheduling Policy for the business.
21+
1822
## Properties
1923
| Property | Type |Description|
2024
|:---------------|:--------|:----------|

api-reference/beta/resources/report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ Microsoft Graph controls access to resources via permissions. You must specify t
2121

2222
## Settings
2323

24-
In Microsoft 365 reports, user information such as usernames, groups, and sites is concealed; actual values are not displayed. You can use the [adminReportSettings](/graph/api/resources/adminreportsettings?view=graph-rest-beta&preserve-view=true) API to control the display of user information in the reports.
24+
In Microsoft 365 reports, user information such as usernames, groups, and sites is concealed; actual values aren't displayed. You can use the [adminReportSettings](../resources/adminreportsettings.md) API to control the display of user information in the reports.
2525

2626
## Cloud deployments
2727

2828
The following table shows the availability for each API across all cloud deployments.
2929

3030
| APIs | Microsoft Graph global service | **Microsoft Cloud for US Government** | **Microsoft Cloud China operated by 21Vianet** | **Microsoft Cloud for USNat and USSec** |
3131
| ------------------------------------------------------------ | ------------------------------ | ------------------------------------- | ---------------------------------------------- | --------------------------- |
32-
| [Admin Report Settings](/graph/api/resources/adminreportsettings?view=graph-rest-beta&preserve-view=true) |||||
32+
| [Admin report settings](../resources/adminreportsettings.md) |||||
3333
| [Microsoft 365 activations](/graph/api/resources/office-365-activations-reports?view=graph-rest-beta&preserve-view=true) |||||
3434
| [Microsoft 365 active users](/graph/api/resources/office-365-active-users-reports?view=graph-rest-beta&preserve-view=true)|||||
3535
| [Microsoft 365 Apps usage](/graph/api/resources/microsoft-365-apps-usage-report?view=graph-rest-beta&preserve-view=true) |||||

api-reference/beta/resources/workplacesensor.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Represents a sensor on hardware that collects and reports data on physical or en
2222
|displayName|String|The display name of the sensor. Optional.|
2323
|placeId|String| The unique identifier of the place that the sensor detects. If the device is installed in a room equipped with a mailbox, this property should match the **ExternalDirectoryObjectId** or Microsoft Entra object ID of the room mailbox. If the sensor detects the same place as the location of the device, the property can be omitted. The default value is the place identifier of the device. Optional. |
2424
|sensorId|String| The user-defined unique identifier of the sensor on the device. If the device has multiple sensors of the same type, the property must be provided to identify each sensor. If the device has only one sensor of a type, the property can be omitted. The default value is the sensor type. Optional. |
25-
|sensorType|[workplaceSensorType](../resources/workplacesensor.md#workplacesensortype-values)|The type of sensor. The possible values are: `occupancy`, `peopleCount`, `inferredOccupancy`, `heartbeat`, `bagde`, `wifi`, `unknownFutureValue`. Required. |
25+
|sensorType|[workplaceSensorType](../resources/workplacesensor.md#workplacesensortype-values)|The type of sensor. The possible values are: `occupancy`, `peopleCount`, `inferredOccupancy`, `heartbeat`, `badge`, `unknownFutureValue`. Required. |
2626

2727
### workplaceSensorType values
2828

@@ -33,7 +33,6 @@ Represents a sensor on hardware that collects and reports data on physical or en
3333
| inferredOccupancy | The sensor estimates the occupancy status of the place based on other clues, such as the presence of a laptop or a backpack. Use it for sensors that don't directly detect motion or people count. |
3434
| heartbeat | The sensor reports the heartbeat of the device. It indicates if the device is online or not. Use it for sensors that monitor the status of the device. |
3535
| badge | The sensor reports badge-swiping events of the people. Use it for sensors that accept active user interactions. |
36-
| wifi | The sensor reports the device's Wi-Fi connection and disconnects events from people. Use it for sensors that connect to other devices with Wi-Fi. |
3736
| unknownFutureValue | Evolvable enumeration sentinel value. Don't use. |
3837

3938
## Relationships

api-reference/beta/resources/workplacesensordevicetelemetry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Represents the data collected and reported by a sensor on a device, such as occu
2323
|deviceId|String|The user-defined unique identifier of the device provided at the time of creation. Don't use the system generated identifier of the device.|
2424
|intValue|Int32|The value of the sensor as an integer. Use it for sensors that report numerical values, such as people count. |
2525
|sensorId|String|The user-defined unique identifier of the sensor on the device. Optional. If the device has multiple sensors of the same type, the property must be provided to identify each sensor. If the device has unique sensor types, the property can be omitted. The default value is the sensor type.|
26-
|sensorType|[workplaceSensorType](../resources/workplacesensor.md#workplacesensortype-values)| The type of sensor. The possible values are: `occupancy`, `peopleCount`, `inferredOccupancy`, `heartbeat`, `badge`, `wifi`, `unknownFutureValue`.|
26+
|sensorType|[workplaceSensorType](../resources/workplacesensor.md#workplacesensortype-values)| The type of sensor. The possible values are: `occupancy`, `peopleCount`, `inferredOccupancy`, `heartbeat`, `badge`, `unknownFutureValue`.|
2727
|timestamp|DateTimeOffset|The date and time when the sensor measured and reported its value. The timestamp type represents date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
28-
|eventValue| [workplaceSensorEventValue](../resources/workplacesensoreventvalue.md)| The extra values associated with badge and Wi-Fi signals. |
28+
|eventValue| [workplaceSensorEventValue](../resources/workplacesensoreventvalue.md)| The extra values associated with badge signals. |
2929
|locationHint|String|The additional information to indicate the location of the device. |
3030

3131
## Relationships

api-reference/beta/resources/workplacesensoreventvalue.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "workplaceSensorEventValue resource type"
3-
description: "Represents the data collected and reported by a Wi-Fi or badge-swiping device."
3+
description: "Represents the data collected and reported by a badge-swiping device."
44
author: "Ailss"
55
ms.localizationpriority: medium
66
ms.subservice: "outlook"
@@ -13,22 +13,20 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Represents the data collected and reported by a Wi-Fi or badge-swiping device.
16+
Represents the data collected and reported by a badge-swiping device.
1717

1818
## Properties
1919

2020
| Property | Type | Description |
2121
|:---------------------------|:--------|:---------------------------------------------------------------|
22-
| eventType | [workplaceSensorEventType](../resources/workplacesensoreventvalue.md#workplacesensoreventtype-values) | The type of possible sensor event value. The possible values are: `badgeIn`, `badgeOut`, `wifiConnect`, `wifiDisconnect`, `unknownFutureValue`. |
22+
| eventType | [workplaceSensorEventType](../resources/workplacesensoreventvalue.md#workplacesensoreventtype-values) | The type of possible sensor event value. The possible values are: `badgeIn`, `badgeOut`, `unknownFutureValue`. |
2323
| user | [emailIdentity](../resources/emailidentity.md) | The unique identifier of a user. It could be an email or a Microsoft Entra ID. |
2424

2525
### workplaceSensorEventType values
2626
| Member | Description |
2727
|:-------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
2828
| badgeIn | An event in which a user enters a place by swiping the badge. |
2929
| badgeOut | An event in which a user exits a place by swiping the badge. |
30-
| wifiConnect | An event in which a user connects to the Wi-Fi device. |
31-
| wifiDisconnect | An event in which a user disconnects from the Wi-Fi device. |
3230
| unknownFutureValue | Evolvable enumeration sentinel value. Don't use. |
3331
## JSON representation
3432
The following JSON representation shows the resource type.

0 commit comments

Comments
 (0)