@provoly/hypervisor 2.4.0 → 2.4.1
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/esm2022/src/lib/event/detail/event-detail.component.mjs +16 -6
- package/esm2022/src/lib/store/equipment/equipment.service.mjs +2 -2
- package/fesm2022/provoly-hypervisor.mjs +16 -6
- package/fesm2022/provoly-hypervisor.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/event/detail/event-detail.component.d.ts +1 -0
|
@@ -29,7 +29,7 @@ export class EquipmentService {
|
|
|
29
29
|
if (domain) {
|
|
30
30
|
if (domain === 'STA') {
|
|
31
31
|
params = params.append('family', 'STA_CAPTEUR');
|
|
32
|
-
params = params.append('family', '
|
|
32
|
+
params = params.append('family', 'STA_CAPTEUR_VIDEO');
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
params = params.set('domain', domain);
|
|
@@ -47,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.6", ngImpor
|
|
|
47
47
|
providedIn: 'root'
|
|
48
48
|
}]
|
|
49
49
|
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2.Store }] });
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcm92b2x5L2h5cGVydmlzb3Ivc3JjL2xpYi9zdG9yZS9lcXVpcG1lbnQvZXF1aXBtZW50LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQWMsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFFBQVEsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUU1QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7Ozs7QUFPbEUsTUFBTSxPQUFPLGdCQUFnQjtJQUMzQixZQUNVLFVBQXNCLEVBQ3RCLEtBQWlCO1FBRGpCLGVBQVUsR0FBVixVQUFVLENBQVk7UUFDdEIsVUFBSyxHQUFMLEtBQUssQ0FBWTtJQUN4QixDQUFDO0lBRUosVUFBVSxDQUFDLElBQVk7UUFDckIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUM3QyxRQUFRLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNmLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQXNCLFNBQVMsQ0FBQyxHQUFHLEdBQUcsb0JBQW9CLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMvRixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELElBQUk7UUFDRixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQzdDLFFBQVEsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ2YsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBaUIsU0FBUyxDQUFDLEdBQUcsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzdFLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQTBCLEVBQUUsTUFBZ0I7UUFDakQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUM3QyxRQUFRLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNmLElBQUksTUFBTSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUM7WUFDOUIsTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUMvRSxJQUFJLE1BQU07Z0JBQUUsTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQ2xELElBQUcsTUFBTSxFQUFFLENBQUM7Z0JBQ1YsSUFBRyxNQUFNLEtBQUssS0FBSyxFQUFFLENBQUM7b0JBQ3BCLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxhQUFhLENBQUMsQ0FBQztvQkFDaEQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLG1CQUFtQixDQUFDLENBQUM7Z0JBQ3hELENBQUM7cUJBQU0sQ0FBQztvQkFDTixNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7Z0JBQ3hDLENBQUM7WUFDSCxDQUFDO1lBQ0QsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBc0IsU0FBUyxDQUFDLEdBQUcsR0FBRyxhQUFhLENBQUMsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDOUYsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7OEdBdkNVLGdCQUFnQjtrSEFBaEIsZ0JBQWdCLGNBRmYsTUFBTTs7MkZBRVAsZ0JBQWdCO2tCQUg1QixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnQsIEh0dHBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBtZXJnZU1hcCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQgeyBIeXBTZWxlY3RvcnMgfSBmcm9tICcuLi9oeXBlcnZpc29yL2h5cGVydmlzb3Iuc2VsZWN0b3JzJztcbmltcG9ydCB7RXF1aXBtZW50Rm9yRXZlbnQsIEh5cEVxdWlwbWVudH0gZnJvbSAnLi4vLi4vbW9kZWwvaHlwLWVxdWlwbWVudC5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgSHlwRXZlbnRUb29sdGlwQmFzZSB9IGZyb20gJy4uLy4uL21vZGVsL2V2ZW50L2h5cC1ldmVudC10b29sdGlwLmludGVyZmFjZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEVxdWlwbWVudFNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGh0dHBDbGllbnQ6IEh0dHBDbGllbnQsXG4gICAgcHJpdmF0ZSBzdG9yZTogU3RvcmU8YW55PlxuICApIHt9XG5cbiAgZmluZEJ5TmFtZShuYW1lOiBzdHJpbmcpOiBPYnNlcnZhYmxlPEh5cEV2ZW50VG9vbHRpcEJhc2U+IHtcbiAgICByZXR1cm4gdGhpcy5zdG9yZS5zZWxlY3QoSHlwU2VsZWN0b3JzLnVybCkucGlwZShcbiAgICAgIG1lcmdlTWFwKCh1cmwpID0+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuaHR0cENsaWVudC5nZXQ8SHlwRXZlbnRUb29sdGlwQmFzZT4oZW5jb2RlVVJJKGAke3VybH0vZXF1aXBtZW50cy9uYW1lLyR7bmFtZX1gKSk7XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICBsaXN0KCkge1xuICAgIHJldHVybiB0aGlzLnN0b3JlLnNlbGVjdChIeXBTZWxlY3RvcnMudXJsKS5waXBlKFxuICAgICAgbWVyZ2VNYXAoKHVybCkgPT4ge1xuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LmdldDxIeXBFcXVpcG1lbnRbXT4oZW5jb2RlVVJJKGAke3VybH0vZXF1aXBtZW50c2ApKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIHNlYXJjaChzZWFyY2g6IHN0cmluZyB8IHVuZGVmaW5lZCwgZG9tYWluID86IHN0cmluZyk6IE9ic2VydmFibGU8RXF1aXBtZW50Rm9yRXZlbnRbXT4ge1xuICAgIHJldHVybiB0aGlzLnN0b3JlLnNlbGVjdChIeXBTZWxlY3RvcnMudXJsKS5waXBlKFxuICAgICAgbWVyZ2VNYXAoKHVybCkgPT4ge1xuICAgICAgICBsZXQgcGFyYW1zID0gbmV3IEh0dHBQYXJhbXMoKTtcbiAgICAgICAgcGFyYW1zID0gcGFyYW1zLnNldCgnc29ydCcsICduYW1lJykuc2V0KCdvcmRlcicsICdERVNDJykuc2V0KCdwYWdlU2l6ZScsICcxMCcpO1xuICAgICAgICBpZiAoc2VhcmNoKSBwYXJhbXMgPSBwYXJhbXMuc2V0KCdzZWFyY2gnLCBzZWFyY2gpO1xuICAgICAgICBpZihkb21haW4pIHtcbiAgICAgICAgICBpZihkb21haW4gPT09ICdTVEEnKSB7XG4gICAgICAgICAgICBwYXJhbXMgPSBwYXJhbXMuYXBwZW5kKCdmYW1pbHknLCAnU1RBX0NBUFRFVVInKTtcbiAgICAgICAgICAgIHBhcmFtcyA9IHBhcmFtcy5hcHBlbmQoJ2ZhbWlseScsICdTVEFfQ0FQVEVVUl9WSURFTycpO1xuICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBwYXJhbXMgPSBwYXJhbXMuc2V0KCdkb21haW4nLCBkb21haW4pO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LmdldDxFcXVpcG1lbnRGb3JFdmVudFtdPihlbmNvZGVVUkkoYCR7dXJsfS9lcXVpcG1lbnRzYCksIHsgcGFyYW1zIH0pO1xuICAgICAgfSlcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -1183,7 +1183,7 @@ class EquipmentService {
|
|
|
1183
1183
|
if (domain) {
|
|
1184
1184
|
if (domain === 'STA') {
|
|
1185
1185
|
params = params.append('family', 'STA_CAPTEUR');
|
|
1186
|
-
params = params.append('family', '
|
|
1186
|
+
params = params.append('family', 'STA_CAPTEUR_VIDEO');
|
|
1187
1187
|
}
|
|
1188
1188
|
else {
|
|
1189
1189
|
params = params.set('domain', domain);
|
|
@@ -2351,14 +2351,24 @@ class EventDetailComponent extends SubscriptionnerDirective {
|
|
|
2351
2351
|
this._events = this._events.map((eve) => {
|
|
2352
2352
|
return {
|
|
2353
2353
|
...eve,
|
|
2354
|
-
creator: eve
|
|
2355
|
-
? eve.creator
|
|
2356
|
-
: eve.externalSourceRef === 'Hyperviseur'
|
|
2357
|
-
? this.profile?.userName
|
|
2358
|
-
: '--'
|
|
2354
|
+
creator: this.getCreator(eve)
|
|
2359
2355
|
};
|
|
2360
2356
|
});
|
|
2361
2357
|
}
|
|
2358
|
+
getCreator(eve) {
|
|
2359
|
+
if (eve.creator) {
|
|
2360
|
+
return eve.creator;
|
|
2361
|
+
}
|
|
2362
|
+
else if (eve.id < 0 || !eve.id) {
|
|
2363
|
+
return this.profile?.userName;
|
|
2364
|
+
}
|
|
2365
|
+
else if (eve.externalSourceRef !== 'Hyperviseur') {
|
|
2366
|
+
return '--';
|
|
2367
|
+
}
|
|
2368
|
+
else {
|
|
2369
|
+
return '';
|
|
2370
|
+
}
|
|
2371
|
+
}
|
|
2362
2372
|
getComboBoxRegExp(search) {
|
|
2363
2373
|
return RegExp(`(${search})` ?? '(/-/-/)', 'gid');
|
|
2364
2374
|
}
|