From 987fbb5211a0b0c563ac2c9a33d3ada0f58ab58c Mon Sep 17 00:00:00 2001 From: Rohan Antony Date: Thu, 9 Jun 2022 11:28:18 +0200 Subject: [PATCH 01/18] Changes for handling chartjs upgrade --- src/app/pages/statistics/shared/chart-utilities.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/statistics/shared/chart-utilities.ts b/src/app/pages/statistics/shared/chart-utilities.ts index 5083470254..32ea643995 100644 --- a/src/app/pages/statistics/shared/chart-utilities.ts +++ b/src/app/pages/statistics/shared/chart-utilities.ts @@ -366,8 +366,8 @@ export class SimpleChart { if(!this.chartOptions.plugins.title.font){ this.chartOptions.plugins.title.font = {}; } - this.chartOptions.plugins.title.font.family = this.fontFamily; - this.chartOptions.plugins.title.font.size = this.fontSizeNumber; + this.chartOptions.plugins.title.font['family'] = this.fontFamily; + this.chartOptions.plugins.title.font['size'] = this.fontSizeNumber; if (this.withLegend) { if(!this.chartOptions.plugins.legend){ this.chartOptions.plugins.legend = { @@ -380,7 +380,7 @@ export class SimpleChart { }; } this.chartOptions.plugins.legend.labels.color = this.fontColor; - this.chartOptions.plugins.legend.labels.font.family = this.fontFamily; + this.chartOptions.plugins.legend.labels.font['family'] = this.fontFamily; } if (this.chartType === ChartTypeValues.PIE) { minDivisor = this.constMinDivisorPie; From 17121ca83c86f199ec23dda8943610e14c5c8d9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 22:37:00 +0000 Subject: [PATCH 02/18] Bump ts-node from 10.8.0 to 10.8.1 Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.8.0 to 10.8.1. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v10.8.0...v10.8.1) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff8fc746e4..0bb5f4a67e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "puppeteer": "^14.3.0", "rimraf": "^3.0.2", "rosie": "^2.1.0", - "ts-node": "~10.8.0", + "ts-node": "~10.8.1", "ts-node-dev": "^2.0.0", "typescript": "~4.1.6", "webpack": "^4.46.0", @@ -24026,9 +24026,9 @@ } }, "node_modules/ts-node": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz", - "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==", + "version": "10.8.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz", + "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==", "devOptional": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -44425,9 +44425,9 @@ } }, "ts-node": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz", - "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==", + "version": "10.8.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz", + "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==", "devOptional": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", diff --git a/package.json b/package.json index 67f2e238bc..94442eafd2 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "puppeteer": "^14.3.0", "rimraf": "^3.0.2", "rosie": "^2.1.0", - "ts-node": "~10.8.0", + "ts-node": "~10.8.1", "ts-node-dev": "^2.0.0", "typescript": "~4.1.6", "webpack": "^4.46.0", From 81de13af9e9e58c3b97d1c604d0b78f1679c1be5 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Wed, 15 Jun 2022 13:46:52 +0200 Subject: [PATCH 03/18] Use visible prop to dislpay/hide a column Added Tag description in history and in progress sessions --- .../transactions-history-table-data-source.ts | 134 +++++++++--------- ...transactions-in-error-table-data-source.ts | 79 ++++++----- ...nsactions-in-progress-table-data-source.ts | 121 ++++++++-------- 3 files changed, 165 insertions(+), 169 deletions(-) diff --git a/src/app/pages/transactions/history/transactions-history-table-data-source.ts b/src/app/pages/transactions/history/transactions-history-table-data-source.ts index a263aa33b6..53d3f6dd30 100644 --- a/src/app/pages/transactions/history/transactions-history-table-data-source.ts +++ b/src/app/pages/transactions/history/transactions-history-table-data-source.ts @@ -44,7 +44,6 @@ import { UserTableFilter } from '../../../shared/table/filters/user-table-filter import { TableDataSource } from '../../../shared/table/table-data-source'; import { ChargingStationButtonAction, Connector } from '../../../types/ChargingStation'; import { DataResult, TransactionDataResult } from '../../../types/DataResult'; -import { HTTPError } from '../../../types/HTTPError'; import { LogButtonAction } from '../../../types/Log'; import { TableActionDef, TableColumnDef, TableDef, TableFilterDef } from '../../../types/Table'; import { TenantComponents } from '../../../types/Tenant'; @@ -196,16 +195,14 @@ export class TransactionsHistoryTableDataSource extends TableDataSource stateOfCharge ? `${stateOfCharge}% > ${row.stop.stateOfCharge}%` : '-', - } - ); - if (this.componentService.isActive(TenantComponents.PRICING)) { - tableColumns.push({ + }, + { id: 'stop.roundedPrice', name: 'transactions.price', headerClass: 'col-10p', class: 'col-10p', formatter: (roundedPrice: number, transaction: Transaction) => this.appCurrencyPipe.transform(roundedPrice, transaction.stop.priceUnit), - }); - } - if (this.isOrganizationComponentActive) { - tableColumns.push( - { - id: 'company.name', - name: 'companies.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - { - id: 'site.name', - name: 'sites.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - { - id: 'siteArea.name', - name: 'site_areas.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - ); - } - if (this.authorizationService.canListUsers()) { - tableColumns.push({ + visible: this.componentService.isActive(TenantComponents.PRICING) + }, + { + id: 'company.name', + name: 'companies.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { + id: 'site.name', + name: 'sites.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { + id: 'siteArea.name', + name: 'site_areas.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { id: 'user', name: 'transactions.user', headerClass: 'col-15p', class: 'text-left col-15p', formatter: (user: User) => this.appUserNamePipe.transform(user), + visible: this.authorizationService.canListUsers() }, { id: 'tagID', name: 'tags.id', headerClass: 'col-10p', class: 'text-left col-10p', - formatter: (tagID: string) => tagID ? tagID : '-' + formatter: (tagID: string) => tagID ? tagID : '-', + visible: this.authorizationService.canListUsers() }, { id: 'tag.visualID', name: 'tags.visual_id', headerClass: 'col-15p', class: 'text-left col-15p', - formatter: (visualID: string) => visualID ? visualID : '-' - }); - } - if (this.componentService.isActive(TenantComponents.CAR)) { - if (this.authorizationService.canListCars()) { - tableColumns.push({ - id: 'carCatalog', - name: 'car.title', - headerClass: 'text-center col-15p', - class: 'text-center col-15p', - sortable: true, - formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', - }); - } - if (this.authorizationService.canUpdateCar()) { - tableColumns.push({ - id: 'car.licensePlate', - name: 'cars.license_plate', - headerClass: 'text-center col-15p', - class: 'text-center col-15p', - sortable: true, - formatter: (licensePlate: string) => licensePlate ? licensePlate : '-' - }); - } - } - if (this.componentService.isActive(TenantComponents.BILLING) && - this.authorizationService.canListInvoicesBilling()) { - tableColumns.push({ + formatter: (visualID: string) => visualID ? visualID : '-', + visible: this.authorizationService.canListUsers() + }, + { + id: 'tag.description', + name: 'general.description', + headerClass: 'col-15p', + class: 'text-left col-15p', + visible: this.authorizationService.canListUsers() + }, + { + id: 'carCatalog', + name: 'car.title', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canListCars() + }, + { + id: 'car.licensePlate', + name: 'cars.license_plate', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (licensePlate: string) => licensePlate ? licensePlate : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canUpdateCar() + }, + { id: 'billingData.stop.invoiceNumber', name: 'invoices.number', headerClass: 'text-center col-10p', class: 'col-10p', formatter: (invoiceNumber: string) => invoiceNumber || '-', - }); - } - return tableColumns; + visible: this.componentService.isActive(TenantComponents.BILLING) && this.authorizationService.canListInvoicesBilling() + } + ]; } public formatInactivity(totalInactivitySecs: number, row: Transaction) { diff --git a/src/app/pages/transactions/in-error/transactions-in-error-table-data-source.ts b/src/app/pages/transactions/in-error/transactions-in-error-table-data-source.ts index a3d1cff186..2e6d1d872a 100644 --- a/src/app/pages/transactions/in-error/transactions-in-error-table-data-source.ts +++ b/src/app/pages/transactions/in-error/transactions-in-error-table-data-source.ts @@ -184,16 +184,14 @@ export class TransactionsInErrorTableDataSource extends TableDataSource stateOfCharge ? `${stateOfCharge}% > ${row.stop.stateOfCharge}%` : '-', }, - ); - if (this.isAdmin || this.isSiteAdmin) { - columns.push( - { - id: 'user', - name: 'transactions.user', - headerClass: 'col-15p', - class: 'text-left col-15p', - formatter: (value: User) => this.appUserNamePipe.transform(value), - }, - { - id: 'tagID', - name: 'transactions.badge_id', - headerClass: 'col-15p', - class: 'text-left col-15p', - formatter: (tagID: string) => tagID ? tagID : '-' - } - ); - if (this.componentService.isActive(TenantComponents.CAR)) { - if (this.authorizationService.canListCars()) { - columns.push({ - id: 'carCatalog', - name: 'car.title', - headerClass: 'text-center col-15p', - class: 'text-center col-15p', - sortable: true, - formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', - }); - } + { + id: 'user', + name: 'transactions.user', + headerClass: 'col-15p', + class: 'text-left col-15p', + formatter: (value: User) => this.appUserNamePipe.transform(value), + visible: this.authorizationService.canListUsers() + }, + { + id: 'tagID', + name: 'tags.id', + headerClass: 'col-10p', + class: 'text-left col-10p', + formatter: (tagID: string) => tagID ? tagID : '-', + visible: this.authorizationService.canListUsers() + }, + { + id: 'carCatalog', + name: 'car.title', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canListCars() + }, + { + id: 'car.licensePlate', + name: 'cars.license_plate', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (licensePlate: string) => licensePlate ? licensePlate : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canUpdateCar() } - } - return columns as TableColumnDef[]; + ]; } public formatChargingStation(chargingStationID: string, row: Transaction) { diff --git a/src/app/pages/transactions/in-progress/transactions-in-progress-table-data-source.ts b/src/app/pages/transactions/in-progress/transactions-in-progress-table-data-source.ts index 92619d3d58..0006475da5 100644 --- a/src/app/pages/transactions/in-progress/transactions-in-progress-table-data-source.ts +++ b/src/app/pages/transactions/in-progress/transactions-in-progress-table-data-source.ts @@ -121,16 +121,14 @@ export class TransactionsInProgressTableDataSource extends TableDataSource this.appCurrencyPipe.transform(price, transaction.priceUnit), - }); - } - if (this.isOrganizationComponentActive) { - tableColumns.push( - { - id: 'company.name', - name: 'companies.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - { - id: 'site.name', - name: 'sites.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - { - id: 'siteArea.name', - name: 'site_areas.title', - class: 'd-none d-xl-table-cell col-20p', - headerClass: 'd-none d-xl-table-cell col-20p', - }, - ); - } - if (this.authorizationService.canListUsers()) { - tableColumns.push({ + visible: this.componentService.isActive(TenantComponents.PRICING) + }, + { + id: 'company.name', + name: 'companies.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { + id: 'site.name', + name: 'sites.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { + id: 'siteArea.name', + name: 'site_areas.title', + class: 'd-none d-xl-table-cell col-20p', + headerClass: 'd-none d-xl-table-cell col-20p', + visible: this.isOrganizationComponentActive + }, + { id: 'user', name: 'transactions.user', headerClass: 'col-15p', class: 'text-left col-15p', formatter: (value: User) => this.appUserNamePipe.transform(value), + visible: this.authorizationService.canListUsers() }, { id: 'tagID', name: 'tags.id', headerClass: 'col-10p', class: 'text-left col-10p', - formatter: (tagID: string) => tagID ? tagID : '-' + formatter: (tagID: string) => tagID ? tagID : '-', + visible: this.authorizationService.canListUsers() }, { id: 'tag.visualID', name: 'tags.visual_id', headerClass: 'col-15p', class: 'text-left col-15p', - formatter: (visualID: string) => visualID ? visualID : '-' - }); - } - if (this.componentService.isActive(TenantComponents.CAR)) { - if (this.authorizationService.canListCars()) { - tableColumns.push({ - id: 'carCatalog', - name: 'car.title', - headerClass: 'text-center col-15p', - class: 'text-center col-15p', - sortable: true, - formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', - }); - } - if (this.authorizationService.canUpdateCar()) { - tableColumns.push({ - id: 'car.licensePlate', - name: 'cars.license_plate', - headerClass: 'text-center col-15p', - class: 'text-center col-15p', - sortable: true, - formatter: (licensePlate: string) => licensePlate ? licensePlate : '-' - }); + formatter: (visualID: string) => visualID ? visualID : '-', + visible: this.authorizationService.canListUsers() + }, + { + id: 'tag.description', + name: 'general.description', + headerClass: 'col-15p', + class: 'text-left col-15p', + visible: this.authorizationService.canListUsers() + }, + { + id: 'carCatalog', + name: 'car.title', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canListCars() + }, + { + id: 'car.licensePlate', + name: 'cars.license_plate', + headerClass: 'text-center col-15p', + class: 'text-center col-15p', + sortable: true, + formatter: (licensePlate: string) => licensePlate ? licensePlate : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canUpdateCar() } - } - return tableColumns; + ]; } public rowActionTriggered(actionDef: TableActionDef, transaction: Transaction) { From 402bc19f24272f3fd654cf13dcf0f38165aceb2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 22:24:52 +0000 Subject: [PATCH 04/18] Bump @types/expect-puppeteer from 4.4.7 to 5.0.0 Bumps [@types/expect-puppeteer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/expect-puppeteer) from 4.4.7 to 5.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/expect-puppeteer) --- updated-dependencies: - dependency-name: "@types/expect-puppeteer" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bb5f4a67e..4f26f667e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,7 +72,7 @@ "@types/bootstrap": "^5.1.12", "@types/chart.js": "^2.9.37", "@types/convict": "^6.0.2", - "@types/expect-puppeteer": "^4.4.7", + "@types/expect-puppeteer": "^5.0.0", "@types/file-saver": "^2.0.5", "@types/jest": "^27.4.1", "@types/jest-environment-puppeteer": "^5.0.2", @@ -6040,9 +6040,9 @@ } }, "node_modules/@types/expect-puppeteer": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@types/expect-puppeteer/-/expect-puppeteer-4.4.7.tgz", - "integrity": "sha512-C5UHvCNTmjiGAVU5XyzR7xmZPRF/+YfpSd746Gd4ytcSpLT+/ke1EzrpDhO0OqqtpExQvr8M4qb0md9tybq7XA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/expect-puppeteer/-/expect-puppeteer-5.0.0.tgz", + "integrity": "sha512-AECdyguFplvrltdWHwL87DFHZWHgLADG9pnRFkKNPdz1g4GG1PIHqTP42576nPMBSwFZnycLabojnqjhgUfWRQ==", "dev": true, "dependencies": { "@types/jest": "*", @@ -30303,9 +30303,9 @@ } }, "@types/expect-puppeteer": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@types/expect-puppeteer/-/expect-puppeteer-4.4.7.tgz", - "integrity": "sha512-C5UHvCNTmjiGAVU5XyzR7xmZPRF/+YfpSd746Gd4ytcSpLT+/ke1EzrpDhO0OqqtpExQvr8M4qb0md9tybq7XA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/expect-puppeteer/-/expect-puppeteer-5.0.0.tgz", + "integrity": "sha512-AECdyguFplvrltdWHwL87DFHZWHgLADG9pnRFkKNPdz1g4GG1PIHqTP42576nPMBSwFZnycLabojnqjhgUfWRQ==", "dev": true, "requires": { "@types/jest": "*", diff --git a/package.json b/package.json index 94442eafd2..201e4eb847 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "@types/bootstrap": "^5.1.12", "@types/chart.js": "^2.9.37", "@types/convict": "^6.0.2", - "@types/expect-puppeteer": "^4.4.7", + "@types/expect-puppeteer": "^5.0.0", "@types/file-saver": "^2.0.5", "@types/jest": "^27.4.1", "@types/jest-environment-puppeteer": "^5.0.2", From 22a750a68d7318a17a3796516e94a1d17ecc9968 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 22:25:27 +0000 Subject: [PATCH 05/18] Bump zone.js from 0.11.5 to 0.11.6 Bumps [zone.js](https://github.com/angular/angular/tree/HEAD/packages/zone.js) from 0.11.5 to 0.11.6. - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/packages/zone.js/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/zone.js-0.11.6/packages/zone.js) --- updated-dependencies: - dependency-name: zone.js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bb5f4a67e..a54512fe2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", - "zone.js": "~0.11.5" + "zone.js": "~0.11.6" }, "devDependencies": { "@angular-devkit/build-angular": "~0.1102.12", @@ -25974,9 +25974,9 @@ } }, "node_modules/zone.js": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.5.tgz", - "integrity": "sha512-D1/7VxEuQ7xk6z/kAROe4SUbd9CzxY4zOwVGnGHerd/SgLIVU5f4esDzQUsOCeArn933BZfWMKydH7l7dPEp0g==", + "version": "0.11.6", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz", + "integrity": "sha512-umJqFtKyZlPli669gB1gOrRE9hxUUGkZr7mo878z+NEBJZZixJkKeVYfnoLa7g25SseUDc92OZrMKKHySyJrFg==", "dependencies": { "tslib": "^2.3.0" } @@ -45965,9 +45965,9 @@ "dev": true }, "zone.js": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.5.tgz", - "integrity": "sha512-D1/7VxEuQ7xk6z/kAROe4SUbd9CzxY4zOwVGnGHerd/SgLIVU5f4esDzQUsOCeArn933BZfWMKydH7l7dPEp0g==", + "version": "0.11.6", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz", + "integrity": "sha512-umJqFtKyZlPli669gB1gOrRE9hxUUGkZr7mo878z+NEBJZZixJkKeVYfnoLa7g25SseUDc92OZrMKKHySyJrFg==", "requires": { "tslib": "^2.3.0" } diff --git a/package.json b/package.json index 94442eafd2..f02c4e55bb 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", - "zone.js": "~0.11.5" + "zone.js": "~0.11.6" }, "optionalDependencies": { "bufferutil": "^4.0.6", From 380a41b67844b479fb0290f564d5b5f283475799 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 08:56:14 +0200 Subject: [PATCH 06/18] Fixed NPE with connectors --- src/app/utils/Utils.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/utils/Utils.ts b/src/app/utils/Utils.ts index 4aa7a594b6..70650b98b7 100644 --- a/src/app/utils/Utils.ts +++ b/src/app/utils/Utils.ts @@ -514,16 +514,18 @@ export class Utils { chargePoint.power = 0; for (const connectorID of chargePoint.connectorIDs) { const connector = Utils.getConnectorFromID(chargingStation, connectorID); - if (chargePoint.cannotChargeInParallel || chargePoint.sharePowerToAllConnectors) { - chargePoint.amperage = connector.amperage; - chargePoint.power = connector.power; - } else { - chargePoint.amperage += connector.amperage; - chargePoint.power += connector.power; + if (connector) { + if (chargePoint.cannotChargeInParallel || chargePoint.sharePowerToAllConnectors) { + chargePoint.amperage = connector.amperage; + chargePoint.power = connector.power; + } else { + chargePoint.amperage += connector.amperage; + chargePoint.power += connector.power; + } + chargePoint.numberOfConnectedPhase = connector.numberOfConnectedPhase; + chargePoint.currentType = connector.currentType; + chargePoint.voltage = connector.voltage; } - chargePoint.numberOfConnectedPhase = connector.numberOfConnectedPhase; - chargePoint.currentType = connector.currentType; - chargePoint.voltage = connector.voltage; } } } From bde71a267e23d385b4dda8b84b0e0ea1ce62a2d7 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 09:23:28 +0200 Subject: [PATCH 07/18] Bumped version --- package-lock.json | 4 ++-- package.json | 2 +- src/app/release-notes/release-notes.component.ts | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f1b7ac3e3..0ec81f45a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ev-dashboard", - "version": "2.6.8", + "version": "2.6.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ev-dashboard", - "version": "2.6.8", + "version": "2.6.9", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 80ce53a3ca..acfe8accdf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ev-dashboard", "description": "Dashboard for Electric Vehicle charging station", "homepage": "https://github.com/sap-labs-france/ev-dashboard", - "version": "2.6.8", + "version": "2.6.9", "engines": { "npm": "8.x.x." }, diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 3931d2dcc6..5a79dc4fc6 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -23,6 +23,19 @@ export class ReleaseNotesComponent { } public buildReleaseNotes() { this.releaseNotes = [ + { + version: '2.6.9', + date: new Date('2022-06-17'), + componentChanges: [ + { + name: 'Dashboard', + changes: [ + `Fixed OCPI Tag type to match RFID standard`, + `Handle Tag ID sent by payment terminals`, + ], + }, + ], + }, { version: '2.6.8', date: new Date('2022-06-13'), From de1f93944dcc320fc3371d33d2d3661be30bbbd8 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 11:29:51 +0200 Subject: [PATCH 08/18] Fallback version of ngx-daterangepicker-material --- package-lock.json | 46 +++++++++++++++++++++++++++++++++++----------- package.json | 4 +++- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ec81f45a3..8fbc8c0896 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "ev-dashboard", "version": "2.6.9", "hasInstallScript": true, "license": "Apache-2.0", @@ -36,6 +35,7 @@ "bootstrap-material-design": "^4.1.3", "bootstrap-notify": "^3.1.3", "bootstrap-select": "^1.13.18", + "bufferutil": "^4.0.6", "chart.js": "^3.7.0", "chartjs-adapter-moment": "^1.0.0", "chartjs-plugin-datalabels": "^2.0.0", @@ -50,7 +50,7 @@ "ng2-file-upload": "^1.4.0", "ngx-captcha": "^9.0.1", "ngx-csv-parser": "0.0.7", - "ngx-daterangepicker-material": "^5.0.2", + "ngx-daterangepicker-material": "5.0.1", "ngx-google-places-autocomplete": "^2.0.5", "ngx-moment": "^5.0.0", "popper.js": "^1.16.1", @@ -58,6 +58,7 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", + "utf-8-validate": "^5.0.9", "zone.js": "~0.11.6" }, "devDependencies": { @@ -520,6 +521,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -2721,6 +2723,7 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz", "integrity": "sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==", "dependencies": { + "parse5": "^5.0.0", "tslib": "^2.0.0" }, "optionalDependencies": { @@ -8424,6 +8427,7 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", + "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -10847,7 +10851,8 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -11946,6 +11951,7 @@ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, "dependencies": { + "@types/yauzl": "^2.9.1", "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" @@ -15443,6 +15449,7 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", "graceful-fs": "^4.2.9", "jest-regex-util": "^27.5.1", "jest-serializer": "^27.5.1", @@ -16860,6 +16867,9 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -17009,7 +17019,14 @@ "dev": true, "dependencies": { "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "needle": "^2.5.2", "parse-node-version": "^1.0.1", + "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -17905,6 +17922,7 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, "dependencies": { + "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -18322,15 +18340,15 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/ngx-daterangepicker-material": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/ngx-daterangepicker-material/-/ngx-daterangepicker-material-5.0.2.tgz", - "integrity": "sha512-1NV47l5kzvSxwZpMv91hAbTXuvysgCocQeRhsdkk67szeCTgzdXMof3s+jW5uhRiN1+a7NI8X0mHFv8trBjceg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ngx-daterangepicker-material/-/ngx-daterangepicker-material-5.0.1.tgz", + "integrity": "sha512-vbxsiRqyBgXExRBPxuCodLlOOsVEZJ20nTPZks/7z943gZcb2XKwRuQ9hi43MG0xl7RVzDKZdsNKU8bzB86g7g==", "dependencies": { "dayjs": "^1.10.4", "tslib": "^2.0.0" }, "peerDependencies": { - "dayjs": "^1.10.7" + "dayjs": "^1.10.4" } }, "node_modules/ngx-google-places-autocomplete": { @@ -21663,6 +21681,9 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz", "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==", "dev": true, + "dependencies": { + "fsevents": "~2.3.1" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -24815,8 +24836,10 @@ "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "dependencies": { + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -24913,6 +24936,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -39938,9 +39962,9 @@ } }, "ngx-daterangepicker-material": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/ngx-daterangepicker-material/-/ngx-daterangepicker-material-5.0.2.tgz", - "integrity": "sha512-1NV47l5kzvSxwZpMv91hAbTXuvysgCocQeRhsdkk67szeCTgzdXMof3s+jW5uhRiN1+a7NI8X0mHFv8trBjceg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ngx-daterangepicker-material/-/ngx-daterangepicker-material-5.0.1.tgz", + "integrity": "sha512-vbxsiRqyBgXExRBPxuCodLlOOsVEZJ20nTPZks/7z943gZcb2XKwRuQ9hi43MG0xl7RVzDKZdsNKU8bzB86g7g==", "requires": { "dayjs": "^1.10.4", "tslib": "^2.0.0" diff --git a/package.json b/package.json index acfe8accdf..b60f7df7ec 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "bootstrap-material-design": "^4.1.3", "bootstrap-notify": "^3.1.3", "bootstrap-select": "^1.13.18", + "bufferutil": "^4.0.6", "chart.js": "^3.7.0", "chartjs-adapter-moment": "^1.0.0", "chartjs-plugin-datalabels": "^2.0.0", @@ -102,7 +103,7 @@ "ng2-file-upload": "^1.4.0", "ngx-captcha": "^9.0.1", "ngx-csv-parser": "0.0.7", - "ngx-daterangepicker-material": "^5.0.2", + "ngx-daterangepicker-material": "5.0.1", "ngx-google-places-autocomplete": "^2.0.5", "ngx-moment": "^5.0.0", "popper.js": "^1.16.1", @@ -110,6 +111,7 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", + "utf-8-validate": "^5.0.9", "zone.js": "~0.11.6" }, "optionalDependencies": { From 7b8f46bc986c32cf175ad0de4f1e7690602e436c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 09:31:20 +0000 Subject: [PATCH 09/18] Bump chart.js from 3.7.1 to 3.8.0 Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](https://github.com/chartjs/Chart.js/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: chart.js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 43 +++++++++---------------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fbc8c0896..ff9980602d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,8 +35,7 @@ "bootstrap-material-design": "^4.1.3", "bootstrap-notify": "^3.1.3", "bootstrap-select": "^1.13.18", - "bufferutil": "^4.0.6", - "chart.js": "^3.7.0", + "chart.js": "^3.8.0", "chartjs-adapter-moment": "^1.0.0", "chartjs-plugin-datalabels": "^2.0.0", "file-saver": "^2.0.5", @@ -58,7 +57,6 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", - "utf-8-validate": "^5.0.9", "zone.js": "~0.11.6" }, "devDependencies": { @@ -521,7 +519,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -2723,7 +2720,6 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz", "integrity": "sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==", "dependencies": { - "parse5": "^5.0.0", "tslib": "^2.0.0" }, "optionalDependencies": { @@ -8376,9 +8372,9 @@ "dev": true }, "node_modules/chart.js": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz", - "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA==" + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.0.tgz", + "integrity": "sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg==" }, "node_modules/chartjs-adapter-moment": { "version": "1.0.0", @@ -8427,7 +8423,6 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -10851,8 +10846,7 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -11951,7 +11945,6 @@ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, "dependencies": { - "@types/yauzl": "^2.9.1", "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" @@ -15449,7 +15442,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", "graceful-fs": "^4.2.9", "jest-regex-util": "^27.5.1", "jest-serializer": "^27.5.1", @@ -16867,9 +16859,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dependencies": { - "graceful-fs": "^4.1.6" - }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -17019,14 +17008,7 @@ "dev": true, "dependencies": { "copy-anything": "^2.0.1", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^2.5.2", "parse-node-version": "^1.0.1", - "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -17922,7 +17904,6 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, "dependencies": { - "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -21681,9 +21662,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz", "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==", "dev": true, - "dependencies": { - "fsevents": "~2.3.1" - }, "bin": { "rollup": "dist/bin/rollup" }, @@ -24836,10 +24814,8 @@ "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "dependencies": { - "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.1" + "neo-async": "^2.5.0" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -24936,7 +24912,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -32214,9 +32189,9 @@ "dev": true }, "chart.js": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz", - "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA==" + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.8.0.tgz", + "integrity": "sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg==" }, "chartjs-adapter-moment": { "version": "1.0.0", diff --git a/package.json b/package.json index b60f7df7ec..446ecfde60 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "bootstrap-notify": "^3.1.3", "bootstrap-select": "^1.13.18", "bufferutil": "^4.0.6", - "chart.js": "^3.7.0", + "chart.js": "^3.8.0", "chartjs-adapter-moment": "^1.0.0", "chartjs-plugin-datalabels": "^2.0.0", "file-saver": "^2.0.5", From af9417370834b3ae73e2008cddf83299f3b457d2 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 12:05:40 +0200 Subject: [PATCH 10/18] Updated pkg-lock.json --- package-lock.json | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff9980602d..b9991542b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,7 @@ "bootstrap-material-design": "^4.1.3", "bootstrap-notify": "^3.1.3", "bootstrap-select": "^1.13.18", + "bufferutil": "^4.0.6", "chart.js": "^3.8.0", "chartjs-adapter-moment": "^1.0.0", "chartjs-plugin-datalabels": "^2.0.0", @@ -57,6 +58,7 @@ "tldts": "^5.7.80", "ts-jest": "^27.1.4", "tslib": "^2.4.0", + "utf-8-validate": "^5.0.9", "zone.js": "~0.11.6" }, "devDependencies": { @@ -519,6 +521,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -2720,6 +2723,7 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz", "integrity": "sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==", "dependencies": { + "parse5": "^5.0.0", "tslib": "^2.0.0" }, "optionalDependencies": { @@ -8423,6 +8427,7 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", + "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -10846,7 +10851,8 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -11945,6 +11951,7 @@ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, "dependencies": { + "@types/yauzl": "^2.9.1", "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" @@ -15442,6 +15449,7 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", "graceful-fs": "^4.2.9", "jest-regex-util": "^27.5.1", "jest-serializer": "^27.5.1", @@ -16859,6 +16867,9 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -17008,7 +17019,14 @@ "dev": true, "dependencies": { "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "needle": "^2.5.2", "parse-node-version": "^1.0.1", + "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -17904,6 +17922,7 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, "dependencies": { + "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -21662,6 +21681,9 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz", "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==", "dev": true, + "dependencies": { + "fsevents": "~2.3.1" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -24814,8 +24836,10 @@ "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "dependencies": { + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -24912,6 +24936,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", From fbd728ee20ff1784a9daa5e35419d7ba4515e915 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 15:46:44 +0200 Subject: [PATCH 11/18] Updated release notes --- src/app/release-notes/release-notes.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 5a79dc4fc6..579c5de5cf 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -32,6 +32,7 @@ export class ReleaseNotesComponent { changes: [ `Fixed OCPI Tag type to match RFID standard`, `Handle Tag ID sent by payment terminals`, + `Retrigger the Async task framework after it has run once`, ], }, ], From 0ae7c438b0d9087f51b0ed8377ca9547e9f3a55a Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 16:16:45 +0200 Subject: [PATCH 12/18] Updated release notes --- src/app/release-notes/release-notes.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 579c5de5cf..500a3af9fa 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -33,6 +33,7 @@ export class ReleaseNotesComponent { `Fixed OCPI Tag type to match RFID standard`, `Handle Tag ID sent by payment terminals`, `Retrigger the Async task framework after it has run once`, + `Check of OCPI CPO Locations is now done once a day`, ], }, ], From e757499358a767ef187766b44316e9b6159edd52 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 16:17:51 +0200 Subject: [PATCH 13/18] Updated sub-modules --- src/assets/configs-aws | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/configs-aws b/src/assets/configs-aws index 0badec3872..4314b5e40c 160000 --- a/src/assets/configs-aws +++ b/src/assets/configs-aws @@ -1 +1 @@ -Subproject commit 0badec387282dab71c4d649043c05266f2be7a18 +Subproject commit 4314b5e40cd42cd9a8027d7701b91731ea08c364 From d1a867385834de0d980fd899c159ed06c3176afa Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 17:10:10 +0200 Subject: [PATCH 14/18] Updated release notes --- src/app/release-notes/release-notes.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 500a3af9fa..668a6553ce 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -34,6 +34,7 @@ export class ReleaseNotesComponent { `Handle Tag ID sent by payment terminals`, `Retrigger the Async task framework after it has run once`, `Check of OCPI CPO Locations is now done once a day`, + `Log in error failed Remote Push Notification`, ], }, ], From e78444fcd9d946829ffe096d02248a1b483b00b2 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Fri, 17 Jun 2022 17:29:24 +0200 Subject: [PATCH 15/18] Aligned column visibility in all TableDataSource.buildTableColumnDefs() --- .../list/assets-list-table-data-source.ts | 3 +- .../car-catalogs-list-table-data-source.ts | 3 +- .../list/invoices-table-data-source.ts | 9 ++-- .../list/companies-list-table-data-source.ts | 3 +- .../list/site-areas-list-table-data-source.ts | 28 +++++------ .../site-users-table-data-source.ts | 16 +++---- ...cpi-endpoints-details-table-data-source.ts | 3 +- .../tags/list/tags-list-table-data-source.ts | 8 +--- .../transactions-refund-table-data-source.ts | 17 +++---- .../users-in-error-table-data-source.ts | 11 ++--- .../list/users-list-table-data-source.ts | 48 ++++++++----------- .../user-sites-table-data-source.ts | 13 ++--- .../payment-methods-table-data-source.ts | 3 +- .../site-areas-dialog-table-data-source.ts | 26 ++++------ .../pricing-definitions-table-data-source.ts | 3 +- 15 files changed, 78 insertions(+), 116 deletions(-) diff --git a/src/app/pages/assets/list/assets-list-table-data-source.ts b/src/app/pages/assets/list/assets-list-table-data-source.ts index 58681a78ea..3306e90440 100644 --- a/src/app/pages/assets/list/assets-list-table-data-source.ts +++ b/src/app/pages/assets/list/assets-list-table-data-source.ts @@ -104,7 +104,7 @@ export class AssetsListTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDef: TableColumnDef[] = [ + return [ { id: 'id', name: 'general.id', @@ -183,7 +183,6 @@ export class AssetsListTableDataSource extends TableDataSource { }, }, ]; - return tableColumnDef; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/cars/car-catalogs/car-catalogs-list-table-data-source.ts b/src/app/pages/cars/car-catalogs/car-catalogs-list-table-data-source.ts index 87ce301fa6..6ba7326c70 100644 --- a/src/app/pages/cars/car-catalogs/car-catalogs-list-table-data-source.ts +++ b/src/app/pages/cars/car-catalogs/car-catalogs-list-table-data-source.ts @@ -86,7 +86,7 @@ export class CarCatalogsListTableDataSource extends TableDataSource } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDef: TableColumnDef[] = [ + return [ { id: 'image', name: 'cars.image', @@ -219,7 +219,6 @@ export class CarCatalogsListTableDataSource extends TableDataSource this.decimalPipe.transform(acceleration) + ' ' + this.translateService.instant('cars.unit.secondes') : '-', }, ]; - return tableColumnDef; } public rowActionTriggered(actionDef: TableActionDef, carCatalog: CarCatalog) { diff --git a/src/app/pages/invoices/list/invoices-table-data-source.ts b/src/app/pages/invoices/list/invoices-table-data-source.ts index 96b5ba4a1c..2e9edf7d7e 100644 --- a/src/app/pages/invoices/list/invoices-table-data-source.ts +++ b/src/app/pages/invoices/list/invoices-table-data-source.ts @@ -87,8 +87,7 @@ export class InvoicesTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const columns = []; - columns.push( + return [ { id: 'status', name: 'general.status', @@ -131,7 +130,7 @@ export class InvoicesTableDataSource extends TableDataSource { { id: 'sessions', name: 'invoices.number_of_items', - formatter: (sessions: BillingSessionData[], invoice: BillingInvoice) => sessions?.length, + formatter: (sessions: BillingSessionData[], invoice: BillingInvoice) => sessions?.length?.toString(), headerClass: 'col-10p text-center', class: 'col-10p text-center', sortable: false, @@ -143,8 +142,8 @@ export class InvoicesTableDataSource extends TableDataSource { headerClass: 'col-10p', class: 'col-10p', sortable: true, - }); - return columns as TableColumnDef[]; + } + ]; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/organization/companies/list/companies-list-table-data-source.ts b/src/app/pages/organization/companies/list/companies-list-table-data-source.ts index 49beca479e..ca55d6f39f 100644 --- a/src/app/pages/organization/companies/list/companies-list-table-data-source.ts +++ b/src/app/pages/organization/companies/list/companies-list-table-data-source.ts @@ -74,7 +74,7 @@ export class CompaniesListTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDef: TableColumnDef[] = [ + return [ { id: 'logo', name: 'companies.logo', @@ -146,7 +146,6 @@ export class CompaniesListTableDataSource extends TableDataSource { class: 'col-15em', }, ]; - return tableColumnDef; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/organization/site-areas/list/site-areas-list-table-data-source.ts b/src/app/pages/organization/site-areas/list/site-areas-list-table-data-source.ts index 4dee06c5aa..7907b8cfe4 100644 --- a/src/app/pages/organization/site-areas/list/site-areas-list-table-data-source.ts +++ b/src/app/pages/organization/site-areas/list/site-areas-list-table-data-source.ts @@ -126,7 +126,7 @@ export class SiteAreasListTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDef: TableColumnDef[] = [ + return [ { id: 'id', name: 'general.id', @@ -157,20 +157,15 @@ export class SiteAreasListTableDataSource extends TableDataSource { headerClass: 'col-10p text-center', class: 'col-10p text-center', formatter: (numberOfPhases: number, siteArea: SiteArea) => siteArea.issuer ? numberOfPhases.toString() : '-', - } - ]; - if (this.componentService.isActive(TenantComponents.SMART_CHARGING)) { - tableColumnDef.push( - { - id: 'smartCharging', - name: 'site_areas.smart_charging', - headerClass: 'col-10p text-center', - class: 'col-10p text-center', - formatter: (smartCharging: boolean) => Utils.displayYesNo(this.translateService, smartCharging), - } - ); - } - tableColumnDef.push( + }, + { + id: 'smartCharging', + name: 'site_areas.smart_charging', + headerClass: 'col-10p text-center', + class: 'col-10p text-center', + formatter: (smartCharging: boolean) => Utils.displayYesNo(this.translateService, smartCharging), + visible: this.componentService.isActive(TenantComponents.SMART_CHARGING), + }, { id: 'accessControl', name: 'site_areas.access_control', @@ -233,8 +228,7 @@ export class SiteAreasListTableDataSource extends TableDataSource { headerClass: 'col-15em', class: 'col-15em', }, - ); - return tableColumnDef; + ]; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/organization/sites/site-users/site-users-table-data-source.ts b/src/app/pages/organization/sites/site-users/site-users-table-data-source.ts index 44483233e4..33df1eae28 100644 --- a/src/app/pages/organization/sites/site-users/site-users-table-data-source.ts +++ b/src/app/pages/organization/sites/site-users/site-users-table-data-source.ts @@ -94,7 +94,7 @@ export class SiteUsersTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const columns: TableColumnDef[] = [ + return [ { id: 'user.name', name: 'users.name', @@ -112,16 +112,15 @@ export class SiteUsersTableDataSource extends TableDataSource { id: 'user.email', name: 'users.email', class: 'text-left col-40p', - } - ]; - if (this.getMode() === TableDataSourceMode.READ_WRITE) { - columns.push({ + }, + { id: 'siteAdmin', isAngularComponent: true, angularComponent: SiteUsersAdminCheckboxComponent, name: 'sites.admin_role', headerClass: 'text-center', class: 'col-10p', + visible: this.getMode() === TableDataSourceMode.READ_WRITE, }, { id: 'siteOwner', @@ -130,10 +129,9 @@ export class SiteUsersTableDataSource extends TableDataSource { name: 'sites.owner_role', headerClass: 'text-center', class: 'col-10p', - }); - } - - return columns; + visible: this.getMode() === TableDataSourceMode.READ_WRITE, + } + ]; } public setSite(site: Site) { diff --git a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts index 7a5b46a95a..f3c0a60b4b 100644 --- a/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts +++ b/src/app/pages/settings-integration/ocpi/endpoints/ocpi-details/settings-ocpi-endpoints-details-table-data-source.ts @@ -94,7 +94,7 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDefs = [ + return [ { id: 'lastCpoPushStatuses', type: 'integer', @@ -248,7 +248,6 @@ export class SettingsOcpiEndpointsDetailsTableDataSource extends TableDataSource visible: this.ocpiEndpoint?.role === OCPIRole.EMSP, }, ]; - return tableColumnDefs; } public buildTableActionsRightDef(): TableActionDef[] { diff --git a/src/app/pages/tags/list/tags-list-table-data-source.ts b/src/app/pages/tags/list/tags-list-table-data-source.ts index e659c2501c..147739baf1 100644 --- a/src/app/pages/tags/list/tags-list-table-data-source.ts +++ b/src/app/pages/tags/list/tags-list-table-data-source.ts @@ -196,8 +196,7 @@ export class TagsListTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const tableColumnDef: TableColumnDef[] = []; - tableColumnDef.push( + return [ { id: 'active', name: 'tags.status', @@ -261,8 +260,6 @@ export class TagsListTableDataSource extends TableDataSource { headerClass: 'col-20em', class: 'col-20em', }, - ); - tableColumnDef.push( { id: 'lastChangedOn', name: 'users.changed_on', @@ -287,8 +284,7 @@ export class TagsListTableDataSource extends TableDataSource { formatter: (issuer) => issuer ? this.translateService.instant('issuer.local') : this.translateService.instant('issuer.foreign'), }, - ); - return tableColumnDef; + ]; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts index 6fe07aa5da..743a66b2ab 100644 --- a/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts +++ b/src/app/pages/transactions/refund/transactions-refund-table-data-source.ts @@ -151,8 +151,7 @@ export class TransactionsRefundTableDataSource extends TableDataSource this.appCurrencyPipe.transform(price, row.stop.priceUnit), }, - ); - if (this.componentService.isActive(TenantComponents.CAR) && - this.authorizationService.canListCars()) { - columns.push({ + { id: 'carCatalog', name: 'car.title', headerClass: 'text-center col-15p', class: 'text-center col-15p', sortable: true, formatter: (carCatalog: CarCatalog) => carCatalog ? Utils.buildCarCatalogName(carCatalog) : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canListCars(), }, { id: 'car.licensePlate', @@ -237,10 +234,10 @@ export class TransactionsRefundTableDataSource extends TableDataSource licensePlate ? licensePlate : '-' - }); - } - return columns as TableColumnDef[]; + formatter: (licensePlate: string) => licensePlate ? licensePlate : '-', + visible: this.componentService.isActive(TenantComponents.CAR) && this.authorizationService.canListCars(), + } + ]; } public formatInactivity(totalInactivitySecs: number, row: Transaction) { diff --git a/src/app/pages/users/in-error/users-in-error-table-data-source.ts b/src/app/pages/users/in-error/users-in-error-table-data-source.ts index 41583505c3..96599b8379 100644 --- a/src/app/pages/users/in-error/users-in-error-table-data-source.ts +++ b/src/app/pages/users/in-error/users-in-error-table-data-source.ts @@ -78,9 +78,7 @@ export class UsersInErrorTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const loggedUserRole = this.centralServerService.getLoggedUser().role; - const columns = []; - columns.push( + return [ { id: 'status', name: 'users.status', @@ -93,7 +91,8 @@ export class UsersInErrorTableDataSource extends TableDataSource { { id: 'role', name: 'users.role', - formatter: (role: string) => this.translateService.instant(this.userRolePipe.transform(role, loggedUserRole)), + formatter: (role: string) => this.translateService.instant( + this.userRolePipe.transform(role, this.centralServerService.getLoggedUser().role)), headerClass: 'col-10p text-center', class: 'text-left col-10p text-center', sortable: true, @@ -134,8 +133,8 @@ export class UsersInErrorTableDataSource extends TableDataSource { class: 'col-30p text-danger', sortable: true, formatter: (value: string, row: UserInError) => this.translateService.instant(`users.errors.${row.errorCode}.title`), - }); - return columns as TableColumnDef[]; + }, + ]; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/users/list/users-list-table-data-source.ts b/src/app/pages/users/list/users-list-table-data-source.ts index 664927bc6c..b415030308 100644 --- a/src/app/pages/users/list/users-list-table-data-source.ts +++ b/src/app/pages/users/list/users-list-table-data-source.ts @@ -141,9 +141,7 @@ export class UsersListTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const loggedUserRole = this.centralServerService.getLoggedUser().role; - const columns = []; - columns.push( + return [ { id: 'status', name: 'users.status', @@ -181,7 +179,8 @@ export class UsersListTableDataSource extends TableDataSource { headerClass: 'col-10em', class: 'text-left col-10em', sortable: true, - formatter: (role: string) => role ? this.translateService.instant(this.appUserRolePipe.transform(role, loggedUserRole)) : '-', + formatter: (role: string) => role ? this.translateService.instant( + this.appUserRolePipe.transform(role, this.centralServerService.getLoggedUser().role)) : '-', }, { id: 'email', @@ -190,27 +189,23 @@ export class UsersListTableDataSource extends TableDataSource { class: 'text-left col-20p', sortable: true, }, - ); - if (this.componentService.isActive(TenantComponents.BILLING)) { - columns.push( - { - id: 'billingData.customerID', - name: 'billing.id', - headerClass: 'col-15p', - class: 'col-15p', - sortable: true, - }, - { - id: 'billingData.lastChangedOn', - name: 'billing.updated_on', - headerClass: 'col-15p', - class: 'col-15p', - sortable: true, - formatter: (lastChangedOn: Date) => this.datePipe.transform(lastChangedOn), - }, - ); - } - columns.push( + { + id: 'billingData.customerID', + name: 'billing.id', + headerClass: 'col-15p', + class: 'col-15p', + sortable: true, + visible: this.componentService.isActive(TenantComponents.BILLING), + }, + { + id: 'billingData.lastChangedOn', + name: 'billing.updated_on', + headerClass: 'col-15p', + class: 'col-15p', + sortable: true, + formatter: (lastChangedOn: Date) => this.datePipe.transform(lastChangedOn), + visible: this.componentService.isActive(TenantComponents.BILLING), + }, { id: 'createdOn', name: 'users.created_on', @@ -257,8 +252,7 @@ export class UsersListTableDataSource extends TableDataSource { sortable: true, formatter: (technicalUser: boolean) => Utils.displayYesNo(this.translateService, technicalUser), }, - ); - return columns as TableColumnDef[]; + ]; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/pages/users/user-sites/user-sites-table-data-source.ts b/src/app/pages/users/user-sites/user-sites-table-data-source.ts index a954018c4a..853c9e52b4 100644 --- a/src/app/pages/users/user-sites/user-sites-table-data-source.ts +++ b/src/app/pages/users/user-sites/user-sites-table-data-source.ts @@ -82,7 +82,7 @@ export class UserSitesTableDataSource extends TableDataSource { } public buildTableColumnDefs(): TableColumnDef[] { - const columns: TableColumnDef[] = [ + return [ { id: 'site.name', name: 'sites.name', @@ -111,18 +111,15 @@ export class UserSitesTableDataSource extends TableDataSource { name: 'sites.admin_role', class: 'col-10p', }, - - ]; - if (this.authorizationService.canCreateSiteArea()) { - columns.push({ + { id: 'siteOwner', isAngularComponent: true, angularComponent: UserSitesOwnerRadioComponent, name: 'sites.owner_role', class: 'col-10p', - }); - } - return columns; + visible: this.authorizationService.canCreateSiteArea(), + } + ]; } public setUser(user: User) { diff --git a/src/app/pages/users/user/payment-methods/payment-methods-table-data-source.ts b/src/app/pages/users/user/payment-methods/payment-methods-table-data-source.ts index 4b826d3f4f..b6b702aec3 100644 --- a/src/app/pages/users/user/payment-methods/payment-methods-table-data-source.ts +++ b/src/app/pages/users/user/payment-methods/payment-methods-table-data-source.ts @@ -106,7 +106,7 @@ export class PaymentMethodsTableDataSource extends TableDataSource this.datePipe.transform(createdOn) } ]; - return columns; } public buildTableActionsDef(): TableActionDef[] { diff --git a/src/app/shared/dialogs/site-areas/site-areas-dialog-table-data-source.ts b/src/app/shared/dialogs/site-areas/site-areas-dialog-table-data-source.ts index f80c2f8056..5331831b9f 100644 --- a/src/app/shared/dialogs/site-areas/site-areas-dialog-table-data-source.ts +++ b/src/app/shared/dialogs/site-areas/site-areas-dialog-table-data-source.ts @@ -73,7 +73,7 @@ export class SiteAreasDialogTableDataSource extends DialogTableDataSource Utils.displayYesNo(this.translateService, smartCharging), - } - ); - } - tableColumnDef.push( + { + id: 'smartCharging', + name: 'site_areas.smart_charging', + headerClass: 'col-10p text-center', + class: 'col-10p text-center', + formatter: (smartCharging: boolean) => Utils.displayYesNo(this.translateService, smartCharging), + visible: this.componentService.isActive(TenantComponents.SMART_CHARGING), + }, { id: 'address.address1', name: 'general.address', @@ -122,7 +117,6 @@ export class SiteAreasDialogTableDataSource extends DialogTableDataSource Date: Sat, 18 Jun 2022 02:28:19 +0200 Subject: [PATCH 16/18] Updated release notes --- src/app/release-notes/release-notes.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index 668a6553ce..d93a3f0b89 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -35,6 +35,7 @@ export class ReleaseNotesComponent { `Retrigger the Async task framework after it has run once`, `Check of OCPI CPO Locations is now done once a day`, `Log in error failed Remote Push Notification`, + `Virtual RFID ID are generated now on 8 bytes`, ], }, ], From 8b14226d110a7e29d6ac6ea29da6ecf7575eecb5 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Sun, 19 Jun 2022 11:45:18 +0200 Subject: [PATCH 17/18] Removed debug logs --- src/app/authentication/login/authentication-login.component.ts | 1 - src/app/pages/assets/asset/main/asset-main.component.ts | 1 - src/app/pages/cars/car/main/car-main.component.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/src/app/authentication/login/authentication-login.component.ts b/src/app/authentication/login/authentication-login.component.ts index b349e47156..8f467c8141 100644 --- a/src/app/authentication/login/authentication-login.component.ts +++ b/src/app/authentication/login/authentication-login.component.ts @@ -120,7 +120,6 @@ export class AuthenticationLoginComponent implements OnInit, OnDestroy { if (this.subDomain) { // Retrieve tenant's logo this.centralServerService.getTenantLogoBySubdomain(this.subDomain).subscribe((tenantLogo: string) => { - console.log(tenantLogo); if (tenantLogo) { this.tenantLogo = tenantLogo; } diff --git a/src/app/pages/assets/asset/main/asset-main.component.ts b/src/app/pages/assets/asset/main/asset-main.component.ts index 0951fb879e..ce5764bd20 100644 --- a/src/app/pages/assets/asset/main/asset-main.component.ts +++ b/src/app/pages/assets/asset/main/asset-main.component.ts @@ -243,7 +243,6 @@ export class AssetMainComponent implements OnInit, OnChanges { .afterClosed().subscribe((result) => { if (!Utils.isEmptyArray(result) && result[0].objectRef) { const siteArea = result[0].objectRef as SiteArea; - console.log(siteArea); this.siteArea.setValue(siteArea.name); this.siteAreaID.setValue(siteArea.id); this.selectedSiteArea = siteArea; diff --git a/src/app/pages/cars/car/main/car-main.component.ts b/src/app/pages/cars/car/main/car-main.component.ts index 3bc927f3fa..df8ecbdf1a 100644 --- a/src/app/pages/cars/car/main/car-main.component.ts +++ b/src/app/pages/cars/car/main/car-main.component.ts @@ -110,7 +110,6 @@ export class CarMainComponent implements OnInit, OnChanges { this.carTypes.push({ key: CarType.POOL_CAR, value: 'cars.pool_car' }); } // User ID - console.log(this.carsAuthorizations); if(this.carsAuthorizations.metadata?.userID?.mandatory) { this.user.setValidators(Validators.required); this.userID.setValidators(Validators.required); From 372ff76e736dc6608cecace0e67cca7a0e501078 Mon Sep 17 00:00:00 2001 From: LucasBrazi06 Date: Sun, 19 Jun 2022 21:42:18 +0200 Subject: [PATCH 18/18] Updated release notes --- src/app/release-notes/release-notes.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index d93a3f0b89..b32ceaa9b9 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -25,7 +25,7 @@ export class ReleaseNotesComponent { this.releaseNotes = [ { version: '2.6.9', - date: new Date('2022-06-17'), + date: new Date('2022-06-19'), componentChanges: [ { name: 'Dashboard',