Feat/tracking (#6095)

* fix(Matomo): Adjust tracking code

* feat(Tracking): Adjusted tracking to allow configuration via env and tracking on component level

* removed unnecessary file

* adjustments

* ...

* clean code

* working on adding tracker to all components..

* feat(Tracking): Added tracking to all routed components

* fix(Linting):blacked code

* added env variables to template

---------

Co-authored-by: denbicloud <[email protected]>
Co-authored-by: dweinholz <[email protected]>

.gitignore

@@ -34,7 +34,7 @@
 npm-debug.log
 testem.log
 /typings
-
+/.nx
 #test environment
 /tests/environment.json
 *e2e/environment.json

angular.json

@@ -33,7 +33,6 @@
               ]
             },
             "scripts": [
-              "src/assets/js/matomo.js"
             ],
             "vendorChunk": true,
             "extractLicenses": false,

package.json

@@ -65,6 +65,7 @@
         "ngx-bootstrap": "12.0.0",
         "ngx-clipboard": "16.0.0",
         "ngx-cookie-service": "17.1.0",
+        "ngx-matomo-client": "6.2.0",
         "ngx-owl-carousel-o": "17.0.0",
         "ngx-scrollbar": "13.0.3",
         "postcss-loader": "8.1.1",

src/app/api-connector/applications.service.ts

@@ -58,9 +58,12 @@ export class ApplicationsService {
 	}
 
 	getLifetimeExtensionUser(lifetimeextension_id: string | number): Observable<User> {
-		return this.http.get<User>(`${ApiSettings.getApiBaseURL()}project_applications/lifetime/extensions/${lifetimeextension_id}/user/`, {
-			withCredentials: true,
-		});
+		return this.http.get<User>(
+			`${ApiSettings.getApiBaseURL()}project_applications/lifetime/extensions/${lifetimeextension_id}/user/`,
+			{
+				withCredentials: true,
+			},
+		);
 	}
 
 	getModificationUser(project_id: string | number): Observable<User> {
@@ -148,11 +151,11 @@ export class ApplicationsService {
 	}
 
 	/**
-		 * Checks if some client has the resource available for an application.
-		 *
-		 * @param app_id
-		 * @returns
-		 */
+	 * Checks if some client has the resource available for an application.
+	 *
+	 * @param app_id
+	 * @returns
+	 */
 	getApplicationClientAvaiable(app_id: string): Observable<any> {
 		return this.http.get(`${ApiSettings.getApiBaseURL()}project_applications/${app_id}/clients/resource/`, {
 			withCredentials: true,

src/app/api-connector/credits.service.ts

@@ -21,19 +21,29 @@ export class CreditsService {
 	 * @returns The expected credits for the resources.
 	 */
 	public getCreditsForApplication(flavors: Flavor[], months: number): Observable<number> {
-
-		return this.http.post<number>(`${ApiSettings.getApiBaseURL()}creditManager/getCreditsForApplication/`, { flavors, months }, {
-			withCredentials: true,
-		});
+		return this.http.post<number>(
+			`${ApiSettings.getApiBaseURL()}creditManager/getCreditsForApplication/`,
+			{ flavors, months },
+			{
+				withCredentials: true,
+			},
+		);
 	}
 
 	/**
 	 * Get credits for project application.
 	 *
 	 * @returns The expected credits for the resources.
 	 */
-	public getExtraCreditsForExtension(cpus: number, ram: number, months: number, projectApplicationId: string): Observable<number> {
-		const params: HttpParams = new HttpParams().set('new_cpu', cpus.toString()).set('new_ram', ram.toString())
+	public getExtraCreditsForExtension(
+		cpus: number,
+		ram: number,
+		months: number,
+		projectApplicationId: string,
+	): Observable<number> {
+		const params: HttpParams = new HttpParams()
+			.set('new_cpu', cpus.toString())
+			.set('new_ram', ram.toString())
 			.set('new_lifetime', months.toString())
 			.set('project_application_id', projectApplicationId);
 
@@ -49,7 +59,8 @@ export class CreditsService {
 	 * @returns The expected credits for the resources.
 	 */
 	public getExtraCreditsForLifetimeExtension(months: number, projectApplicationId: string): Observable<number> {
-		const params: HttpParams = new HttpParams().set('new_lifetime', months.toString())
+		const params: HttpParams = new HttpParams()
+			.set('new_lifetime', months.toString())
 			.set('project_application_id', projectApplicationId);
 
 		return this.http.get<number>(`${ApiSettings.getApiBaseURL()}creditManager/getExtraCreditsNumberLifetime/`, {
@@ -64,7 +75,6 @@ export class CreditsService {
 	 * @returns The expected credits for the resources.
 	 */
 	public getExtraCreditsForResourceExtension(flavors: Flavor[], projectApplicationId: string): Observable<number> {
-
 		return this.http.post<number>(
 			`${ApiSettings.getApiBaseURL()}creditManager/getExtraCreditsNumberResource/`,
 			{ flavors, projectApplicationId },
@@ -116,7 +126,10 @@ export class CreditsService {
 		start_timestamp: number,
 	): Observable<{}> {
 		const params: {} = {
-			hours, flavor_pairs, compute_center_name, start_timestamp,
+			hours,
+			flavor_pairs,
+			compute_center_name,
+			start_timestamp,
 		};
 
 		return this.http.post(`${ApiSettings.getApiBase()}public/credits_calculator/needed/`, params, {
@@ -131,7 +144,10 @@ export class CreditsService {
 		start_timestamp: number,
 	): Observable<{}> {
 		const params: {} = {
-			credits, flavor_pairs, compute_center_name, start_timestamp,
+			credits,
+			flavor_pairs,
+			compute_center_name,
+			start_timestamp,
 		};
 
 		return this.http.post(`${ApiSettings.getApiBase()}public/credits_calculator/time/`, params, {
@@ -140,13 +156,10 @@ export class CreditsService {
 	}
 
 	public getCreditsWeights(): Observable<ResourceWeight[]> {
-
-		return this.http.get<IResourceWeight[]>(`${ApiSettings.getApiBase()}public/creditsweights/`).pipe(
-			map(
-				(weights: IResourceWeight[]): ResourceWeight[] => weights.map(
-					(weight: IResourceWeight): ResourceWeight => new ResourceWeight(weight),
-				),
-			),
-		);
+		return this.http
+			.get<IResourceWeight[]>(`${ApiSettings.getApiBase()}public/creditsweights/`)
+			.pipe(
+				map((weights: IResourceWeight[]): ResourceWeight[] => weights.map((weight: IResourceWeight): ResourceWeight => new ResourceWeight(weight))),
+			);
 	}
 }