diff --git a/angular.json b/angular.json index f1e14f3f7..293072438 100644 --- a/angular.json +++ b/angular.json @@ -1,159 +1,160 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "ebad-front": { - "root": "", - "sourceRoot": "src", - "projectType": "application", - "prefix": "app", - "schematics": {}, - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/ebad-front", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", - "assets": [ - "src/favicon.ico", - "src/assets", - "src/silent-refresh.html" - ], - "styles": [ - "src/styles.scss" - ], - "scripts": [ - "node_modules/apexcharts/dist/apexcharts.min.js", - "node_modules/jquery/dist/jquery.js", - "node_modules/datatables.net/js/jquery.dataTables.js" - ] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "aot": true, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, { +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "ebad-front": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "prefix": "app", + "schematics": {}, + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/ebad-front", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.app.json", + "assets": [ + "src/favicon.ico", + "src/assets", + "src/silent-refresh.html" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [ + "node_modules/apexcharts/dist/apexcharts.min.js", + "node_modules/jquery/dist/jquery.js", + "node_modules/datatables.net/js/jquery.dataTables.js" + ] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "3mb", + "maximumError": "6mb" + }, + { "type": "anyComponentStyle", "maximumWarning": "6kb" } - ] - } - } - }, - "serve": { - "builder": "ngx-build-plus:dev-server", - "options": { - "browserTarget": "ebad-front:build", - "extraWebpackConfig": "./cypress/coverage.webpack.js" - }, - "configurations": { - "production": { - "browserTarget": "ebad-front:build:production" - } - } - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "ebad-front:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", - "styles": [ - "src/styles.scss" - ], - "scripts": [], - "assets": [ - "src/favicon.ico", - "src/assets" - ] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } - }, - "cypress-run": { - "builder": "@briebug/cypress-schematic:cypress", - "options": { - "devServerTarget": "ebad-front:serve" - }, - "configurations": { - "production": { - "devServerTarget": "ebad-front:serve:production" - } - } - }, - "cypress-open": { - "builder": "@briebug/cypress-schematic:cypress", - "options": { - "devServerTarget": "ebad-front:serve", - "watch": true, - "headless": false - }, - "configurations": { - "production": { - "devServerTarget": "ebad-front:serve:production" - } - } - }, - "e2e": { - "builder": "@briebug/cypress-schematic:cypress", - "options": { - "devServerTarget": "ebad-front:serve", - "watch": true, - "headless": false - }, - "configurations": { - "production": { - "devServerTarget": "ebad-front:serve:production" - } - } - } - } - } - }, - "defaultProject": "ebad-front", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - } -} + ] + } + } + }, + "serve": { + "builder": "ngx-build-plus:dev-server", + "options": { + "browserTarget": "ebad-front:build", + "extraWebpackConfig": "./cypress/coverage.webpack.js" + }, + "configurations": { + "production": { + "browserTarget": "ebad-front:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "ebad-front:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "karmaConfig": "src/karma.conf.js", + "styles": [ + "src/styles.scss" + ], + "scripts": [], + "assets": [ + "src/favicon.ico", + "src/assets" + ] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + }, + "cypress-run": { + "builder": "@briebug/cypress-schematic:cypress", + "options": { + "devServerTarget": "ebad-front:serve" + }, + "configurations": { + "production": { + "devServerTarget": "ebad-front:serve:production" + } + } + }, + "cypress-open": { + "builder": "@briebug/cypress-schematic:cypress", + "options": { + "devServerTarget": "ebad-front:serve", + "watch": true, + "headless": false + }, + "configurations": { + "production": { + "devServerTarget": "ebad-front:serve:production" + } + } + }, + "e2e": { + "builder": "@briebug/cypress-schematic:cypress", + "options": { + "devServerTarget": "ebad-front:serve", + "watch": true, + "headless": false + }, + "configurations": { + "production": { + "devServerTarget": "ebad-front:serve:production" + } + } + } + } + } + }, + "defaultProject": "ebad-front", + "schematics": { + "@schematics/angular:component": { + "style": "scss" + } + } +} diff --git a/package-lock.json b/package-lock.json index 78efd3173..4ce028fe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4004,9 +4004,9 @@ "integrity": "sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=" }, "apexcharts": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.24.0.tgz", - "integrity": "sha512-iT6czJCIVrmAtrcO90MZTQCvC+xi6R6Acf0jNH/d40FVTtCfcqECuKIh5iAMyOTtgUb7+fQ8rbadH2bm1kbL9Q==", + "version": "3.25.0", + "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.25.0.tgz", + "integrity": "sha512-uM7OF+jLL4ba79noYcrMwMgJW8DI+Ff28CCQoGq23g25z8nGSQEoU+u12YWlECA9gBA5tbmdaQhMxjlK+M6B9Q==", "requires": { "svg.draggable.js": "^2.2.2", "svg.easing.js": "^2.0.0", @@ -7273,9 +7273,9 @@ } }, "enhanced-resolve": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", - "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz", + "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -11902,17 +11902,17 @@ "dev": true }, "ng-apexcharts": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.5.4.tgz", - "integrity": "sha512-KYpG5l0VTPLqvYcJBm3amSGrI932geSDQppqo+81cNQNwc41o4xeHtygPnn2BvYGOxLE7aS/eN8aqnQ5Ruorrw==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.5.8.tgz", + "integrity": "sha512-Je4wJuwYdylAUccxKhfWmdZh7PVOcvlDmyXkrmj9VdhkVQZgBTuyH9oilYYKZCmch2j+EIctyRsgaCtYsGeo+w==", "requires": { "tslib": "^1.10.0" }, "dependencies": { "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" } } }, @@ -16591,18 +16591,27 @@ "dev": true }, "ts-loader": { - "version": "8.0.13", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.13.tgz", - "integrity": "sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA==", + "version": "8.0.17", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.17.tgz", + "integrity": "sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w==", "dev": true, "requires": { - "chalk": "^2.3.0", + "chalk": "^4.1.0", "enhanced-resolve": "^4.0.0", - "loader-utils": "^1.0.2", + "loader-utils": "^2.0.0", "micromatch": "^4.0.0", - "semver": "^6.0.0" + "semver": "^7.3.4" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -16612,6 +16621,37 @@ "fill-range": "^7.0.1" } }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -16621,12 +16661,38 @@ "to-regex-range": "^5.0.1" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -16638,10 +16704,22 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } }, "to-regex-range": { "version": "5.0.1", diff --git a/package.json b/package.json index 0613b138b..eba02fa9b 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "angular-oauth2-oidc": "^10.0.3", "angular-oauth2-oidc-jwks": "^9.0.0", "angular-svg-icon": "^10.0.0", - "apexcharts": "^3.24.0", + "apexcharts": "^3.25.0", "bootstrap": "twbs/bootstrap#bd27834", "core-js": "^3.6.5", "datatables.net": "^1.10.22", @@ -49,7 +49,7 @@ "jsrsasign-util": "^1.0.0", "live-server": "^1.2.1", "marked": "^2.0.0", - "ng-apexcharts": "^1.5.4", + "ng-apexcharts": "^1.5.8", "ng-multiselect-dropdown": "^0.2.10", "ngx-countup": "^7.3.3", "ngx-file-drop": "^9.0.1", diff --git a/src/app/accreditation-requests/accreditation-request-routing.module.ts b/src/app/accreditation-requests/accreditation-request-routing.module.ts index a110787ee..29bf9998a 100644 --- a/src/app/accreditation-requests/accreditation-request-routing.module.ts +++ b/src/app/accreditation-requests/accreditation-request-routing.module.ts @@ -1,12 +1,12 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; -import {SynthesisAccreditationRequest} from "./synthesis-accreditation-request.component"; +import {AuthGuard} from '../core'; +import {SynthesisAccreditationRequestComponent} from './synthesis-accreditation-request.component'; const routes: Routes = [ { path: '', - component: SynthesisAccreditationRequest, + component: SynthesisAccreditationRequestComponent, canActivate: [AuthGuard] } ]; diff --git a/src/app/accreditation-requests/accreditation-request.module.ts b/src/app/accreditation-requests/accreditation-request.module.ts index 361cf075f..1e85a3ad9 100644 --- a/src/app/accreditation-requests/accreditation-request.module.ts +++ b/src/app/accreditation-requests/accreditation-request.module.ts @@ -4,7 +4,7 @@ import {IconsModule} from '../icons'; import {NgbPaginationModule, NgbTypeaheadModule} from "@ng-bootstrap/ng-bootstrap"; import {AccreditationRequestRoutingModule} from "./accreditation-request-routing.module"; import {ListAccreditationRequestComponent} from "./list-accreditation-request.component"; -import {SynthesisAccreditationRequest} from "./synthesis-accreditation-request.component"; +import {SynthesisAccreditationRequestComponent} from "./synthesis-accreditation-request.component"; import {ModalRequestComponent} from "./modal-request/modal-request.component"; import {DataTablesModule} from "angular-datatables"; @@ -12,7 +12,7 @@ import {DataTablesModule} from "angular-datatables"; @NgModule({ declarations: [ ListAccreditationRequestComponent, - SynthesisAccreditationRequest, + SynthesisAccreditationRequestComponent, ModalRequestComponent ], imports: [ @@ -25,7 +25,7 @@ import {DataTablesModule} from "angular-datatables"; ], exports: [ ListAccreditationRequestComponent, - SynthesisAccreditationRequest + SynthesisAccreditationRequestComponent ], entryComponents: [ ModalRequestComponent diff --git a/src/app/accreditation-requests/list-accreditation-request.component.ts b/src/app/accreditation-requests/list-accreditation-request.component.ts index ec4306adb..fe087fda1 100644 --- a/src/app/accreditation-requests/list-accreditation-request.component.ts +++ b/src/app/accreditation-requests/list-accreditation-request.component.ts @@ -1,17 +1,16 @@ -import {Component, Input, OnInit, ViewChild} from '@angular/core'; -import {AccreditationRequestsService} from '../core/services'; -import {Constants} from "../shared/Constants"; -import {Observable, Subject} from "rxjs"; -import {AccreditationRequest} from "../core/models"; -import {Page} from "../core/models/page.model"; -import {ToastService} from "../core/services/toast.service"; -import {DataTableDirective} from "angular-datatables"; +import {AfterViewInit, Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {AccreditationRequestsService, AccreditationRequest} from '../core'; +import {Constants} from '../shared/Constants'; +import {Observable, Subject} from 'rxjs'; +import {Page} from '../core/models/page.model'; +import {ToastService} from '../core/services/toast.service'; +import {DataTableDirective} from 'angular-datatables'; @Component({ selector: 'app-list-accreditation-request', templateUrl: './list-accreditation-request.component.html' }) -export class ListAccreditationRequestComponent implements OnInit { +export class ListAccreditationRequestComponent implements OnInit, AfterViewInit, OnDestroy { @Input() userOnly: boolean; title = 'Liste des demandes d\'accréditation à traiter'; @@ -28,9 +27,9 @@ export class ListAccreditationRequestComponent implements OnInit { } ngOnInit(): void { - const columnsForAdminOrModo = [{data: 'id',},{data:'user'}, {data: 'application'}, {data: 'wantUse'}, {data: 'wantManage'}, {data: 'state'}, {data: '',orderable: false}]; - const columnsForUserOnly = [{data: 'id',}, {data: 'application'}, {data: 'wantUse'}, {data: 'wantManage'}, {data: 'state'}]; - var columns = columnsForAdminOrModo; + const columnsForAdminOrModo = [{data: 'id', }, {data: 'user'}, {data: 'application'}, {data: 'wantUse'}, {data: 'wantManage'}, {data: 'state'}, {data: '', orderable: false}]; + const columnsForUserOnly = [{data: 'id', }, {data: 'application'}, {data: 'wantUse'}, {data: 'wantManage'}, {data: 'state'}]; + let columns = columnsForAdminOrModo; if (this.userOnly) { this.title = 'Liste des demandes d\'accréditation'; columns = columnsForUserOnly; @@ -48,9 +47,9 @@ export class ListAccreditationRequestComponent implements OnInit { processing: false, ajax: (dataTablesParameters: any, callback) => { this.listRequest({ - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir } ) .subscribe(resp => { @@ -62,7 +61,7 @@ export class ListAccreditationRequestComponent implements OnInit { }); }); }, - columns: columns + columns }; this.dtTrigger.next(); } @@ -99,7 +98,7 @@ export class ListAccreditationRequestComponent implements OnInit { this.toastService.showError(`Une erreur est survenue lors de l'acceptation : ${error}`); this.refreshAccreditationRequests(); } - ) + ); } reject(accreditationRequest: AccreditationRequest) { diff --git a/src/app/accreditation-requests/synthesis-accreditation-request.component.ts b/src/app/accreditation-requests/synthesis-accreditation-request.component.ts index 22312b5e4..25cd4cedd 100644 --- a/src/app/accreditation-requests/synthesis-accreditation-request.component.ts +++ b/src/app/accreditation-requests/synthesis-accreditation-request.component.ts @@ -1,20 +1,18 @@ import {Component} from '@angular/core'; -import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; -import {ModalRequestComponent} from "./modal-request/modal-request.component"; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {ModalRequestComponent} from './modal-request/modal-request.component'; @Component({ - selector: 'ebad-synthesis-accreditation-request', + selector: 'app-synthesis-accreditation-request', templateUrl: './synthesis-accreditation-request.component.html' }) -export class SynthesisAccreditationRequest { +export class SynthesisAccreditationRequestComponent { constructor(private modalService: NgbModal) {} requestAccreditation(){ const modalRef = this.modalService.open(ModalRequestComponent); - modalRef.result.then((result) => { - }, (reason) => { - }); + modalRef.result.then(); } } diff --git a/src/app/admin-applications/admin-applications-routing.module.ts b/src/app/admin-applications/admin-applications-routing.module.ts index 3e048c4b2..8658b76dd 100644 --- a/src/app/admin-applications/admin-applications-routing.module.ts +++ b/src/app/admin-applications/admin-applications-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {AdminApplicationsComponent} from './admin-applications.component'; const routes: Routes = [ diff --git a/src/app/admin-applications/admin-applications.component.ts b/src/app/admin-applications/admin-applications.component.ts index b5a8f0203..ceea9b746 100644 --- a/src/app/admin-applications/admin-applications.component.ts +++ b/src/app/admin-applications/admin-applications.component.ts @@ -1,14 +1,13 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {ApplicationsService, GlobalSettingsService} from '../core/services'; +import {ApplicationsService, Application, GlobalSettingsService} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalApplicationComponent} from './modal-application/modal-application.component'; import {ModalUsersComponent} from './modal-users/modal-users.component'; import {ModalApplicationDeletionComponent} from './modal-application-deletion/modal-application-deletion.component'; -import {Constants} from "../shared/Constants"; -import {Application} from "../core/models"; -import {DataTableDirective} from "angular-datatables"; +import {Constants} from '../shared/Constants'; +import {DataTableDirective} from 'angular-datatables'; import {Subject} from 'rxjs'; -import {ToastService} from "../core/services/toast.service"; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-admin-applications', @@ -38,7 +37,7 @@ export class AdminApplicationsComponent implements AfterViewInit, OnDestroy, OnI this.importApplicationEnabled = this.globalSettingsService.importApplicationIsEnable(); this.dtOptions = { - order: [[1,'asc']], + order: [[1, 'asc']], pagingType: 'full_numbers', pageLength: this.constants.numberByPage, serverSide: true, @@ -46,10 +45,10 @@ export class AdminApplicationsComponent implements AfterViewInit, OnDestroy, OnI ajax: (dataTablesParameters: any, callback) => { this.applicationsService .getAllManage({ - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -88,7 +87,7 @@ export class AdminApplicationsComponent implements AfterViewInit, OnDestroy, OnI const modalRef = this.modalService.open(ModalApplicationComponent); modalRef.result.then((result) => { this.toastService.showSuccess(`L'application ${result.name} a bien été ajoutée`); - this.refreshApplication() + this.refreshApplication(); }, (reason) => { if (reason.message !== undefined) { this.toastService.showError( `Une erreur est survenue lors de l'ajout de l'application : ${reason.message}`); @@ -99,42 +98,41 @@ export class AdminApplicationsComponent implements AfterViewInit, OnDestroy, OnI onClickImportApplications() { this.applicationsService.importApplications().subscribe( - (result) => { + () => { this.toastService.showSuccess(`Les applications ont bien étaient importées`); - this.refreshApplication() + this.refreshApplication(); } , (error) => this.toastService.showError(`Une erreur est survenue lors de l'import des applications : ${error.message}`) - ) + ); } editApplication(app: Application) { const modalRef = this.modalService.open(ModalApplicationComponent); modalRef.result.then((result) => { this.toastService.showSuccess(`L'application ${result.name} a bien été modifiée`); - this.refreshApplication() + this.refreshApplication(); }, (reason) => { if (reason.message !== undefined) { this.toastService.showError( `Une erreur est survenue lors de la modification de l'application : ${reason.message}`); } }); - modalRef.componentInstance.application = app; + modalRef.componentInstance.application = {...app}; modalRef.componentInstance.isUpdate = true; } deleteApplication(app: Application) { const modalRef = this.modalService.open(ModalApplicationDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.applicationsService.deleteApplication(app.id).subscribe( () => { this.toastService.showSuccess(`L'application a été supprimée`); - this.refreshApplication() + this.refreshApplication(); }, reason => { this.toastService.showError( `Une erreur est survenue lors de la suppression de l'application : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.application = app; } diff --git a/src/app/admin-applications/admin-applications.module.ts b/src/app/admin-applications/admin-applications.module.ts index 8e8f030f7..840c5ccc3 100644 --- a/src/app/admin-applications/admin-applications.module.ts +++ b/src/app/admin-applications/admin-applications.module.ts @@ -7,7 +7,7 @@ import {ModalUsersComponent} from './modal-users/modal-users.component'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {IconsModule} from '../icons'; import {ModalApplicationDeletionComponent} from './modal-application-deletion/modal-application-deletion.component'; -import {DataTablesModule} from "angular-datatables"; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [AdminApplicationsComponent, ModalApplicationComponent, ModalUsersComponent, ModalApplicationDeletionComponent], diff --git a/src/app/admin-applications/modal-application-deletion/modal-application-deletion.component.ts b/src/app/admin-applications/modal-application-deletion/modal-application-deletion.component.ts index d39746da2..250301938 100644 --- a/src/app/admin-applications/modal-application-deletion/modal-application-deletion.component.ts +++ b/src/app/admin-applications/modal-application-deletion/modal-application-deletion.component.ts @@ -1,17 +1,14 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Application} from '../../core/models'; +import {Application} from '../../core'; @Component({ selector: 'app-modal-application-deletion', templateUrl: './modal-application-deletion.component.html' }) -export class ModalApplicationDeletionComponent implements OnInit { +export class ModalApplicationDeletionComponent { application: Application; constructor(public activeModal: NgbActiveModal) { } - - ngOnInit() { - } } diff --git a/src/app/admin-news/admin-news-routing.module.ts b/src/app/admin-news/admin-news-routing.module.ts index 839c73188..b619f96e3 100644 --- a/src/app/admin-news/admin-news-routing.module.ts +++ b/src/app/admin-news/admin-news-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {AdminNewsComponent} from './admin-news.component'; const routes: Routes = [ diff --git a/src/app/admin-news/admin-news.component.ts b/src/app/admin-news/admin-news.component.ts index 087e9fe37..64286a598 100644 --- a/src/app/admin-news/admin-news.component.ts +++ b/src/app/admin-news/admin-news.component.ts @@ -1,13 +1,13 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import {NewsService} from '../core/services'; +import {NewsService} from '../core'; import {ModalNewComponent} from './modal-new/modal-new.component'; import {ModalNewDeletionComponent} from './modal-new-deletion/modal-new-deletion.component'; -import {Constants} from "../shared/Constants"; -import {New} from "../core/models"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {ToastService} from "../core/services/toast.service"; +import {Constants} from '../shared/Constants'; +import {New} from '../core/models'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-admin-news', @@ -37,10 +37,10 @@ export class AdminNewsComponent implements AfterViewInit, OnDestroy, OnInit { ajax: (dataTablesParameters: any, callback) => { this.newsService .getAll({ - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'title': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + title: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -78,8 +78,6 @@ export class AdminNewsComponent implements AfterViewInit, OnDestroy, OnInit { } onClickAddNew() { - - const modalRef = this.modalService.open(ModalNewComponent, {size: 'lg'}); modalRef.result.then(() => { this.toastService.showSuccess(`L'actualité a bien été ajoutée`); @@ -102,13 +100,13 @@ export class AdminNewsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la modification de l'actualité : ${reason.message}`); } }); - modalRef.componentInstance.oneNew = oneNew; + modalRef.componentInstance.oneNew = {...oneNew}; modalRef.componentInstance.isUpdate = true; } deleteNew(oneNew: New) { const modalRef = this.modalService.open(ModalNewDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.newsService.deleteNew(oneNew.id).subscribe( () => { this.toastService.showSuccess(`L'actualité a été supprimée`); @@ -118,7 +116,6 @@ export class AdminNewsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la suppression de l'actualité : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.oneNew = oneNew; } diff --git a/src/app/admin-news/admin-news.module.ts b/src/app/admin-news/admin-news.module.ts index 1e7852a0c..5c8e40092 100644 --- a/src/app/admin-news/admin-news.module.ts +++ b/src/app/admin-news/admin-news.module.ts @@ -5,8 +5,8 @@ import {SharedModule} from '../shared'; import {ModalNewComponent} from './modal-new/modal-new.component'; import {ModalNewDeletionComponent} from './modal-new-deletion/modal-new-deletion.component'; import {CKEditorModule} from '@ckeditor/ckeditor5-angular'; -import {NgbPaginationModule, NgbToastModule} from "@ng-bootstrap/ng-bootstrap"; -import {DataTablesModule} from "angular-datatables"; +import {NgbPaginationModule, NgbToastModule} from '@ng-bootstrap/ng-bootstrap'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ diff --git a/src/app/admin-news/modal-new-deletion/modal-new-deletion.component.ts b/src/app/admin-news/modal-new-deletion/modal-new-deletion.component.ts index 5bb6b19a7..c85b66fe0 100644 --- a/src/app/admin-news/modal-new-deletion/modal-new-deletion.component.ts +++ b/src/app/admin-news/modal-new-deletion/modal-new-deletion.component.ts @@ -1,17 +1,14 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {New} from '../../core/models'; +import {New} from '../../core'; @Component({ selector: 'app-modal-new-deletion', templateUrl: './modal-new-deletion.component.html' }) -export class ModalNewDeletionComponent implements OnInit { +export class ModalNewDeletionComponent { oneNew: New; constructor(public activeModal: NgbActiveModal) { } - - ngOnInit() { - } } diff --git a/src/app/admin-news/modal-new/modal-new.component.ts b/src/app/admin-news/modal-new/modal-new.component.ts index 7e368a5ed..b5a37fc1e 100644 --- a/src/app/admin-news/modal-new/modal-new.component.ts +++ b/src/app/admin-news/modal-new/modal-new.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {New} from '../../core/models'; -import {NewsService} from '../../core/services'; +import {NewsService, New} from '../../core'; import * as ClassicEditor from '@ckeditor/ckeditor5-build-classic'; @Component({ diff --git a/src/app/admin-norms/admin-norms-routing.module.ts b/src/app/admin-norms/admin-norms-routing.module.ts index e38645ec8..4a5004dca 100644 --- a/src/app/admin-norms/admin-norms-routing.module.ts +++ b/src/app/admin-norms/admin-norms-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {AdminNormsComponent} from './admin-norms.component'; const routes: Routes = [ diff --git a/src/app/admin-norms/admin-norms.component.ts b/src/app/admin-norms/admin-norms.component.ts index 1a26a4db1..73c505281 100644 --- a/src/app/admin-norms/admin-norms.component.ts +++ b/src/app/admin-norms/admin-norms.component.ts @@ -1,13 +1,12 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {NormsService} from '../core/services'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalNormComponent} from './modal-norm/modal-norm.component'; import {ModalNormDeletionComponent} from './modal-norm-deletion/modal-norm-deletion.component'; -import {Constants} from "../shared/Constants"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {Norme} from "../core/models"; -import {ToastService} from "../core/services/toast.service"; +import {Constants} from '../shared/Constants'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {Norme, NormsService} from '../core'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-admin-norms', @@ -37,10 +36,10 @@ export class AdminNormsComponent implements AfterViewInit, OnDestroy, OnInit { ajax: (dataTablesParameters: any, callback) => { this.normsService .getAll({ - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -100,7 +99,7 @@ export class AdminNormsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la modification de la norme : ${reason.message}`); } }); - modalRef.componentInstance.norm = norm; + modalRef.componentInstance.norm = {...norm}; modalRef.componentInstance.isUpdate = true; } @@ -116,7 +115,6 @@ export class AdminNormsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la suppression de la norme : ${reason.detail}`); } ); - }, reason => { }); modalRef.componentInstance.norm = norm; } diff --git a/src/app/admin-norms/admin-norms.module.ts b/src/app/admin-norms/admin-norms.module.ts index 2429bac9b..c901956cf 100644 --- a/src/app/admin-norms/admin-norms.module.ts +++ b/src/app/admin-norms/admin-norms.module.ts @@ -4,8 +4,8 @@ import {AdminNormsRoutingModule} from './admin-norms-routing.module'; import {SharedModule} from '../shared'; import {ModalNormComponent} from './modal-norm/modal-norm.component'; import {ModalNormDeletionComponent} from './modal-norm-deletion/modal-norm-deletion.component'; -import {NgbPaginationModule} from "@ng-bootstrap/ng-bootstrap"; -import {DataTablesModule} from "angular-datatables"; +import {NgbPaginationModule} from '@ng-bootstrap/ng-bootstrap'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [AdminNormsComponent, ModalNormComponent, ModalNormDeletionComponent], diff --git a/src/app/admin-norms/modal-norm-deletion/modal-norm-deletion.component.ts b/src/app/admin-norms/modal-norm-deletion/modal-norm-deletion.component.ts index 70ffe66f7..5d13b828b 100644 --- a/src/app/admin-norms/modal-norm-deletion/modal-norm-deletion.component.ts +++ b/src/app/admin-norms/modal-norm-deletion/modal-norm-deletion.component.ts @@ -1,17 +1,14 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Norme} from '../../core/models'; +import {Norme} from '../../core'; @Component({ selector: 'app-modal-norm-deletion', templateUrl: './modal-norm-deletion.component.html' }) -export class ModalNormDeletionComponent implements OnInit { +export class ModalNormDeletionComponent { norm: Norme; constructor(public activeModal: NgbActiveModal) { } - - ngOnInit() { - } } diff --git a/src/app/admin-norms/modal-norm/modal-norm.component.ts b/src/app/admin-norms/modal-norm/modal-norm.component.ts index 566d74969..cb7b27cc8 100644 --- a/src/app/admin-norms/modal-norm/modal-norm.component.ts +++ b/src/app/admin-norms/modal-norm/modal-norm.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Norme} from '../../core/models'; -import {NormsService} from '../../core/services'; +import {NormsService, Norme} from '../../core'; @Component({ selector: 'app-modal-norm', diff --git a/src/app/admin-settings/admin-settings.component.ts b/src/app/admin-settings/admin-settings.component.ts index 6cc37ce6d..2ea6530da 100644 --- a/src/app/admin-settings/admin-settings.component.ts +++ b/src/app/admin-settings/admin-settings.component.ts @@ -21,17 +21,17 @@ export class AdminSettingsComponent implements OnInit { ngOnInit() { this.globalSettingService.getAllSettings().subscribe( (data) => this.settings = data - ) + ); } disableSetting(globalSetting: GlobalSetting){ - this.globalSettingService.changeValue(globalSetting.key,'false').subscribe( + this.globalSettingService.changeValue(globalSetting.key, 'false').subscribe( (result) => this.settings[this.settings.indexOf(globalSetting)] = result ); } enableSetting(globalSetting: GlobalSetting){ - this.globalSettingService.changeValue(globalSetting.key,'true').subscribe( + this.globalSettingService.changeValue(globalSetting.key, 'true').subscribe( (result) => this.settings[this.settings.indexOf(globalSetting)] = result ); } diff --git a/src/app/admin-users/admin-users-routing.module.ts b/src/app/admin-users/admin-users-routing.module.ts index 80b6f8499..0cc3f9899 100644 --- a/src/app/admin-users/admin-users-routing.module.ts +++ b/src/app/admin-users/admin-users-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {AdminUsersComponent} from './admin-users.component'; const routes: Routes = [ diff --git a/src/app/admin-users/admin-users.component.ts b/src/app/admin-users/admin-users.component.ts index 47d31301b..0980c9a01 100644 --- a/src/app/admin-users/admin-users.component.ts +++ b/src/app/admin-users/admin-users.component.ts @@ -1,16 +1,15 @@ import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {Table} from '../shared/table/table.model'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import {UsersService} from '../core/services'; +import {UsersService, User} from '../core'; import {ModalUserComponent} from './modal-user/modal-user.component'; -import {User} from '../core/models'; -import {ModalRolesComponent} from "./modal-roles/modal-roles.component"; -import {environment} from "../../environments/environment"; -import {Pageable} from "../core/models/pageable.model"; -import {Constants} from "../shared/Constants"; -import {fromEvent} from "rxjs"; -import {debounceTime, distinctUntilChanged, filter, tap} from "rxjs/operators"; -import {ToastService} from "../core/services/toast.service"; +import {ModalRolesComponent} from './modal-roles/modal-roles.component'; +import {environment} from '../../environments/environment'; +import {Pageable} from '../core/models/pageable.model'; +import {Constants} from '../shared/Constants'; +import {fromEvent} from 'rxjs'; +import {debounceTime, distinctUntilChanged, filter, tap} from 'rxjs/operators'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-admin-users', @@ -49,13 +48,13 @@ export class AdminUsersComponent implements OnInit, AfterViewInit { ngAfterViewInit() { // server-side search - fromEvent(this.input.nativeElement,'keyup') + fromEvent(this.input.nativeElement, 'keyup') .pipe( filter(Boolean), debounceTime(500), distinctUntilChanged(), tap((text) => { - let pageable : any = new Pageable(0, this.pageSize); + const pageable: any = new Pageable(0, this.pageSize); pageable.login = this.input.nativeElement.value; this.refreshUsers(pageable); }) @@ -64,7 +63,7 @@ export class AdminUsersComponent implements OnInit, AfterViewInit { } changePage(event){ - this.refreshUsers(new Pageable(event-1,this.pageSize)); + this.refreshUsers(new Pageable(event - 1, this.pageSize)); } refreshUsers(pageable: any = new Pageable(0, this.pageSize)) { @@ -77,7 +76,7 @@ export class AdminUsersComponent implements OnInit, AfterViewInit { this.peoplesPage.from = (this.pagination.currentPage - 1) * this.pagination.itemsPerPage + 1; this.peoplesPage.to = (this.pagination.currentPage - 1) * this.pagination.itemsPerPage + this.pagination.itemsPerPage; this.peoplesPage.of = this.pagination.totalItems; - if(this.peoplesPage.to > this.peoplesPage.of){ + if (this.peoplesPage.to > this.peoplesPage.of){ this.peoplesPage.to = this.peoplesPage.of; } } @@ -104,16 +103,16 @@ export class AdminUsersComponent implements OnInit, AfterViewInit { this.refreshUsers(); }, (reason) => { if (reason.message !== undefined) { - this.toastService.showError( `Une erreur est survenue lors de la modification de l'utilisateur : ${reason.message}`); + this.toastService.showError( `Une erreur est survenue lors de la modification des rôles de l'utilisateur : ${reason.message}`); } }); modalRef.componentInstance.roles.loginUser = user.login; - modalRef.componentInstance.roles.roleAdmin = user.authorities.find(function (obj: any) { - return obj.name === "ROLE_ADMIN"; - }) != undefined; - modalRef.componentInstance.roles.roleUser = user.authorities.find(function (obj: any) { - return obj.name === "ROLE_USER"; - }) != undefined; + modalRef.componentInstance.roles.roleAdmin = user.authorities.find((obj: any) => { + return obj.name === 'ROLE_ADMIN'; + }) !== undefined; + modalRef.componentInstance.roles.roleUser = user.authorities.find((obj: any) => { + return obj.name === 'ROLE_USER'; + }) !== undefined; } onClickModifyUser(user: User) { @@ -126,7 +125,7 @@ export class AdminUsersComponent implements OnInit, AfterViewInit { this.toastService.showError( `Une erreur est survenue lors de la modification de l'utilisateur : ${reason.message}`); } }); - modalRef.componentInstance.user = user; + modalRef.componentInstance.user = {...user}; modalRef.componentInstance.isUpdate = true; } diff --git a/src/app/admin-users/admin-users.module.ts b/src/app/admin-users/admin-users.module.ts index ef474bce6..4c6a0de67 100644 --- a/src/app/admin-users/admin-users.module.ts +++ b/src/app/admin-users/admin-users.module.ts @@ -4,8 +4,8 @@ import {SharedModule} from '../shared'; import {AdminUsersComponent} from './admin-users.component'; import {ModalUserComponent} from './modal-user/modal-user.component'; import {IconsModule} from '../icons'; -import {ModalRolesComponent} from "./modal-roles/modal-roles.component"; -import {NgxPaginationModule} from "ngx-pagination"; +import {ModalRolesComponent} from './modal-roles/modal-roles.component'; +import {NgxPaginationModule} from 'ngx-pagination'; @NgModule({ declarations: [AdminUsersComponent, ModalUserComponent, ModalRolesComponent], diff --git a/src/app/admin-users/modal-roles/modal-roles.component.ts b/src/app/admin-users/modal-roles/modal-roles.component.ts index 64ae08f11..7c3970711 100644 --- a/src/app/admin-users/modal-roles/modal-roles.component.ts +++ b/src/app/admin-users/modal-roles/modal-roles.component.ts @@ -1,13 +1,12 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Roles} from '../../core/models'; -import {UsersService} from '../../core/services'; +import {UsersService, Roles} from '../../core'; @Component({ selector: 'app-modal-roles', templateUrl: './modal-roles.component.html' }) -export class ModalRolesComponent implements OnInit { +export class ModalRolesComponent { isUpdate = false; title = 'Modifier les rôles d\'un utilisateur'; action = 'Modifier'; @@ -21,9 +20,6 @@ export class ModalRolesComponent implements OnInit { private usersService: UsersService) { } - ngOnInit() { - } - changeRoles() { this.usersService.updateRoles(this.roles).subscribe( user => { diff --git a/src/app/admin-users/modal-user/modal-user.component.ts b/src/app/admin-users/modal-user/modal-user.component.ts index afe90fe2f..546f28f4e 100644 --- a/src/app/admin-users/modal-user/modal-user.component.ts +++ b/src/app/admin-users/modal-user/modal-user.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {User} from '../../core/models'; -import {UsersService} from '../../core/services'; +import {UsersService, User} from '../../core'; @Component({ selector: 'app-modal-user', diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d7a9e23cc..71d6830e4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,10 +1,10 @@ import {NgModule} from '@angular/core'; import {PreloadAllModules, RouterModule, Routes} from '@angular/router'; -import {HomeComponent} from "./home/home.component"; -import {AuthGuard} from "./core/services"; -import {NoAuthGuard} from "./auth/no-auth-guard.service"; -import {AuthComponent} from "./auth/auth.component"; -import {SynthesisAccreditationRequest} from "./accreditation-requests/synthesis-accreditation-request.component"; +import {HomeComponent} from './home/home.component'; +import {AuthGuard} from './core'; +import {NoAuthGuard} from './auth/no-auth-guard.service'; +import {AuthComponent} from './auth/auth.component'; +import {SynthesisAccreditationRequestComponent} from './accreditation-requests/synthesis-accreditation-request.component'; const routes: Routes = [ @@ -98,7 +98,7 @@ const routes: Routes = [ }, { path: 'accreditations', - component: SynthesisAccreditationRequest, + component: SynthesisAccreditationRequestComponent, canActivate: [AuthGuard] }, { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 925ea29af..a46b9a245 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,10 @@ import {Component, OnInit} from '@angular/core'; import {GlobalSettingsService, UserService} from './core'; -import {TranslateService} from "@ngx-translate/core"; -import {OauthService} from "./security/oauth.service"; -import {environment} from "../environments/environment"; -import {Router} from "@angular/router"; +import {TranslateService} from '@ngx-translate/core'; +import {OauthService} from './security/oauth.service'; +import {environment} from '../environments/environment'; +import {Router} from '@angular/router'; @Component({ selector: 'app-root', @@ -28,19 +28,22 @@ export class AppComponent implements OnInit { ngOnInit() { if (!environment.jwt) { - this.oauthService.runInitialLoginSequence().then(() => { - - }).catch( + this.oauthService.runInitialLoginSequence().then().catch( (error) => { - console.log("error when run initial login sequence "+error); + console.error('error when run initial login sequence ' + error); this.router.navigateByUrl('/login'); } ); + }else { + this.userService.populate(); } - this.userService.populate(); + this.userService.isAuthenticated.subscribe((result) => { this.isAuthenticated = result; - if(result){ + if (result){ + if (!environment.jwt) { + this.userService.populate(); + } this.globalSettingsService.populateGlobalSetting(); } }, (error) => { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 19878a85f..07bc20ce6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,16 +12,15 @@ import {registerLocaleData} from '@angular/common'; import localeFr from '@angular/common/locales/fr'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {HomeModule} from './home/home.module'; -import {SecurityModule} from "./security/security.module"; -import {TranslateLoader, TranslateModule} from "@ngx-translate/core"; -import {HttpClient} from "@angular/common/http"; -import {TranslateHttpLoader} from "@ngx-translate/http-loader"; -import {AccreditationRequestModule} from "./accreditation-requests/accreditation-request.module"; -import {AngularSvgIconModule} from "angular-svg-icon"; -import {LogOut} from "angular-feather/icons"; +import {SecurityModule} from './security/security.module'; +import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; +import {HttpClient} from '@angular/common/http'; +import {TranslateHttpLoader} from '@ngx-translate/http-loader'; +import {AccreditationRequestModule} from './accreditation-requests/accreditation-request.module'; +import {AngularSvgIconModule} from 'angular-svg-icon'; export function HttpLoaderFactory(http: HttpClient) { - return new TranslateHttpLoader(http, "./assets/i18n/", ".json"); + return new TranslateHttpLoader(http, './assets/i18n/', '.json'); } registerLocaleData(localeFr); diff --git a/src/app/auth/auth.component.ts b/src/app/auth/auth.component.ts index babdfc85d..87dee4e56 100644 --- a/src/app/auth/auth.component.ts +++ b/src/app/auth/auth.component.ts @@ -3,8 +3,8 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {ActivatedRoute, Router} from '@angular/router'; import {ApiService, UserService} from '../core'; -import {OauthService} from "../security/oauth.service"; -import {environment} from "../../environments/environment"; +import {OauthService} from '../security/oauth.service'; +import {environment} from '../../environments/environment'; @Component({ selector: 'app-auth-page', @@ -36,18 +36,18 @@ export class AuthComponent implements OnInit { ngOnInit() { this.route.params.subscribe(params => { - if (params['referer']){ - this.referer = params['referer']; + if (params.referer){ + this.referer = params.referer; } }); - this.apiService.get('/csrf').subscribe((result) => { - console.log('csrf'); - }, (error) => {}); + this.apiService.get('/csrf').subscribe(() => { + console.debug('csrf'); + }); } submitForm() { - if(!this.jwt) { + if (!this.jwt) { this.oauthService.login(this.referer); }else { diff --git a/src/app/auth/no-auth-guard.service.ts b/src/app/auth/no-auth-guard.service.ts index 5de5d59ed..a37ea9dc7 100644 --- a/src/app/auth/no-auth-guard.service.ts +++ b/src/app/auth/no-auth-guard.service.ts @@ -20,7 +20,7 @@ export class NoAuthGuard implements CanActivate { if(isAuth){ this.router.navigateByUrl('/home'); } - return !isAuth + return !isAuth; })); } diff --git a/src/app/batchs/batchs-routing.module.ts b/src/app/batchs/batchs-routing.module.ts index ab3508740..74c99505e 100644 --- a/src/app/batchs/batchs-routing.module.ts +++ b/src/app/batchs/batchs-routing.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; import {BatchsComponent} from './batchs.component'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; const routes: Routes = [ { diff --git a/src/app/batchs/batchs.component.ts b/src/app/batchs/batchs.component.ts index b7b5c74fb..436a99649 100644 --- a/src/app/batchs/batchs.component.ts +++ b/src/app/batchs/batchs.component.ts @@ -1,13 +1,11 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {BatchsService, EnvironmentsService} from '../core/services'; -import {Batch, Environment, InfoEnvironment} from '../core/models'; +import {Batch, Environment, InfoEnvironment, BatchsService, EnvironmentsService} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalRunWithParametersComponent} from './modal-run-with-parameters/modal-run-with-parameters.component'; import {Constants} from '../shared/Constants'; import {DataTableDirective} from 'angular-datatables'; import {Subject} from 'rxjs'; import {ToastService} from '../core/services/toast.service'; -import {RxStompService} from '@stomp/ng2-stompjs'; @Component({ selector: 'app-batchs-page', @@ -104,14 +102,13 @@ export class BatchsComponent implements AfterViewInit, OnDestroy, OnInit { modalRef.result.then((parameters) => { this.runBatch(batch, false, parameters); }, (reason) => { - console.log(`Dismissed ${reason}`); + console.debug(`Dismissed ${reason}`); }); modalRef.componentInstance.batchName = batch.name; modalRef.componentInstance.parameters = batch.defaultParam; } runBatch(batch: Batch, defaultParams: boolean, param?: string) { - this.toastService.showInfo('Votre batch vient d\'être lancé'); const apiParams: any = {env: this.environmentSelected.id}; @@ -124,16 +121,11 @@ export class BatchsComponent implements AfterViewInit, OnDestroy, OnInit { } this.batchsService.run(batch.id, apiParams).subscribe( - trace => { - if (trace.returnCode === 0) { - this.toastService.showSuccess('Le batch ' + batch.name + ' s\'est terminé avec le code ' + trace.returnCode); - } else { - this.toastService.showError('Le batch ' + batch.name + ' s\'est terminé avec le code ' + trace.returnCode); - } + id => { + this.toastService.showSuccess('Le batch ' + batch.name + ' vient d\'être lancé'); }, err => { this.toastService.showError(err || 'Une erreur est survenue'); - } ); } diff --git a/src/app/batchs/batchs.module.ts b/src/app/batchs/batchs.module.ts index d40ea1ba1..6c7951307 100644 --- a/src/app/batchs/batchs.module.ts +++ b/src/app/batchs/batchs.module.ts @@ -4,8 +4,8 @@ import {BatchsRoutingModule} from './batchs-routing.module'; import {SharedModule} from '../shared'; import {IconsModule} from '../icons'; import {ModalRunWithParametersComponent} from './modal-run-with-parameters/modal-run-with-parameters.component'; -import {NgbPaginationModule} from "@ng-bootstrap/ng-bootstrap"; -import {DataTablesModule} from "angular-datatables"; +import {NgbPaginationModule} from '@ng-bootstrap/ng-bootstrap'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [BatchsComponent, ModalRunWithParametersComponent], diff --git a/src/app/chains/chains-routing.module.ts b/src/app/chains/chains-routing.module.ts index 0158540d7..4c99d5b5e 100644 --- a/src/app/chains/chains-routing.module.ts +++ b/src/app/chains/chains-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ChainsComponent} from './chains.component'; const routes: Routes = [ diff --git a/src/app/chains/chains.component.ts b/src/app/chains/chains.component.ts index 5ff5dbaef..b468721c7 100644 --- a/src/app/chains/chains.component.ts +++ b/src/app/chains/chains.component.ts @@ -1,10 +1,9 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Chain, Environment, InfoEnvironment} from '../core/models'; -import {ChainsService, EnvironmentsService} from '../core/services'; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {Constants} from "../shared/Constants"; -import {ToastService} from "../core/services/toast.service"; +import {ChainsService, EnvironmentsService, Chain, Environment, InfoEnvironment} from '../core'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {Constants} from '../shared/Constants'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-chains', @@ -37,14 +36,14 @@ export class ChainsComponent implements AfterViewInit, OnDestroy, OnInit { ajax: (dataTablesParameters: any, callback) => { if (!this.environmentSelected) { this.chains = []; - return + return; } this.chainsService .getAllFromEnvironment(this.environmentSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -93,15 +92,9 @@ export class ChainsComponent implements AfterViewInit, OnDestroy, OnInit { } runChain(chain) { - this.toastService.showInfo('Votre chaine vient d\'être lancée'); - this.chainsService.run(chain.id).subscribe( - trace => { - if (trace.returnCode === 0) { - this.toastService.showSuccess('La chaine ' + chain.name + ' s\'est terminée avec le code ' + trace.returnCode); - } else { - this.toastService.showError( 'Le chaine ' + chain.name + ' s\'est terminée avec le code ' + trace.returnCode); - } + () => { + this.toastService.showSuccess('La chaine ' + chain.name + ' vient d\'être lancée'); }, err => { this.toastService.showError( err || 'Une erreur est survenue'); diff --git a/src/app/chains/chains.module.ts b/src/app/chains/chains.module.ts index 361367684..b3802f786 100644 --- a/src/app/chains/chains.module.ts +++ b/src/app/chains/chains.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {ChainsComponent} from './chains.component'; import {ChainsRoutingModule} from './chains-routing.module'; import {SharedModule} from '../shared'; -import {DataTablesModule} from "angular-datatables"; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ChainsComponent], diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 12a496567..e8cb808a6 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -26,8 +26,8 @@ import { } from './services'; import {TracesService} from './services/traces.service'; import {FileKindsService} from './services/file-kinds.service'; -import {RoleService} from "./services/role.service"; -import {SchedulingsService} from "./services/schedulings.service"; +import {RoleService} from './services/role.service'; +import {SchedulingsService} from './services/schedulings.service'; @NgModule({ imports: [ diff --git a/src/app/core/interceptors/http.token.interceptor.ts b/src/app/core/interceptors/http.token.interceptor.ts index 0ba63687b..3dcd3e6e8 100644 --- a/src/app/core/interceptors/http.token.interceptor.ts +++ b/src/app/core/interceptors/http.token.interceptor.ts @@ -1,10 +1,10 @@ import {Injectable} from '@angular/core'; -import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest,} from '@angular/common/http'; +import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, } from '@angular/common/http'; import {Observable, throwError} from 'rxjs'; import {JwtService, UserService} from '../services'; -import {catchError} from "rxjs/operators"; -import {Router} from "@angular/router"; +import {catchError} from 'rxjs/operators'; +import {Router} from '@angular/router'; @Injectable() export class HttpTokenInterceptor implements HttpInterceptor { @@ -15,17 +15,13 @@ export class HttpTokenInterceptor implements HttpInterceptor { intercept(req: HttpRequest, next: HttpHandler): Observable> { const headersConfig = { - 'Accept': 'application/json' - }; + Accept: 'application/json' + } as any; const token = this.jwtService.getToken(); if (token) { - headersConfig['Authorization'] = `Bearer ${token}`; - } - - if (!(req.body instanceof FormData)) { - headersConfig['Content-Type'] = 'application/json'; + headersConfig.Authorization = `Bearer ${token}`; } const request = req.clone({setHeaders: headersConfig}); diff --git a/src/app/core/models/accreditation-request.model.ts b/src/app/core/models/accreditation-request.model.ts index 1ce514f81..95373b935 100644 --- a/src/app/core/models/accreditation-request.model.ts +++ b/src/app/core/models/accreditation-request.model.ts @@ -1,6 +1,6 @@ import {Audit} from './audit.model'; -import {User} from "./user.model"; -import {Application} from "./application.model"; +import {User} from './user.model'; +import {Application} from './application.model'; export interface AccreditationRequest extends Audit { id: number; diff --git a/src/app/core/models/index.ts b/src/app/core/models/index.ts index 064664cdb..ae9fc9b77 100644 --- a/src/app/core/models/index.ts +++ b/src/app/core/models/index.ts @@ -19,10 +19,10 @@ export * from './errors.model'; export * from './profile.model'; export * from './directory.model'; export * from './file.model'; -export * from './usage-application.model' -export * from './notification.model' -export * from './roles.model' -export * from './global-setting.model' -export * from './creation-accreditation-request.model' -export * from './accreditation-request.model' -export * from './response-accreditation-request.model' +export * from './usage-application.model'; +export * from './notification.model'; +export * from './roles.model'; +export * from './global-setting.model'; +export * from './creation-accreditation-request.model'; +export * from './accreditation-request.model'; +export * from './response-accreditation-request.model'; diff --git a/src/app/core/models/job.model.ts b/src/app/core/models/job.model.ts new file mode 100644 index 000000000..3b52feb32 --- /dev/null +++ b/src/app/core/models/job.model.ts @@ -0,0 +1,3 @@ +export interface Job { + id: number; +} diff --git a/src/app/core/models/pageable.model.ts b/src/app/core/models/pageable.model.ts index 704ebef99..d85037b74 100644 --- a/src/app/core/models/pageable.model.ts +++ b/src/app/core/models/pageable.model.ts @@ -11,7 +11,7 @@ export class Pageable { constructor(pageNumber?: number, pageSize?: number, sort?: string){ this.page = pageNumber; this.size = pageSize; - if(sort) { + if (sort) { this.sort = sort; } } diff --git a/src/app/core/models/scheduling.model.ts b/src/app/core/models/scheduling.model.ts index bca100c1e..1797f4674 100644 --- a/src/app/core/models/scheduling.model.ts +++ b/src/app/core/models/scheduling.model.ts @@ -1,6 +1,6 @@ import {Audit} from './audit.model'; import {Environment} from './environment.model'; -import {Batch} from "./batch.model"; +import {Batch} from './batch.model'; export interface Scheduling extends Audit { id: number; diff --git a/src/app/core/models/statistics.model.ts b/src/app/core/models/statistics.model.ts index 1b73eb91f..2a29c963f 100644 --- a/src/app/core/models/statistics.model.ts +++ b/src/app/core/models/statistics.model.ts @@ -1,4 +1,4 @@ -import {StatisticsByDay} from "./statisticsByDay.model"; +import {StatisticsByDay} from './statisticsByDay.model'; export interface Statistics { usersNbr: number; diff --git a/src/app/core/models/statisticsByDay.model.ts b/src/app/core/models/statisticsByDay.model.ts index 0e125bb64..d795fa066 100644 --- a/src/app/core/models/statisticsByDay.model.ts +++ b/src/app/core/models/statisticsByDay.model.ts @@ -1,5 +1,5 @@ export interface StatisticsByDay { - date: string, - nbr: number, - executionTime: number + date: string; + nbr: number; + executionTime: number; } diff --git a/src/app/core/models/usage-application.model.ts b/src/app/core/models/usage-application.model.ts index 5865406ba..322f3b30e 100644 --- a/src/app/core/models/usage-application.model.ts +++ b/src/app/core/models/usage-application.model.ts @@ -1,4 +1,4 @@ -import {User} from "./user.model"; +import {User} from './user.model'; export interface UsageApplication { applicationId: number; diff --git a/src/app/core/models/user.model.ts b/src/app/core/models/user.model.ts index e4068a11a..3f7cf40c4 100644 --- a/src/app/core/models/user.model.ts +++ b/src/app/core/models/user.model.ts @@ -1,6 +1,6 @@ import {Audit} from './audit.model'; import {Account} from './account.model'; -import {UsageApplication} from "./usage-application.model"; +import {UsageApplication} from './usage-application.model'; export interface User extends Account, Audit { id: number; diff --git a/src/app/core/services/accreditation-requests.service.ts b/src/app/core/services/accreditation-requests.service.ts index 60d75da8a..42bb0dda3 100644 --- a/src/app/core/services/accreditation-requests.service.ts +++ b/src/app/core/services/accreditation-requests.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {AccreditationRequest, CreationAccreditationRequest, ResponseAccreditationRequest} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class AccreditationRequestsService { @@ -14,11 +14,11 @@ export class AccreditationRequestsService { ) { } - getAllNeedAnswer(pageable: any = new Pageable(0,20)): Observable> { + getAllNeedAnswer(pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}/need-answer`, pageable); } - getAllMyRequests(pageable: any = new Pageable(0,20)): Observable> { + getAllMyRequests(pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}`, pageable); } diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts index e42f4ef02..8068bc475 100644 --- a/src/app/core/services/api.service.ts +++ b/src/app/core/services/api.service.ts @@ -1,10 +1,7 @@ import {Injectable} from '@angular/core'; import {environment} from '../../../environments/environment'; import {HttpClient, HttpParams} from '@angular/common/http'; -import {Observable, throwError} from 'rxjs'; - -import {JwtService} from './jwt.service'; -import {catchError} from 'rxjs/operators'; +import {Observable} from 'rxjs'; @Injectable() export class ApiService { @@ -15,27 +12,35 @@ export class ApiService { get(path: string, params: any = new HttpParams()): Observable { - return this.http.get(`${environment.apiUrl}${path}`, {params}); + return this.http.get(`${environment.apiUrl}${path}`, {params, headers: {'Content-Type': 'application/json'}}); } put(path: string, body: object = {}): Observable { return this.http.put( `${environment.apiUrl}${path}`, - JSON.stringify(body) + JSON.stringify(body), { + headers: {'Content-Type': 'application/json'} + } ); } patch(path: string, body: object = {}): Observable { return this.http.patch( `${environment.apiUrl}${path}`, - JSON.stringify(body) + JSON.stringify(body), + { + headers: {'Content-Type': 'application/json'} + } ); } post(path: string, body: object = {}): Observable { return this.http.post( `${environment.apiUrl}${path}`, - JSON.stringify(body) + JSON.stringify(body), + { + headers: {'Content-Type': 'application/json'} + } ); } @@ -47,7 +52,10 @@ export class ApiService { delete(path): Observable { return this.http.delete( - `${environment.apiUrl}${path}` + `${environment.apiUrl}${path}`, + { + headers: {'Content-Type': 'application/json'} + } ); } } diff --git a/src/app/core/services/applications.service.ts b/src/app/core/services/applications.service.ts index b9337221c..55ad8d199 100644 --- a/src/app/core/services/applications.service.ts +++ b/src/app/core/services/applications.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {Application, UsageApplication, User} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class ApplicationsService { @@ -18,19 +18,19 @@ export class ApplicationsService { return this.apiService.post(`${this.apiName}/import-all`); } - getAll(pageable: Pageable = new Pageable(0,20)): Observable> { + getAll(pageable: Pageable = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}`, pageable); } - search(pageable: Pageable = new Pageable(0,20), name: string): Observable> { + search(pageable: Pageable = new Pageable(0, 20), name: string): Observable> { return this.apiService.get(`${this.apiName}/search?name=${name}`, pageable); } - getAllModerable(pageable: Pageable = new Pageable(0,20)): Observable> { + getAllModerable(pageable: Pageable = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}/write`, pageable); } - getAllManage(pageable: any = new Pageable(0,20)): Observable> { + getAllManage(pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}/gestion`, pageable); } @@ -54,7 +54,7 @@ export class ApplicationsService { return this.apiService.get(`${this.apiName}/moderators/${applicationId}`); } - getUsageFromApplication(applicationId: number, pageable: Pageable = new Pageable(0,20)): Observable> { + getUsageFromApplication(applicationId: number, pageable: Pageable = new Pageable(0, 20)): Observable> { return this.apiService.get(`${this.apiName}/${applicationId}/usages`, pageable); } } diff --git a/src/app/core/services/auth-guard.service.ts b/src/app/core/services/auth-guard.service.ts index 30d3b8119..8fe829ccb 100644 --- a/src/app/core/services/auth-guard.service.ts +++ b/src/app/core/services/auth-guard.service.ts @@ -3,9 +3,9 @@ import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from ' import {UserService} from './user.service'; import {take, tap} from 'rxjs/operators'; -import {environment} from "../../../environments/environment"; -import {Observable} from "rxjs"; -import {OauthService} from "../../security/oauth.service"; +import {environment} from '../../../environments/environment'; +import {Observable} from 'rxjs'; +import {OauthService} from '../../security/oauth.service'; @Injectable() export class AuthGuard implements CanActivate { @@ -20,8 +20,8 @@ export class AuthGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): boolean | Observable{ - if(environment.jwt) { - console.log('can activate ' + state.url); + if (environment.jwt) { + console.debug('can activate ' + state.url); let canActivate = false; this.userService.isAuthenticated.pipe(take(1)).subscribe( (isAuthenticated: boolean) => { @@ -37,11 +37,11 @@ export class AuthGuard implements CanActivate { ); return canActivate; }else { - console.log("canActivate oauth"); + console.debug('canActivate oauth'); return this.oauthService.canActivateProtectedRoutes$ .pipe(tap(x => { console.log('You tried to go to ' + state.url + ' and this guard said ' + x); - if(!x){ + if (!x){ this.router.navigate(['login', {referer: state.url}]); } })); diff --git a/src/app/core/services/batchs.service.ts b/src/app/core/services/batchs.service.ts index 90a029b7c..19e379409 100644 --- a/src/app/core/services/batchs.service.ts +++ b/src/app/core/services/batchs.service.ts @@ -2,9 +2,10 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {ApiService} from './api.service'; -import {Batch, Trace} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Batch} from '../models'; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; +import {Job} from '../models/job.model'; @Injectable() export class BatchsService { @@ -13,11 +14,11 @@ export class BatchsService { ) { } - getAllFromEnvironment(idEnvironment: number, pageable: any = new Pageable(0,20)): Observable> { + getAllFromEnvironment(idEnvironment: number, pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/batchs?environnements.id=${idEnvironment}`, pageable); } - getAllFromApplication(idApplication: number, pageable: any = new Pageable(0,20)): Observable> { + getAllFromApplication(idApplication: number, pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/batchs?environnements.application.id=${idApplication}`, pageable); } @@ -25,7 +26,7 @@ export class BatchsService { return this.apiService.get('/batchs/' + slug); } - run(slug, params): Observable { + run(slug, params): Observable { return this.apiService.get('/batchs/run/' + slug, params); } diff --git a/src/app/core/services/chains.service.ts b/src/app/core/services/chains.service.ts index 472bbb6a5..75dadbde3 100644 --- a/src/app/core/services/chains.service.ts +++ b/src/app/core/services/chains.service.ts @@ -2,9 +2,10 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {ApiService} from './api.service'; -import {Chain, Trace} from '../models'; -import {Pageable} from "../models/pageable.model"; -import {Page} from "../models/page.model"; +import {Chain} from '../models'; +import {Pageable} from '../models/pageable.model'; +import {Page} from '../models/page.model'; +import {Job} from '../models/job.model'; @Injectable() export class ChainsService { @@ -14,7 +15,7 @@ export class ChainsService { ) { } - getAllFromEnvironment(environmentId, pageable: any = new Pageable(0,20)): Observable> { + getAllFromEnvironment(environmentId, pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/${this.apiName}/env/${environmentId}`, pageable); } @@ -22,7 +23,7 @@ export class ChainsService { return this.apiService.get(`/${this.apiName}/` + chainId); } - run(chainId): Observable { + run(chainId): Observable { return this.apiService.post(`/${this.apiName}/${chainId}/run`); } diff --git a/src/app/core/services/environments.service.ts b/src/app/core/services/environments.service.ts index 27910a2a8..e6fde1707 100644 --- a/src/app/core/services/environments.service.ts +++ b/src/app/core/services/environments.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {Environment, InfoEnvironment} from '../models'; -import {Pageable} from "../models/pageable.model"; -import {Page} from "../models/page.model"; +import {Pageable} from '../models/pageable.model'; +import {Page} from '../models/page.model'; @Injectable() export class EnvironmentsService { @@ -18,8 +18,8 @@ export class EnvironmentsService { return this.apiService.get(`${this.apiName}/${slug}`); } - getEnvironmentFromApp(appId: number, pageable: any = new Pageable(0,20)): Observable> { - return this.apiService.get(`${this.apiName}?applicationId=${appId}`,pageable); + getEnvironmentFromApp(appId: number, pageable: any = new Pageable(0, 20)): Observable> { + return this.apiService.get(`${this.apiName}?applicationId=${appId}`, pageable); } getInfo(slug): Observable { diff --git a/src/app/core/services/file-kinds.service.ts b/src/app/core/services/file-kinds.service.ts index 393d93302..fcd705e64 100644 --- a/src/app/core/services/file-kinds.service.ts +++ b/src/app/core/services/file-kinds.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {FileKind} from '../models/file-kind.model'; -import {Pageable} from "../models/pageable.model"; -import {Page} from "../models/page.model"; +import {Pageable} from '../models/pageable.model'; +import {Page} from '../models/page.model'; @Injectable() export class FileKindsService { @@ -14,8 +14,8 @@ export class FileKindsService { ) { } - getAllFromApplication(applicationId, pageable: any = new Pageable(0,20)): Observable> { - return this.apiService.get(`/${this.apiName}/application/${applicationId}`,pageable); + getAllFromApplication(applicationId, pageable: any = new Pageable(0, 20)): Observable> { + return this.apiService.get(`/${this.apiName}/application/${applicationId}`, pageable); } addNaming(fileKinds: FileKind): Observable { diff --git a/src/app/core/services/files.service.ts b/src/app/core/services/files.service.ts index 49d347156..3845fe4df 100644 --- a/src/app/core/services/files.service.ts +++ b/src/app/core/services/files.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {Directory, File} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class FilesService { @@ -13,7 +13,7 @@ export class FilesService { ) { } - getAllFromEnvironment(envId, pageable: any = new Pageable(0,20)): Observable> { + getAllFromEnvironment(envId, pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/directories/env/${envId}`, pageable); } @@ -31,8 +31,8 @@ export class FilesService { getAllFilesFromDirectory(slug, subDir?: string): Observable { let param; - if(subDir && subDir != ''){ - param = {'subDirectory': subDir} + if (subDir && subDir !== ''){ + param = {subDirectory: subDir}; } return this.apiService.get(`/directories/files/${slug}`, param); } @@ -42,16 +42,16 @@ export class FilesService { } downloadFile(file): Observable { - return this.apiService.postFile(`/directories/files/read`, file, {responseType: 'arraybuffer'}); + return this.apiService.postFile(`/directories/files/read`, file, {responseType: 'arraybuffer', headers: {'Content-Type': 'application/json'}}); } uploadFile(file, name, idDirectory, subDirectory?): Observable { const formData = new FormData(); formData.append('directory', idDirectory); formData.append('file', file, name); - if(subDirectory) { + if (subDirectory) { formData.append('subDirectory', subDirectory); } - return this.apiService.postFile(`/directories/files/upload`, formData); + return this.apiService.postFile(`/directories/files/upload`, formData, {}); } } diff --git a/src/app/core/services/global-settings.service.ts b/src/app/core/services/global-settings.service.ts index 2cec6f198..81da7ac73 100644 --- a/src/app/core/services/global-settings.service.ts +++ b/src/app/core/services/global-settings.service.ts @@ -1,14 +1,14 @@ import {Injectable} from '@angular/core'; import {ApiService} from './api.service'; -import {File, GlobalSetting} from '../models'; -import {Observable} from "rxjs"; +import {GlobalSetting} from '../models'; +import {Observable} from 'rxjs'; @Injectable() export class GlobalSettingsService { private globalSettings: GlobalSetting[]; - private mapSettings: Map; + private mapSettings: Map; private apiName = '/global-settings'; @@ -20,11 +20,11 @@ export class GlobalSettingsService { (globalSettings) => { this.globalSettings = globalSettings; this.mapSettings = new Map(); - for(let globalSetting of this.globalSettings){ + for (const globalSetting of this.globalSettings){ this.mapSettings.set(globalSetting.key, globalSetting.value); } }, - (error) => console.log(error) + (error) => console.error(error) ); } @@ -32,23 +32,23 @@ export class GlobalSettingsService { return this.apiService.get(`${this.apiName}`); } - changeValue(key: String, value: String): Observable { - return this.apiService.post(`${this.apiName}/${key}`,{value: value}); + changeValue(key: string, value: string): Observable { + return this.apiService.post(`${this.apiName}/${key}`, {value}); } importEnvironmentIsEnable(): boolean{ - return JSON.parse(this.mapSettings.get("ENVIRONMENT_IMPORT_ENABLED").toLowerCase()); + return JSON.parse(this.mapSettings.get('ENVIRONMENT_IMPORT_ENABLED').toLowerCase()); } importApplicationIsEnable(): boolean{ - return JSON.parse(this.mapSettings.get("APPLICATION_IMPORT_ENABLED").toLowerCase()); + return JSON.parse(this.mapSettings.get('APPLICATION_IMPORT_ENABLED').toLowerCase()); } createApplicationIsEnable(): boolean{ - return JSON.parse(this.mapSettings.get("APPLICATION_CREATE_ENABLED").toLowerCase()); + return JSON.parse(this.mapSettings.get('APPLICATION_CREATE_ENABLED').toLowerCase()); } createEnvironmentIsEnable(): boolean{ - return JSON.parse(this.mapSettings.get("ENVIRONMENT_CREATE_ENABLED").toLowerCase()); + return JSON.parse(this.mapSettings.get('ENVIRONMENT_CREATE_ENABLED').toLowerCase()); } } diff --git a/src/app/core/services/index.ts b/src/app/core/services/index.ts index a2e7cde8c..b2cb82bba 100644 --- a/src/app/core/services/index.ts +++ b/src/app/core/services/index.ts @@ -16,7 +16,7 @@ export * from './files.service'; export * from './norms.service'; export * from './users.service'; export * from './news.service'; -export * from './notifications.service' -export * from './global-settings.service' -export * from './accreditation-requests.service' -export * from './select-choices.service' +export * from './notifications.service'; +export * from './global-settings.service'; +export * from './accreditation-requests.service'; +export * from './select-choices.service'; diff --git a/src/app/core/services/navigation.service.ts b/src/app/core/services/navigation.service.ts deleted file mode 100644 index 39daebd01..000000000 --- a/src/app/core/services/navigation.service.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Application, Environment} from "../models"; - -@Injectable() -export class NavigationService { - private application: Application; - private environment: Environment; - - constructor() {} - -} diff --git a/src/app/core/services/news.service.ts b/src/app/core/services/news.service.ts index 61793fae5..03dd29517 100644 --- a/src/app/core/services/news.service.ts +++ b/src/app/core/services/news.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {New} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class NewsService { @@ -14,12 +14,12 @@ export class NewsService { ) { } - getAllPublic(pageable: Pageable = new Pageable(0,20)): Observable> { - return this.apiService.get(`${this.apiName}/public`,pageable); + getAllPublic(pageable: Pageable = new Pageable(0, 20)): Observable> { + return this.apiService.get(`${this.apiName}/public`, pageable); } - getAll(pageable: any = new Pageable(0,20)): Observable> { - return this.apiService.get(`${this.apiName}`,pageable); + getAll(pageable: any = new Pageable(0, 20)): Observable> { + return this.apiService.get(`${this.apiName}`, pageable); } addNew(oneNew: New): Observable { diff --git a/src/app/core/services/norms.service.ts b/src/app/core/services/norms.service.ts index 36bb47c6f..5fab4106b 100644 --- a/src/app/core/services/norms.service.ts +++ b/src/app/core/services/norms.service.ts @@ -3,8 +3,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {Norme} from '../models'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class NormsService { @@ -13,11 +13,11 @@ export class NormsService { ) { } - getAll(pageable: any = new Pageable(0,20)): Observable> { + getAll(pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/norms`, pageable); } - getAllName(pageable: Pageable = new Pageable(0,20)): Observable> { + getAllName(pageable: Pageable = new Pageable(0, 20)): Observable> { return this.apiService.get(`/norms/name`, pageable); } diff --git a/src/app/core/services/notifications.service.ts b/src/app/core/services/notifications.service.ts index 0de70c0cd..13add5b92 100644 --- a/src/app/core/services/notifications.service.ts +++ b/src/app/core/services/notifications.service.ts @@ -2,7 +2,7 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {ApiService} from './api.service'; -import {Notification} from "../models"; +import {Notification} from '../models'; @Injectable() export class NotificationsService { diff --git a/src/app/core/services/profiles.service.ts b/src/app/core/services/profiles.service.ts index deca6e245..4a424515b 100644 --- a/src/app/core/services/profiles.service.ts +++ b/src/app/core/services/profiles.service.ts @@ -7,7 +7,7 @@ import {map} from 'rxjs/operators'; @Injectable() export class ProfilesService { - constructor ( + constructor( private apiService: ApiService ) {} diff --git a/src/app/core/services/role.service.ts b/src/app/core/services/role.service.ts index 519e34af7..0fd4d509d 100644 --- a/src/app/core/services/role.service.ts +++ b/src/app/core/services/role.service.ts @@ -1,11 +1,9 @@ import {Injectable} from '@angular/core'; -import {User} from "../models"; +import {User} from '../models'; @Injectable() export class RoleService { - constructor() { - } isModo(user: User): boolean { if (user.usageApplications === undefined) { @@ -21,7 +19,7 @@ export class RoleService { hasThisRole(role: string, user: User): boolean { const roles = user.authorities; - if (role === "ROLE_MODO") { + if (role === 'ROLE_MODO') { return this.isModo(user); } @@ -29,7 +27,7 @@ export class RoleService { return false; } - const result = roles.find(function (obj: any) { + const result = roles.find((obj: any) => { return obj.name === role; }); diff --git a/src/app/core/services/schedulings.service.ts b/src/app/core/services/schedulings.service.ts index c82ac4daf..013e75b1f 100644 --- a/src/app/core/services/schedulings.service.ts +++ b/src/app/core/services/schedulings.service.ts @@ -2,10 +2,10 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; import {ApiService} from './api.service'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; -import {Scheduling} from "../models/scheduling.model"; -import {CreationScheduling} from "../models/creation-scheduling.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; +import {Scheduling} from '../models/scheduling.model'; +import {CreationScheduling} from '../models/creation-scheduling.model'; @Injectable() export class SchedulingsService { @@ -14,7 +14,7 @@ export class SchedulingsService { ) { } - getAllFromEnvironment(idEnvironment: number, pageable: any = new Pageable(0,20)): Observable> { + getAllFromEnvironment(idEnvironment: number, pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/schedulings/env/${idEnvironment}`, pageable); } diff --git a/src/app/core/services/select-choices.service.ts b/src/app/core/services/select-choices.service.ts index 05b05f82f..28007ccb9 100644 --- a/src/app/core/services/select-choices.service.ts +++ b/src/app/core/services/select-choices.service.ts @@ -1,16 +1,16 @@ import {Injectable} from '@angular/core'; -import {Application, Environment} from "../models"; +import {Application, Environment} from '../models'; @Injectable() export class SelectChoicesService { selectApp(application: Application){ - if(!application){ + if (!application){ window.localStorage.removeItem('applicationSelected'); return; } - window.localStorage.setItem('applicationSelected', application.id+''); + window.localStorage.setItem('applicationSelected', application.id + ''); } getSelectedApp(): string{ @@ -18,11 +18,11 @@ export class SelectChoicesService { } selectEnv(environment: Environment){ - if(!environment){ + if (!environment){ window.localStorage.removeItem('environmentSelected'); return; } - window.localStorage.setItem('environmentSelected', environment.id+''); + window.localStorage.setItem('environmentSelected', environment.id + ''); } getSelectedEnv(): string{ diff --git a/src/app/core/services/statistics.service.ts b/src/app/core/services/statistics.service.ts index 9b4ac8486..48cba911a 100644 --- a/src/app/core/services/statistics.service.ts +++ b/src/app/core/services/statistics.service.ts @@ -7,7 +7,7 @@ import {Statistics} from '../models'; @Injectable() export class StatisticsService { - constructor ( + constructor( private apiService: ApiService ) {} diff --git a/src/app/core/services/tags.service.ts b/src/app/core/services/tags.service.ts index e23aedc26..eee60a7ef 100644 --- a/src/app/core/services/tags.service.ts +++ b/src/app/core/services/tags.service.ts @@ -6,7 +6,7 @@ import {map} from 'rxjs/operators'; @Injectable() export class TagsService { - constructor ( + constructor( private apiService: ApiService ) {} diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 82884ad2f..5424bbf74 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -46,7 +46,7 @@ export class UserService { }, err => this.purgeAuth() ); - } else if(environment.jwt) { + } else if (environment.jwt) { // Remove any potential remnants of previous auth states this.purgeAuth(); } @@ -75,7 +75,7 @@ export class UserService { purgeAuth() { this.rxStompService.deactivate(); - if(!environment.jwt) { + if (!environment.jwt) { this.oauthService.logout(); } // Remove JWT from localstorage diff --git a/src/app/core/services/users.service.ts b/src/app/core/services/users.service.ts index 3bcae6195..c83d3d2c6 100644 --- a/src/app/core/services/users.service.ts +++ b/src/app/core/services/users.service.ts @@ -4,8 +4,8 @@ import {Observable} from 'rxjs'; import {ApiService} from './api.service'; import {Roles, User} from '../models'; import {UserApplication} from '../models/user-application.model'; -import {Page} from "../models/page.model"; -import {Pageable} from "../models/pageable.model"; +import {Page} from '../models/page.model'; +import {Pageable} from '../models/pageable.model'; @Injectable() export class UsersService { @@ -14,7 +14,7 @@ export class UsersService { ) { } - getAll(pageable: any = new Pageable(0,20)): Observable> { + getAll(pageable: any = new Pageable(0, 20)): Observable> { return this.apiService.get(`/users`, pageable); } diff --git a/src/app/files/files-routing.module.ts b/src/app/files/files-routing.module.ts index 4a2847d85..38495af06 100644 --- a/src/app/files/files-routing.module.ts +++ b/src/app/files/files-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {FilesComponent} from './files.component'; const routes: Routes = [ diff --git a/src/app/files/files.component.ts b/src/app/files/files.component.ts index afc571788..409281a8a 100644 --- a/src/app/files/files.component.ts +++ b/src/app/files/files.component.ts @@ -1,13 +1,12 @@ import {Component, OnInit} from '@angular/core'; import {FileSystemDirectoryEntry, FileSystemFileEntry} from 'ngx-file-drop'; -import {EventSelectChangeModel, Option, Select} from '../shared/head-selector'; -import {Application, Directory, Environment, File} from '../core/models'; -import {ApplicationsService, EnvironmentsService, FilesService} from '../core/services'; +import {EventSelectChangeModel, Option, Select} from '../shared'; +import {ApplicationsService, EnvironmentsService, FilesService, Application, Directory, Environment, File} from '../core'; import * as FileSaver from 'file-saver'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalRenameComponent} from './modal-rename/modal-rename.component'; -import {Pageable} from "../core/models/pageable.model"; -import {ToastService} from "../core/services/toast.service"; +import {Pageable} from '../core/models/pageable.model'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-files', @@ -48,9 +47,9 @@ export class FilesComponent implements OnInit { refreshRemoteFiles() { - let subDirectoryParam = ""; + let subDirectoryParam = ''; this.subDir.forEach(dir => { - subDirectoryParam += "/" + dir; + subDirectoryParam += '/' + dir; }); this.remoteFiles = []; this.filesService.getAllFilesFromDirectory(this.directorySelected.id, subDirectoryParam) @@ -134,9 +133,8 @@ export class FilesComponent implements OnInit { //// UPLOAD //// - //FIXME UPLOAD EVENT + // FIXME UPLOAD EVENT public dropped(event: any) { - console.log(event); for (const droppedFile of event) { // Is it a file? @@ -202,9 +200,9 @@ export class FilesComponent implements OnInit { } upload() { - let subDirectoryParam = ""; + let subDirectoryParam = ''; this.subDir.forEach(dir => { - subDirectoryParam += "/" + dir; + subDirectoryParam += '/' + dir; }); for (const file of this.localFiles) { this.filesService.uploadFile(file, file.customName, this.directorySelected.id, subDirectoryParam).subscribe( @@ -222,18 +220,18 @@ export class FilesComponent implements OnInit { exploreParentDirectory(): void { this.subDir.pop(); - this.explore() + this.explore(); } exploreChildDirectory(remoteDir: File): void { - this.subDir.push(remoteDir.name) - this.explore() + this.subDir.push(remoteDir.name); + this.explore(); } explore(): void { - let subDirectoryParam = ""; + let subDirectoryParam = ''; this.subDir.forEach(dir => { - subDirectoryParam += "/" + dir; + subDirectoryParam += '/' + dir; }); this.filesService.getAllFilesFromDirectory(this.directorySelected.id, subDirectoryParam).subscribe((files) => this.remoteFiles = files); } diff --git a/src/app/files/files.module.ts b/src/app/files/files.module.ts index 428d72dc0..0cecbbb68 100644 --- a/src/app/files/files.module.ts +++ b/src/app/files/files.module.ts @@ -3,8 +3,8 @@ import {FilesComponent} from './files.component'; import {FilesRoutingModule} from './files-routing.module'; import {SharedModule} from '../shared'; import {ModalRenameComponent} from './modal-rename/modal-rename.component'; -import {NgxFileDropModule} from "ngx-file-drop"; -import {DataTablesModule} from "angular-datatables"; +import {NgxFileDropModule} from 'ngx-file-drop'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [FilesComponent, ModalRenameComponent], diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 94a57e5f5..8cf0fad8a 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; import {HomeComponent} from './home.component'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; const routes: Routes = [ { diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 91a8b5f07..f3afc60f9 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,123 +1,125 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {ApexChart, ApexFill, ApexLegend, ApexStroke, ApexXAxis, ChartComponent} from "ng-apexcharts"; -import {StatisticsService} from "../core/services"; -import {Statistics} from "../core/models"; +import {ApexChart, ApexFill, ApexLegend, ApexStroke, ApexXAxis, ChartComponent} from 'ng-apexcharts'; +import {StatisticsService, Statistics} from '../core'; @Component({ - selector: 'app-home-page', - templateUrl: './home.component.html', - styleUrls: ['./home.component.css'] + selector: 'app-home-page', + templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] }) export class HomeComponent implements OnInit { - @ViewChild("chartComponentAvgTime", { static: true }) - chartComponentAvgTime: ChartComponent; - @ViewChild("chartComponentBatchRunnedNbr", { static: true }) - chartComponentBatchRunnedNbr: ChartComponent; - chart: ApexChart[] = []; - stroke: ApexStroke; - fill: ApexFill; - xaxis: ApexXAxis; - colors: string[]; - legend: ApexLegend; - optionsCountUpMs = { - separator: ' ', - decimal: ',', - suffix: ' ms' - }; - - optionsCountUp = { - separator: ' ', - decimal: ',' - }; - - statistics: Statistics; - private dataBatchsNbr: number[] = []; - seriesBatchsNbr = [{ - name: "Count batchs", - data: this.dataBatchsNbr - }]; - - private dataAvgTime: number[] = []; - seriesAvgTime = [{ - name: "Average Time", - data: this.dataAvgTime - }]; - - labels: string[] = []; - - constructor(private statisticsService: StatisticsService) { - } - - ngOnInit() { - this.statisticsService.get().subscribe( - (statistics) => { - this.statistics = statistics; - for(let statByDay of statistics.statisticsByDay){ - this.labels.push(statByDay.date); - this.dataAvgTime.push(statByDay.executionTime); - this.dataBatchsNbr.push(statByDay.nbr); - } - this.chartComponentAvgTime.updateSeries(this.seriesAvgTime,true); - this.chartComponentBatchRunnedNbr.updateSeries(this.seriesBatchsNbr,true); - } - ); - - this.chart[0] = { - type: "bar", - fontFamily: 'inherit', - height: 40.0, - sparkline: { - enabled: true - }, - animations: { - enabled: false - }, + @ViewChild('chartComponentAvgTime', {static: true}) + chartComponentAvgTime: ChartComponent; + @ViewChild('chartComponentBatchRunnedNbr', {static: true}) + chartComponentBatchRunnedNbr: ChartComponent; + chart: ApexChart[] = []; + stroke: ApexStroke; + fill: ApexFill; + xaxis: ApexXAxis; + colors: string[]; + legend: ApexLegend; + optionsCountUpMs = { + separator: ' ', + decimal: ',', + suffix: ' ms' }; - this.chart[1] = { - type: "line", - fontFamily: 'inherit', - height: 40.0, - sparkline: { - enabled: true - }, - animations: { - enabled: true - }, + optionsCountUp = { + separator: ' ', + decimal: ',' }; - this.chart[2] = { - type: "line", - fontFamily: 'inherit', - height: 40.0, - sparkline: { - enabled: true - }, - animations: { - enabled: true, - speed: 2000 - }, - }; + statistics: Statistics; + seriesBatchsNbr = [{ + name: 'Count batchs', + data: [] + }]; - this.stroke = { - width: 2, - dashArray: [0, 3], - lineCap: "round", - curve: "smooth", - }; + seriesAvgTime = [{ + name: 'Average Time', + data: [] + }]; - this.fill = { - opacity: 1 - }; + labels: string[] = []; - this.xaxis = { - type: 'datetime', - }; + constructor(private statisticsService: StatisticsService) { + this.chart[0] = { + type: 'bar', + fontFamily: 'inherit', + height: 40.0, + sparkline: { + enabled: true + }, + animations: { + enabled: false + }, + }; - this.colors = ["#206bc4"]; - this.legend = { - show: false, - }; - } + this.chart[1] = { + type: 'line', + fontFamily: 'inherit', + height: 40.0, + sparkline: { + enabled: true + }, + animations: { + enabled: true + }, + }; + + this.chart[2] = { + type: 'line', + fontFamily: 'inherit', + height: 40.0, + sparkline: { + enabled: true + }, + animations: { + enabled: true, + speed: 2000 + }, + }; + + this.stroke = { + width: 2, + dashArray: [0, 3], + lineCap: 'round', + curve: 'smooth', + }; + + this.fill = { + opacity: 1 + }; + + this.xaxis = { + type: 'datetime', + }; + + this.colors = ['#206bc4']; + this.legend = { + show: false, + }; + } + + ngOnInit() { + this.statisticsService.get().subscribe( + (statistics) => { + this.statistics = statistics; + const newDataAvgTime = []; + const newLabels = []; + const newDataBatchsNbr = []; + + for (const statByDay of statistics.statisticsByDay) { + newLabels.push(statByDay.date); + newDataAvgTime.push(statByDay.executionTime); + newDataBatchsNbr.push(statByDay.nbr); + } + + this.labels = newLabels; + this.seriesBatchsNbr[0].data = newDataBatchsNbr; + this.seriesAvgTime[0].data = newDataAvgTime; + } + ); + } } diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index b32e0c397..df20f895e 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -4,9 +4,9 @@ import {HomeComponent} from './home.component'; import {HomeAuthResolver} from './home-auth-resolver.service'; import {SharedModule} from '../shared'; import {HomeRoutingModule} from './home-routing.module'; -import {AccreditationRequestModule} from "../accreditation-requests/accreditation-request.module"; -import {NgApexchartsModule} from "ng-apexcharts"; -import {CountUpModule} from "ngx-countup"; +import {AccreditationRequestModule} from '../accreditation-requests/accreditation-request.module'; +import {NgApexchartsModule} from 'ng-apexcharts'; +import {CountUpModule} from 'ngx-countup'; @NgModule({ imports: [ diff --git a/src/app/icons/icons.module.ts b/src/app/icons/icons.module.ts index 3381761a7..ac9cdd942 100644 --- a/src/app/icons/icons.module.ts +++ b/src/app/icons/icons.module.ts @@ -1,5 +1,5 @@ import {NgModule} from '@angular/core'; -import {FeatherModule} from "angular-feather"; +import {FeatherModule} from 'angular-feather'; import { Activity, BarChart2, Bell, BellOff, Calendar, CheckCircle, Code, Edit, @@ -12,7 +12,7 @@ import { Server, Terminal, Users, X, XCircle -} from "angular-feather/icons"; +} from 'angular-feather/icons'; const icons = { Home, diff --git a/src/app/loading/loading-routing.module.ts b/src/app/loading/loading-routing.module.ts index 0e31d481f..abf0fbe60 100644 --- a/src/app/loading/loading-routing.module.ts +++ b/src/app/loading/loading-routing.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {LoadingComponent} from "./loading.component"; -import {NoAuthGuard} from "../auth/no-auth-guard.service"; +import {LoadingComponent} from './loading.component'; +import {NoAuthGuard} from '../auth/no-auth-guard.service'; const routes: Routes = [ diff --git a/src/app/loading/loading.component.ts b/src/app/loading/loading.component.ts index 3ebcbc144..d09b5c2ae 100644 --- a/src/app/loading/loading.component.ts +++ b/src/app/loading/loading.component.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {Router} from "@angular/router"; +import {Router} from '@angular/router'; @Component({ selector: 'app-auth-page', diff --git a/src/app/loading/loading.module.ts b/src/app/loading/loading.module.ts index 193ae622c..674326718 100644 --- a/src/app/loading/loading.module.ts +++ b/src/app/loading/loading.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {LoadingComponent} from './loading.component'; import {SharedModule} from '../shared'; -import {LoadingRoutingModule} from "./loading-routing.module"; +import {LoadingRoutingModule} from './loading-routing.module'; @NgModule({ imports: [ diff --git a/src/app/manage-access-control/manage-access-control-routing.module.ts b/src/app/manage-access-control/manage-access-control-routing.module.ts index 5e949d2b0..db9fc6c0e 100644 --- a/src/app/manage-access-control/manage-access-control-routing.module.ts +++ b/src/app/manage-access-control/manage-access-control-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageAccessControlComponent} from './manage-access-control.component'; const routes: Routes = [ diff --git a/src/app/manage-access-control/manage-access-control.component.ts b/src/app/manage-access-control/manage-access-control.component.ts index 54f35a704..732b53c6e 100644 --- a/src/app/manage-access-control/manage-access-control.component.ts +++ b/src/app/manage-access-control/manage-access-control.component.ts @@ -1,17 +1,16 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {Table} from '../shared/table/table.model'; -import {ApplicationsService, UsersService} from '../core/services'; -import {Application, UsageApplication, User} from '../core/models'; -import {Constants} from "../shared/Constants"; -import {Pageable} from "../core/models/pageable.model"; -import {UserApplication} from "../core/models/user-application.model"; +import {ApplicationsService, UsersService, Application, UsageApplication, User} from '../core'; +import {Constants} from '../shared/Constants'; +import {Pageable} from '../core/models/pageable.model'; +import {UserApplication} from '../core/models/user-application.model'; @Component({ selector: 'app-admin-users', templateUrl: './manage-access-control.component.html' }) -export class ManageAccessControlComponent implements OnInit { +export class ManageAccessControlComponent { applicationSelected: Application; table: Table; @@ -36,10 +35,6 @@ export class ManageAccessControlComponent implements OnInit { } - ngOnInit() { - - } - changePage(event) { this.refreshUsers(new Pageable(event - 1, this.pageSize)); } diff --git a/src/app/manage-access-control/manage-access-control.module.ts b/src/app/manage-access-control/manage-access-control.module.ts index f3f13a39a..4e8c473a7 100644 --- a/src/app/manage-access-control/manage-access-control.module.ts +++ b/src/app/manage-access-control/manage-access-control.module.ts @@ -3,7 +3,7 @@ import {ManageAccessControlRoutingModule} from './manage-access-control-routing. import {SharedModule} from '../shared'; import {ManageAccessControlComponent} from './manage-access-control.component'; import {IconsModule} from '../icons'; -import {NgxPaginationModule} from "ngx-pagination"; +import {NgxPaginationModule} from 'ngx-pagination'; @NgModule({ declarations: [ManageAccessControlComponent], diff --git a/src/app/manage-batchs/manage-batchs-routing.module.ts b/src/app/manage-batchs/manage-batchs-routing.module.ts index acb0597fc..cfa533b6b 100644 --- a/src/app/manage-batchs/manage-batchs-routing.module.ts +++ b/src/app/manage-batchs/manage-batchs-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageBatchsComponent} from './manage-batchs.component'; const routes: Routes = [ diff --git a/src/app/manage-batchs/manage-batchs.component.ts b/src/app/manage-batchs/manage-batchs.component.ts index 2cf84c3b4..dec86673f 100644 --- a/src/app/manage-batchs/manage-batchs.component.ts +++ b/src/app/manage-batchs/manage-batchs.component.ts @@ -1,13 +1,12 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Application, Batch} from '../core/models'; -import {BatchsService} from '../core/services'; +import {Application, Batch, BatchsService} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalBatchComponent} from './modal-batch/modal-batch.component'; import {ModalBatchDeletionComponent} from './modal-batch-deletion/modal-batch-deletion.component'; -import {Constants} from "../shared/Constants"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {ToastService} from "../core/services/toast.service"; +import {Constants} from '../shared/Constants'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-manage-batchs', @@ -25,12 +24,12 @@ export class ManageBatchsComponent implements AfterViewInit, OnDestroy, OnInit { constructor(private batchsService: BatchsService, private modalService: NgbModal, private toastService: ToastService, - private constants: Constants,) { + private constants: Constants, ) { } applicationChanged(application: Application) { this.applicationSelected = application; - this.refreshBatchs() + this.refreshBatchs(); } ngOnInit() { @@ -43,14 +42,14 @@ export class ManageBatchsComponent implements AfterViewInit, OnDestroy, OnInit { ajax: (dataTablesParameters: any, callback) => { if (!this.applicationSelected) { this.batchs = []; - return + return; } this.batchsService .getAllFromApplication(this.applicationSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -113,13 +112,13 @@ export class ManageBatchsComponent implements AfterViewInit, OnDestroy, OnInit { } }); modalRef.componentInstance.application = this.applicationSelected; - modalRef.componentInstance.batch = batch; + modalRef.componentInstance.batch = {...batch}; modalRef.componentInstance.isUpdate = true; } deleteBatch(batch: Batch) { const modalRef = this.modalService.open(ModalBatchDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.batchsService.delete(batch).subscribe( () => { this.toastService.showSuccess(`Le batch ${batch.name} a été supprimé`); @@ -129,7 +128,6 @@ export class ManageBatchsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError(`Une erreur est survenue lors de la suppression du batch : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.application = this.applicationSelected; modalRef.componentInstance.batch = batch; diff --git a/src/app/manage-batchs/manage-batchs.module.ts b/src/app/manage-batchs/manage-batchs.module.ts index c343c9c1b..2e3c98eed 100644 --- a/src/app/manage-batchs/manage-batchs.module.ts +++ b/src/app/manage-batchs/manage-batchs.module.ts @@ -5,8 +5,8 @@ import {ManageBatchsRoutingModule} from './manage-batchs-routing.module'; import {ModalBatchComponent} from './modal-batch/modal-batch.component'; import {NgMultiSelectDropDownModule} from 'ng-multiselect-dropdown'; import {ModalBatchDeletionComponent} from './modal-batch-deletion/modal-batch-deletion.component'; -import {NgbPaginationModule} from "@ng-bootstrap/ng-bootstrap"; -import {DataTablesModule} from "angular-datatables"; +import {NgbPaginationModule} from '@ng-bootstrap/ng-bootstrap'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ManageBatchsComponent, ModalBatchComponent, ModalBatchDeletionComponent], diff --git a/src/app/manage-batchs/modal-batch-deletion/modal-batch-deletion.component.ts b/src/app/manage-batchs/modal-batch-deletion/modal-batch-deletion.component.ts index 0350b17ea..6960a58ff 100644 --- a/src/app/manage-batchs/modal-batch-deletion/modal-batch-deletion.component.ts +++ b/src/app/manage-batchs/modal-batch-deletion/modal-batch-deletion.component.ts @@ -1,17 +1,14 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Batch} from '../../core/models'; +import {Batch} from '../../core'; @Component({ selector: 'app-modal-batch-deletion', templateUrl: './modal-batch-deletion.component.html' }) -export class ModalBatchDeletionComponent implements OnInit { +export class ModalBatchDeletionComponent { batch: Batch; constructor(public activeModal: NgbActiveModal) { } - - ngOnInit() { - } } diff --git a/src/app/manage-batchs/modal-batch/modal-batch.component.ts b/src/app/manage-batchs/modal-batch/modal-batch.component.ts index 085e9724d..dc53deca7 100644 --- a/src/app/manage-batchs/modal-batch/modal-batch.component.ts +++ b/src/app/manage-batchs/modal-batch/modal-batch.component.ts @@ -1,8 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {BatchsService, EnvironmentsService} from '../../core/services'; -import {Application, Batch} from '../../core/models'; -import {Pageable} from "../../core/models/pageable.model"; +import {BatchsService, EnvironmentsService, Application, Batch} from '../../core'; +import {Pageable} from '../../core/models/pageable.model'; @Component({ selector: 'app-modal-batch', @@ -33,7 +32,7 @@ export class ModalBatchComponent implements OnInit { } ngOnInit() { - this.environnementService.getEnvironmentFromApp(this.application.id, new Pageable(0,-1)) + this.environnementService.getEnvironmentFromApp(this.application.id, new Pageable(0, -1)) .subscribe((page) => this.dropdownList = page.content); this.dropdownSettings = { singleSelection: false, diff --git a/src/app/manage-chains/manage-chains-routing.module.ts b/src/app/manage-chains/manage-chains-routing.module.ts index 043ced13d..f04cfaf37 100644 --- a/src/app/manage-chains/manage-chains-routing.module.ts +++ b/src/app/manage-chains/manage-chains-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageChainsComponent} from './manage-chains.component'; const routes: Routes = [ diff --git a/src/app/manage-chains/manage-chains.component.ts b/src/app/manage-chains/manage-chains.component.ts index bbc6b5622..d83ba2271 100644 --- a/src/app/manage-chains/manage-chains.component.ts +++ b/src/app/manage-chains/manage-chains.component.ts @@ -1,13 +1,12 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Chain, Environment} from '../core/models'; -import {ChainsService} from '../core/services'; +import {Chain, Environment, ChainsService} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalChainComponent} from './modal-chain/modal-chain.component'; import {ModalChainDeletionComponent} from './modal-chain-deletion/modal-chain-deletion.component'; -import {Constants} from "../shared/Constants"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {ToastService} from "../core/services/toast.service"; +import {Constants} from '../shared/Constants'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-manage-chains', @@ -31,22 +30,22 @@ export class ManageChainsComponent implements AfterViewInit, OnDestroy, OnInit { ngOnInit() { this.dtOptions = { - order: [[0,'asc']], + order: [[0, 'asc']], pagingType: 'full_numbers', pageLength: this.constants.numberByPage, serverSide: true, processing: false, ajax: (dataTablesParameters: any, callback) => { - if(!this.environmentSelected){ + if (!this.environmentSelected){ this.chains = []; - return + return; } this.chainsService .getAllFromEnvironment(this.environmentSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -113,13 +112,13 @@ export class ManageChainsComponent implements AfterViewInit, OnDestroy, OnInit { } }); modalRef.componentInstance.environment = this.environmentSelected; - modalRef.componentInstance.chain = chain; + modalRef.componentInstance.chain = {...chain}; modalRef.componentInstance.isUpdate = true; } deleteChain(chain: Chain) { const modalRef = this.modalService.open(ModalChainDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.chainsService.deleteChaine(chain).subscribe( () => { this.toastService.showSuccess(`Le chaine a été supprimée`); @@ -129,7 +128,6 @@ export class ManageChainsComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la suppression de la chaine : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.chain = chain; } diff --git a/src/app/manage-chains/manage-chains.module.ts b/src/app/manage-chains/manage-chains.module.ts index af1c2faf5..6aa553fc2 100644 --- a/src/app/manage-chains/manage-chains.module.ts +++ b/src/app/manage-chains/manage-chains.module.ts @@ -6,7 +6,7 @@ import {ModalChainComponent} from './modal-chain/modal-chain.component'; import {DragDropModule} from '@angular/cdk/drag-drop'; import {IconsModule} from '../icons'; import {ModalChainDeletionComponent} from './modal-chain-deletion/modal-chain-deletion.component'; -import {DataTablesModule} from "angular-datatables"; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ManageChainsComponent, ModalChainComponent, ModalChainDeletionComponent], diff --git a/src/app/manage-chains/modal-chain-deletion/modal-chain-deletion.component.ts b/src/app/manage-chains/modal-chain-deletion/modal-chain-deletion.component.ts index d3aa87d9b..6dbcd3ba6 100644 --- a/src/app/manage-chains/modal-chain-deletion/modal-chain-deletion.component.ts +++ b/src/app/manage-chains/modal-chain-deletion/modal-chain-deletion.component.ts @@ -1,17 +1,15 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Chain} from '../../core/models'; +import {Chain} from '../../core'; @Component({ selector: 'app-modal-chain-deletion', templateUrl: './modal-chain-deletion.component.html' }) -export class ModalChainDeletionComponent implements OnInit { +export class ModalChainDeletionComponent { chain: Chain; constructor(public activeModal: NgbActiveModal) { } - ngOnInit() { - } } diff --git a/src/app/manage-chains/modal-chain/modal-chain.component.ts b/src/app/manage-chains/modal-chain/modal-chain.component.ts index 52970652a..0b226bf7b 100644 --- a/src/app/manage-chains/modal-chain/modal-chain.component.ts +++ b/src/app/manage-chains/modal-chain/modal-chain.component.ts @@ -1,10 +1,9 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {BatchsService, ChainsService} from '../../core/services'; -import {Batch, Chain, ChainAssociation, Environment} from '../../core/models'; +import {BatchsService, ChainsService, Batch, Chain, ChainAssociation, Environment} from '../../core'; import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop'; import {NgModel} from '@angular/forms'; -import {Pageable} from "../../core/models/pageable.model"; +import {Pageable} from '../../core/models/pageable.model'; @Component({ selector: 'app-modal-chain', @@ -105,7 +104,7 @@ export class ModalChainComponent implements OnInit { ); } else { this.chainsService.updateChain(this.chain).subscribe( - batch => { + () => { this.activeModal.close(this.chain); }, error => { diff --git a/src/app/manage-directories/manage-directories-routing.module.ts b/src/app/manage-directories/manage-directories-routing.module.ts index ee59f9741..da0f663c5 100644 --- a/src/app/manage-directories/manage-directories-routing.module.ts +++ b/src/app/manage-directories/manage-directories-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageDirectoriesComponent} from './manage-directories.component'; const routes: Routes = [ diff --git a/src/app/manage-directories/manage-directories.component.ts b/src/app/manage-directories/manage-directories.component.ts index 6ea004746..d984faf34 100644 --- a/src/app/manage-directories/manage-directories.component.ts +++ b/src/app/manage-directories/manage-directories.component.ts @@ -1,13 +1,12 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Directory, Environment} from '../core/models'; -import {FilesService} from '../core/services'; +import {Directory, Environment, FilesService} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ModalDirectoryComponent} from './modal-directory/modal-directory.component'; import {ModalDirectoryDeletionComponent} from './modal-directory-deletion/modal-directory-deletion.component'; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {Constants} from "../shared/Constants"; -import {ToastService} from "../core/services/toast.service"; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {Constants} from '../shared/Constants'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-manage-directories', @@ -39,14 +38,14 @@ export class ManageDirectoriesComponent implements AfterViewInit, OnDestroy, OnI ajax: (dataTablesParameters: any, callback) => { if (!this.environmentSelected) { this.directories = []; - return + return; } this.filesService .getAllFromEnvironment(this.environmentSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -60,7 +59,7 @@ export class ManageDirectoriesComponent implements AfterViewInit, OnDestroy, OnI }, columns: [{ data: 'id' - }, {data: 'name'}, {data: 'path'}, {data: 'canWrite'},{data: 'canExplore'}, { + }, {data: 'name'}, {data: 'path'}, {data: 'canWrite'}, {data: 'canExplore'}, { data: '', orderable: false }] @@ -113,13 +112,13 @@ export class ManageDirectoriesComponent implements AfterViewInit, OnDestroy, OnI } }); modalRef.componentInstance.environment = this.environmentSelected; - modalRef.componentInstance.directory = directory; + modalRef.componentInstance.directory = {...directory}; modalRef.componentInstance.isUpdate = true; } deleteDirectory(directory: Directory) { const modalRef = this.modalService.open(ModalDirectoryDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.filesService.deleteDirectory(directory).subscribe( () => { this.toastService.showSuccess(`Le répertoire a été supprimé`); @@ -129,7 +128,6 @@ export class ManageDirectoriesComponent implements AfterViewInit, OnDestroy, OnI this.toastService.showError( `Une erreur est survenue lors de la suppression du répertoire : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.directory = directory; } diff --git a/src/app/manage-directories/manage-directories.module.ts b/src/app/manage-directories/manage-directories.module.ts index fc25cad11..9dd5c4a61 100644 --- a/src/app/manage-directories/manage-directories.module.ts +++ b/src/app/manage-directories/manage-directories.module.ts @@ -4,7 +4,7 @@ import {SharedModule} from '../shared'; import {ManageDirectoriesRoutingModule} from './manage-directories-routing.module'; import {ModalDirectoryComponent} from './modal-directory/modal-directory.component'; import {ModalDirectoryDeletionComponent} from './modal-directory-deletion/modal-directory-deletion.component'; -import {DataTablesModule} from "angular-datatables"; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ManageDirectoriesComponent, ModalDirectoryComponent, ModalDirectoryDeletionComponent], diff --git a/src/app/manage-directories/modal-directory-deletion/modal-directory-deletion.component.ts b/src/app/manage-directories/modal-directory-deletion/modal-directory-deletion.component.ts index 9b7c34e57..63b05e8af 100644 --- a/src/app/manage-directories/modal-directory-deletion/modal-directory-deletion.component.ts +++ b/src/app/manage-directories/modal-directory-deletion/modal-directory-deletion.component.ts @@ -1,17 +1,14 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Directory} from '../../core/models'; +import {Directory} from '../../core'; @Component({ selector: 'app-modal-directory-deletion', templateUrl: './modal-directory-deletion.component.html' }) -export class ModalDirectoryDeletionComponent implements OnInit { +export class ModalDirectoryDeletionComponent { directory: Directory; constructor(public activeModal: NgbActiveModal) { } - - ngOnInit() { - } } diff --git a/src/app/manage-directories/modal-directory/modal-directory.component.ts b/src/app/manage-directories/modal-directory/modal-directory.component.ts index 27f967668..b437fa996 100644 --- a/src/app/manage-directories/modal-directory/modal-directory.component.ts +++ b/src/app/manage-directories/modal-directory/modal-directory.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Directory, Environment} from '../../core/models'; -import {FilesService} from '../../core/services'; +import {Directory, Environment, FilesService} from '../../core'; @Component({ selector: 'app-modal-directory', diff --git a/src/app/manage-environments/manage-environments-routing.module.ts b/src/app/manage-environments/manage-environments-routing.module.ts index 2123dd248..271321c9b 100644 --- a/src/app/manage-environments/manage-environments-routing.module.ts +++ b/src/app/manage-environments/manage-environments-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageEnvironmentsComponent} from './manage-environments.component'; const routes: Routes = [ diff --git a/src/app/manage-environments/manage-environments.component.ts b/src/app/manage-environments/manage-environments.component.ts index bf9817cf5..28705d870 100644 --- a/src/app/manage-environments/manage-environments.component.ts +++ b/src/app/manage-environments/manage-environments.component.ts @@ -1,13 +1,12 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Application, Environment} from '../core/models'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import {ApplicationsService, EnvironmentsService, GlobalSettingsService} from '../core/services'; +import {Application, Environment, ApplicationsService, EnvironmentsService, GlobalSettingsService} from '../core'; import {ModalEnvironmentComponent} from './modal-environment/modal-environment.component'; import {ModalEnvironmentDeletionComponent} from './modal-environment-deletion/modal-environment-deletion.component'; -import {Constants} from "../shared/Constants"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {ToastService} from "../core/services/toast.service"; +import {Constants} from '../shared/Constants'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-manage-environments', @@ -53,22 +52,22 @@ export class ManageEnvironmentsComponent implements AfterViewInit, OnDestroy, On this.importEnvironmentEnabled = this.globalSettingsService.importEnvironmentIsEnable(); this.dtOptions = { - order: [[0,'asc']], + order: [[0, 'asc']], pagingType: 'full_numbers', pageLength: this.constants.numberByPage, serverSide: true, processing: false, ajax: (dataTablesParameters: any, callback) => { - if(!this.applicationSelected){ + if (!this.applicationSelected){ this.environments = []; - return + return; } this.environmentsService .getEnvironmentFromApp(this.applicationSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -122,12 +121,12 @@ export class ManageEnvironmentsComponent implements AfterViewInit, OnDestroy, On onClickImportEnvironments() { this.environmentsService.importEnvironmentToApp(this.applicationSelected.id).subscribe( - (result) => { - this.toastService.showSuccess(`Les environnements ont bien étaient importés`); + () => { + this.toastService.showSuccess(`Les environnements ont bien été importés`); this.refreshEnvironments(); }, (error) => this.toastService.showError(`Une erreur est survenue lors de l'import des environnments : ${error.message}`) - ) + ); } editEnvironment(env: Environment) { @@ -141,15 +140,15 @@ export class ManageEnvironmentsComponent implements AfterViewInit, OnDestroy, On } }); modalRef.componentInstance.application = this.applicationSelected; - modalRef.componentInstance.environment = env; + modalRef.componentInstance.environment = {...env}; modalRef.componentInstance.isUpdate = true; } deleteEnvironment(env: Environment) { const modalRef = this.modalService.open(ModalEnvironmentDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.environmentsService.deleteEnvironemnt(env.id).subscribe( - fileKind => { + () => { this.toastService.showSuccess(`L'environnement a été supprimé`); this.applicationChanged(this.applicationSelected); }, @@ -157,7 +156,6 @@ export class ManageEnvironmentsComponent implements AfterViewInit, OnDestroy, On this.toastService.showError( `Une erreur est survenue lors de la suppression de l'environnement : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.application = this.applicationSelected; modalRef.componentInstance.environment = env; diff --git a/src/app/manage-environments/manage-environments.module.ts b/src/app/manage-environments/manage-environments.module.ts index 66ea1922d..a72f85c01 100644 --- a/src/app/manage-environments/manage-environments.module.ts +++ b/src/app/manage-environments/manage-environments.module.ts @@ -4,8 +4,8 @@ import {ManageEnvironmentsRoutingModule} from './manage-environments-routing.mod import {SharedModule} from '../shared'; import {ModalEnvironmentComponent} from './modal-environment/modal-environment.component'; import {ModalEnvironmentDeletionComponent} from './modal-environment-deletion/modal-environment-deletion.component'; -import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; -import {DataTablesModule} from "angular-datatables"; +import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ManageEnvironmentsComponent, ModalEnvironmentComponent, ModalEnvironmentDeletionComponent], diff --git a/src/app/manage-environments/modal-environment-deletion/modal-environment-deletion.component.ts b/src/app/manage-environments/modal-environment-deletion/modal-environment-deletion.component.ts index 0a36bc349..d643457b0 100644 --- a/src/app/manage-environments/modal-environment-deletion/modal-environment-deletion.component.ts +++ b/src/app/manage-environments/modal-environment-deletion/modal-environment-deletion.component.ts @@ -1,17 +1,15 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Environment} from '../../core/models'; +import {Environment} from '../../core'; @Component({ selector: 'app-modal-environment-deletion', templateUrl: './modal-environment-deletion.component.html' }) -export class ModalEnvironmentDeletionComponent implements OnInit { +export class ModalEnvironmentDeletionComponent { environment: Environment; constructor(public activeModal: NgbActiveModal) { } - ngOnInit() { - } } diff --git a/src/app/manage-environments/modal-environment/modal-environment.component.ts b/src/app/manage-environments/modal-environment/modal-environment.component.ts index bc004e60c..e5396f981 100644 --- a/src/app/manage-environments/modal-environment/modal-environment.component.ts +++ b/src/app/manage-environments/modal-environment/modal-environment.component.ts @@ -1,8 +1,7 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Application, Environment, Norme} from '../../core/models'; -import {EnvironmentsService, NormsService} from '../../core/services'; -import {Pageable} from "../../core/models/pageable.model"; +import {Application, Environment, Norme, EnvironmentsService, NormsService} from '../../core'; +import {Pageable} from '../../core/models/pageable.model'; @Component({ selector: 'app-modal-environment', diff --git a/src/app/manage-naming/manage-naming-routing.module.ts b/src/app/manage-naming/manage-naming-routing.module.ts index f24373926..f6721fc74 100644 --- a/src/app/manage-naming/manage-naming-routing.module.ts +++ b/src/app/manage-naming/manage-naming-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ManageNamingComponent} from './manage-naming.component'; const routes: Routes = [ diff --git a/src/app/manage-naming/manage-naming.component.ts b/src/app/manage-naming/manage-naming.component.ts index 79155bfad..e63153416 100644 --- a/src/app/manage-naming/manage-naming.component.ts +++ b/src/app/manage-naming/manage-naming.component.ts @@ -1,14 +1,14 @@ import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Application} from '../core/models'; +import {Application} from '../core'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {FileKindsService} from '../core/services/file-kinds.service'; import {ModalNamingComponent} from './modal-naming/modal-naming.component'; import {ModalNamingDeletionComponent} from './modal-naming-deletion/modal-naming-deletion.component'; -import {FileKind} from "../core/models/file-kind.model"; -import {DataTableDirective} from "angular-datatables"; -import {Subject} from "rxjs"; -import {Constants} from "../shared/Constants"; -import {ToastService} from "../core/services/toast.service"; +import {FileKind} from '../core/models/file-kind.model'; +import {DataTableDirective} from 'angular-datatables'; +import {Subject} from 'rxjs'; +import {Constants} from '../shared/Constants'; +import {ToastService} from '../core/services/toast.service'; @Component({ selector: 'app-manage-naming', @@ -41,14 +41,14 @@ export class ManageNamingComponent implements AfterViewInit, OnDestroy, OnInit { ajax: (dataTablesParameters: any, callback) => { if (!this.applicationSelected) { this.namings = []; - return + return; } this.fileKindsService .getAllFromApplication(this.applicationSelected.id, { - 'page': dataTablesParameters.start / dataTablesParameters.length, - 'size': dataTablesParameters.length, - 'sort': dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, - 'name': dataTablesParameters.search.value + page: dataTablesParameters.start / dataTablesParameters.length, + size: dataTablesParameters.length, + sort: dataTablesParameters.columns[dataTablesParameters.order[0].column].data + ',' + dataTablesParameters.order[0].dir, + name: dataTablesParameters.search.value } ) .subscribe(resp => { @@ -62,7 +62,7 @@ export class ManageNamingComponent implements AfterViewInit, OnDestroy, OnInit { }, columns: [{ data: 'id' - }, {data: 'name'}, {data: 'pattern'},{ + }, {data: 'name'}, {data: 'pattern'}, { data: '', orderable: false }] @@ -116,15 +116,15 @@ export class ManageNamingComponent implements AfterViewInit, OnDestroy, OnInit { } }); modalRef.componentInstance.application = this.applicationSelected; - modalRef.componentInstance.fileKind = naming; + modalRef.componentInstance.fileKind = {...naming}; modalRef.componentInstance.isUpdate = true; } deleteNaming(naming: FileKind) { const modalRef = this.modalService.open(ModalNamingDeletionComponent); - modalRef.result.then((result) => { + modalRef.result.then(() => { this.fileKindsService.deleteNaming(naming).subscribe( - fileKind => { + () => { this.toastService.showSuccess(`Le nommage a été supprimé`); this.applicationChanged(this.applicationSelected); }, @@ -132,7 +132,6 @@ export class ManageNamingComponent implements AfterViewInit, OnDestroy, OnInit { this.toastService.showError( `Une erreur est survenue lors de la suppression du nommage : ${reason}`); } ); - }, reason => { }); modalRef.componentInstance.application = this.applicationSelected; modalRef.componentInstance.fileKind = naming; diff --git a/src/app/manage-naming/manage-naming.module.ts b/src/app/manage-naming/manage-naming.module.ts index c855eda7c..ff9163717 100644 --- a/src/app/manage-naming/manage-naming.module.ts +++ b/src/app/manage-naming/manage-naming.module.ts @@ -4,7 +4,7 @@ import {ManageNamingRoutingModule} from './manage-naming-routing.module'; import {SharedModule} from '../shared'; import {ModalNamingComponent} from './modal-naming/modal-naming.component'; import {ModalNamingDeletionComponent} from './modal-naming-deletion/modal-naming-deletion.component'; -import {DataTablesModule} from "angular-datatables"; +import {DataTablesModule} from 'angular-datatables'; @NgModule({ declarations: [ManageNamingComponent, ModalNamingDeletionComponent, ModalNamingComponent], diff --git a/src/app/manage-naming/modal-naming/modal-naming.component.ts b/src/app/manage-naming/modal-naming/modal-naming.component.ts index e1b400e43..2eb018488 100644 --- a/src/app/manage-naming/modal-naming/modal-naming.component.ts +++ b/src/app/manage-naming/modal-naming/modal-naming.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Application} from '../../core/models'; +import {Application} from '../../core'; import {FileKind} from '../../core/models/file-kind.model'; import {FileKindsService} from '../../core/services/file-kinds.service'; diff --git a/src/app/profile/profile-routing.module.ts b/src/app/profile/profile-routing.module.ts index d85dca69b..c66e43c4c 100644 --- a/src/app/profile/profile-routing.module.ts +++ b/src/app/profile/profile-routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {AuthGuard} from '../core/services'; +import {AuthGuard} from '../core'; import {ProfileComponent} from './profile.component'; const routes: Routes = [ diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts index c784faf9a..2b24c2099 100644 --- a/src/app/profile/profile.component.ts +++ b/src/app/profile/profile.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - selector: 'ebad-profile', + selector: 'app-profile', templateUrl: './profile.component.html', styleUrls: [] }) diff --git a/src/app/schedulings/modal-add-scheduling/modal-add-scheduling.component.html b/src/app/schedulings/modal-add-scheduling/modal-add-scheduling.component.html index ef6678754..5bcbb98eb 100644 --- a/src/app/schedulings/modal-add-scheduling/modal-add-scheduling.component.html +++ b/src/app/schedulings/modal-add-scheduling/modal-add-scheduling.component.html @@ -26,7 +26,7 @@