@provoly/hypervisor 1.6.0 → 1.6.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 +43 -35
- package/esm2022/src/lib/store/equipment/equipment.service.mjs +4 -2
- package/fesm2022/provoly-hypervisor.mjs +45 -35
- 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
- package/src/lib/store/equipment/equipment.service.d.ts +1 -1
|
@@ -20,12 +20,14 @@ export class EquipmentService {
|
|
|
20
20
|
return this.httpClient.get(encodeURI(`${url}/equipments`));
|
|
21
21
|
}));
|
|
22
22
|
}
|
|
23
|
-
search(search) {
|
|
23
|
+
search(search, domain) {
|
|
24
24
|
return this.store.select(HypSelectors.url).pipe(mergeMap((url) => {
|
|
25
25
|
let params = new HttpParams();
|
|
26
26
|
params = params.set('sort', 'name').set('order', 'DESC').set('pageSize', '10');
|
|
27
27
|
if (search)
|
|
28
28
|
params = params.set('search', search);
|
|
29
|
+
if (domain)
|
|
30
|
+
params = params.set('domain', domain);
|
|
29
31
|
return this.httpClient.get(encodeURI(`${url}/equipments`), { params });
|
|
30
32
|
}));
|
|
31
33
|
}
|
|
@@ -38,4 +40,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.6", ngImpor
|
|
|
38
40
|
providedIn: 'root'
|
|
39
41
|
}]
|
|
40
42
|
}], ctorParameters: () => [{ type: i1.HttpClient }, { type: i2.Store }] });
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcm92b2x5L2h5cGVydmlzb3Ivc3JjL2xpYi9zdG9yZS9lcXVpcG1lbnQvZXF1aXBtZW50LnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQWMsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFFBQVEsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUU1QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7Ozs7QUFPbEUsTUFBTSxPQUFPLGdCQUFnQjtJQUMzQixZQUNVLFVBQXNCLEVBQ3RCLEtBQWlCO1FBRGpCLGVBQVUsR0FBVixVQUFVLENBQVk7UUFDdEIsVUFBSyxHQUFMLEtBQUssQ0FBWTtJQUN4QixDQUFDO0lBRUosVUFBVSxDQUFDLElBQVk7UUFDckIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUM3QyxRQUFRLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNmLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQXNCLFNBQVMsQ0FBQyxHQUFHLEdBQUcsb0JBQW9CLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMvRixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELElBQUk7UUFDRixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQzdDLFFBQVEsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ2YsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBaUIsU0FBUyxDQUFDLEdBQUcsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzdFLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQTBCLEVBQUUsTUFBZ0I7UUFDakQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUM3QyxRQUFRLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNmLElBQUksTUFBTSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUM7WUFDOUIsTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUMvRSxJQUFJLE1BQU07Z0JBQUUsTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQ2xELElBQUksTUFBTTtnQkFBRSxNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDbEQsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBc0IsU0FBUyxDQUFDLEdBQUcsR0FBRyxhQUFhLENBQUMsRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDOUYsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7OEdBaENVLGdCQUFnQjtrSEFBaEIsZ0JBQWdCLGNBRmYsTUFBTTs7MkZBRVAsZ0JBQWdCO2tCQUg1QixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnQsIEh0dHBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBtZXJnZU1hcCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgU3RvcmUgfSBmcm9tICdAbmdyeC9zdG9yZSc7XG5pbXBvcnQgeyBIeXBTZWxlY3RvcnMgfSBmcm9tICcuLi9oeXBlcnZpc29yL2h5cGVydmlzb3Iuc2VsZWN0b3JzJztcbmltcG9ydCB7RXF1aXBtZW50Rm9yRXZlbnQsIEh5cEVxdWlwbWVudH0gZnJvbSAnLi4vLi4vbW9kZWwvaHlwLWVxdWlwbWVudC5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgSHlwRXZlbnRUb29sdGlwQmFzZSB9IGZyb20gJy4uLy4uL21vZGVsL2V2ZW50L2h5cC1ldmVudC10b29sdGlwLmludGVyZmFjZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEVxdWlwbWVudFNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGh0dHBDbGllbnQ6IEh0dHBDbGllbnQsXG4gICAgcHJpdmF0ZSBzdG9yZTogU3RvcmU8YW55PlxuICApIHt9XG5cbiAgZmluZEJ5TmFtZShuYW1lOiBzdHJpbmcpOiBPYnNlcnZhYmxlPEh5cEV2ZW50VG9vbHRpcEJhc2U+IHtcbiAgICByZXR1cm4gdGhpcy5zdG9yZS5zZWxlY3QoSHlwU2VsZWN0b3JzLnVybCkucGlwZShcbiAgICAgIG1lcmdlTWFwKCh1cmwpID0+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuaHR0cENsaWVudC5nZXQ8SHlwRXZlbnRUb29sdGlwQmFzZT4oZW5jb2RlVVJJKGAke3VybH0vZXF1aXBtZW50cy9uYW1lLyR7bmFtZX1gKSk7XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICBsaXN0KCkge1xuICAgIHJldHVybiB0aGlzLnN0b3JlLnNlbGVjdChIeXBTZWxlY3RvcnMudXJsKS5waXBlKFxuICAgICAgbWVyZ2VNYXAoKHVybCkgPT4ge1xuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LmdldDxIeXBFcXVpcG1lbnRbXT4oZW5jb2RlVVJJKGAke3VybH0vZXF1aXBtZW50c2ApKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIHNlYXJjaChzZWFyY2g6IHN0cmluZyB8IHVuZGVmaW5lZCwgZG9tYWluID86IHN0cmluZyk6IE9ic2VydmFibGU8RXF1aXBtZW50Rm9yRXZlbnRbXT4ge1xuICAgIHJldHVybiB0aGlzLnN0b3JlLnNlbGVjdChIeXBTZWxlY3RvcnMudXJsKS5waXBlKFxuICAgICAgbWVyZ2VNYXAoKHVybCkgPT4ge1xuICAgICAgICBsZXQgcGFyYW1zID0gbmV3IEh0dHBQYXJhbXMoKTtcbiAgICAgICAgcGFyYW1zID0gcGFyYW1zLnNldCgnc29ydCcsICduYW1lJykuc2V0KCdvcmRlcicsICdERVNDJykuc2V0KCdwYWdlU2l6ZScsICcxMCcpO1xuICAgICAgICBpZiAoc2VhcmNoKSBwYXJhbXMgPSBwYXJhbXMuc2V0KCdzZWFyY2gnLCBzZWFyY2gpO1xuICAgICAgICBpZiAoZG9tYWluKSBwYXJhbXMgPSBwYXJhbXMuc2V0KCdkb21haW4nLCBkb21haW4pO1xuICAgICAgICByZXR1cm4gdGhpcy5odHRwQ2xpZW50LmdldDxFcXVpcG1lbnRGb3JFdmVudFtdPihlbmNvZGVVUkkoYCR7dXJsfS9lcXVpcG1lbnRzYCksIHsgcGFyYW1zIH0pO1xuICAgICAgfSlcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -822,12 +822,14 @@ class EquipmentService {
|
|
|
822
822
|
return this.httpClient.get(encodeURI(`${url}/equipments`));
|
|
823
823
|
}));
|
|
824
824
|
}
|
|
825
|
-
search(search) {
|
|
825
|
+
search(search, domain) {
|
|
826
826
|
return this.store.select(HypSelectors.url).pipe(mergeMap((url) => {
|
|
827
827
|
let params = new HttpParams();
|
|
828
828
|
params = params.set('sort', 'name').set('order', 'DESC').set('pageSize', '10');
|
|
829
829
|
if (search)
|
|
830
830
|
params = params.set('search', search);
|
|
831
|
+
if (domain)
|
|
832
|
+
params = params.set('domain', domain);
|
|
831
833
|
return this.httpClient.get(encodeURI(`${url}/equipments`), { params });
|
|
832
834
|
}));
|
|
833
835
|
}
|
|
@@ -1796,7 +1798,8 @@ class EventDetailComponent extends SubscriptionnerDirective {
|
|
|
1796
1798
|
});
|
|
1797
1799
|
this.equipControls.controls.forEach((control, index) => {
|
|
1798
1800
|
this.equipments$[index] = control.valueChanges.pipe(startWith(control.value), debounceTime(200), switchMap(equipment => {
|
|
1799
|
-
|
|
1801
|
+
const domain = this.eventModifications[index]?.domain ?? this._events[index]?.domain ?? undefined;
|
|
1802
|
+
return this.equipmentService.search(typeof equipment === 'object' ? equipment?.name : equipment, domain).pipe(map$1((equipments) => {
|
|
1800
1803
|
return equipments;
|
|
1801
1804
|
}));
|
|
1802
1805
|
}), catchError(() => throwError(() => new Error('Search Equipment problem'))), shareReplay());
|
|
@@ -1986,6 +1989,41 @@ class EventDetailComponent extends SubscriptionnerDirective {
|
|
|
1986
1989
|
toggle(i) {
|
|
1987
1990
|
this.opened[i] = !this.opened[i];
|
|
1988
1991
|
}
|
|
1992
|
+
manageEquipment(index) {
|
|
1993
|
+
const getEquipment = this.equipControls.at(index).value;
|
|
1994
|
+
if (typeof getEquipment === 'object') {
|
|
1995
|
+
this.selectedEquipment[index] = true;
|
|
1996
|
+
this.getDataForTooltip(getEquipment, index);
|
|
1997
|
+
if (!this.eventModifications[index]) {
|
|
1998
|
+
this.eventModifications[index] = {};
|
|
1999
|
+
}
|
|
2000
|
+
this.eventModifications[index].address = getEquipment?.address;
|
|
2001
|
+
this.eventModifications[index].district = getEquipment?.district;
|
|
2002
|
+
this.eventModifications[index].equipment = getEquipment;
|
|
2003
|
+
this.adressDisabled[index] = true;
|
|
2004
|
+
}
|
|
2005
|
+
else {
|
|
2006
|
+
this.selectedEquipment[index] = false;
|
|
2007
|
+
if (!this.eventModifications[index]) {
|
|
2008
|
+
this.eventModifications[index] = {};
|
|
2009
|
+
}
|
|
2010
|
+
this.eventModifications[index].address = '';
|
|
2011
|
+
this.eventModifications[index].district = '';
|
|
2012
|
+
this.eventModifications[index].equipment = undefined;
|
|
2013
|
+
this.adressDisabled[index] = false;
|
|
2014
|
+
}
|
|
2015
|
+
if (this._events[index].equipment?.name === getEquipment?.name || this._events[index].equipment === getEquipment) {
|
|
2016
|
+
if (!!this.eventModifications[index]) {
|
|
2017
|
+
// @ts-ignore
|
|
2018
|
+
delete this.eventModifications[index].equipment;
|
|
2019
|
+
delete this.eventModifications[index].address;
|
|
2020
|
+
delete this.eventModifications[index].district;
|
|
2021
|
+
if (Object.keys(this.eventModifications[index]).length === 0) {
|
|
2022
|
+
delete this.eventModifications[index];
|
|
2023
|
+
}
|
|
2024
|
+
}
|
|
2025
|
+
}
|
|
2026
|
+
}
|
|
1989
2027
|
modifyEvent(index, prop, $event) {
|
|
1990
2028
|
this.eventModifications[index] = this.eventModifications[index] ?? {};
|
|
1991
2029
|
if (prop === 'category') {
|
|
@@ -1994,6 +2032,10 @@ class EventDetailComponent extends SubscriptionnerDirective {
|
|
|
1994
2032
|
this.eventModifications[index].subCategory = 'NONE';
|
|
1995
2033
|
}
|
|
1996
2034
|
}
|
|
2035
|
+
if (prop === 'domain' && this.equipControls.at(index).value?.domain !== $event) {
|
|
2036
|
+
this.equipControls.at(index).setValue('');
|
|
2037
|
+
this.manageEquipment(index);
|
|
2038
|
+
}
|
|
1997
2039
|
const isDate = prop.indexOf('Date') > -1;
|
|
1998
2040
|
// @ts-ignore
|
|
1999
2041
|
const newValue = $event instanceof Event ? $event.target?.value : $event;
|
|
@@ -2226,39 +2268,7 @@ class EventDetailComponent extends SubscriptionnerDirective {
|
|
|
2226
2268
|
}
|
|
2227
2269
|
closeAutocomplete(index) {
|
|
2228
2270
|
this.openedAutocomplete[index] = !this.openedAutocomplete[index];
|
|
2229
|
-
|
|
2230
|
-
if (typeof getEquipment === 'object') {
|
|
2231
|
-
this.selectedEquipment[index] = true;
|
|
2232
|
-
this.getDataForTooltip(getEquipment, index);
|
|
2233
|
-
if (!this.eventModifications[index]) {
|
|
2234
|
-
this.eventModifications[index] = {};
|
|
2235
|
-
}
|
|
2236
|
-
this.eventModifications[index].address = getEquipment?.address;
|
|
2237
|
-
this.eventModifications[index].district = getEquipment.district;
|
|
2238
|
-
this.eventModifications[index].equipment = getEquipment;
|
|
2239
|
-
this.adressDisabled[index] = true;
|
|
2240
|
-
}
|
|
2241
|
-
else {
|
|
2242
|
-
this.selectedEquipment[index] = false;
|
|
2243
|
-
if (!this.eventModifications[index]) {
|
|
2244
|
-
this.eventModifications[index] = {};
|
|
2245
|
-
}
|
|
2246
|
-
this.eventModifications[index].address = '';
|
|
2247
|
-
this.eventModifications[index].district = '';
|
|
2248
|
-
this.eventModifications[index].equipment = undefined;
|
|
2249
|
-
this.adressDisabled[index] = false;
|
|
2250
|
-
}
|
|
2251
|
-
if (this._events[index].equipment?.name === getEquipment?.name || this._events[index].equipment === getEquipment) {
|
|
2252
|
-
if (!!this.eventModifications[index]) {
|
|
2253
|
-
// @ts-ignore
|
|
2254
|
-
delete this.eventModifications[index].equipment;
|
|
2255
|
-
delete this.eventModifications[index].address;
|
|
2256
|
-
delete this.eventModifications[index].district;
|
|
2257
|
-
if (Object.keys(this.eventModifications[index]).length === 0) {
|
|
2258
|
-
delete this.eventModifications[index];
|
|
2259
|
-
}
|
|
2260
|
-
}
|
|
2261
|
-
}
|
|
2271
|
+
this.manageEquipment(index);
|
|
2262
2272
|
this._outputModifications();
|
|
2263
2273
|
}
|
|
2264
2274
|
getDataForTooltip($event, index) {
|