@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
|
@@ -343,20 +343,22 @@ class SubAssetsService extends DataGridService {
|
|
|
343
343
|
}
|
|
344
344
|
canEditGroup(group) {
|
|
345
345
|
return __awaiter(this, void 0, void 0, function* () {
|
|
346
|
-
return yield this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN], group);
|
|
346
|
+
return yield this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN, Permissions.ROLE_MANAGED_OBJECT_ADMIN], group);
|
|
347
347
|
});
|
|
348
348
|
}
|
|
349
349
|
canCreateGroup() {
|
|
350
350
|
const currentUser = this.appState.currentUser.value;
|
|
351
351
|
const hasAdminRole = this.user.hasAnyRole(currentUser, [
|
|
352
352
|
Permissions.ROLE_INVENTORY_ADMIN,
|
|
353
|
-
Permissions.ROLE_INVENTORY_CREATE
|
|
353
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
354
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
355
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
354
356
|
]);
|
|
355
357
|
return hasAdminRole;
|
|
356
358
|
}
|
|
357
359
|
canAssignDevice(group) {
|
|
358
360
|
return __awaiter(this, void 0, void 0, function* () {
|
|
359
|
-
return yield this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN], group);
|
|
361
|
+
return yield this.permissionsService.canEdit([Permissions.ROLE_INVENTORY_ADMIN, Permissions.ROLE_MANAGED_OBJECT_ADMIN], group);
|
|
360
362
|
});
|
|
361
363
|
}
|
|
362
364
|
canEditSmartGroup() {
|
|
@@ -369,7 +371,8 @@ class SubAssetsService extends DataGridService {
|
|
|
369
371
|
canDeleteSmartGroup() {
|
|
370
372
|
const SMART_GROUPS_ROLES_DELETE = [
|
|
371
373
|
Permissions.ROLE_SMARTGROUP_ADMIN,
|
|
372
|
-
Permissions.ROLE_INVENTORY_ADMIN
|
|
374
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
375
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN
|
|
373
376
|
];
|
|
374
377
|
return this.permissionsService.hasAnyRole(SMART_GROUPS_ROLES_DELETE);
|
|
375
378
|
}
|
|
@@ -381,7 +384,10 @@ class SubAssetsService extends DataGridService {
|
|
|
381
384
|
const hasAnyInventoryRole = this.user.hasAnyRole(currentUser, [
|
|
382
385
|
Permissions.ROLE_INVENTORY_ADMIN,
|
|
383
386
|
Permissions.ROLE_INVENTORY_READ,
|
|
384
|
-
Permissions.ROLE_INVENTORY_CREATE
|
|
387
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
388
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
389
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE,
|
|
390
|
+
Permissions.ROLE_MANAGED_OBJECT_READ
|
|
385
391
|
]);
|
|
386
392
|
return !hasAnyInventoryRole;
|
|
387
393
|
}
|
|
@@ -542,7 +548,12 @@ class AddGroupComponent {
|
|
|
542
548
|
this.subscription = this.onCancel.subscribe(() => this.resetStepper());
|
|
543
549
|
this.canCreateGroup =
|
|
544
550
|
this.subAssetsService.canCreateGroup() ||
|
|
545
|
-
(yield this.permissionsService.canEdit([
|
|
551
|
+
(yield this.permissionsService.canEdit([
|
|
552
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
553
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
554
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
555
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
556
|
+
], {
|
|
546
557
|
id: this.currentGroupId
|
|
547
558
|
}));
|
|
548
559
|
this.canAssignDevice = yield this.subAssetsService.canAssignDevice({
|
|
@@ -1775,7 +1786,10 @@ class GroupsComponent {
|
|
|
1775
1786
|
this.shouldDisableAddGroup = false;
|
|
1776
1787
|
}
|
|
1777
1788
|
ngOnInit() {
|
|
1778
|
-
if (!this.permissions.
|
|
1789
|
+
if (!this.permissions.hasAnyRole([
|
|
1790
|
+
Permissions.ROLE_INVENTORY_READ,
|
|
1791
|
+
Permissions.ROLE_MANAGED_OBJECT_READ
|
|
1792
|
+
])) {
|
|
1779
1793
|
this.sortable = false;
|
|
1780
1794
|
}
|
|
1781
1795
|
this.shouldDisableAddGroup = !this.subAssetsService.canCreateGroup();
|
|
@@ -1829,7 +1843,12 @@ class SubAssetsComponent {
|
|
|
1829
1843
|
this.group = Object.assign({}, contextData);
|
|
1830
1844
|
this.title = this.group.name;
|
|
1831
1845
|
this.currentGroupId = this.group.id;
|
|
1832
|
-
this.shouldDisableAddGroup = !(yield this.permissionsService.canEdit([
|
|
1846
|
+
this.shouldDisableAddGroup = !(yield this.permissionsService.canEdit([
|
|
1847
|
+
Permissions.ROLE_INVENTORY_ADMIN,
|
|
1848
|
+
Permissions.ROLE_INVENTORY_CREATE,
|
|
1849
|
+
Permissions.ROLE_MANAGED_OBJECT_ADMIN,
|
|
1850
|
+
Permissions.ROLE_MANAGED_OBJECT_CREATE
|
|
1851
|
+
], this.group));
|
|
1833
1852
|
this.shouldDisableAssignDevices = !(yield this.subAssetsService.canAssignDevice(this.group));
|
|
1834
1853
|
this.customProperties = yield this.subAssetsService.getCustomProperties(this.group);
|
|
1835
1854
|
this.shouldShowAssetsProperties =
|