Merge remote-tracking branch 'origin/master'

Author: ViacheslavKlimov

ce/docs/DeviceApiControllerApi.md

@@ -37,6 +37,7 @@ void removeEntitiesFromEntityGroup(@Nonnull String entityGroupId, @Nonnull List<
 EntityGroupInfo saveEntityGroup(@Nonnull EntityGroup entityGroup) // Create Or Update Entity Group (saveEntityGroup)
 void shareEntityGroup(@Nonnull String entityGroupId, @Nonnull ShareGroupRequest shareGroupRequest) // Share the Entity Group (shareEntityGroup)
 void shareEntityGroupToChildOwnerUserGroup(@Nonnull String entityGroupId, @Nonnull String userGroupId, @Nonnull String roleId) // Share the Entity Group with User group (shareEntityGroupToChildOwnerUserGroup)
+void shareEntityGroupToChildOwnerUserGroupV2(@Nonnull UUID entityGroupId, @Nonnull ShareGroupRequest shareGroupRequest) // Share the Entity Group with User group (shareEntityGroupToChildOwnerUserGroupV2)
 EntityGroup unassignEntityGroupFromEdge(@Nonnull String edgeId, @Nonnull String groupType, @Nonnull String entityGroupId) // Unassign entity group from edge (unassignEntityGroupFromEdge)
 ```
 
@@ -945,6 +946,31 @@ Share the entity group with specified user group using specified role.   Availab
 null (empty response body)
 
 
+## shareEntityGroupToChildOwnerUserGroupV2
+
+```
+void shareEntityGroupToChildOwnerUserGroupV2(@Nonnull UUID entityGroupId, @Nonnull ShareGroupRequest shareGroupRequest)
+```
+
+**POST** `/api/v2/entityGroup/{entityGroupId}/share`
+
+Share the Entity Group with User group (shareEntityGroupToChildOwnerUserGroupV2)
+
+Share the entity group with specified user group using specified role.   Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. Security check is performed to verify that the user has 'WRITE' permission for specified group.
+
+
+### Parameters
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **entityGroupId** | **UUID** | A uuid value representing the Entity Group Id that you would like to share. For example, '784f394c-42b6-435a-983c-b7beff2784f9' | |
+| **shareGroupRequest** | **ShareGroupRequest** |  | |
+
+### Return type
+
+null (empty response body)
+
+
 ## unassignEntityGroupFromEdge
 
 ```

ce/spec/openapi.json

@@ -23,8 +23,8 @@
 | **legendLabelColor** | **String** |  | [optional] |
 | **legendValueFont** | **Font** |  | [optional] |
 | **legendValueColor** | **String** |  | [optional] |
-| **yaxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** |  | [optional] |
 | **xaxis** | **TimeSeriesChartXAxisSettings** |  | [optional] |
+| **yaxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** |  | [optional] |
 | **thresholds** | **List\<TimeSeriesChartThreshold\>** |  | [optional] |
 | **grid** | **TimeSeriesChartGridSettings** |  | [optional] |
 | **yAxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** |  | [optional] |