Merge branch 'dev' into deps/ng2-charts-6.x

.husky/pre-commit

@@ -1 +1,3 @@
-yarn
+#!/bin/sh
+
+npx lint-staged

package.json

@@ -92,7 +92,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "async": "3.2.5",
-    "audit-ci": "6.6.1",
+    "audit-ci": "7.1.0",
     "autoprefixer": "10.4.20",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "15.0.0",

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

@@ -113,7 +113,7 @@ export class CreditsService {
 	 *
 	 * @param group_id
 	 */
-	public getCreditsUsageHistoryOfProject(group_id: number): Observable<{}> {
+	public getCreditsUsageHistoryOfProject(group_id: number): Observable<object> {
 		return this.http.get(`${ApiSettings.getApiBaseURL()}creditManager/${group_id}/getCreditsHistory/`, {
 			withCredentials: true,
 		});
@@ -124,8 +124,8 @@ export class CreditsService {
 		flavor_pairs: [string, number][],
 		compute_center_name: string,
 		start_timestamp: number,
-	): Observable<{}> {
-		const params: {} = {
+	): Observable<object> {
+		const params: object = {
 			hours,
 			flavor_pairs,
 			compute_center_name,
@@ -142,8 +142,8 @@ export class CreditsService {
 		flavor_pairs: [string, number][],
 		compute_center_name: string,
 		start_timestamp: number,
-	): Observable<{}> {
-		const params: {} = {
+	): Observable<object> {
+		const params: object = {
 			credits,
 			flavor_pairs,
 			compute_center_name,

src/app/applications/application-detail/resource-detail/resource-detail.component.html

@@ -71,7 +71,7 @@
 							color:
 								application.project_modification_request.vms_requested >= application.project_application_vms_requested
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -101,7 +101,7 @@
 					<td>
 						<span
 							[ngStyle]="{
-								color: flavorDiff.diff >= 0 ? 'green' : 'red'
+								color: flavorDiff.diff >= 0 ? 'green' : 'red',
 							}"
 						>
 							{{ flavorDiff.diff === 0 ? '' : flavorDiff.diff > 0 ? '+' : '-' }}
@@ -124,7 +124,7 @@
 							color:
 								application.project_modification_request.total_cores >= application.project_application_total_cores
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -155,7 +155,7 @@
 							color:
 								application.project_modification_request.total_ram >= application.project_application_total_ram
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -183,7 +183,7 @@
 							color:
 								application.project_modification_request.total_gpu >= application.project_application_total_gpu
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -210,7 +210,7 @@
 				<td>
 					<span
 						[ngStyle]="{
-							color: green
+							color: 'green',
 						}"
 					>
 						+ {{ application.project_modification_request.extra_credits }}
@@ -241,7 +241,7 @@
 							color:
 								application.project_modification_request.volume_limit >= application.project_application_volume_limit
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -272,7 +272,7 @@
 								application.project_modification_request.volume_counter >=
 								application.project_application_volume_counter
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{
@@ -304,7 +304,7 @@
 								application.project_modification_request.object_storage >=
 								application.project_application_object_storage
 									? 'green'
-									: 'red'
+									: 'red',
 						}"
 					>
 						{{

src/app/applications/application-detail/resource-detail/resource-detail.component.ts

@@ -1,5 +1,4 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { green } from 'audit-ci/dist/colors';
 import { Application } from '../../application.model/application.model';
 import { User } from '../../application.model/user.model';
 import { ApplicationBaseClassComponent } from '../../../shared/shared_modules/baseClass/application-base-class.component';
@@ -24,7 +23,6 @@ export class ResourceDetailComponent extends ApplicationBaseClassComponent imple
 	@Input() is_vo_admin: boolean;
 	@Input() current_credits: number;
 	protected readonly Math = Math;
-	protected readonly green = green;
 	flavorDiffs: FlavorDiff[] = [];
 
 	ngOnInit() {

src/app/projectmanagement/modals/modification-request/modification-request.component.ts

@@ -272,7 +272,7 @@ export class ModificationRequestComponent implements OnInit, OnDestroy {
 	}
 
 	showSubmitModal(adjustment: boolean): void {
-		let initialState: {};
+		let initialState: object;
 		if (adjustment) {
 			initialState = {
 				project: this.project,

src/app/projectmanagement/overview.component.ts

@@ -9,7 +9,8 @@ import {
 	ViewChild,
 	inject,
 } from '@angular/core';
-import moment from 'moment'; import { forkJoin, Observable, Subscription } from 'rxjs';
+import moment from 'moment';
+import { forkJoin, Observable, Subscription } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DOCUMENT } from '@angular/common';
 import { Chart } from 'chart.js';
@@ -178,8 +179,8 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements
 					this.creditHistoryLoaded = false;
 					this.creditsChart = undefined;
 				}
-			} catch (someError) {
-				// empty catch
+			} catch (error: any) {
+				console.log(error);
 			}
 
 			this.subscription.unsubscribe();
@@ -217,8 +218,8 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements
 			if (this.updateCreditsHistoryIntervals) {
 				clearInterval(this.updateCreditsHistoryIntervals);
 			}
-		} catch (someError) {
-			// empty catch
+		} catch (error: any) {
+			console.log(error);
 		}
 	}
 
@@ -440,7 +441,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements
 			this.subscription.add(
 				this.creditsService
 					.getCreditsUsageHistoryOfProject(Number(this.project_application.project_application_perun_id.toString()))
-					.subscribe((response: {}): void => {
+					.subscribe((response: any): void => {
 						if (response['data_points'] !== undefined) {
 							const data_points: number[] = response['data_points'];
 							if (this.creditsChart !== undefined) {
@@ -517,7 +518,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements
 								this.project_application.project_application_current_credits = credits;
 							}
 						},
-						(err: Error): void => {
+						(err: any): void => {
 							console.log(err.message);
 						},
 					),

src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.ts

@@ -126,7 +126,7 @@ export class ClusterActionsComponent implements OnDestroy {
 		this.cluster.status = VirtualMachineStates.POWERING_OFF;
 		this.subscription.add(
 			this.virtualmachineservice.stopCluster(this.cluster.cluster_id).subscribe((): void => {
-				this.cluster.status === VirtualMachineStates.POWERING_OFF;
+				this.cluster.status = VirtualMachineStates.POWERING_OFF;
 				this.startStatusLoop.emit();
 			}),
 		);