From 5fe73a4533b96f1407c1a9f915c534627b99578a Mon Sep 17 00:00:00 2001 From: vlo-rte Date: Wed, 17 Feb 2021 16:06:30 +0100 Subject: [PATCH 01/45] [OC-1440] New logging screen filters --- .../modules/archives/archives.component.html | 60 +--- .../modules/archives/archives.component.ts | 286 ++--------------- .../app/modules/archives/archives.module.ts | 4 +- .../logging-filters.component.html | 14 +- .../logging-filters.component.ts | 97 +----- .../logging-table.component.html | 2 + .../logging-table/logging-table.component.ts | 39 ++- .../modules/logging/logging.component.html | 5 +- .../src/app/modules/logging/logging.module.ts | 4 +- .../archives-logging-filters.component.html | 65 ++++ .../archives-logging-filters.component.ts | 290 ++++++++++++++++++ .../archives-logging-filters.module.ts | 31 ++ ui/main/src/assets/i18n/en.json | 24 +- ui/main/src/assets/i18n/fr.json | 24 +- 14 files changed, 502 insertions(+), 443 deletions(-) create mode 100644 ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.html create mode 100644 ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.ts create mode 100644 ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.module.ts diff --git a/ui/main/src/app/modules/archives/archives.component.html b/ui/main/src/app/modules/archives/archives.component.html index fa72fe36f9..2032fc9ebd 100644 --- a/ui/main/src/app/modules/archives/archives.component.html +++ b/ui/main/src/app/modules/archives/archives.component.html @@ -12,61 +12,7 @@
- - -
-
- - - - -
-
- - -
-
- - -
-
- - - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
+
@@ -113,7 +59,7 @@ archive.result.businessPeriod archive.result.title archive.result.summary - archive.result.service + archive.result.service @@ -127,7 +73,7 @@ {{ card.process + '.' + card.processVersion + '.' + card.summary.key}} - {{ findServiceLabelForProcess(card.process) }} + {{ filtersTemplate.findServiceLabelForProcess(card.process) }}
diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts index 580f3da503..7b6a4835ac 100644 --- a/ui/main/src/app/modules/archives/archives.component.ts +++ b/ui/main/src/app/modules/archives/archives.component.ts @@ -9,7 +9,7 @@ import {Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Observable, Subject} from 'rxjs'; +import {Subject} from 'rxjs'; import {AppState} from '@ofStore/index'; import {ProcessesService} from '@ofServices/processes.service'; import {Store} from '@ngrx/store'; @@ -17,35 +17,15 @@ import {takeUntil} from 'rxjs/operators'; import {FormControl, FormGroup} from '@angular/forms'; import {ConfigService} from '@ofServices/config.service'; import {TimeService} from '@ofServices/time.service'; -import {NgbDateStruct, NgbModal, NgbModalOptions, NgbModalRef, NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; -import {DateTimeNgb} from '@ofModel/datetime-ngb.model'; +import {NgbModal, NgbModalOptions, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; import {CardService} from '@ofServices/card.service'; import {LightCard} from '@ofModel/light-card.model'; import {Page} from '@ofModel/page.model'; import {ExportService} from '@ofServices/export.service'; import {TranslateService} from '@ngx-translate/core'; import {Card} from '@ofModel/card.model'; -import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors'; +import {ArchivesLoggingFiltersComponent} from "../share/archives-logging-filters/archives-logging-filters.component"; -export enum FilterDateTypes { - PUBLISH_DATE_FROM_PARAM = 'publishDateFrom', - PUBLISH_DATE_TO_PARAM = 'publishDateTo', - ACTIVE_FROM_PARAM = 'activeFrom', - ACTIVE_TO_PARAM = 'activeTo' - -} - -export const checkElement = (enumeration: typeof FilterDateTypes, value: string): boolean => { - let result = false; - if (Object.values(enumeration).map(enumValue => enumValue.toString()).includes(value)) { - result = true; - } - return result; -}; - -export const transformToTimestamp = (date: NgbDateStruct, time: NgbTimeStruct): string => { - return new DateTimeNgb(date, time).formatDateTime(); -}; @Component({ selector: 'of-archives', @@ -60,34 +40,18 @@ export class ArchivesComponent implements OnDestroy, OnInit { size: number; archiveForm: FormGroup; - filters; results: LightCard[]; currentPage = 0; resultsNumber: number = 0; hasResult = false; firstQueryHasBeenDone = false; - // Filter values - serviceDropdownList = []; - serviceDropdownSettings = {}; - processDropdownList = []; - processDropdownListWhenSelectedService = []; - processesWithoutServiceDropdownList = []; - processDropdownSettings = {}; - stateDropdownListWhenSelectedProcess = []; - stateDropdownSettings = {}; - tagsDropdownList = []; - tagsDropdownSettings = {}; - // View card modalRef: NgbModalRef; @ViewChild('cardDetail') cardDetailTemplate: ElementRef; + @ViewChild('filters') filtersTemplate: ArchivesLoggingFiltersComponent; selectedCard : Card; - processesDropdownListPerServices = new Map(); - statesDropdownListPerProcesses = new Map(); - processesGroups: {id: string, processes: string[]}[]; - constructor(private store: Store, private processesService: ProcessesService, private configService: ConfigService, @@ -108,211 +72,11 @@ export class ArchivesComponent implements OnDestroy, OnInit { activeFrom: new FormControl(''), activeTo: new FormControl(''), }); - - } ngOnInit() { - this.tags = this.configService.getConfigValue('archive.filters.tags.list'); this.size = this.configService.getConfigValue('archive.filters.page.size', 10); this.results = new Array(); - this.processesGroups = this.processesService.getProcessGroups(); - this.processesService.getAllProcesses().forEach((process) => { - const id = process.id; - let itemName = process.name; - if (!itemName) { - itemName = id; - } - this.processDropdownList.push({ id: id, itemName: itemName, i18nPrefix: `${process.id}.${process.version}` }); - }); - this.processDropdownListWhenSelectedService = []; - this.stateDropdownListWhenSelectedProcess = []; - - if (!!this.tags) { - this.tags.forEach(tag => this.tagsDropdownList.push({ id: tag.value, itemName: tag.label })); - } - - this.loadAllProcessesPerServices(); - this.loadAllStatesPerProcesses(); - - this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => { - this.translate.use(locale); - this.translate.get(['archive.selectServiceText','archive.selectProcessText','archive.selectStateText', - 'archive.selectTagText']) - .subscribe(translations => { - this.serviceDropdownSettings = { - text: translations['archive.selectServiceText'], - badgeShowLimit: 1, - enableSearchFilter: true - } - this.processDropdownSettings = { - text: translations['archive.selectProcessText'], - badgeShowLimit: 1, - enableSearchFilter: true - } - this.stateDropdownSettings = { - text: translations['archive.selectStateText'], - badgeShowLimit: 1, - enableSearchFilter: true - } - this.tagsDropdownSettings = { - text: translations['archive.selectTagText'], - badgeShowLimit: 1, - enableSearchFilter: true - }; - }) - }); - this.changeProcessesWhenSelectService(); - this.changeStatesWhenSelectProcess(); - } - - addProcessesDropdownList(processesDropdownList: any[]): void { - processesDropdownList.forEach( processDropdownList => - this.processDropdownListWhenSelectedService.push(processDropdownList) ); - } - - addStatesDropdownList(statesDropdownList: any[]): void { - statesDropdownList.forEach( stateDropdownList => - this.stateDropdownListWhenSelectedProcess.push(stateDropdownList) ); - } - - changeProcessesWhenSelectService(): void { - this.archiveForm.get('service').valueChanges.subscribe((selectedServices) => { - - if (!! selectedServices && selectedServices.length > 0) { - this.processDropdownListWhenSelectedService = []; - selectedServices.forEach(service => { - - if (service.id == '--') - this.addProcessesDropdownList(this.processesWithoutServiceDropdownList); - else - this.addProcessesDropdownList(this.processesDropdownListPerServices.get(service.id)); - }); - } - else - this.processDropdownListWhenSelectedService = []; - }); - } - - changeStatesWhenSelectProcess(): void { - this.archiveForm.get('process').valueChanges.subscribe((selectedProcesses) => { - - if (!! selectedProcesses && selectedProcesses.length > 0) { - this.stateDropdownListWhenSelectedProcess = []; - selectedProcesses.forEach(process => - this.addStatesDropdownList(this.statesDropdownListPerProcesses.get(process.id)) - ); - } - else - this.stateDropdownListWhenSelectedProcess = []; - }); - } - - findServiceForProcess(processId : string) : string { - for (let group of this.processesGroups) { - if (group.processes.find(process => process == processId)) - return group.id; - } - return ''; - } - - findServiceLabelForProcess(processId : string) : string { - const serviceId = this.findServiceForProcess(processId); - return (!! serviceId && serviceId != '') ? serviceId : "service.defaultLabel"; - } - - loadAllProcessesPerServices(): void { - this.processesService.getAllProcesses().forEach(process => { - - const service = this.findServiceForProcess(process.id); - if (service != '') { - let processes = (!! this.processesDropdownListPerServices.get(service) ? this.processesDropdownListPerServices.get(service) : []); - processes.push({id: process.id, itemName: process.name, i18nPrefix: `${process.id}.${process.version}`}); - this.processesDropdownListPerServices.set(service, processes); - } - else - this.processesWithoutServiceDropdownList.push({ id: process.id, itemName: process.name, i18nPrefix: `${process.id}.${process.version}` }); - }); - if (this.processesWithoutServiceDropdownList.length > 0) - this.serviceDropdownList.push({ id: '--', itemName: "service.defaultLabel" }); - - const services = Array.from(this.processesDropdownListPerServices.keys()); - services.forEach(service => this.serviceDropdownList.push({ id: service, itemName: service })); - } - - loadAllStatesPerProcesses(): void { - this.processesService.getAllProcesses().forEach(process => { - - let statesDropdownList = []; - for (let state in process.states) - statesDropdownList.push({id: process.id + '.' + state, itemName: process.states[state].name, i18nPrefix: `${process.id}.${process.version}`}); - this.statesDropdownListPerProcesses.set(process.id, statesDropdownList); - }); - } - - displayServiceFilter() { - return !!this.serviceDropdownList && this.serviceDropdownList.length > 1 ; - } - - protected getLocale(): Observable { - return this.store.select(buildSettingsOrConfigSelector('locale')); - } - - /** - * Transforms the filters list to Map - */ - filtersToMap = (filters: any) : void => { - this.filters = new Map(); - Object.keys(filters).forEach(key => { - const element = filters[key]; - // if the form element is date - if (element) { - if (checkElement(FilterDateTypes, key)) - this.dateFilterToMap(key, element); - else { - if (element.length) { - const ids = []; - if (key == 'state') - this.stateFilterToMap(element); - else if (key == 'service') - this.serviceFilterToMap(element); - else { - element.forEach(val => ids.push(val.id)); - this.filters.set(key, ids); - } - } - } - } - }); - } - - dateFilterToMap(key: string, element: any) { - const { date, time } = element; - if (date) { - const timeStamp = this.timeService.toNgBTimestamp(transformToTimestamp(date, time)); - if (timeStamp !== 'NaN') - this.filters.set(key, [timeStamp]); - } - } - - stateFilterToMap(element: any) { - const ids = []; - element.forEach(val => ids.push(val.id.substring(val.id.indexOf('.') + 1))); - this.filters.set('state', ids); - } - - serviceFilterToMap(element: any) { - const ids = []; - - element.forEach(service => { - if (service.id == '--') - this.processesWithoutServiceDropdownList.forEach(process => ids.push(process.id)) - else - this.processesDropdownListPerServices.get(service.id).forEach(process => ids.push(process.id)) - }); - - if (!this.filters.get('process')) - this.filters.set('process', ids); } resetForm() { @@ -322,13 +86,12 @@ export class ArchivesComponent implements OnDestroy, OnInit { this.resultsNumber = 0; } - sendQuery(page_number): void { const { value } = this.archiveForm; - this.filtersToMap(value); - this.filters.set('size', [this.size.toString()]); - this.filters.set('page', [page_number]); - this.cardService.fetchArchivedCards(this.filters) + this.filtersTemplate.filtersToMap(value); + this.filtersTemplate.filters.set('size', [this.size.toString()]); + this.filtersTemplate.filters.set('page', [page_number]); + this.cardService.fetchArchivedCards(this.filtersTemplate.filters) .pipe(takeUntil(this.unsubscribe$)) .subscribe((page: Page) => { this.resultsNumber = page.totalElements; @@ -339,7 +102,6 @@ export class ArchivesComponent implements OnDestroy, OnInit { page.content.forEach(card => this.loadTranslationForCardIfNeeded(card)); this.results = page.content; }); - } loadTranslationForCardIfNeeded(card: LightCard) { @@ -357,14 +119,13 @@ export class ArchivesComponent implements OnDestroy, OnInit { // EXPORT TO EXCEL - initExportArchiveData(): void { const exportArchiveData = []; - this.filters.set('size', [this.resultsNumber.toString()]); - this.filters.set('page', [0]); + this.filtersTemplate.filters.set('size', [this.resultsNumber.toString()]); + this.filtersTemplate.filters.set('page', [0]); - this.cardService.fetchArchivedCards(this.filters).pipe(takeUntil(this.unsubscribe$)) + this.cardService.fetchArchivedCards(this.filtersTemplate.filters).pipe(takeUntil(this.unsubscribe$)) .subscribe((page: Page) => { const lines = page.content; @@ -373,17 +134,28 @@ export class ArchivesComponent implements OnDestroy, OnInit { const businessDateColumnName = this.translateColomn('archive.result.businessPeriod'); const titleColumnName = this.translateColomn('archive.result.title'); const summaryColumnName = this.translateColomn('archive.result.summary'); + const serviceColumnName = this.translateColomn('archive.result.service'); lines.forEach((card: LightCard) => { if (typeof card !== undefined) { // TO DO translation for old process should be done , but loading local arrive to late , solution to find - exportArchiveData.push({ - [severityColumnName]: card.severity, - [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), - [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), - [titleColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), - [summaryColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters) - }); + if (this.filtersTemplate.displayServiceFilter()) + exportArchiveData.push({ + [severityColumnName]: card.severity, + [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), + [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), + [titleColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), + [summaryColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters), + [serviceColumnName]: this.translateColomn(this.filtersTemplate.findServiceLabelForProcess(card.process)) + }); + else + exportArchiveData.push({ + [severityColumnName]: card.severity, + [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), + [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), + [titleColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), + [summaryColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters) + }); } }); this.exportService.exportAsExcelFile(exportArchiveData, 'Archive'); diff --git a/ui/main/src/app/modules/archives/archives.module.ts b/ui/main/src/app/modules/archives/archives.module.ts index 52e0d197f4..17bf2b22ba 100644 --- a/ui/main/src/app/modules/archives/archives.module.ts +++ b/ui/main/src/app/modules/archives/archives.module.ts @@ -19,6 +19,7 @@ import {DatetimeFilterModule} from '../share/datetime-filter/datetime-filter.mod import {MultiFilterModule} from 'app/modules/share/multi-filter/multi-filter.module'; import {CardDetailModule} from 'app/modules/share/card-detail/card-detail.module'; import {ArchivesEntryPointComponent} from './archives-entry-point.component'; +import {ArchivesLoggingFiltersModule} from "../share/archives-logging-filters/archives-logging-filters.module"; @NgModule({ imports: [ @@ -30,7 +31,8 @@ import {ArchivesEntryPointComponent} from './archives-entry-point.component'; NgbModule, DatetimeFilterModule, MultiFilterModule, - CardDetailModule + CardDetailModule, + ArchivesLoggingFiltersModule ], declarations: [ diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html index 491420d186..a021a0c95b 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html @@ -5,19 +5,13 @@ +
-
- -
+ + +
diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts index 9e40418ee9..9404e69c90 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts @@ -7,7 +7,7 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {AppState} from '@ofStore/index'; import {Store} from '@ngrx/store'; import {FormControl, FormGroup} from '@angular/forms'; @@ -15,35 +15,10 @@ import {FormControl, FormGroup} from '@angular/forms'; import {SendLoggingQuery} from '@ofActions/logging.actions'; import {ConfigService} from '@ofServices/config.service'; import {TimeService} from '@ofServices/time.service'; -import {NgbDateStruct, NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; -import {DateTimeNgb} from '@ofModel/datetime-ngb.model'; -import {TranslateService} from '@ngx-translate/core'; -import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors'; -import {Observable, Subject} from 'rxjs'; -import {takeUntil} from 'rxjs/operators'; +import {Subject} from 'rxjs'; +import {ArchivesLoggingFiltersComponent} from "../../../share/archives-logging-filters/archives-logging-filters.component"; -export enum FilterDateTypes { - PUBLISH_DATE_FROM_PARAM = 'publishDateFrom', - PUBLISH_DATE_TO_PARAM = 'publishDateTo', - ACTIVE_FROM_PARAM = 'activeFrom', - ACTIVE_TO_PARAM = 'activeTo' - -} - - -export const checkElement = (enumeration: typeof FilterDateTypes, value: string): boolean => { - let result = false; - if (Object.values(enumeration).map(enumValue => enumValue.toString()).includes(value)) { - result = true; - } - return result; -}; - -export const transformToTimestamp = (date: NgbDateStruct, time: NgbTimeStruct): string => { - return new DateTimeNgb(date, time).formatDateTime(); -}; - @Component({ selector: 'of-logging-filters', templateUrl: './logging-filters.component.html', @@ -57,15 +32,16 @@ export class LoggingFiltersComponent implements OnInit, OnDestroy { size = 10; loggingForm: FormGroup; - dropdownList = []; - dropdownSettings = {}; + @ViewChild('filters') filtersTemplate: ArchivesLoggingFiltersComponent; public submittedOnce = false; @Input() public processData: []; - constructor(private store: Store, private timeService: TimeService, private configService: ConfigService, private translate: TranslateService) { + constructor(private store: Store, + private timeService: TimeService, + private configService: ConfigService) { } @@ -73,72 +49,27 @@ export class LoggingFiltersComponent implements OnInit, OnDestroy { this.size = this.configService.getConfigValue('archive.filters.page.size', 10); this.loggingForm = new FormGroup( { + tags: new FormControl([]), + state: new FormControl([]), process: new FormControl([]), + service: new FormControl([]), publishDateFrom: new FormControl(''), publishDateTo: new FormControl(''), activeFrom: new FormControl(''), activeTo: new FormControl('') } ); - this.dropdownList = this.processData; - - this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => { - this.translate.use(locale); - this.translate.get(['logging.filters.selectProcessText']) - .subscribe(translations => { - this.dropdownSettings = { - text: translations['logging.filters.selectProcessText'], - enableSearchFilter: true, - badgeShowLimit: 4, - classes: 'custom-class-example' - } - }) - }); - } - - protected getLocale(): Observable { - return this.store.select(buildSettingsOrConfigSelector('locale')); } sendQuery() { const {value} = this.loggingForm; - const params = this.filtersToMap(value); - params.set('size', [this.size.toString()]); - params.set('page', ['0']); - this.store.dispatch(new SendLoggingQuery({params})); + this.filtersTemplate.filtersToMap(value); + this.filtersTemplate.filters.set('size', [this.size.toString()]); + this.filtersTemplate.filters.set('page', ['0']); + this.store.dispatch(new SendLoggingQuery({params: this.filtersTemplate.filters})); this.submittedOnce = true; } - /** - * Transforms the filters list to Map - */ - filtersToMap = (filters: any): Map => { - const params = new Map(); - Object.keys(filters).forEach(key => { - const element = filters[key]; - // if the form element is date - if (element) { - if (checkElement(FilterDateTypes, key)) { - const {date, time} = element; - if (date) { - const timeStamp = this.timeService.toNgBTimestamp(transformToTimestamp(date, time)); - if (timeStamp !== 'NaN') { - params.set(key, [timeStamp]); - } - } - } else { - if (element.length) { - const idProcessArray = []; - element.forEach(val => idProcessArray.push(val.id)); - params.set(key, idProcessArray); - } - } - } - }); - return params; - } - - resetForm() { this.loggingForm.reset(); diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html index 2168442f6c..75a56ae651 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html @@ -17,6 +17,7 @@ logging.summary logging.description logging.sender + logging.service @@ -31,6 +32,7 @@ {{element.sender}} + {{ parentComponent.filters.filtersTemplate.findServiceLabelForProcess(element.process) }}
diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts index fb6c2316ad..603bfd6cfd 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public @@ -23,6 +23,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ExportService } from '@ofServices/export.service'; import { FlushLoggingResult, UpdateLoggingPage } from '@ofStore/actions/logging.actions'; import { ConfigService } from '@ofServices/config.service'; +import { LoggingComponent } from "../../logging.component"; @Component({ @@ -32,9 +33,9 @@ import { ConfigService } from '@ofServices/config.service'; }) export class LoggingTableComponent implements OnInit, OnDestroy { - @Input() results: LineOfLoggingResult[]; @Input() processStateDescription: Map; + @Input() displayServiceColumn: boolean; displayedResult: string; exportLoggingData: Array ; page = 0; @@ -44,8 +45,13 @@ export class LoggingTableComponent implements OnInit, OnDestroy { unsubscribe$: Subject = new Subject(); - constructor(public timeService: TimeService, private cardService: CardService, - private store: Store, private translate: TranslateService, private exportService: ExportService, private configService: ConfigService) { + constructor(public timeService: TimeService, + private cardService: CardService, + private store: Store, + private translate: TranslateService, + private exportService: ExportService, + private configService: ConfigService, + private parentComponent: LoggingComponent) { } ngOnInit() { @@ -92,16 +98,27 @@ export class LoggingTableComponent implements OnInit, OnDestroy { const summaryColumnName = this.translateColomn('logging.summary'); const descriptionColumnName = this.translateColomn('logging.description'); const senderColumnName = this.translateColomn('logging.sender'); + const serviceColumnName = this.translateColomn('logging.service'); lines.forEach( (line: LineOfLoggingResult) => { if (typeof line !== undefined) { - this.exportLoggingData.push({ - [timeOfActionColumnName]: this.timeService.formatDateTime(line.businessDate), - [titleColumnName]: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), - [summaryColumnName]: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), - [descriptionColumnName]: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)), - [senderColumnName]: line.sender - }); + if (this.displayServiceColumn) + this.exportLoggingData.push({ + [timeOfActionColumnName]: this.timeService.formatDateTime(line.businessDate), + [titleColumnName]: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), + [summaryColumnName]: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), + [descriptionColumnName]: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)), + [senderColumnName]: line.sender, + [serviceColumnName]: this.translateColomn(this.parentComponent.filters.filtersTemplate.findServiceLabelForProcess(line.process)) + }); + else + this.exportLoggingData.push({ + [timeOfActionColumnName]: this.timeService.formatDateTime(line.businessDate), + [titleColumnName]: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), + [summaryColumnName]: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), + [descriptionColumnName]: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)), + [senderColumnName]: line.sender + }); } }); this.exportService.exportAsExcelFile(this.exportLoggingData, 'Logging'); diff --git a/ui/main/src/app/modules/logging/logging.component.html b/ui/main/src/app/modules/logging/logging.component.html index 4a58a69e4b..03f320fd41 100644 --- a/ui/main/src/app/modules/logging/logging.component.html +++ b/ui/main/src/app/modules/logging/logging.component.html @@ -15,7 +15,10 @@
- + +
diff --git a/ui/main/src/app/modules/logging/logging.module.ts b/ui/main/src/app/modules/logging/logging.module.ts index da5d3ceff9..1b92adf1b6 100644 --- a/ui/main/src/app/modules/logging/logging.module.ts +++ b/ui/main/src/app/modules/logging/logging.module.ts @@ -18,6 +18,7 @@ import {LoggingComponent} from './logging.component'; import {LoggingFiltersComponent} from './components/logging-filters/logging-filters.component'; import {DatetimeFilterModule} from '../../modules/share/datetime-filter/datetime-filter.module'; import {MultiFilterModule} from '../share/multi-filter/multi-filter.module'; +import {ArchivesLoggingFiltersModule} from "../share/archives-logging-filters/archives-logging-filters.module"; @NgModule({ @@ -29,7 +30,8 @@ import {MultiFilterModule} from '../share/multi-filter/multi-filter.module'; TranslateModule, NgbModule, DatetimeFilterModule, - MultiFilterModule + MultiFilterModule, + ArchivesLoggingFiltersModule ], declarations: [ LoggingComponent, diff --git a/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.html b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.html new file mode 100644 index 0000000000..beb5291787 --- /dev/null +++ b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.html @@ -0,0 +1,65 @@ + + + + + + + + +
+ + +
+
+ + + + +
+
+ + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
\ No newline at end of file diff --git a/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.ts b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.ts new file mode 100644 index 0000000000..d207034dec --- /dev/null +++ b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.component.ts @@ -0,0 +1,290 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {ConfigService} from "@ofServices/config.service"; +import {Card} from "@ofModel/card.model"; +import {LightCard} from "@ofModel/light-card.model"; +import {FormGroup} from "@angular/forms"; +import {ProcessesService} from "@ofServices/processes.service"; +import {takeUntil} from "rxjs/operators"; +import {Observable, Subject} from "rxjs"; +import {buildSettingsOrConfigSelector} from "@ofSelectors/settings.x.config.selectors"; +import {Store} from "@ngrx/store"; +import {AppState} from "@ofStore/index"; +import {TranslateService} from "@ngx-translate/core"; +import {TimeService} from "@ofServices/time.service"; +import {NgbDateStruct, NgbTimeStruct} from "@ng-bootstrap/ng-bootstrap"; +import {DateTimeNgb} from "@ofModel/datetime-ngb.model"; + +export enum FilterDateTypes { + PUBLISH_DATE_FROM_PARAM = 'publishDateFrom', + PUBLISH_DATE_TO_PARAM = 'publishDateTo', + ACTIVE_FROM_PARAM = 'activeFrom', + ACTIVE_TO_PARAM = 'activeTo' + +} + +export const checkElement = (enumeration: typeof FilterDateTypes, value: string): boolean => { + let result = false; + if (Object.values(enumeration).map(enumValue => enumValue.toString()).includes(value)) { + result = true; + } + return result; +}; + +export const transformToTimestamp = (date: NgbDateStruct, time: NgbTimeStruct): string => { + return new DateTimeNgb(date, time).formatDateTime(); +}; + +@Component({ + selector: 'of-archives-logging-filters', + templateUrl: './archives-logging-filters.component.html' +}) +export class ArchivesLoggingFiltersComponent implements OnInit, OnDestroy { + + @Input() public card: Card | LightCard; + @Input() parentForm: FormGroup; + + unsubscribe$: Subject = new Subject(); + + tags: any[]; + filters; + + // Filter values + serviceDropdownList = []; + serviceDropdownSettings = {}; + processDropdownList = []; + processDropdownListWhenSelectedService = []; + processesWithoutServiceDropdownList = []; + processDropdownSettings = {}; + stateDropdownListWhenSelectedProcess = []; + stateDropdownSettings = {}; + tagsDropdownList = []; + tagsDropdownSettings = {}; + + processesDropdownListPerServices = new Map(); + statesDropdownListPerProcesses = new Map(); + processesGroups: {id: string, processes: string[]}[]; + + constructor(private store: Store, + private translate: TranslateService, + private configService: ConfigService, + private timeService: TimeService, + private processesService: ProcessesService) { + } + + ngOnInit() { + this.tags = this.configService.getConfigValue('archive.filters.tags.list'); + this.processesGroups = this.processesService.getProcessGroups(); + + this.processesService.getAllProcesses().forEach((process) => { + const id = process.id; + let itemName = process.name; + if (!itemName) { + itemName = id; + } + this.processDropdownList.push({ id: id, itemName: itemName, i18nPrefix: `${process.id}.${process.version}` }); + }); + this.processDropdownListWhenSelectedService = []; + this.stateDropdownListWhenSelectedProcess = []; + + if (!!this.tags) { + this.tags.forEach(tag => this.tagsDropdownList.push({ id: tag.value, itemName: tag.label })); + } + + this.loadAllProcessesPerServices(); + this.loadAllStatesPerProcesses(); + + this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => { + this.translate.use(locale); + this.translate.get(['filters.selectServiceText','filters.selectProcessText','filters.selectStateText', + 'filters.selectTagText']) + .subscribe(translations => { + this.serviceDropdownSettings = { + text: translations['filters.selectServiceText'], + badgeShowLimit: 1, + enableSearchFilter: true + } + this.processDropdownSettings = { + text: translations['filters.selectProcessText'], + badgeShowLimit: 1, + enableSearchFilter: true + } + this.stateDropdownSettings = { + text: translations['filters.selectStateText'], + badgeShowLimit: 1, + enableSearchFilter: true + } + this.tagsDropdownSettings = { + text: translations['filters.selectTagText'], + badgeShowLimit: 1, + enableSearchFilter: true + }; + }) + }); + + this.changeProcessesWhenSelectService(); + this.changeStatesWhenSelectProcess(); + } + + /** + * Transforms the filters list to Map + */ + filtersToMap = (filters: any) : void => { + this.filters = new Map(); + Object.keys(filters).forEach(key => { + const element = filters[key]; + // if the form element is date + if (element) { + if (checkElement(FilterDateTypes, key)) + this.dateFilterToMap(key, element); + else { + if (element.length) { + const ids = []; + if (key == 'state') + this.stateFilterToMap(element); + else if (key == 'service') + this.serviceFilterToMap(element); + else { + element.forEach(val => ids.push(val.id)); + this.filters.set(key, ids); + } + } + } + } + }); + } + + dateFilterToMap(key: string, element: any) { + const { date, time } = element; + if (date) { + const timeStamp = this.timeService.toNgBTimestamp(transformToTimestamp(date, time)); + if (timeStamp !== 'NaN') + this.filters.set(key, [timeStamp]); + } + } + + stateFilterToMap(element: any) { + const ids = []; + element.forEach(val => ids.push(val.id.substring(val.id.indexOf('.') + 1))); + this.filters.set('state', ids); + } + + serviceFilterToMap(element: any) { + const ids = []; + + element.forEach(service => { + if (service.id == '--') + this.processesWithoutServiceDropdownList.forEach(process => ids.push(process.id)) + else + this.processesDropdownListPerServices.get(service.id).forEach(process => ids.push(process.id)) + }); + + if (!this.filters.get('process')) + this.filters.set('process', ids); + } + + addProcessesDropdownList(processesDropdownList: any[]): void { + processesDropdownList.forEach( processDropdownList => + this.processDropdownListWhenSelectedService.push(processDropdownList) ); + } + + addStatesDropdownList(statesDropdownList: any[]): void { + statesDropdownList.forEach( stateDropdownList => + this.stateDropdownListWhenSelectedProcess.push(stateDropdownList) ); + } + + changeProcessesWhenSelectService(): void { + this.parentForm.get('service').valueChanges.subscribe((selectedServices) => { + + if (!! selectedServices && selectedServices.length > 0) { + this.processDropdownListWhenSelectedService = []; + selectedServices.forEach(service => { + + if (service.id == '--') + this.addProcessesDropdownList(this.processesWithoutServiceDropdownList); + else + this.addProcessesDropdownList(this.processesDropdownListPerServices.get(service.id)); + }); + } + else + this.processDropdownListWhenSelectedService = []; + }); + } + + changeStatesWhenSelectProcess(): void { + this.parentForm.get('process').valueChanges.subscribe((selectedProcesses) => { + + if (!! selectedProcesses && selectedProcesses.length > 0) { + this.stateDropdownListWhenSelectedProcess = []; + selectedProcesses.forEach(process => + this.addStatesDropdownList(this.statesDropdownListPerProcesses.get(process.id)) + ); + } + else + this.stateDropdownListWhenSelectedProcess = []; + }); + } + + findServiceForProcess(processId : string) : string { + for (let group of this.processesGroups) { + if (group.processes.find(process => process == processId)) + return group.id; + } + return ''; + } + + loadAllProcessesPerServices(): void { + this.processesService.getAllProcesses().forEach(process => { + + const service = this.findServiceForProcess(process.id); + if (service != '') { + let processes = (!! this.processesDropdownListPerServices.get(service) ? this.processesDropdownListPerServices.get(service) : []); + processes.push({id: process.id, itemName: process.name, i18nPrefix: `${process.id}.${process.version}`}); + this.processesDropdownListPerServices.set(service, processes); + } + else + this.processesWithoutServiceDropdownList.push({ id: process.id, itemName: process.name, i18nPrefix: `${process.id}.${process.version}` }); + }); + if (this.processesWithoutServiceDropdownList.length > 0) + this.serviceDropdownList.push({ id: '--', itemName: "service.defaultLabel" }); + + const services = Array.from(this.processesDropdownListPerServices.keys()); + services.forEach(service => this.serviceDropdownList.push({ id: service, itemName: service })); + } + + loadAllStatesPerProcesses(): void { + this.processesService.getAllProcesses().forEach(process => { + + let statesDropdownList = []; + for (let state in process.states) + statesDropdownList.push({id: process.id + '.' + state, itemName: process.states[state].name, i18nPrefix: `${process.id}.${process.version}`}); + this.statesDropdownListPerProcesses.set(process.id, statesDropdownList); + }); + } + + displayServiceFilter() { + return !!this.serviceDropdownList && this.serviceDropdownList.length > 1 ; + } + + protected getLocale(): Observable { + return this.store.select(buildSettingsOrConfigSelector('locale')); + } + + findServiceLabelForProcess(processId : string) : string { + const serviceId = this.findServiceForProcess(processId); + return (!! serviceId && serviceId != '') ? serviceId : "service.defaultLabel"; + } + + ngOnDestroy() { + this.unsubscribe$.next(); + this.unsubscribe$.complete(); + } +} diff --git a/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.module.ts b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.module.ts new file mode 100644 index 0000000000..db0a06ec76 --- /dev/null +++ b/ui/main/src/app/modules/share/archives-logging-filters/archives-logging-filters.module.ts @@ -0,0 +1,31 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {TranslateModule} from '@ngx-translate/core'; +import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; +import {MultiFilterModule} from 'app/modules/share/multi-filter/multi-filter.module'; +import {ArchivesLoggingFiltersComponent} from "./archives-logging-filters.component"; + + +@NgModule({ + declarations: [ArchivesLoggingFiltersComponent], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + TranslateModule, + NgbModule, + MultiFilterModule + ], + exports: [ArchivesLoggingFiltersComponent] +}) +export class ArchivesLoggingFiltersModule { } diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 0016005b1b..5cb38a50f2 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -128,10 +128,6 @@ }, "archive": { "filters": { - "service": "SERVICE", - "process": "PROCESS", - "state": "STATE", - "tags": "TAGS", "publishDateFrom": "PUBLISH FROM", "publishDateTo": "PUBLISH TO", "activeFrom": "ACTIVE FROM", @@ -147,22 +143,18 @@ }, "noResult": "Your search did not match any results.", "exportToExcel" : "Export data", - "resultsNumber":"Results number", - "selectServiceText": "Select a Service", - "selectProcessText": "Select a Process", - "selectStateText": "Select a State", - "selectTagText": "Select a Tag" + "resultsNumber":"Results number" }, "logging": { "filters": { - "process": "PROCESS", - "selectProcessText": "Select a Process" + "process": "PROCESS" }, "timeOfAction": "TIME OF ACTION", "title": "TITLE", "summary": "SUMMARY", "description": "DESCRIPTION", "sender": "ACTOR", + "service": "SERVICE", "noResult": "Your search did not match any results.", "ExportTOExcel": "Export data", "resultsNumber":"Results number" @@ -347,5 +339,15 @@ "to": "to", "of": "of", "page": "Page" + }, + "filters": { + "service": "SERVICE", + "process": "PROCESS", + "state": "STATE", + "tags": "TAGS", + "selectServiceText": "Select a Service", + "selectProcessText": "Select a Process", + "selectStateText": "Select a State", + "selectTagText": "Select a Tag" } } diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index b14f355303..e02cd39089 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -128,10 +128,6 @@ }, "archive": { "filters": { - "service": "SERVICE", - "process": "PROCESSUS", - "state": "ETAT", - "tags": "ETIQUETTES", "publishDateFrom": "PUBLIE A PARTIR DE", "publishDateTo": "PUBLIE JUSQU'A", "activeFrom": "ACTIVE A PARTIR DE", @@ -147,22 +143,18 @@ }, "noResult": "Votre recherche ne correspond à aucun résultat.", "exportToExcel" : "Exporter les données", - "resultsNumber":"Nombre de résultats", - "selectServiceText": "Sélectionner un Service", - "selectProcessText": "Sélectionner un Processus", - "selectStateText": "Sélectionner un Etat", - "selectTagText": "Sélectionner une Etiquette" + "resultsNumber":"Nombre de résultats" }, "logging": { "filters": { - "process": "PROCESSUS", - "selectProcessText": "Sélectionner un Processus" + "process": "PROCESSUS" }, "timeOfAction": "MOMENT DE L'ACTION", "title": "TITRE", "summary": "RESUME", "description": "DESCRIPTION", "sender": "EMETTEUR", + "service": "SERVICE", "noResult": "Votre recherche ne correspond à aucun résultat.", "ExportTOExcel": "Exporter les données", "resultsNumber":"Nombre de résultats" @@ -347,5 +339,15 @@ "to": "à", "of": "de", "page": "Page" + }, + "filters": { + "service": "SERVICE", + "process": "PROCESSUS", + "state": "ETAT", + "tags": "ETIQUETTES", + "selectServiceText": "Sélectionner un Service", + "selectProcessText": "Sélectionner un Processus", + "selectStateText": "Sélectionner un Etat", + "selectTagText": "Sélectionner une Etiquette" } } From 6b9acc008ff6434fddf04c0dd48059c70f4ddc5f Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Mon, 22 Feb 2021 14:31:20 +0100 Subject: [PATCH 02/45] [OC-1500] Sonar - empty constructors --- .../template/en/chart-line.handlebars | 4 +- ui/main/src/app/common/error/app-error.ts | 8 ++- .../confirmation-dialog.component.ts | 7 +-- .../components/table/admin-table.directive.ts | 12 +++-- .../modules/archives/archives.component.ts | 49 +++++++++---------- .../init-chart/init-chart.component.ts | 34 ++++--------- .../logging-table/logging-table.component.ts | 43 ++++++++-------- .../monitoring-table.component.ts | 33 ++++++------- .../menus/menu-link/menu-link.component.html | 10 ++-- .../menus/menu-link/menu-link.component.ts | 21 +++----- .../base-setting/base-setting.component.html | 13 ----- ...component.ts => base-setting.directive.ts} | 18 +++---- .../checkbox-setting.component.ts | 14 +++--- .../list-setting/list-setting.component.ts | 7 ++- .../multi-settings.component.ts | 7 ++- .../text-setting/text-setting.component.ts | 7 ++- .../app/modules/settings/settings.module.ts | 7 +-- .../src/app/services/export.service.spec.ts | 34 ------------- ui/main/src/app/services/export.service.ts | 13 ++--- ui/main/src/app/services/services.module.ts | 4 +- .../store/actions/authentication.actions.ts | 47 ++++++++---------- ui/main/src/app/store/actions/feed.actions.ts | 8 +-- .../app/store/actions/light-card.actions.ts | 19 +------ ui/main/src/app/store/actions/menu.actions.ts | 11 ++--- .../store/reducers/authentication.reducer.ts | 11 ++--- 25 files changed, 164 insertions(+), 277 deletions(-) delete mode 100644 ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.html rename ui/main/src/app/modules/settings/components/settings/base-setting/{base-setting.component.ts => base-setting.directive.ts} (87%) delete mode 100644 ui/main/src/app/services/export.service.spec.ts diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/chart-line.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/chart-line.handlebars index 70310360c8..34e6cc4804 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/chart-line.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/chart-line.handlebars @@ -1,6 +1,6 @@

-Daily electrical consumption forcast +Daily electrical consumption forecast

@@ -47,4 +47,4 @@ var myChart = new Chart(ctx, { } }); - \ No newline at end of file + diff --git a/ui/main/src/app/common/error/app-error.ts b/ui/main/src/app/common/error/app-error.ts index d2ed6fb2f7..3dd7422960 100644 --- a/ui/main/src/app/common/error/app-error.ts +++ b/ui/main/src/app/common/error/app-error.ts @@ -10,5 +10,11 @@ // TODO I'm not sure why this class is necessary. What does new AppError(null) mean?? export class AppError { - constructor(originalError? ) {} + + public originalError; + + constructor(originalError? ) { + this.originalError = originalError; + } + } diff --git a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts index e50e36b944..e1a8a4d087 100644 --- a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts +++ b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts @@ -8,14 +8,14 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, Input} from '@angular/core'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'of-confirmation-dialog', templateUrl: './confirmation-dialog.component.html' }) -export class ConfirmationDialogComponent implements OnInit { +export class ConfirmationDialogComponent { @Input() title: string; @Input() message: string; @@ -24,9 +24,6 @@ export class ConfirmationDialogComponent implements OnInit { constructor(private activeModal: NgbActiveModal) { } - ngOnInit() { - } - public decline() { this.activeModal.close(false); } diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts index 4d25e5eac0..7079c32527 100644 --- a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts +++ b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts @@ -169,8 +169,10 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { () => { // If modal is closed this.refreshData(); // This refreshes the data when the modal is closed after a change }, - () => { }); // If the modal is dismissed (by clicking the "close" button, the top right cross icon - // or clicking outside the modal, there is no need to refresh the data + () => { + // If the modal is dismissed (by clicking the "close" button, the top right cross icon + // or clicking outside the modal, there is no need to refresh the data + }); } if (columnId === 'delete') { this.openDeleteConfirmationDialog(params.data); @@ -206,8 +208,10 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { this.refreshData(); // This refreshes the data when the modal is closed after a change // Data creation doesn't need to be propagated to the user table }, - () => { }); // If modal is dismissed (by clicking the "close" button, the top right cross icon - // or clicking outside the modal, there is no need to refresh the data + () => { + // If modal is dismissed (by clicking the "close" button, the top right cross icon + // or clicking outside the modal, there is no need to refresh the data + }); } refreshData() { diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts index 7b6a4835ac..a9b68caeb6 100644 --- a/ui/main/src/app/modules/archives/archives.component.ts +++ b/ui/main/src/app/modules/archives/archives.component.ts @@ -24,7 +24,7 @@ import {Page} from '@ofModel/page.model'; import {ExportService} from '@ofServices/export.service'; import {TranslateService} from '@ngx-translate/core'; import {Card} from '@ofModel/card.model'; -import {ArchivesLoggingFiltersComponent} from "../share/archives-logging-filters/archives-logging-filters.component"; +import {ArchivesLoggingFiltersComponent} from '../share/archives-logging-filters/archives-logging-filters.component'; @Component({ @@ -42,7 +42,7 @@ export class ArchivesComponent implements OnDestroy, OnInit { results: LightCard[]; currentPage = 0; - resultsNumber: number = 0; + resultsNumber = 0; hasResult = false; firstQueryHasBeenDone = false; @@ -50,14 +50,13 @@ export class ArchivesComponent implements OnDestroy, OnInit { modalRef: NgbModalRef; @ViewChild('cardDetail') cardDetailTemplate: ElementRef; @ViewChild('filters') filtersTemplate: ArchivesLoggingFiltersComponent; - selectedCard : Card; + selectedCard: Card; constructor(private store: Store, private processesService: ProcessesService, private configService: ConfigService, private timeService: TimeService, private cardService: CardService, - private exportService: ExportService, private translate: TranslateService, private modalService: NgbModal ) { @@ -76,7 +75,7 @@ export class ArchivesComponent implements OnDestroy, OnInit { ngOnInit() { this.size = this.configService.getConfigValue('archive.filters.page.size', 10); - this.results = new Array(); + this.results = []; } resetForm() { @@ -97,8 +96,7 @@ export class ArchivesComponent implements OnDestroy, OnInit { this.resultsNumber = page.totalElements; this.currentPage = page_number + 1; // page on ngb-pagination component start at 1 , and page on backend start at 0 this.firstQueryHasBeenDone = true; - if (page.content.length > 0) this.hasResult = true; - else this.hasResult = false; + this.hasResult = page.content.length > 0; page.content.forEach(card => this.loadTranslationForCardIfNeeded(card)); this.results = page.content; }); @@ -129,12 +127,12 @@ export class ArchivesComponent implements OnDestroy, OnInit { .subscribe((page: Page) => { const lines = page.content; - const severityColumnName = this.translateColomn('archive.result.severity'); - const publishDateColumnName = this.translateColomn('archive.result.publishDate'); - const businessDateColumnName = this.translateColomn('archive.result.businessPeriod'); - const titleColumnName = this.translateColomn('archive.result.title'); - const summaryColumnName = this.translateColomn('archive.result.summary'); - const serviceColumnName = this.translateColomn('archive.result.service'); + const severityColumnName = this.translateColumn('archive.result.severity'); + const publishDateColumnName = this.translateColumn('archive.result.publishDate'); + const businessDateColumnName = this.translateColumn('archive.result.businessPeriod'); + const titleColumnName = this.translateColumn('archive.result.title'); + const summaryColumnName = this.translateColumn('archive.result.summary'); + const serviceColumnName = this.translateColumn('archive.result.service'); lines.forEach((card: LightCard) => { if (typeof card !== undefined) { @@ -144,21 +142,21 @@ export class ArchivesComponent implements OnDestroy, OnInit { [severityColumnName]: card.severity, [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), - [titleColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), - [summaryColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters), - [serviceColumnName]: this.translateColomn(this.filtersTemplate.findServiceLabelForProcess(card.process)) + [titleColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), + [summaryColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters), + [serviceColumnName]: this.translateColumn(this.filtersTemplate.findServiceLabelForProcess(card.process)) }); else exportArchiveData.push({ [severityColumnName]: card.severity, [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), - [titleColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), - [summaryColumnName]: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters) + [titleColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), + [summaryColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters) }); } }); - this.exportService.exportAsExcelFile(exportArchiveData, 'Archive'); + ExportService.exportAsExcelFile(exportArchiveData, 'Archive'); }); } @@ -166,14 +164,14 @@ export class ArchivesComponent implements OnDestroy, OnInit { this.initExportArchiveData(); } - translateColomn(key: string | Array, interpolateParams?: Object): any { - let translatedColomn: number; + translateColumn(key: string | Array, interpolateParams?: Object): any { + let translatedColumn: number; this.translate.get(key, interpolateParams) .pipe(takeUntil(this.unsubscribe$)) - .subscribe((translate) => { translatedColomn = translate; }); + .subscribe((translate) => { translatedColumn = translate; }); - return translatedColomn; + return translatedColumn; } @@ -189,10 +187,9 @@ export class ArchivesComponent implements OnDestroy, OnInit { } getPublishDateTranslationParams(): any { - const param = { + return { 'time': this.timeService.formatDateTime(this.selectedCard.publishDate) - } - return param; + }; } ngOnDestroy() { diff --git a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts index a0baeab192..181b6e0db5 100644 --- a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts +++ b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,7 +8,7 @@ */ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; import * as _ from 'lodash-es'; import * as moment from 'moment'; import {Store} from '@ngrx/store'; @@ -16,20 +16,14 @@ import {AppState} from '@ofStore/index'; import {FilterType} from '@ofServices/filter.service'; import {ApplyFilter} from '@ofActions/feed.actions'; import {TimeService} from '@ofServices/time.service'; -import {GlobalStyleService} from '@ofServices/global-style.service'; -const forwardWeekConf = { - start: {year: 0, month: 0, week: 1, day: 0, hour: 0, minute: 0, second: 0}, - end: {year: 0, month: 0, week: 1, day: 0, hour: 0, minute: 0, second: 0} -}; - @Component({ selector: 'of-init-chart', templateUrl: './init-chart.component.html', styleUrls: ['./init-chart.component.scss'] }) -export class InitChartComponent implements OnInit, OnDestroy { +export class InitChartComponent implements OnInit { @Input() confDomain; @@ -52,7 +46,7 @@ export class InitChartComponent implements OnInit, OnDestroy { public endDate; - constructor(private store: Store, private time: TimeService, private globalStyleService: GlobalStyleService) { + constructor(private store: Store, private time: TimeService) { } @@ -112,11 +106,7 @@ export class InitChartComponent implements OnInit, OnDestroy { selectZoomButton(buttonTitle) { this.buttonList.forEach(button => { - if (button.buttonTitle === buttonTitle) { - button.selected = true; - } else { - button.selected = false; - } + button.selected = button.buttonTitle === buttonTitle; }); } @@ -138,7 +128,7 @@ export class InitChartComponent implements OnInit, OnDestroy { } case '7D': { startDomain = moment().minutes(0).second(0).millisecond(0).subtract(12, 'hours'); - // set position to a mutliple of 4 + // set position to a multiple of 4 for (let i = 0; i < 4; i++) { if (((startDomain.hours() - i) % 4) === 0) { startDomain.subtract(i, 'hours'); @@ -207,13 +197,9 @@ export class InitChartComponent implements OnInit, OnDestroy { } } - - ngOnDestroy() { - } - /** : - * apply arrow button clicked : switch the graph context with the zoom level configurated + * apply arrow button clicked : switch the graph context with the zoom level configured * at the left or right of our actual button selected * @param direction receive by child component custom-timeline-chart */ @@ -254,8 +240,8 @@ export class InitChartComponent implements OnInit, OnDestroy { startDomain = this.goForward(startDomain); endDomain = this.goForward(endDomain); } else { - startDomain = this.goBackword(startDomain); - endDomain = this.goBackword(endDomain); + startDomain = this.goBackward(startDomain); + endDomain = this.goBackward(endDomain); } this.setStartAndEndDomain(startDomain.valueOf(), endDomain.valueOf()); @@ -278,7 +264,7 @@ export class InitChartComponent implements OnInit, OnDestroy { } } - goBackword(dateToMove: moment.Moment) { + goBackward(dateToMove: moment.Moment) { switch (this.domainId) { case 'TR': return dateToMove.subtract(2, 'hour'); diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts index 603bfd6cfd..9b2adf484c 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts @@ -12,7 +12,7 @@ import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { LineOfLoggingResult } from '@ofModel/line-of-logging-result.model'; import { TimeService } from '@ofServices/time.service'; import { Moment } from 'moment-timezone'; -import { CardService } from '../../../../services/card.service'; +import { CardService } from '@ofServices/card.service'; import { selectLoggingCount, selectLoggingFilter } from '@ofSelectors/logging.selectors'; import { Store, select } from '@ngrx/store'; import { Page } from '@ofModel/page.model'; @@ -23,7 +23,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ExportService } from '@ofServices/export.service'; import { FlushLoggingResult, UpdateLoggingPage } from '@ofStore/actions/logging.actions'; import { ConfigService } from '@ofServices/config.service'; -import { LoggingComponent } from "../../logging.component"; +import { LoggingComponent } from '../../logging.component'; @Component({ @@ -49,7 +49,6 @@ export class LoggingTableComponent implements OnInit, OnDestroy { private cardService: CardService, private store: Store, private translate: TranslateService, - private exportService: ExportService, private configService: ConfigService, private parentComponent: LoggingComponent) { } @@ -61,7 +60,7 @@ export class LoggingTableComponent implements OnInit, OnDestroy { catchError(err => of(0)) ); this.size = this.configService.getConfigValue('archive.filters.page.size', 10); - + this.store.select(selectLoggingFilter) .pipe(takeUntil(this.unsubscribe$)) .subscribe(filters => { @@ -93,35 +92,35 @@ export class LoggingTableComponent implements OnInit, OnDestroy { .subscribe((page: Page) => { const lines = page.content; - const timeOfActionColumnName = this.translateColomn('logging.timeOfAction'); - const titleColumnName = this.translateColomn('logging.title'); - const summaryColumnName = this.translateColomn('logging.summary'); - const descriptionColumnName = this.translateColomn('logging.description'); - const senderColumnName = this.translateColomn('logging.sender'); - const serviceColumnName = this.translateColomn('logging.service'); + const timeOfActionColumnName = this.translateColumn('logging.timeOfAction'); + const titleColumnName = this.translateColumn('logging.title'); + const summaryColumnName = this.translateColumn('logging.summary'); + const descriptionColumnName = this.translateColumn('logging.description'); + const senderColumnName = this.translateColumn('logging.sender'); + const serviceColumnName = this.translateColumn('logging.service'); lines.forEach( (line: LineOfLoggingResult) => { if (typeof line !== undefined) { if (this.displayServiceColumn) this.exportLoggingData.push({ [timeOfActionColumnName]: this.timeService.formatDateTime(line.businessDate), - [titleColumnName]: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), - [summaryColumnName]: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), - [descriptionColumnName]: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)), + [titleColumnName]: this.translateColumn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), + [summaryColumnName]: this.translateColumn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), + [descriptionColumnName]: this.translateColumn(this.processStateDescription.get(line.process + '.' + line.state)), [senderColumnName]: line.sender, - [serviceColumnName]: this.translateColomn(this.parentComponent.filters.filtersTemplate.findServiceLabelForProcess(line.process)) + [serviceColumnName]: this.translateColumn(this.parentComponent.filters.filtersTemplate.findServiceLabelForProcess(line.process)) }); else this.exportLoggingData.push({ [timeOfActionColumnName]: this.timeService.formatDateTime(line.businessDate), - [titleColumnName]: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), - [summaryColumnName]: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), - [descriptionColumnName]: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)), + [titleColumnName]: this.translateColumn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters), + [summaryColumnName]: this.translateColumn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters), + [descriptionColumnName]: this.translateColumn(this.processStateDescription.get(line.process + '.' + line.state)), [senderColumnName]: line.sender }); } }); - this.exportService.exportAsExcelFile(this.exportLoggingData, 'Logging'); + ExportService.exportAsExcelFile(this.exportLoggingData, 'Logging'); }); } @@ -129,14 +128,14 @@ export class LoggingTableComponent implements OnInit, OnDestroy { this.initExportLoggingData(); } - translateColomn(key: string | Array, interpolateParams?: Object): any { - let translatedColomn: number; + translateColumn(key: string | Array, interpolateParams?: Object): any { + let translatedColumn: number; this.translate.get(key, interpolateParams) .pipe(takeUntil(this.unsubscribe$)) - .subscribe((translate) => { translatedColomn = translate; }); + .subscribe((translate) => { translatedColumn = translate; }); - return translatedColomn; + return translatedColumn; } diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts index 58ea674b22..db6134f880 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts @@ -39,7 +39,6 @@ export class MonitoringTableComponent implements OnDestroy { constructor(readonly timeService: TimeService , private translate: TranslateService - , private exportService: ExportService , private store: Store , private modalService: NgbModal ) { @@ -59,22 +58,22 @@ export class MonitoringTableComponent implements OnDestroy { this.exportMonitoringData = []; let time: string, businessPeriod: string, processName: any, title: any, summary: any, status: any; - const timeColumnName = this.translateColomn('monitoring.time'); - const businessPeriodColumnName = this.translateColomn('monitoring.businessPeriod'); - const processColumnName = this.translateColomn('monitoring.filters.process'); - const titleColumnName = this.translateColomn('monitoring.title'); - const summaryColumnName = this.translateColomn('monitoring.summary'); - const statusColumnName = this.translateColomn('monitoring.status'); - const severityColumnName = this.translateColomn('monitoring.severity'); + const timeColumnName = this.translateColumn('monitoring.time'); + const businessPeriodColumnName = this.translateColumn('monitoring.businessPeriod'); + const processColumnName = this.translateColumn('monitoring.filters.process'); + const titleColumnName = this.translateColumn('monitoring.title'); + const summaryColumnName = this.translateColumn('monitoring.summary'); + const statusColumnName = this.translateColumn('monitoring.status'); + const severityColumnName = this.translateColumn('monitoring.severity'); this.result.forEach((line: LineOfMonitoringResult) => { if (typeof line !== undefined) { time = this.displayTime(line.creationDateTime); businessPeriod = this.displayTime(line.beginningOfBusinessPeriod).concat(this.displayTime(line.endOfBusinessPeriod)); - processName = this.translateColomn(line.processName); - title = this.translateColomn(line.title.key, line.title.parameters); - summary = this.translateColomn(line.summary.key, line.summary.parameters); - status = this.translateColomn(line.coordinationStatus); + processName = this.translateColumn(line.processName); + title = this.translateColumn(line.title.key, line.title.parameters); + summary = this.translateColumn(line.summary.key, line.summary.parameters); + status = this.translateColumn(line.coordinationStatus); this.exportMonitoringData.push({ [timeColumnName]: time, @@ -91,19 +90,19 @@ export class MonitoringTableComponent implements OnDestroy { export(): void { this.initExportMonitoringData(); - this.exportService.exportAsExcelFile(this.exportMonitoringData, 'Monitoring'); + ExportService.exportAsExcelFile(this.exportMonitoringData, 'Monitoring'); } - translateColomn(key: string | Array, interpolateParams?: Object): any { - let translatedColomn: number; + translateColumn(key: string | Array, interpolateParams?: Object): any { + let translatedColumn: number; this.translate.get(key, interpolateParams) .pipe(takeUntil(this.unsubscribe$)) .subscribe((translate) => { - translatedColomn = translate; + translatedColumn = translate; }); - return translatedColomn; + return translatedColumn; } ngOnDestroy() { diff --git a/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.html b/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.html index 8004e9746a..dfbb065317 100644 --- a/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.html +++ b/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.html @@ -1,4 +1,4 @@ - + @@ -7,15 +7,15 @@ -
+ -
+ -
+ \ No newline at end of file +
diff --git a/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.ts b/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.ts index 6e7d7840de..e8f938f5b0 100644 --- a/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.ts +++ b/ui/main/src/app/modules/navbar/menus/menu-link/menu-link.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,34 +8,29 @@ */ -import {Component, Input, OnInit} from '@angular/core'; -import {Menu, MenuEntry, MenuEntryLinkTypeEnum} from "@ofModel/menu.model"; -import {Store} from "@ngrx/store"; -import {AppState} from "@ofStore/index"; -import { ConfigService} from "@ofServices/config.service"; +import {Component, Input} from '@angular/core'; +import {Menu, MenuEntry, MenuEntryLinkTypeEnum} from '@ofModel/menu.model'; @Component({ selector: 'of-menu-link', templateUrl: './menu-link.component.html', styleUrls: ['./menu-link.component.scss'] }) -export class MenuLinkComponent implements OnInit { +export class MenuLinkComponent { @Input() public menu: Menu; @Input() public menuEntry: MenuEntry; - - constructor(private store: Store,private configService: ConfigService) { + + constructor() { + // No body because all members are Inputs. } - LynkType = MenuEntryLinkTypeEnum + LinkType = MenuEntryLinkTypeEnum; public hasLinkType(type: MenuEntryLinkTypeEnum) { return this.menuEntry.linkType === type; } - ngOnInit() { - - } } diff --git a/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.html b/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.html deleted file mode 100644 index 50a5fa4b49..0000000000 --- a/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - -

- base-setting works! -

diff --git a/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.ts b/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.directive.ts similarity index 87% rename from ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.ts rename to ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.directive.ts index 1bea7b6c10..cafa556ce4 100644 --- a/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.component.ts +++ b/ui/main/src/app/modules/settings/components/settings/base-setting/base-setting.directive.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,7 +8,7 @@ */ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Directive, Injectable, Input, OnDestroy, OnInit} from '@angular/core'; import {AppState} from '@ofStore/index'; import {Store} from '@ngrx/store'; import {PatchSettings} from '@ofActions/settings.actions'; @@ -19,11 +19,9 @@ import {FormGroup} from '@angular/forms'; import * as _ from 'lodash-es'; import {selectIdentifier} from '@ofSelectors/authentication.selectors'; -@Component({ - selector: 'of-base-setting', - templateUrl: './base-setting.component.html' -}) -export class BaseSettingComponent implements OnInit, OnDestroy { +@Directive() +@Injectable() +export abstract class BaseSettingDirective implements OnInit, OnDestroy { @Input() public settingPath: string; @Input() public messagePlaceholder: string; @@ -33,7 +31,7 @@ export class BaseSettingComponent implements OnInit, OnDestroy { form: FormGroup; private baseSettings = {}; - constructor(protected store: Store) { + protected constructor(protected store: Store) { } @@ -73,9 +71,7 @@ export class BaseSettingComponent implements OnInit, OnDestroy { this.ngUnsubscribe$.complete(); } - protected updateValue(value: any) { - - } + protected abstract updateValue(value: any); protected initFormGroup(): FormGroup { return null; diff --git a/ui/main/src/app/modules/settings/components/settings/checkbox-setting/checkbox-setting.component.ts b/ui/main/src/app/modules/settings/components/settings/checkbox-setting/checkbox-setting.component.ts index a9fd38fc88..0102f0891b 100644 --- a/ui/main/src/app/modules/settings/components/settings/checkbox-setting/checkbox-setting.component.ts +++ b/ui/main/src/app/modules/settings/components/settings/checkbox-setting/checkbox-setting.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -9,17 +9,17 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {BaseSettingComponent} from "../base-setting/base-setting.component"; -import {Store} from "@ngrx/store"; -import {AppState} from "@ofStore/index"; -import {FormControl, FormGroup} from "@angular/forms"; +import {BaseSettingDirective} from '../base-setting/base-setting.directive'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {FormControl, FormGroup} from '@angular/forms'; @Component({ selector: 'of-checkbox-setting', templateUrl: './checkbox-setting.component.html', styleUrls: ['./checkbox-setting.component.scss'] }) -export class CheckboxSettingComponent extends BaseSettingComponent implements OnInit, OnDestroy { +export class CheckboxSettingComponent extends BaseSettingDirective implements OnInit, OnDestroy { @Input() public labelClass: string; @@ -35,7 +35,7 @@ export class CheckboxSettingComponent extends BaseSettingComponent implements On return new FormGroup({ setting: new FormControl('') }, {updateOn: 'change'}); - //No need for validators are the checkbox input type can only create boolean values + // No need for validators are the checkbox input type can only create boolean values } updateValue(value) { diff --git a/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.ts b/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.ts index 57bd0fde9f..79686c9341 100644 --- a/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.ts +++ b/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,9 +8,8 @@ */ - import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {BaseSettingComponent} from '../base-setting/base-setting.component'; +import {BaseSettingDirective} from '../base-setting/base-setting.directive'; import {AppState} from '@ofStore/index'; import {Store} from '@ngrx/store'; import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms'; @@ -22,7 +21,7 @@ import {Observable, of} from 'rxjs'; selector: 'of-list-setting', templateUrl: './list-setting.component.html' }) -export class ListSettingComponent extends BaseSettingComponent implements OnInit, OnDestroy { +export class ListSettingComponent extends BaseSettingDirective implements OnInit, OnDestroy { @Input() values: ({ value: string, label: (I18n | string) } | string)[]; preparedList: { value: string, label: Observable }[]; diff --git a/ui/main/src/app/modules/settings/components/settings/multi-settings/multi-settings.component.ts b/ui/main/src/app/modules/settings/components/settings/multi-settings/multi-settings.component.ts index cbc4494d70..9e68d4cc13 100644 --- a/ui/main/src/app/modules/settings/components/settings/multi-settings/multi-settings.component.ts +++ b/ui/main/src/app/modules/settings/components/settings/multi-settings/multi-settings.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,9 +8,8 @@ */ - import {Component, OnDestroy, OnInit} from '@angular/core'; -import {BaseSettingComponent} from '../base-setting/base-setting.component'; +import {BaseSettingDirective} from '../base-setting/base-setting.directive'; import {Store} from '@ngrx/store'; import {AppState} from '@ofStore/index'; import {FormControl, FormGroup, Validators} from '@angular/forms'; @@ -19,7 +18,7 @@ import {FormControl, FormGroup, Validators} from '@angular/forms'; selector: 'of-multi-settings', templateUrl: './multi-settings.component.html' }) -export class MultiSettingsComponent extends BaseSettingComponent implements OnInit, OnDestroy { +export class MultiSettingsComponent extends BaseSettingDirective implements OnInit, OnDestroy { constructor(protected store: Store) { super(store); diff --git a/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.ts b/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.ts index 8d2d39fe50..ae2c5f309a 100644 --- a/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.ts +++ b/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,9 +8,8 @@ */ - import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {BaseSettingComponent} from '../base-setting/base-setting.component'; +import {BaseSettingDirective} from '../base-setting/base-setting.directive'; import {AppState} from '@ofStore/index'; import {Store} from '@ngrx/store'; import {FormControl, FormGroup, Validators} from '@angular/forms'; @@ -20,7 +19,7 @@ import {FormControl, FormGroup, Validators} from '@angular/forms'; selector: 'of-text-setting', templateUrl: './text-setting.component.html' }) -export class TextSettingComponent extends BaseSettingComponent implements OnInit, OnDestroy { +export class TextSettingComponent extends BaseSettingDirective implements OnInit, OnDestroy { @Input() pattern: string; @Input() disabled: boolean; diff --git a/ui/main/src/app/modules/settings/settings.module.ts b/ui/main/src/app/modules/settings/settings.module.ts index 5057ae0c17..d61fa08b87 100644 --- a/ui/main/src/app/modules/settings/settings.module.ts +++ b/ui/main/src/app/modules/settings/settings.module.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,12 +8,10 @@ */ - import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {SettingsRoutingModule} from './settings-routing.module'; import {SettingsComponent} from './components/settings/settings.component'; -import {BaseSettingComponent} from './components/settings/base-setting/base-setting.component'; import {TextSettingComponent} from './components/settings/text-setting/text-setting.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {TranslateModule} from '@ngx-translate/core'; @@ -21,11 +19,10 @@ import {ListSettingComponent} from './components/settings/list-setting/list-sett import {MultiSettingsComponent} from './components/settings/multi-settings/multi-settings.component'; import {TypeAheadSettingsComponent} from './components/settings/type-ahead-settings/type-ahead-settings.component'; import {TypeaheadModule} from 'ngx-type-ahead'; -import { CheckboxSettingComponent } from './components/settings/checkbox-setting/checkbox-setting.component'; +import {CheckboxSettingComponent} from './components/settings/checkbox-setting/checkbox-setting.component'; @NgModule({ declarations: [SettingsComponent - , BaseSettingComponent , TextSettingComponent , ListSettingComponent , MultiSettingsComponent diff --git a/ui/main/src/app/services/export.service.spec.ts b/ui/main/src/app/services/export.service.spec.ts deleted file mode 100644 index 2ee87475ae..0000000000 --- a/ui/main/src/app/services/export.service.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * Copyright (c) 2020, RTEi (http://www.rte-international.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - -import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { StoreModule } from '@ngrx/store'; -import { appReducer } from '@ofStore/index'; - -import { ExportService } from './export.service'; - -describe('ExportService', () => { - let service: ExportService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, - StoreModule.forRoot(appReducer)], - providers: [ExportService] - - }); - service = TestBed.inject(ExportService); - - }); - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/ui/main/src/app/services/export.service.ts b/ui/main/src/app/services/export.service.ts index 1c1cb56d9f..9f23eb2c58 100644 --- a/ui/main/src/app/services/export.service.ts +++ b/ui/main/src/app/services/export.service.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public @@ -7,27 +7,22 @@ * SPDX-License-Identifier: MPL-2.0 * This file is part of the OperatorFabric project. */ -import {Injectable} from '@angular/core'; import * as XLSX from 'xlsx'; import {saveAs} from 'file-saver-es'; const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'; const EXCEL_EXTENSION = '.xlsx'; -@Injectable() -export class ExportService { +export abstract class ExportService { - constructor() { - } - - public exportAsExcelFile(json: any[], excelFileName: string): void { + public static exportAsExcelFile(json: any[], excelFileName: string): void { const worksheet: XLSX.WorkSheet = XLSX.utils.json_to_sheet(json); const workbook: XLSX.WorkBook = { Sheets: { 'data': worksheet }, SheetNames: ['data'] }; const excelBuffer: any = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }); this.saveAsExcelFile(excelBuffer, excelFileName); } - private saveAsExcelFile(buffer: any, fileName: string): void { + private static saveAsExcelFile(buffer: any, fileName: string): void { const data: Blob = new Blob([buffer], { type: EXCEL_TYPE }); diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts index b16100d548..b05b94992c 100644 --- a/ui/main/src/app/services/services.module.ts +++ b/ui/main/src/app/services/services.module.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com)Copyright (c) 2020, RTEi (http://www.rte-international.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public @@ -27,7 +27,6 @@ import {GlobalStyleService} from '@ofServices/global-style.service'; import {AppService} from './app.service'; import {GroupsService} from './groups.service'; import {EntitiesService} from './entities.service'; -import {ExportService} from './export.service'; import {ReminderService} from '@ofServices/reminder/reminder.service'; @NgModule({ @@ -38,7 +37,6 @@ import {ReminderService} from '@ofServices/reminder/reminder.service'; ConfigService, SettingsService, CardService, - ExportService, AuthenticationService, TimeService, ProcessesService, diff --git a/ui/main/src/app/store/actions/authentication.actions.ts b/ui/main/src/app/store/actions/authentication.actions.ts index e2055bac3e..a1f25d97bc 100644 --- a/ui/main/src/app/store/actions/authentication.actions.ts +++ b/ui/main/src/app/store/actions/authentication.actions.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,26 +8,25 @@ */ - import {Action} from '@ngrx/store'; import {Guid} from 'guid-typescript'; -import {Message} from "@ofModel/message.model"; +import {Message} from '@ofModel/message.model'; export enum AuthenticationActionTypes { InitAuthStatus = '[Authentication] Init Authentication Status' - ,CheckAuthenticationStatus = '[Authentication] Check Authentication Status' - ,AcceptLogIn = '[Authentication] Accept the user log in attempt' - ,RejectLogIn = '[Authentication] Reject the user log in attempt' - ,TryToLogIn = '[Authentication] Try to log the user in' - ,TryToLogOut = '[Authentication] Try to log the user out' - ,AcceptLogOut = '[Authentication] Accept the user log out attempt' - ,AcceptLogOutSuccess = '[Authentication] Success Accept the user log out attempt' - ,CheckImplicitFlowAuthenticationStatus = '[Authentication] Check Authentication Status specifically for the Implicit Flow' - ,UselessAuthAction = '[Authentication] Test purpose action' + , CheckAuthenticationStatus = '[Authentication] Check Authentication Status' + , AcceptLogIn = '[Authentication] Accept the user log in attempt' + , RejectLogIn = '[Authentication] Reject the user log in attempt' + , TryToLogIn = '[Authentication] Try to log the user in' + , TryToLogOut = '[Authentication] Try to log the user out' + , AcceptLogOut = '[Authentication] Accept the user log out attempt' + , AcceptLogOutSuccess = '[Authentication] Success Accept the user log out attempt' + , CheckImplicitFlowAuthenticationStatus = '[Authentication] Check Authentication Status specifically for the Implicit Flow' + , UselessAuthAction = '[Authentication] Test purpose action' // TODO the following actions should be merge with password and code flow management of authentication - ,ImplicitallyAuthenticated = '[Authentication] User is authentication using Implicit Flow' - ,UnAuthenticationFromImplicitFlow = '[Authentication] User is log out by implicit Flow internal managment' - ,UnableToRefreshOrGetToken = '[Authentication] The token can not be refresh or we cannot get a token' + , ImplicitlyAuthenticated = '[Authentication] User is authentication using Implicit Flow' + , UnAuthenticationFromImplicitFlow = '[Authentication] User is log out by implicit Flow internal management' + , UnableToRefreshOrGetToken = '[Authentication] The token can not be refresh or we cannot get a token' } /** @@ -38,8 +37,8 @@ export class PayloadForSuccessfulAuthentication { public clientId: Guid, public token: string, public expirationDate: Date, - public firstName?:string, - public lastName?:string) { + public firstName?: string, + public lastName?: string) { } } @@ -51,7 +50,7 @@ export class InitAuthStatus implements Action { /* istanbul ignore next */ readonly type = AuthenticationActionTypes.InitAuthStatus; /* istanbul ignore next */ - constructor(public payload:{code: string}){} + constructor(public payload: {code: string}) {} } /** @@ -81,10 +80,10 @@ export class AcceptLogIn implements Action { */ export class TryToLogIn implements Action { /* istanbul ignore next */ - readonly type= AuthenticationActionTypes.TryToLogIn; + readonly type = AuthenticationActionTypes.TryToLogIn; /* istanbul ignore next */ - constructor(public payload: {username: string, password: string}){} + constructor(public payload: {username: string, password: string}) {} } /** @@ -112,11 +111,7 @@ export class RejectLogIn implements Action { * */ export class AcceptLogOut implements Action { - /* istanbul ignore next */ readonly type = AuthenticationActionTypes.AcceptLogOut; - - /* istanbul ignore next */ - constructor(){} } /** @@ -133,7 +128,7 @@ export class CheckImplicitFlowAuthenticationStatus implements Action { readonly type = AuthenticationActionTypes.CheckImplicitFlowAuthenticationStatus; } -export class UselessAuthAction implements Action{ +export class UselessAuthAction implements Action { /* istanbul ignore next */ readonly type = AuthenticationActionTypes.UselessAuthAction; @@ -141,7 +136,7 @@ export class UselessAuthAction implements Action{ export class ImplicitlyAuthenticated implements Action { /* istanbul ignore next */ - readonly type = AuthenticationActionTypes.ImplicitallyAuthenticated; + readonly type = AuthenticationActionTypes.ImplicitlyAuthenticated; } export class UnAuthenticationFromImplicitFlow implements Action { diff --git a/ui/main/src/app/store/actions/feed.actions.ts b/ui/main/src/app/store/actions/feed.actions.ts index 36cbb07f76..07c382742d 100644 --- a/ui/main/src/app/store/actions/feed.actions.ts +++ b/ui/main/src/app/store/actions/feed.actions.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -33,16 +33,10 @@ export class ApplyFilter implements Action { export class ChangeSort implements Action { readonly type = FeedActionTypes.ChangeSort; - /* istanbul ignore next */ - constructor() { - } } export class ChangeReadSort implements Action { readonly type = FeedActionTypes.ChangeReadSort; - - constructor() { - } } export class ResetFilter implements Action { diff --git a/ui/main/src/app/store/actions/light-card.actions.ts b/ui/main/src/app/store/actions/light-card.actions.ts index 92ac372d69..7bed7bb7e9 100644 --- a/ui/main/src/app/store/actions/light-card.actions.ts +++ b/ui/main/src/app/store/actions/light-card.actions.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,7 +8,6 @@ */ - import {Action} from '@ngrx/store'; import {LightCard} from '@ofModel/light-card.model'; @@ -16,7 +15,6 @@ export enum LightCardActionTypes { LoadLightCards = '[LCard] Load', EmptyLightCards = '[LCard] Empty', LoadLightCardsSuccess = '[LCard] Load Success', - LoadLightCardsExtendedData = '[LCard] Load Extended Data', LoadLightCardsFailure = '[LCard] Load Fail', SelectLightCard = '[LCard] Select One', ClearLightCardSelection = '[LCard] Clear Light Card Selection', @@ -41,16 +39,7 @@ export class EmptyLightCards implements Action { export class LoadLightCardsSuccess implements Action { readonly type = LightCardActionTypes.LoadLightCardsSuccess; - /* istanbul ignore next */ - constructor(public payload: { lightCards: LightCard[] }) { - } -} - -export class LoadLightCardsExtendedData implements Action { - readonly type = LightCardActionTypes.LoadLightCardsExtendedData; - - /* istanbul ignore next */ - constructor() { + constructor(public payload: {lightCards: LightCard[]} ) { } } @@ -76,8 +65,6 @@ export class ClearLightCardSelection implements Action { readonly type = LightCardActionTypes.ClearLightCardSelection; - constructor() { - } } export class AddLightCardFailure implements Action { @@ -115,8 +102,6 @@ export class UpdateALightCard implements Action { export class LightCardAlreadyUpdated implements Action { readonly type = LightCardActionTypes.LightCardAlreadyUpdated; - constructor() { - } } export type LightCardActions = diff --git a/ui/main/src/app/store/actions/menu.actions.ts b/ui/main/src/app/store/actions/menu.actions.ts index 452f755204..fad9b75c0e 100644 --- a/ui/main/src/app/store/actions/menu.actions.ts +++ b/ui/main/src/app/store/actions/menu.actions.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,24 +8,19 @@ */ - import {Action} from '@ngrx/store'; -import {Menu} from "@ofModel/menu.model"; +import {Menu} from '@ofModel/menu.model'; export enum MenuActionTypes { LoadMenu = '[Menu] Load Menu', LoadMenuSuccess = '[Menu] Load Menu Success', LoadMenuFailure = '[Menu] Load Menu Fail', HandleUnexpectedError = '[Menu] Handle unexpected error', - + } // needed by NGRX entities export class LoadMenu implements Action { readonly type = MenuActionTypes.LoadMenu; - - /* istanbul ignore next */ - constructor() { - } } export class LoadMenuFailure implements Action { readonly type = MenuActionTypes.LoadMenuFailure; diff --git a/ui/main/src/app/store/reducers/authentication.reducer.ts b/ui/main/src/app/store/reducers/authentication.reducer.ts index 187560ea79..f0a821077a 100644 --- a/ui/main/src/app/store/reducers/authentication.reducer.ts +++ b/ui/main/src/app/store/reducers/authentication.reducer.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,7 +8,6 @@ */ - import {AuthenticationActions, AuthenticationActionTypes} from '@ofActions/authentication.actions'; import {authInitialState, AuthState} from '@ofStates/authentication.state'; @@ -21,7 +20,7 @@ export function reducer(state: AuthState = authInitialState, action: Authenticat ...state, code: action.payload.code, message: null - } + }; } case AuthenticationActionTypes.AcceptLogIn: { @@ -60,7 +59,7 @@ export function reducer(state: AuthState = authInitialState, action: Authenticat message: action.payload.error }; } - case AuthenticationActionTypes.ImplicitallyAuthenticated: { + case AuthenticationActionTypes.ImplicitlyAuthenticated: { return { ...state, isImplicitlyAuthenticated: true @@ -70,7 +69,7 @@ export function reducer(state: AuthState = authInitialState, action: Authenticat return { ...state, isImplicitlyAuthenticated: false - } + }; } default: @@ -97,4 +96,4 @@ export const getExpirationTime = (state: AuthState) => { } else { return UTC_beginning_time; } -} +}; From 76e25e91a6c3a95eb4598ccb247169191b9eb573 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Wed, 24 Feb 2021 08:12:08 +0100 Subject: [PATCH 03/45] [OC-1502] Bug - correct rendering of chosen values in multi-select input field Signed-off-by: freddidierRTE --- ui/main/src/assets/styles/styles.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index b176a90895..16f0044d59 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -545,8 +545,11 @@ type-ahead > .badge-primary { } -.opfab-multiselect .c-token { - width: 85%; +// Apply only on archives and logging pages as we want only one value in to see in the input field +.archives-page .opfab-multiselect .c-token, +.archives-login .opfab-multiselect .c-token + { + width: 85%; } .opfab-multiselect::after { From 15efb812f08b5d8786550acb79427afcf59e9d7b Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Wed, 24 Feb 2021 16:34:44 +0100 Subject: [PATCH 04/45] [OC-1089] Add perimeter management to admin screen --- ui/main/src/app/common/utilities.ts | 19 +++ ui/main/src/app/model/perimeter.model.ts | 31 ++++ ui/main/src/app/model/processes.model.ts | 9 +- .../src/app/model/userWithPerimeters.model.ts | 8 +- .../app/modules/admin/admin-routing.module.ts | 5 + .../app/modules/admin/admin.component.html | 3 + ui/main/src/app/modules/admin/admin.module.ts | 33 +++- .../action-cell-renderer.component.html | 0 .../action-cell-renderer.component.ts | 2 +- .../array-cell-renderer.component.html | 0 .../array-cell-renderer.component.ts | 0 .../entity-cell-renderer.component.ts | 2 +- .../group-cell-renderer.component.ts | 2 +- .../process-cell-renderer.component.ts | 25 +++ .../state-rights-cell-renderer.component.html | 18 ++ .../state-rights-cell-renderer.component.scss | 21 +++ .../state-rights-cell-renderer.component.ts | 48 ++++++ .../edit-entity-modal.component.html} | 18 +- .../edit-entity-modal.component.scss} | 0 .../edit-entity-modal.component.ts} | 24 +-- .../groups/edit-group-modal.component.html | 64 +++++++ .../groups/edit-group-modal.component.scss | 17 ++ .../groups/edit-group-modal.component.ts | 112 ++++++++++++ .../edit-perimeter-modal.component.html | 76 +++++++++ .../edit-perimeter-modal.component.scss | 23 +++ .../edit-perimeter-modal.component.ts | 159 ++++++++++++++++++ .../users/edit-user-modal.component.html | 1 + .../users/edit-user-modal.component.ts | 4 +- .../components/table/admin-table.directive.ts | 19 ++- .../table/entities-table.component.ts | 6 +- .../table/groups-table.component.ts | 6 +- .../table/perimeters-table.component.ts | 28 +++ .../components/table/users-table.component.ts | 2 +- .../modules/admin/services/sharing.service.ts | 13 +- .../components/detail/detail.component.ts | 22 +-- .../feedconfiguration.component.ts | 93 +++++----- .../app/modules/logging/logging.component.ts | 14 +- .../single-filter.component.html | 2 +- .../single-filter/single-filter.component.ts | 3 +- .../modules/usercard/usercard.component.ts | 121 +++++++------ .../src/app/services/perimeters.service.ts | 113 +++++++++++++ ui/main/src/assets/i18n/en.json | 22 ++- ui/main/src/assets/i18n/fr.json | 24 ++- ui/main/src/environments/environment.prod.ts | 4 +- ui/main/src/environments/environment.ts | 4 +- 45 files changed, 1006 insertions(+), 214 deletions(-) create mode 100644 ui/main/src/app/common/utilities.ts create mode 100644 ui/main/src/app/model/perimeter.model.ts rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/action-cell-renderer.component.html (100%) rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/action-cell-renderer.component.ts (96%) rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/array-cell-renderer.component.html (100%) rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/array-cell-renderer.component.ts (100%) rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/entity-cell-renderer.component.ts (94%) rename ui/main/src/app/modules/admin/components/{table => cell-renderers}/group-cell-renderer.component.ts (94%) create mode 100644 ui/main/src/app/modules/admin/components/cell-renderers/process-cell-renderer.component.ts create mode 100644 ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.html create mode 100644 ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.scss create mode 100644 ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.ts rename ui/main/src/app/modules/admin/components/editmodal/{groups-entities/edit-entity-group-modal.component.html => entities/edit-entity-modal.component.html} (68%) rename ui/main/src/app/modules/admin/components/editmodal/{groups-entities/edit-entity-group-modal.component.scss => entities/edit-entity-modal.component.scss} (100%) rename ui/main/src/app/modules/admin/components/editmodal/{groups-entities/edit-entity-group-modal.component.ts => entities/edit-entity-modal.component.ts} (76%) create mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.html create mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.scss create mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.ts create mode 100644 ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.html create mode 100644 ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.scss create mode 100644 ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.ts create mode 100644 ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts create mode 100644 ui/main/src/app/services/perimeters.service.ts diff --git a/ui/main/src/app/common/utilities.ts b/ui/main/src/app/common/utilities.ts new file mode 100644 index 0000000000..0745cd90ba --- /dev/null +++ b/ui/main/src/app/common/utilities.ts @@ -0,0 +1,19 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {Process} from '@ofModel/processes.model'; + +export abstract class Utilities { + + public static getI18nPrefixFromProcess (process: Process): string { + return process.id + '.' + process.version + '.'; + } + +} + diff --git a/ui/main/src/app/model/perimeter.model.ts b/ui/main/src/app/model/perimeter.model.ts new file mode 100644 index 0000000000..e9a8f9006b --- /dev/null +++ b/ui/main/src/app/model/perimeter.model.ts @@ -0,0 +1,31 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +export class Perimeter { + public constructor( + readonly id: string, + readonly process: string, + readonly stateRights: Array, + ) { + } + +} + +export class StateRight { + + constructor( + readonly state: string, + readonly right: RightsEnum + ) { + } +} + +export enum RightsEnum { + Write = 'Write', ReceiveAndWrite = 'ReceiveAndWrite', Receive = 'Receive' +} diff --git a/ui/main/src/app/model/processes.model.ts b/ui/main/src/app/model/processes.model.ts index 39fbaed59a..620d989149 100644 --- a/ui/main/src/app/model/processes.model.ts +++ b/ui/main/src/app/model/processes.model.ts @@ -31,11 +31,8 @@ export class Process { return null; } } -} - -export const unfouundProcess: Process = new Process('', '', 'process.not-found', - [], null, null); +} export class UiVisibility { @@ -87,12 +84,10 @@ export class Response { export enum AcknowledgmentAllowedEnum { ALWAYS = 'Always', - NEVER = 'Never', + NEVER = 'Never', ONLY_WHEN_RESPONSE_DISABLED_FOR_USER = 'OnlyWhenResponseDisabledForUser' } -type Omit = Pick>; - export enum InputType { TEXT, LIST, diff --git a/ui/main/src/app/model/userWithPerimeters.model.ts b/ui/main/src/app/model/userWithPerimeters.model.ts index 9c801c8a9e..d2224328b5 100644 --- a/ui/main/src/app/model/userWithPerimeters.model.ts +++ b/ui/main/src/app/model/userWithPerimeters.model.ts @@ -7,7 +7,8 @@ * This file is part of the OperatorFabric project. */ -import { User } from '@ofModel/user.model'; +import {User} from '@ofModel/user.model'; +import {RightsEnum} from '@ofModel/perimeter.model'; export class UserWithPerimeters { @@ -30,11 +31,6 @@ export class ComputedPerimeter { } -export enum RightsEnum { - Write = 'Write', ReceiveAndWrite = 'ReceiveAndWrite', Receive = 'Receive' -} - - export function userRight(rights: RightsEnum) { let result; switch (rights) { diff --git a/ui/main/src/app/modules/admin/admin-routing.module.ts b/ui/main/src/app/modules/admin/admin-routing.module.ts index 0c1a443ef3..41e156e090 100644 --- a/ui/main/src/app/modules/admin/admin-routing.module.ts +++ b/ui/main/src/app/modules/admin/admin-routing.module.ts @@ -14,6 +14,7 @@ import {AdminComponent} from './admin.component'; import {UsersTableComponent} from './components/table/users-table.component'; import {GroupsTableComponent} from './components/table/groups-table.component'; import {EntitiesTableComponent} from './components/table/entities-table.component'; +import {PerimetersTableComponent} from './components/table/perimeters-table.component'; const defaultPath = 'users'; @@ -34,6 +35,10 @@ const routes: Routes = [ path: 'groups', component: GroupsTableComponent }, + { + path: 'perimeters', + component: PerimetersTableComponent + }, { path: '**', redirectTo: defaultPath } diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html index d123337ffa..ab53633743 100644 --- a/ui/main/src/app/modules/admin/admin.component.html +++ b/ui/main/src/app/modules/admin/admin.component.html @@ -20,6 +20,9 @@
  • admin.tabs.groups
    • +
  • + admin.tabs.perimeters +

    • diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts index 6aad6ba628..3f2d620929 100644 --- a/ui/main/src/app/modules/admin/admin.module.ts +++ b/ui/main/src/app/modules/admin/admin.module.ts @@ -17,18 +17,25 @@ import {AdminRoutingModule} from './admin-routing.module'; import {TranslateModule} from '@ngx-translate/core'; import {AppErrorHandler} from 'app/common/error/app-error-handler'; import {ConfirmationDialogComponent} from './components/confirmation-dialog/confirmation-dialog.component'; -import {EditEntityGroupModalComponent} from './components/editmodal/groups-entities/edit-entity-group-modal.component'; import {UsersTableComponent} from './components/table/users-table.component'; import {EditUserModalComponent} from './components/editmodal/users/edit-user-modal.component'; import {EntitiesTableComponent} from './components/table/entities-table.component'; import {GroupsTableComponent} from './components/table/groups-table.component'; import {AgGridModule} from 'ag-grid-angular'; import {MultiFilterModule} from '../share/multi-filter/multi-filter.module'; -import {ArrayCellRendererComponent} from './components/table/array-cell-renderer.component'; -import {ActionCellRendererComponent} from './components/table/action-cell-renderer.component'; -import {GroupCellRendererComponent} from './components/table/group-cell-renderer.component'; -import {EntityCellRendererComponent} from './components/table/entity-cell-renderer.component'; +import {ArrayCellRendererComponent} from './components/cell-renderers/array-cell-renderer.component'; +import {ActionCellRendererComponent} from './components/cell-renderers/action-cell-renderer.component'; +import {GroupCellRendererComponent} from './components/cell-renderers/group-cell-renderer.component'; +import {EntityCellRendererComponent} from './components/cell-renderers/entity-cell-renderer.component'; import {SharingService} from './services/sharing.service'; +import {PerimetersTableComponent} from './components/table/perimeters-table.component'; +import {StateRightsCellRendererComponent} from './components/cell-renderers/state-rights-cell-renderer.component'; +import {EditEntityModalComponent} from './components/editmodal/entities/edit-entity-modal.component'; +import {EditGroupModalComponent} from './components/editmodal/groups/edit-group-modal.component'; +import {EditPerimeterModalComponent} from './components/editmodal/perimeters/edit-perimeter-modal.component'; +import {SingleFilterModule} from '../share/single-filter/single-filter.module'; +import {ProcessCellRendererComponent} from './components/cell-renderers/process-cell-renderer.component'; +import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; @NgModule({ declarations: [ @@ -36,13 +43,18 @@ import {SharingService} from './services/sharing.service'; UsersTableComponent, EntitiesTableComponent, GroupsTableComponent, + PerimetersTableComponent, EditUserModalComponent, ConfirmationDialogComponent, - EditEntityGroupModalComponent, + EditEntityModalComponent, + EditGroupModalComponent, + EditPerimeterModalComponent, ActionCellRendererComponent, ArrayCellRendererComponent, GroupCellRendererComponent, - EntityCellRendererComponent + EntityCellRendererComponent, + ProcessCellRendererComponent, + StateRightsCellRendererComponent ], @@ -54,12 +66,15 @@ import {SharingService} from './services/sharing.service'; , CommonModule , MultiFilterModule , TranslateModule + , NgbModule , AgGridModule.withComponents([[ ActionCellRendererComponent, ArrayCellRendererComponent, GroupCellRendererComponent, - EntityCellRendererComponent - ]]) + EntityCellRendererComponent, + ProcessCellRendererComponent, + StateRightsCellRendererComponent + ]]), SingleFilterModule ], providers: [ { provide: ErrorHandler, useClass: AppErrorHandler }, diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/cell-renderers/action-cell-renderer.component.html similarity index 100% rename from ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html rename to ui/main/src/app/modules/admin/components/cell-renderers/action-cell-renderer.component.html diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/action-cell-renderer.component.ts similarity index 96% rename from ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts rename to ui/main/src/app/modules/admin/components/cell-renderers/action-cell-renderer.component.ts index b8ac94b7eb..eabe581700 100644 --- a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts +++ b/ui/main/src/app/modules/admin/components/cell-renderers/action-cell-renderer.component.ts @@ -14,7 +14,7 @@ import {ICellRendererParams} from 'ag-grid-community'; @Component({ selector: 'of-action-cell-renderer', - templateUrl: 'action-cell-renderer.component.html', + templateUrl: './action-cell-renderer.component.html', }) export class ActionCellRendererComponent implements ICellRendererAngularComp { diff --git a/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/cell-renderers/array-cell-renderer.component.html similarity index 100% rename from ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html rename to ui/main/src/app/modules/admin/components/cell-renderers/array-cell-renderer.component.html diff --git a/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/array-cell-renderer.component.ts similarity index 100% rename from ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts rename to ui/main/src/app/modules/admin/components/cell-renderers/array-cell-renderer.component.ts diff --git a/ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/entity-cell-renderer.component.ts similarity index 94% rename from ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts rename to ui/main/src/app/modules/admin/components/cell-renderers/entity-cell-renderer.component.ts index d11924bb7b..aa3c91b922 100644 --- a/ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts +++ b/ui/main/src/app/modules/admin/components/cell-renderers/entity-cell-renderer.component.ts @@ -14,7 +14,7 @@ import {AdminItemType} from '../../services/sharing.service'; @Component({ selector: 'of-entity-cell-renderer', - templateUrl: 'array-cell-renderer.component.html' + templateUrl: './array-cell-renderer.component.html' }) export class EntityCellRendererComponent extends ArrayCellRendererComponent { diff --git a/ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/group-cell-renderer.component.ts similarity index 94% rename from ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts rename to ui/main/src/app/modules/admin/components/cell-renderers/group-cell-renderer.component.ts index eea8b0df2c..07b937cf2e 100644 --- a/ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts +++ b/ui/main/src/app/modules/admin/components/cell-renderers/group-cell-renderer.component.ts @@ -13,7 +13,7 @@ import {AdminItemType} from '../../services/sharing.service'; @Component({ selector: 'of-group-cell-renderer', - templateUrl: 'array-cell-renderer.component.html', + templateUrl: './array-cell-renderer.component.html', }) export class GroupCellRendererComponent extends ArrayCellRendererComponent { diff --git a/ui/main/src/app/modules/admin/components/cell-renderers/process-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/process-cell-renderer.component.ts new file mode 100644 index 0000000000..ecc5b9c803 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/cell-renderers/process-cell-renderer.component.ts @@ -0,0 +1,25 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {Component} from '@angular/core'; +import {ArrayCellRendererComponent} from './array-cell-renderer.component'; +import {AdminItemType} from '../../services/sharing.service'; + +@Component({ + selector: 'of-process-cell-renderer', + templateUrl: './array-cell-renderer.component.html', +}) +export class ProcessCellRendererComponent extends ArrayCellRendererComponent { + + /** Defining components extending ArrayCellComponent proved necessary rather than using generics or passing the type as a + * constructor parameter because ag-grid only accepts non-generic class names in column definitions. + * */ + + itemType = AdminItemType.GROUP; +} diff --git a/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.html new file mode 100644 index 0000000000..fbf7fde7ea --- /dev/null +++ b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.html @@ -0,0 +1,18 @@ + + + + + + + + + + {{stateRight.state}} + + + + + diff --git a/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.scss b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.scss new file mode 100644 index 0000000000..145898e526 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.scss @@ -0,0 +1,21 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +@import "~assets/styles/_variables.scss"; + +/* import bootstrap*/ +@import '../../../../../../node_modules/bootstrap/scss/bootstrap.scss'; + +.opfab-bg-right-receive {background-color: $gray-500;} +.opfab-bg-right-receiveandwrite {background-color: $blue;} +.opfab-bg-right-write {background-color: lighten($blue,30);} + +.badge { + color: $dark; +} diff --git a/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.ts new file mode 100644 index 0000000000..c8e0a93697 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/cell-renderers/state-rights-cell-renderer.component.ts @@ -0,0 +1,48 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +import {Component} from '@angular/core'; +import {ICellRendererAngularComp} from 'ag-grid-angular'; +import {ICellRendererParams} from 'ag-grid-community'; +import {StateRight} from '@ofModel/perimeter.model'; + +@Component({ + selector: 'of-state-rights-cell-renderer', + templateUrl: './state-rights-cell-renderer.component.html', + styleUrls: ['./state-rights-cell-renderer.component.scss'] +}) +export class StateRightsCellRendererComponent implements ICellRendererAngularComp { + + constructor() { + } + + // For explanations regarding ag-grid CellRenderers see + // https://www.ag-grid.com/documentation/angular/component-cell-renderer/#example-rendering-using-angular-components + private _stateRightsValues: StateRight[]; + + + agInit(params: any): void { + + this._stateRightsValues = params.getValue(); + + } + + /** This method returns true to signal to the grid that this renderer doesn't need to be recreated if the underlying data changes + * See https://www.ag-grid.com/documentation/angular/component-cell-renderer/#handling-refresh + * */ + refresh(params: ICellRendererParams): boolean { + return true; + } + + get stateRightsValues(): StateRight[] { + return this._stateRightsValues; + } + +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html similarity index 68% rename from ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.html rename to ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html index a455c7024b..cd3dc7b6be 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.html +++ b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html @@ -10,14 +10,13 @@
    {{row.id}} - admin.input.group.add - admin.input.entity.add -
    - +
    @@ -28,6 +27,7 @@
    admin.input.id.required
    admin.input.id.minLength
    +
    admin.input.id.pattern
    @@ -46,13 +46,11 @@
    - - - - +
    diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.scss similarity index 100% rename from ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.scss rename to ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.scss diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts similarity index 76% rename from ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.ts rename to ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts index 6f464e1e68..df3b0262e3 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.ts +++ b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts @@ -16,15 +16,15 @@ import {AdminItemType, SharingService} from '../../../services/sharing.service'; import {CrudService} from '@ofServices/crud-service'; @Component({ - selector: 'of-edit-entity-group-modal', - templateUrl: './edit-entity-group-modal.component.html', - styleUrls: ['./edit-entity-group-modal.component.scss'] + selector: 'of-edit-entity-modal', + templateUrl: './edit-entity-modal.component.html', + styleUrls: ['./edit-entity-modal.component.scss'] }) -export class EditEntityGroupModalComponent implements OnInit { +export class EditEntityModalComponent implements OnInit { - entityGroupForm = new FormGroup({ + entityForm = new FormGroup({ id: new FormControl('' - , [Validators.required, Validators.minLength(2)]), + , [Validators.required, Validators.minLength(2), Validators.pattern(/^[A-z\d\-_]+$/)]), name: new FormControl('', [Validators.required]), description: new FormControl('') }); @@ -43,7 +43,7 @@ export class EditEntityGroupModalComponent implements OnInit { ngOnInit() { this.crudService = this.dataHandlingService.resolveCrudServiceDependingOnType(this.type); if (this.row) { // If the modal is used for edition, initialize the modal with current data from this row - this.entityGroupForm.patchValue(this.row, { onlySelf: true }); + this.entityForm.patchValue(this.row, { onlySelf: true }); } } @@ -53,14 +53,14 @@ export class EditEntityGroupModalComponent implements OnInit { // user chose to perform an action (here, update the selected item). // This is important as code in the corresponding table components relies on the resolution of the // `NgbModalRef.result` promise to trigger a refresh of the data shown on the table. - this.crudService.update(this.entityGroupForm.value).subscribe(() => { + this.crudService.update(this.entityForm.value).subscribe(() => { this.activeModal.close('Update button clicked on ' + this.type + ' modal'); }); } private cleanForm() { if (this.row) { - this.entityGroupForm.value['id'] = this.row.id; + this.entityForm.value['id'] = this.row.id; } this.id.setValue((this.id.value as string).trim()); this.name.setValue((this.name.value as string).trim()); @@ -69,15 +69,15 @@ export class EditEntityGroupModalComponent implements OnInit { } get id() { - return this.entityGroupForm.get('id') as FormControl; + return this.entityForm.get('id') as FormControl; } get name() { - return this.entityGroupForm.get('name') as FormControl; + return this.entityForm.get('name') as FormControl; } get description() { - return this.entityGroupForm.get('description') as FormControl; + return this.entityForm.get('description') as FormControl; } dismissModal(reason: string): void { diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.html new file mode 100644 index 0000000000..c857623158 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.html @@ -0,0 +1,64 @@ + + + + + + + + + +
    +
    + {{row.id}} + admin.input.{{type}}.add + +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    admin.input.id.required
    +
    admin.input.id.minLength
    +
    admin.input.id.pattern
    +
    + +
    + + +
    +
    +
    admin.input.name.required
    +
    + +
    + + +
    + +
    + + +
    +
    +
    +
    +
    + + + +
    +
    +
    diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.scss new file mode 100644 index 0000000000..81f3c8cca2 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.scss @@ -0,0 +1,17 @@ +/* Copyright (c) 2020, RTEi (http://www.rte-international.com) + * Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +.row { + margin-bottom: 15px; +} + +of-multi-filter { + width: 100%; +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.ts new file mode 100644 index 0000000000..44c48702bc --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/groups/edit-group-modal.component.ts @@ -0,0 +1,112 @@ +/* Copyright (c) 2020, RTEi (http://www.rte-international.com) + * Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +import {Component, Input, OnInit} from '@angular/core'; +import {FormControl, FormGroup, Validators} from '@angular/forms'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {AdminItemType, SharingService} from '../../../services/sharing.service'; +import {CrudService} from '@ofServices/crud-service'; +import {PerimetersService} from '@ofServices/perimeters.service'; + +@Component({ + selector: 'of-edit-group-modal', + templateUrl: './edit-group-modal.component.html', + styleUrls: ['./edit-group-modal.component.scss'] +}) +export class EditGroupModalComponent implements OnInit { + + groupForm = new FormGroup({ + id: new FormControl('' + , [Validators.required, Validators.minLength(2), Validators.pattern(/^[A-z\d\-_]+$/)]), + name: new FormControl('', [Validators.required]), + description: new FormControl(''), + perimeters: new FormControl([]) + }); + + perimetersDropdownList = []; + selectedPerimeters = []; + perimetersDropdownSettings = { + badgeShowLimit: 3, + enableSearchFilter: true + }; + + @Input() row: any; + @Input() type: AdminItemType; + + private crudService: CrudService; + + constructor( + private activeModal: NgbActiveModal, + private dataHandlingService: SharingService, + private perimetersService: PerimetersService + ) { + } + + ngOnInit() { + this.crudService = this.dataHandlingService.resolveCrudServiceDependingOnType(this.type); + + if (this.row) { // If the modal is used for edition, initialize the modal with current data from this row + + // For 'simple' fields (where the value is directly displayed), we use the form's patching method + const {id, name, description} = this.row; + this.groupForm.patchValue({id, name, description}, { onlySelf: false }); + + // Otherwise, we use the selectedItems property of the of-multiselect component + this.selectedPerimeters = this.row.perimeters; + } + + this.perimetersService.getPerimeters().forEach((perimeter) => { + this.perimetersDropdownList.push({ id: perimeter.id }); + }); + } + + update() { + this.cleanForm(); + this.perimeters.setValue(this.perimeters.value.map(entity => entity.id)); + // We call the activeModal "close" method and not "dismiss" to indicate that the modal was closed because the + // user chose to perform an action (here, update the selected item). + // This is important as code in the corresponding table components relies on the resolution of the + // `NgbModalRef.result` promise to trigger a refresh of the data shown on the table. + this.crudService.update(this.groupForm.value).subscribe(() => { + this.activeModal.close('Update button clicked on ' + this.type + ' modal'); + }); + } + + private cleanForm() { + if (this.row) { + this.groupForm.value['id'] = this.row.id; + } + this.id.setValue((this.id.value as string).trim()); + this.name.setValue((this.name.value as string).trim()); + this.description.setValue((this.description.value as string).trim()); + + } + + get id() { + return this.groupForm.get('id') as FormControl; + } + + get name() { + return this.groupForm.get('name') as FormControl; + } + + get description() { + return this.groupForm.get('description') as FormControl; + } + + get perimeters() { + return this.groupForm.get('perimeters') as FormControl; + } + + dismissModal(reason: string): void { + this.activeModal.dismiss(reason); + } +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.html new file mode 100644 index 0000000000..2cd9963dde --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.html @@ -0,0 +1,76 @@ + + + + + + + + + +
    +
    + {{row.id}} + admin.input.perimeter.add + +
    +
    +
    +
    +
    + +
    + + +
    + +
    +
    admin.input.id.required
    +
    admin.input.id.minLength
    +
    admin.input.id.pattern
    +
    + +
    + +
    + +
    + + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + + +
    + + +
    + + + +
    +
    +
    diff --git a/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.scss new file mode 100644 index 0000000000..42b355a742 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.scss @@ -0,0 +1,23 @@ +/* Copyright (c) 2020, RTEi (http://www.rte-international.com) + * Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +.row { + margin-bottom: 15px; +} + +of-single-filter { + width: 100%; +} + +.icons { + font-size: 1rem; + text-align: center; + padding-top: 10px; +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.ts new file mode 100644 index 0000000000..cacd83bcfe --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/perimeters/edit-perimeter-modal.component.ts @@ -0,0 +1,159 @@ +/* Copyright (c) 2020, RTEi (http://www.rte-international.com) + * Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {FormArray, FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; +import {Component, Input, OnInit} from '@angular/core'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {Perimeter, RightsEnum, StateRight} from '@ofModel/perimeter.model'; +import {ProcessesService} from '@ofServices/processes.service'; +import {PerimetersService} from '@ofServices/perimeters.service'; +import {Process} from '@ofModel/processes.model'; +import {Utilities} from '../../../../../common/utilities'; + +@Component({ + selector: 'of-edit-user-modal', + templateUrl: './edit-perimeter-modal.component.html', + styleUrls: ['./edit-perimeter-modal.component.scss'] +}) +export class EditPerimeterModalComponent implements OnInit { + + constructor( + private activeModal: NgbActiveModal, + private crudService: PerimetersService, + private processesService: ProcessesService, + private formBuilder: FormBuilder) { + + this.perimeterForm = this.formBuilder.group({ + id: new FormControl('' + , [Validators.required, Validators.minLength(2), Validators.pattern(/^[A-z\d\-_]+$/)]), + process: new FormControl(''), + stateRights: this.formBuilder.array([EditPerimeterModalComponent.createStateRightFormGroup()]) + }); + + } + + get id() { + return this.perimeterForm.get('id') as FormControl; + } + + get process() { + return this.perimeterForm.get('process') as FormControl; + } + + get stateRights() { + return this.perimeterForm.get('stateRights') as FormGroup; + } + + perimeterForm: FormGroup; + + processesDefinition: Process[]; + processOptions = []; + stateOptions = []; + rightOptions = Object.values(RightsEnum); + + @Input() row: Perimeter; + + private static createStateRightFormGroup(initialState?, initialRight?): FormGroup { + return new FormGroup({ + 'state': new FormControl(initialState ? initialState : '', [Validators.required]), + 'right': new FormControl(initialRight ? initialRight : '', [Validators.required]) + }); + } + + ngOnInit() { + + // Initialize value lists for process inputs + this.initProcessOptions(); + this.changeStatesWhenSelectProcess(); + + if (this.row) { // If the modal is used for edition, initialize the modal with current data from this row + const {id, process, stateRights} = this.row; + this.perimeterForm.patchValue({id, process}, { onlySelf: false }); + const stateRightsControls = this.formBuilder.array(stateRights + .map((stateRight: StateRight) => EditPerimeterModalComponent.createStateRightFormGroup(stateRight.state, stateRight.right))); + this.perimeterForm.setControl('stateRights', stateRightsControls); + } + } + + initProcessOptions(): void { + this.processesDefinition = this.processesService.getAllProcesses(); + + // The dropdown will prefix values with the process Ids because there is no certainty that i18n values are unique across bundles. + this.processesDefinition.forEach((process: Process) => { + const label = process.name ? (Utilities.getI18nPrefixFromProcess(process) + process.name) : process.id; + const processToShow = { value: process.id, label: label }; + this.processOptions.push(processToShow); + }); + } + + changeStatesWhenSelectProcess(): void { + this.perimeterForm.get('process').valueChanges.subscribe((process) => { + + // Update state options based on selected process + if (!!process) { + this.stateOptions = this.processesDefinition.filter(processDef => processDef.id === process) + .flatMap((processDef: Process) => { + const statesToShow = []; + for (const [stateId, value] of Object.entries(processDef.states)) { + statesToShow.push({value: stateId, label: Utilities.getI18nPrefixFromProcess(processDef) + value.name}); + } + return statesToShow; + }); + } + + // Reset stateRights form controls + this.perimeterForm.setControl('stateRights', this.formBuilder.array([EditPerimeterModalComponent.createStateRightFormGroup()])); + }); + } + + create() { + this.cleanForm(); + this.crudService.create(this.perimeterForm.value).subscribe(() => { + this.activeModal.close('Update button clicked on perimeter modal'); + // We call the activeModal "close" method and not "dismiss" to indicate that the modal was closed because the + // user chose to perform an action (here, update the selected item). + // This is important as code in the corresponding table components relies on the resolution of the + // `NgbMobalRef.result` promise to trigger a refresh of the data shown on the table. + }); + } + + update() { + this.cleanForm(); + this.crudService.update(this.perimeterForm.value).subscribe(() => { + this.activeModal.close('Update button clicked on perimeter modal'); + }); + } + + public addStateRightFormGroup() { + const stateRights = this.perimeterForm.get('stateRights') as FormArray; + stateRights.push(EditPerimeterModalComponent.createStateRightFormGroup()); + } + + public removeOrClearStateRight(i: number) { + const emails = this.perimeterForm.get('stateRights') as FormArray; + if (emails.length > 1) { + emails.removeAt(i); + } else { + emails.reset(); + } + } + + private cleanForm() { + if (this.row) { + this.perimeterForm.value['id'] = this.row.id; + } + this.id.setValue((this.id.value as string).trim()); + } + + dismissModal(reason: string): void { + this.activeModal.dismiss(reason); + } + +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.html index 3984c6276f..7e95790b02 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.html +++ b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.html @@ -28,6 +28,7 @@
    admin.input.login.required
    admin.input.login.minLength
    +
    admin.input.id.pattern
    diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.ts index df67f25d6b..c277c2df67 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.ts +++ b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.ts @@ -49,7 +49,7 @@ export class EditUserModalComponent implements OnInit { this.userForm = new FormGroup({ login: new FormControl('' - , [Validators.required, Validators.minLength(4)]), + , [Validators.required, Validators.minLength(4), Validators.pattern(/^[A-z\d\-_]+$/)]), firstName: new FormControl('', [Validators.required]), lastName: new FormControl('', [Validators.required]), groups: new FormControl([]), @@ -61,7 +61,7 @@ export class EditUserModalComponent implements OnInit { ngOnInit() { if (this.row) { // If the modal is used for edition, initialize the modal with current data from this row - // For 'simple' fields (where the value is directly displayed), we use the entityGroupForm's patching method + // For 'simple' fields (where the value is directly displayed), we use the form's patching method const {login, firstName, lastName} = this.row; this.userForm.patchValue({login, firstName, lastName}, { onlySelf: false }); diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts index 7079c32527..4bc8059fa2 100644 --- a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts +++ b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts @@ -16,11 +16,12 @@ import {Subject, throwError} from 'rxjs'; import {ConfirmationDialogService} from '../../services/confirmation-dialog.service'; import {AppError} from '../../../../common/error/app-error'; import {CrudService} from '@ofServices/crud-service'; -import {ActionCellRendererComponent} from './action-cell-renderer.component'; -import {EntityCellRendererComponent} from './entity-cell-renderer.component'; -import {GroupCellRendererComponent} from './group-cell-renderer.component'; +import {ActionCellRendererComponent} from '../cell-renderers/action-cell-renderer.component'; +import {EntityCellRendererComponent} from '../cell-renderers/entity-cell-renderer.component'; +import {GroupCellRendererComponent} from '../cell-renderers/group-cell-renderer.component'; import {AdminItemType, SharingService} from '../../services/sharing.service'; import {takeUntil} from 'rxjs/operators'; +import {StateRightsCellRendererComponent} from '../cell-renderers/state-rights-cell-renderer.component'; @Directive() @Injectable() @@ -32,6 +33,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { // (e.g. EntitiesTableComponent) as they depend on the type of the table /** Modal component to open when editing an item from the table (e.g. `EditEntityGroupModal`) */ public editModalComponent; + public modalOptions = {}; /** Type of data managed by the table (e.g. `AdminItemType.ENTITY`) */ protected tableType: AdminItemType; /** Relevant fields for this data type. They will be used to populate the table columns */ @@ -60,7 +62,8 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { frameworkComponents : { actionCellRenderer: ActionCellRendererComponent, groupCellRenderer: GroupCellRendererComponent, - entityCellRenderer: EntityCellRendererComponent + entityCellRenderer: EntityCellRendererComponent, + stateRightsCellRenderer: StateRightsCellRendererComponent }, domLayout: 'autoHeight', defaultColDef : { @@ -79,7 +82,9 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { 'dataColumn': { sortable: true, filter: true, - flex: 2 + wrapText: true, + autoHeight: true, + flex: 4, } }, localeTextFunc : function (key) { @@ -162,7 +167,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { // This method might be flagged as "unused" by IDEs but it's actually called through the ActionCellRendererComponent const columnId = params.colDef.colId; if (columnId === 'edit') { - const modalRef = this.modalService.open(this.editModalComponent); + const modalRef = this.modalService.open(this.editModalComponent,this.modalOptions); modalRef.componentInstance.type = this.tableType; modalRef.componentInstance.row = params.data; // This passes the data from the edited row to the modal to initialize input values. modalRef.result.then( @@ -199,7 +204,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { } createNewItem(): void { - const modalRef = this.modalService.open(this.editModalComponent); + const modalRef = this.modalService.open(this.editModalComponent,this.modalOptions); modalRef.componentInstance.type = this.tableType; modalRef.result.then( // Hooking the refresh of the data to the closing of the modal seemed simpler than setting up diff --git a/ui/main/src/app/modules/admin/components/table/entities-table.component.ts b/ui/main/src/app/modules/admin/components/table/entities-table.component.ts index 76b42ece02..d881b43a3d 100644 --- a/ui/main/src/app/modules/admin/components/table/entities-table.component.ts +++ b/ui/main/src/app/modules/admin/components/table/entities-table.component.ts @@ -10,7 +10,7 @@ import {Component, OnInit} from '@angular/core'; import {AdminTableDirective, Field} from './admin-table.directive'; -import {EditEntityGroupModalComponent} from '../editmodal/groups-entities/edit-entity-group-modal.component'; +import {EditEntityModalComponent} from '../editmodal/entities/edit-entity-modal.component'; import {AdminItemType} from '../../services/sharing.service'; @Component({ @@ -20,8 +20,8 @@ import {AdminItemType} from '../../services/sharing.service'; export class EntitiesTableComponent extends AdminTableDirective implements OnInit { tableType = AdminItemType.ENTITY; - fields = [new Field('id'), new Field('name'), new Field('description')]; + fields = [new Field('id', 3), new Field('name', 3), new Field('description', 5), new Field('parents', 5, 'entityCellRenderer')]; idField = 'id'; - editModalComponent = EditEntityGroupModalComponent; + editModalComponent = EditEntityModalComponent; } diff --git a/ui/main/src/app/modules/admin/components/table/groups-table.component.ts b/ui/main/src/app/modules/admin/components/table/groups-table.component.ts index 64397e50c7..31f16cf9e3 100644 --- a/ui/main/src/app/modules/admin/components/table/groups-table.component.ts +++ b/ui/main/src/app/modules/admin/components/table/groups-table.component.ts @@ -10,8 +10,8 @@ import {Component, OnInit} from '@angular/core'; import {AdminTableDirective, Field} from './admin-table.directive'; -import {EditEntityGroupModalComponent} from '../editmodal/groups-entities/edit-entity-group-modal.component'; import {AdminItemType} from '../../services/sharing.service'; +import {EditGroupModalComponent} from '../editmodal/groups/edit-group-modal.component'; @Component({ templateUrl: 'admin-table.directive.html', @@ -20,8 +20,8 @@ import {AdminItemType} from '../../services/sharing.service'; export class GroupsTableComponent extends AdminTableDirective implements OnInit { tableType = AdminItemType.GROUP; - fields = [new Field('id'), new Field('name'), new Field('description')]; + fields = [new Field('id', 3), new Field('name', 3), new Field('description', 4), new Field('perimeters', 6)]; idField = 'id'; - editModalComponent = EditEntityGroupModalComponent; + editModalComponent = EditGroupModalComponent; } diff --git a/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts b/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts new file mode 100644 index 0000000000..44a592976b --- /dev/null +++ b/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {Component, OnInit} from '@angular/core'; +import {AdminTableDirective, Field} from './admin-table.directive'; +import {AdminItemType} from '../../services/sharing.service'; +import {EditPerimeterModalComponent} from '../editmodal/perimeters/edit-perimeter-modal.component'; + +@Component({ + templateUrl: 'admin-table.directive.html', + selector: 'of-perimeters-table' +}) +export class PerimetersTableComponent extends AdminTableDirective implements OnInit { + + tableType = AdminItemType.PERIMETER; + fields = [new Field('id'), new Field('process'), new Field('stateRights', 7, 'stateRightsCellRenderer')]; + idField = 'id'; + editModalComponent = EditPerimeterModalComponent; + modalOptions = {size: 'xl'}; + +} diff --git a/ui/main/src/app/modules/admin/components/table/users-table.component.ts b/ui/main/src/app/modules/admin/components/table/users-table.component.ts index 1e2e9a35fb..eed00a1ce7 100644 --- a/ui/main/src/app/modules/admin/components/table/users-table.component.ts +++ b/ui/main/src/app/modules/admin/components/table/users-table.component.ts @@ -21,7 +21,7 @@ export class UsersTableComponent extends AdminTableDirective implements OnInit { tableType = AdminItemType.USER; fields = [new Field('login'), new Field('firstName'), new Field('lastName'), - new Field('groups', 5, 'groupCellRenderer'), new Field('entities', 5, 'entityCellRenderer')]; + new Field('groups', 8, 'groupCellRenderer'), new Field('entities', 8, 'entityCellRenderer')]; idField = 'login'; editModalComponent = EditUserModalComponent; diff --git a/ui/main/src/app/modules/admin/services/sharing.service.ts b/ui/main/src/app/modules/admin/services/sharing.service.ts index e47e4f748a..ea5fd9ef5e 100644 --- a/ui/main/src/app/modules/admin/services/sharing.service.ts +++ b/ui/main/src/app/modules/admin/services/sharing.service.ts @@ -16,6 +16,7 @@ import {CrudService} from '@ofServices/crud-service'; import {CachedCrudService} from '@ofServices/cached-crud-service'; import {Observable, ReplaySubject, Subject} from 'rxjs'; import {takeUntil} from 'rxjs/operators'; +import {PerimetersService} from '@ofServices/perimeters.service'; /** The aim of this service is to provide the services that need to be shared between components of the admin screen. For example, a single * instance of `EntitiesService` should be used across all components so a update to the cache is visible from all components. @@ -31,13 +32,15 @@ export class SharingService implements OnDestroy { constructor(private entitiesService: EntitiesService, private groupsService: GroupsService, - private userService: UserService) { + private userService: UserService, + private perimetersService: PerimetersService) { this._paginationPageSize$ = new ReplaySubject(); - // Initialization necessary for groups selection dropdown in modals and to display names instead of codes + // Initialization necessary for groups/perimeters selection dropdown in modals and to display names instead of codes // As it is only necessary for admin purposes, it's done here rather than in the app initialization code this.groupsService.loadAllGroupsData().pipe(takeUntil(this.unsubscribe$)).subscribe(); + this.perimetersService.loadAllPerimetersData().pipe(takeUntil(this.unsubscribe$)).subscribe(); } /** This is a factory method returning the appropriate `CrudService` depending on the type passed as parameter. @@ -47,6 +50,7 @@ export class SharingService implements OnDestroy { case AdminItemType.ENTITY: return this.entitiesService; case AdminItemType.GROUP: return this.groupsService; case AdminItemType.USER: return this.userService; + case AdminItemType.PERIMETER: return this.perimetersService; default: throw Error('No CrudService associated with ' + adminItemType); } } @@ -57,6 +61,7 @@ export class SharingService implements OnDestroy { switch (adminItemType) { case AdminItemType.ENTITY: return this.entitiesService; case AdminItemType.GROUP: return this.groupsService; + case AdminItemType.PERIMETER: return this.perimetersService; default: throw Error('No CachedCrudService associated with ' + adminItemType); } } @@ -81,5 +86,7 @@ export class SharingService implements OnDestroy { export enum AdminItemType { USER = 'user', ENTITY = 'entity', - GROUP = 'group' + GROUP = 'group', + PERIMETER = 'perimeter', + PROCESS = 'process' } diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 8540764857..1396f6bee2 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -40,7 +40,7 @@ import {LightCard, Severity} from '@ofModel/light-card.model'; import {AppService, PageType} from '@ofServices/app.service'; import {User} from '@ofModel/user.model'; import {Map} from '@ofModel/map'; -import {RightsEnum, userRight} from '@ofModel/userWithPerimeters.model'; +import {userRight} from '@ofModel/userWithPerimeters.model'; import {ClearLightCardSelection, UpdateALightCard} from '@ofStore/actions/light-card.actions'; import {UserService} from '@ofServices/user.service'; import {EntitiesService} from '@ofServices/entities.service'; @@ -50,6 +50,7 @@ import {ConfigService} from '@ofServices/config.service'; import {TimeService} from '@ofServices/time.service'; import {AlertMessage} from '@ofStore/actions/alert.actions'; import {MessageLevel} from '@ofModel/message.model'; +import {RightsEnum} from '@ofModel/perimeter.model'; declare const templateGateway: any; @@ -164,13 +165,13 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } open(content) { - const modalOptions = { windowClass : "opfab-modal-content"} + const modalOptions = { windowClass : 'opfab-modal-content'}; this.modalRef = this.modalService.open(content, modalOptions); } adaptTemplateSize() { const cardTemplate = document.getElementById('div-card-template'); - if (!!cardTemplate) { + if (!!cardTemplate) { const diffWindow = cardTemplate.getBoundingClientRect(); const divBtn = document.getElementById('div-detail-btn'); @@ -295,10 +296,9 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC getPublishDateTranslationParams(): any { - const param = { + return { 'time': this.time.formatDateTime(this.card.publishDate) - } - return param; + }; } @@ -495,8 +495,8 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC let permission = false; this.userService.getCurrentUserWithPerimeters().computedPerimeters.forEach(perim => { if ((perim.process === this.card.process) && (perim.state === this._responseData.state) - && (this.compareRightAction(perim.rights, RightsEnum.Write) - || this.compareRightAction(perim.rights, RightsEnum.ReceiveAndWrite))) { + && (DetailComponent.compareRightAction(perim.rights, RightsEnum.Write) + || DetailComponent.compareRightAction(perim.rights, RightsEnum.ReceiveAndWrite))) { permission = true; return true; } @@ -520,8 +520,8 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC userWithPerimeters.computedPerimeters.forEach(perim => { if ((perim.process === this.card.process) && (perim.state === this.card.state) - && (this.compareRightAction(perim.rights, RightsEnum.Write) - || this.compareRightAction(perim.rights, RightsEnum.ReceiveAndWrite))) { + && (DetailComponent.compareRightAction(perim.rights, RightsEnum.Write) + || DetailComponent.compareRightAction(perim.rights, RightsEnum.ReceiveAndWrite))) { permission = true; return true; } @@ -530,7 +530,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC return permission; } - private compareRightAction(userRights: RightsEnum, rightsAction: RightsEnum): boolean { + private static compareRightAction(userRights: RightsEnum, rightsAction: RightsEnum): boolean { return (userRight(userRights) - userRight(rightsAction)) === 0; } diff --git a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts index bf55bb9378..9e17e70f9b 100644 --- a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts +++ b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts @@ -8,19 +8,20 @@ */ import {Component, OnInit} from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '@ofStore/index'; -import { UserService } from '@ofServices/user.service'; -import { Process } from '@ofModel/processes.model'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; -import { UserWithPerimeters } from '@ofModel/userWithPerimeters.model'; -import { ProcessesService } from '@ofServices/processes.service'; -import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms'; -import { SettingsService } from '@ofServices/settings.service'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {UserService} from '@ofServices/user.service'; +import {Process} from '@ofModel/processes.model'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModalRef} from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; +import {UserWithPerimeters} from '@ofModel/userWithPerimeters.model'; +import {ProcessesService} from '@ofServices/processes.service'; +import {FormArray, FormBuilder, FormControl, FormGroup} from '@angular/forms'; +import {SettingsService} from '@ofServices/settings.service'; import {CardService} from '@ofServices/card.service'; import {EmptyLightCards} from '@ofActions/light-card.actions'; -import {TranslateService} from "@ngx-translate/core"; +import {TranslateService} from '@ngx-translate/core'; +import {Utilities} from '../../common/utilities'; @Component({ @@ -35,16 +36,16 @@ export class FeedconfigurationComponent implements OnInit { processesDefinition: Process[]; processGroupsData: {id: string, groupLabel?: string, processes: string[]}[]; processesWithoutGroup: { idProcess: string, - processLabel: string }[]; + processLabel: string }[]; currentUserWithPerimeters: UserWithPerimeters; processesStatesLabels: Map; + states: + { stateLabel: string, + stateControlIndex: number + }[] + }>; preparedListOfProcessesStates: { processId: string, - stateId: string }[]; + stateId: string }[]; modalRef: NgbModalRef; @@ -62,11 +63,11 @@ export class FeedconfigurationComponent implements OnInit { private translateService: TranslateService ) { this.processesStatesLabels = new Map (); + states: + { stateLabel: string, + stateControlIndex: number + }[] + }> (); this.preparedListOfProcessesStates = []; this.processesWithoutGroup = []; this.processesDefinition = this.processesService.getAllProcesses(); @@ -88,12 +89,12 @@ export class FeedconfigurationComponent implements OnInit { private makeProcessesWithoutGroup() { this.processesDefinition.forEach(process => { if (! this.findInProcessGroups(process.id)) { - let processLabel = (!!process.name) ? this.getI18nPrefixFromProcess(process) + process.name : - this.getI18nPrefixFromProcess(process) + process.id; + let processLabel = (!!process.name) ? Utilities.getI18nPrefixFromProcess(process) + process.name : + Utilities.getI18nPrefixFromProcess(process) + process.id; this.translateService.get(processLabel).subscribe(translate => { processLabel = translate; }); this.processesWithoutGroup.push({idProcess: process.id, - processLabel: processLabel}); + processLabel: processLabel}); } }); this.processesWithoutGroup.sort((obj1, obj2) => this.compareObj(obj1.processLabel, obj2.processLabel)); @@ -102,8 +103,8 @@ export class FeedconfigurationComponent implements OnInit { private addCheckboxesInFormArray() { const processesStatesNotNotified = ((!! this.currentUserWithPerimeters.processesStatesNotNotified) ? - this.currentUserWithPerimeters.processesStatesNotNotified : - null); + this.currentUserWithPerimeters.processesStatesNotNotified : + null); this.processesDefinition.forEach(process => { for (const key in process.states) { @@ -126,14 +127,14 @@ export class FeedconfigurationComponent implements OnInit { const statesArray: { stateLabel: string, stateControlIndex: number }[] = new Array<{stateLabel: string, stateControlIndex: number}>(); - let processLabel = (!!process.name) ? this.getI18nPrefixFromProcess(process) + process.name : - this.getI18nPrefixFromProcess(process) + process.id; + let processLabel = (!!process.name) ? Utilities.getI18nPrefixFromProcess(process) + process.name : + Utilities.getI18nPrefixFromProcess(process) + process.id; this.translateService.get(processLabel).subscribe(translate => { processLabel = translate; }); for (const key in process.states) { const value = process.states[key]; - let stateLabel = (!!value.name) ? this.getI18nPrefixFromProcess(process) + value.name : - this.getI18nPrefixFromProcess(process) + key; + let stateLabel = (!!value.name) ? Utilities.getI18nPrefixFromProcess(process) + value.name : + Utilities.getI18nPrefixFromProcess(process) + key; this.translateService.get(stateLabel).subscribe(translate => { stateLabel = translate; }); @@ -145,7 +146,7 @@ export class FeedconfigurationComponent implements OnInit { } statesArray.sort((obj1, obj2) => this.compareObj(obj1.stateLabel, obj2.stateLabel)); this.processesStatesLabels.set(process.id, {processLabel: processLabel, - states: statesArray}); + states: statesArray}); } } } @@ -182,17 +183,17 @@ export class FeedconfigurationComponent implements OnInit { const processesStatesNotNotifiedUpdate = new Map(); this.feedConfigurationForm.value.processesStates.map((checked, i) => { - if (! checked) { - const currentProcessId = this.preparedListOfProcessesStates[i].processId; - const currentStateId = this.preparedListOfProcessesStates[i].stateId; - - const statesNotNotifiedUpdate = processesStatesNotNotifiedUpdate.get(currentProcessId); - if (!! statesNotNotifiedUpdate) - statesNotNotifiedUpdate.push(this.preparedListOfProcessesStates[i].stateId); - else - processesStatesNotNotifiedUpdate.set(currentProcessId, [currentStateId]); - } - }); + if (! checked) { + const currentProcessId = this.preparedListOfProcessesStates[i].processId; + const currentStateId = this.preparedListOfProcessesStates[i].stateId; + + const statesNotNotifiedUpdate = processesStatesNotNotifiedUpdate.get(currentProcessId); + if (!! statesNotNotifiedUpdate) + statesNotNotifiedUpdate.push(this.preparedListOfProcessesStates[i].stateId); + else + processesStatesNotNotifiedUpdate.set(currentProcessId, [currentStateId]); + } + }); this.settingsService.patchUserSettings({login: this.currentUserWithPerimeters.userData.login, processesStatesNotNotified: Object.fromEntries(processesStatesNotNotifiedUpdate)}) @@ -219,10 +220,6 @@ export class FeedconfigurationComponent implements OnInit { ); } - getI18nPrefixFromProcess(process: Process): string { - return process.id + '.' + process.version + '.'; - } - open(content) { this.modalRef = this.modalService.open(content); } diff --git a/ui/main/src/app/modules/logging/logging.component.ts b/ui/main/src/app/modules/logging/logging.component.ts index 4d046abcb0..21f1886c74 100644 --- a/ui/main/src/app/modules/logging/logging.component.ts +++ b/ui/main/src/app/modules/logging/logging.component.ts @@ -16,7 +16,7 @@ import {selectLinesOfLoggingResult} from '@ofSelectors/logging.selectors'; import {map, takeUntil} from 'rxjs/operators'; import {LoggingFiltersComponent} from './components/logging-filters/logging-filters.component'; import {ProcessesService} from '@ofServices/processes.service'; -import {Process} from '@ofModel/processes.model'; +import {Utilities} from '../../common/utilities'; @Component({ selector: 'of-logging', @@ -32,7 +32,7 @@ export class LoggingComponent implements OnInit, OnDestroy { canDisplayNoResultMessage = false; unsubscribe$: Subject = new Subject(); - processValueForFilter = new Array(); + processValueForFilter = []; processStateDescription = new Map(); constructor(private store: Store, private processesService: ProcessesService) { @@ -46,10 +46,8 @@ export class LoggingComponent implements OnInit, OnDestroy { this.processValueForFilter.push({id: id, itemName: itemName, i18nPrefix: `${process.id}.${process.version}` }); } - for (const key in process.states) { - this.processStateDescription.set(process.id + '.' + key, - this.getI18nPrefixFromProcess(process) + process.states[key].description); - } + for (const key in process.states) this.processStateDescription.set(process.id + '.' + key, + Utilities.getI18nPrefixFromProcess(process) + process.states[key].description); }); } @@ -75,8 +73,4 @@ export class LoggingComponent implements OnInit, OnDestroy { this.unsubscribe$.complete(); } - getI18nPrefixFromProcess(process: Process): string { - return process.id + '.' + process.version + '.'; - } - } diff --git a/ui/main/src/app/modules/share/single-filter/single-filter.component.html b/ui/main/src/app/modules/share/single-filter/single-filter.component.html index 337ba46aa3..3d11d4438b 100644 --- a/ui/main/src/app/modules/share/single-filter/single-filter.component.html +++ b/ui/main/src/app/modules/share/single-filter/single-filter.component.html @@ -11,6 +11,6 @@
    diff --git a/ui/main/src/app/modules/share/single-filter/single-filter.component.ts b/ui/main/src/app/modules/share/single-filter/single-filter.component.ts index 84f09bc09a..f3391cecb3 100644 --- a/ui/main/src/app/modules/share/single-filter/single-filter.component.ts +++ b/ui/main/src/app/modules/share/single-filter/single-filter.component.ts @@ -8,7 +8,7 @@ */ -import {Component, Input, OnInit, OnChanges} from '@angular/core'; +import {Component, Input, OnChanges, OnInit} from '@angular/core'; import {Observable, of} from 'rxjs'; import {I18n} from '@ofModel/i18n.model'; import {FormControl, FormGroup} from '@angular/forms'; @@ -27,6 +27,7 @@ export class SingleFilterComponent implements OnInit, OnChanges { @Input() public parentForm: FormGroup; @Input() public filterPath: string; @Input() public valuesInObservable: Observable; + @Input() public prefixWithValue: boolean; constructor(private translateService: TranslateService) { this.parentForm = new FormGroup({ diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 6217633599..86f94510b2 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -7,34 +7,36 @@ * This file is part of the OperatorFabric project. */ -import { Component, OnDestroy, TemplateRef, ElementRef, OnInit, Input } from '@angular/core'; -import { FormControl, FormGroup } from '@angular/forms'; -import { Store } from '@ngrx/store'; -import { AppState } from '@ofStore/index'; -import { CardService } from '@ofServices/card.service'; -import { UserService } from '@ofServices/user.service'; -import { Card, CardData,fromCardToCardForPublishing, TimeSpan} from '@ofModel/card.model'; -import { I18n } from '@ofModel/i18n.model'; -import { Subject } from 'rxjs'; -import { Process } from '@ofModel/processes.model'; -import { TimeService } from '@ofServices/time.service'; -import { Severity } from '@ofModel/light-card.model'; -import { Guid } from 'guid-typescript'; -import { NgbDateStruct,NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; -import { SafeHtml, DomSanitizer } from '@angular/platform-browser'; -import { UserWithPerimeters, RightsEnum, ComputedPerimeter } from '@ofModel/userWithPerimeters.model'; -import { EntitiesService } from '@ofServices/entities.service'; -import { ProcessesService } from '@ofServices/processes.service'; -import { ActivatedRoute} from '@angular/router'; -import { DateTimeNgb, getDateTimeNgbFromMoment } from '@ofModel/datetime-ngb.model'; +import {Component, ElementRef, Input, OnDestroy, OnInit, TemplateRef} from '@angular/core'; +import {FormControl, FormGroup} from '@angular/forms'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {CardService} from '@ofServices/card.service'; +import {UserService} from '@ofServices/user.service'; +import {Card, CardData, fromCardToCardForPublishing, TimeSpan} from '@ofModel/card.model'; +import {I18n} from '@ofModel/i18n.model'; +import {Subject} from 'rxjs'; +import {Process} from '@ofModel/processes.model'; +import {TimeService} from '@ofServices/time.service'; +import {Severity} from '@ofModel/light-card.model'; +import {Guid} from 'guid-typescript'; +import {NgbDateStruct, NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModalRef} from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; +import {DomSanitizer, SafeHtml} from '@angular/platform-browser'; +import {ComputedPerimeter, UserWithPerimeters} from '@ofModel/userWithPerimeters.model'; +import {EntitiesService} from '@ofServices/entities.service'; +import {ProcessesService} from '@ofServices/processes.service'; +import {ActivatedRoute} from '@angular/router'; +import {DateTimeNgb, getDateTimeNgbFromMoment} from '@ofModel/datetime-ngb.model'; import * as moment from 'moment-timezone'; -import { HandlebarsService } from '../cards/services/handlebars.service'; -import { DetailContext } from '@ofModel/detail-context.model'; -import { map } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; -import { MessageLevel } from '@ofModel/message.model'; -import { AlertMessage } from '@ofStore/actions/alert.actions'; +import {HandlebarsService} from '../cards/services/handlebars.service'; +import {DetailContext} from '@ofModel/detail-context.model'; +import {map} from 'rxjs/operators'; +import {TranslateService} from '@ngx-translate/core'; +import {MessageLevel} from '@ofModel/message.model'; +import {AlertMessage} from '@ofStore/actions/alert.actions'; +import {RightsEnum} from '@ofModel/perimeter.model'; +import {Utilities} from '../../common/utilities'; declare const templateGateway: any; @@ -63,24 +65,24 @@ export class UserCardComponent implements OnDestroy, OnInit { }); stateOptions: any[]; - recipientsOptions = new Array(); + recipientsOptions = []; selectedRecipients = []; dropdownSettings = {}; - processOptions = new Array(); - processOptionsWhenSelectedService = new Array(); - serviceOptions = new Array(); + processOptions = []; + processOptionsWhenSelectedService = []; + serviceOptions = []; selectedProcess: Process; selectedState: string; processesPerServices = new Map(); servicePerProcesses = new Map(); - processesWithoutService = new Array(); + processesWithoutService = []; statesPerProcesses = new Map(); userCardTemplate: SafeHtml; editCardMode = false; cardToEdit: CardData; - @Input() cardIdToEdit = null; + @Input() cardIdToEdit = null; public card: Card; readonly defaultStartDate = new Date().valueOf() + 60000; @@ -92,9 +94,9 @@ export class UserCardComponent implements OnDestroy, OnInit { public displaySendingCardInProgress = false; modalRef: NgbModalRef; - severityVisible: boolean = true; - startDateVisible: boolean = true; - endDateVisible: boolean = true; + severityVisible = true; + startDateVisible = true; + endDateVisible = true; displayForm() { return !!this.processOptions && this.processOptions.length > 0; @@ -151,12 +153,11 @@ export class UserCardComponent implements OnDestroy, OnInit { badgeShowLimit: 30, enableSearchFilter: true }; - + this.loadCardForEdition(); } - loadCardForEdition() - { + loadCardForEdition() { if (!!this.cardIdToEdit) { this.editCardMode = true; this.cardService.loadCard(this.cardIdToEdit).subscribe(card => { @@ -167,7 +168,7 @@ export class UserCardComponent implements OnDestroy, OnInit { if (serviceForCardToEdit) this.messageForm.get('service').setValue(serviceForCardToEdit); else - this.messageForm.get('service').setValue("--"); + this.messageForm.get('service').setValue('--'); this.messageForm.get('process').setValue(this.cardToEdit.card.process); this.messageForm.get('state').setValue(this.cardToEdit.card.state); @@ -186,12 +187,12 @@ export class UserCardComponent implements OnDestroy, OnInit { this.recipientsOptions.sort(( a, b ) => a.itemName.localeCompare(b.itemName)); } - + loadAllProcessAndStateInUserPerimeter(): void { this.processesDefinition = this.processesService.getAllProcesses(); const processesInPerimeter: Set = new Set(); this.currentUserWithPerimeters.computedPerimeters.forEach(perimeter => { - if (this.userCanSendCard(perimeter)) processesInPerimeter.add(perimeter.process); + if (UserCardComponent.userCanSendCard(perimeter)) processesInPerimeter.add(perimeter.process); }); this.processesDefinition.forEach(process => { @@ -205,10 +206,8 @@ export class UserCardComponent implements OnDestroy, OnInit { }); } - isProcessInProcessesGroup(idProcess: string, processesGroup: {id: string, processes: string[]}) : boolean { - if (processesGroup.processes.find(process => process === idProcess)) - return true; - return false; + isProcessInProcessesGroup(idProcess: string, processesGroup: {id: string, processes: string[]}): boolean { + return !!processesGroup.processes.find(process => process === idProcess); } loadAllServicesRelatingToUserPerimeter(): void { @@ -232,9 +231,9 @@ export class UserCardComponent implements OnDestroy, OnInit { if (this.processOptions.length > numberOfProcessesAttachedToAService) { this.loadProcessesWithoutService(); - this.serviceOptions.push({value: "--", label: "service.defaultLabel"}); + this.serviceOptions.push({value: '--', label: 'service.defaultLabel'}); } - for (let serviceId of this.processesPerServices.keys()) + for (const serviceId of this.processesPerServices.keys()) this.serviceOptions.push({value: serviceId, label: serviceId}); } @@ -243,7 +242,7 @@ export class UserCardComponent implements OnDestroy, OnInit { this.processesWithoutService = this.processOptions.filter(processOption => processesWithService.indexOf(processOption.value) < 0); } - private userCanSendCard(perimeter: ComputedPerimeter): boolean { + private static userCanSendCard(perimeter: ComputedPerimeter): boolean { return ((perimeter.rights === RightsEnum.ReceiveAndWrite) || (perimeter.rights === RightsEnum.Write)); } @@ -252,11 +251,11 @@ export class UserCardComponent implements OnDestroy, OnInit { const statesList = []; this.currentUserWithPerimeters.computedPerimeters.forEach( perimeter => { - if ((perimeter.process === process.id) && this.userCanSendCard(perimeter)) { + if ((perimeter.process === process.id) && UserCardComponent.userCanSendCard(perimeter)) { const state = process.states[perimeter.state]; if (!!state) { if (!!state.userCard) { - const label = !!state.name ? (new I18n(this.getI18nPrefixFromProcess(process) + const label = !!state.name ? (new I18n(Utilities.getI18nPrefixFromProcess(process) + state.name)) : perimeter.state; const stateEntry = { value: perimeter.state, label: label }; statesList.push(stateEntry); @@ -281,7 +280,7 @@ export class UserCardComponent implements OnDestroy, OnInit { changeProcessesWhenSelectService(): void { this.messageForm.get('service').valueChanges.subscribe((service) => { if (!!service) { - if (service == '--') + if (service === '--') this.processOptionsWhenSelectedService = this.processesWithoutService; else this.processOptionsWhenSelectedService = this.processesPerServices.get(service); @@ -349,7 +348,7 @@ export class UserCardComponent implements OnDestroy, OnInit { reinsertScripts(): void { const scripts = this.element.nativeElement.getElementsByTagName('script'); - Array.prototype.forEach.call(scripts, script => { //scripts.foreach does not work ... + Array.prototype.forEach.call(scripts, script => { // scripts.foreach does not work ... const scriptCopy = document.createElement('script'); scriptCopy.type = script.type ? script.type : 'text/javascript'; if (!!script.innerHTML) { @@ -393,7 +392,7 @@ export class UserCardComponent implements OnDestroy, OnInit { } const selectedRecipients = this.recipientForm.value['recipients']; - const recipients = new Array(); + const recipients = []; if (selectedRecipients.length < 1) { this.displayMessage('userCard.error.noRecipientSelected', null, MessageLevel.ERROR); return; @@ -414,7 +413,7 @@ export class UserCardComponent implements OnDestroy, OnInit { let endDate = this.messageForm.get('endDate').value; if (!endDate) endDate = this.endDateVisible ? this.defaultEndDate : null; else endDate = this.createTimestampFromValue(endDate); - + const title = (!!specificInformation.card.title) ? specificInformation.card.title : 'UNDEFINED'; const summary = (!!specificInformation.card.summary) ? specificInformation.card.summary : 'UNDEFINED'; const keepChildCards = (!!specificInformation.card.keepChildCards) ? specificInformation.card.keepChildCards : false; @@ -462,7 +461,7 @@ export class UserCardComponent implements OnDestroy, OnInit { data: specificInformation.card.data, } as Card; - this.displayPreview= true; + this.displayPreview = true; } @@ -470,20 +469,14 @@ export class UserCardComponent implements OnDestroy, OnInit { const { date, time } = value; if (date) { return this.timeService.toNgBNumberTimestamp(this.transformToTimestamp(date, time)); - // TODO Why do we need 2 transformations? What is an NgBTimestamp vs a plain Timestamp? } else { return null; } - } + }; transformToTimestamp(date: NgbDateStruct, time: NgbTimeStruct): string { return new DateTimeNgb(date, time).formatDateTime(); } - - - getI18nPrefixFromProcess = (process: Process): string => { - return process.id + '.' + process.version + '.'; - } getEntityName(id: string): string { const entityOption = this.recipientsOptions.find(entity => entity.id === id); @@ -510,7 +503,7 @@ export class UserCardComponent implements OnDestroy, OnInit { this.displayMessage('userCard.cardSendWithNoError', null, MessageLevel.INFO); } - this.modal.dismiss("Close"); + this.modal.dismiss('Close'); }, err => { console.error('Error when sending card :', err); diff --git a/ui/main/src/app/services/perimeters.service.ts b/ui/main/src/app/services/perimeters.service.ts new file mode 100644 index 0000000000..1811dc3b29 --- /dev/null +++ b/ui/main/src/app/services/perimeters.service.ts @@ -0,0 +1,113 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import {Observable, Subject} from 'rxjs'; +import {environment} from '@env/environment'; +import {HttpClient} from '@angular/common/http'; +import {catchError, takeUntil, tap} from 'rxjs/operators'; +import {Injectable, OnDestroy} from '@angular/core'; +import {CachedCrudService} from '@ofServices/cached-crud-service'; +import {Perimeter} from '@ofModel/perimeter.model'; + +@Injectable({ + providedIn: 'root' +}) +export class PerimetersService extends CachedCrudService implements OnDestroy { + + readonly perimetersUrl: string; + private _perimeters: Perimeter[]; + + private ngUnsubscribe$ = new Subject(); + + /** + * @constructor + * @param httpClient - Angular build-in + */ + constructor(private httpClient: HttpClient) { + super(); + this.perimetersUrl = `${environment.urls.perimeters}`; + } + + ngOnDestroy() { + this.ngUnsubscribe$.next(); + this.ngUnsubscribe$.complete(); + } + + deleteById(id: string) { + const url = `${this.perimetersUrl}/${id}`; + return this.httpClient.delete(url).pipe( + catchError((error: Response) => this.handleError(error)) + ); + } + + private updateCachedPerimeters(perimeterData: Perimeter): void { + const updatedPerimeters = this._perimeters.filter(perimeter => perimeter.id !== perimeterData.id); + updatedPerimeters.push(perimeterData); + this._perimeters = updatedPerimeters; + } + + getAllPerimeters(): Observable { + return this.httpClient.get(`${this.perimetersUrl}`).pipe( + catchError((error: Response) => this.handleError(error)) + ); + } + + public loadAllPerimetersData(): Observable { + return this.getAllPerimeters() + .pipe(takeUntil(this.ngUnsubscribe$) + , tap( + (perimeters) => { + if (!!perimeters) { + this._perimeters = perimeters; + console.log(new Date().toISOString(), 'List of perimeters loaded'); + } + }, (error) => console.error(new Date().toISOString(), 'an error occurred', error) + )); + } + + public getPerimeters(): Perimeter[] { + return this._perimeters; + } + + public getCachedValues(): Array { + return this.getPerimeters(); + } + + createPerimeter(perimeterData: Perimeter): Observable { + return this.httpClient.post(`${this.perimetersUrl}`, perimeterData).pipe( + catchError((error: Response) => this.handleError(error)), + tap(() => { + this.updateCachedPerimeters(perimeterData); + }) + ); + } + + updatePerimeter(perimeterData: Perimeter): Observable { + return this.httpClient.put(`${this.perimetersUrl}` + '/' + perimeterData.id, perimeterData).pipe( + catchError((error: Response) => this.handleError(error)), + tap(() => { + this.updateCachedPerimeters(perimeterData); + }) + ); + } + + + getAll(): Observable { + return this.getAllPerimeters(); + } + + create(data: any): Observable { + return this.createPerimeter(data); + } + + update(data: any): Observable { + return this.updatePerimeter(data); + } + +} diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 5cb38a50f2..893ff8c657 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -268,16 +268,27 @@ "id": "Id", "name": "Name", "description": "Description", + "perimeters" : "Perimeters", "confirmDelete": "Do you really want to delete group", "add": "Add new group" }, "entity": { "id": "Id", "name": "Name", + "parents": "Parent Entities", "description": "Description", "confirmDelete": "Do you really want to delete entity", "add": "Add new entity" }, + "perimeter": { + "id": "Id", + "process": "Process", + "stateRights": "State Rights", + "state": "State", + "right": "Right", + "confirmDelete": "Do you really want to delete perimeter", + "add":"Add new perimeter" + }, "user": { "login": "Login", "lastName": "Last name", @@ -295,7 +306,8 @@ "confirm": "Please confirm...", "login": { "required": "Login is required.", - "minLength": "Login should be minimum 4 characters." + "minLength": "Login should be minimum 4 characters.", + "pattern": "Login should only contain the following characters: letters, _, - or digits." }, "firstName": { "required": "First name is required." @@ -306,6 +318,7 @@ "id": { "required": "Id is required.", "minLength": "Id should be minimum 2 characters.", + "pattern": "Id should only contain the following characters: letters, _, - or digits.", "label":"Id" }, "name": { @@ -316,9 +329,10 @@ "lines": "lines per page" }, "tabs": { - "users": "Users management", - "groups": "Groups management", - "entities": "Entities management" + "users": "Users Management", + "groups": "Groups Management", + "entities": "Entities Management", + "perimeters": "Perimeters Management" } }, "service": { diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index e02cd39089..f98acaec61 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -267,24 +267,35 @@ "group": { "id": "Id", "name": "Nom", + "perimeters" : "Périmètres", "description": "Description", - "confirmDelete": "Voulez vous vraiment supprimer le groupe", + "confirmDelete": "Voulez-vous vraiment supprimer le groupe", "add":"Ajouter un nouveau groupe" }, "entity": { "id": "Id", "name": "Nom", + "parents": "Entités parentes", "description": "Description", - "confirmDelete": "Voulez vous vraiment supprimer l'entité", + "confirmDelete": "Voulez-vous vraiment supprimer l'entité", "add":"Ajouter une nouvelle entité" }, + "perimeter": { + "id": "Id", + "process": "Processus", + "stateRights": "Permissions sur les états", + "state": "Etat", + "right": "Permission", + "confirmDelete": "Voulez-vous vraiment supprimer le périmètre", + "add":"Ajouter un nouveau périmètre" + }, "user": { "login": "Identifiant", "lastName": "Nom", "firstName": "Prénom", "groups": "Groupes", "entities": "Entités", - "confirmDelete": "Voulez vous vraiment supprimer l'utilisateur", + "confirmDelete": "Voulez-vous vraiment supprimer l'utilisateur", "add":"Ajouter un nouvel utilisateur" }, "edit": "Editer", @@ -295,7 +306,8 @@ "confirm":"Confirmez...", "login": { "required": "L'identifiant est obligatoire.", - "minLength": "L'identifiant doit avoir au moins 4 caractères." + "minLength": "L'identifiant doit avoir au moins 4 caractères.", + "pattern": "L'identifiant ne peut contenir que les caractères suivants : lettres, _, - ou chiffres." }, "firstName": { "required": "Le prénom est obligatoire." @@ -306,6 +318,7 @@ "id": { "required": "L'identifiant est obligatoire.", "minLength": "L'identifiant doit avoir au moins 2 caractères.", + "pattern": "L'identifiant ne peut contenir que les caractères suivants : lettres, _, - ou chiffres.", "label":"Id" }, "name": { @@ -318,7 +331,8 @@ "tabs": { "users": "Gestion des utilisateurs", "groups": "Gestion des groupes", - "entities": "Gestion des entités" + "entities": "Gestion des entités", + "perimeters": "Gestion des périmètres" } }, "service": { diff --git a/ui/main/src/environments/environment.prod.ts b/ui/main/src/environments/environment.prod.ts index 8cd0a06051..4c94e12d21 100644 --- a/ui/main/src/environments/environment.prod.ts +++ b/ui/main/src/environments/environment.prod.ts @@ -19,12 +19,12 @@ export const environment = { users: '/users', groups: '/users/groups', entities: '/users/entities', + perimeters: '/users/perimeters', archives : '', processes: '/businessconfig/processes', processGroups: '/businessconfig/processgroups', config: '/config/web-ui.json', - menuConfig: '/config/ui-menu.json', - time: '/time' + menuConfig: '/config/ui-menu.json' }, paths: { diff --git a/ui/main/src/environments/environment.ts b/ui/main/src/environments/environment.ts index 1a25f2c143..f97e027102 100644 --- a/ui/main/src/environments/environment.ts +++ b/ui/main/src/environments/environment.ts @@ -23,12 +23,12 @@ export const environment = { users: 'http://localhost:2002/users', groups: 'http://localhost:2002/users/groups', entities: 'http://localhost:2002/users/entities', + perimeters: 'http://localhost:2002/users/perimeters', archives: '', processes: 'http://localhost:2002/businessconfig/processes', processGroups: 'http://localhost:2002/businessconfig/processgroups', config: 'http://localhost:2002/config/web-ui.json', - menuConfig: 'http://localhost:2002/config/ui-menu.json', - time: 'http://localhost:2002/time' + menuConfig: 'http://localhost:2002/config/ui-menu.json' }, paths: { i18n: '/assets/i18n/' From 69a1d0b2c0827c1087542cba0a0a4ad02a31bbfd Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Thu, 25 Feb 2021 15:49:32 +0100 Subject: [PATCH 05/45] [OC-1446] In client lib avoid serialization of null fields --- client/src/main/resources/swagger-templates/pojo.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/main/resources/swagger-templates/pojo.mustache b/client/src/main/resources/swagger-templates/pojo.mustache index 9516a8098d..2558c49362 100755 --- a/client/src/main/resources/swagger-templates/pojo.mustache +++ b/client/src/main/resources/swagger-templates/pojo.mustache @@ -1,9 +1,11 @@ +import com.fasterxml.jackson.annotation.JsonInclude; /** * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} */{{#description}} //@ApiModel(description = "{{{description}}}"){{/description}} {{#useBeanValidation}}@Validated{{/useBeanValidation}} {{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} +@JsonInclude(JsonInclude.Include.NON_NULL) public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} { {{#serializableModel}} private static final long serialVersionUID = 1L; From df6054a03446319b30c3f177512cdf6dbacc57c6 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Fri, 26 Feb 2021 09:05:19 +0100 Subject: [PATCH 06/45] [OC-1497] Fixing issue with card edition and IT incident example --- .../reference_doc/template_description.adoc | 10 + .../template/en/incidentInProgress.handlebars | 28 +- .../en/usercard_incidentInProgress.handlebars | 28 +- .../template/fr/incidentInProgress.handlebars | 21 +- .../fr/usercard_incidentInProgress.handlebars | 27 +- .../components/detail/detail.component.ts | 58 ++- .../cards/services/handlebars.service.spec.ts | 92 ++-- .../cards/services/handlebars.service.ts | 394 +++++++++--------- ui/main/src/app/services/app.service.ts | 6 +- 9 files changed, 357 insertions(+), 307 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index 7169867f2a..aa09cf4495 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -445,6 +445,16 @@ Return an array that is a merge of the two arrays. {{/each}} .... +[[conditionalAttribute]] +=== conditionalAttribute + +Adds the specified attribute to an HTML element if the given condition is truthy. +This is useful for attributes such as `checked` where it is the presence or absence of the attribute that matters (i.e. +an checkbox with `checked=false` will still be checked). +.... + +.... + [[opfab_template_style]] == OperatorFabric css styles diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars index c0a51743c7..b4dce2599c 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars @@ -23,12 +23,11 @@
    -
    Please fill in the impacts from your perspective
    +
    Please fill in the impacts from your perspective


    - - +
    @@ -38,13 +37,11 @@
    - -


    - +
    @@ -80,14 +77,14 @@ if (templateGateway.childCards[0]) { let childsDiv = document.getElementById("childs-div"); - let responses = ' RESPONSES RECEIVED :

    ' - responses += ' '; + let responses = ' RESPONSES RECEIVED :
    '; + responses += '
    Entity
    '; responses += ' '; responses += ' '; - templateGateway.childCards.forEach((c, i) => { + templateGateway.childCards.forEach((c) => { const entityName = templateGateway.getEntityName(c.publisher); - responses += `` + responses += ``; if (c.data.impacts.SA) responses += ``; else responses += ``; if (c.data.impacts.SB) responses += ``; @@ -108,13 +105,11 @@ childsDiv.innerHTML = responses; } - } - - templateGateway.applyChildCards(); + }; templateGateway.validyForm = function () { - const S1 = document.getElementById('SA').checked; + const SA = document.getElementById('SA').checked; const SB = document.getElementById('SB').checked; const SC = document.getElementById('SC').checked; const SD = document.getElementById('SD').checked; @@ -133,7 +128,7 @@ SF: SF, OTHERS: OTHERS } - } + }; return { valid: true, @@ -141,6 +136,3 @@ }; } - - -

    \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars index dd9ed88130..7b22690a0e 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars @@ -10,7 +10,7 @@

    - +
    @@ -19,32 +19,26 @@ IMPACTED SERVICES :

    -
    Entity Service A Service B Service C Service D Service E Service F
    ${entityName}
    ${entityName} YES NO YES
    +
    - - - - - - + + + + + +

    - - OTHER IMPACTS +

    \ No newline at end of file + diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars index 5f19710094..5e4578bca2 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars @@ -24,11 +24,11 @@
    -
    Merci de saisir les impacts que vous identifiez de votre coté
    +
    Merci de saisir les impacts que vous identifiez de votre coté


    - +
    @@ -42,7 +42,7 @@

    - +
    @@ -78,14 +78,14 @@ if (templateGateway.childCards[0]) { let childsDiv = document.getElementById("childs-div"); - let responses = ' REPONSES RECUES :

    ' - responses += '
    '; + let responses = ' REPONSES RECUES :
    '; + responses += '
    Entity
    '; responses += ' '; responses += ' '; - templateGateway.childCards.forEach((c, i) => { + templateGateway.childCards.forEach((c) => { const entityName = templateGateway.getEntityName(c.publisher); - responses += `` + responses += ``; if (c.data.impacts.SA) responses += ``; else responses += ``; if (c.data.impacts.SB) responses += ``; @@ -106,11 +106,11 @@ childsDiv.innerHTML = responses; } - } + }; templateGateway.validyForm = function () { - const S1 = document.getElementById('SA').checked; + const SA = document.getElementById('SA').checked; const SB = document.getElementById('SB').checked; const SC = document.getElementById('SC').checked; const SD = document.getElementById('SD').checked; @@ -129,7 +129,7 @@ SF: SF, OTHERS: OTHERS } - } + }; return { valid: true, @@ -139,4 +139,3 @@ -

    \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars index cd5f8a9c63..6b0864a0d7 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars @@ -6,10 +6,11 @@ +

    - +
    @@ -18,32 +19,26 @@ SERVICES IMPACTES :

    -
    Entity Service A Service B Service C Service D Service E Service F
    ${entityName}
    ${entityName} OUI NON OUI
    +
    - - - - - - + + + + + +

    - +

    \ No newline at end of file + diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 1396f6bee2..bc3fdc6378 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -119,7 +119,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC public isActionEnabled = false; public lttdExpiredIsTrue: boolean; - public cardStateName: string; public hasAlreadyResponded = false; unsubscribe$: Subject = new Subject(); @@ -146,6 +145,10 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC public displayDeleteResult = false; + private static compareRightAction(userRights: RightsEnum, rightsAction: RightsEnum): boolean { + return (userRight(userRights) - userRight(rightsAction)) === 0; + } + constructor(private element: ElementRef, private businessconfigService: ProcessesService, private handlebars: HandlebarsService, @@ -184,7 +187,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC cardTemplate.style.height = `${cardTemplateHeight}px`; cardTemplate.style.overflowX = 'hidden'; - } + } } ngAfterViewChecked() { @@ -250,9 +253,8 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } private setButtonsVisibility() { - if (this._appService.pageType === PageType.ARCHIVE) this.showButtons = false; - else this.showButtons = true; - if ((this._appService.pageType !== PageType.CALENDAR)&& (this._appService.pageType !== PageType.MONITORING)) { + this.showButtons = this._appService.pageType !== PageType.ARCHIVE; + if ((this._appService.pageType !== PageType.CALENDAR) && (this._appService.pageType !== PageType.MONITORING)) { this.showMaxAndReduceButton = true; } this.showCloseButton = true; @@ -264,7 +266,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC ngDoCheck() { const previous = this.lttdExpiredIsTrue; this.checkLttdExpired(); - if (previous != this.lttdExpiredIsTrue) { + if (previous !== this.lttdExpiredIsTrue) { templateGateway.setLttdExpired(this.lttdExpiredIsTrue); } } @@ -394,12 +396,12 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC markAsReadIfNecessary() { if (this.card.hasBeenRead === false) { - // we do not set the card as read in the UI yet , as we want to keep - // the card as unread in the feed - // we will set it read in the UI and in the feed when + // we do not set the card as read in the UI yet , as we want to keep + // the card as unread in the feed + // we will set it read in the UI and in the feed when // - we close the card // - we exit the feed (i.e destroy the card) - // - we change card + // - we change card this.cardSetToReadButNotYetOnUI = this.card; this.cardService.postUserCardRead(this.card.uid).subscribe(); @@ -420,8 +422,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC if (this.parentModalRef) { this.parentModalRef.close(); this.store.dispatch(new ClearLightCardSelection()); - } - else this._appService.closeDetails(this.currentPath); + } else this._appService.closeDetails(this.currentPath); } // for certain types of template , we need to reload it to take into account @@ -440,14 +441,14 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC this.markAsReadIfNecessary(); this.message = {display: false, text: undefined, className: undefined}; - + if (this._responseData != null && this._responseData !== undefined) { this.setEntitiesToRespond(); this.setIsActionEnabled(); } this.setButtonsVisibility(); this.setShowDetailCardHeader(); - + } private setEntitiesToRespond() { @@ -487,7 +488,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC return this._userEntitiesAllowedToRespond.length === 1; } - private getUserEntityToRespond() : string { + private getUserEntityToRespond(): string { return this._userEntitiesAllowedToRespond.length === 1 ? this._userEntitiesAllowedToRespond[0] : null; } @@ -505,7 +506,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } private isAcknowledgmentAllowed(): boolean { - return (this.cardState.acknowledgmentAllowed === AcknowledgmentAllowedEnum.ALWAYS || + return (this.cardState.acknowledgmentAllowed === AcknowledgmentAllowedEnum.ALWAYS || (this.cardState.acknowledgmentAllowed === AcknowledgmentAllowedEnum.ONLY_WHEN_RESPONSE_DISABLED_FOR_USER && !this.isActionEnabled)); } @@ -530,10 +531,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC return permission; } - private static compareRightAction(userRights: RightsEnum, rightsAction: RightsEnum): boolean { - return (userRight(userRights) - userRight(rightsAction)) === 0; - } - get listVisibleEntitiesToRespond() { return this._listEntitiesToRespond.length > maxVisibleEntitiesToRespond ? this._listEntitiesToRespond.slice(0, maxVisibleEntitiesToRespond) : this._listEntitiesToRespond; } @@ -578,7 +575,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC this._htmlContent = this.sanitizer.bypassSecurityTrustHtml(html); setTimeout(() => { // wait for DOM rendering this.reinsertScripts(); - setTimeout(() => { // wait for script loading before calling them in template + setTimeout(() => { // wait for script loading before calling them in template templateGateway.applyChildCards(); if (this.hasAlreadyResponded) templateGateway.lockAnswer(); if (this.card.lttd && this.lttdExpiredIsTrue) { @@ -662,6 +659,12 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } editCard(): void { + + // We close the card detail in the background to avoid interference when executing the template for the edition preview. + // Otherwise, this can cause issues with templates functions referencing elements by id as there are two elements with the same id + // in the document. + this.closeDetails(); + if (!!this.parentModalRef) this.parentModalRef.close(); const options: NgbModalOptions = { @@ -669,12 +672,21 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC backdrop: 'static' }; this.modalRef = this.modalService.open(this.userCardTemplate, options); - + + // Once the edition is complete or canceled, we reopen the card detail (see above). + this.modalRef.result.then( + () => { // If modal is closed + this._appService.reopenDetails(this.currentPath, this.card.id); + }, + () => { + this._appService.reopenDetails(this.currentPath, this.card.id); + }); + } setFullScreen(active) { this.fullscreen = active; - templateGateway.setScreenSize(active? 'lg' : 'md'); + templateGateway.setScreenSize(active ? 'lg' : 'md'); } ngOnDestroy() { diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts index 60657a41f2..6cf961150a 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,29 +8,28 @@ */ - import {getTestBed, TestBed} from '@angular/core/testing'; import {ProcessesService} from '@ofServices/processes.service'; import {HttpClientTestingModule, HttpTestingController, TestRequest} from '@angular/common/http/testing'; import {environment} from '@env/environment'; -import {TranslateLoader, TranslateModule, TranslateService} from "@ngx-translate/core"; -import {RouterTestingModule} from "@angular/router/testing"; -import {Store, StoreModule} from "@ngrx/store"; -import {appReducer, AppState} from "@ofStore/index"; -import {getOneRandomCard,AuthenticationImportHelperForSpecs, BusinessconfigI18nLoaderFactory} from "@tests/helpers"; -import {LightCard} from "@ofModel/light-card.model"; -import {ServicesModule} from "@ofServices/services.module"; -import {HandlebarsService} from "./handlebars.service"; -import {Guid} from "guid-typescript"; -import {I18n} from "@ofModel/i18n.model"; -import * as moment from "moment"; -import {UserContext} from "@ofModel/user-context.model"; -import {DetailContext} from "@ofModel/detail-context.model"; +import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core'; +import {RouterTestingModule} from '@angular/router/testing'; +import {Store, StoreModule} from '@ngrx/store'; +import {appReducer, AppState} from '@ofStore/index'; +import {AuthenticationImportHelperForSpecs, BusinessconfigI18nLoaderFactory, getOneRandomCard} from '@tests/helpers'; +import {LightCard} from '@ofModel/light-card.model'; +import {ServicesModule} from '@ofServices/services.module'; +import {HandlebarsService} from './handlebars.service'; +import {Guid} from 'guid-typescript'; +import {I18n} from '@ofModel/i18n.model'; +import * as moment from 'moment'; +import {UserContext} from '@ofModel/user-context.model'; +import {DetailContext} from '@ofModel/detail-context.model'; function computeTemplateUri(templateName) { return `${environment.urls.processes}/testProcess/templates/${templateName}`; - //TODO OC-1009 Why is the pprocess hardcoded? It needs to match the one set by default in getOneRandomCard. + // TODO OC-1009 Why is the pprocess hardcoded? It needs to match the one set by default in getOneRandomCard. } describe('Handlebars Services', () => { @@ -87,6 +86,8 @@ describe('Handlebars Services', () => { unsortedNumbers: [2, 1, 4, 0, 5, 3], numberStrings: ['0', '1', '2', '3', '4', '5'], arrays: [[], [0, 1, 2], ['0', '1', '2', '3']], + undefinedValue: undefined, + nullValue: null, booleans: [false, true], splitString: 'a.split.string', pythons: { @@ -140,51 +141,51 @@ describe('Handlebars Services', () => { }); } - it('complile polyIf helper ==', (done) => { + it('compile polyIf helper ==', (done) => { expectIfCond(card, 'card.data.numbers.[0]', '==', 'card.data.numbers.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '==', 'card.data.numbers.[1]', 'false', done); expectIfCond(card, 'card.data.numbers.[0]', '==', 'card.data.numberStrings.[0]', 'true', done); }); - it('complile polyIf helper ===', (done) => { + it('compile polyIf helper ===', (done) => { expectIfCond(card, 'card.data.numbers.[0]', '===', 'card.data.numbers.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '===', 'card.data.numberStrings.[0]', 'false', done); }); - it('complile polyIf helper <', (done) => { + it('compile polyIf helper <', (done) => { // expectIfCond(card, 'card.data.numbers.[0]', '<', 'card.data.numbers.[1]', 'true'); expectIfCond(card, 'card.data.numbers.[0]', '<', 'card.data.numberStrings.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '<', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.numbers.[1]', '<', 'card.data.numbers.[1]', 'false', done); }); - it('complile polyIf helper >', (done) => { + it('compile polyIf helper >', (done) => { expectIfCond(card, 'card.data.numbers.[1]', '>', 'card.data.numbers.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '>', 'card.data.numberStrings.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '>', 'card.data.numbers.[1]', 'false', done); expectIfCond(card, 'card.data.numbers.[1]', '>', 'card.data.numbers.[1]', 'false', done); }); - it('complile polyIf helper <=', (done) => { + it('compile polyIf helper <=', (done) => { expectIfCond(card, 'card.data.numbers.[0]', '<=', 'card.data.numbers.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '<=', 'card.data.numberStrings.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '<=', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.numbers.[1]', '<=', 'card.data.numbers.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '<=', 'card.data.numberStrings.[1]', 'true', done); }); - it('complile polyIf helper >=', (done) => { + it('compile polyIf helper >=', (done) => { expectIfCond(card, 'card.data.numbers.[1]', '>=', 'card.data.numbers.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '>=', 'card.data.numberStrings.[0]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '>=', 'card.data.numbers.[1]', 'false', done); expectIfCond(card, 'card.data.numbers.[1]', '>=', 'card.data.numbers.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[1]', '>=', 'card.data.numberStrings.[1]', 'true', done); }); - it('complile polyIf helper !=', (done) => { + it('compile polyIf helper !=', (done) => { expectIfCond(card, 'card.data.numbers.[0]', '!=', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.numbers.[0]', '!=', 'card.data.numbers.[1]', 'true', done); expectIfCond(card, 'card.data.numbers.[0]', '!=', 'card.data.numberStrings.[0]', 'false', done); }); - it('complile polyIf helper !==', (done) => { + it('compile polyIf helper !==', (done) => { expectIfCond(card, 'card.data.numbers.[0]', '!==', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.numbers.[0]', '!==', 'card.data.numberStrings.[0]', 'true', done); }); - it('complile polyIf helper &&', (done) => { + it('compile polyIf helper &&', (done) => { expectIfCond(card, 'card.data.booleans.[0]', '&&', 'card.data.booleans.[0]', 'false', done); expectIfCond(card, 'card.data.booleans.[0]', '&&', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.booleans.[0]', '&&', 'card.data.numberStrings.[0]', 'false', done); @@ -193,7 +194,7 @@ describe('Handlebars Services', () => { expectIfCond(card, 'card.data.booleans.[1]', '&&', 'card.data.numbers.[2]', 'true', done); expectIfCond(card, 'card.data.booleans.[1]', '&&', 'card.data.numberStrings.[3]', 'true', done); }); - it('complile polyIf helper ||', (done) => { + it('compile polyIf helper ||', (done) => { expectIfCond(card, 'card.data.booleans.[0]', '||', 'card.data.booleans.[0]', 'false', done); expectIfCond(card, 'card.data.booleans.[0]', '||', 'card.data.numbers.[0]', 'false', done); expectIfCond(card, 'card.data.booleans.[0]', '||', 'card.data.numberStrings.[0]', 'true', done); @@ -216,7 +217,42 @@ describe('Handlebars Services', () => { expect(call.request.method).toBe('GET'); call.flush('{{arrayAtIndexLength card.data.arrays 1}}'); }); - }) + }); + + function expectConditionalAttribute(card, condition, attribute, expectedResult: string, done) { + const templateName = Guid.create().toString(); + const testedExpression = `{{conditionalAttribute ${condition} ${attribute}}}`; + handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) + .subscribe((result) => { + console.debug(`testing [${testedExpression}], result [${result}], expected [${expectedResult}]`); + expect(result).toEqual(expectedResult, + `Expected result to be ${expectedResult} when testing [${condition}]`); + done(); + }); + let calls = httpMock.match(req => req.url == computeTemplateUri(templateName)); + expect(calls.length).toEqual(1); + calls.forEach(call => { + expect(call.request.method).toBe('GET'); + call.flush(testedExpression); + }); + } + + it('compile conditionalAttribute', (done) => { + // The attribute will show up if the property exists and is truthy + expectConditionalAttribute(card, 'card.data.booleans.[0]', '\'someAttribute\'', '', done); + expectConditionalAttribute(card, 'card.data.booleans.[1]', '\'someAttribute\'', 'someAttribute', done); + expectConditionalAttribute(card, 'card.data.name', '\'someAttribute\'', 'someAttribute', done); + expectConditionalAttribute(card, 'card.data.some.property.that.doesnt.exist', '\'someAttribute\'', '', done); + expectConditionalAttribute(card, 'card.data.undefinedValue', '\'someAttribute\'', '', done); + expectConditionalAttribute(card, 'card.data.nullValue', '\'someAttribute\'', '', done); + + // The condition can also be an expression using other helpers + expectConditionalAttribute(card, '(bool card.data.name "===" \'something\')', '\'someAttribute\'', 'someAttribute', done); + + // The attribute itself can also come from the card data + expectConditionalAttribute(card, 'card.data.booleans.[1]', 'card.data.name', 'something', done); + }); + it('compile arrayAtIndexLength Alt', (done) => { const templateName = Guid.create().toString(); handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) @@ -517,7 +553,7 @@ describe('Handlebars Services', () => { expect(lines[3]).toMatch(/ <\/script>/); done(); }); - let calls = httpMock.match(req => req.url == computeTemplateUri(templateName)); + const calls = httpMock.match(req => req.url === computeTemplateUri(templateName)); expect(calls.length).toEqual(1); calls.forEach(call => { expect(call.request.method).toBe('GET'); diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.ts b/ui/main/src/app/modules/cards/services/handlebars.service.ts index 383bd58fbc..adbad7f223 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,96 +8,72 @@ */ - -import {Injectable} from "@angular/core"; -import * as Handlebars from "handlebars/dist/handlebars.js" -import {TranslateService} from "@ngx-translate/core"; +import {Injectable} from '@angular/core'; +import * as Handlebars from 'handlebars/dist/handlebars.js'; +import {TranslateService} from '@ngx-translate/core'; import * as moment from 'moment'; -import {Map} from "@ofModel/map"; -import {Observable, of} from "rxjs"; -import {map, tap} from "rxjs/operators"; -import {ProcessesService} from "@ofServices/processes.service"; -import {Guid} from "guid-typescript"; -import {DetailContext} from "@ofModel/detail-context.model"; -import {Store} from "@ngrx/store"; -import {AppState} from "@ofStore/index"; -import {buildSettingsOrConfigSelector} from "@ofSelectors/settings.x.config.selectors"; +import {Map} from '@ofModel/map'; +import {Observable, of} from 'rxjs'; +import {map, tap} from 'rxjs/operators'; +import {ProcessesService} from '@ofServices/processes.service'; +import {Guid} from 'guid-typescript'; +import {DetailContext} from '@ofModel/detail-context.model'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {buildSettingsOrConfigSelector} from '@ofSelectors/settings.x.config.selectors'; @Injectable() export class HandlebarsService { - private templateCache:Map = new Map(); - private _locale: string; - constructor( private translate: TranslateService, private businessconfig: ProcessesService, - private store: Store){ - this.registerPreserveSpace(); + private store: Store) { + HandlebarsService.registerPreserveSpace(); this.registerNumberFormat(); this.registerDateFormat(); - this.registerCardAction(); + HandlebarsService.registerCardAction(); this.registerSvg(); this.registerI18n(); this.registerSort(); - this.registerSlice(); - this.registerArrayAtIndex(); - this.registerMath(); - this.registerSplit(); - this.registerArrayAtIndexLength(); - this.registerBool(); + HandlebarsService.registerSlice(); + HandlebarsService.registerArrayAtIndex(); + HandlebarsService.registerMath(); + HandlebarsService.registerSplit(); + HandlebarsService.registerArrayAtIndexLength(); + HandlebarsService.registerBool(); this.registerNow(); - this.registerJson(); - this.registerKeyValue(); - this.registerToBreakage(); - this.registerArrayContains(); - this.registerArrayContainsOneOf(); - this.registerTimes(); - this.registerKeepSpacesAndEndOfLine(); - this.registerMergeArrays(); - this.store.select(buildSettingsOrConfigSelector('locale')).subscribe(locale => this.changeLocale(locale)) - } - - public changeLocale(locale:string){ - if(locale) { - this._locale = locale; - }else{ - this._locale = 'en'; - } - } - - public executeTemplate(templateName: string, context: DetailContext):Observable { - return this.queryTemplate(context.card.process,context.card.processVersion,templateName).pipe( - map(t => t(context))); + HandlebarsService.registerJson(); + HandlebarsService.registerKeyValue(); + HandlebarsService.registerToBreakage(); + HandlebarsService.registerArrayContains(); + HandlebarsService.registerArrayContainsOneOf(); + HandlebarsService.registerTimes(); + HandlebarsService.registerKeepSpacesAndEndOfLine(); + HandlebarsService.registerMergeArrays(); + HandlebarsService.registerConditionalAttribute(); + this.store.select(buildSettingsOrConfigSelector('locale')).subscribe(locale => this.changeLocale(locale)); } - public queryTemplate(process:string, version:string, name: string):Observable { - const locale = this._locale; - const key = `${process}.${version}.${name}.${locale}`; - let template = this.templateCache[key]; - if(template){ - return of(template); - } - return this.businessconfig.fetchHbsTemplate(process,version,name,locale).pipe( - map(s=>Handlebars.compile(s)), - tap(t=>this.templateCache[key]=t) - ); - } + private templateCache: Map = new Map(); + private _locale: string; - private registerJson() { + private static registerJson() { Handlebars.registerHelper('json', function (obj) { - return new Handlebars.SafeString(JSON.stringify(obj)) + return new Handlebars.SafeString(JSON.stringify(obj)); }); } - private registerBool() { + private static registerBool() { Handlebars.registerHelper('bool', function (v1, operator, v2, options) { switch (operator) { case '==': + // tslint:disable-next-line:triple-equals return (v1 == v2); case '===': return (v1 === v2); case '!=': + // tslint:disable-next-line:triple-equals return (v1 != v2); case '!==': return (v1 !== v2); @@ -119,51 +95,51 @@ export class HandlebarsService { }); } - private registerArrayAtIndexLength() { + private static registerArrayAtIndexLength() { Handlebars.registerHelper('arrayAtIndexLength', function (value, index, options) { return value[index].length; }); } - private registerSplit() { + private static registerSplit() { Handlebars.registerHelper('split', function (...args: any[]) { - if(args.length === 3) + if (args.length === 3) return args[0].split(args[1]); - if(args.length === 4) + if (args.length === 4) return args[0].split(args[1])[args[2]]; }); } - private registerMath(){ - Handlebars.registerHelper("math", function(lvalue, operator, rvalue, options) { + private static registerMath() { + Handlebars.registerHelper('math', function(lvalue, operator, rvalue, options) { let result; - switch(operator) { - case "+": result = lvalue + rvalue; break; - case "-": result = lvalue - rvalue; break; - case "*": result = lvalue * rvalue; break; - case "/": result = lvalue / rvalue; break; - case "%": result = lvalue % rvalue; break; + switch (operator) { + case '+': result = lvalue + rvalue; break; + case '-': result = lvalue - rvalue; break; + case '*': result = lvalue * rvalue; break; + case '/': result = lvalue / rvalue; break; + case '%': result = lvalue % rvalue; break; } return result; }); } - private registerArrayAtIndex() { + private static registerArrayAtIndex() { Handlebars.registerHelper('arrayAtIndex', function (value, index, options) { return value[index]; }); } - private registerSlice() { + private static registerSlice() { Handlebars.registerHelper('slice', function () { - let args = []; + const args = []; for (let index = 0; index < arguments.length - 1; index++) { args.push(arguments[index]); } - const value = args[0] + const value = args[0]; const from = args[1]; let to = null; - if(args.length>=3) { + if (args.length >= 3) { to = args[2]; return value.slice(from, to); } @@ -171,26 +147,149 @@ export class HandlebarsService { }); } + private static registerCardAction() { + Handlebars.registerHelper('action', function () { + const args = []; + for (let i = 0; i < arguments.length - 1; i++) { + args.push(arguments[i]); + } + let actionId = ''; + for (let i = 0; i < args.length; i++) { + actionId += args[i]; + } + return ``; + }); + } + + private static registerPreserveSpace() { + Handlebars.registerHelper('preserveSpace', function (value, options) { + return value.replace(/ /g, '\u00A0'); + }); + } + + private static registerArrayContains() { + Handlebars.registerHelper('arrayContains', function(arr, value, options) { + return arr.includes(value); + }); + } + + private static registerArrayContainsOneOf() { + Handlebars.registerHelper('arrayContainsOneOf', function(arr1, arr2, options) { + return arr1.some( ai => arr2.includes(ai) ); + }); + } + + private static registerTimes() { + Handlebars.registerHelper('times', function(n, block) { + let accum = ''; + for (let i = 0; i < n; ++i) + accum += block.fn(i); + return accum; + }); + } + + private static registerToBreakage() { + Handlebars.registerHelper('toBreakage', function (word, breakage, options) { + switch (breakage) { + case 'lowercase': + return word.toLowerCase(); + case 'uppercase': + return word.toUpperCase(); + default: + console.error(`Invalid parameter ${breakage} for the toBreakage helper`); + return 'ERROR'; + } + }); + } + + private static registerKeyValue() { + Handlebars.registerHelper('keyValue', function (obj, options) { + if (Object.keys(obj).length === 0) { + return options.fn({value: false}); + } + let buffer, key; + buffer = ''; + for (key in obj) { + if (!Object.hasOwnProperty.call(obj, key)) { + continue; + } + buffer += options.fn({ + key: key, + value: obj[key] + }) || ''; + } + return buffer; + }); + } + + private static registerKeepSpacesAndEndOfLine() { + Handlebars.registerHelper('keepSpacesAndEndOfLine', function (value, options) { + let result = Handlebars.escapeExpression(value); + result = result.replace(/\n/g, '
    '); + result = result.replace(/\s\s/g, '  '); + return new Handlebars.SafeString(result); + }); + + } + + private static registerMergeArrays() { + Handlebars.registerHelper('mergeArrays', function (arr1, arr2, options) { + return arr1.concat(arr2); + }); + } + + private static registerConditionalAttribute() { + Handlebars.registerHelper('conditionalAttribute', function (condition, attribute) { + return (condition) ? attribute : ''; + }); + } + + public changeLocale(locale: string) { + if (locale) { + this._locale = locale; + } else { + this._locale = 'en'; + } + } + + public executeTemplate(templateName: string, context: DetailContext): Observable { + return this.queryTemplate(context.card.process, context.card.processVersion, templateName).pipe( + map(t => t(context))); + } + + public queryTemplate(process: string, version: string, name: string): Observable { + const locale = this._locale; + const key = `${process}.${version}.${name}.${locale}`; + const template = this.templateCache[key]; + if (template) { + return of(template); + } + return this.businessconfig.fetchHbsTemplate(process, version, name, locale).pipe( + map(s => Handlebars.compile(s)), + tap(t => this.templateCache[key] = t) + ); + } + private registerSort() { Handlebars.registerHelper('sort', function () { - let args = []; + const args = []; for (let index = 0; index < arguments.length - 1; index++) { args.push(arguments[index]); } const context: any | any[] = args[0]; const sortKey = args[1]; let arrayToSort: any[]; - let isObject:boolean; - if (typeof context == 'object') { + let isObject: boolean; + if (typeof context === 'object') { if (context.length !== undefined && context.length !== null) { arrayToSort = context; - isObject = (typeof arrayToSort[0] == 'object') + isObject = (typeof arrayToSort[0] === 'object'); } else { isObject = true; arrayToSort = []; - for (let property in context) { + for (const property in context) { if (context.hasOwnProperty(property)) { - if (typeof context[property] == 'object') { + if (typeof context[property] === 'object') { arrayToSort.push({templatedObjectkey: property, ...context[property]}); } else { arrayToSort.push({ @@ -215,21 +314,21 @@ export class HandlebarsService { private registerI18n() { Handlebars.registerHelper('i18n', (...fctArgs) => { - let args = [], + const args = [], options = fctArgs[fctArgs.length - 1]; for (let i = 0; i < fctArgs.length - 1; i++) { args.push(fctArgs[i]); } let i18nKey: string, i18nParams: string[]; - if (typeof args[0] == 'object') { + if (typeof args[0] === 'object') { i18nKey = args[0].key; i18nParams = args[0].parameters; } else { - i18nKey = ""; + i18nKey = ''; for (let i = 0; i < args.length; i++) { if (i18nKey) - i18nKey += "." + i18nKey += '.'; i18nKey += args[i]; } i18nParams = options.hash; @@ -242,32 +341,18 @@ export class HandlebarsService { private registerSvg() { const svgUid = Guid.create().toString(); Handlebars.registerHelper('svg', function () { - let args = []; + const args = []; for (let i = 0; i < arguments.length - 1; i++) { args.push(arguments[i]); } - let imageUrl = ""; + let imageUrl = ''; for (let i = 0; i < args.length; i++) { imageUrl += args[i]; } return ` ` - }); - } - - private registerCardAction() { - Handlebars.registerHelper('action', function () { - let args = []; - for (let i = 0; i < arguments.length - 1; i++) { - args.push(arguments[i]); - } - let actionId = ""; - for (let i = 0; i < args.length; i++) { - actionId += args[i]; - } - return `` + `; }); } @@ -289,98 +374,21 @@ export class HandlebarsService { private registerNow() { Handlebars.registerHelper('now', function (options) { return moment().valueOf(); - }) - } - - private registerPreserveSpace() { - Handlebars.registerHelper("preserveSpace", function (value, options) { - return value.replace(/ /g, '\u00A0') - }); - } - - private registerArrayContains() { - Handlebars.registerHelper('arrayContains', function(arr, value, options) { - return arr.includes(value); - }); - } - - private registerArrayContainsOneOf() { - Handlebars.registerHelper('arrayContainsOneOf', function(arr1, arr2, options) { - return arr1.some( ai => arr2.includes(ai) ); - }); - } - - private registerTimes() { - Handlebars.registerHelper('times', function(n, block) { - var accum = ''; - for(var i = 0; i < n; ++i) - accum += block.fn(i); - return accum; }); } - - private registerToBreakage() { - Handlebars.registerHelper('toBreakage', function (word, breakage, options) { - switch (breakage) { - case 'lowercase': - return word.toLowerCase(); - case 'uppercase': - return word.toUpperCase(); - default: - console.error(`Invalid parameter ${breakage} for the toBreakage helper`); - return 'ERROR'; - } - }); - } - - private registerKeyValue() { - Handlebars.registerHelper('keyValue', function (obj, options) { - if (Object.keys(obj).length === 0) { - return options.fn({value: false}); - } - var buffer, key; - buffer = ""; - for (key in obj) { - if (!Object.hasOwnProperty.call(obj, key)) { - continue; - } - buffer += options.fn({ - key: key, - value: obj[key] - }) || ''; - } - return buffer; - }); - } - - private registerKeepSpacesAndEndOfLine() { - Handlebars.registerHelper('keepSpacesAndEndOfLine', function (value, options) { - let result = Handlebars.escapeExpression(value); - result = result.replace(/\n/g, '
    '); - result = result.replace(/\s\s/g, '  '); - return new Handlebars.SafeString(result); - }); - - } - - private registerMergeArrays() { - Handlebars.registerHelper('mergeArrays', function (arr1, arr2, options) { - return arr1.concat(arr2); - }); - } } -function sortOnKey(key){ - return function(a,b){ - if(typeof a[key] == 'string' && typeof b[key] == 'string'){ - if(a[key]b[key]) - return 1 + else if (a[key] > b[key]) + return 1; return 0; - }else if(typeof a[key] == 'number' && typeof b[key] == 'number'){ - return a[key]-b[key]; + } else if (typeof a[key] === 'number' && typeof b[key] === 'number') { + return a[key] - b[key]; } return 0; - } + }; } diff --git a/ui/main/src/app/services/app.service.ts b/ui/main/src/app/services/app.service.ts index fece4725fe..7f308ace1b 100644 --- a/ui/main/src/app/services/app.service.ts +++ b/ui/main/src/app/services/app.service.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -48,4 +48,8 @@ export class AppService { this.store.dispatch(new ClearLightCardSelection()); this._router.navigate(['/' + currentPath, 'cards']); } + + reopenDetails(currentPath: string, cardId: string) { + this._router.navigate(['/' + currentPath, 'cards', cardId]); + } } From f1447393391f2d92d147d9b7fae9269ebf582ad7 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Fri, 26 Feb 2021 09:25:41 +0100 Subject: [PATCH 07/45] OC-1503 Add an opfab style for border box with label in template Signed-off-by: freddidierRTE --- .../reference_doc/template_description.adoc | 5 +- .../template/en/incidentInProgress.handlebars | 25 +++-- .../en/usercard_incidentInProgress.handlebars | 7 +- .../template/fr/incidentInProgress.handlebars | 24 +++-- .../fr/usercard_incidentInProgress.handlebars | 6 +- .../template/en/usercard_task.handlebars | 7 +- .../template/fr/usercard_task.handlebars | 7 +- ui/main/src/assets/styles/styles.scss | 95 ++++++++++++------- 8 files changed, 105 insertions(+), 71 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index aa09cf4495..d33165bc8a 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -465,11 +465,12 @@ OperatorFabric defines a `css class` that you should use so your templates don't * opfab-select : select input field * opfab-radio-button : radio button input field * opfab-checkbox : checkbox input field -* opfab-table : a HTML table +* opfab-table : a HTML table +* opfab-border-box : a box with a label These styles are especially useful for templates used in user card or card with responses. -Your can find example using these classes in the OperatorFabric core repository (https://github.com/opfab/operatorfabric-core/tree/develop/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples[src/test/utils/karate/businessconfig/resources/bundle_userCardExamples]). +Your can find example using these classes in the OperatorFabric core repository (https://github.com/opfab/operatorfabric-core/tree/develop/src/test/utils/karate/businessconfig/resources[src/test/utils/karate/businessconfig/resources]). == Charts diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars index b4dce2599c..5392699e7f 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars @@ -27,16 +27,21 @@

    - - - - - - - - - -
    +
    + + + + + + + + + + +
    +
    + +


    diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars index 7b22690a0e..1a0a5c06ae 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_incidentInProgress.handlebars @@ -17,9 +17,9 @@
    -IMPACTED SERVICES :

    -
    - +
    + +
    @@ -31,6 +31,7 @@ IMPACTED SERVICES :


    +

    - - - - - - - - - -
    +
    + + + + + + + + + + +
    +
    +


    diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars index 6b0864a0d7..e37a25a6a0 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_incidentInProgress.handlebars @@ -17,9 +17,9 @@
    -SERVICES IMPACTES :

    -
    - +
    + +
    diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars index 27d95d1d8e..cf4ede00c3 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars @@ -14,10 +14,9 @@
    -REPEAT EVERY: -

    -
    -
    +
    + +
    diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars index 59c1272285..fb54beb7b5 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars @@ -15,10 +15,9 @@
    -REPETER CHAQUE: -

    -
    -
    +
    + +
    diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index 16f0044d59..4ff8323a3c 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -578,41 +578,6 @@ type-ahead > .badge-primary { // end multiselect specific conf -// Class to use when background form is lighter - -.opfab-form-lighter { - .opfab-input, - .opfab-input > input, - .opfab-input label , - .opfab-textarea, - .opfab-textarea > textarea, - .opfab-textarea label , - .form-control , - .form-control:disabled , - .opfab-input > input , - .opfab-multiselect, - .opfab-multiselect > label, - .opfab-multiselect .c-btn, - .opfab-select, - .opfab-select > select, - .opfab-select > select option, - .opfab-select > label, - .opfab-input-type-ahead, - .opfab-input-type-ahead > input, - .opfab-input-type-ahead label , - type-ahead > input{ - background-color: var(--opfab-bgcolor); - } - type-ahead > .badge-primary { - background-color: var(--opfab-bgcolor-darker); - } - // Remove default arrow by setting the up/down arrow color to the background color - .opfab-multiselect .selected-list .c-angle-down svg, .opfab-multiselect .selected-list .c-angle-up svg{ - fill: var(--opfab-bgcolor); - } - -} - // Table @@ -649,6 +614,66 @@ type-ahead > .badge-primary { } +// Border box + +.opfab-border-box { + color:var(--opfab-input-text-color); + position: relative; + box-sizing: border-box; + padding: 10px; + border: 1px solid var(--opfab-form-border-color); + border-radius: 3px; + outline: none; +} + +.opfab-border-box > label { + margin-left: 10px; + padding-left: 10px; + padding-right: 10px; + position: absolute; + font-size: 11px; + top: -10px; + left:10; + color: var(--opfab-form-label-text-color); + background-color: var(--opfab-bgcolor-darker); +} + + +// Class to use when background form is lighter + +.opfab-form-lighter { + .opfab-input, + .opfab-input > input, + .opfab-input label , + .opfab-textarea, + .opfab-textarea > textarea, + .opfab-textarea label , + .form-control , + .form-control:disabled , + .opfab-input > input , + .opfab-multiselect, + .opfab-multiselect > label, + .opfab-multiselect .c-btn, + .opfab-select, + .opfab-select > select, + .opfab-select > select option, + .opfab-select > label, + .opfab-border-box > label, + .opfab-input-type-ahead, + .opfab-input-type-ahead > input, + .opfab-input-type-ahead label , + type-ahead > input{ + background-color: var(--opfab-bgcolor); + } + type-ahead > .badge-primary { + background-color: var(--opfab-bgcolor-darker); + } + // Remove default arrow by setting the up/down arrow color to the background color + .opfab-multiselect .selected-list .c-angle-down svg, .opfab-multiselect .selected-list .c-angle-up svg{ + fill: var(--opfab-bgcolor); + } + +} // Pagination component config From 981cd9335efaa2c07a58419b5d215f2a7408b038 Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Fri, 26 Feb 2021 11:54:46 +0100 Subject: [PATCH 08/45] [OC-1499] Disable service and process fields when editing a user card --- ui/main/src/app/modules/usercard/usercard.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 86f94510b2..599fea7fd4 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -169,8 +169,11 @@ export class UserCardComponent implements OnDestroy, OnInit { this.messageForm.get('service').setValue(serviceForCardToEdit); else this.messageForm.get('service').setValue('--'); + + this.messageForm.get('service').disable(); this.messageForm.get('process').setValue(this.cardToEdit.card.process); + this.messageForm.get('process').disable(); this.messageForm.get('state').setValue(this.cardToEdit.card.state); this.messageForm.get('startDate').setValue(getDateTimeNgbFromMoment(moment(this.cardToEdit.card.startDate))); this.messageForm.get('endDate').setValue(getDateTimeNgbFromMoment(moment(this.cardToEdit.card.endDate))); @@ -367,8 +370,9 @@ export class UserCardComponent implements OnDestroy, OnInit { onSubmitForm(template: TemplateRef) { const formValue = this.messageForm.value; + const processValue = this.editCardMode ? this.cardToEdit.card.process : formValue['process']; const selectedProcess = this.processesDefinition.find(process => { - return process.id === formValue['process']; + return process.id === processValue; }); const processVersion = selectedProcess.version; const state = formValue['state']; From fda18caa65226b2d21066a6d917befa5e3a1f899 Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Fri, 26 Feb 2021 17:34:34 +0100 Subject: [PATCH 09/45] [OC-1508] Communicate to the template if the user can respond --- .../asciidoc/reference_doc/response_cards.adoc | 7 ++++++- .../template/en/incidentInProgress.handlebars | 14 ++++++++++++-- .../template/fr/incidentInProgress.handlebars | 14 ++++++++++++-- .../cards/components/detail/detail.component.ts | 1 + ui/main/src/assets/js/templateGateway.js | 3 ++- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index 4317870dfa..1a1fe02652 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -172,6 +172,11 @@ The user can then click on "MODIFY ANSWER" and the button will come back to its Once again, after validating its answer, the information will be sent to the third template that the card has been locked (by calling the templateGateway.lockAnswer() function). +== Response enabled +The template will be informed if the current user has the permission to answer by calling the _templateGateway.setUserCanRespond(boolean)_ function. +An example of templateGateway.setUserCanRespond() implementation can be found in the file src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/incidentInProgress.handlebars. + == Last Time to Decide (`lttd`) -If the card has a last time to decide (lttd) configured, when the time is expired this information will be sent to the third template (by calling the template.setLttdExpired(true) function). \ No newline at end of file +If the card has a last time to decide (lttd) configured, when the time is expired this information will be sent to the third template (by calling the template.setLttdExpired(true) function). + diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars index 5392699e7f..eae7757a74 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/incidentInProgress.handlebars @@ -20,7 +20,7 @@ -
    +
    Please fill in the impacts from your perspective
    @@ -45,7 +45,7 @@


    -
    +
    @@ -140,4 +140,14 @@ formData: formData }; } + + templateGateway.setUserCanRespond = function(responseEnabled) { + if (responseEnabled) { + document.getElementById('services').style.display = ''; + document.getElementById('other-impacts').style.display = ''; + } else { + document.getElementById('services').style.display = 'none'; + document.getElementById('other-impacts').style.display = 'none' + } + } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars index cf76547538..5bb597dd74 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/incidentInProgress.handlebars @@ -21,7 +21,7 @@ -
    +
    Merci de saisir les impacts que vous identifiez de votre coté
    @@ -45,7 +45,7 @@


    -
    +
    @@ -140,6 +140,16 @@ formData: formData }; } + + templateGateway.setUserCanRespond = function(responseEnabled) { + if (responseEnabled) { + document.getElementById('services').style.display = ''; + document.getElementById('other-impacts').style.display = ''; + } else { + document.getElementById('services').style.display = 'none'; + document.getElementById('other-impacts').style.display = 'none' + } + } diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index bc3fdc6378..ba90b2a19d 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -583,6 +583,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } templateGateway.setScreenSize(this.screenSize); + templateGateway.setUserCanRespond(this.isActionEnabled); }, 10); }, 10); }, () => { diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js index 7825b5ab36..d7d9071a9d 100644 --- a/ui/main/src/assets/js/templateGateway.js +++ b/ui/main/src/assets/js/templateGateway.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -37,6 +37,7 @@ const templateGateway = { unlockAnswer: function() {}, setLttdExpired: function(expired) {}, setScreenSize: function(size) {}, + setUserCanRespond: function(responseEnabled) {}, childCards: [] }; From 79907e30edb8bad53fb71a4fdc2b32699a1dc460 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 1 Mar 2021 09:13:36 +0100 Subject: [PATCH 10/45] [OC-1512] Adapt UI for small screens Signed-off-by: freddidierRTE --- .../components/detail/detail.component.html | 252 +++++++++--------- .../components/detail/detail.component.ts | 5 + .../src/app/modules/feed/feed.component.html | 2 +- .../src/app/modules/feed/feed.component.ts | 6 + 4 files changed, 142 insertions(+), 123 deletions(-) diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index 9e1be2b455..16f0fbbcd3 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -6,32 +6,35 @@ -
    +
    • - {{i18nPrefix+card.title.key}} + {{i18nPrefix+card.title.key}}
    • -
      - -
      -
      {{'button.edit'}}
      -       -
      +
      +
      + +
      +
      {{'button.edit'}}
      +       +
      -
      - -
      -
      {{'button.delete'}}
      -       -
      +
      + +
      +
      {{'button.delete'}}
      +       +
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      @@ -44,131 +47,136 @@ -
      - - - - - +
      + - -
      -   {{entity.name}}   -
      -       - -
      -
      -
      - response.status : - {{i18nPrefix+this.cardState.name}}   - | - + + + + + + +
      +   {{entity.name}}  
      +       -
      -
      +
      +
      +
      + response.status : + {{i18nPrefix+this.cardState.name}}   + | +
      - response.answers : - +
      +
      + response.answers : +   {{entity.name}}   - - -  ..  - +       + +  ..  + +
      -
      -
      +
      -
      +
      -
      +
      - feed.received -
      - - + feed.received +
      + + - + +
      -
      - -
      - userCard.deleteCard.doYouReallyWant -
      - -
      -
      -
      - - -
      -       + +
      + userCard.deleteCard.doYouReallyWant +
      + +
      +
      +
      + + +
      +       + + +
      +

      userCard.deleteCard.cardDeletedWithNoError

      + +
      +
      + +
      +       + + +
      +

      userCard.deleteCard.error.impossibleToDeleteCard

      + +
      +
      + +
      +       +
      - -
      -

      userCard.deleteCard.cardDeletedWithNoError

      - -
      -
      - -
      -       - -
      -

      userCard.deleteCard.error.impossibleToDeleteCard

      - -
      -
      - -
      -
      - -
      -
      -
      +
      - -
      -
      userCard.editTitle
      -
      - + +
      +
      userCard.editTitle
      +
      +
      -
      -
      +
      +
      - +
      -
      -       \ No newline at end of file +
      + \ No newline at end of file diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index bc3fdc6378..11cee81d7b 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -689,6 +689,11 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC templateGateway.setScreenSize(active ? 'lg' : 'md'); } + public isSmallscreen() + { + return (window.innerWidth <1000); + } + ngOnDestroy() { this.updateReadCardStatusOnUI(); templateGateway.childCards = []; diff --git a/ui/main/src/app/modules/feed/feed.component.html b/ui/main/src/app/modules/feed/feed.component.html index a2fd267d9c..9867c76d74 100644 --- a/ui/main/src/app/modules/feed/feed.component.html +++ b/ui/main/src/app/modules/feed/feed.component.html @@ -11,7 +11,7 @@
      -
      +
      diff --git a/ui/main/src/app/modules/feed/feed.component.ts b/ui/main/src/app/modules/feed/feed.component.ts index 35ec2a21a2..70b3a420b5 100644 --- a/ui/main/src/app/modules/feed/feed.component.ts +++ b/ui/main/src/app/modules/feed/feed.component.ts @@ -31,6 +31,7 @@ export class FeedComponent implements OnInit { selection$: Observable; hideTimeLine: boolean; + constructor(private store: Store, private configService: ConfigService) { } @@ -61,4 +62,9 @@ export class FeedComponent implements OnInit { } + public isSmallscreen() + { + return (window.innerWidth <1000 || window.innerHeight <800 ); + } + } From 9835058ffe68053fee87b684120ba148021e23aa Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 1 Mar 2021 13:57:52 +0100 Subject: [PATCH 11/45] [OC-1514] Add documentation for json handlebars helper Signed-off-by: freddidierRTE --- .../asciidoc/reference_doc/template_description.adoc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index d33165bc8a..a0f44946a0 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -455,6 +455,16 @@ an checkbox with `checked=false` will still be checked). .... +[[json]] +=== json + +Convert the element in json, this can be useful to use the element as a javascript object in the template. For example : + +.... +var myAttribute = {{json data.myAttribute}}; +.... + + [[opfab_template_style]] == OperatorFabric css styles From b0c1b4dda3f8996ad86a9c70c732fe36aa915d28 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 1 Mar 2021 14:24:05 +0100 Subject: [PATCH 12/45] [OC-1514] reorder documentation for handlebars helpers in alphabetical order Signed-off-by: freddidierRTE --- .../reference_doc/template_description.adoc | 428 +++++++++--------- 1 file changed, 217 insertions(+), 211 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index a0f44946a0..6b398ec236 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -29,151 +29,167 @@ following helpers : == OperatorFabric specific handlebars helpers -[[numberformat]] -=== numberFormat +[[arrayContains]] +=== arrayContains -formats a number parameter using -https://developer.mozilla.org/fr/docs/Web/JavaScript/Reference/Objets_globaux/Nu -mberFormat[Intl.NumberFormat]. -The locale used is the current user selected one, and options are passed as hash -parameters (https://handlebarsjs.com/[see Handlebars doc Literals section]). +Verify if an array contains a specified element. If the array does contain the element, it returns true. Otherwise, it returns false. .... -{{numberFormat card.data.price style="currency" currency="EUR"}} +

      test

      .... -[[dateformat]] -=== dateFormat - -formats the submitted parameters (millisecond since epoch) using -https://momentjs.com/[mement.format]. The locale used is the current user -selected one, the format is "format" hash parameter -(https://handlebarsjs.com/[see Handlebars doc Literals section]). +If the colors array contains 'red', the output is: .... -{{dateFormat card.data.birthday format="MMMM Do YYYY, h:mm:ss a"}} +

      test

      .... -[[slice]] -=== slice - -extracts a sub array from ann array +[[arrayContainsOneOf]] +=== arrayContainsOneOf -example: +If the first array contains at least one element of the second array, return true. Otherwise, return false. .... - -
        -{{#each (slice array 0 2)}} -
      • {{this}}
        • -{{/each}} -
      +{{#if (arrayContainsOneOf arr1 arr2)}} +

      Arr1 contains at least one element of arr2

      +{{/if}} .... -outputs: + +[[bool]] +=== bool + +returns a boolean result value on an arithmetical operation (including object +equality) or boolean operation. + +Arguments: - v1: left value operand - op: operator (string value) - v2: right +value operand + +arithmetical operators: + + - == + - === + - != + - !== + - < + - <= + - > + - >= + +boolean operators: + +- && +- || + +examples: .... -
        -
      • foo
        • -
      • bar
        • -
      +{{#if (bool v1 '<' v2)}} + v1 is strictly lower than v2 +{{else}} + V2 is lower or equal to v1 +{{/if}} .... -and +[[conditionalAttribute]] +=== conditionalAttribute +Adds the specified attribute to an HTML element if the given condition is truthy. +This is useful for attributes such as `checked` where it is the presence or absence of the attribute that matters (i.e. +an checkbox with `checked=false` will still be checked). .... - -
        -{{#each (slice array 1)}} -
      • {{this}}
        • -{{/each}} -
      + .... -outputs: +[[dateformat]] +=== dateFormat + +formats the submitted parameters (millisecond since epoch) using +https://momentjs.com/[mement.format]. The locale used is the current user +selected one, the format is "format" hash parameter +(https://handlebarsjs.com/[see Handlebars doc Literals section]). .... -
        -
      • bar
        • -
      • baz
        • -
      +{{dateFormat card.data.birthday format="MMMM Do YYYY, h:mm:ss a"}} .... -[[now]] -=== now -outputs the current date in millisecond from epoch. The date is computed from -application internal time service and thus may be different from the date that -one can compute from javascript api which relies on the browsers' system time. +[[i18n]] +=== i18n -NB: Due to Handlebars limitation you must provide at least one argument to -helpers otherwise, Handlebars will confuse a helper and a variable. In the -bellow example, we simply pass an empty string. +outputs a i18n result from a key and some parameters. There are two ways of +configuration : -example: +* Pass an object as sole argument. The object must contain a key field (string) +and an optional parameter field (map of parameterKey => value) ++ +.... +{{i18n card.data.i18nTitle}} +.... +* Pass a string key as sole argument and use hash parameters +(https://handlebarsjs.com/[see Handlebars doc Literals section]) for i18n string +parameters. .... -
      {{now ""}}
      -
      -
      {{dateFormat (now "") format="MMMM Do YYYY, h:mm:ss a"}}
      + +{{i18n "emergency.title" date="2018-06-14" cause="Broken Coffee Machine"}} .... outputs .... -
      1551454795179
      -
      -
      mars 1er 2019, 4:39:55 pm
      +Emergency situation happened on 2018-06-14. Cause : Broken Cofee Machine .... -for a local set to `FR_fr` -[[preservespace]] -=== preserveSpace +[[json]] +=== json -preserves space in parameter string to avoid html standard space trimming. +Convert the element in json, this can be useful to use the element as a javascript object in the template. For example : .... -{{preserveSpace card.data.businessId}} +var myAttribute = {{json data.myAttribute}}; .... -[[bool]] -=== bool +=== keepSpacesAndEndOfLine -returns a boolean result value on an arithmetical operation (including object -equality) or boolean operation. +Convert a string to a light HTML by replacing : -Arguments: - v1: left value operand - op: operator (string value) - v2: right -value operand + - each new line character with
      + - spaces with \  when there is at least two consecutive spaces. -arithmetical operators: - - == - - === - - != - - !== - - < - - <= - - > - - >= +[[keyValue]] +=== keyValue -boolean operators: +This allows to traverse a map. -- && -- || +Notice that this should normally be feasible by using the built-in each helper, but a client was having some troubles using it so we added this custom helper. -examples: +.... +{{#keyValue studentGrades}} +

      {{key}}: {{value}}

      +{{/keyValue}} +.... + +If the value of the studentGrades map is: .... -{{#if (bool v1 '<' v2)}} - v1 is strictly lower than v2 -{{else}} - V2 is lower or equal to v1 -{{/if}} +{ + 'student1': 15, + 'student2': 12, + 'student3': 9 +} +.... + +The output will be: + +.... +

      student1: 15

      +

      student2: 12

      +

      student3: 9

      .... [[math]] @@ -201,69 +217,115 @@ example: {{math 1 '+' 2}} .... -[[split]] -=== split +[[mergeArrays]] +=== mergeArrays -splits a string into an array based on a split string. +Return an array that is a merge of the two arrays. + +.... +{{#each (mergeArrays arr1 arr2)}} +

      {{@index}} element: {{this}}

      +{{/each}} +.... + +[[now]] +=== now + +outputs the current date in millisecond from epoch. The date is computed from +application internal time service and thus may be different from the date that +one can compute from javascript api which relies on the browsers' system time. + +NB: Due to Handlebars limitation you must provide at least one argument to +helpers otherwise, Handlebars will confuse a helper and a variable. In the +bellow example, we simply pass an empty string. example: .... -
        -{{#each (split 'my.example.string' '.')}} -
      • {{this}}
        • -{{/each}} -
      +
      {{now ""}}
      +
      +
      {{dateFormat (now "") format="MMMM Do YYYY, h:mm:ss a"}}
      .... outputs .... -
        -
      • my
        • -
      • example
        • -
      • string
        • -
      +
      1551454795179
      +
      +
      mars 1er 2019, 4:39:55 pm
      .... -[[svg]] -=== svg +for a local set to `FR_fr` -outputs a svg tag with lazy loading, and missing image replacement message. The -image url is the concatenation of an arbitrary number of helper arguments +[[numberformat]] +=== numberFormat + +formats a number parameter using +https://developer.mozilla.org/fr/docs/Web/JavaScript/Reference/Objets_globaux/Nu +mberFormat[Intl.NumberFormat]. +The locale used is the current user selected one, and options are passed as hash +parameters (https://handlebarsjs.com/[see Handlebars doc Literals section]). .... -{{{svg baseUri scheduledOpId "/" substation "/before/" -computationPhaseOrdinal}}} +{{numberFormat card.data.price style="currency" currency="EUR"}} .... -[[i18n]] -=== i18n +[[preservespace]] +=== preserveSpace -outputs a i18n result from a key and some parameters. There are two ways of -configuration : +preserves space in parameter string to avoid html standard space trimming. -* Pass an object as sole argument. The object must contain a key field (string) -and an optional parameter field (map of parameterKey => value) -+ .... -{{i18n card.data.i18nTitle}} +{{preserveSpace card.data.businessId}} .... -* Pass a string key as sole argument and use hash parameters -(https://handlebarsjs.com/[see Handlebars doc Literals section]) for i18n string -parameters. + +[[slice]] +=== slice + +extracts a sub array from ann array + +example: .... -{{i18n "emergency.title" date="2018-06-14" cause="Broken Coffee Machine"}} +
        +{{#each (slice array 0 2)}} +
      • {{this}}
        • +{{/each}} +
      .... -outputs +outputs: .... -Emergency situation happened on 2018-06-14. Cause : Broken Cofee Machine +
        +
      • foo
        • +
      • bar
        • +
      +.... + +and + +.... + +
        +{{#each (slice array 1)}} +
      • {{this}}
        • +{{/each}} +
      +.... + +outputs: + +.... +
        +
      • bar
        • +
      • baz
        • +
      .... [[sort]] @@ -333,21 +395,44 @@ outputs :
    .... -[[arrayContains]] -=== arrayContains -Verify if an array contains a specified element. If the array does contain the element, it returns true. Otherwise, it returns false. +[[split]] +=== split + +splits a string into an array based on a split string. + +example: .... -

    test

    +
      +{{#each (split 'my.example.string' '.')}} +
    • {{this}}
      • +{{/each}} +
    .... -If the colors array contains 'red', the output is: +outputs .... -

    test

    +
      +
    • my
      • +
    • example
      • +
    • string
      • +
    +.... + +[[svg]] +=== svg + +outputs a svg tag with lazy loading, and missing image replacement message. The +image url is the concatenation of an arbitrary number of helper arguments + +.... +{{{svg baseUri scheduledOpId "/" substation "/before/" +computationPhaseOrdinal}}} .... + [[times]] === times @@ -385,85 +470,6 @@ If the value of the key variable is "TEST", the output will be: tests .... -[[keyValue]] -=== keyValue - -This allows to traverse a map. - -Notice that this should normally be feasible by using the built-in each helper, but a client was having some troubles using it so we added this custom helper. - -.... -{{#keyValue studentGrades}} -

    {{key}}: {{value}}

    -{{/keyValue}} -.... - -If the value of the studentGrades map is: - -.... -{ - 'student1': 15, - 'student2': 12, - 'student3': 9 -} -.... - -The output will be: - -.... -

    student1: 15

    -

    student2: 12

    -

    student3: 9

    -.... - -=== keepSpacesAndEndOfLine - -Convert a string to a light HTML by replacing : - - - each new line character with
    - - spaces with \  when there is at least two consecutive spaces. - -[[arrayContainsOneOf]] -=== arrayContainsOneOf - -If the first array contains at least one element of the second array, return true. Otherwise, return false. - -.... -{{#if (arrayContainsOneOf arr1 arr2)}} -

    Arr1 contains at least one element of arr2

    -{{/if}} -.... - -[[mergeArrays]] -=== mergeArrays - -Return an array that is a merge of the two arrays. - -.... -{{#each (mergeArrays arr1 arr2)}} -

    {{@index}} element: {{this}}

    -{{/each}} -.... - -[[conditionalAttribute]] -=== conditionalAttribute - -Adds the specified attribute to an HTML element if the given condition is truthy. -This is useful for attributes such as `checked` where it is the presence or absence of the attribute that matters (i.e. -an checkbox with `checked=false` will still be checked). -.... - -.... - -[[json]] -=== json - -Convert the element in json, this can be useful to use the element as a javascript object in the template. For example : - -.... -var myAttribute = {{json data.myAttribute}}; -.... - [[opfab_template_style]] == OperatorFabric css styles From a2d0036a3bb34f2a5cc5e4eec9ca7e884de6e20f Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Thu, 25 Feb 2021 16:18:55 +0100 Subject: [PATCH 13/45] [OC-1446] Implementation of a test java client --- settings.gradle | 2 + src/test/clientApp/clientApp.gradle | 50 +++++++++++ src/test/clientApp/launchClientApp.sh | 13 +++ .../client/ClientApplication.java | 84 +++++++++++++++++++ .../client/cards/CardClient.java | 58 +++++++++++++ .../operatorfabric/client/cards/CardData.java | 23 +++++ .../client/common/HttpClientInterceptor.java | 34 ++++++++ .../client/config/JacksonConfig.java | 48 +++++++++++ .../client/security/AuthClient.java | 57 +++++++++++++ .../client/security/AuthToken.java | 26 ++++++ .../src/main/resources/application.yml | 6 ++ 11 files changed, 401 insertions(+) create mode 100755 src/test/clientApp/clientApp.gradle create mode 100755 src/test/clientApp/launchClientApp.sh create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/ClientApplication.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardClient.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardData.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/common/HttpClientInterceptor.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/config/JacksonConfig.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthClient.java create mode 100644 src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthToken.java create mode 100644 src/test/clientApp/src/main/resources/application.yml diff --git a/settings.gradle b/settings.gradle index f26c4d5d99..11eebda3ec 100755 --- a/settings.gradle +++ b/settings.gradle @@ -42,6 +42,7 @@ include 'services:core:users' include 'web-ui' include 'ui:main' include 'externalApp' +include 'clientApp' project(':client:businessconfig').name = 'businessconfig-client-data' project(':client:cards').name = 'cards-client-data' @@ -53,6 +54,7 @@ project(':services:core:cards-consultation').name = 'cards-consultation-business project(':web-ui').name = 'web-ui' project(':ui:main').name = 'main-user-interface' project(':externalApp').projectDir = file('src/test/externalApp') +project(':clientApp').projectDir = file('src/test/clientApp') //we check if the modules have gradle configuration files rootProject.children.each { project -> diff --git a/src/test/clientApp/clientApp.gradle b/src/test/clientApp/clientApp.gradle new file mode 100755 index 0000000000..239f758166 --- /dev/null +++ b/src/test/clientApp/clientApp.gradle @@ -0,0 +1,50 @@ + +buildscript { + repositories { + jcenter() + mavenLocal() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } + } + dependencies { + + } +} + +apply plugin: plugin.bom +apply plugin: plugin.boot +apply plugin: 'java' + + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + + +//create a single Jar with all dependencies +jar { + manifest { + attributes 'Main-Class': 'org.lfenergy.operatorfabric.client.ClientApplication' + } + + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } + } + + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + + annotationProcessor 'org.projectlombok:lombok' + compile project(':client:cards-client-data') + compile project(':tools:generic:utilities'), project(':tools:spring:spring-utilities') + testImplementation('org.springframework.boot:spring-boot-starter-test') { + } +} + +test { + useJUnitPlatform() +} diff --git a/src/test/clientApp/launchClientApp.sh b/src/test/clientApp/launchClientApp.sh new file mode 100755 index 0000000000..38c75fa8e8 --- /dev/null +++ b/src/test/clientApp/launchClientApp.sh @@ -0,0 +1,13 @@ +#/bin/sh + +# Copyright (c) 2021, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + +java -jar build/libs/clientApp-SNAPSHOT.jar + diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/ClientApplication.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/ClientApplication.java new file mode 100644 index 0000000000..c51fa601c9 --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/ClientApplication.java @@ -0,0 +1,84 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client; + +import java.time.Instant; +import java.util.List; + +import org.lfenergy.operatorfabric.cards.model.Card; +import org.lfenergy.operatorfabric.cards.model.CardCreationReport; +import org.lfenergy.operatorfabric.cards.model.I18n; +import org.lfenergy.operatorfabric.cards.model.SeverityEnum; +import org.lfenergy.operatorfabric.client.cards.CardClient; +import org.lfenergy.operatorfabric.client.security.AuthClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@SpringBootApplication +public class ClientApplication implements CommandLineRunner { + + @Autowired + public CardClient cardClient; + + @Autowired + public AuthClient authClient; + + private final String OPFAB_PUBLICATION_URL = "http://localhost:2102/cards"; + private final String OPFAB_CONSULTATION_URL = "http://localhost:2002/cards/cards"; + private final String OPFAB_AUTH_URL = "http://localhost:2002/auth/token"; + + public static void main(String[] args) { + SpringApplication.run(ClientApplication.class, args).close(); + + } + + @Override + public void run(String... args) { + testCard(); + } + + private void testCard() { + Card card = new Card(); + card.setPublisher("api_test"); + card.setProcessVersion("1"); + card.setProcess("api_test"); + card.setProcessInstanceId("processClient"); + card.setState("messageState"); + card.setUserRecipients(List.of("operator1")); + card.setSeverity(SeverityEnum.INFORMATION); + card.setStartDate(Instant.now()); + + I18n summary = new I18n(); + summary.setKey("message.summary"); + card.setSummary(summary); + + I18n title = new I18n(); + title.setKey("message.title"); + card.setTitle(title); + + CardCreationReport result = cardClient.postCard(OPFAB_PUBLICATION_URL, card); + log.info("Card creation result " + result); + + try { + String token = authClient.getToken(OPFAB_AUTH_URL); + String cardId = "api_test.processClient"; + Card card2 = cardClient.getCard(OPFAB_CONSULTATION_URL, token, cardId); + log.info("Got card " + card2); + } catch (Exception e) { + log.error("Error getting card", e); + } + + } +} diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardClient.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardClient.java new file mode 100644 index 0000000000..9a353afeac --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardClient.java @@ -0,0 +1,58 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client.cards; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.lfenergy.operatorfabric.cards.model.Card; +import org.lfenergy.operatorfabric.cards.model.CardCreationReport; +import org.lfenergy.operatorfabric.client.common.HttpClientInterceptor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +@Component +public class CardClient { + + @Autowired + public RestTemplateBuilder builder; + + public CardCreationReport postCard(String url, Card card) { + RestTemplate restTemplate = builder.build(); + restTemplate.setInterceptors(List.of(new HttpClientInterceptor())); + + HttpEntity request = new HttpEntity<>(card); + ResponseEntity response = restTemplate.postForEntity(url, request, CardCreationReport.class); + return response.getBody(); + } + + public Card getCard(String url, String authToken, String cardId) { + RestTemplate restTemplate = builder.build(); + + HttpHeaders headers = new HttpHeaders(); + headers.add("Authorization","Bearer " + authToken); + HttpEntity request = new HttpEntity<>(headers); + Map params = new HashMap<>(); + + ResponseEntity response = restTemplate.exchange(url + "/" + cardId, HttpMethod.GET, + request, CardData.class, params); + return response.getBody().card; + } + + + +} diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardData.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardData.java new file mode 100644 index 0000000000..c016e520d0 --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/cards/CardData.java @@ -0,0 +1,23 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ +package org.lfenergy.operatorfabric.client.cards; + +import org.lfenergy.operatorfabric.cards.model.Card; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class CardData { + Card card; + Card[] childCards; +} \ No newline at end of file diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/common/HttpClientInterceptor.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/common/HttpClientInterceptor.java new file mode 100644 index 0000000000..3c4d116f7b --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/common/HttpClientInterceptor.java @@ -0,0 +1,34 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client.common; + +import java.io.IOException; + +import org.springframework.http.HttpRequest; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class HttpClientInterceptor + implements ClientHttpRequestInterceptor { + + + @Override + public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) + throws IOException { + log.info("Request body: " + new String(body)); + ClientHttpResponse response = execution.execute(request, body); + + return response; + } +} \ No newline at end of file diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/config/JacksonConfig.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/config/JacksonConfig.java new file mode 100644 index 0000000000..6cc5a81f34 --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/config/JacksonConfig.java @@ -0,0 +1,48 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.lfenergy.operatorfabric.springtools.json.InstantModule; + +/** + * Json configuration + * + * + */ +@Configuration +@Slf4j +public class JacksonConfig { + + /** + * Builds object mapper adding java 8 custom configuration and business module configuration ({@link BusinessconfigModule}) + * @param builder Spring internal {@link ObjectMapper} builder [injected] + * @return configured object mapper for json + */ + @Bean + @Autowired + public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { + ObjectMapper objectMapper = builder.createXmlMapper(false).build(); + + // Some other custom configuration to support Java 8 features + objectMapper.registerModule(new Jdk8Module()); + objectMapper.registerModule(new JavaTimeModule()); + objectMapper.registerModule(new InstantModule()); + return objectMapper; + } +} + diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthClient.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthClient.java new file mode 100644 index 0000000000..eef4399c62 --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthClient.java @@ -0,0 +1,57 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client.security; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; + +@Component +public class AuthClient { + + @Autowired + public RestTemplateBuilder builder; + + @Autowired + private ObjectMapper objectMapper; + + public String getToken(String url) throws JsonMappingException, JsonProcessingException { + + RestTemplate restTemplate = builder.build(); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + + MultiValueMap map= new LinkedMultiValueMap(); + map.add("username", "operator1"); + map.add("password", "test"); + map.add("grant_type", "password"); + map.add("client_id", "opfab-client"); + + HttpEntity> request = new HttpEntity>(map, headers); + + ResponseEntity response = restTemplate.postForEntity( url, request , String.class ); + AuthToken token = objectMapper.readValue(response.getBody(), AuthToken.class); + return token.getAccess_token(); + } + + +} diff --git a/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthToken.java b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthToken.java new file mode 100644 index 0000000000..41b4868680 --- /dev/null +++ b/src/test/clientApp/src/main/java/org/lfenergy/operatorfabric/client/security/AuthToken.java @@ -0,0 +1,26 @@ +/* Copyright (c) 2021, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +package org.lfenergy.operatorfabric.client.security; + +import lombok.Getter; + + +public class AuthToken { + + @Getter + private String access_token; + private long expires_in; + private long refresh_expires_in; + private String refresh_token; + private String token_type; + private String id_token; + private String scope; + private String session_state; +} diff --git a/src/test/clientApp/src/main/resources/application.yml b/src/test/clientApp/src/main/resources/application.yml new file mode 100644 index 0000000000..5a46dacabc --- /dev/null +++ b/src/test/clientApp/src/main/resources/application.yml @@ -0,0 +1,6 @@ +spring: + main: + web-application-type: none +logging: + level: + org.springframework.web.client.RestTemplate: DEBUG From a14bc9b0fd9ab8263caa4ccc1e03933c01fd65fa Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Wed, 3 Mar 2021 06:21:56 +0100 Subject: [PATCH 14/45] [OC-1498] Add the possibility to set the response state from the template --- src/docs/asciidoc/reference_doc/archives.adoc | 1 + .../reference_doc/response_cards.adoc | 59 ++++++--- .../bundle_defaultProcess/config.json | 9 +- .../bundle_defaultProcess/i18n/en.json | 8 +- .../en/multipleOptionsResponse.handlebars | 5 + .../template/en/question.handlebars | 48 +++++--- .../template/en/response.handlebars | 3 + .../fr/multipleOptionsResponse.handlebars | 5 + .../template/fr/question.handlebars | 35 +++--- .../template/fr/response.handlebars | 4 + .../cards/setPerimeterFor6Cards.feature | 116 +++++++++--------- .../components/detail/detail.component.ts | 4 +- 12 files changed, 185 insertions(+), 112 deletions(-) create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/multipleOptionsResponse.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/multipleOptionsResponse.handlebars diff --git a/src/docs/asciidoc/reference_doc/archives.adoc b/src/docs/asciidoc/reference_doc/archives.adoc index ae9edd56ab..b5fa4b0ad2 100644 --- a/src/docs/asciidoc/reference_doc/archives.adoc +++ b/src/docs/asciidoc/reference_doc/archives.adoc @@ -37,3 +37,4 @@ The results of these queries are limited to cards that the user is allowed to se If a card is sent to an entity and a group, then this user must be part of both the group and the entity. +NOTE: Currently, child cards are not shown in the Archives, only the parent card is shown. diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index 1a1fe02652..b81b8f02af 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -46,7 +46,8 @@ For the url, do not use localhost if you run OperatorFabric in a docker, as the === Configure the response in config.json -A card can have a response only if it's in a process/state that is configured for. To do that you need to setup the good configuration in the config.json of the concerned process. Here is an example of configuration : +A card can have a response only if it's in a process/state that is configured for. To do that you need to define the +appropriate configuration in the config.json of the concerned process. Here is an example of configuration: .... { @@ -75,31 +76,49 @@ A card can have a response only if it's in a process/state that is configured fo } .... -We define here a state name "questionState" with a response field. Now, if we send a card with process "defaultProcess" and state "questionState" , the user will have the possibility to respond if he has the good privileges. +We define here a state name "questionState" with a response field. Now, if we send a card with process "defaultProcess" +and state "questionState", the user will have the possibility to respond if he has the required privileges. - The field "state" in the response field is used to define the state to use for the response (the child card). -- The field "externalRecipients" define the recipients of the response card. These recipients are keys referenced in the config file of cards-publication service, in "externalRecipients-url" element. This field is optional. -- The field "btnColor" define the color of the submit button for the response, it is optional and there is 3 possibilities : RED , GREEN , YELLOW -- The field "btnText"is the i18n key of the title of the submit button, it is optional. +- The field "externalRecipients" define the recipients of the response card. These recipients are keys referenced in +the config file of cards-publication service, in "externalRecipients-url" element. This field is optional. +- The field "btnColor" define the color of the submit button for the response, it is optional and there are 3 +possibilities : RED , GREEN , YELLOW +- The field "btnText" is the i18n key of the title of the submit button, it is optional. +NOTE: The state to be used for the response can also be set dynamically based on the contents of the card or the +response by returning it in the `templateGateway.validyForm` method (see below for details). === Design the question form in the template For the user to response you need to define the response form in the template with standard HTML syntax -To enable operator fabric to send the response, you need to implement a javascript function in your template called templateGateway.validyForm which return an object containing three fields : +To enable operator fabric to send the response, you need to implement a javascript function in your template called +`templateGateway.validyForm` which returns an object containing four fields : - valid (_boolean_) : true if the user input is valid - errorMsg (_string_) : message in case of invalid user input. If valid is true this field is not necessary. - formData (_any_) : the user input to send in the data field of the child card. If valid is false this field is not necessary. +- responseState : name of the response state to use. This field is not mandatory, if it is not set the state defined in +`config.json` will be used for the response. -This method will be called by OperatorFabric when user click on the button to send the response +This method will be called by OperatorFabric when the user clicks on the button to send the response. -You can find an example in the file src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars. +In the example below, the `validyForm` creates a `formData` object by retrieving the user's inputs from the HTML. +In addition, if the user chose several options, it overrides the response state defined in the `config.json` with another +state. + +.src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars +[source,js] +---- +include::../../../test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars[tag=templateGateway.validyForm_example] +---- === Define permissions -To respond to a card a user must have the right privileges, it is done using "perimeters". The user must be in a group that is attached to a perimeter with a right "Write" for the concerned process/state, the state being the response state defined in the config.json. +To respond to a card a user must have the right privileges, it is done using "perimeters". The user must be in a group +that is attached to a perimeter with a right "Write" for the concerned process/state, the state being the response +state defined in the config.json. Here is an example of definition of a perimeter : .... @@ -117,13 +136,15 @@ Here is an example of definition of a perimeter : To configure it in OperatorFabric , you need to make a POST of this json file to the end point /users/perimeters. -To add it to a group name for example "mygroup", you need to make a PATCH request to end point 'users/groups/mygroup/perimeters' with payload ["perimeterQuestion"] +To add it to a group name for example "mygroup", you need to make a PATCH request to endpoint +'users/groups/mygroup/perimeters' with payload ["perimeterQuestion"] NOTE: If you don't want OperatorFabric to check for user perimeter when responding to a card, you can add the variable "checkPerimeterForResponseCard" and set it to false, in the config file of cards-publication and in web-ui.json. == Send a question card -The question card is like a usual card except that you have the field "entitiesAllowedToRespond" to set with the entities allowed to respond to the card. If the user is not in the entity, he will not be able to respond. +The question card is like a usual card except that you have the field "entitiesAllowedToRespond" to set with the +entities allowed to respond to the card. If the user is not in the entity, he will not be able to respond. .... ... @@ -136,7 +157,9 @@ The question card is like a usual card except that you have the field "entitiesA .... -NOTE: By default, OperatorFabric considers that if the parent card (question card) is modified, then the child cards are deleted. If you want to keep the child cards when the parent card is changed, then you must add in the parent card the field "keepChildCards" and set it to true. +NOTE: By default, OperatorFabric considers that if the parent card (question card) is modified, then the child cards +are deleted. If you want to keep the child cards when the parent card is changed, then you must add in the parent +card the field "keepChildCards" and set it to true. @@ -152,7 +175,8 @@ This method will be called by OperatorFabric when loading the card and every tim === Entity name -If you want to show the name of an entity that send the response, you need to get the id of the entity via the publisher field of the child card and then you can get the name of the entity by calling _templateGateway.getEntityName(entityId)_ +If you want to show the name of an entity that send the response, you need to get the id of the entity via the publisher +field of the child card and then you can get the name of the entity by calling _templateGateway.getEntityName(entityId)_ === Example @@ -160,8 +184,10 @@ You can find an example in the file src/test/utils/karate/businessconfig/resourc == Lock mechanism -When a user has never answered to a response card, the button will be marked as "VALIDATE ANSWER" and the card will be unlocked. -When the user responds for the first time (and the response succeeds), the button will then be marked as "MODIFY ANSWER" and the information that the card has been locked will be sent to the third template (by calling the _templateGateway.lockAnswer()_ function). +When a user has never answered to a response card, the button will be marked as "VALIDATE ANSWER" and the card will be +unlocked. +When the user responds for the first time (and the response succeeds), the button will then be marked as "MODIFY ANSWER" +and the information that the card has been locked will be sent to the third template (by calling the _templateGateway.lockAnswer()_ function). Once a user has responded to a response card, its entity status will be considered as "already answered" for this card. Then all the users having the same entity will be in this status for this card. @@ -173,10 +199,9 @@ The user can then click on "MODIFY ANSWER" and the button will come back to its Once again, after validating its answer, the information will be sent to the third template that the card has been locked (by calling the templateGateway.lockAnswer() function). == Response enabled -The template will be informed if the current user has the permission to answer by calling the _templateGateway.setUserCanRespond(boolean)_ function. +The template will be informed if the current user has the permission to answer by calling the _templateGateway.setUserCanRespond(boolean)_ function. An example of templateGateway.setUserCanRespond() implementation can be found in the file src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/incidentInProgress.handlebars. == Last Time to Decide (`lttd`) If the card has a last time to decide (lttd) configured, when the time is expired this information will be sent to the third template (by calling the template.setLttdExpired(true) function). - diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json index 16c33677dc..f475c83e96 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json @@ -81,7 +81,14 @@ "style" ], "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser" - }, + }, + "multipleOptionsResponseState": { + "name": "multipleOptionsResponseState.title", + "description": "multipleOptionsResponseState.description", + "color": "#0070C0", + "acknowledgmentAllowed": "Always", + "templateName": "multipleOptionsResponseState" + }, "responseState": { "name": "response.title", "description": "responseState.description", diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/i18n/en.json index dc000712ff..9b6e54f9af 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/i18n/en.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/i18n/en.json @@ -7,11 +7,11 @@ "chartDetail" : { "title":"A Chart"}, "chartLine" : { "title":"Electricity consumption forecast"}, "question" : {"title": "⚡ Planned Outage","button" : {"text" :"Send your response"}}, - "contingencies": {"title" : "⚠️ Network Contingencies ⚠️","summary":"Contingencies report for french network"}, + "contingencies": {"title" : "⚠️ Network Contingencies ⚠️","summary":"Contingencies report for French network"}, "response" : { "title":"Planned outage date response"}, "menu": { "label": "Test Process Menu", - "first":"Operator Fabric Documentation", + "first":"OperatorFabric Documentation", "second":"LF Energy" }, @@ -35,6 +35,10 @@ "title": "Action required", "description": "Question state" }, + "multipleOptionsResponseState": { + "title": "Additional information required", + "description": "Follow-up Question state" + }, "responseState": { "description": "Response state" } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/multipleOptionsResponse.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/multipleOptionsResponse.handlebars new file mode 100644 index 0000000000..f9c0b84282 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/multipleOptionsResponse.handlebars @@ -0,0 +1,5 @@ + + + +Response received: user selected several options. diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars index de1a80d87c..9f54f71934 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars @@ -2,12 +2,12 @@
    -

    Outage needed for 2 hours on french-england HVDC Line

    +

    Outage needed for 2 hours on the France-England HVDC line


    - Could you please confirm the time frame that are ok for you ?

    - - - + Could you please confirm the time frames that are ok for you ?

    + + +
    @@ -24,17 +24,16 @@ if (templateGateway.childCards[0]) { let childsDiv = document.getElementById("childs-div"); - let responses = '

    Responses received


    ' + let responses = '

    Responses received


    '; responses += '
    '; - responses += ' '; - responses += ' '; - responses += ' '; + responses += ' '; + responses += ' '; + responses += ' '; responses += ' '; templateGateway.childCards.forEach( (c, i) => { - const entityName = templateGateway.getEntityName(c.publisher); - responses += `` + responses += ``; if (c.data.choice1) responses += ""; else responses += ""; if (c.data.choice2) responses += ""; @@ -46,11 +45,14 @@ responses += '
    Entity 10/08/2020 8PM-10PM 10/08/2020 10PM-12PM 11/08/2020 8PM-12PM 10/08/2020 8AM-10AM 10/08/2020 10AM-12PM 11/08/2020 8AM-10AM
    ${entityName}
    ${entityName} OK NOK OK


    '; - childsDiv.innerHTML = responses ; - } - } + childsDiv.innerHTML = responses ; + } + }; + // The below 'tag' comment (and matching end tag) is directed at asciidoctor to include this snippet as an example in the + // documentation, it should not be used in actual templates. + //tag::templateGateway.validyForm_example[] templateGateway.validyForm = function() { const formData = {}; @@ -58,25 +60,33 @@ for (const [key, value] of [... new FormData(formElement)]) { (key in formData) ? formData[key].push(value) : formData[key] = [value]; } - return { + + const result = { valid: true, formData: formData - }; + }; - } + // If the user chose several options, we decide to move the process to a specific state, for example to ask a follow-up question (what's their preferred option). + const choiceRequiresFollowUp = Object.entries(formData).length>1; + if(choiceRequiresFollowUp) result['responseState'] = 'multipleOptionsResponseState'; + + return result; + + }; + //end::templateGateway.validyForm_example[] templateGateway.lockAnswer = function() { document.getElementById('choice1').disabled = true; document.getElementById('choice2').disabled = true; document.getElementById('choice3').disabled = true; - } + }; templateGateway.unlockAnswer = function() { document.getElementById('choice1').disabled = false; document.getElementById('choice2').disabled = false; document.getElementById('choice3').disabled = false; - } + }; templateGateway.setLttdExpired = function(expired) { const responseEnabled = document.getElementById('responseDisabled'); diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/response.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/response.handlebars index 1790d4ee51..de7f0bfc7b 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/response.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/response.handlebars @@ -1,2 +1,5 @@ + + Response received diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/multipleOptionsResponse.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/multipleOptionsResponse.handlebars new file mode 100644 index 0000000000..3e989a14f7 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/multipleOptionsResponse.handlebars @@ -0,0 +1,5 @@ + + + +Réponse reçue : l'utilisateur a choisi plusieurs options. diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/question.handlebars index 210a43c8de..ff76713b25 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/question.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/question.handlebars @@ -1,12 +1,10 @@ -
    -

    Indisponibilité de 2 heures à prevoir pour la ligne HVDC france-angleterre

    +

    Indisponibilité de 2 heures à prevoir pour la ligne HVDC France-Angleterre


    - Merci de confirmer les créneaux qui vous conviennent

    - + Merci de confirmer les créneaux qui vous conviennent:

    @@ -22,22 +20,20 @@ \ No newline at end of file + diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/chart.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/chart.handlebars index 1550808086..2a2a5dd11e 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/chart.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/chart.handlebars @@ -6,11 +6,16 @@ Un graphique - +
    + +
    +
    + Plus d'informations sur les graphiques ? + \ No newline at end of file + diff --git a/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.html b/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.html index d59481f5cf..660d236dde 100644 --- a/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.html +++ b/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.html @@ -1,4 +1,4 @@ - + @@ -12,5 +12,5 @@ - +
    diff --git a/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.ts b/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.ts index 5b50c588a8..9f77ce0a25 100644 --- a/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.ts +++ b/ui/main/src/app/modules/businessconfigparty/iframedisplay.component.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,19 +7,16 @@ * This file is part of the OperatorFabric project. */ - - -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; -import { ActivatedRoute } from '@angular/router'; -import { concatMap, map, takeUntil, skip } from 'rxjs/operators'; -import { Observable, Subject } from 'rxjs'; -import { Store } from '@ngrx/store'; -import { AppState } from '@ofStore/index'; -import { selectGlobalStyleState } from '@ofSelectors/global-style.selectors'; -import { GlobalStyleService } from '@ofServices/global-style.service'; -import { ConfigService } from '@ofServices/config.service'; - +import {Component, OnDestroy, OnInit} from '@angular/core'; +import {DomSanitizer, SafeUrl} from '@angular/platform-browser'; +import {ActivatedRoute, Router} from '@angular/router'; +import {concatMap, map, skip, takeUntil} from 'rxjs/operators'; +import {Subject} from 'rxjs'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {selectGlobalStyleState} from '@ofSelectors/global-style.selectors'; +import {GlobalStyleService} from '@ofServices/global-style.service'; +import {ConfigService} from '@ofServices/config.service'; @Component({ selector: 'of-iframedisplay', @@ -28,7 +25,7 @@ import { ConfigService } from '@ofServices/config.service'; }) export class IframeDisplayComponent implements OnInit, OnDestroy { - public iframeURL: Observable; + public iframeURL: SafeUrl; unsubscribe$: Subject = new Subject(); constructor( @@ -36,7 +33,8 @@ export class IframeDisplayComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private businessconfigService: ConfigService, private store: Store, - private globalStyleService: GlobalStyleService + private globalStyleService: GlobalStyleService, + private router: Router, ) { } @@ -45,18 +43,23 @@ export class IframeDisplayComponent implements OnInit, OnDestroy { this.reloadIframeWhenGlobalStyleChange(); } - private loadIframe() { - this.iframeURL = this.route.paramMap.pipe( - concatMap(paramMap => - this.businessconfigService.queryMenuEntryURL(paramMap.get("menu_id"), paramMap.get("menu_entry_id")) - ), - map((url) => this.addOpfabThemeParamToUrl(url)), - map(this.sanitizer.bypassSecurityTrustResourceUrl)); + this.route.paramMap.pipe( + concatMap(paramMap => this.businessconfigService.queryMenuEntryURL(paramMap.get('menu_id'), paramMap.get('menu_entry_id'))), + map((url) => this.addOpfabThemeParamToUrl(url)), + map((url) => this.addParamToUrl(url)), + map((url) => this.sanitizer.bypassSecurityTrustResourceUrl(url)), + takeUntil(this.unsubscribe$) + ).subscribe( + url => this.iframeURL = url, + err => { + console.log('Error in business application redirection = ', err); this.router.navigate(['/feed']); + }); } private addOpfabThemeParamToUrl(url: string ): string { + console.log("url=",url); this.globalStyleService.getStyle(); url += (url.includes('?')) ? '&' : '?'; url += 'opfab_theme='; @@ -64,6 +67,19 @@ export class IframeDisplayComponent implements OnInit, OnDestroy { return url; } + // If a business application is called form a card, it can be called with parameters + // To do that, in the card the window.location is set with the url #/businessconfig/menu_id/menuItem_id + // then is is possible to add params to the url + // For example: #/businessconfig/menu_id/menuItem_id?myparam=param1&myotherparam=param2 + // + // The user will be redirected to the url configured + the parameters + + private addParamToUrl(url) + { + const params = document.location.href.split('?'); + if (!!params[1]) return url+ '&' + params[1] + return url; + } private reloadIframeWhenGlobalStyleChange() { this.store.select(selectGlobalStyleState) diff --git a/ui/main/src/app/services/config.service.ts b/ui/main/src/app/services/config.service.ts index 2df8cac319..c24e551fc9 100644 --- a/ui/main/src/app/services/config.service.ts +++ b/ui/main/src/app/services/config.service.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -71,14 +71,13 @@ export class ConfigService { const menu = menus.find(m => m.id === id); if (menu) { const entry = menu.entries.filter(e => e.id === menuEntryId); - if (entry.length === 1) { return of(entry[0].url); } else { - throwError(new Error('No such menu entry.')); + return throwError(new Error('No such menu entry.')); } } else { - throwError(new Error('No such menu entry.')); + return throwError(new Error('No such menu entry.')); } } diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js index d7d9071a9d..11790a4e07 100644 --- a/ui/main/src/assets/js/templateGateway.js +++ b/ui/main/src/assets/js/templateGateway.js @@ -10,16 +10,15 @@ const templateGateway = { opfabEntityNames : null, - - validyForm: function(formData=null) { - console.log(new Date().toISOString() , ` Template.js : no validyForm method define in template , valid set to true`); - return this.isValid = undefined; - }, + childCards: [], setEntityNames: function(entityNames){ this.opfabEntityNames = entityNames; }, + + // UTILITIES FOR TEMPLATE + getEntityName: function(entityId) { if (!this.opfabEntityNames) { console.log(new Date().toISOString() , ` Template.js : no entities information loaded`); @@ -32,13 +31,43 @@ const templateGateway = { return this.opfabEntityNames.get(entityId); }, + redirectToBusinessMenu: function(menuId,menuItemId,params){ + const urlSplit = document.location.href.split('#'); + var newUrl = urlSplit[0] + '#/businessconfigparty/' + menuId + '/' + menuItemId ; + if (!!params) newUrl += '?' + params; + document.location.href = newUrl; + }, + + + // + // FUNCTIONS TO OVERRIDE BY TEMPLATES + // + // Opfab call this function to inform the template that the card is locked lockAnswer: function() {}, - applyChildCards: function() {}, + + // Opfab call this function to inform the template that the card is unlocked unlockAnswer: function() {}, + + // Opfab call this function to inform that the template has to apply child cards (called after template rendering and after change in child cards) + applyChildCards: function() {}, + + // Opfab call this function when lttd expire with expired set to true setLttdExpired: function(expired) {}, + + // Opfab call this method to inform the template of the size of the screen dedicated to the card + // size = 'md' for standard size + // size = 'lg' for large size , i.e when the card is in full screen mode setScreenSize: function(size) {}, + + // Opfab call this method to tell the template if the user can respond to the card + // responseEnabled set to true if possible , false otherwise setUserCanRespond: function(responseEnabled) {}, - childCards: [] + + // Opfab call this method to get the form result when user want to send response + validyForm: function() { + console.log(new Date().toISOString() , ` Template.js : no validyForm method define in template , valid set to true`); + return this.isValid = undefined; + } }; From f34e3ba1c9a75a720435eb845ffbf04ba84885e8 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 4 Mar 2021 08:59:52 +0100 Subject: [PATCH 16/45] [OC-1512] Adapt UI for small screens - Adjustements Signed-off-by: freddidierRTE --- ui/main/src/app/modules/feed/feed.component.html | 4 ++-- ui/main/src/app/modules/feed/feed.component.scss | 7 +++++++ ui/main/src/app/modules/feed/feed.component.ts | 8 ++++++-- ui/main/src/app/modules/navbar/navbar.component.html | 6 ------ ui/main/src/assets/styles/styles.scss | 3 +-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ui/main/src/app/modules/feed/feed.component.html b/ui/main/src/app/modules/feed/feed.component.html index 9867c76d74..9d604073ab 100644 --- a/ui/main/src/app/modules/feed/feed.component.html +++ b/ui/main/src/app/modules/feed/feed.component.html @@ -11,13 +11,13 @@
    -
    +
    -
    +
    diff --git a/ui/main/src/app/modules/feed/feed.component.scss b/ui/main/src/app/modules/feed/feed.component.scss index 9897798ba2..c05b63774d 100644 --- a/ui/main/src/app/modules/feed/feed.component.scss +++ b/ui/main/src/app/modules/feed/feed.component.scss @@ -15,3 +15,10 @@ padding-right: 0px; } + .opfab-small-screen { + width: 100%; + } + + .opfab-standard-screen{ + width: 440px; + } \ No newline at end of file diff --git a/ui/main/src/app/modules/feed/feed.component.ts b/ui/main/src/app/modules/feed/feed.component.ts index 70b3a420b5..8d1f1a0dbf 100644 --- a/ui/main/src/app/modules/feed/feed.component.ts +++ b/ui/main/src/app/modules/feed/feed.component.ts @@ -62,9 +62,13 @@ export class FeedComponent implements OnInit { } - public isSmallscreen() + public enoughSpaceForTimeLine() { - return (window.innerWidth <1000 || window.innerHeight <800 ); + return (window.innerWidth >1000 && window.innerHeight > 700 ); } + public enoughSpaceForCardDetail() + { + return (window.innerWidth > 1000); + } } diff --git a/ui/main/src/app/modules/navbar/navbar.component.html b/ui/main/src/app/modules/navbar/navbar.component.html index 039c1ea10f..6f04804fd4 100644 --- a/ui/main/src/app/modules/navbar/navbar.component.html +++ b/ui/main/src/app/modules/navbar/navbar.component.html @@ -51,12 +51,6 @@
    -
    • diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index 4ff8323a3c..2fd879a944 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -26,7 +26,6 @@ body { color: $light; padding: 80px 0px 30px 0px; margin: 0px; - min-width: 500px; background-color: $dark; height: 100vh; font-family: 'Open Sans', sans-serif; @@ -34,7 +33,7 @@ body { // scroll styling for firefox only scrollbar-color:var(--opfab-scrollbar-bar-bgcolor-firefox) var(--opfab-scrollbar-bgcolor-firefox) ; -} +} // CUSTOM SCROLLBAR STYLE From 21f4ddd1b912cff78e98c279fa113ae01f7c1630 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Thu, 4 Mar 2021 10:41:31 +0100 Subject: [PATCH 17/45] [OC-1520] Setting version for Prometheus/Micrometer dependency --- build.gradle | 4 ++-- services/services.gradle | 2 +- versions.properties | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4dc1f089c0..cba2edaa68 100755 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,6 @@ ext { starterWeb : "org.springframework.boot:spring-boot-starter-web:${versions['spring.boot']}", starterWebflux : "org.springframework.boot:spring-boot-starter-webflux:${versions['spring.boot']}", actuator : "org.springframework.boot:spring-boot-starter-actuator:${versions['spring.boot']}", - micrometer : "io.micrometer:micrometer-registry-prometheus:latest.release", starterAop : "org.springframework.boot:spring-boot-starter-aop:${versions['spring.boot']}", starterJetty : "org.springframework.boot:spring-boot-starter-jetty:${versions['spring.boot']}", starterRabbitmq : "org.springframework.boot:spring-boot-starter-amqp:${versions['spring.boot']}", @@ -74,7 +73,8 @@ ext { feignMock : "io.github.openfeign:feign-mock:${versions['feign']}", feignJackson : "io.github.openfeign:feign-jackson:${versions['feign']}", jacksonAnnotations : "com.fasterxml.jackson.core:jackson-annotations:${versions['jacksonAnnotations']}", - collections4 : "org.apache.commons:commons-collections4:${versions['apache.commons.collections4']}" + collections4 : "org.apache.commons:commons-collections4:${versions['apache.commons.collections4']}", + micrometer : "io.micrometer:micrometer-registry-prometheus:${versions['micrometer']}" ] generator = [ diff --git a/services/services.gradle b/services/services.gradle index 3d6318b9b5..4d76f06983 100755 --- a/services/services.gradle +++ b/services/services.gradle @@ -38,7 +38,7 @@ subprojects { dependencies { compile boot.actuator - compile boot.micrometer + compile misc.micrometer annotationProcessor misc.lombok implementation misc.lombok diff --git a/versions.properties b/versions.properties index f44bb0d5ae..3fe228163f 100755 --- a/versions.properties +++ b/versions.properties @@ -15,6 +15,7 @@ jacksonAnnotations=2.12.0 apache.commons.collections4=4.4 kavro.schemaRegistryClient=5.5.1 kavro.avroSerializer=5.5.1 +micrometer=1.5.2 # testing libs assertj=3.18.1 From 7326669a033a40bc7595fab94564a1cda8041a23 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 4 Mar 2021 11:12:32 +0100 Subject: [PATCH 18/45] [OC-1521] Upgrade to MongoDB 4.4.4 Signed-off-by: freddidierRTE --- config/dev/docker-compose.yml | 2 +- config/docker/docker-compose.yml | 2 +- src/main/docker/mongodb/docker-compose.yml | 2 +- src/main/docker/test-environment/docker-compose.yml | 2 +- src/main/docker/test-quality-environment/docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/dev/docker-compose.yml b/config/dev/docker-compose.yml index 666c204f9d..9b614a7448 100755 --- a/config/dev/docker-compose.yml +++ b/config/dev/docker-compose.yml @@ -7,7 +7,7 @@ services: - "15672:15672" - "15674:15674" mongodb: - image: mongo:4.1.1-xenial + image: mongo:4.4.4-bionic ports: - "27017:27017" environment: diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml index 6014b88650..ed6cf27ba9 100755 --- a/config/docker/docker-compose.yml +++ b/config/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.1' services: mongodb: - image: mongo:4.1.1-xenial + image: mongo:4.4.4-bionic ports: - "27017:27017" environment: diff --git a/src/main/docker/mongodb/docker-compose.yml b/src/main/docker/mongodb/docker-compose.yml index 009f11e945..1cd3b0c307 100755 --- a/src/main/docker/mongodb/docker-compose.yml +++ b/src/main/docker/mongodb/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.1' services: mongodb: container_name: mongodb - image: mongo:4.1.1-xenial + image: mongo:4.4.4-bionic ports: - "27017:27017" environment: diff --git a/src/main/docker/test-environment/docker-compose.yml b/src/main/docker/test-environment/docker-compose.yml index 5e87252869..02e307c605 100755 --- a/src/main/docker/test-environment/docker-compose.yml +++ b/src/main/docker/test-environment/docker-compose.yml @@ -7,7 +7,7 @@ services: - "15672:15672" - "15674:15674" mongodb: - image: mongo:4.1.1-xenial + image: mongo:4.4.4-bionic ports: - "27017:27017" environment: diff --git a/src/main/docker/test-quality-environment/docker-compose.yml b/src/main/docker/test-quality-environment/docker-compose.yml index 72636936d4..37ef404e4f 100755 --- a/src/main/docker/test-quality-environment/docker-compose.yml +++ b/src/main/docker/test-quality-environment/docker-compose.yml @@ -7,7 +7,7 @@ services: - "15672:15672" - "15674:15674" mongodb: - image: mongo:4.1.1-xenial + image: mongo:4.4.4-bionic ports: - "27017:27017" environment: From 294a766e47c03fea46b1d34f0ae6a97ee9001502 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Thu, 4 Mar 2021 13:55:43 +0100 Subject: [PATCH 19/45] [OC-1524] Admin UI - Avoid dismissal of modals on outside click --- .../components/table/admin-table.directive.ts | 56 ++++++++++--------- .../table/perimeters-table.component.ts | 2 +- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts index 4bc8059fa2..148d1e3c45 100644 --- a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts +++ b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts @@ -11,7 +11,7 @@ import {Directive, Injectable, OnDestroy, OnInit} from '@angular/core'; import {ColDef, GridOptions, ICellRendererParams} from 'ag-grid-community'; import {TranslateService} from '@ngx-translate/core'; -import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; import {Subject, throwError} from 'rxjs'; import {ConfirmationDialogService} from '../../services/confirmation-dialog.service'; import {AppError} from '../../../../common/error/app-error'; @@ -27,28 +27,6 @@ import {StateRightsCellRendererComponent} from '../cell-renderers/state-rights-c @Injectable() export abstract class AdminTableDirective implements OnInit, OnDestroy { - unsubscribe$: Subject = new Subject(); - - // These fields will be initialized in the concrete classes extending `AdminTableDirective` - // (e.g. EntitiesTableComponent) as they depend on the type of the table - /** Modal component to open when editing an item from the table (e.g. `EditEntityGroupModal`) */ - public editModalComponent; - public modalOptions = {}; - /** Type of data managed by the table (e.g. `AdminItemType.ENTITY`) */ - protected tableType: AdminItemType; - /** Relevant fields for this data type. They will be used to populate the table columns */ - protected fields: Field[]; - /** Among these fields, which one represents an item's unique id (e.g. `id`) */ - protected idField: string; - - // ag-grid configuration objects - public gridOptions; - public gridApi; - public rowData: any; - - protected i18NPrefix = 'admin.input.'; - protected crudService: CrudService; - constructor( protected translateService: TranslateService, protected confirmationDialogService: ConfirmationDialogService, @@ -99,6 +77,34 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { // Defining a custom cellRenderer was necessary (instead of using onCellClicked & an inline cellRenderer) because of // the need to call a method from the parent component } + /** Default options for edition modals. */ + protected static defaultModalOptions: NgbModalOptions = { + backdrop: 'static' // Modal shouldn't close even if we click outside it + }; + + unsubscribe$: Subject = new Subject(); + + // These fields will be initialized in the concrete classes extending `AdminTableDirective` + // (e.g. EntitiesTableComponent) as they depend on the type of the table + /** Modal component to open when editing an item from the table (e.g. `EditEntityGroupModal`) */ + public editModalComponent; + /** Default modal options can be added to or overridden using this property in the xxx-table components extending the directive. */ + public modalOptions: NgbModalOptions = AdminTableDirective.defaultModalOptions; + + /** Type of data managed by the table (e.g. `AdminItemType.ENTITY`) */ + protected tableType: AdminItemType; + /** Relevant fields for this data type. They will be used to populate the table columns */ + protected fields: Field[]; + /** Among these fields, which one represents an item's unique id (e.g. `id`) */ + protected idField: string; + + // ag-grid configuration objects + public gridOptions; + public gridApi; + public rowData: any; + + protected i18NPrefix = 'admin.input.'; + protected crudService: CrudService; ngOnInit() { this.crudService = this.dataHandlingService.resolveCrudServiceDependingOnType(this.tableType); @@ -167,7 +173,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { // This method might be flagged as "unused" by IDEs but it's actually called through the ActionCellRendererComponent const columnId = params.colDef.colId; if (columnId === 'edit') { - const modalRef = this.modalService.open(this.editModalComponent,this.modalOptions); + const modalRef = this.modalService.open(this.editModalComponent, this.modalOptions); modalRef.componentInstance.type = this.tableType; modalRef.componentInstance.row = params.data; // This passes the data from the edited row to the modal to initialize input values. modalRef.result.then( @@ -204,7 +210,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { } createNewItem(): void { - const modalRef = this.modalService.open(this.editModalComponent,this.modalOptions); + const modalRef = this.modalService.open(this.editModalComponent, this.modalOptions); modalRef.componentInstance.type = this.tableType; modalRef.result.then( // Hooking the refresh of the data to the closing of the modal seemed simpler than setting up diff --git a/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts b/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts index 44a592976b..84358dc71d 100644 --- a/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts +++ b/ui/main/src/app/modules/admin/components/table/perimeters-table.component.ts @@ -23,6 +23,6 @@ export class PerimetersTableComponent extends AdminTableDirective implements OnI fields = [new Field('id'), new Field('process'), new Field('stateRights', 7, 'stateRightsCellRenderer')]; idField = 'id'; editModalComponent = EditPerimeterModalComponent; - modalOptions = {size: 'xl'}; + modalOptions = {...AdminTableDirective.defaultModalOptions, size: 'xl'}; } From 1d680c97d873ac3f1fc3520ac835f67fb12a9cf6 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Fri, 5 Mar 2021 10:22:39 +0100 Subject: [PATCH 20/45] [OC-1526] Fixes configuration in cards-consult and card-pub docker images ci_docker --- services/core/cards-consultation/src/main/docker/Dockerfile | 2 +- services/core/cards-publication/src/main/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/cards-consultation/src/main/docker/Dockerfile b/services/core/cards-consultation/src/main/docker/Dockerfile index 9e7494d740..2180ab5c06 100755 --- a/services/core/cards-consultation/src/main/docker/Dockerfile +++ b/services/core/cards-consultation/src/main/docker/Dockerfile @@ -20,5 +20,5 @@ COPY add-certificates.sh /add-certificates.sh COPY java-config-docker-entrypoint.sh /docker-entrypoint.sh COPY common-docker.yml /config/common-docker.yml COPY ${JAR_FILE} app.jar -COPY cards-consultation-docker.yml /config/ +COPY cards-consultation-docker.yml /config/application-docker.yml ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/services/core/cards-publication/src/main/docker/Dockerfile b/services/core/cards-publication/src/main/docker/Dockerfile index f62492b8ab..33896e2657 100755 --- a/services/core/cards-publication/src/main/docker/Dockerfile +++ b/services/core/cards-publication/src/main/docker/Dockerfile @@ -20,5 +20,5 @@ COPY add-certificates.sh /add-certificates.sh COPY java-config-docker-entrypoint.sh /docker-entrypoint.sh COPY common-docker.yml /config/common-docker.yml COPY ${JAR_FILE} app.jar -COPY cards-publication-docker.yml /config/ +COPY cards-publication-docker.yml /config/application-docker.yml ENTRYPOINT ["/docker-entrypoint.sh"] From 0b21d037c604955df3be29cb3f529b7b631f874c Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Thu, 4 Mar 2021 15:19:46 +0100 Subject: [PATCH 21/45] [OC-1515] Memorize choosen domain for timeline --- .../time-line/init-chart/init-chart.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts index 181b6e0db5..c9cc95a2f8 100644 --- a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts +++ b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.ts @@ -76,8 +76,16 @@ export class InitChartComponent implements OnInit { this.buttonList.push(defaultConfig); } // Set the zoom activated - if (this.buttonList.length > 0) { - this.changeGraphConf(this.buttonList[0]); + let initialGraphConf = this.buttonList.length > 0 ? this.buttonList[0] : null; + + const savedDomain = localStorage.getItem('opfab.timeLine.domain'); + + if (!!savedDomain) { + initialGraphConf = this.buttonList.find(b => b.domainId === savedDomain); + } + + if (!!initialGraphConf) { + this.changeGraphConf(initialGraphConf); } } @@ -101,6 +109,7 @@ export class InitChartComponent implements OnInit { this.selectZoomButton(conf.buttonTitle); this.domainId = conf.domainId; this.setDefaultStartAndEndDomain(); + localStorage.setItem('opfab.timeLine.domain', this.domainId); } From 56f3dc8fb4334df88f23c33b3fee3aafcd4dce28 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Thu, 4 Mar 2021 10:23:01 +0100 Subject: [PATCH 22/45] [OC-1464] Fix bug when deleting all bundles --- .../services/ProcessesService.java | 56 +- ...inUserBusinessconfigControllerShould.java} | 105 ++- ...minUserBusinessconfigControllerShould.java | 17 +- .../services/ProcessesServiceShould.java | 598 +++++++++--------- 4 files changed, 369 insertions(+), 407 deletions(-) rename services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/{GivenAdminUserThirdControllerShould.java => GivenAdminUserBusinessconfigControllerShould.java} (90%) diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java index ec19a806a0..62ddace1e3 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -11,32 +11,12 @@ package org.lfenergy.operatorfabric.businessconfig.services; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.stream.Stream; - -import javax.annotation.PostConstruct; -import javax.validation.ConstraintViolation; - -import org.lfenergy.operatorfabric.businessconfig.model.*; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; +import lombok.extern.slf4j.Slf4j; import org.lfenergy.operatorfabric.businessconfig.model.Process; +import org.lfenergy.operatorfabric.businessconfig.model.*; import org.lfenergy.operatorfabric.springtools.error.model.ApiError; import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException; import org.lfenergy.operatorfabric.utilities.PathUtils; @@ -49,11 +29,17 @@ import org.springframework.stereotype.Service; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; - -import lombok.extern.slf4j.Slf4j; +import javax.annotation.PostConstruct; +import javax.validation.ConstraintViolation; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.stream.Stream; /** * Processes Service for managing business processes definition and resources @@ -479,13 +465,13 @@ public synchronized void deleteVersion(String id, String version) throws IOExcep } //delete version folder PathUtils.delete(processVersionPath); - log.debug("removed process:{} whith version:{} from filesystem", id, version); + log.debug("removed process:{} with version:{} from filesystem", id, version); completeCache.remove(id,version); } } /** - * Resets data (only used in tests) + * Removes all configuration bundles from storage and clears all caches * * @throws IOException multiple underlying cases (file system access, file system manipulation - deletion) */ @@ -493,8 +479,10 @@ public void clear() throws IOException { Resource resource = this.resourceLoader.getResource(PATH_PREFIX + this.storagePath); File file = resource.getFile(); if(file.exists()) { - try (Stream pathStream = Files.walk(PathUtils.getPath(file), 1)) { + Path storageRoot = PathUtils.getPath(file); + try (Stream pathStream = Files.walk(storageRoot, 1)) { pathStream + .filter(path -> path != storageRoot) // Avoid deleting the storage root folder .forEach(PathUtils::silentDelete); }finally { this.completeCache.clear(); diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserBusinessconfigControllerShould.java similarity index 90% rename from services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java rename to services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserBusinessconfigControllerShould.java index 2823fb9a75..53703c6010 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserBusinessconfigControllerShould.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -11,38 +11,13 @@ package org.lfenergy.operatorfabric.businessconfig.controllers; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.lfenergy.operatorfabric.test.AssertUtils.assertException; -import static org.lfenergy.operatorfabric.utilities.PathUtils.copy; -import static org.lfenergy.operatorfabric.utilities.PathUtils.silentDelete; -import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; -import org.lfenergy.operatorfabric.springtools.configuration.test.WithMockOpFabUser; import org.lfenergy.operatorfabric.businessconfig.application.IntegrationTestApplication; import org.lfenergy.operatorfabric.businessconfig.services.ProcessesService; +import org.lfenergy.operatorfabric.springtools.configuration.test.WithMockOpFabUser; +import org.lfenergy.operatorfabric.utilities.PathUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; @@ -54,7 +29,21 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.web.context.WebApplicationContext; -import lombok.extern.slf4j.Slf4j; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.lfenergy.operatorfabric.test.AssertUtils.assertException; +import static org.lfenergy.operatorfabric.utilities.PathUtils.copy; +import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = {IntegrationTestApplication.class}) @@ -88,15 +77,7 @@ void setup() throws Exception { @AfterAll void dispose() throws IOException { service.clear(); - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); } - - /*@BeforeEach - void setupEach() throws Exception { - copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); - service.loadCacheSafe(); - }*/ @Test void listProcesses() throws Exception { @@ -134,7 +115,7 @@ void fetchWithVersion() throws Exception { .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andExpect(jsonPath("$.version", is("0.1"))); } - + @Test void fetchCssResource() throws Exception { @@ -308,22 +289,24 @@ void createProcessGroupsWithDuplicateProcessInDifferentGroups() throws Exception .andExpect(status().isBadRequest()) .andExpect(jsonPath("$.message", is("There is a duplicate process in the file you have sent"))); } - + @Nested @WithMockOpFabUser(login="adminUser", roles = {"ADMIN"}) class DeleteOnlyOneProcess { - - static final String bundleName = "first"; - - @BeforeEach - void setupEach() throws Exception { - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); - copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); - service.loadCache(); - } - - @Test + + static final String bundleName = "first"; + + @BeforeEach + void setupEach() throws Exception { + // This will also delete the businessconfig-storage root folder, but in this case it's needed as + // the following copy would fail if the folder already existed. + if (Files.exists(testDataDir)) Files.walk(testDataDir, 1).forEach(PathUtils::silentDelete); + copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); + service.loadCache(); + } + + + @Test void deleteBundleByNameAndVersionWhichNotBeingDefault() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/"+bundleName+"/versions/0.1")); result @@ -332,7 +315,7 @@ void deleteBundleByNameAndVersionWhichNotBeingDefault() throws Exception { result .andExpect(status().isNotFound()); } - + @Test void deleteBundleByNameAndVersionWhichBeingDefault() throws Exception { mockMvc.perform(delete("/businessconfig/processes/"+bundleName+"/versions/v1")).andExpect(status().isNoContent()); @@ -345,7 +328,7 @@ void deleteBundleByNameAndVersionWhichBeingDefault() throws Exception { .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andExpect(jsonPath("$.version", is(not("v1")))); } - + @Test void deleteBundleByNameAndVersionHavingOnlyOneVersion() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/deletetest/versions/2.1")); @@ -355,21 +338,21 @@ void deleteBundleByNameAndVersionHavingOnlyOneVersion() throws Exception { result .andExpect(status().isNotFound()); } - + @Test void deleteBundleByNameAndVersionWhichNotExisting() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/second/versions/impossible_someone_really_so_crazy_to_give_this_name_to_a_version")); result .andExpect(status().isNotFound()); } - + @Test void deleteBundleByNameWhichNotExistingAndVersion() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/impossible_someone_really_so_crazy_to_give_this_name_to_a_bundle/versions/2.1")); result .andExpect(status().isNotFound()); } - + @Test void deleteGivenBundle() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/"+bundleName)); @@ -379,7 +362,7 @@ void deleteGivenBundle() throws Exception { result .andExpect(status().isNotFound()); } - + @Test void deleteGivenBundleNotFoundError() throws Exception { ResultActions result = mockMvc.perform(delete("/businessconfig/processes/impossible_a_businessconfig_with_this_exact_name_exists")); @@ -400,9 +383,9 @@ void clean() throws Exception { .andExpect(jsonPath("$", hasSize(0))); } } - + } - + } } diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java index de109cf2e3..8e8e6c9f3e 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,6 +16,7 @@ import org.lfenergy.operatorfabric.springtools.configuration.test.WithMockOpFabUser; import org.lfenergy.operatorfabric.businessconfig.application.IntegrationTestApplication; import org.lfenergy.operatorfabric.businessconfig.services.ProcessesService; +import org.lfenergy.operatorfabric.utilities.PathUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; @@ -37,19 +38,12 @@ import static org.hamcrest.Matchers.is; import static org.lfenergy.operatorfabric.test.AssertUtils.assertException; import static org.lfenergy.operatorfabric.utilities.PathUtils.copy; -import static org.lfenergy.operatorfabric.utilities.PathUtils.silentDelete; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; -/** - *

      - * Created on 17/04/18 - * - * - */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = {IntegrationTestApplication.class}) @ActiveProfiles("test") @@ -80,8 +74,6 @@ void setup() throws Exception { @AfterAll void dispose() throws IOException { service.clear(); - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); } @Test @@ -267,8 +259,9 @@ class DeleteOnlyOneProcess { @BeforeEach void setup() throws Exception { - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); + // This will also delete the businessconfig-storage root folder, but in this case it's needed as + // the following copy would fail if the folder already existed. + if (Files.exists(testDataDir)) Files.walk(testDataDir, 1).forEach(PathUtils::silentDelete); copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); service.loadCache(); } diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java index 045719954a..1f048b6888 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,7 +16,6 @@ import static org.lfenergy.operatorfabric.businessconfig.model.ResourceTypeEnum.I18N; import static org.lfenergy.operatorfabric.businessconfig.model.ResourceTypeEnum.TEMPLATE; import static org.lfenergy.operatorfabric.utilities.PathUtils.copy; -import static org.lfenergy.operatorfabric.utilities.PathUtils.silentDelete; import java.io.File; import java.io.FileNotFoundException; @@ -27,7 +26,6 @@ import java.nio.file.Paths; import java.util.Arrays; -import net.minidev.json.JSONObject; import org.apache.commons.io.FileUtils; import org.assertj.core.api.Condition; import org.junit.jupiter.api.AfterAll; @@ -40,13 +38,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.operatorfabric.businessconfig.application.IntegrationTestApplication; import org.lfenergy.operatorfabric.businessconfig.model.Process; -import org.lfenergy.operatorfabric.businessconfig.model.ProcessGroup; import org.lfenergy.operatorfabric.businessconfig.model.ProcessGroupData; import org.lfenergy.operatorfabric.businessconfig.model.ProcessGroupsData; -import org.lfenergy.operatorfabric.springtools.error.model.ApiError; +import org.lfenergy.operatorfabric.utilities.PathUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -59,303 +55,305 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ProcessesServiceShould { - private static Path testDataDir = Paths.get("./build/test-data/businessconfig-storage"); - @Autowired - private ProcessesService service; - - @BeforeEach - void prepare() throws IOException { - copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); - service.loadCache(); - service.loadProcessGroupsCache(); - } - - @AfterAll - static void dispose() throws IOException { - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); - } - - @Test - void listProcesses() { - assertThat(service.listProcesses()).hasSize(2); - } - - @Test - void fetch() { - Process firstProcess = service.fetch("first"); - assertThat(firstProcess).hasFieldOrPropertyWithValue("version", "v1"); - } - - @Test - void fetchWithVersion() { - Process firstProcess = service.fetch("first", "0.1"); - assertThat(firstProcess).hasFieldOrPropertyWithValue("version", "0.1"); - } - - @Test - void fetchCss() throws IOException { - File styleFile = service.fetchResource("first", CSS, "style1").getFile(); - assertThat(styleFile.getParentFile()) - .isDirectory() - .doesNotHave( - new Condition<>(f -> f.getName().equals("fr") || f.getName().equals("en"), - "parent directory should not be a locale directory")); - assertThat(styleFile) - .exists() - .isFile() - .hasName("style1.css") - .hasContent(".bold {\n" + - " font-weight: bold;\n" + - "}"); - styleFile = service.fetchResource("first", CSS, "0.1", "style1").getFile(); - assertThat(styleFile) - .exists() - .isFile() - .hasName("style1.css") - .hasContent(".bold {\n" + - " font-weight: bolder;\n" + - "}"); - styleFile = service.fetchResource("first", CSS, "0.1", "fr", "style1").getFile(); - assertThat(styleFile) - .exists() - .isFile() - .hasName("style1.css") - .hasContent(".bold {\n" + - " font-weight: bolder;\n" + - "}"); - } - - @Test - void fetchTemplate() throws IOException { - File templateFile = service.fetchResource("first", TEMPLATE, null,"fr","template1").getFile(); - assertThat(templateFile.getParentFile()).isDirectory().hasName("fr"); - assertThat(templateFile) - .exists() - .isFile() - .hasName("template1.handlebars") - .hasContent("{{service}} fr"); - templateFile = service.fetchResource("first", TEMPLATE, "0.1", "fr", "template").getFile(); - assertThat(templateFile) - .exists() - .isFile() - .hasName("template.handlebars") - .hasContent("{{service}} fr 0.1"); - templateFile = service.fetchResource("first", TEMPLATE, "0.1", "en", "template").getFile(); - assertThat(templateFile) - .exists() - .isFile() - .hasName("template.handlebars") - .hasContent("{{service}} en 0.1"); - } - - @Test - void fetchI18n() throws IOException { - File i18nFile = service.fetchResource("first", I18N,null,"fr", null).getFile(); - assertThat(i18nFile) - .exists() - .isFile() - .hasName("fr.json") - .hasContent("card.title=\"Titre $1\""); - i18nFile = service.fetchResource("first", I18N, "0.1", "fr", null).getFile(); - assertThat(i18nFile) - .exists() - .isFile() - .hasName("fr.json") - .hasContent("card.title=\"Titre $1 0.1\""); - i18nFile = service.fetchResource("first", I18N, "0.1", "en", null).getFile(); - assertThat(i18nFile) - .exists() - .isFile() - .hasName("en.json") - .hasContent("card.title=\"Title $1 0.1\""); - } - - @Test - void fetchResourceError() { - assertException(FileNotFoundException.class).isThrownBy(() -> - service.fetchResource("what", - TEMPLATE, - "0.1", - null, - "template")); - assertException(FileNotFoundException.class).isThrownBy(() -> - service.fetchResource("first", - TEMPLATE, - "0.2", - null, - "template")); - assertException(FileNotFoundException.class).isThrownBy(() -> - service.fetchResource("first", - CSS, - "0.1", - null, - "styleWhat")); - assertException(FileNotFoundException.class).isThrownBy(() -> - service.fetchResource("first", - TEMPLATE, - "0.1", - null, - "template1") - .getInputStream() - ); - - assertException(FileNotFoundException.class).isThrownBy(() -> - service.fetchResource("first", - TEMPLATE, - "0.1", - "de", - "template") - .getInputStream() - ); - } - - @Test - public void testCheckNoDuplicateProcessInUploadedFile() { - - ProcessGroupData gp1 = ProcessGroupData.builder().id("gp1").processes(Arrays.asList("process1", "process2")).build(); - ProcessGroupData gp2 = ProcessGroupData.builder().id("gp2").processes(Arrays.asList("process3", "process4")).build(); - ProcessGroupData gp3 = ProcessGroupData.builder().id("gp3").processes(Arrays.asList("process5", "process4")).build(); - ProcessGroupData gp4 = ProcessGroupData.builder().id("gp4").processes(Arrays.asList("process7", "process8", "process7")).build(); - - ProcessGroupsData groups_without_duplicate = ProcessGroupsData.builder().groups(Arrays.asList(gp1, gp2)).build(); - ProcessGroupsData groups_with_duplicate = ProcessGroupsData.builder().groups(Arrays.asList(gp2, gp3)).build(); - ProcessGroupsData groups_with_duplicate_in_the_same_group = ProcessGroupsData.builder().groups(Arrays.asList(gp1, gp4)).build(); - - assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_without_duplicate)).isTrue(); - assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_with_duplicate)).isFalse(); - assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_with_duplicate_in_the_same_group)).isFalse(); - } - - @Nested - class CreateContent { - @RepeatedTest(2) - void updateProcess() throws IOException { - Path pathToBundle = Paths.get("./build/test-data/bundles/second-2.0.tar.gz"); - try (InputStream is = Files.newInputStream(pathToBundle)) { - Process process = service.updateProcess(is); - assertThat(process).hasFieldOrPropertyWithValue("id", "second"); - assertThat(process).hasFieldOrPropertyWithValue("version", "2.0"); - assertThat(process.getStates().size()).isEqualTo(1); - assertThat(process.getStates().get("firstState").getTemplateName()).isEqualTo("template"); - assertThat(process.getStates().get("firstState").getResponse().getExternalRecipients().size()).isEqualTo(2); - assertThat(service.listProcesses()).hasSize(3); - } catch (IOException e) { - log.trace("rethrowing exception"); - throw e; - } + private static Path testDataDir = Paths.get("./build/test-data/businessconfig-storage"); + @Autowired + private ProcessesService service; + + @BeforeEach + void prepare() throws IOException { + copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); + service.loadCache(); + service.loadProcessGroupsCache(); + } + + @AfterAll + static void dispose() throws IOException { + // This will also delete the businessconfig-storage root folder, but in this case it's needed as + // the following copy would fail if the folder already existed. + if (Files.exists(testDataDir)) Files.walk(testDataDir, 1).forEach(PathUtils::silentDelete); + } + + @Test + void listProcesses() { + assertThat(service.listProcesses()).hasSize(2); + } + + @Test + void fetch() { + Process firstProcess = service.fetch("first"); + assertThat(firstProcess).hasFieldOrPropertyWithValue("version", "v1"); + } + + @Test + void fetchWithVersion() { + Process firstProcess = service.fetch("first", "0.1"); + assertThat(firstProcess).hasFieldOrPropertyWithValue("version", "0.1"); + } + + @Test + void fetchCss() throws IOException { + File styleFile = service.fetchResource("first", CSS, "style1").getFile(); + assertThat(styleFile.getParentFile()) + .isDirectory() + .doesNotHave( + new Condition<>(f -> f.getName().equals("fr") || f.getName().equals("en"), + "parent directory should not be a locale directory")); + assertThat(styleFile) + .exists() + .isFile() + .hasName("style1.css") + .hasContent(".bold {\n" + + " font-weight: bold;\n" + + "}"); + styleFile = service.fetchResource("first", CSS, "0.1", "style1").getFile(); + assertThat(styleFile) + .exists() + .isFile() + .hasName("style1.css") + .hasContent(".bold {\n" + + " font-weight: bolder;\n" + + "}"); + styleFile = service.fetchResource("first", CSS, "0.1", "fr", "style1").getFile(); + assertThat(styleFile) + .exists() + .isFile() + .hasName("style1.css") + .hasContent(".bold {\n" + + " font-weight: bolder;\n" + + "}"); + } + + @Test + void fetchTemplate() throws IOException { + File templateFile = service.fetchResource("first", TEMPLATE, null,"fr","template1").getFile(); + assertThat(templateFile.getParentFile()).isDirectory().hasName("fr"); + assertThat(templateFile) + .exists() + .isFile() + .hasName("template1.handlebars") + .hasContent("{{service}} fr"); + templateFile = service.fetchResource("first", TEMPLATE, "0.1", "fr", "template").getFile(); + assertThat(templateFile) + .exists() + .isFile() + .hasName("template.handlebars") + .hasContent("{{service}} fr 0.1"); + templateFile = service.fetchResource("first", TEMPLATE, "0.1", "en", "template").getFile(); + assertThat(templateFile) + .exists() + .isFile() + .hasName("template.handlebars") + .hasContent("{{service}} en 0.1"); + } + + @Test + void fetchI18n() throws IOException { + File i18nFile = service.fetchResource("first", I18N,null,"fr", null).getFile(); + assertThat(i18nFile) + .exists() + .isFile() + .hasName("fr.json") + .hasContent("card.title=\"Titre $1\""); + i18nFile = service.fetchResource("first", I18N, "0.1", "fr", null).getFile(); + assertThat(i18nFile) + .exists() + .isFile() + .hasName("fr.json") + .hasContent("card.title=\"Titre $1 0.1\""); + i18nFile = service.fetchResource("first", I18N, "0.1", "en", null).getFile(); + assertThat(i18nFile) + .exists() + .isFile() + .hasName("en.json") + .hasContent("card.title=\"Title $1 0.1\""); + } + + @Test + void fetchResourceError() { + assertException(FileNotFoundException.class).isThrownBy(() -> + service.fetchResource("what", + TEMPLATE, + "0.1", + null, + "template")); + assertException(FileNotFoundException.class).isThrownBy(() -> + service.fetchResource("first", + TEMPLATE, + "0.2", + null, + "template")); + assertException(FileNotFoundException.class).isThrownBy(() -> + service.fetchResource("first", + CSS, + "0.1", + null, + "styleWhat")); + assertException(FileNotFoundException.class).isThrownBy(() -> + service.fetchResource("first", + TEMPLATE, + "0.1", + null, + "template1") + .getInputStream() + ); + + assertException(FileNotFoundException.class).isThrownBy(() -> + service.fetchResource("first", + TEMPLATE, + "0.1", + "de", + "template") + .getInputStream() + ); } - + + @Test + public void testCheckNoDuplicateProcessInUploadedFile() { + + ProcessGroupData gp1 = ProcessGroupData.builder().id("gp1").processes(Arrays.asList("process1", "process2")).build(); + ProcessGroupData gp2 = ProcessGroupData.builder().id("gp2").processes(Arrays.asList("process3", "process4")).build(); + ProcessGroupData gp3 = ProcessGroupData.builder().id("gp3").processes(Arrays.asList("process5", "process4")).build(); + ProcessGroupData gp4 = ProcessGroupData.builder().id("gp4").processes(Arrays.asList("process7", "process8", "process7")).build(); + + ProcessGroupsData groups_without_duplicate = ProcessGroupsData.builder().groups(Arrays.asList(gp1, gp2)).build(); + ProcessGroupsData groups_with_duplicate = ProcessGroupsData.builder().groups(Arrays.asList(gp2, gp3)).build(); + ProcessGroupsData groups_with_duplicate_in_the_same_group = ProcessGroupsData.builder().groups(Arrays.asList(gp1, gp4)).build(); + + assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_without_duplicate)).isTrue(); + assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_with_duplicate)).isFalse(); + assertThat(service.checkNoDuplicateProcessInUploadedFile(groups_with_duplicate_in_the_same_group)).isFalse(); + } + @Nested - class DeleteOnlyOneBusinessconfig { - - static final String bundleName = "first"; - - static final String CONFIG_FILE_NAME = "config.json"; - - @BeforeEach - void prepare() throws IOException { - if (Files.exists(testDataDir)) - Files.walk(testDataDir, 1).forEach(p -> silentDelete(p)); - copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); - service.loadCache(); - } - - @Test - void deleteBundleByNameAndVersionWhichNotBeingDefault() throws Exception { - Path bundleDir = testDataDir.resolve(bundleName); - Path bundleVersionDir = bundleDir.resolve("0.1"); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); - service.deleteVersion(bundleName,"0.1"); - Assertions.assertNull(service.fetch(bundleName, "0.1")); - Process process = service.fetch(bundleName); - Assertions.assertNotNull(process); - Assertions.assertFalse(process.getVersion().equals("0.1")); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); - } - - @Test - void deleteBundleByNameAndVersionWhichBeingDeafult1() throws Exception { - Path bundleDir = testDataDir.resolve(bundleName); - Process process = service.fetch(bundleName); - Assertions.assertTrue(process.getVersion().equals("v1")); - Path bundleVersionDir = bundleDir.resolve("v1"); - Path bundleNewDefaultVersionDir = bundleDir.resolve("0.1"); - FileUtils.touch(bundleNewDefaultVersionDir.toFile());//this is to be sure this version is the last modified - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); - service.deleteVersion(bundleName,"v1"); - Assertions.assertNull(service.fetch(bundleName, "v1")); - process = service.fetch(bundleName); - Assertions.assertNotNull(process); - Assertions.assertTrue(process.getVersion().equals("0.1")); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); - Assertions.assertTrue(Files.isDirectory(bundleNewDefaultVersionDir)); - Assertions.assertTrue(FileUtils.contentEquals(bundleDir.resolve(CONFIG_FILE_NAME).toFile(), - bundleNewDefaultVersionDir.resolve(CONFIG_FILE_NAME).toFile())); - } - - @Test - void deleteBundleByNameAndVersionWhichBeingDefault2() throws Exception { - Path bundleDir = testDataDir.resolve(bundleName); - final Process process = service.fetch(bundleName); - Assertions.assertTrue(process.getVersion().equals("v1")); - Path bundleVersionDir = bundleDir.resolve("v1"); - Path bundleNewDefaultVersionDir = bundleDir.resolve("0.5"); - FileUtils.touch(bundleNewDefaultVersionDir.toFile());//this is to be sure this version is the last modified - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); - service.deleteVersion(bundleName,"v1"); - Assertions.assertNull(service.fetch(bundleName, "v1")); - Process _process = service.fetch(bundleName); - Assertions.assertNotNull(_process); - Assertions.assertTrue(_process.getVersion().equals("0.5")); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); - Assertions.assertTrue(Files.isDirectory(bundleNewDefaultVersionDir)); - Assertions.assertTrue(FileUtils.contentEquals(bundleDir.resolve(CONFIG_FILE_NAME).toFile(), - bundleNewDefaultVersionDir.resolve(CONFIG_FILE_NAME).toFile())); - } - - @Test - void deleteBundleByNameAndVersionWhichNotExisting() throws Exception { - Assertions.assertThrows(FileNotFoundException.class, () -> {service.deleteVersion(bundleName,"impossible_someone_really_so_crazy_to_give_this_name_to_a_version");}); - } - - @Test - void deleteBundleByNameWhichNotExistingAndVersion() throws Exception { - Assertions.assertThrows(FileNotFoundException.class, () -> {service.deleteVersion("impossible_someone_really_so_crazy_to_give_this_name_to_a_bundle","1.0");}); - } - - @Test - void deleteBundleByNameAndVersionHavingOnlyOneVersion() throws Exception { - Path bundleDir = testDataDir.resolve("deletetest"); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - service.deleteVersion("deletetest","2.1"); - Assertions.assertNull(service.fetch("deletetest","2.1")); - Assertions.assertNull(service.fetch("deletetest")); - Assertions.assertFalse(Files.isDirectory(bundleDir)); - } - - @Test - void deleteGivenBundle() throws Exception { - Path bundleDir = testDataDir.resolve(bundleName); - Assertions.assertTrue(Files.isDirectory(bundleDir)); - service.delete(bundleName); - Assertions.assertFalse(Files.isDirectory(bundleDir)); + class CreateContent { + @RepeatedTest(2) + void updateProcess() throws IOException { + Path pathToBundle = Paths.get("./build/test-data/bundles/second-2.0.tar.gz"); + try (InputStream is = Files.newInputStream(pathToBundle)) { + Process process = service.updateProcess(is); + assertThat(process).hasFieldOrPropertyWithValue("id", "second"); + assertThat(process).hasFieldOrPropertyWithValue("version", "2.0"); + assertThat(process.getStates().size()).isEqualTo(1); + assertThat(process.getStates().get("firstState").getTemplateName()).isEqualTo("template"); + assertThat(process.getStates().get("firstState").getResponse().getExternalRecipients().size()).isEqualTo(2); + assertThat(service.listProcesses()).hasSize(3); + } catch (IOException e) { + log.trace("rethrowing exception"); + throw e; + } } - @Nested - class DeleteContent { - @Test - void clean() throws IOException { - service.clear(); - assertThat(service.listProcesses()).hasSize(0); - } - } + @Nested + class DeleteOnlyOneBusinessconfig { + + static final String bundleName = "first"; + + static final String CONFIG_FILE_NAME = "config.json"; + + @BeforeEach + void prepare() throws IOException { + // This will also delete the businessconfig-storage root folder, but in this case it's needed as + // the following copy would fail if the folder already existed. + if (Files.exists(testDataDir)) Files.walk(testDataDir, 1).forEach(PathUtils::silentDelete); + copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); + service.loadCache(); + } + + @Test + void deleteBundleByNameAndVersionWhichNotBeingDefault() throws Exception { + Path bundleDir = testDataDir.resolve(bundleName); + Path bundleVersionDir = bundleDir.resolve("0.1"); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); + service.deleteVersion(bundleName,"0.1"); + Assertions.assertNull(service.fetch(bundleName, "0.1")); + Process process = service.fetch(bundleName); + Assertions.assertNotNull(process); + Assertions.assertFalse(process.getVersion().equals("0.1")); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); + } + + @Test + void deleteBundleByNameAndVersionWhichBeingDeafult1() throws Exception { + Path bundleDir = testDataDir.resolve(bundleName); + Process process = service.fetch(bundleName); + Assertions.assertTrue(process.getVersion().equals("v1")); + Path bundleVersionDir = bundleDir.resolve("v1"); + Path bundleNewDefaultVersionDir = bundleDir.resolve("0.1"); + FileUtils.touch(bundleNewDefaultVersionDir.toFile());//this is to be sure this version is the last modified + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); + service.deleteVersion(bundleName,"v1"); + Assertions.assertNull(service.fetch(bundleName, "v1")); + process = service.fetch(bundleName); + Assertions.assertNotNull(process); + Assertions.assertTrue(process.getVersion().equals("0.1")); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); + Assertions.assertTrue(Files.isDirectory(bundleNewDefaultVersionDir)); + Assertions.assertTrue(FileUtils.contentEquals(bundleDir.resolve(CONFIG_FILE_NAME).toFile(), + bundleNewDefaultVersionDir.resolve(CONFIG_FILE_NAME).toFile())); + } + + @Test + void deleteBundleByNameAndVersionWhichBeingDefault2() throws Exception { + Path bundleDir = testDataDir.resolve(bundleName); + final Process process = service.fetch(bundleName); + Assertions.assertTrue(process.getVersion().equals("v1")); + Path bundleVersionDir = bundleDir.resolve("v1"); + Path bundleNewDefaultVersionDir = bundleDir.resolve("0.5"); + FileUtils.touch(bundleNewDefaultVersionDir.toFile());//this is to be sure this version is the last modified + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertTrue(Files.isDirectory(bundleVersionDir)); + service.deleteVersion(bundleName,"v1"); + Assertions.assertNull(service.fetch(bundleName, "v1")); + Process _process = service.fetch(bundleName); + Assertions.assertNotNull(_process); + Assertions.assertTrue(_process.getVersion().equals("0.5")); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + Assertions.assertFalse(Files.isDirectory(bundleVersionDir)); + Assertions.assertTrue(Files.isDirectory(bundleNewDefaultVersionDir)); + Assertions.assertTrue(FileUtils.contentEquals(bundleDir.resolve(CONFIG_FILE_NAME).toFile(), + bundleNewDefaultVersionDir.resolve(CONFIG_FILE_NAME).toFile())); + } + + @Test + void deleteBundleByNameAndVersionWhichNotExisting() throws Exception { + Assertions.assertThrows(FileNotFoundException.class, () -> {service.deleteVersion(bundleName,"impossible_someone_really_so_crazy_to_give_this_name_to_a_version");}); + } + + @Test + void deleteBundleByNameWhichNotExistingAndVersion() throws Exception { + Assertions.assertThrows(FileNotFoundException.class, () -> {service.deleteVersion("impossible_someone_really_so_crazy_to_give_this_name_to_a_bundle","1.0");}); + } + + @Test + void deleteBundleByNameAndVersionHavingOnlyOneVersion() throws Exception { + Path bundleDir = testDataDir.resolve("deletetest"); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + service.deleteVersion("deletetest","2.1"); + Assertions.assertNull(service.fetch("deletetest","2.1")); + Assertions.assertNull(service.fetch("deletetest")); + Assertions.assertFalse(Files.isDirectory(bundleDir)); + } + + @Test + void deleteGivenBundle() throws Exception { + Path bundleDir = testDataDir.resolve(bundleName); + Assertions.assertTrue(Files.isDirectory(bundleDir)); + service.delete(bundleName); + Assertions.assertFalse(Files.isDirectory(bundleDir)); + } + + @Nested + class DeleteContent { + @Test + void clean() throws IOException { + service.clear(); + assertThat(service.listProcesses()).hasSize(0); + } + } + } } - } } From 4f065fc81ffd8e37d79bfde1a971ae39a3ae09cc Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 8 Mar 2021 09:51:23 +0100 Subject: [PATCH 23/45] [OC-1519] Start users,card-consultation and card-publication after mongo and rabbit Signed-off-by: freddidierRTE --- config/docker/docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml index ed6cf27ba9..92b6588e47 100755 --- a/config/docker/docker-compose.yml +++ b/config/docker/docker-compose.yml @@ -29,6 +29,9 @@ services: users: container_name: users image: "lfeoperatorfabric/of-users-business-service:SNAPSHOT" + depends_on: + - mongodb + - rabbitmq user: ${USER_ID}:${USER_GID} ports: - "2103:8080" @@ -64,6 +67,7 @@ services: image: "lfeoperatorfabric/of-cards-publication-business-service:SNAPSHOT" depends_on: - mongodb + - rabbitmq user: ${USER_ID}:${USER_GID} ports: - "2102:8080" @@ -79,6 +83,9 @@ services: cards-consultation: container_name: cards-consultation image: "lfeoperatorfabric/of-cards-consultation-business-service:SNAPSHOT" + depends_on: + - mongodb + - rabbitmq user: ${USER_ID}:${USER_GID} ports: - "2104:8080" From 263cc3794cf00cc6a906e5978f04b8f8f15fda76 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 8 Mar 2021 11:15:15 +0100 Subject: [PATCH 24/45] [OC-1530] usercard: when sending the card send it as well to the current user Signed-off-by: freddidierRTE --- src/docs/asciidoc/reference_doc/user_cards.adoc | 5 +++++ ui/main/src/app/modules/usercard/usercard.component.html | 2 +- ui/main/src/app/modules/usercard/usercard.component.ts | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/user_cards.adoc b/src/docs/asciidoc/reference_doc/user_cards.adoc index a4522687ed..409ac5caca 100644 --- a/src/docs/asciidoc/reference_doc/user_cards.adoc +++ b/src/docs/asciidoc/reference_doc/user_cards.adoc @@ -133,3 +133,8 @@ or `Write` for the chosen process and state. For example: NOTE: Using the `ReceiveAndWrite` right instead of the `Write` right allows the user to receive the card they sent and edit or delete it. + + +== Misc + +When a user send a card, it is always send to himself whatever he chooses in the recipient list. \ No newline at end of file diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html index 2bcd6f4193..a5e87d3b51 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.html +++ b/ui/main/src/app/modules/usercard/usercard.component.html @@ -87,7 +87,7 @@
      - diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 599fea7fd4..ae382f913c 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -367,7 +367,7 @@ export class UserCardComponent implements OnDestroy, OnInit { this.store.dispatch(new AlertMessage({alertMessage: {message: msg, level: severity, i18n: {key: i18nKey}}})); } - onSubmitForm(template: TemplateRef) { + prepareCard() { const formValue = this.messageForm.value; const processValue = this.editCardMode ? this.cardToEdit.card.process : formValue['process']; @@ -454,6 +454,7 @@ export class UserCardComponent implements OnDestroy, OnInit { severity: severity, hasBeenAcknowledged: false, hasBeenRead: false, + userRecipients : [this.currentUserWithPerimeters.userData.login], entityRecipients: recipients, entitiesAllowedToRespond: entitiesAllowedToRespond, externalRecipients: null, From 40dd3baf601bf1bd7c773cb006aada92aacead9d Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 8 Mar 2021 14:48:38 +0100 Subject: [PATCH 25/45] Minor doc correction Signed-off-by: freddidierRTE --- src/docs/asciidoc/reference_doc/response_cards.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index b81b8f02af..50db1511c0 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -111,7 +111,7 @@ state. .src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars [source,js] ---- -include::../../../test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars[tag=templateGateway.validyForm_example] +include::../../../test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/question.handlebars[tag=templateGateway.validyForm_example] ---- === Define permissions From 88185d621c0dfa752598ec55df19af7ee7318fec Mon Sep 17 00:00:00 2001 From: vlo-rte Date: Mon, 8 Mar 2021 15:40:30 +0100 Subject: [PATCH 26/45] [OC-1535] correct a typo on the timeline (French version) --- ui/main/src/assets/i18n/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index f98acaec61..4b75d0a667 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -21,7 +21,7 @@ "timeline": { "hideTimeline" : "Masquer la timeline", "showTimeline" : "Afficher la Timeline", - "businessPeriod": "Periode métier", + "businessPeriod": "Période métier", "buttonTitle": { "TR": "Temps réel", "J": "Jour", From ac338a4d68bd7004f65a0eaa9a95430ff2de12c6 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Mon, 8 Mar 2021 16:49:21 +0100 Subject: [PATCH 27/45] [OC-1534] Update dev environment documentation --- bin/load_environment_light.sh | 4 +++- src/docs/asciidoc/dev_env/launch_dev.adoc | 5 +---- src/docs/asciidoc/dev_env/requirements.adoc | 12 ++++++------ src/docs/asciidoc/dev_env/ui.adoc | 9 +++++++++ src/test/utils/karate/README.adoc | 7 ++++++- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/bin/load_environment_light.sh b/bin/load_environment_light.sh index 56c2a17476..35ec0db10b 100755 --- a/bin/load_environment_light.sh +++ b/bin/load_environment_light.sh @@ -11,8 +11,10 @@ source ${BASH_SOURCE%/*}/load_variables.sh +sdk install gradle 6.5.1 sdk use gradle 6.5.1 # the java version is externalized because also needed for travis configuration +sdk install java $( Date: Mon, 8 Mar 2021 16:56:31 +0100 Subject: [PATCH 28/45] [OC-1530] typo update --- src/docs/asciidoc/reference_doc/user_cards.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/asciidoc/reference_doc/user_cards.adoc b/src/docs/asciidoc/reference_doc/user_cards.adoc index 409ac5caca..445f36d0f4 100644 --- a/src/docs/asciidoc/reference_doc/user_cards.adoc +++ b/src/docs/asciidoc/reference_doc/user_cards.adoc @@ -137,4 +137,4 @@ edit or delete it. == Misc -When a user send a card, it is always send to himself whatever he chooses in the recipient list. \ No newline at end of file +When a user send a card, it is always sent to himself whatever he chooses in the recipient list. \ No newline at end of file From 11cddd092a47195c2f0908603a7f9a81f6c69e4e Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 9 Mar 2021 13:12:50 +0100 Subject: [PATCH 29/45] [OC-1532] BUG - usercard - if process has no state available for sending card , do not show it Signed-off-by: freddidierRTE --- ui/main/src/app/modules/usercard/usercard.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 599fea7fd4..35eb066b20 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -203,8 +203,10 @@ export class UserCardComponent implements OnDestroy, OnInit { const _i18nPrefix = process.id + '.' + process.version + '.'; const label = process.name ? (_i18nPrefix + process.name) : process.id; const processToShow = { value: process.id, label: label }; - this.processOptions.push(processToShow); + this.loadStatesForProcess(process); + // Add process option only if there is at least one state + if (this.statesPerProcesses.get(process.id).length > 0) this.processOptions.push(processToShow); } }); } From 96c399ecfec260129c0522e0f4e88a0997568409 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 9 Mar 2021 13:13:03 +0100 Subject: [PATCH 30/45] [OC-1532] Reduce cognitive complexity (Sonar issue) Signed-off-by: freddidierRTE --- .../modules/usercard/usercard.component.ts | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 35eb066b20..6482326e70 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -257,20 +257,25 @@ export class UserCardComponent implements OnDestroy, OnInit { this.currentUserWithPerimeters.computedPerimeters.forEach( perimeter => { if ((perimeter.process === process.id) && UserCardComponent.userCanSendCard(perimeter)) { - const state = process.states[perimeter.state]; - if (!!state) { - if (!!state.userCard) { - const label = !!state.name ? (new I18n(Utilities.getI18nPrefixFromProcess(process) - + state.name)) : perimeter.state; - const stateEntry = { value: perimeter.state, label: label }; - statesList.push(stateEntry); - } - } else console.log('WARNING : state', perimeter.state , 'is present in perimeter for process' - , process.id , 'but not in process definition'); - + const state = this.getStateFromProcessDefinition(process,perimeter.state) + if (!!state) statesList.push(state); } }); this.statesPerProcesses.set(process.id, statesList); + + } + + getStateFromProcessDefinition(process: Process, stateId: string) { + const stateFromProcessDefinition = process.states[stateId]; + if (!!stateFromProcessDefinition) { + if (!!stateFromProcessDefinition.userCard) { + const label = !!stateFromProcessDefinition.name ? (new I18n(Utilities.getI18nPrefixFromProcess(process) + + stateFromProcessDefinition.name)) : stateId; + return { value: stateId, label: label }; + } + } else console.log('WARNING : state', stateId, 'is present in perimeter for process' + , process.id, 'but not in process definition'); + return null; } From 8d44c3cb0dbd14846f6248ee8813db1ba6cbee9b Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Thu, 4 Mar 2021 10:52:43 +0100 Subject: [PATCH 31/45] [OC-1257] Set groups of entities compatible with reponse card from usercard --- config/dev/users-dev.yml | 31 +++--- config/docker/users-docker.yml | 32 +++--- .../impl/UserCardProcessorImpl.java | 8 +- .../services/CardProcessServiceShould.java | 31 +++++- .../users/model/EntityData.java | 9 +- .../core/users/src/main/modeling/swagger.yaml | 2 + .../configuration/ObjectMapperShould.java | 6 +- .../reference_doc/users_management.adoc | 2 +- .../api/karate/cards/deleteUserCard.feature | 2 +- src/test/api/karate/cards/userCards.feature | 33 +++++- .../users/entities/createEntities.feature | 5 +- ui/main/angular.json | 4 +- ui/main/src/app/model/entity.model.ts | 6 +- .../entities/edit-entity-modal.component.html | 8 ++ .../entities/edit-entity-modal.component.ts | 9 +- .../table/entities-table.component.ts | 2 +- .../components/detail/detail.component.ts | 12 ++- .../modules/usercard/usercard.component.ts | 14 ++- .../src/app/services/entities.service.spec.ts | 101 +++++++++++++++++- ui/main/src/app/services/entities.service.ts | 15 +++ ui/main/src/assets/i18n/en.json | 4 +- ui/main/src/assets/i18n/fr.json | 4 +- 22 files changed, 278 insertions(+), 62 deletions(-) diff --git a/config/dev/users-dev.yml b/config/dev/users-dev.yml index 2ee7ede6c9..3ccac1175f 100755 --- a/config/dev/users-dev.yml +++ b/config/dev/users-dev.yml @@ -49,18 +49,25 @@ operatorfabric.users.default: name: ReadOnly description: ReadOnly Group entities: - - id: ENTITY1 - name: Control Room 1 - description: Control Room 1 - - id: ENTITY2 - name: Control Room 2 - description: Control Room 2 - - id: ENTITY3 - name: Control Room 3 - description: Control Room 3 - - id: ENTITY4 - name: IT Supervision Center - description: IT Supervision Center + - id: ENTITY1 + name: Control Room 1 + description: Control Room 1 + parents : ["ALLCONTROLROOMS"] + - id: ENTITY2 + name: Control Room 2 + description: Control Room 2 + parents : ["ALLCONTROLROOMS"] + - id: ENTITY3 + name: Control Room 3 + description: Control Room 3 + parents : ["ALLCONTROLROOMS"] + - id: ALLCONTROLROOMS + name: All Control Rooms + description: All Control Rooms + entityAllowedToSendCard: false + - id: ENTITY4 + name: IT Supervision Center + description: IT Supervision Center user-settings: - login: operator3 description: Da Operator Rulez diff --git a/config/docker/users-docker.yml b/config/docker/users-docker.yml index 8ba4f184ab..8a9f265384 100644 --- a/config/docker/users-docker.yml +++ b/config/docker/users-docker.yml @@ -50,15 +50,23 @@ operatorfabric.users.default: name: ReadOnly description: ReadOnly Group entities: - - id: ENTITY1 - name: Control Room 1 - description: Control Room 1 - - id: ENTITY2 - name: Control Room 2 - description: Control Room 2 - - id: ENTITY3 - name: Control Room 3 - description: Control Room 3 - - id: ENTITY4 - name: IT Supervision Center - description: IT Supervision Center + - id: ENTITY1 + name: Control Room 1 + description: Control Room 1 + parents : ["ALLCONTROLROOMS"] + - id: ENTITY2 + name: Control Room 2 + description: Control Room 2 + parents : ["ALLCONTROLROOMS"] + - id: ENTITY3 + name: Control Room 3 + description: Control Room 3 + parents : ["ALLCONTROLROOMS"] + - id: ALLCONTROLROOMS + name: All Control Rooms + description: All Control Rooms + entityAllowedToSendCard: false + - id: ENTITY4 + name: IT Supervision Center + description: IT Supervision Center + diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java index b455947340..6218cf9c8d 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java @@ -26,11 +26,9 @@ public String processPublisher(CardPublicationData card, CurrentUserWithPerimete Optional> entitiesUser= Optional.ofNullable(user.getUserData().getEntities()); - //take first entity of the user as the card publisher id - if(entitiesUser.isPresent() && !entitiesUser.get().isEmpty()) { - card.setPublisher(entitiesUser.get().get(0)); - return entitiesUser.get().get(0); - + //Check thah publisher is included in user entities + if(entitiesUser.isPresent() && !entitiesUser.get().isEmpty() && entitiesUser.get().contains(card.getPublisher()) ) { + return card.getPublisher(); } //no possible calculation of publisher id from card and user arguments, // throw a runtime exception to be handled by Mono.onErrorResume() diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java index db572ae3a4..3873ef6693 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java @@ -229,7 +229,7 @@ void createUserCards() throws URISyntaxException { ArrayList externalRecipients = new ArrayList<>(); externalRecipients.add("api_test_externalRecipient1"); - CardPublicationData card = CardPublicationData.builder().publisher("PUBLISHER_1").processVersion("O") + CardPublicationData card = CardPublicationData.builder().publisher("newPublisherId").processVersion("O") .processInstanceId("PROCESS_CARD_USER").severity(SeverityEnum.INFORMATION) .process("PROCESS_CARD_USER") .state("STATE1") @@ -253,6 +253,29 @@ void createUserCards() throws URISyntaxException { } + @Test + void createUserCardsWithWrongPublisher() throws URISyntaxException { + ArrayList externalRecipients = new ArrayList<>(); + externalRecipients.add("api_test_externalRecipient1"); + + CardPublicationData card = CardPublicationData.builder().publisher("PUBLISHER_X").processVersion("O") + .processInstanceId("PROCESS_CARD_USER").severity(SeverityEnum.INFORMATION) + .process("PROCESS_CARD_USER") + .state("STATE1") + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .externalRecipients(externalRecipients) + .recipient(RecipientPublicationData.builder().type(DEADEND).build()) + .state("state1") + .build(); + + StepVerifier.create(cardProcessingService.processUserCards(Flux.just(card), currentUserWithPerimeters)) + .expectNextMatches(r -> r.getCount().equals(0)).verifyComplete(); + checkCardCount(0); + checkArchiveCount(0); + + } @Test void childCards() throws URISyntaxException { @@ -278,7 +301,7 @@ void childCards() throws URISyntaxException { ArrayList externalRecipients = new ArrayList<>(); externalRecipients.add("api_test_externalRecipient1"); - CardPublicationData card = CardPublicationData.builder().publisher("PUBLISHER_1").processVersion("O") + CardPublicationData card = CardPublicationData.builder().publisher("newPublisherId").processVersion("O") .processInstanceId("PROCESS_CARD_USER").severity(SeverityEnum.INFORMATION) .process("PROCESS_CARD_USER") .parentCardId(cards.get(0).getId()) @@ -353,7 +376,7 @@ void preserveData() { HoursAndMinutes hoursAndMinutes = new HoursAndMinutesPublicationData(2,10); RecurrencePublicationData recurrence = new RecurrencePublicationData("timezone",daysOfWeek,hoursAndMinutes, duration); - CardPublicationData newCard = CardPublicationData.builder().publisher("PUBLISHER_1") + CardPublicationData newCard = CardPublicationData.builder().publisher("publisher(") .processVersion("0.0.1").processInstanceId("PROCESS_1").severity(SeverityEnum.ALARM) .startDate(start).title(I18nPublicationData.builder().key("title").build()) .summary(I18nPublicationData.builder().key("summary").parameter("arg1", "value1") @@ -396,7 +419,7 @@ private boolean checkCardCount(long expectedCount) { } private boolean checkCardPublisherId(CardPublicationData card) { - if (user.getEntities().get(0).equals(card.getPublisher())) { + if (user.getEntities().contains(card.getPublisher())) { return true; } else { log.warn("Expected card publisher id is " + user.getEntities().get(0) + " but it was " + card.getPublisher()); diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/EntityData.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/EntityData.java index f71b114ef5..f6f6d3a3e2 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/EntityData.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/EntityData.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,7 +10,6 @@ package org.lfenergy.operatorfabric.users.model; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -38,7 +37,10 @@ public class EntityData implements Entity { private String id; private String name; private String description; - @JsonIgnore + + @Builder.Default + private Boolean entityAllowedToSendCard = true; + private Set parents; public EntityData(Entity entity) { @@ -46,6 +48,7 @@ public EntityData(Entity entity) { this.id = entity.getId(); this.name = entity.getName(); this.description = entity.getDescription(); + this.entityAllowedToSendCard = entity.getEntityAllowedToSendCard(); this.parents = entity.getParents().stream().collect(Collectors.toSet()); } diff --git a/services/core/users/src/main/modeling/swagger.yaml b/services/core/users/src/main/modeling/swagger.yaml index 9ec614579a..df3c40e9c2 100755 --- a/services/core/users/src/main/modeling/swagger.yaml +++ b/services/core/users/src/main/modeling/swagger.yaml @@ -99,6 +99,8 @@ definitions: type: string description: type: string + entityAllowedToSendCard: + type: boolean parents: type: array items: diff --git a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/configuration/ObjectMapperShould.java b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/configuration/ObjectMapperShould.java index 1417eca146..a3efee7525 100644 --- a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/configuration/ObjectMapperShould.java +++ b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/configuration/ObjectMapperShould.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -93,7 +93,8 @@ public void readEntity() throws IOException { String stringEntity = "{" + "\"id\": \"TESTENTITY\"," + "\"name\": \"Test Entity\"," + - "\"description\": \"An entity used for tests\"" + + "\"description\": \"An entity used for tests\"," + + "\"entityAllowedToSendCard\": false" + "}"; Entity entity = mapper.readValue(stringEntity, Entity.class); assertThat(entity).isNotNull(); @@ -101,5 +102,6 @@ public void readEntity() throws IOException { assertThat(entity.getId()).isEqualTo("TESTENTITY"); assertThat(entity.getName()).isEqualTo("Test Entity"); assertThat(entity.getDescription()).isEqualTo("An entity used for tests"); + assertThat(entity.getEntityAllowedToSendCard()).isFalse(); } } diff --git a/src/docs/asciidoc/reference_doc/users_management.adoc b/src/docs/asciidoc/reference_doc/users_management.adoc index f1885d1b74..5bbe80c8c6 100644 --- a/src/docs/asciidoc/reference_doc/users_management.adoc +++ b/src/docs/asciidoc/reference_doc/users_management.adoc @@ -55,7 +55,7 @@ ifndef::single-page-doc[<<{gradle-rootdir}/documentation/current/deployment/inde The notion of entity is loose and can be used to model organizations structures(examples : control center, company , department... ). Entities are used to send cards to several users without a name specifically. The information about membership to an entity is stored in the user's data (`entities` field of the `user` object). In Entity objects, the `parents` property (array) expresses the fact that this entity is a part of one or several other entities. This feature allows cards to be sent to a group of entities without having to repeat the detailed list of entities for each card. - +The boolean property `entityAllowedToSendCard` (default value `true`) can be used to mark an Entity as not eligible as card publisher. This can be useful for a group of entities where only child entities should be used as card publishers while the parent is just a logical group usable as card recipient. Examples using entities can be found ifdef::single-page-doc[<<_send_to_several_users, here>>] diff --git a/src/test/api/karate/cards/deleteUserCard.feature b/src/test/api/karate/cards/deleteUserCard.feature index 6e7273de26..09605cdeeb 100644 --- a/src/test/api/karate/cards/deleteUserCard.feature +++ b/src/test/api/karate/cards/deleteUserCard.feature @@ -201,7 +201,7 @@ Feature: deleteUserCards tests * def cardForDeleteForbidden3 = """ { - "publisher" : "ENTITY1", + "publisher" : "ENTITY2", "processVersion" : "1", "process" :"processDeleteUserCard", "processInstanceId" : "processDeleteUserCardForbidden3", diff --git a/src/test/api/karate/cards/userCards.feature b/src/test/api/karate/cards/userCards.feature index 4e60dbfbf2..bc35fc2873 100644 --- a/src/test/api/karate/cards/userCards.feature +++ b/src/test/api/karate/cards/userCards.feature @@ -168,7 +168,32 @@ Feature: UserCards tests } """ - # Push user card without authentication +# Push user card with wrong publisher + Given url opfabPublishCardUrl + 'cards/userCard' + And request card + When method post + Then status 401 + + + * def card = +""" +{ + "publisher" : "ENTITY1", + "processVersion" : "1", + "process" :"process_1", + "processInstanceId" : "process_id_w", + "state": "state2", + "groupRecipients": ["Dispatcher"], + "externalRecipients" : ["api_test_externalRecipient1"], + "severity" : "INFORMATION", + "startDate" : 1553186770681, + "summary" : {"key" : "defaultProcess.summary"}, + "title" : {"key" : "defaultProcess.title"}, + "data" : {"message":"a message"} +} +""" + +# Push user card without authentication Given url opfabPublishCardUrl + 'cards/userCard' And request card When method post @@ -195,7 +220,7 @@ Feature: UserCards tests * def card = """ { - "publisher" : "cardTest2", + "publisher" : "ENTITY1", "processVersion" : "1", "process" :"process_2", "processInstanceId" : "process_o", @@ -342,7 +367,7 @@ Feature: UserCards tests * def childCard1 = """ { - "publisher" : "cardTest4", + "publisher" : "ENTITY1", "processVersion" : "1", "process" :"process_1", "processInstanceId" : "process_id_4", @@ -380,7 +405,7 @@ Feature: UserCards tests * def childCard2 = """ { - "publisher" : "cardTest5", + "publisher" : "ENTITY1", "processVersion" : "1", "process" :"process_1", "processInstanceId" : "process_id_5", diff --git a/src/test/api/karate/users/entities/createEntities.feature b/src/test/api/karate/users/entities/createEntities.feature index ff08ec2dbe..40aa3f79ef 100644 --- a/src/test/api/karate/users/entities/createEntities.feature +++ b/src/test/api/karate/users/entities/createEntities.feature @@ -20,7 +20,8 @@ Feature: CreateEntities { "id" : "entityKarate1", "name" : "entityKarate1 name", - "description" : "I Love Karate" + "description" : "I Love Karate", + "entityAllowedToSendCard" : false } """ * def wrongEntity = @@ -42,6 +43,7 @@ Feature: CreateEntities And match response.description == entity.description And match response.name == entity.name And match response.id == entity.id + And match response.entityAllowedToSendCard == true Scenario: Update my entity @@ -54,6 +56,7 @@ Feature: CreateEntities And match response.description == entityUpdated.description And match response.name == entityUpdated.name And match response.id == entity.id + And match response.entityAllowedToSendCard == false Scenario: create without admin role #HForbiden without admin role, expected response 403 diff --git a/ui/main/angular.json b/ui/main/angular.json index 7b42920801..402e62006c 100755 --- a/ui/main/angular.json +++ b/ui/main/angular.json @@ -120,7 +120,9 @@ "src/assets/styles/style.css", "src/assets/styles/styles.scss" ], - "scripts": [], + "scripts": [ + "src/assets/js/templateGateway.js" + ], "assets": [ "src/favicon.ico", "src/assets" diff --git a/ui/main/src/app/model/entity.model.ts b/ui/main/src/app/model/entity.model.ts index 66a8a8f140..d91e3d7987 100644 --- a/ui/main/src/app/model/entity.model.ts +++ b/ui/main/src/app/model/entity.model.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,7 +14,9 @@ export class Entity { public constructor( readonly id:string, readonly name:string, - readonly description:string + readonly description:string, + readonly entityAllowedToSendCard:boolean, + readonly parents: string[] ){} } \ No newline at end of file diff --git a/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html index cd3dc7b6be..edae97fa7e 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html +++ b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.html @@ -42,6 +42,14 @@
      + +
      + +
      +
    diff --git a/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts index df3b0262e3..2b36c08a29 100644 --- a/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts +++ b/ui/main/src/app/modules/admin/components/editmodal/entities/edit-entity-modal.component.ts @@ -26,7 +26,8 @@ export class EditEntityModalComponent implements OnInit { id: new FormControl('' , [Validators.required, Validators.minLength(2), Validators.pattern(/^[A-z\d\-_]+$/)]), name: new FormControl('', [Validators.required]), - description: new FormControl('') + description: new FormControl(''), + entityAllowedToSendCard: new FormControl(false), }); @Input() row: any; @@ -65,7 +66,7 @@ export class EditEntityModalComponent implements OnInit { this.id.setValue((this.id.value as string).trim()); this.name.setValue((this.name.value as string).trim()); this.description.setValue((this.description.value as string).trim()); - + this.entityAllowedToSendCard.setValue(this.entityAllowedToSendCard.value as boolean); } get id() { @@ -80,6 +81,10 @@ export class EditEntityModalComponent implements OnInit { return this.entityForm.get('description') as FormControl; } + get entityAllowedToSendCard() { + return this.entityForm.get('entityAllowedToSendCard') as FormControl; + } + dismissModal(reason: string): void { this.activeModal.dismiss(reason); } diff --git a/ui/main/src/app/modules/admin/components/table/entities-table.component.ts b/ui/main/src/app/modules/admin/components/table/entities-table.component.ts index d881b43a3d..894e149415 100644 --- a/ui/main/src/app/modules/admin/components/table/entities-table.component.ts +++ b/ui/main/src/app/modules/admin/components/table/entities-table.component.ts @@ -20,7 +20,7 @@ import {AdminItemType} from '../../services/sharing.service'; export class EntitiesTableComponent extends AdminTableDirective implements OnInit { tableType = AdminItemType.ENTITY; - fields = [new Field('id', 3), new Field('name', 3), new Field('description', 5), new Field('parents', 5, 'entityCellRenderer')]; + fields = [new Field('id', 3), new Field('name', 3), new Field('description', 5), new Field('entityAllowedToSendCard', 3), new Field('parents', 5, 'entityCellRenderer')]; idField = 'id'; editModalComponent = EditEntityModalComponent; diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 0ea74921d1..639e8ba749 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -454,8 +454,14 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC private setEntitiesToRespond() { this._listEntitiesToRespond = new Array(); this._userEntitiesAllowedToRespond = []; + if (this.card.entitiesAllowedToRespond) { - this.card.entitiesAllowedToRespond.forEach(entity => { + + const entitiesToRespond = this.entitiesService.getEntities().filter(entity => this.card.entitiesAllowedToRespond.includes(entity.id)); + const allowed = this.entitiesService.getEntitiesAllowedToRespond(entitiesToRespond).map(entity => entity.id); + console.log(new Date().toISOString(), ' Detail card - entities allowed to respond = ', allowed); + + allowed.forEach(entity => { const entityName = this.getEntityName(entity); if (entityName) { this._listEntitiesToRespond.push( @@ -465,7 +471,9 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC }); } }); - this._userEntitiesAllowedToRespond = this.card.entitiesAllowedToRespond.filter(x => this.user.entities.includes(x)); + + this._userEntitiesAllowedToRespond = allowed.filter(x => this.user.entities.includes(x)); + console.log(new Date().toISOString(), ' Detail card - users entities allowed to respond = ', this._userEntitiesAllowedToRespond); } } diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 599fea7fd4..d788f2c8db 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -37,6 +37,7 @@ import {MessageLevel} from '@ofModel/message.model'; import {AlertMessage} from '@ofStore/actions/alert.actions'; import {RightsEnum} from '@ofModel/perimeter.model'; import {Utilities} from '../../common/utilities'; +import {Entity} from '@ofModel/entity.model'; declare const templateGateway: any; @@ -64,6 +65,7 @@ export class UserCardComponent implements OnDestroy, OnInit { }; }); + entities: Entity[]; stateOptions: any[]; recipientsOptions = []; selectedRecipients = []; @@ -184,7 +186,8 @@ export class UserCardComponent implements OnDestroy, OnInit { loadAllEntities(): void { - this.entitiesService.getEntities().forEach(entity => + this.entities = this.entitiesService.getEntities(); + this.entities.forEach(entity => this.recipientsOptions.push({ id: entity.id, itemName: entity.name })); this.recipientsOptions.sort(( a, b ) => a.itemName.localeCompare(b.itemName)); @@ -402,11 +405,15 @@ export class UserCardComponent implements OnDestroy, OnInit { return; } else selectedRecipients.forEach(entity => recipients.push(entity.id)); + const publisher = this.currentUserWithPerimeters.userData.entities.find(userEntity => { + const entity = this.entities.find(e => e.id === userEntity); + return entity.entityAllowedToSendCard; + }); const entitiesAllowedToRespond = []; if (selectedProcess.states[state].response) { recipients.forEach(entity => { - if (!this.currentUserWithPerimeters.userData.entities.includes(entity)) entitiesAllowedToRespond.push(entity); + if (entity != publisher) entitiesAllowedToRespond.push(entity); }); } @@ -436,7 +443,6 @@ export class UserCardComponent implements OnDestroy, OnInit { else timeSpans = [new TimeSpan(startDate , endDate )]; } - let processInstanceId ; if (this.editCardMode) processInstanceId = this.cardToEdit.card.processInstanceId; else processInstanceId = Guid.create().toString(); @@ -444,7 +450,7 @@ export class UserCardComponent implements OnDestroy, OnInit { this.card = { id: 'dummyId', publishDate: null, - publisher: this.currentUserWithPerimeters.userData.entities[0], + publisher: publisher, processVersion: processVersion, process: selectedProcess.id, processInstanceId: processInstanceId, diff --git a/ui/main/src/app/services/entities.service.spec.ts b/ui/main/src/app/services/entities.service.spec.ts index 60eea88aa3..f56d5e2217 100644 --- a/ui/main/src/app/services/entities.service.spec.ts +++ b/ui/main/src/app/services/entities.service.spec.ts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -35,11 +35,12 @@ describe('EntitiesService', () => { it('should be created', () => { expect(entitiesService).toBeTruthy(); }); + describe('#getAllEntities', () => { it('should return an Observable', () => { const listEntities: Entity[] = []; - const entity1 = new Entity('ENTITY1', 'Control Room 1', 'Control Room 1'); - const entity2 = new Entity('ENTITY2', 'Control Room 2', 'Control Room 2'); + const entity1 = new Entity('ENTITY1', 'Control Room 1', 'Control Room 1', true, []); + const entity2 = new Entity('ENTITY2', 'Control Room 2', 'Control Room 2', true, []); listEntities.push(entity1); listEntities.push(entity2); entitiesService.getAllEntities().subscribe(result => { @@ -52,4 +53,98 @@ describe('EntitiesService', () => { req.flush(listEntities); }); }); + + + describe('#getEntitiesAllowedToRespond', () => { + it('shoud return 3 entities', () => { + const listEntities: Entity[] = []; + const entity1 = new Entity('ENTITY1', 'Control Room 1', 'Control Room 1', true, []); + const entity2 = new Entity('ENTITY2', 'Control Room 2', 'Control Room 2', true, []); + const entity3 = new Entity('ENTITY3', 'Control Room 3', 'Control Room 3', false, []); + const entity3_1 = new Entity('ENTITY3.1', 'Control Room 3.1', 'Control Room 3.1', false, ['ENTITY3']); + const entity3_1_1 = new Entity('ENTITY3.1.1', 'Control Room 3.1.1', 'Control Room 3.1.1', false, ['ENTITY3.1']); + const entity3_1_2 = new Entity('ENTITY3.1.2', 'Control Room 3.1.2', 'Control Room 3.1.2', true, ['ENTITY3.1']); + const entity3_2 = new Entity('ENTITY3.2', 'Control Room 3.2', 'Control Room 3.2', true, ['ENTITY3']); + + listEntities.push(entity1); + listEntities.push(entity2); + listEntities.push(entity3); + listEntities.push(entity3_1); + listEntities.push(entity3_1_1); + listEntities.push(entity3_1_2); + listEntities.push(entity3_2); + + entitiesService.loadAllEntitiesData().subscribe(result => { + expect(result.length).toBe(7); + const selectedEntities: Entity[] = []; + selectedEntities.push(entity2); + selectedEntities.push(entity3); + const allowedEntities = entitiesService.getEntitiesAllowedToRespond(selectedEntities); + expect(allowedEntities.length).toBe(3); + expect(allowedEntities[0].id).toBe('ENTITY2'); + expect(allowedEntities[1].id).toBe('ENTITY3.1.2'); + expect(allowedEntities[2].id).toBe('ENTITY3.2'); + }); + const req = httpMock.expectOne(`${environment.urls.entities}`); + expect(req.request.method).toBe('GET'); + req.flush(listEntities); + + }); + + it('shoud return 1 entity', () => { + const listEntities: Entity[] = []; + + const entityGroup = new Entity('ENTITYGROUP', 'Control Rooms', 'Control Rooms', true, []); + const entity1 = new Entity('ENTITY1', 'Control Room 1', 'Control Room 1', true, ['ENTITYGROUP']); + const entity2 = new Entity('ENTITY2', 'Control Room 2', 'Control Room 2', true, ['ENTITYGROUP']); + + listEntities.push(entity1); + listEntities.push(entity2); + listEntities.push(entityGroup); + + entitiesService.loadAllEntitiesData().subscribe(result => { + expect(result.length).toBe(3); + const selectedEntities: Entity[] = []; + selectedEntities.push(entityGroup); + + const allowedEntities = entitiesService.getEntitiesAllowedToRespond(selectedEntities); + expect(allowedEntities.length).toBe(1); + expect(allowedEntities[0].id).toBe('ENTITYGROUP'); + }); + const req = httpMock.expectOne(`${environment.urls.entities}`); + expect(req.request.method).toBe('GET'); + req.flush(listEntities); + + }); + + it('shoud return 2 entity', () => { + const listEntities: Entity[] = []; + + const entityGroup = new Entity('ENTITYGROUP', 'Control Rooms', 'Control Rooms', false, []); + const entity1 = new Entity('ENTITY1', 'Control Room 1', 'Control Room 1', true, ['ENTITYGROUP']); + const entity2 = new Entity('ENTITY2', 'Control Room 2', 'Control Room 2', true, ['ENTITYGROUP']); + + listEntities.push(entity1); + listEntities.push(entity2); + listEntities.push(entityGroup); + + entitiesService.loadAllEntitiesData().subscribe(result => { + expect(result.length).toBe(3); + const selectedEntities: Entity[] = []; + selectedEntities.push(entity1); + selectedEntities.push(entity2); + selectedEntities.push(entityGroup); + + const allowedEntities = entitiesService.getEntitiesAllowedToRespond(selectedEntities); + expect(allowedEntities.length).toBe(2); + expect(allowedEntities[0].id).toBe('ENTITY1'); + expect(allowedEntities[1].id).toBe('ENTITY2'); + }); + const req = httpMock.expectOne(`${environment.urls.entities}`); + expect(req.request.method).toBe('GET'); + req.flush(listEntities); + + }); + }); + }) diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts index b853d1669c..ff0095684c 100644 --- a/ui/main/src/app/services/entities.service.ts +++ b/ui/main/src/app/services/entities.service.ts @@ -117,4 +117,19 @@ export class EntitiesService extends CachedCrudService implements OnDestroy { templateGateway.setEntityNames(entityNames); } + public getEntitiesAllowedToRespond(selected: Entity[]) : Entity[] { + let allowed = new Set(); + selected.forEach(entity => { + if (entity.entityAllowedToSendCard) { + allowed.add(entity); + } else { + const childs = this._entities.filter(child => child.parents.includes(entity.id)); + const childsAllowed = this.getEntitiesAllowedToRespond(childs); + childsAllowed.forEach(c => allowed.add(c)); + } + }) + + return Array.from(allowed); + } + } diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 893ff8c657..8eea6e8f3d 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -277,6 +277,7 @@ "name": "Name", "parents": "Parent Entities", "description": "Description", + "entityAllowedToSendCard": "Card sending allowed", "confirmDelete": "Do you really want to delete entity", "add": "Add new entity" }, @@ -326,7 +327,8 @@ "label":"Name" }, "description": "Description", - "lines": "lines per page" + "lines": "lines per page", + "entityAllowedToSendCard": "Card sending allowed" }, "tabs": { "users": "Users Management", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index f98acaec61..0bb3b6802f 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -277,6 +277,7 @@ "name": "Nom", "parents": "Entités parentes", "description": "Description", + "entityAllowedToSendCard": "Envoi de carte autorisé", "confirmDelete": "Voulez-vous vraiment supprimer l'entité", "add":"Ajouter une nouvelle entité" }, @@ -326,7 +327,8 @@ "label":"Nom" }, "description": "Description", - "lines": "lignes par page" + "lines": "lignes par page", + "entityAllowedToSendCard": "Envoi de carte autorisé" }, "tabs": { "users": "Gestion des utilisateurs", From c83d4a11d19d3c29e036da7ba9b3c38d15738f23 Mon Sep 17 00:00:00 2001 From: Alexandra Guironnet Date: Wed, 10 Mar 2021 09:59:23 +0100 Subject: [PATCH 32/45] [OC-1543] Reviewing TODO comments in code and documentation --- CICD/prepare_release_version.sh | 1 - build.gradle | 1 - .../ArchivedCardCustomRepositoryImpl.java | 2 - .../cards/consultation/TestUtilities.java | 2 - .../ArchivedCardRepositoryShould.java | 4 +- .../services/CardProcessServiceShould.java | 7 --- .../users/model/UserSettingsDataShould.java | 2 - src/docs/asciidoc/CICD/pipeline_conf.adoc | 7 --- src/docs/asciidoc/CICD/release_process.adoc | 1 - src/docs/asciidoc/TODO_WIP.adoc | 49 ------------------- src/docs/asciidoc/community/index.adoc | 5 -- src/docs/asciidoc/community/workflow.adoc | 17 ------- .../configuration/certificates.adoc | 1 - .../configuration/configuration.adoc | 3 +- src/docs/asciidoc/deployment/port_table.adoc | 2 - .../deployment/users_groups_admin.adoc | 1 - src/docs/asciidoc/dev_env/ui.adoc | 3 +- src/docs/asciidoc/docs/single_page_doc.adoc | 7 +-- .../getting_started/troubleshooting.adoc | 2 - .../reference_doc/card_structure.adoc | 1 - .../reference_doc/response_cards.adoc | 2 +- .../asciidoc/resources/migration_guide.adoc | 4 -- .../asciidoc/resources/mock_pipeline.adoc | 3 +- .../oauth/OAuth2ReactiveConfiguration.java | 3 -- ...thMockOpFabUserSecurityContextFactory.java | 2 - ui/main/src/app/app-routing.module.ts | 1 - ui/main/src/app/common/error/app-error.ts | 1 - .../components/table/admin-table.directive.ts | 2 +- .../services/confirmation-dialog.service.ts | 3 +- .../cards/services/handlebars.service.spec.ts | 1 - .../modules/usercard/usercard.component.ts | 1 - .../services/sound-notification.service.ts | 1 - .../store/actions/authentication.actions.ts | 1 - 33 files changed, 10 insertions(+), 133 deletions(-) delete mode 100644 src/docs/asciidoc/TODO_WIP.adoc diff --git a/CICD/prepare_release_version.sh b/CICD/prepare_release_version.sh index 4a8254a526..15d441aec3 100755 --- a/CICD/prepare_release_version.sh +++ b/CICD/prepare_release_version.sh @@ -62,7 +62,6 @@ find . -name swagger.yaml | xargs sed -i "s/\(version: *\)$oldVersion/\1$newVers # With the current commmand, if the "version" key appears somewhere else in the file it will be affected as well. # That's why oldVersion is part of the pattern, as it is less likely that another version key would appear with the exact same value. # The issue is that if the value has been mistakenly modified and is not $oldVersion, it won't be updated -# TODO Find a better solution or add a check echo "Using $newVersion for lfeoperatorfabric images in dev and docker environment docker-compose files" # String example for regexp: image: "lfeoperatorfabric/of-web-ui:0.13.1.RELEASE" diff --git a/build.gradle b/build.gradle index cba2edaa68..cc55965198 100755 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,6 @@ ext { swagger : "io.swagger:swagger-codegen-cli:${versions['swagger']}", swaggerGeneratorPlugin : "gradle.plugin.org.hidetake:gradle-swagger-generator-plugin:${versions['swagger.generator.plugin']}", swaggerUI : "org.webjars:swagger-ui:${versions['swaggerUI']}", - //TODO Is springFox still used? What for? springfoxSwagger2 : "io.springfox:springfox-swagger2:${versions['springfox']}", springfoxSwaggerUI : "io.springfox:springfox-swagger-ui:${versions['springfox']}" ] diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardCustomRepositoryImpl.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardCustomRepositoryImpl.java index 70533f23dc..f6ed5b850b 100644 --- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardCustomRepositoryImpl.java +++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardCustomRepositoryImpl.java @@ -143,7 +143,6 @@ private Query createQueryFromUserAndParams(Tuple2 regularParametersCriteria(MultiValueMap params) { @@ -161,7 +160,6 @@ private List regularParametersCriteria(MultiValueMap p return criteria; } - //TODO Note in doc that this assumes params to be unique, otherwise will take first occurrence private List publishDateCriteria(MultiValueMap params) { List criteria = new ArrayList<>(); diff --git a/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/TestUtilities.java b/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/TestUtilities.java index 3cfdfb98d1..e0796559a1 100644 --- a/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/TestUtilities.java +++ b/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/TestUtilities.java @@ -291,8 +291,6 @@ public static boolean checkIfContainsAny(List listA, List listB) return false; } - //TODO Method to check if a flux of pages are sorted -// public static CardConsultationData configureRecipientReferencesAndStartDate(CardConsultationData card, String user, Instant startDate, String[] groups, String[] entities) { card.setStartDate(startDate); card.setGroupRecipients(groups != null ? Arrays.asList(groups) : null); diff --git a/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardRepositoryShould.java b/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardRepositoryShould.java index 7242371879..320aa8ff49 100644 --- a/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardRepositoryShould.java +++ b/services/core/cards-consultation/src/test/java/org/lfenergy/operatorfabric/cards/consultation/repositories/ArchivedCardRepositoryShould.java @@ -123,7 +123,7 @@ public static void initUsers() { @BeforeEach private void initCardData() { - //TODO Limit test data to what's really necessary + int processNo = 0; //create past cards persistCard(createSimpleArchivedCard(processNo++, firstPublisher, nowMinusThree, nowMinusTwo, nowMinusOne, login1, new String[]{"rte","operator"}, new String[]{"entity1","entity2"})); @@ -647,6 +647,4 @@ public void fetchArchivedCardsGroupAndEntityRecipientAreAllowedToSee() { } - //TODO Add test to make sure results are ordered between pages - } diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java index db572ae3a4..1a80882130 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java @@ -63,12 +63,6 @@ import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus; - -/** - *

    - *

    - * Created on 30/07/18 - */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = CardPublicationApplication.class) @ActiveProfiles(profiles = {"native", "test"}) @@ -488,7 +482,6 @@ void deleteOneCard_with_card_with_id() { .expectNextMatches(r -> r.intValue()==thereShouldBeOneCardLess).verifyComplete(); } - // FIXME unify way test cards are created throughout tests private List instantiateSeveralRandomCards(EasyRandom randomGenerator, int cardNumber) { List cardsList = randomGenerator.objects(CardPublicationData.class, cardNumber) diff --git a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/model/UserSettingsDataShould.java b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/model/UserSettingsDataShould.java index 87c178495d..05e066b9ce 100644 --- a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/model/UserSettingsDataShould.java +++ b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/model/UserSettingsDataShould.java @@ -22,8 +22,6 @@ public class UserSettingsDataShould { - //TODO Add tests for new settings - @Test public void encapsulateTagSet(){ UserSettingsData userData = UserSettingsData.builder().defaultTag("test1").defaultTag("test2").build(); diff --git a/src/docs/asciidoc/CICD/pipeline_conf.adoc b/src/docs/asciidoc/CICD/pipeline_conf.adoc index 7e0d09c6c4..62ef538e23 100644 --- a/src/docs/asciidoc/CICD/pipeline_conf.adoc +++ b/src/docs/asciidoc/CICD/pipeline_conf.adoc @@ -23,11 +23,6 @@ to the account of any member of the team. == CICD Pipeline -=== GitHub - -Work in progress -//TODO Describe two repos, groups, branch protection rules - === Travis CI We use Travis CI to manage our pipeline. As of today, it is composed of 7 stages: @@ -80,8 +75,6 @@ https://sonarcloud.io/dashboard?id=org.lfenergy.operatorfabric%3Aoperatorfabric- that is not shared with external PRs for security reasons, so this would cause the stage (and the build) to fail. This is why in the case of external PRs the `test` phase is ran instead (leaving out sonar-scanner). -//TODO Finish explanations - === SonarCloud To be allowed to push results to SonarCloud, Travis needs to be authenticated. This is done by generating a token on diff --git a/src/docs/asciidoc/CICD/release_process.adoc b/src/docs/asciidoc/CICD/release_process.adoc index 057d58fb64..df9a80026d 100644 --- a/src/docs/asciidoc/CICD/release_process.adoc +++ b/src/docs/asciidoc/CICD/release_process.adoc @@ -62,7 +62,6 @@ found under *src/docs/asciidoc/docs* in the link:{opfab_core_repo}[operatorfabri . In the link:{opfab_core_repo}[operatorfabric-core repository] release-notes.adoc file, replace the `Version SNAPSHOT` title by `Version X.X.X.RELEASE` -//TODO Make that part of prepare version script . In the link:{jira_release_page}[releases page on JIRA], change the name from "Next Version" to "X.X.X.RELEASE" diff --git a/src/docs/asciidoc/TODO_WIP.adoc b/src/docs/asciidoc/TODO_WIP.adoc deleted file mode 100644 index a396f0e7a5..0000000000 --- a/src/docs/asciidoc/TODO_WIP.adoc +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2018-2020 RTE (http://www.rte-france.com) -// See AUTHORS.txt -// This document is subject to the terms of the Creative Commons Attribution 4.0 International license. -// If a copy of the license was not distributed with this -// file, You can obtain one at https://creativecommons.org/licenses/by/4.0/. -// SPDX-License-Identifier: CC-BY-4.0 - - -// After moving -//TODO Remove unnecessary custom id anchors (script it?) -//TODO Look at todo in documents, create issues -//TODO Document new documentation org, guidelines and pipeline - -//TODO Proofreading -//TODO Test examples to see if they are still accurate -//TODO Check all images -//TODO Add HSA archive doc -//TODO Cross-reference troubleshooting and organize into sections -//TODO Get new roadmap and make it prettier -//TODO Set API properties (URL etc.) in config files -//TODO Add footer with social/contact/github/spectrum icons -//TODO Handle responsive behaviour -//TODO Replace drawio files by svg or png with embedded drawio info - -//TODO Rebase mock website and repo - -//TODO Warning LC local serve KO -//Jekyll Feed: Generating feed for posts -//Conversion error: Jekyll::Converters::Scss encountered an error while converting 'assets/css/style.scss': -//Invalid US-ASCII character "\xE2" on line 5 -//jekyll 3.8.5 | Error: Invalid US-ASCII character "\xE2" on line 5 - -// Optional -//TODO FInd a way to keep navbar (asciidoctor plugin? modifying index.html for swagger UI? customizing asciidoc template?) -// Issue for previous versions? - -//TODO Update asciidoctor plugin (v10) -//TODO Create macro or block so that the special behaviour of inter-doc links for the single page doc doesn't have to be specified everytime -//TODO Add link back to summary (only for html?) -//TODO yml examples: links to github repo, include from github repo, include copies? tradeoff between self-sufficient -//and risk that 1) content is not available at the time of generation 2) content evolves (rather than remaining snapshot -// of what it was for this version) -> not for html -//TODO Organize root content -//TODO Organize images into subfolders -//TODO Replace file copies by includes from code -//TODO Read back notes -//TODO Find a way to share common resources (js, images) between apis -//TODO Test pdf output (images, links) - diff --git a/src/docs/asciidoc/community/index.adoc b/src/docs/asciidoc/community/index.adoc index b52b0bd1cf..8d8c827d1e 100644 --- a/src/docs/asciidoc/community/index.adoc +++ b/src/docs/asciidoc/community/index.adoc @@ -64,8 +64,6 @@ include::workflow.adoc[leveloffset=+2] === Code Guidelines -//TODO add style guidelines - * We don't mention specific authors by name in each file (in Javadoc or in the documentation for example), so as not to have to maintain these mentions (since this information is tracked by git anyway). * For ui code, you must use a linter with rules provided in ui/main/tslint.json @@ -157,7 +155,4 @@ could be interested in: And if you're interested in LF Energy in general: https://lists.lfenergy.org/g/lfenergy[LF Energy General Discussion] -=== JIRA -//TODO OC-887 - include::CODE_OF_CONDUCT.adoc[leveloffset=+1] diff --git a/src/docs/asciidoc/community/workflow.adoc b/src/docs/asciidoc/community/workflow.adoc index 8ff2fba7fc..0417f9afc2 100644 --- a/src/docs/asciidoc/community/workflow.adoc +++ b/src/docs/asciidoc/community/workflow.adoc @@ -10,11 +10,6 @@ = Contribution Workflow -//TODO Make sure everything that is stated is enforced (or log it in an issue) -//TODO Check base branch for PRs -//TODO Limit which branches can be merged into develop or master -//TODO Manage who can merge/push into master, merge into develop, create release branches? - The project started out using a link:https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow[Feature Branch workflow], but as the project team grew and we needed to manage support to previous releases we decided to switch to a workflow @@ -29,12 +24,8 @@ project, which is a parameter for certain build tasks and for our CICD pipeline. == Principles -//TODO Create diagram with all branches - === `develop` branch -//TODO Add main branches image - The role of the `develop` branch is quite similar to that of the `master` branch in our previous "Feature Branch" workflow. @@ -79,8 +70,6 @@ link:https://help.github.com/en/github/collaborating-with-issues-and-pull-reques features (comments, proposed changes, etc.) to make changes to the PR until it meets the project requirements. . Once it is ready to be included in the next version, the pull request is then merged back into `develop`. -//TODO Add feature_branches image - *Naming convention:* Feature branches names should always start with the reference of the JIRA issue they're addressing, optionally followed by additional information if several branches are associated with a given JIRA issue. @@ -98,9 +87,6 @@ Commit messages should also start with the JIRA issue ID between brackets: `[OC- This allows the branch, PR and commits to be directly accessible from the JIRA issue. -//TODO Link to section describing JIRA workflow once it's written -//TODO When should we delete supporting branches? - === Release branches Once developments are in a release-ready state and have been tested on the `develop` branch, a release branch should @@ -131,7 +117,6 @@ Example: The valid branch name for the branch bringing 1.3.0.RELEASE into `maste === Hotfix branches -//TODO Work in progress: detail hotfix branches lifecycle and constraints. *Naming convention:* Hotfix branches names should always start with "HF_" and the reference of the JIRA issue they're @@ -241,7 +226,6 @@ below to make sure your branch meets its criteria. Once you feel your branch is ready, submit a pull request. Open pull requests are then reviewed by the core maintainers to assign a reviewer to each of them. -//TODO Explain process for forks/external PRs To do so, go to the `branches` tab of the repository as described above. Click the "New Pull Request" button for your branch. @@ -392,7 +376,6 @@ Once the pull request meets all the criteria from the above check list, you can image::existing_PR_check_base.png[] . If that is not the case, you can edit the base branch by clicking the `Edit` button in the top right corner. -//TODO Check if in this case the PR build is re-run ? If not conflicts or build issues might go un-detected . Click the `merge pull request` button at the bottom of the PR page diff --git a/src/docs/asciidoc/deployment/configuration/certificates.adoc b/src/docs/asciidoc/deployment/configuration/certificates.adoc index 662daae82e..240f1ca4c7 100644 --- a/src/docs/asciidoc/deployment/configuration/certificates.adoc +++ b/src/docs/asciidoc/deployment/configuration/certificates.adoc @@ -15,7 +15,6 @@ If you're using certificates (for example for Keycloak) that are not from a cert this will cause errors such as this one: image::certificate_error.png[Missing certificate error message] -//TODO Replace by text error message so it comes up in search If that is the case, you can pass the additional authorities or certificates that you use to the containers at runtime. diff --git a/src/docs/asciidoc/deployment/configuration/configuration.adoc b/src/docs/asciidoc/deployment/configuration/configuration.adoc index 6fb2346ba8..24862ee774 100644 --- a/src/docs/asciidoc/deployment/configuration/configuration.adoc +++ b/src/docs/asciidoc/deployment/configuration/configuration.adoc @@ -8,10 +8,9 @@ -:springboot_doc: https://docs.spring.io/spring-boot/docs/2.1.2.RELEASE/ +:springboot_doc: https://docs.spring.io/spring-boot/docs/2.4.0-M1/reference/htmlsingle/ :mongo_doc: https://docs.mongodb.com/manual/reference/ :spring_kafka_doc: https://docs.spring.io/spring-kafka/reference/html/ -//TODO Check if versions are correct = Configuration diff --git a/src/docs/asciidoc/deployment/port_table.adoc b/src/docs/asciidoc/deployment/port_table.adoc index f98cf511b6..d2e542fe72 100644 --- a/src/docs/asciidoc/deployment/port_table.adoc +++ b/src/docs/asciidoc/deployment/port_table.adoc @@ -10,8 +10,6 @@ = Service port table -//TODO Check that it is correct and up to date - By default all service built artifacts are configured with server.port set to 8080 diff --git a/src/docs/asciidoc/deployment/users_groups_admin.adoc b/src/docs/asciidoc/deployment/users_groups_admin.adoc index 9231b3d96e..ceaf20a1f8 100644 --- a/src/docs/asciidoc/deployment/users_groups_admin.adoc +++ b/src/docs/asciidoc/deployment/users_groups_admin.adoc @@ -153,7 +153,6 @@ HTTP/1.1 200 OK === Update user details -//TODO Check if it hasn't been replaced with create As shown by this result, the firstName of the new operator has been misspelled. We need ifdef::single-page-doc[link:../api/users/index.html#/users/updateUser[to update the existing user]] diff --git a/src/docs/asciidoc/dev_env/ui.adoc b/src/docs/asciidoc/dev_env/ui.adoc index eb7cd44f45..2ec6d3dae9 100644 --- a/src/docs/asciidoc/dev_env/ui.adoc +++ b/src/docs/asciidoc/dev_env/ui.adoc @@ -21,13 +21,12 @@ SPA:: stands for *Single Page Application* == Run === Front End development -//TODO Explain that the back needs to be running to be able to test in 4200. Replace steps below by link to appropriate doc OperatorFabric uses 4 external services to run properly : * an event queue: RabbitMQ; * a no SQL database: MongoDB; - * an authentication provider: keycloak; + * an authentication provider: Keycloak; * a web server: Nginx. Those instances are available as docker images in the project. diff --git a/src/docs/asciidoc/docs/single_page_doc.adoc b/src/docs/asciidoc/docs/single_page_doc.adoc index 111fa45f0f..790852d26a 100644 --- a/src/docs/asciidoc/docs/single_page_doc.adoc +++ b/src/docs/asciidoc/docs/single_page_doc.adoc @@ -12,10 +12,10 @@ = OperatorFabric Documentation -include::../architecture/index.adoc[] - include::../getting_started/index.adoc[] +include::../architecture/index.adoc[] + include::../reference_doc/index.adoc[] include::../deployment/index.adoc[] @@ -28,6 +28,3 @@ include::../CICD/index.adoc[] include::../resources/index.adoc[] -//TODO Add introduction and move architecture after getting started? - -//TODO Reorder diff --git a/src/docs/asciidoc/getting_started/troubleshooting.adoc b/src/docs/asciidoc/getting_started/troubleshooting.adoc index 4a18626ca6..298c534aef 100644 --- a/src/docs/asciidoc/getting_started/troubleshooting.adoc +++ b/src/docs/asciidoc/getting_started/troubleshooting.adoc @@ -11,8 +11,6 @@ [[troubleshooting_bundle]] = Troubleshooting -//TODO Merge with other troubleshooting? - == My bundle is not loaded The server send a `+{"status":"BAD_REQUEST","message":"unable to open submitted diff --git a/src/docs/asciidoc/reference_doc/card_structure.adoc b/src/docs/asciidoc/reference_doc/card_structure.adoc index 9d0187834c..ce29befe76 100644 --- a/src/docs/asciidoc/reference_doc/card_structure.adoc +++ b/src/docs/asciidoc/reference_doc/card_structure.adoc @@ -5,7 +5,6 @@ // file, You can obtain one at https://creativecommons.org/licenses/by/4.0/. // SPDX-License-Identifier: CC-BY-4.0 -//TODO Remove unnecessary anchors [[card_structure]] = Card Structure diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index 50db1511c0..b81b8f02af 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -111,7 +111,7 @@ state. .src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars [source,js] ---- -include::../../../test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/question.handlebars[tag=templateGateway.validyForm_example] +include::../../../test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/question.handlebars[tag=templateGateway.validyForm_example] ---- === Define permissions diff --git a/src/docs/asciidoc/resources/migration_guide.adoc b/src/docs/asciidoc/resources/migration_guide.adoc index b7aceb0c5d..7b6eca0f43 100644 --- a/src/docs/asciidoc/resources/migration_guide.adoc +++ b/src/docs/asciidoc/resources/migration_guide.adoc @@ -200,10 +200,6 @@ split them into several bundles. The `id` of the bundles should match the `proce . Run the following scripts in the mongo shell to copy the value of `publisherVersion` to a new `processVersion` field and to copy the value of `processId` to a new `processInstanceId` field for all cards (current and archived): - - - -//TODO Detail steps to mongo shell ? + .Current cards [source, shell] diff --git a/src/docs/asciidoc/resources/mock_pipeline.adoc b/src/docs/asciidoc/resources/mock_pipeline.adoc index 8b3ccfa268..d82a6605a1 100644 --- a/src/docs/asciidoc/resources/mock_pipeline.adoc +++ b/src/docs/asciidoc/resources/mock_pipeline.adoc @@ -16,7 +16,8 @@ master branch, to our docker images or to the documentation. We didn't find any we decided to create a complete mock pipeline replicating the actual pipeline. This is a short summary of the necessary steps. -//TODO Check if this is still accurate after the migration to travis-ci.com (OC-1110) +IMPORTANT: This document reflects the steps to create the pipeline on travis-ci.org and might not be completely +accurate now that we've migrated to travis-ci.com. == GitHub . Create organization opfab-mock diff --git a/tools/spring/spring-oauth2-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/oauth/OAuth2ReactiveConfiguration.java b/tools/spring/spring-oauth2-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/oauth/OAuth2ReactiveConfiguration.java index 7c482ede19..27683feb4c 100644 --- a/tools/spring/spring-oauth2-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/oauth/OAuth2ReactiveConfiguration.java +++ b/tools/spring/spring-oauth2-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/oauth/OAuth2ReactiveConfiguration.java @@ -24,9 +24,6 @@ /** *

    Authentication configuration for webflux

    * - * FIXME probably useless since Spring security 5.1.1. Check it. - * - * */ @Configuration public class OAuth2ReactiveConfiguration extends OAuth2GenericConfiguration{ diff --git a/tools/spring/spring-test-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/test/WithMockOpFabUserSecurityContextFactory.java b/tools/spring/spring-test-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/test/WithMockOpFabUserSecurityContextFactory.java index 220b4bcdf7..4e54ffec5a 100644 --- a/tools/spring/spring-test-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/test/WithMockOpFabUserSecurityContextFactory.java +++ b/tools/spring/spring-test-utilities/src/main/java/org/lfenergy/operatorfabric/springtools/configuration/test/WithMockOpFabUserSecurityContextFactory.java @@ -45,8 +45,6 @@ public SecurityContext createSecurityContext(WithMockOpFabUser customUser) { Arrays.asList(customUser.roles()), customUser.entities() != null ? Arrays.asList(customUser.entities()) : null); - //Authentication auth = new UsernamePasswordAuthenticationToken(principal, "password", principal.getAuthorities()); - //TODO do the same for User service if proven useful String tokenValue = "dummyTokenValue"; Instant issuedAt = Instant.now(); Instant expiresAt = Instant.now().plus(365, ChronoUnit.DAYS); diff --git a/ui/main/src/app/app-routing.module.ts b/ui/main/src/app/app-routing.module.ts index 145580ef9b..789e205915 100644 --- a/ui/main/src/app/app-routing.module.ts +++ b/ui/main/src/app/app-routing.module.ts @@ -64,7 +64,6 @@ const routes: Routes = [ redirectTo: defaultPath } ]; -// TODO manage visible path more gently const startIndex = 0; const numberOfHiddenRoutes = 6 ; // 'Calendar' 'businessconfigparty', 'settings', 'navbar', 'admin', 'feedconfiguration' const manageIndexesWhichBeginAtZero = 1; diff --git a/ui/main/src/app/common/error/app-error.ts b/ui/main/src/app/common/error/app-error.ts index 3dd7422960..cabaecfe1d 100644 --- a/ui/main/src/app/common/error/app-error.ts +++ b/ui/main/src/app/common/error/app-error.ts @@ -8,7 +8,6 @@ * This file is part of the OperatorFabric project. */ -// TODO I'm not sure why this class is necessary. What does new AppError(null) mean?? export class AppError { public originalError; diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts index 148d1e3c45..bbbda488f2 100644 --- a/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts +++ b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts @@ -195,7 +195,7 @@ export abstract class AdminTableDirective implements OnInit, OnDestroy { this.confirmationDialogService.confirm( this.translateService.instant('admin.input.confirm'), this.translateService.instant('admin.input.' + this.tableType + '.confirmDelete') + ' ' + row[this.idField] + '?', - 'OK', // TODO Refactor to avoid translate.instant ? OK is not i18ed ? + 'OK', this.translateService.instant('admin.input.cancel') ).then((confirmed) => { if (confirmed) { diff --git a/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts b/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts index c35533a9fe..b70949655e 100644 --- a/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts +++ b/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts @@ -17,14 +17,13 @@ import {ConfirmationDialogComponent} from '../components/confirmation-dialog/con providedIn: 'root' }) export class ConfirmationDialogService { - // TODO Is it really necessary ? Couldn't that be handled by the confirmation-dialog-component as it doesn't seem reusable ? constructor(private modalService: NgbModal) { } public confirm( title: string, message: string, - btnOkText: string = 'OK', // TODO I18N ? + btnOkText: string = 'OK', btnCancelText: string = 'Cancel'): Promise { const modalRef = this.modalService.open(ConfirmationDialogComponent); modalRef.componentInstance.title = title; diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts index 6cf961150a..9cefc87898 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts @@ -29,7 +29,6 @@ import {DetailContext} from '@ofModel/detail-context.model'; function computeTemplateUri(templateName) { return `${environment.urls.processes}/testProcess/templates/${templateName}`; - // TODO OC-1009 Why is the pprocess hardcoded? It needs to match the one set by default in getOneRandomCard. } describe('Handlebars Services', () => { diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index fb244ef118..c4baeb5d8a 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -507,7 +507,6 @@ export class UserCardComponent implements OnDestroy, OnInit { .subscribe( resp => { const msg = resp.message; - // TODO better way to handle perimeter errors if (!!msg && msg.includes('unable')) { console.log('Impossible to send card , error message from service : ', msg); this.displayMessage('userCard.error.impossibleToSendCard', null, MessageLevel.ERROR); diff --git a/ui/main/src/app/services/sound-notification.service.ts b/ui/main/src/app/services/sound-notification.service.ts index 69590e27d2..c3601fd872 100644 --- a/ui/main/src/app/services/sound-notification.service.ts +++ b/ui/main/src/app/services/sound-notification.service.ts @@ -63,7 +63,6 @@ export class SoundNotificationService { handleCards(lightCards: LightCard[], currentlyVisibleIds: string[]) { from(lightCards).subscribe( // There is no need to unsubscribe because this is by essence a finite observable - // TODO Possible improvement: all cards in an operation have the same publishDate (to be checked) // so we could do this check only once by operation and either handle all cards or dismiss the batch entirely (card: LightCard) => { // Check whether card has just been published and whether it is currently visible in the feed diff --git a/ui/main/src/app/store/actions/authentication.actions.ts b/ui/main/src/app/store/actions/authentication.actions.ts index a1f25d97bc..ad4d11790f 100644 --- a/ui/main/src/app/store/actions/authentication.actions.ts +++ b/ui/main/src/app/store/actions/authentication.actions.ts @@ -23,7 +23,6 @@ export enum AuthenticationActionTypes { , AcceptLogOutSuccess = '[Authentication] Success Accept the user log out attempt' , CheckImplicitFlowAuthenticationStatus = '[Authentication] Check Authentication Status specifically for the Implicit Flow' , UselessAuthAction = '[Authentication] Test purpose action' - // TODO the following actions should be merge with password and code flow management of authentication , ImplicitlyAuthenticated = '[Authentication] User is authentication using Implicit Flow' , UnAuthenticationFromImplicitFlow = '[Authentication] User is log out by implicit Flow internal management' , UnableToRefreshOrGetToken = '[Authentication] The token can not be refresh or we cannot get a token' From 0f9034ce3755ed5f9021696c2f9f5ab8acd921f5 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 8 Mar 2021 13:21:36 +0100 Subject: [PATCH 33/45] [OC-1529] Show card entity publisher on feed and card detail Signed-off-by: freddidierRTE --- .../modules/archives/archives.component.html | 10 +++++-- .../modules/archives/archives.component.ts | 21 ++++++++++---- .../components/detail/detail.component.html | 10 +++++-- .../components/detail/detail.component.ts | 28 ++++++++++--------- .../light-card/light-card.component.html | 8 +++++- .../share/light-card/light-card.component.ts | 12 +++++++- .../modules/usercard/usercard.component.ts | 1 + ui/main/src/assets/i18n/en.json | 4 ++- ui/main/src/assets/i18n/fr.json | 4 ++- 9 files changed, 72 insertions(+), 26 deletions(-) diff --git a/ui/main/src/app/modules/archives/archives.component.html b/ui/main/src/app/modules/archives/archives.component.html index 2032fc9ebd..41db8c405f 100644 --- a/ui/main/src/app/modules/archives/archives.component.html +++ b/ui/main/src/app/modules/archives/archives.component.html @@ -110,8 +110,14 @@
    - feed.received - + + feed.received + {{getFormattedPublishDate()}} feed.at {{getFormattedPublishTime()}} + + feed.from + {{fromEntitySelectedCard}} + +
    diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts index a9b68caeb6..4d8f52e07c 100644 --- a/ui/main/src/app/modules/archives/archives.component.ts +++ b/ui/main/src/app/modules/archives/archives.component.ts @@ -25,6 +25,7 @@ import {ExportService} from '@ofServices/export.service'; import {TranslateService} from '@ngx-translate/core'; import {Card} from '@ofModel/card.model'; import {ArchivesLoggingFiltersComponent} from '../share/archives-logging-filters/archives-logging-filters.component'; +import { EntitiesService } from '@ofServices/entities.service'; @Component({ @@ -51,6 +52,7 @@ export class ArchivesComponent implements OnDestroy, OnInit { @ViewChild('cardDetail') cardDetailTemplate: ElementRef; @ViewChild('filters') filtersTemplate: ArchivesLoggingFiltersComponent; selectedCard: Card; + fromEntitySelectedCard = null; constructor(private store: Store, private processesService: ProcessesService, @@ -58,7 +60,8 @@ export class ArchivesComponent implements OnDestroy, OnInit { private timeService: TimeService, private cardService: CardService, private translate: TranslateService, - private modalService: NgbModal + private modalService: NgbModal, + private entitiesService: EntitiesService ) { this.archiveForm = new FormGroup({ @@ -181,17 +184,25 @@ export class ArchivesComponent implements OnDestroy, OnInit { const options: NgbModalOptions = { size: 'fullscreen' }; + this.computeFromEntity(); this.modalRef = this.modalService.open(this.cardDetailTemplate, options); } ); } - getPublishDateTranslationParams(): any { - return { - 'time': this.timeService.formatDateTime(this.selectedCard.publishDate) - }; + private computeFromEntity() + { + if (this.selectedCard.publisherType === 'ENTITY' ) this.fromEntitySelectedCard = this.entitiesService.getEntityName(this.selectedCard.publisher); + else this.fromEntitySelectedCard = null; } + getFormattedPublishDate(): any { + return this.timeService.formatDate(this.selectedCard.publishDate) + } + + getFormattedPublishTime(): any { + return this.timeService.formatTime(this.selectedCard.publishDate) + } ngOnDestroy() { this.unsubscribe$.next(); this.unsubscribe$.complete(); diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index 16f0fbbcd3..f75c02d715 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -97,8 +97,14 @@
    - feed.received + + feed.received + {{getFormattedPublishDate()}} feed.at {{getFormattedPublishTime()}} + + feed.from + {{fromEntity}} + +
    -

    {{i18nPrefix + lightCard.title.key}}

    +

    + {{i18nPrefix + lightCard.title.key}} + + feed.from + {{fromEntity}} + +

    diff --git a/ui/main/src/app/modules/share/light-card/light-card.component.ts b/ui/main/src/app/modules/share/light-card/light-card.component.ts index 2e6288d049..9aa0b210e4 100644 --- a/ui/main/src/app/modules/share/light-card/light-card.component.ts +++ b/ui/main/src/app/modules/share/light-card/light-card.component.ts @@ -20,6 +20,7 @@ import { Subject } from 'rxjs'; import { ConfigService } from '@ofServices/config.service'; import { AppService, PageType } from '@ofServices/app.service'; import { TranslateService } from '@ngx-translate/core'; +import { EntitiesService } from '@ofServices/entities.service'; @Component({ selector: 'of-light-card', @@ -35,6 +36,7 @@ export class LightCardComponent implements OnInit, OnDestroy { protected _i18nPrefix: string; cardTitle: string; dateToDisplay: string; + fromEntity = null; private ngUnsubscribe: Subject = new Subject(); @@ -45,7 +47,8 @@ export class LightCardComponent implements OnInit, OnDestroy { private time: TimeService, private configService: ConfigService, private _appService: AppService, - protected translate: TranslateService + private entitiesService: EntitiesService, + protected translate: TranslateService, ) { } @@ -60,9 +63,16 @@ export class LightCardComponent implements OnInit, OnDestroy { this.currentPath = urlParts[1]; } }); + this.computeFromEntity(); this.computeDisplayedDate(); } + computeFromEntity() + { + if (this.lightCard.publisherType === 'ENTITY' ) this.fromEntity = this.entitiesService.getEntityName(this.lightCard.publisher); + else this.fromEntity = null; + } + computeDisplayedDate() { switch (this.configService.getConfigValue('feed.card.time.display', 'BUSINESS')) { case 'NONE': diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 8e7dec55ba..c61249e136 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -458,6 +458,7 @@ export class UserCardComponent implements OnDestroy, OnInit { id: 'dummyId', publishDate: null, publisher: publisher, + publisherType : 'ENTITY', processVersion: processVersion, process: selectedProcess.id, processInstanceId: processInstanceId, diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 8eea6e8f3d..c710dd0743 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -89,7 +89,9 @@ "acknowledged": "Acknowledged", "lttd": "Time remaining to decide" }, - "received": "Received at {{time}}" + "received": "Received on", + "at": "at", + "from" : "from" }, "login": { "reset": "Reset", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index 8afa243f5a..098eef5868 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -89,7 +89,9 @@ "acknowledged": "Acquittée", "lttd": "Temps restant pour décider" }, - "received": "Reçu à {{time}}" + "received": "Reçu le", + "at" : "à", + "from": "de" }, "login": { "reset": "RaZ", From 2ef8cec168b8ccbdc0b43519463fe729d60bf219 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 11 Mar 2021 10:43:36 +0100 Subject: [PATCH 34/45] [OC-1528] Update screenshot for getting started documentation Signed-off-by: freddidierRTE --- src/docs/asciidoc/images/example4.png | Bin 113702 -> 87522 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/docs/asciidoc/images/example4.png b/src/docs/asciidoc/images/example4.png index 949303567344e58646650a0b2f9151df36cf83cd..f0e06bf5b5e43918ccb525ac29b518495eb22f66 100644 GIT binary patch literal 87522 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 VcOL)8tu4#>o(TN5>6;5b{}*9rOWXhe literal 113702 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%0AE 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 From 700311c24e03adef96ffd4c988807bbdbf9634ac Mon Sep 17 00:00:00 2001 From: Gerben Danen Date: Thu, 11 Mar 2021 14:14:08 +0100 Subject: [PATCH 35/45] [OC-1473] Updated dockerimages for MongoDB and Keycloak. Updated mongodb from 4.1.1 to 4.4.4. Updated Keycloak from 6.0.1 to 12.0.2 Signed-off-by: Gerben Danen --- config/dev/docker-compose.yml | 4 ++-- config/docker/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/dev/docker-compose.yml b/config/dev/docker-compose.yml index 9b614a7448..a7ee8cc3a2 100755 --- a/config/dev/docker-compose.yml +++ b/config/dev/docker-compose.yml @@ -14,8 +14,8 @@ services: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: password keycloak: - image: jboss/keycloak:6.0.1 - command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export + image: jboss/keycloak:12.0.2 + command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export -Dkeycloak.profile.feature.upload_scripts=enabled environment: - KEYCLOAK_USER=admin - KEYCLOAK_PASSWORD=admin diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml index 92b6588e47..0d41b35aac 100755 --- a/config/docker/docker-compose.yml +++ b/config/docker/docker-compose.yml @@ -14,8 +14,8 @@ services: # - "5672:5672" # - "15672:15672" keycloak: - image: jboss/keycloak:6.0.1 - command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export + image: jboss/keycloak:12.0.2 + command: -Dkeycloak.migration.action=import -Dkeycloak.migration.provider=dir -Dkeycloak.migration.dir=/keycloak/export -Dkeycloak.profile.feature.upload_scripts=enabled environment: - KEYCLOAK_USER=admin - KEYCLOAK_PASSWORD=admin From e5d694eade2829c36967cccc4f7085226b9dbc3b Mon Sep 17 00:00:00 2001 From: vlo-rte Date: Tue, 2 Mar 2021 16:58:18 +0100 Subject: [PATCH 36/45] [OC-1441] New monitoring screen --- .../bundle_defaultProcess/config.json | 21 +- .../bundle_userCardExamples/config.json | 6 +- .../bundle_userCardExamples2/config.json | 6 +- .../bundle_userCardExamples3/config.json | 3 +- .../model/line-of-monitoring-result.model.ts | 5 +- ui/main/src/app/model/processes.model.ts | 9 +- .../modules/archives/archives.component.html | 4 +- .../modules/archives/archives.component.ts | 8 +- .../init-chart/init-chart.component.html | 53 +-- .../init-chart/init-chart.component.scss | 66 ---- .../init-chart/init-chart.component.spec.ts | 133 +++---- .../init-chart/init-chart.component.ts | 284 +-------------- .../time-line/time-line.component.html | 4 +- .../time-line/time-line.component.ts | 60 +--- ui/main/src/app/modules/feed/feed.module.ts | 6 +- .../logging-filters.component.ts | 2 +- .../logging-table.component.html | 4 +- .../logging-table/logging-table.component.ts | 12 +- .../modules/logging/logging.component.html | 2 +- .../monitoring-filters.component.html | 110 ++---- .../monitoring-filters.component.scss | 50 --- .../monitoring-filters.component.ts | 300 ++++++++-------- .../monitoring-table.component.html | 6 +- .../monitoring-table.component.ts | 44 ++- .../monitoring/monitoring.component.html | 6 +- .../monitoring/monitoring.component.ts | 23 +- .../modules/monitoring/monitoring.module.ts | 23 +- .../archives-logging-filters.component.html | 20 +- .../archives-logging-filters.component.ts | 105 +++--- .../timeline-buttons.component.html | 34 ++ .../timeline-buttons.component.scss | 76 ++++ .../timeline-buttons.component.ts | 338 ++++++++++++++++++ .../timeline-buttons.module.ts | 31 ++ .../modules/usercard/usercard.component.html | 14 +- .../modules/usercard/usercard.component.ts | 70 ++-- ui/main/src/app/services/filter.service.ts | 21 +- ui/main/src/app/services/processes.service.ts | 57 ++- ui/main/src/assets/i18n/en.json | 27 +- ui/main/src/assets/i18n/fr.json | 25 +- 39 files changed, 1080 insertions(+), 988 deletions(-) create mode 100644 ui/main/src/app/modules/share/timeline-buttons/timeline-buttons.component.html create mode 100644 ui/main/src/app/modules/share/timeline-buttons/timeline-buttons.component.scss create mode 100644 ui/main/src/app/modules/share/timeline-buttons/timeline-buttons.component.ts create mode 100644 ui/main/src/app/modules/share/timeline-buttons/timeline-buttons.module.ts diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json index f475c83e96..b7800bcb8b 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json @@ -19,7 +19,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" }, "chartState": { "name": "chartDetail.title", @@ -29,7 +30,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "FINISHED" }, "chartLineState": { "name": "chartLine.title", @@ -39,7 +41,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "CANCELED" }, "processState": { "name": "process.label", @@ -52,7 +55,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" }, "contingenciesState": { "name": "contingencies.title", @@ -62,7 +66,8 @@ "styles": [ "contingencies" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" }, "questionState": { "name": "questionState.title", @@ -80,7 +85,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser" + "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser", + "type" : "INPROGRESS" }, "multipleOptionsResponseState": { "name": "multipleOptionsResponseState.title", @@ -97,7 +103,8 @@ "styles": [ "style" ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" } } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json index 20ae8aa492..b0e325789b 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json @@ -16,7 +16,8 @@ }, "templateName": "conference", "styles": [], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" }, "incidentInProgressState": { "name": "incidentInProgress.name", @@ -32,7 +33,8 @@ }, "templateName": "incidentInProgress", "styles": [], - "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser" + "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser", + "type" : "INPROGRESS" } } } \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json index 2d521ddf1f..2c1020d808 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json @@ -16,7 +16,8 @@ }, "templateName": "message", "styles": [], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" }, "questionState": { "name": "question.title", @@ -33,7 +34,8 @@ }, "templateName": "question", "styles": [], - "acknowledgmentAllowed": "Never" + "acknowledgmentAllowed": "Never", + "type" : "INPROGRESS" } } } \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json index 792e8e1f83..63121f504f 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json @@ -17,7 +17,8 @@ "templateName": "task", "styles": [ ], - "acknowledgmentAllowed": "Always" + "acknowledgmentAllowed": "Always", + "type" : "INPROGRESS" } } } \ No newline at end of file diff --git a/ui/main/src/app/model/line-of-monitoring-result.model.ts b/ui/main/src/app/model/line-of-monitoring-result.model.ts index ec9242d221..c680044155 100644 --- a/ui/main/src/app/model/line-of-monitoring-result.model.ts +++ b/ui/main/src/app/model/line-of-monitoring-result.model.ts @@ -9,6 +9,7 @@ import {Moment} from 'moment-timezone'; import {I18n} from '@ofModel/i18n.model'; +import {TypeOfStateEnum} from "@ofModel/processes.model"; export interface LineOfMonitoringResult { creationDateTime: Moment; @@ -17,8 +18,8 @@ export interface LineOfMonitoringResult { title: I18n; summary: I18n; processName: string; - coordinationStatus: string; - coordinationStatusColor: string; cardId: string; severity: string; + processId: string; + typeOfState: TypeOfStateEnum } diff --git a/ui/main/src/app/model/processes.model.ts b/ui/main/src/app/model/processes.model.ts index 620d989149..be83b7213f 100644 --- a/ui/main/src/app/model/processes.model.ts +++ b/ui/main/src/app/model/processes.model.ts @@ -55,7 +55,8 @@ export class State { readonly color?: string, readonly userCard?: UserCard, readonly description?: string, - readonly showDetailCardHeader?: boolean + readonly showDetailCardHeader?: boolean, + readonly type?: TypeOfStateEnum ) { } } @@ -88,6 +89,12 @@ export enum AcknowledgmentAllowedEnum { ONLY_WHEN_RESPONSE_DISABLED_FOR_USER = 'OnlyWhenResponseDisabledForUser' } +export enum TypeOfStateEnum { + INPROGRESS = 'INPROGRESS', + FINISHED = 'FINISHED', + CANCELED = 'CANCELED' +} + export enum InputType { TEXT, LIST, diff --git a/ui/main/src/app/modules/archives/archives.component.html b/ui/main/src/app/modules/archives/archives.component.html index 2032fc9ebd..486159ad90 100644 --- a/ui/main/src/app/modules/archives/archives.component.html +++ b/ui/main/src/app/modules/archives/archives.component.html @@ -59,7 +59,7 @@ archive.result.businessPeriod archive.result.title archive.result.summary - archive.result.service + archive.result.processGroup @@ -73,7 +73,7 @@ {{ card.process + '.' + card.processVersion + '.' + card.summary.key}} - {{ filtersTemplate.findServiceLabelForProcess(card.process) }} + {{ processesService.findProcessGroupLabelForProcess(card.process) }}
    diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts index a9b68caeb6..0bba88e52f 100644 --- a/ui/main/src/app/modules/archives/archives.component.ts +++ b/ui/main/src/app/modules/archives/archives.component.ts @@ -65,7 +65,7 @@ export class ArchivesComponent implements OnDestroy, OnInit { tags: new FormControl([]), state: new FormControl([]), process: new FormControl([]), - service: new FormControl([]), + processGroup: new FormControl([]), publishDateFrom: new FormControl(), publishDateTo: new FormControl(''), activeFrom: new FormControl(''), @@ -132,19 +132,19 @@ export class ArchivesComponent implements OnDestroy, OnInit { const businessDateColumnName = this.translateColumn('archive.result.businessPeriod'); const titleColumnName = this.translateColumn('archive.result.title'); const summaryColumnName = this.translateColumn('archive.result.summary'); - const serviceColumnName = this.translateColumn('archive.result.service'); + const processGroupColumnName = this.translateColumn('archive.result.processGroup'); lines.forEach((card: LightCard) => { if (typeof card !== undefined) { // TO DO translation for old process should be done , but loading local arrive to late , solution to find - if (this.filtersTemplate.displayServiceFilter()) + if (this.filtersTemplate.displayProcessGroupFilter()) exportArchiveData.push({ [severityColumnName]: card.severity, [publishDateColumnName]: this.timeService.formatDateTime(card.publishDate), [businessDateColumnName]: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate), [titleColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters), [summaryColumnName]: this.translateColumn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters), - [serviceColumnName]: this.translateColumn(this.filtersTemplate.findServiceLabelForProcess(card.process)) + [processGroupColumnName]: this.translateColumn(this.processesService.findProcessGroupLabelForProcess(card.process)) }); else exportArchiveData.push({ diff --git a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.html b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.html index ef0e66aefc..85fba54309 100644 --- a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.html +++ b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.html @@ -1,4 +1,4 @@ - + @@ -8,41 +8,15 @@
    -
    -
    - - timeline.businessPeriod : {{startDate}} -- {{endDate}} - -
    -     +
    + +
    - - -
    +
    - << + <<
    - +
    - + >>
    @@ -68,10 +43,10 @@
    -