@c8y/ngx-components 1018.0.196 → 1018.0.201
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/common/global-config.service.d.ts +1 -1
- package/core/common/permissions.service.d.ts +2 -2
- package/core/i18n/pattern-messages.data.d.ts +20 -20
- package/esm2020/assets-navigator/asset-node.service.mjs +9 -3
- package/esm2020/context-dashboard/add-dashboard.factory.mjs +10 -3
- package/esm2020/context-dashboard/context-dashboard.service.mjs +11 -3
- package/esm2020/context-dashboard/dashboard-detail.component.mjs +7 -2
- package/esm2020/context-dashboard/report-dashboard/report-dashboard-list.component.mjs +4 -2
- package/esm2020/core/common/global-config.service.mjs +6 -2
- package/esm2020/core/common/permissions.service.mjs +2 -2
- package/esm2020/core/common/user-preferences/user-preferences.service.mjs +6 -2
- package/esm2020/core/i18n/pattern-messages.data.mjs +21 -21
- package/esm2020/files-repository/files-repository.guard.mjs +6 -5
- package/esm2020/repository/configuration/device-tab/configuration-preview.component.mjs +11 -3
- package/esm2020/sub-assets/add-group/add-group.component.mjs +7 -2
- package/esm2020/sub-assets/groups.component.mjs +5 -2
- package/esm2020/sub-assets/sub-assets.component.mjs +7 -2
- package/esm2020/sub-assets/sub-assets.service.mjs +12 -6
- package/fesm2015/c8y-ngx-components-assets-navigator.mjs +8 -2
- package/fesm2015/c8y-ngx-components-assets-navigator.mjs.map +1 -1
- package/fesm2015/c8y-ngx-components-context-dashboard.mjs +28 -6
- package/fesm2015/c8y-ngx-components-context-dashboard.mjs.map +1 -1
- package/fesm2015/c8y-ngx-components-files-repository.mjs +5 -4
- package/fesm2015/c8y-ngx-components-files-repository.mjs.map +1 -1
- package/fesm2015/c8y-ngx-components-repository-configuration.mjs +10 -2
- package/fesm2015/c8y-ngx-components-repository-configuration.mjs.map +1 -1
- package/fesm2015/c8y-ngx-components-sub-assets.mjs +27 -8
- package/fesm2015/c8y-ngx-components-sub-assets.mjs.map +1 -1
- package/fesm2015/c8y-ngx-components.mjs +31 -23
- package/fesm2015/c8y-ngx-components.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components-assets-navigator.mjs +8 -2
- package/fesm2020/c8y-ngx-components-assets-navigator.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components-context-dashboard.mjs +28 -6
- package/fesm2020/c8y-ngx-components-context-dashboard.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components-files-repository.mjs +5 -4
- package/fesm2020/c8y-ngx-components-files-repository.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components-repository-configuration.mjs +10 -2
- package/fesm2020/c8y-ngx-components-repository-configuration.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components-sub-assets.mjs +27 -8
- package/fesm2020/c8y-ngx-components-sub-assets.mjs.map +1 -1
- package/fesm2020/c8y-ngx-components.mjs +31 -23
- package/fesm2020/c8y-ngx-components.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -289,18 +289,20 @@ class SubAssetsService extends DataGridService {
|
|
|
289
289
|
return this.getAssetsStatistics(parentReference, filters);
|
|
290
290
|
}
|
|
291
291
|
async canEditGroup(group) {
|
|
292
|
-
return await this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN], group);
|
|
292
|
+
return await this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN, Permissions.ROLE_MANAGED_OBJECT_ADMIN], group);
|
|
293
293
|
}
|
|
294
294
|
canCreateGroup() {
|
|
295
295
|
const currentUser = this.appState.currentUser.value;
|
|
296
296
|
const hasAdminRole = this.user.hasAnyRole(currentUser, [
|
|
297
297
|
Permissions.ROLE_INVENTORY_ADMIN,
|
|
298
|
-
Permissions.ROLE_INVENTORY_CREATE
|
|
298
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
299
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
300
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
299
301
|
]);
|
|
300
302
|
return hasAdminRole;
|
|
301
303
|
}
|
|
302
304
|
async canAssignDevice(group) {
|
|
303
|
-
return await this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN], group);
|
|
305
|
+
return await this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN, Permissions.ROLE_MANAGED_OBJECT_ADMIN], group);
|
|
304
306
|
}
|
|
305
307
|
canEditSmartGroup() {
|
|
306
308
|
const SMART_GROUPS_ROLES_EDIT = [
|
|
@@ -312,7 +314,8 @@ class SubAssetsService extends DataGridService {
|
|
|
312
314
|
canDeleteSmartGroup() {
|
|
313
315
|
const SMART_GROUPS_ROLES_DELETE = [
|
|
314
316
|
Permissions.ROLE_SMARTGROUP_ADMIN,
|
|
315
|
-
Permissions.ROLE_INVENTORY_ADMIN
|
|
317
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
318
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN
|
|
316
319
|
];
|
|
317
320
|
return this.permissionsService.hasAnyRole(SMART_GROUPS_ROLES_DELETE);
|
|
318
321
|
}
|
|
@@ -324,7 +327,10 @@ class SubAssetsService extends DataGridService {
|
|
|
324
327
|
const hasAnyInventoryRole = this.user.hasAnyRole(currentUser, [
|
|
325
328
|
Permissions.ROLE_INVENTORY_ADMIN,
|
|
326
329
|
Permissions.ROLE_INVENTORY_READ,
|
|
327
|
-
Permissions.ROLE_INVENTORY_CREATE
|
|
330
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
331
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
332
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE,
|
|
333
|
+
Permissions.ROLE_MANAGED_OBJECT_READ
|
|
328
334
|
]);
|
|
329
335
|
return !hasAnyInventoryRole;
|
|
330
336
|
}
|
|
@@ -524,7 +530,12 @@ class AddGroupComponent {
|
|
|
524
530
|
this.subscription = this.onCancel.subscribe(() => this.resetStepper());
|
|
525
531
|
this.canCreateGroup =
|
|
526
532
|
this.subAssetsService.canCreateGroup() ||
|
|
527
|
-
(await this.permissionsService.canEdit([
|
|
533
|
+
(await this.permissionsService.canEdit([
|
|
534
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
535
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
536
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
537
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
538
|
+
], {
|
|
528
539
|
id: this.currentGroupId
|
|
529
540
|
}));
|
|
530
541
|
this.canAssignDevice = await this.subAssetsService.canAssignDevice({
|
|
@@ -1701,7 +1712,10 @@ class GroupsComponent {
|
|
|
1701
1712
|
this.shouldDisableAddGroup = false;
|
|
1702
1713
|
}
|
|
1703
1714
|
ngOnInit() {
|
|
1704
|
-
if (!this.permissions.
|
|
1715
|
+
if (!this.permissions.hasAnyRole([
|
|
1716
|
+
Permissions.ROLE_INVENTORY_READ,
|
|
1717
|
+
Permissions.ROLE_MANAGED_OBJECT_READ
|
|
1718
|
+
])) {
|
|
1705
1719
|
this.sortable = false;
|
|
1706
1720
|
}
|
|
1707
1721
|
this.shouldDisableAddGroup = !this.subAssetsService.canCreateGroup();
|
|
@@ -1750,7 +1764,12 @@ class SubAssetsComponent {
|
|
|
1750
1764
|
this.group = { ...contextData };
|
|
1751
1765
|
this.title = this.group.name;
|
|
1752
1766
|
this.currentGroupId = this.group.id;
|
|
1753
|
-
this.shouldDisableAddGroup = !(await this.permissionsService.canEdit([
|
|
1767
|
+
this.shouldDisableAddGroup = !(await this.permissionsService.canEdit([
|
|
1768
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
1769
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
1770
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
1771
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
1772
|
+
], this.group));
|
|
1754
1773
|
this.shouldDisableAssignDevices = !(await this.subAssetsService.canAssignDevice(this.group));
|
|
1755
1774
|
this.customProperties = await this.subAssetsService.getCustomProperties(this.group);
|
|
1756
1775
|
this.shouldShowAssetsProperties =
|