Merge pull request #2329 from sap-labs-france/master-qa

Merge master-qa

.gitignore

@@ -31,6 +31,7 @@ speed-measure-plugin*.json
 
 # IDE - VSCode
 .vscode/*
+!.vscode/settings-template.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json

.vscode/settings-template.json

@@ -0,0 +1,5 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
+}

package.json

@@ -2,7 +2,7 @@
   "name": "ev-dashboard",
   "description": "Dashboard for Electric Vehicle charging station",
   "homepage": "https://github.com/LucasBrazi06/ev-dashboard",
-  "version": "2.4.55",
+  "version": "2.4.56",
   "engines": {
     "npm": "6.x.x."
   },
@@ -133,16 +133,16 @@
     "@types/jquery": "^3.5.5",
     "@types/mocha": "^8.2.2",
     "@types/moment-duration-format": "^2.2.2",
-    "@types/node": "^14.14.36",
+    "@types/node": "^14.14.37",
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
     "codeceptjs": "^3.0.5",
     "cross-env": "^7.0.3",
-    "eslint": "^7.22.0",
+    "eslint": "^7.23.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsdoc": "^32.3.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "faker": "^5.5.0",
+    "faker": "^5.5.1",
     "husky": "^4.3.8",
     "import-sort-parser-typescript": "^6.0.0",
     "import-sort-style-module": "^6.0.0",

src/app/app.component.ts

@@ -14,12 +14,12 @@ export class AppComponent {
   public constructor(
     private iconRegistry: MatIconRegistry,
     private sanitizer: DomSanitizer) {
-      for (const connectorMap of CONNECTOR_TYPE_MAP) {
-        if (connectorMap.svgIconName) {
-          iconRegistry.addSvgIcon(
-            connectorMap.svgIconName,
-            sanitizer.bypassSecurityTrustResourceUrl(connectorMap.svgIconFile));
-        }
+    for (const connectorMap of CONNECTOR_TYPE_MAP) {
+      if (connectorMap.svgIconName) {
+        iconRegistry.addSvgIcon(
+          connectorMap.svgIconName,
+          sanitizer.bypassSecurityTrustResourceUrl(connectorMap.svgIconFile));
       }
+    }
   }
 }

src/app/authentication/define-password/authentication-define-password.component.ts

@@ -59,7 +59,7 @@ export class AuthenticationDefinePasswordComponent implements OnInit, OnDestroy
             Validators.required,
           ])),
       },
-        (passwordFormGroup: FormGroup) => Utils.validateEqual(passwordFormGroup, 'password', 'repeatPassword')),
+      (passwordFormGroup: FormGroup) => Utils.validateEqual(passwordFormGroup, 'password', 'repeatPassword')),
     });
     // Form
     this.passwords = (this.formGroup.controls['passwords'] as FormGroup);

src/app/pages/assets/asset/asset.component.ts

@@ -59,18 +59,18 @@ export class AssetComponent implements OnInit {
   public asset!: Asset;
 
   public constructor(
-      private authorizationService: AuthorizationService,
-      private centralServerService: CentralServerService,
-      private componentService: ComponentService,
-      private messageService: MessageService,
-      private spinnerService: SpinnerService,
-      private configService: ConfigService,
-      private activatedRoute: ActivatedRoute,
-      private dialog: MatDialog,
-      private dialogService: DialogService,
-      private translateService: TranslateService,
-      private router: Router
-    ) {
+    private authorizationService: AuthorizationService,
+    private centralServerService: CentralServerService,
+    private componentService: ComponentService,
+    private messageService: MessageService,
+    private spinnerService: SpinnerService,
+    private configService: ConfigService,
+    private activatedRoute: ActivatedRoute,
+    private dialog: MatDialog,
+    private dialogService: DialogService,
+    private translateService: TranslateService,
+    private router: Router
+  ) {
     this.maxSize = this.configService.getAsset().maxImageKb;
     // Check auth
     if (this.activatedRoute.snapshot.params['id'] &&

src/app/pages/assets/list/consumption-chart/asset-consumption-chart-detail.component.ts

@@ -16,8 +16,8 @@ export class AssetConsumptionChartDetailComponent extends CellContentTemplateDir
   public assetType!: AssetType;
 
   public ngOnInit(): void {
-      this.assetID = this.row.id as string;
-      this.assetType = this.row.assetType;
+    this.assetID = this.row.id as string;
+    this.assetType = this.row.assetType;
   }
 
   public ngOnChanges(changes: SimpleChanges): void {

src/app/pages/cars/car-catalog/carousel/car-carousel.component.ts

@@ -39,21 +39,21 @@ export class CarCarouselComponent implements AfterViewInit {
       this.spinnerService.show();
       this.centralServerService.getCarCatalogImages(this.carCatalogID, {},
         { limit: 2, skip: Constants.DEFAULT_SKIP }).subscribe((carImage) => {
-          this.spinnerService.hide();
-          if (carImage.count > 0) {
-            this.images = Array(carImage.count).fill(null);
-            // Load the two first images
-            this.images[0] = carImage.result[0].image;
-            if (carImage.count > 1) {
-              this.images[1] = carImage.result[1].image;
-            }
-          } else {
-            this.noImages = true;
+        this.spinnerService.hide();
+        if (carImage.count > 0) {
+          this.images = Array(carImage.count).fill(null);
+          // Load the two first images
+          this.images[0] = carImage.result[0].image;
+          if (carImage.count > 1) {
+            this.images[1] = carImage.result[1].image;
           }
-        }, (error) => {
-          this.spinnerService.hide();
-          Utils.handleHttpError(error, this.router, this.messageService, this.centralServerService, 'general.car_image_error');
-        });
+        } else {
+          this.noImages = true;
+        }
+      }, (error) => {
+        this.spinnerService.hide();
+        Utils.handleHttpError(error, this.router, this.messageService, this.centralServerService, 'general.car_image_error');
+      });
     }
   }
 

src/app/pages/cars/car-catalogs/car-catalogs-list.component.ts

@@ -11,5 +11,5 @@ export class CarCatalogsListComponent {
   // eslint-disable-next-line no-useless-constructor
   public constructor(
     public carCatalogsListTableDataSource: CarCatalogsListTableDataSource,
-    ) {}
+  ) {}
 }

src/app/pages/cars/car/car-users-editable-table-data-source.ts

@@ -100,33 +100,33 @@ export class CarUsersEditableTableDataSource extends EditableTableDataSource<Use
         this.centralServerService.getCarUsers(
           { ...this.buildFilterValues(), carID: this.carID },
           paging, this.getSorting()).subscribe((usersCar) => {
-            // Initial Assignment
-            if (!this.serverCalled) {
-              // Keep original list for comparison
-              this.carUsers = Utils.cloneObject(usersCar.result) as UserCar[];
-              // Set rows manually
-              this.editableRows = usersCar.result;
-              this.serverCalled = true;
-            }
-            // Check Paging
-            if (paging.skip !== 0) {
-              // Add new paginated rows
-              this.carUsers.splice(paging.skip, paging.limit, ...Utils.cloneObject(usersCar.result) as UserCar[]);
-              this.editableRows.splice(paging.skip, paging.limit, ...usersCar.result);
-            }
-            // Create the form controls
-            this.createFormControls();
-            observer.next({
-              count: usersCar.count + this.getAddedCarUsers().length - this.getRemovedCarUsers().length,
-              result: paging.skip !== 0 ? usersCar.result : this.editableRows,
-            });
-            observer.complete();
-          }, (error) => {
-            // No longer exists!
-            Utils.handleHttpError(error, this.router, this.messageService, this.centralServerService, 'general.error_backend');
-            // Error
-            observer.error(error);
+          // Initial Assignment
+          if (!this.serverCalled) {
+            // Keep original list for comparison
+            this.carUsers = Utils.cloneObject(usersCar.result) as UserCar[];
+            // Set rows manually
+            this.editableRows = usersCar.result;
+            this.serverCalled = true;
+          }
+          // Check Paging
+          if (paging.skip !== 0) {
+            // Add new paginated rows
+            this.carUsers.splice(paging.skip, paging.limit, ...Utils.cloneObject(usersCar.result) as UserCar[]);
+            this.editableRows.splice(paging.skip, paging.limit, ...usersCar.result);
+          }
+          // Create the form controls
+          this.createFormControls();
+          observer.next({
+            count: usersCar.count + this.getAddedCarUsers().length - this.getRemovedCarUsers().length,
+            result: paging.skip !== 0 ? usersCar.result : this.editableRows,
           });
+          observer.complete();
+        }, (error) => {
+          // No longer exists!
+          Utils.handleHttpError(error, this.router, this.messageService, this.centralServerService, 'general.error_backend');
+          // Error
+          observer.error(error);
+        });
       } else {
         // Recreate the form controls
         this.createFormControls();

src/app/pages/cars/car/car.dialog.component.ts

@@ -12,8 +12,8 @@ export class CarDialogComponent implements AfterViewInit {
   public carID!: string;
 
   public constructor(
-      public dialogRef: MatDialogRef<CarDialogComponent>,
-      @Inject(MAT_DIALOG_DATA) data: string) {
+    public dialogRef: MatDialogRef<CarDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) data: string) {
     this.carID = data;
   }
 

src/app/pages/cars/cars/cars-list-table-data-source.ts

@@ -178,15 +178,15 @@ export class CarsListTableDataSource extends TableDataSource<Car> {
           headerClass: 'text-center col-10p',
           class: 'text-center col-10p',
           formatter: (defaultCar: boolean, car: Car) => car.carUsers.find((userCar) => userCar.default) ?
-              this.translateService.instant('general.yes') : this.translateService.instant('general.no'),
+            this.translateService.instant('general.yes') : this.translateService.instant('general.no'),
         },
         {
           id: 'owner',
           name: 'cars.car_owner',
           headerClass: 'text-center col-10p',
           class: 'text-center col-10p',
           formatter: (carOwner: boolean, car: Car) => car.carUsers.find((userCar) => userCar.owner) ?
-              this.translateService.instant('general.yes') : this.translateService.instant('general.no')
+            this.translateService.instant('general.yes') : this.translateService.instant('general.no')
         }
       );
     }

src/app/pages/charging-stations/charging-plans/charging-plans-list-table-data-source.ts

@@ -61,19 +61,19 @@ export class ChargingPlansListTableDataSource extends TableDataSource<ChargingPr
   }
 
   public initFilters() {
-        // Charging Station
-        const chargingStationID = this.windowService.getSearch('ChargingStationID');
-        if (chargingStationID) {
-          const chargingStationTableFilter = this.tableFiltersDef.find(filter => filter.id === 'charger');
-          if (chargingStationTableFilter) {
-            chargingStationTableFilter.currentValue = [{ key: chargingStationID, value: chargingStationID }];
-            this.filterChanged(chargingStationTableFilter);
-          }
-        }
-        const transactionID = this.windowService.getSearch('TransactionID');
-        if (transactionID) {
-          this.setSearchValue(transactionID);
-        }
+    // Charging Station
+    const chargingStationID = this.windowService.getSearch('ChargingStationID');
+    if (chargingStationID) {
+      const chargingStationTableFilter = this.tableFiltersDef.find(filter => filter.id === 'charger');
+      if (chargingStationTableFilter) {
+        chargingStationTableFilter.currentValue = [{ key: chargingStationID, value: chargingStationID }];
+        this.filterChanged(chargingStationTableFilter);
+      }
+    }
+    const transactionID = this.windowService.getSearch('TransactionID');
+    if (transactionID) {
+      this.setSearchValue(transactionID);
+    }
   }
 
   public getDataChangeSubject(): Observable<ChangeNotification> {
@@ -180,9 +180,9 @@ export class ChargingPlansListTableDataSource extends TableDataSource<ChargingPr
           );
         }
         break;
-        case ChargingStationButtonAction.NAVIGATE_TO_SITE_AREA:
-          this.navigateToSiteAreaAction.action('organization#site-areas?SiteAreaID=' + chargingProfile.chargingStation.siteArea.id);
-          break;
+      case ChargingStationButtonAction.NAVIGATE_TO_SITE_AREA:
+        this.navigateToSiteAreaAction.action('organization#site-areas?SiteAreaID=' + chargingProfile.chargingStation.siteArea.id);
+        break;
     }
   }
 

src/app/pages/charging-stations/charging-station-limitation/charging-plans/charging-plans.component.ts

@@ -86,15 +86,15 @@ export class ChargingPlansComponent implements OnInit, AfterViewInit, OnChanges
       // Update Charging Station?
       this.centralServerNotificationService.getSubjectChargingProfile().pipe(debounceTime(
         this.configService.getAdvanced().debounceTimeNotifMillis)).subscribe((singleChangeNotification) => {
-          if (this.chargingProfiles && singleChangeNotification && singleChangeNotification.data) {
-            const chargingProfile = this.chargingProfiles.find(
-              (cp) => cp.id === singleChangeNotification.data.id);
+        if (this.chargingProfiles && singleChangeNotification && singleChangeNotification.data) {
+          const chargingProfile = this.chargingProfiles.find(
+            (cp) => cp.id === singleChangeNotification.data.id);
             // Reload?
-            if (chargingProfile) {
-              this.refresh();
-            }
+          if (chargingProfile) {
+            this.refresh();
           }
-        });
+        }
+      });
     }
   }