@dsivd/prestations-ng 17.9.1-beta.2 → 17.9.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/CHANGELOG.md +4 -0
- package/UPGRADING_V17.md +2 -0
- package/dsivd-prestations-ng-17.9.1.tgz +0 -0
- package/esm2022/sdk-statistics/sdk-statistics.service.mjs +31 -27
- package/fesm2022/dsivd-prestations-ng.mjs +30 -26
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/sdk-statistics/sdk-statistics.service.d.ts +4 -2
- package/dsivd-prestations-ng-17.9.1-beta.2.tgz +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -17,8 +17,12 @@
|
|
|
17
17
|
### Fixed
|
|
18
18
|
|
|
19
19
|
- [foehn-input-address.component.ts](projects/prestations-ng/src/foehn-address/foehn-input-address.component.ts)
|
|
20
|
+
|
|
20
21
|
- fixed foreign address creating an empty `Locality` for error purpose. Not needed anymore when using prestations-be 17.9.1
|
|
21
22
|
|
|
23
|
+
- [sdk-statistics.service.ts](projects/prestations-ng/src/sdk-statistics/sdk-statistics.service.ts)
|
|
24
|
+
- fix UI freezing when heatmap is enabled in Matomo
|
|
25
|
+
|
|
22
26
|
## [17.9.0] - should be aligned with prestations-be 17.9.0
|
|
23
27
|
|
|
24
28
|
## [17.8.2]
|
package/UPGRADING_V17.md
CHANGED
|
@@ -297,6 +297,8 @@ and your `angular.json` (/projects/{nom-du-projet}/architect/build/options/style
|
|
|
297
297
|
],
|
|
298
298
|
```
|
|
299
299
|
|
|
300
|
+
> If your application uses the BoCommonWebMvcConfig configuration class and your frontend is made using Angular, use SinglePageAppConfig configuration class instead.
|
|
301
|
+
|
|
300
302
|
### gesdem-action-recovery-registration
|
|
301
303
|
|
|
302
304
|
If you use the `<gesdem-action-recovery-registration>` component in a page which includes some `<foehn-error-pill>` or `<foehn-menu-item>` (i.e. e-vaudtax, pocama, any form with a menu)
|
|
Binary file
|
|
@@ -6,35 +6,15 @@ import * as i1 from "@angular/router";
|
|
|
6
6
|
import * as i2 from "../sdk-appinfo/application-info.service";
|
|
7
7
|
import * as i3 from "../foehn-page/foehn-page.service";
|
|
8
8
|
export class SdkStatisticsService {
|
|
9
|
-
constructor(router, applicationInfoService, foehnPageService) {
|
|
9
|
+
constructor(router, applicationInfoService, foehnPageService, ngZone) {
|
|
10
10
|
this.router = router;
|
|
11
11
|
this.applicationInfoService = applicationInfoService;
|
|
12
12
|
this.foehnPageService = foehnPageService;
|
|
13
|
+
this.ngZone = ngZone;
|
|
13
14
|
this._router = router;
|
|
14
15
|
this._applicationInfoService = applicationInfoService;
|
|
15
16
|
this._foehnPageService = foehnPageService;
|
|
16
17
|
}
|
|
17
|
-
static send(matomoUrl, matomoSiteId) {
|
|
18
|
-
const s = document.getElementsByTagName('script')[0];
|
|
19
|
-
const sSrc = s.getAttribute('src');
|
|
20
|
-
// Remove the script added before
|
|
21
|
-
if (sSrc === `${matomoUrl}matomo.js`) {
|
|
22
|
-
s.remove();
|
|
23
|
-
}
|
|
24
|
-
// Set variables
|
|
25
|
-
const _paq = (window._paq = window._paq || []);
|
|
26
|
-
_paq.push(['setCustomUrl', location.pathname]);
|
|
27
|
-
_paq.push(['trackPageView']);
|
|
28
|
-
_paq.push(['setTrackerUrl', `${matomoUrl}matomo.php`]);
|
|
29
|
-
_paq.push(['setSiteId', matomoSiteId]);
|
|
30
|
-
const dBis = document;
|
|
31
|
-
const gBis = dBis.createElement('script');
|
|
32
|
-
const sBis = dBis.getElementsByTagName('script')[0];
|
|
33
|
-
gBis.type = 'text/javascript';
|
|
34
|
-
gBis.async = true;
|
|
35
|
-
gBis.src = `${matomoUrl}matomo.js`;
|
|
36
|
-
sBis.parentNode.insertBefore(gBis, sBis);
|
|
37
|
-
}
|
|
38
18
|
track() {
|
|
39
19
|
this._applicationInfoService.data.pipe(first()).subscribe(data => {
|
|
40
20
|
// Get Matomo settings
|
|
@@ -48,17 +28,41 @@ export class SdkStatisticsService {
|
|
|
48
28
|
if (!matomoUrl.endsWith('/')) {
|
|
49
29
|
matomoUrl = `${matomoUrl}/`;
|
|
50
30
|
}
|
|
51
|
-
|
|
31
|
+
this.send(matomoUrl, matomoSiteId);
|
|
52
32
|
this._router.events
|
|
53
33
|
.pipe(filter(event => event instanceof NavigationEnd))
|
|
54
34
|
// eslint-disable-next-line rxjs/no-nested-subscribe
|
|
55
35
|
.subscribe(() => {
|
|
56
|
-
|
|
36
|
+
this.send(matomoUrl, matomoSiteId);
|
|
57
37
|
});
|
|
58
38
|
}
|
|
59
39
|
});
|
|
60
40
|
}
|
|
61
|
-
|
|
41
|
+
send(matomoUrl, matomoSiteId) {
|
|
42
|
+
// https://github.com/EmmanuelRoux/ngx-matomo-client/issues/60#issuecomment-1326492144
|
|
43
|
+
this.ngZone.runOutsideAngular(() => setTimeout(() => {
|
|
44
|
+
const s = document.getElementsByTagName('script')[0];
|
|
45
|
+
const sSrc = s.getAttribute('src');
|
|
46
|
+
// Remove the script added before
|
|
47
|
+
if (sSrc === `${matomoUrl}matomo.js`) {
|
|
48
|
+
s.remove();
|
|
49
|
+
}
|
|
50
|
+
// Set variables
|
|
51
|
+
const _paq = (window._paq = window._paq || []);
|
|
52
|
+
_paq.push(['setCustomUrl', location.pathname]);
|
|
53
|
+
_paq.push(['trackPageView']);
|
|
54
|
+
_paq.push(['setTrackerUrl', `${matomoUrl}matomo.php`]);
|
|
55
|
+
_paq.push(['setSiteId', matomoSiteId]);
|
|
56
|
+
const dBis = document;
|
|
57
|
+
const gBis = dBis.createElement('script');
|
|
58
|
+
const sBis = dBis.getElementsByTagName('script')[0];
|
|
59
|
+
gBis.type = 'text/javascript';
|
|
60
|
+
gBis.async = true;
|
|
61
|
+
gBis.src = `${matomoUrl}matomo.js`;
|
|
62
|
+
sBis.parentNode.insertBefore(gBis, sBis);
|
|
63
|
+
}, 0));
|
|
64
|
+
}
|
|
65
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, deps: [{ token: i1.Router }, { token: i2.ApplicationInfoService }, { token: i3.FoehnPageService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
62
66
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, providedIn: 'root' }); }
|
|
63
67
|
}
|
|
64
68
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, decorators: [{
|
|
@@ -66,5 +70,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
66
70
|
args: [{
|
|
67
71
|
providedIn: 'root'
|
|
68
72
|
}]
|
|
69
|
-
}], ctorParameters: () => [{ type: i1.Router }, { type: i2.ApplicationInfoService }, { type: i3.FoehnPageService }] });
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
}], ctorParameters: () => [{ type: i1.Router }, { type: i2.ApplicationInfoService }, { type: i3.FoehnPageService }, { type: i0.NgZone }] });
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sdk-statistics.service.js","sourceRoot":"","sources":["../../../../projects/prestations-ng/src/sdk-statistics/sdk-statistics.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, NgZone } from '@angular/core';\nimport { NavigationEnd, Router } from '@angular/router';\nimport { filter, first } from 'rxjs/operators';\n\nimport { FoehnPageService } from '../foehn-page/foehn-page.service';\nimport { ApplicationInfoService } from '../sdk-appinfo/application-info.service';\n\ndeclare global {\n    interface Window {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        _paq: any;\n    }\n}\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class SdkStatisticsService {\n    private _router: Router;\n    private _applicationInfoService: ApplicationInfoService;\n    private _foehnPageService: FoehnPageService;\n\n    constructor(\n        private router: Router,\n        private applicationInfoService: ApplicationInfoService,\n        private foehnPageService: FoehnPageService,\n        private ngZone: NgZone\n    ) {\n        this._router = router;\n        this._applicationInfoService = applicationInfoService;\n        this._foehnPageService = foehnPageService;\n    }\n\n    track(): void {\n        this._applicationInfoService.data.pipe(first()).subscribe(data => {\n            // Get Matomo settings\n            if (\n                'matomoUrl' in data.appProperties &&\n                'matomoSiteId' in data.appProperties &&\n                !!data.appProperties.matomoUrl &&\n                !!data.appProperties.matomoSiteId\n            ) {\n                let matomoUrl = data.appProperties.matomoUrl;\n                const matomoSiteId = data.appProperties.matomoSiteId;\n\n                // Complete url if '/' is missing at the end\n                if (!matomoUrl.endsWith('/')) {\n                    matomoUrl = `${matomoUrl}/`;\n                }\n\n                this.send(matomoUrl, matomoSiteId);\n\n                this._router.events\n                    .pipe(filter(event => event instanceof NavigationEnd))\n                    // eslint-disable-next-line rxjs/no-nested-subscribe\n                    .subscribe(() => {\n                        this.send(matomoUrl, matomoSiteId);\n                    });\n            }\n        });\n    }\n\n    private send(matomoUrl: string, matomoSiteId: string): void {\n        // https://github.com/EmmanuelRoux/ngx-matomo-client/issues/60#issuecomment-1326492144\n        this.ngZone.runOutsideAngular(() =>\n            setTimeout(() => {\n                const s = document.getElementsByTagName('script')[0];\n                const sSrc = s.getAttribute('src');\n\n                // Remove the script added before\n                if (sSrc === `${matomoUrl}matomo.js`) {\n                    s.remove();\n                }\n\n                // Set variables\n                const _paq = (window._paq = window._paq || []);\n                _paq.push(['setCustomUrl', location.pathname]);\n                _paq.push(['trackPageView']);\n\n                _paq.push(['setTrackerUrl', `${matomoUrl}matomo.php`]);\n                _paq.push(['setSiteId', matomoSiteId]);\n                const dBis = document;\n                const gBis = dBis.createElement('script');\n                const sBis = dBis.getElementsByTagName('script')[0];\n                gBis.type = 'text/javascript';\n                gBis.async = true;\n                gBis.src = `${matomoUrl}matomo.js`;\n                sBis.parentNode.insertBefore(gBis, sBis);\n            }, 0)\n        );\n    }\n}\n"]}
|
|
@@ -5319,35 +5319,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
5319
5319
|
}], ctorParameters: () => [{ type: ApplicationInfoService }] });
|
|
5320
5320
|
|
|
5321
5321
|
class SdkStatisticsService {
|
|
5322
|
-
constructor(router, applicationInfoService, foehnPageService) {
|
|
5322
|
+
constructor(router, applicationInfoService, foehnPageService, ngZone) {
|
|
5323
5323
|
this.router = router;
|
|
5324
5324
|
this.applicationInfoService = applicationInfoService;
|
|
5325
5325
|
this.foehnPageService = foehnPageService;
|
|
5326
|
+
this.ngZone = ngZone;
|
|
5326
5327
|
this._router = router;
|
|
5327
5328
|
this._applicationInfoService = applicationInfoService;
|
|
5328
5329
|
this._foehnPageService = foehnPageService;
|
|
5329
5330
|
}
|
|
5330
|
-
static send(matomoUrl, matomoSiteId) {
|
|
5331
|
-
const s = document.getElementsByTagName('script')[0];
|
|
5332
|
-
const sSrc = s.getAttribute('src');
|
|
5333
|
-
// Remove the script added before
|
|
5334
|
-
if (sSrc === `${matomoUrl}matomo.js`) {
|
|
5335
|
-
s.remove();
|
|
5336
|
-
}
|
|
5337
|
-
// Set variables
|
|
5338
|
-
const _paq = (window._paq = window._paq || []);
|
|
5339
|
-
_paq.push(['setCustomUrl', location.pathname]);
|
|
5340
|
-
_paq.push(['trackPageView']);
|
|
5341
|
-
_paq.push(['setTrackerUrl', `${matomoUrl}matomo.php`]);
|
|
5342
|
-
_paq.push(['setSiteId', matomoSiteId]);
|
|
5343
|
-
const dBis = document;
|
|
5344
|
-
const gBis = dBis.createElement('script');
|
|
5345
|
-
const sBis = dBis.getElementsByTagName('script')[0];
|
|
5346
|
-
gBis.type = 'text/javascript';
|
|
5347
|
-
gBis.async = true;
|
|
5348
|
-
gBis.src = `${matomoUrl}matomo.js`;
|
|
5349
|
-
sBis.parentNode.insertBefore(gBis, sBis);
|
|
5350
|
-
}
|
|
5351
5331
|
track() {
|
|
5352
5332
|
this._applicationInfoService.data.pipe(first()).subscribe(data => {
|
|
5353
5333
|
// Get Matomo settings
|
|
@@ -5361,17 +5341,41 @@ class SdkStatisticsService {
|
|
|
5361
5341
|
if (!matomoUrl.endsWith('/')) {
|
|
5362
5342
|
matomoUrl = `${matomoUrl}/`;
|
|
5363
5343
|
}
|
|
5364
|
-
|
|
5344
|
+
this.send(matomoUrl, matomoSiteId);
|
|
5365
5345
|
this._router.events
|
|
5366
5346
|
.pipe(filter(event => event instanceof NavigationEnd))
|
|
5367
5347
|
// eslint-disable-next-line rxjs/no-nested-subscribe
|
|
5368
5348
|
.subscribe(() => {
|
|
5369
|
-
|
|
5349
|
+
this.send(matomoUrl, matomoSiteId);
|
|
5370
5350
|
});
|
|
5371
5351
|
}
|
|
5372
5352
|
});
|
|
5373
5353
|
}
|
|
5374
|
-
|
|
5354
|
+
send(matomoUrl, matomoSiteId) {
|
|
5355
|
+
// https://github.com/EmmanuelRoux/ngx-matomo-client/issues/60#issuecomment-1326492144
|
|
5356
|
+
this.ngZone.runOutsideAngular(() => setTimeout(() => {
|
|
5357
|
+
const s = document.getElementsByTagName('script')[0];
|
|
5358
|
+
const sSrc = s.getAttribute('src');
|
|
5359
|
+
// Remove the script added before
|
|
5360
|
+
if (sSrc === `${matomoUrl}matomo.js`) {
|
|
5361
|
+
s.remove();
|
|
5362
|
+
}
|
|
5363
|
+
// Set variables
|
|
5364
|
+
const _paq = (window._paq = window._paq || []);
|
|
5365
|
+
_paq.push(['setCustomUrl', location.pathname]);
|
|
5366
|
+
_paq.push(['trackPageView']);
|
|
5367
|
+
_paq.push(['setTrackerUrl', `${matomoUrl}matomo.php`]);
|
|
5368
|
+
_paq.push(['setSiteId', matomoSiteId]);
|
|
5369
|
+
const dBis = document;
|
|
5370
|
+
const gBis = dBis.createElement('script');
|
|
5371
|
+
const sBis = dBis.getElementsByTagName('script')[0];
|
|
5372
|
+
gBis.type = 'text/javascript';
|
|
5373
|
+
gBis.async = true;
|
|
5374
|
+
gBis.src = `${matomoUrl}matomo.js`;
|
|
5375
|
+
sBis.parentNode.insertBefore(gBis, sBis);
|
|
5376
|
+
}, 0));
|
|
5377
|
+
}
|
|
5378
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, deps: [{ token: i1$1.Router }, { token: ApplicationInfoService }, { token: FoehnPageService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
5375
5379
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, providedIn: 'root' }); }
|
|
5376
5380
|
}
|
|
5377
5381
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SdkStatisticsService, decorators: [{
|
|
@@ -5379,7 +5383,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
5379
5383
|
args: [{
|
|
5380
5384
|
providedIn: 'root'
|
|
5381
5385
|
}]
|
|
5382
|
-
}], ctorParameters: () => [{ type: i1$1.Router }, { type: ApplicationInfoService }, { type: FoehnPageService }] });
|
|
5386
|
+
}], ctorParameters: () => [{ type: i1$1.Router }, { type: ApplicationInfoService }, { type: FoehnPageService }, { type: i0.NgZone }] });
|
|
5383
5387
|
|
|
5384
5388
|
class IntervalHelper {
|
|
5385
5389
|
static accurateInterval(
|