@c8y/ng1-modules 1017.23.0 → 1017.25.0
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/app-status/app-events/app-events.html +3 -4
- package/app-status/app-status/app-status.html +1 -1
- package/core/ui/user/userPicker.html +26 -17
- package/core/ui/views/alarmList.html +15 -6
- package/core/ui/views/eventList.html +7 -10
- package/package.json +1 -1
- package/smartRules/list/smartRulesList.html +3 -3
- package/tenantApplications/subscribed-applications/subscribed-applications.html +9 -5
- package/tenantApplications/views/index.html +14 -9
- package/tenantApplications/views/popover.html +4 -3
- package/userRoles/copyRolesModal/copyRolesModal.html +8 -5
- package/userRoles/inventoryRolesTab/inventoryRolesTab.html +9 -11
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<div class="p-
|
|
1
|
+
<div class="p-16 separator-bottom">
|
|
2
2
|
<div class="input-group input-group-search">
|
|
3
3
|
<input
|
|
4
4
|
title="{{ 'Filter users' | translate }}"
|
|
@@ -22,18 +22,21 @@
|
|
|
22
22
|
</div>
|
|
23
23
|
</div>
|
|
24
24
|
<div class="user-picker-scroll">
|
|
25
|
-
<c8y-rectangle-spinner
|
|
26
|
-
|
|
25
|
+
<c8y-rectangle-spinner
|
|
26
|
+
ng-if="vm.loading"
|
|
27
|
+
message="'Loading users…' | translate"
|
|
28
|
+
></c8y-rectangle-spinner>
|
|
27
29
|
<div class="list-group" ng-if="vm.userFlatTree">
|
|
28
30
|
<div ng-if="vm.shouldShowWarning()" class="p-t-16 p-b-16 p-r-24 p-l-24">
|
|
29
31
|
<div class="alert alert-warning" translate>
|
|
30
32
|
Some users might not be shown. Try narrowing search criteria.
|
|
31
33
|
</div>
|
|
32
34
|
</div>
|
|
33
|
-
<div
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
<div
|
|
36
|
+
ng-if="vm.userFlatTree.length === 0 && vm.loading === false"
|
|
37
|
+
class="p-t-16 p-b-16 p-r-24 p-l-24"
|
|
38
|
+
>
|
|
39
|
+
<div class="alert alert-warning" translate>No users found.</div>
|
|
37
40
|
</div>
|
|
38
41
|
<div
|
|
39
42
|
class="list-group-item d-flex a-i-center text-truncate p-l-0"
|
|
@@ -44,32 +47,38 @@
|
|
|
44
47
|
class="d-inline-block p-r-4"
|
|
45
48
|
ng-style="::{width: vm.userDepth(user)}"
|
|
46
49
|
ng-hide="::user._owns.length"
|
|
47
|
-
>
|
|
48
|
-
</span>
|
|
50
|
+
></span>
|
|
49
51
|
<button
|
|
50
52
|
class="col-expand btn-dot"
|
|
51
53
|
ng-style="::{'margin-left': (user._depth * 30)}"
|
|
52
54
|
ng-click="::$event.stopPropagation();vm.toggleExpanded(user)"
|
|
53
55
|
ng-show="::user._owns.length"
|
|
56
|
+
title="{{ 'Expand/collapse' | translate }}"
|
|
54
57
|
>
|
|
55
58
|
<i
|
|
56
59
|
c8y-icon="chevron-right"
|
|
57
|
-
ng-class="{'icon-rotate-90':user._expanded}"
|
|
60
|
+
ng-class="{ 'icon-rotate-90': user._expanded }"
|
|
58
61
|
ng-hide="vm.searchQuery"
|
|
59
62
|
></i>
|
|
60
63
|
</button>
|
|
61
|
-
<
|
|
62
|
-
<label
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
<label class="c8y-radio m-r-8">
|
|
65
|
+
<input aria-label="{{::user.userName}}" type="radio" ng-checked="vm.isSelected(user)" />
|
|
66
|
+
<span></span>
|
|
67
|
+
</label>
|
|
68
|
+
<button
|
|
69
|
+
class="d-flex btn-clean fit-w a-i-center"
|
|
70
|
+
title="{{::user.userName}}"
|
|
71
|
+
ng-click="::vm.toggleSelection(user)"
|
|
72
|
+
>
|
|
73
|
+
<div class="user-dot" ng-class="{ 'user-disabled': !user.enabled }">
|
|
67
74
|
{{::user.userName.substr(0,2)}}
|
|
68
75
|
</div>
|
|
69
76
|
<div class="username text-truncate l-h-1">
|
|
70
77
|
<span title="{{::user.userName}}">{{::user.userName}}</span>
|
|
71
78
|
<small ng-if="::user.firstName.length || user.lastName.length" class="text-muted">
|
|
72
|
-
<br />
|
|
79
|
+
<br />
|
|
80
|
+
{{::user.firstName}} {{::user.lastName}}
|
|
81
|
+
</small>
|
|
73
82
|
</div>
|
|
74
83
|
</button>
|
|
75
84
|
</div>
|
|
@@ -31,12 +31,21 @@
|
|
|
31
31
|
<!-- alarm-list -->
|
|
32
32
|
<div class="card-inner-scroll">
|
|
33
33
|
<!-- empty state -->
|
|
34
|
-
<
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
34
|
+
<c8y-ui-empty-state
|
|
35
|
+
ng-if="filteredAlarms.length === 0 && !refreshLoading"
|
|
36
|
+
[icon]="'c8y-alert-idle'"
|
|
37
|
+
[title]="'No alarms to display.' | translate"
|
|
38
|
+
>
|
|
39
|
+
<p c8y-guide-docs>
|
|
40
|
+
<small translate>
|
|
41
|
+
Find out more in the
|
|
42
|
+
<a c8y-guide-href="users-guide/administration/#reprio-alarms">
|
|
43
|
+
User guide`KEEP_ORIGINAL`
|
|
44
|
+
</a>
|
|
45
|
+
.
|
|
46
|
+
</small>
|
|
47
|
+
</p>
|
|
48
|
+
</c8y-ui-empty-state>
|
|
40
49
|
|
|
41
50
|
<!-- loading -->
|
|
42
51
|
<div class="card-block" ng-show="refreshLoading && !paging.more">
|
|
@@ -140,15 +140,12 @@
|
|
|
140
140
|
</div>
|
|
141
141
|
|
|
142
142
|
<!-- empty state -->
|
|
143
|
-
<
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
143
|
+
<c8y-ui-empty-state
|
|
144
|
+
ng-if="events.length == 0"
|
|
145
|
+
[icon]="'c8y-events'"
|
|
146
|
+
[title]="'No events to display.' | translate"
|
|
147
147
|
>
|
|
148
|
-
<
|
|
149
|
-
<div ng-show="!$parent.child.templateUrl" class="h3" translate>No events to display.</div>
|
|
150
|
-
<p ng-show="$parent.child.templateUrl" translate>No events to display.</p>
|
|
151
|
-
<p c8y-guide-docs>
|
|
148
|
+
<span c8y-guide-docs>
|
|
152
149
|
<small translate>
|
|
153
150
|
Find out more in the
|
|
154
151
|
<a c8y-guide-href="users-guide/device-management/#to-view-events">
|
|
@@ -156,8 +153,8 @@
|
|
|
156
153
|
</a>
|
|
157
154
|
.
|
|
158
155
|
</small>
|
|
159
|
-
</
|
|
160
|
-
</
|
|
156
|
+
</span>
|
|
157
|
+
</c8y-ui-empty-state>
|
|
161
158
|
|
|
162
159
|
<div
|
|
163
160
|
class="page-sticky-header hidden-xs c8y-list__item c8y-list--timeline"
|
package/package.json
CHANGED
|
@@ -102,15 +102,15 @@
|
|
|
102
102
|
</button>
|
|
103
103
|
</li>
|
|
104
104
|
<li ng-if="vm.canModify(rule)">
|
|
105
|
-
<
|
|
105
|
+
<button
|
|
106
106
|
title="{{ 'Delete smart rule' | translate }}"
|
|
107
107
|
ng-click="vm.remove(rule)"
|
|
108
108
|
>
|
|
109
109
|
<i c8y-icon="times"></i>
|
|
110
110
|
{{ 'Delete' | translate }}
|
|
111
|
-
</
|
|
111
|
+
</button>
|
|
112
112
|
</li>
|
|
113
|
-
<li
|
|
113
|
+
<li class="divider" ng-if="vm.canInspect()"></li>
|
|
114
114
|
<li ng-if="vm.canInspect()">
|
|
115
115
|
<a
|
|
116
116
|
ng-href="/apps/administration#/eventprocessing/{{ rule.cepModuleId }}"
|
|
@@ -31,23 +31,27 @@
|
|
|
31
31
|
{{ a | humanizeAppName }}
|
|
32
32
|
</p>
|
|
33
33
|
<button
|
|
34
|
-
uib-tooltip="{{'Status' | translate}}: {{::vm.getStringTooltip(a.id) | translate}}"
|
|
34
|
+
uib-tooltip="{{ 'Status' | translate }}: {{::vm.getStringTooltip(a.id) | translate}}"
|
|
35
35
|
tooltip-popup-delay="500"
|
|
36
36
|
tooltip-append-to-body="true"
|
|
37
37
|
tooltip-placement="right"
|
|
38
|
-
aria-label="{{'Status' | translate}}"
|
|
38
|
+
aria-label="{{ 'Status' | translate }}"
|
|
39
39
|
class="btn-clean m-l-4"
|
|
40
40
|
ng-if="::vm.getStatusIcon(a.id)"
|
|
41
41
|
>
|
|
42
42
|
<i c8y-icon="{{::vm.getStatusIcon(a.id)}}"></i>
|
|
43
43
|
</button>
|
|
44
|
+
|
|
44
45
|
<button
|
|
45
|
-
|
|
46
|
+
class="btn btn-dot m-l-auto m-r-8 text-muted"
|
|
46
47
|
type="button"
|
|
47
48
|
ng-click="vm.dissociate(a)"
|
|
48
|
-
|
|
49
|
+
uib-tooltip="{{ 'Unsubscribe' | translate }}"
|
|
50
|
+
aria-label="{{ 'Unsubscribe' | translate }}"
|
|
51
|
+
tooltip-popup-delay="500"
|
|
52
|
+
tooltip-append-to-body="true"
|
|
49
53
|
>
|
|
50
|
-
|
|
54
|
+
<i c8y-icon="unsubscribe"></i>
|
|
51
55
|
</button>
|
|
52
56
|
</div>
|
|
53
57
|
</div>
|
|
@@ -56,12 +56,14 @@
|
|
|
56
56
|
</span>
|
|
57
57
|
</div>
|
|
58
58
|
<div class="flex-no-shrink d-flex">
|
|
59
|
-
<label class="control-label m-b-0 m-r-4 a-s-center">
|
|
59
|
+
<label for="owner" class="control-label m-b-0 m-r-4 a-s-center">
|
|
60
|
+
{{ 'Owner' | translate }}
|
|
61
|
+
</label>
|
|
60
62
|
<div class="c8y-select-wrapper">
|
|
61
63
|
<select
|
|
62
64
|
ng-options="owner.value as owner.label for owner in owners | orderBy:'label'"
|
|
63
65
|
ng-model="filter.owner"
|
|
64
|
-
|
|
66
|
+
id="owner"
|
|
65
67
|
class="form-control"
|
|
66
68
|
></select>
|
|
67
69
|
</div>
|
|
@@ -73,7 +75,7 @@
|
|
|
73
75
|
<li
|
|
74
76
|
class="c8y-list__item collapsible bg-inherit"
|
|
75
77
|
ng-class="{ expanded: isOpen(a) }"
|
|
76
|
-
ng-repeat="a in applications|filter:filterOwner|filter:filter.text"
|
|
78
|
+
ng-repeat="a in applications |filter:filterOwner|filter:filter.text"
|
|
77
79
|
>
|
|
78
80
|
<div class="c8y-list__item__block">
|
|
79
81
|
<div class="c8y-list__item__appicon p-l-0">
|
|
@@ -82,19 +84,22 @@
|
|
|
82
84
|
<div class="c8y-list__item__body m-t-auto m-b-auto">
|
|
83
85
|
<div class="d-flex">
|
|
84
86
|
<button
|
|
87
|
+
title="{{ a | humanizeAppName }}"
|
|
85
88
|
class="btn-clean text-truncate"
|
|
86
89
|
ng-click="openItem(a)"
|
|
87
|
-
title="{{ a | humanizeAppName }}"
|
|
88
90
|
>
|
|
89
91
|
{{ a | humanizeAppName }}
|
|
90
92
|
</button>
|
|
93
|
+
|
|
91
94
|
<button
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
translate
|
|
95
|
+
class="btn-dot m-l-auto m-r-8"
|
|
96
|
+
type="button"
|
|
97
|
+
uib-tooltip="{{ 'Subscribe' | translate }}"
|
|
98
|
+
aria-label="{{ 'Subscribe' | translate }}"
|
|
99
|
+
tooltip-popup-delay="500"
|
|
100
|
+
tooltip-append-to-body="true"
|
|
96
101
|
>
|
|
97
|
-
|
|
102
|
+
<i c8y-icon="subscription"></i>
|
|
98
103
|
</button>
|
|
99
104
|
</div>
|
|
100
105
|
</div>
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<p c8y-guide-docs translate>
|
|
2
2
|
Find out more about available applications in the
|
|
3
|
-
<a c8y-guide-href="users-guide/administration/#managing-applications"
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
<a c8y-guide-href="users-guide/administration/#managing-applications"></a>
|
|
4
|
+
User guide`KEEP_ORIGINAL`
|
|
5
|
+
</a>
|
|
6
|
+
.
|
|
6
7
|
</p>
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
<i c8y-icon="clipboard"></i>
|
|
3
3
|
<h4 id="modal-title" translate>Copy inventory roles from user</h4>
|
|
4
4
|
</div>
|
|
5
|
-
<div class="modal-body p-
|
|
6
|
-
<div class="d-flex">
|
|
7
|
-
<label class="m-b-0 m-r-8" translate>Current roles
|
|
5
|
+
<div class="modal-body p-8 separator-bottom" id="modal-body">
|
|
6
|
+
<div class="d-flex j-c-center">
|
|
7
|
+
<label class="m-b-0 m-r-8" translate>Current roles</label>
|
|
8
8
|
<label title="{{ 'Merge' | translate }}" class="c8y-radio radio-inline">
|
|
9
9
|
<input type="radio" ng-model="vm.process" ng-value="'merge'" />
|
|
10
10
|
<span></span>
|
|
@@ -18,8 +18,11 @@
|
|
|
18
18
|
</div>
|
|
19
19
|
</div>
|
|
20
20
|
|
|
21
|
-
<c8y-ui-user-picker
|
|
22
|
-
|
|
21
|
+
<c8y-ui-user-picker
|
|
22
|
+
model-type="object"
|
|
23
|
+
hidden-users="vm.resolve.userTo"
|
|
24
|
+
ng-model="vm.selectedUser"
|
|
25
|
+
></c8y-ui-user-picker>
|
|
23
26
|
|
|
24
27
|
<div class="modal-footer">
|
|
25
28
|
<button
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
</div>
|
|
17
17
|
</div>
|
|
18
18
|
|
|
19
|
-
<div ng-if="vm.failedToFetchOwnerInventoryRoles === false" class="col-md-
|
|
19
|
+
<div ng-if="vm.failedToFetchOwnerInventoryRoles === false" class="col-md-10">
|
|
20
20
|
<div class="card card--fullpage">
|
|
21
21
|
<div class="card-header separator">
|
|
22
22
|
<div class="card-title">
|
|
@@ -25,10 +25,10 @@
|
|
|
25
25
|
<button
|
|
26
26
|
type="button"
|
|
27
27
|
class="btn-help btn-help--sm"
|
|
28
|
-
aria-label="{{ 'Help' | translate }}"
|
|
29
28
|
popover-trigger="'focus'"
|
|
30
29
|
popover-placement="bottom auto"
|
|
31
30
|
uib-popover-template="'helpContent.html'"
|
|
31
|
+
aria-label="{{ 'Help' | translate }}"
|
|
32
32
|
></button>
|
|
33
33
|
</div>
|
|
34
34
|
<div class="inner-scroll">
|
|
@@ -81,13 +81,13 @@
|
|
|
81
81
|
<div class="c8y-list__item__block">
|
|
82
82
|
<div class="c8y-list__item__icon p-l-0 p-r-4">
|
|
83
83
|
<button
|
|
84
|
-
uib-tooltip="{{ 'Expand all groups' | translate }}"
|
|
85
|
-
tooltip-popup-delay="500"
|
|
86
|
-
tooltip-placement="right"
|
|
87
84
|
type="button"
|
|
88
85
|
class="btn-dot"
|
|
89
86
|
ng-click="vm.expandGroups = !vm.expandGroups"
|
|
90
87
|
ng-disabled="vm.expandGroups"
|
|
88
|
+
uib-tooltip="{{ 'Expand all groups' | translate }}"
|
|
89
|
+
tooltip-popup-delay="500"
|
|
90
|
+
tooltip-placement="right"
|
|
91
91
|
aria-label="{{ 'Expand all groups' | translate }}"
|
|
92
92
|
>
|
|
93
93
|
<i c8y-icon="level-down"></i>
|
|
@@ -102,9 +102,8 @@
|
|
|
102
102
|
<label class="m-b-0">
|
|
103
103
|
{{ 'Inventory roles' | translate }}
|
|
104
104
|
<button
|
|
105
|
-
class="btn-help btn-help--sm"
|
|
106
|
-
aria-label="{{ 'Help' | translate }}"
|
|
107
105
|
type="button"
|
|
106
|
+
class="btn-help btn-help--sm"
|
|
108
107
|
uib-popover="{{
|
|
109
108
|
'Use dropdown to select which roles should be applied to each group and its children.'
|
|
110
109
|
| translate
|
|
@@ -112,6 +111,7 @@
|
|
|
112
111
|
popover-trigger="'focus'"
|
|
113
112
|
popover-placement="auto"
|
|
114
113
|
popover-append-to-body="true"
|
|
114
|
+
aria-label="{{ 'Help' | translate }}"
|
|
115
115
|
></button>
|
|
116
116
|
</label>
|
|
117
117
|
</div>
|
|
@@ -138,19 +138,17 @@
|
|
|
138
138
|
type="button"
|
|
139
139
|
ng-disabled="vm.isUnchanged()"
|
|
140
140
|
class="btn btn-default"
|
|
141
|
-
translate
|
|
142
141
|
>
|
|
143
|
-
Clear changes
|
|
142
|
+
{{ 'Clear changes' | translate }}
|
|
144
143
|
</button>
|
|
145
144
|
<button
|
|
146
145
|
title="{{ 'Save' | translate }}"
|
|
147
146
|
type="submit"
|
|
148
147
|
class="btn btn-primary"
|
|
149
|
-
translate
|
|
150
148
|
ng-disabled="vm.isUnchanged()"
|
|
151
149
|
ng-click="vm.onSaveInventoryRoles()"
|
|
152
150
|
>
|
|
153
|
-
Save
|
|
151
|
+
{{ 'Save' | translate }}
|
|
154
152
|
</button>
|
|
155
153
|
</div>
|
|
156
154
|
</div>
|