From dab85fa3d4f83461f0d8d75466f0df96a1665570 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Fri, 29 Jan 2021 17:28:35 +0100
Subject: [PATCH 01/62] [OC-1361] Remove old notification feature via the
 browser

---
 .../configuration/web-ui_configuration.adoc   |  1 -
 .../src/app/modules/feed/feed.component.ts    |  8 +---
 ui/main/src/app/services/card.service.ts      |  3 --
 .../src/app/services/notify.service.spec.ts   | 39 -------------------
 ui/main/src/app/services/notify.service.ts    | 37 ------------------
 ui/main/src/app/services/services.module.ts   |  2 -
 6 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 ui/main/src/app/services/notify.service.spec.ts
 delete mode 100644 ui/main/src/app/services/notify.service.ts

diff --git a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
index cb5edd25e0..faa04cd702 100644
--- a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
+++ b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
@@ -78,7 +78,6 @@ a|card time display mode in the feed. Values :
 |feed.card.secondsBeforeLttdForClockDisplay|180|no| Number of seconds before lttd when a clock is activated in cards on the feed 
 
 |feed.timeline.domains|["TR", "J", "7D", "W", "M", "Y"]|no| List of domains to show on the timeline, possible domains are : "TR", "J", "7D", "W", "M", "Y".
-|feed.notify|false|no|If set to true, new cards are notified in the OS through web-push notifications
 |feedConfiguration.hidden|false|no|Control if you want to show or hide the notification configuration screen
 |playSoundForAlarm|false|no|If set to true, a sound is played when Alarm cards are added or updated in the feed
 |playSoundForAction|false|no|If set to true, a sound is played when Action cards are added or updated in the feed
diff --git a/ui/main/src/app/modules/feed/feed.component.ts b/ui/main/src/app/modules/feed/feed.component.ts
index a3430245ef..93fcd6c599 100644
--- a/ui/main/src/app/modules/feed/feed.component.ts
+++ b/ui/main/src/app/modules/feed/feed.component.ts
@@ -17,7 +17,6 @@ import {LightCard} from '@ofModel/light-card.model';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
 import {catchError, map, delay} from 'rxjs/operators';
 import * as moment from 'moment';
-import { NotifyService } from '@ofServices/notify.service';
 import { ConfigService} from '@ofServices/config.service';
 import { ApplyFilter } from '@ofStore/actions/feed.actions';
 import {BUSINESS_DATE_FILTER_INITIALISATION, FilterType} from '@ofServices/filter.service';
@@ -33,7 +32,7 @@ export class FeedComponent implements OnInit {
     selection$: Observable<string>;
     hideTimeLine: boolean;
 
-    constructor(private store: Store<AppState>, private notifyService: NotifyService, private  configService: ConfigService) {
+    constructor(private store: Store<AppState>, private  configService: ConfigService) {
     }
 
     ngOnInit() {
@@ -52,11 +51,6 @@ export class FeedComponent implements OnInit {
             dow: 6, // First day of week is Saturday
             doy: 12 // First week of year must contain 1 January (7 + 6 - 1)
         }});
-
-        if (this.configService.getConfigValue('feed.notify', false)) {
-            this.notifyService.requestPermission();
-        }
-
     }
 
     // if timeline is present , the filter is initialize by the timeline
diff --git a/ui/main/src/app/services/card.service.ts b/ui/main/src/app/services/card.service.ts
index 12f49b739a..7b00bc9e24 100644
--- a/ui/main/src/app/services/card.service.ts
+++ b/ui/main/src/app/services/card.service.ts
@@ -19,7 +19,6 @@ import {environment} from '@env/environment';
 import {GuidService} from '@ofServices/guid.service';
 import {LightCard, PublisherType} from '@ofModel/light-card.model';
 import {Page} from '@ofModel/page.model';
-import {NotifyService} from '@ofServices/notify.service';
 import {AppState} from '@ofStore/index';
 import {Store} from '@ngrx/store';
 import {CardSubscriptionClosed, CardSubscriptionOpen} from '@ofActions/cards-subscription.actions';
@@ -57,7 +56,6 @@ export class CardService {
 
 
     constructor(private httpClient: HttpClient,
-                private notifyService: NotifyService,
                 private guidService: GuidService,
                 private store: Store<AppState>,
                 private authService: AuthenticationService,
@@ -119,7 +117,6 @@ export class CardService {
         return Observable.create(observer => {
             try {
                 eventSource.onmessage = message => {
-                    this.notifyService.createNotification(`New cards are being pushed`);
                     if (!message) {
                         return observer.error(message);
                     }
diff --git a/ui/main/src/app/services/notify.service.spec.ts b/ui/main/src/app/services/notify.service.spec.ts
deleted file mode 100644
index 118a5b965e..0000000000
--- a/ui/main/src/app/services/notify.service.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (c) 2018-2020, 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 { NotifyService } from './notify.service';
-import { TestBed } from '@angular/core/testing';
-
-describe('NotifyService', () => {
-
-    let mockWindow: any;
-    let mockNotification: any;
-    let notifyService: any;
-    beforeEach(() => {
-
-        mockNotification = function (title, options) {
-            this.title = title;
-            this.options = options;
-            this.requestPermission = jasmine.createSpy();
-        };
-        TestBed.configureTestingModule({
-            providers: [NotifyService]
-        });
-        mockWindow = {
-            Notification: new mockNotification('test', {}),
-            document: {hidden: true}
-        };
-        notifyService = TestBed.get(NotifyService);
-    });
-    it('should check if notification are supported', () => {
-        expect(notifyService.isSupported(mockWindow)).toBeTruthy();
-    });
-
-});
diff --git a/ui/main/src/app/services/notify.service.ts b/ui/main/src/app/services/notify.service.ts
deleted file mode 100644
index eed394b750..0000000000
--- a/ui/main/src/app/services/notify.service.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (c) 2018-2020, 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 {Injectable} from '@angular/core';
-
-@Injectable()
-export class NotifyService {
-
-    permission: string;
-    constructor() {
-    }
-
-    isSupported(window): boolean {
-        return 'Notification' in window;
-    }
-    requestPermission(): void {
-        if (this.isSupported(window)) {
-            Notification.requestPermission(status => {
-                this.permission = status;
-            });
-        }
-    }
-
-    createNotification(title: string) {
-        if (this.isSupported(window) && this.permission === 'granted') {
-            return new Notification(title);
-        }
-    }
-}
diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts
index d48a3559d5..9fa3cc8e72 100644
--- a/ui/main/src/app/services/services.module.ts
+++ b/ui/main/src/app/services/services.module.ts
@@ -23,7 +23,6 @@ import {ConfigService} from '@ofServices/config.service';
 import {I18nService} from '@ofServices/i18n.service';
 import {SettingsService} from '@ofServices/settings.service';
 import { UserService } from './user.service';
-import { NotifyService } from '@ofServices/notify.service';
 import {SoundNotificationService} from '@ofServices/sound-notification.service';
 import {GlobalStyleService} from '@ofServices/global-style.service';
 import { AppService } from './app.service';
@@ -56,7 +55,6 @@ import { ReminderService} from '@ofServices/reminder/reminder.service';
         UserService,
         GroupsService,
         EntitiesService,
-        NotifyService,
         SoundNotificationService,
         GlobalStyleService,
         AppService,

From c25e95dadb705267d39db5ce673c1552b26489d4 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 1 Feb 2021 16:10:20 +0100
Subject: [PATCH 02/62] [OC-1427] Minor updates to release process doc

---
 src/docs/asciidoc/CICD/release_process.adoc | 8 ++++----
 src/docs/asciidoc/resources/index.adoc      | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/CICD/release_process.adoc b/src/docs/asciidoc/CICD/release_process.adoc
index ccea79f8c4..057d58fb64 100644
--- a/src/docs/asciidoc/CICD/release_process.adoc
+++ b/src/docs/asciidoc/CICD/release_process.adoc
@@ -132,7 +132,7 @@ git merge X.X.X.release <3>
 ----
 <1> Check out the `master` branch
 <2> Make sure your local copy is up to date
-<3> Merge the `X.X.X.release` branch into `master`
+<3> Merge the `X.X.X.release` branch into `master`, accepting changes from X.X.X.release in case of conflicts.
 
 IMPORTANT: If you also want the new docker images to be tagged `latest` (as should be the case for most release
 versions), you should add the keyword `ci_latest` to the merge commit message.
@@ -176,7 +176,7 @@ branch they should rely on the latest RELEASE version available on DockerHub. On
 previous steps has completed successfully, and you can see X.X.X.RELEASE images for all services on DockerHub, you should:
 
 . Remove your locally built X.X.X.RELEASE images if any
-. Run the config/demo docker-compose file to make sure it pulls the images from DockerHub and behaves as intended.
+. Run the config/docker docker-compose file to make sure it pulls the images from DockerHub and behaves as intended.
 
 People who want to experiment with OperatorFabric are pointed to this docker-compose so it's important to make sure
 that it's working correctly.
@@ -214,7 +214,7 @@ avoid confusion with the actual release commit tagged on `master`.
 
 ----
 git branch -d X.X.X.release <1>
-​git push origin --delete X.X.X.release <2>
 ----
 <1> Delete the branch locally
-<2> Remove it from GitHub
+
+NOTE: The branch will automatically be deleted from GitHub after it is merged (new repository policy).
diff --git a/src/docs/asciidoc/resources/index.adoc b/src/docs/asciidoc/resources/index.adoc
index 9b76de2b5a..041ec9f92f 100644
--- a/src/docs/asciidoc/resources/index.adoc
+++ b/src/docs/asciidoc/resources/index.adoc
@@ -15,3 +15,5 @@ include::mock_pipeline.adoc[leveloffset=+1]
 include::migration_guide.adoc[leveloffset=+1]
 
 include::migration_guide_to_1.8.adoc[leveloffset=+1]
+
+include::migration_guide_to_2.0.adoc[leveloffset=+1]

From 6099604a3246f1f98a2ab53df7c233d425d8b9d2 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Mon, 1 Feb 2021 16:37:48 +0100
Subject: [PATCH 03/62] [OC-1354] Fix error in console when using multi-select
 component

---
 .../app/modules/share/multi-filter/multi-filter.component.html | 1 -
 .../app/modules/share/multi-filter/multi-filter.component.ts   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.html b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.html
index 33fa328218..75115e91ad 100644
--- a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.html
+++ b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.html
@@ -13,7 +13,6 @@
             
             <angular2-multiselect 
                                   [data]="dropdownList"
-                                  [(ngModel)]="selection"
                                   [settings]="dropdownSettings"
                                   (onDeSelectAll)="onDeSelectAll($event)"
                                   formControlName="{{filterPath}}"
diff --git a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
index 788a163fab..2115262f76 100644
--- a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
+++ b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
@@ -62,6 +62,8 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
             });
 
         }
+        this.parentForm.get(this.filterPath).setValue(this.selection);
+
         this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
             this.translateService.use(locale);
             this.translateService.get(['multiFilter.searchPlaceholderText','multiFilter.selectAllText', 'multiFilter.unSelectAllText', 'multiFilter.filterSelectAllText', 'multiFilter.filterUnSelectAllText'])
@@ -80,6 +82,7 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
 
     onDeSelectAll(items: any) {
         this.selection = [];
+        this.parentForm.get(this.filterPath).setValue(this.selection);
     }
 
     ngOnChanges() {

From 8961ec79bc880e591e32a01c388885e6f712ec32 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Fri, 29 Jan 2021 17:54:39 +0100
Subject: [PATCH 04/62] [OC-1407] Remove detailTitle

---
 .../businessconfig-storage/TEST/1/config.json |  3 ---
 .../businessconfig-storage/TEST/config.json   |  3 ---
 .../businessconfig-storage/first/config.json  |  3 ---
 .../first/v1/config.json                      |  3 ---
 .../model/ProcessStatesData.java              |  1 -
 .../src/main/modeling/swagger.yaml            | 11 ----------
 .../test/data/bundles/second/2.0/config.json  |  3 ---
 .../test/data/bundles/second/2.1/config.json  |  3 ---
 .../businessconfig-storage/first/config.json  |  3 ---
 src/docs/asciidoc/getting_started/index.adoc  |  6 +-----
 .../reference_doc/process_definition.adoc     |  8 +------
 .../reference_doc/response_cards.adoc         |  3 ---
 .../asciidoc/reference_doc/user_cards.adoc    |  3 ---
 .../resources/bundle_api_test/config.json     |  7 -------
 .../resources/bundle_api_test_v2/config.json  |  7 -------
 .../resources/bundle_test_action/config.json  | 15 -------------
 .../bundle_defaultProcess/config.json         | 21 -------------------
 .../bundle_defaultProcess_V0.1/config.json    |  3 ---
 .../bundle_userCardExamples/config.json       | 15 -------------
 .../bundle_gridCooperation/config.json        | 18 ----------------
 .../bundles/bundle_message/config.json        |  1 -
 .../bundles/bundle_message_v2/config.json     |  1 -
 ui/main/src/app/model/processes.model.ts      |  1 -
 .../components/detail/detail.component.html   |  2 +-
 ui/main/src/tests/helpers.ts                  |  2 +-
 25 files changed, 4 insertions(+), 142 deletions(-)

diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json
index 404f2755a9..22269b71e2 100755
--- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json
+++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json
@@ -12,9 +12,6 @@
     "firstState": {
       "name":  "state.label",
       "color": "blue",
-      "detailTitle": {
-        "key": "template.title"
-      },
       "templateName": "operation",
       "acknowledgmentAllowed": "Never"
     }
diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json
index 404f2755a9..22269b71e2 100755
--- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json
+++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json
@@ -12,9 +12,6 @@
     "firstState": {
       "name":  "state.label",
       "color": "blue",
-      "detailTitle": {
-        "key": "template.title"
-      },
       "templateName": "operation",
       "acknowledgmentAllowed": "Never"
     }
diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json
index db1ee3456b..0efc8daddc 100755
--- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json
+++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json
@@ -15,9 +15,6 @@
     "firstState": {
       "name":  "firstState.label",
       "color": "blue",
-      "detailTitle": {
-        "key": "template1.title"
-      },
       "templateName": "template1",
       "acknowledgmentAllowed": "Never"
     }
diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json
index db1ee3456b..0efc8daddc 100755
--- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json
+++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json
@@ -15,9 +15,6 @@
     "firstState": {
       "name":  "firstState.label",
       "color": "blue",
-      "detailTitle": {
-        "key": "template1.title"
-      },
       "templateName": "template1",
       "acknowledgmentAllowed": "Never"
     }
diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
index 40e4bbe7f2..926acd2cee 100644
--- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
+++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
@@ -27,7 +27,6 @@ public class ProcessStatesData implements ProcessStates {
     private String description;
     private Boolean showDetailCardHeader;
     private UserCard userCard;
-    private I18n detailTitle;
     private String templateName;
     @Singular
     private List<String> styles;
diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml
index 6cb9ca9608..b2819f24ff 100755
--- a/services/core/businessconfig/src/main/modeling/swagger.yaml
+++ b/services/core/businessconfig/src/main/modeling/swagger.yaml
@@ -371,9 +371,6 @@ definitions:
             userCard:
               description : User card template and visibility options
               $ref: '#/definitions/UserCard'
-            detailTitle:
-              description: Detail i18n title
-              $ref: '#/definitions/I18n'
             templateName:
               description: >-
                 Name of the template to use
@@ -404,16 +401,8 @@ definitions:
       name: some_business_process.label
       version: v1.0
       initial_state:
-        detailTitle:
-          key: template.title
-          parameters:
-            param: value
         templateName: template1
       other_state:
-        detailTitle:
-          key: template2.title
-          parameters:
-            param: value
         templateName: template2
         styles:
           - my-template.css
diff --git a/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json b/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json
index 369baa2b08..b64deadb25 100755
--- a/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json
+++ b/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json
@@ -18,9 +18,6 @@
         },
         "externalRecipients": ["externalRecipient1", "externalRecipient2"]
       },
-      "detailTitle": {
-        "key": "template.title"
-      },
       "templateName": "template",
       "actions": {
         "action1": {
diff --git a/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json b/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json
index 68ebe47626..c9ac8343f5 100755
--- a/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json
+++ b/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json
@@ -20,9 +20,6 @@
             },
             "externalRecipients": ["externalRecipient1", "externalRecipient2"]
           },
-          "detailTitle": {
-            "key": "template.title"
-          },
           "templateName": "template",
           "actions": {
             "action1": {
diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json
index ac5227066d..6267994003 100755
--- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json
+++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json
@@ -7,9 +7,6 @@
   ],
   "states": {
     "testState": {
-      "detailTitle": {
-        "key": "template.title"
-      },
       "templateName": "template",
       "actions": {
         "testAction": {
diff --git a/src/docs/asciidoc/getting_started/index.adoc b/src/docs/asciidoc/getting_started/index.adoc
index 66d5ff1e1a..f588ae9dac 100644
--- a/src/docs/asciidoc/getting_started/index.adoc
+++ b/src/docs/asciidoc/getting_started/index.adoc
@@ -192,7 +192,6 @@ The global configuration is defined in config.json :
 	"version":"2",
 	"states":{
 		"messageState" : {
-			"detailTitle" : { "key" : "defaultProcess.title"},
 			"templateName" : "template",
 			"styles" : [ "style" ]
 		}
@@ -251,7 +250,7 @@ You should received the following JSON in response, describing your bundle.
 
 [source,JSON]
 ----
-{"id":"defaultProcess","name":null,"version":"2","uiVisibility":null,"states":{"messageState":{"responseData":null,"acknowledgementAllowed":true,"color":null,"name":null,"userCard":null,"detailTitle":{"key":"defaultProcess.title","parameters":null},"templateName":"template","styles":["style"],"acknowledgmentAllowed":true,"response":null}}}
+{"id":"defaultProcess","name":null,"version":"2","uiVisibility":null,"states":{"messageState":{"responseData":null,"acknowledgementAllowed":true,"color":null,"name":null,"userCard":null,"templateName":"template","styles":["style"],"acknowledgmentAllowed":true,"response":null}}}
 ----
 
 ==== Send a card 
@@ -309,19 +308,16 @@ of the bundle:
 	"version":"1",
 	"states":{
 		"criticalSituation-begin" : {
-			"detailTitle" : { "key" : "criticalSituation-begin.title"},
 			"templateName" : "criticalSituationTemplate",
 			"styles" : [ "style" ],
 			"acknowledgmentAllowed": "Always"
 		},
 		"criticalSituation-update" : {
-			"detailTitle" : { "key" : "criticalSituation-update.title"},
 			"templateName" : "criticalSituationTemplate",
 			"styles" : [ "style" ],
 			"acknowledgmentAllowed": "Always"
 		},
 		"criticalSituation-end" : {
-			"detailTitle" : { "key" : "criticalSituation-end.title"},
 			"templateName" : "endCriticalSituationTemplate",
 			"styles" : [ "style" ],
 			"acknowledgmentAllowed": "Always"
diff --git a/src/docs/asciidoc/reference_doc/process_definition.adoc b/src/docs/asciidoc/reference_doc/process_definition.adoc
index 388275d13e..c8f4091981 100644
--- a/src/docs/asciidoc/reference_doc/process_definition.adoc
+++ b/src/docs/asciidoc/reference_doc/process_definition.adoc
@@ -317,15 +317,9 @@ These command line should return a `200 http status` response with the details o
   "version": "1",
   "states" : {
           "start" : {
-            "detailTitle" : {
-              "key" : "start.first.title"
-            },
-            "templateName" : "template1"        
+            "templateName" : "template1"
           },
           "end" : {
-            "detailTitle" : {
-              "key" : "end.first.title"
-            },
             "templateName" : "template2",
             "styles" : [ "bundleTest.css" ]
           }
diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc
index df1129b0c7..2b9d3b0b49 100644
--- a/src/docs/asciidoc/reference_doc/response_cards.adoc
+++ b/src/docs/asciidoc/reference_doc/response_cards.adoc
@@ -65,9 +65,6 @@ A card can have a response only if it's in a process/state that is configured fo
           "key": "question.button.text"
         }
       },
-      "detailTitle": {
-        "key": "question.title"
-      },
       "templateName": "question",
       "styles": [
         "style"
diff --git a/src/docs/asciidoc/reference_doc/user_cards.adoc b/src/docs/asciidoc/reference_doc/user_cards.adoc
index 6729679826..a4522687ed 100644
--- a/src/docs/asciidoc/reference_doc/user_cards.adoc
+++ b/src/docs/asciidoc/reference_doc/user_cards.adoc
@@ -31,9 +31,6 @@ For example :
       "startDateVisible" : true,
       "endDateVisible" : true
     },
-    "detailTitle": {
-      "key": "message.title"
-    },
     "templateName": "message",
     "styles": [],
     "acknowledgmentAllowed": "Always"
diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json
index 4a19faeb61..90d7d4c2ca 100644
--- a/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json
+++ b/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json
@@ -8,7 +8,6 @@
 	},
 	"states": {
 		"messageState" : {
-			"detailTitle" : { "key" : "detail.title"},
 			"templateName" : "template",
 			"styles" : [ "style" ]
 		},
@@ -24,9 +23,6 @@
 		  "response": {
 			"state": "questionState"
 		  },
-		  "detailTitle": {
-			"key": "question.title"
-		  },
 		  "templateName": "question",
 		  "styles": [],
 		  "acknowledgmentAllowed": "Never"
@@ -43,9 +39,6 @@
 		  "response": {
 			"state": "incidentInProgressState"
 		  },
-		  "detailTitle": {
-			"key": "incidentInProgress.name"
-		  },
 		  "templateName": "incidentInProgress",
 		  "styles": [],
 		  "acknowledgmentAllowed": "Always"
diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
index 78813edbe6..bd4e376040 100644
--- a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
+++ b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
@@ -8,7 +8,6 @@
 	},
 	"states": {
 		"messageState" : {
-			"detailTitle" : { "key" : "detail.title"},
 			"templateName" : "template",
 			"styles" : [ "style" ]
 		},
@@ -24,9 +23,6 @@
 		  "response": {
 			"state": "questionState"
 		  },
-		  "detailTitle": {
-			"key": "question.title"
-		  },
 		  "templateName": "question",
 		  "styles": [],
 		  "acknowledgmentAllowed": "Never"
@@ -43,9 +39,6 @@
 		  "response": {
 			"state": "incidentInProgressState"
 		  },
-		  "detailTitle": {
-			"key": "incidentInProgress.name"
-		  },
 		  "templateName": "incidentInProgress",
 		  "styles": [],
 		  "acknowledgmentAllowed": "Always"
diff --git a/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json b/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json
index 207c2a96b4..181262c7d7 100755
--- a/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json
+++ b/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json
@@ -14,9 +14,6 @@
           "key": "action.text"
         }
       },
-      "detailTitle": {
-        "key": "cardDetails.title"
-      },
       "templateName": "long-card",
       "styles": [
       ]
@@ -31,9 +28,6 @@
         },
         "externalRecipients": ["externalRecipient1", "externalRecipient2"]
       },
-      "detailTitle": {
-        "key": "cardDetails.title"
-      },
       "templateName": "template1",
       "styles": [
         "main"
@@ -47,9 +41,6 @@
           "key": "action.text"
         }
       },
-      "detailTitle": {
-        "key": "cardDetails.title"
-      },
       "templateName": "template1",
       "styles": [
         "main"
@@ -61,9 +52,6 @@
         "state": "responseState",
         "btnColor": "RED"
       },
-      "detailTitle": {
-        "key": "cardDetails.title"
-      },
       "templateName": "template1",
       "styles": [
         "main"
@@ -74,9 +62,6 @@
         "lock": true,
         "state": "responseState"
       },
-      "detailTitle": {
-        "key": "cardDetails.title"
-      },
       "templateName": "template1",
       "styles": [
         "main"
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 46b4734c27..16c33677dc 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json
@@ -15,9 +15,6 @@
       "userCard" : {
         "template" : "usercard_message"
       },
-      "detailTitle": {
-        "key": "message.title"
-      },
       "templateName": "template",
       "styles": [
         "style"
@@ -28,9 +25,6 @@
       "name": "chartDetail.title",
       "description": "chartState.description",
       "color": "#DA00DA",
-      "detailTitle": {
-        "key": "chartDetail.title"
-      },
       "templateName": "chart",
       "styles": [
         "style"
@@ -41,9 +35,6 @@
       "name": "chartLine.title",
       "description": "chartLineState.description",
       "color": "#6666FF",
-      "detailTitle": {
-        "key": "chartLine.title"
-      },
       "templateName": "chart-line",
       "styles": [
         "style"
@@ -57,9 +48,6 @@
       "userCard" : {
         "template" : "usercard_process"
       },
-      "detailTitle": {
-        "key": "process.label"
-      },
       "templateName": "process",
       "styles": [
         "style"
@@ -70,9 +58,6 @@
       "name": "contingencies.title",
       "description": "contingenciesState.description",
       "color": "#0070C0",
-      "detailTitle": {
-        "key": "contingencies.title"
-      },
       "templateName": "contingencies",
       "styles": [
         "contingencies"
@@ -91,9 +76,6 @@
           "key": "question.button.text"
         }
       },
-      "detailTitle": {
-        "key": "question.title"
-      },
       "templateName": "question",
       "styles": [
         "style"
@@ -104,9 +86,6 @@
       "name": "response.title",
       "description": "responseState.description",
       "color": "#0070C0",
-      "detailTitle": {
-        "key": "response.title"
-      },
       "templateName": "response",
       "styles": [
         "style"
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json
index 10f4182681..d3e375b980 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json
@@ -6,9 +6,6 @@
     "messageState": {
       "name":  "defaultProcess.title",
       "color": "#CC9900",
-      "detailTitle": {
-        "key": "defaultProcess.title"
-      },
       "templateName": "template",
       "styles": [
         "style"
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 1e2d592c5e..cf4ffba761 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json
@@ -14,9 +14,6 @@
       "userCard" : {
         "template" : "usercard_message"
       },
-      "detailTitle": {
-        "key": "message.title"
-      },
       "templateName": "message",
       "styles": [],
       "acknowledgmentAllowed": "Always"
@@ -27,9 +24,6 @@
       "userCard" : {
         "template" : "usercard_conference"
       },
-      "detailTitle": {
-        "key": "conference.title"
-      },
       "templateName": "conference",
       "styles": [],
       "acknowledgmentAllowed": "Always"
@@ -47,9 +41,6 @@
       "response": {
         "state": "questionState"
       },
-      "detailTitle": {
-        "key": "question.title"
-      },
       "templateName": "question",
       "styles": [],
       "acknowledgmentAllowed": "Never"
@@ -60,9 +51,6 @@
       "userCard" : {
         "template" : "usercard_task"
       },
-      "detailTitle": {
-        "key": "task.title"
-      },
       "templateName": "task",
       "styles": [
       ],
@@ -80,9 +68,6 @@
       "response": {
         "state": "incidentInProgressState"
       },
-      "detailTitle": {
-        "key": "incidentInProgress.name"
-      },
       "templateName": "incidentInProgress",
       "styles": [],
       "acknowledgmentAllowed": "OnlyWhenResponseDisabledForUser"
diff --git a/src/test/utils/karate/examples/gridCooperation/bundle_gridCooperation/config.json b/src/test/utils/karate/examples/gridCooperation/bundle_gridCooperation/config.json
index e3cda5361c..2fb4da9ecf 100644
--- a/src/test/utils/karate/examples/gridCooperation/bundle_gridCooperation/config.json
+++ b/src/test/utils/karate/examples/gridCooperation/bundle_gridCooperation/config.json
@@ -11,54 +11,36 @@
 			"name":  "timeout-FrEs-IGCC.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "red",
-			"detailTitle": {
-						"key": "timeout-FrEs-IGCC.title"
-					},
 			"templateName": "timeout-FrEs-IGCC"
 		},
 		"action-FrEs-IGCC-export-0": {
 			"name":  "action-FrEs-IGCC-export-0.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "red",
-			"detailTitle": {
-						"key": "action-FrEs-IGCC-export-0.title"
-					},
 			"templateName": "action-FrEs-IGCC-export-0"
 		},
 		"action-FrEs-IGCC-export-300": {
 			"name":  "action-FrEs-IGCC-export-300.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "orange",
-			"detailTitle": {
-						"key": "action-FrEs-IGCC-export-300.title"
-					},
 			"templateName": "action-FrEs-IGCC-export-300"
 		},
 		"action-FrEs-IGCC-import-0": {
 			"name":  "action-FrEs-IGCC-import-0.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "red",
-			"detailTitle": {
-						"key": "action-FrEs-IGCC-import-0.title"
-					},
 			"templateName": "action-FrEs-IGCC-import-0"
 		},
 		"action-FrEs-IGCC-import-300": {
 			"name":  "action-FrEs-IGCC-import-300.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "orange",
-			"detailTitle": {
-						"key": "action-FrEs-IGCC-import-300.title"
-					},
 			"templateName": "action-FrEs-IGCC-import-300"
 		},
 		"compliant-FrEs-IGCC": {
 			"name":  "compliant-FrEs-IGCC.title",
 			"acknowledgmentAllowed": "Always",
 			"color": "green",
-			"detailTitle": {
-						"key": "compliant-FrEs-IGCC.title"
-					},
 			"templateName": "compliant-FrEs-IGCC"
 		}
 	}
diff --git a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json
index 3753bcb2de..9efef08c3e 100755
--- a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json
+++ b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json
@@ -3,7 +3,6 @@
 	"version":"1",
 	"states":{
 		"messageState" : {
-			"detailTitle" : { "key" : "defaultProcess.title"},
 			"templateName" : "template",
 			"styles" : [ "style" ]
 		}
diff --git a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json
index 887f4982b0..d29176760d 100644
--- a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json
+++ b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json
@@ -3,7 +3,6 @@
 	"version":"2",
 	"states":{
 		"messageState" : {
-			"detailTitle" : { "key" : "defaultProcess.title"},
 			"templateName" : "template",
 			"styles" : [ "style" ]
 		}
diff --git a/ui/main/src/app/model/processes.model.ts b/ui/main/src/app/model/processes.model.ts
index f5358fc182..39fbaed59a 100644
--- a/ui/main/src/app/model/processes.model.ts
+++ b/ui/main/src/app/model/processes.model.ts
@@ -50,7 +50,6 @@ export class UiVisibility {
 export class State {
     /* istanbul ignore next */
     constructor(
-        readonly detailTitle?: I18n,
         readonly templateName?: string,
         readonly styles?: string[],
         readonly response?: Response,
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 ffd6d56662..9e1be2b455 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
@@ -10,7 +10,7 @@
   <div style="display: block;  margin-top:16px;">
     <ul class="nav nav-tabs opfab-line-undertab">
       <li class="nav-item opfab-tab opfab-menu-item-left" data-toggle="tab">
-        <span class="opfab-tab text-uppercase" translate [translateParams]="cardState.detailTitle?.parameters">{{i18nPrefix+cardState.detailTitle.key}}</span>
+        <span class="opfab-tab text-uppercase" translate [translateParams]="card.title?.parameters">{{i18nPrefix+card.title.key}}</span>
       </li>
       <li *ngIf="showButtons" class="nav-item opfab-menu-item-right">
         <div class="opfab-right-menu-item" *ngIf='showEditAndDeleteButton'>
diff --git a/ui/main/src/tests/helpers.ts b/ui/main/src/tests/helpers.ts
index 3f6b903a9f..9d7288d9e6 100644
--- a/ui/main/src/tests/helpers.ts
+++ b/ui/main/src/tests/helpers.ts
@@ -91,7 +91,7 @@ export function getOneRandomProcess(processTemplate?:any): Process {
         const titleKey =  getRandomI18nData();
         const templateName = 'template1';
         states[getRandomAlphanumericValue(3,10)]=
-            new State(titleKey, templateName, ['style1','style2']);
+            new State(templateName, ['style1','style2']);
     }
 
 

From 633dd6fe911055e4c2d17d478e9c0a4e9a3b8a05 Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Tue, 2 Feb 2021 11:37:33 +0100
Subject: [PATCH 05/62] [OC-1429] Update documentation for reviewer

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 src/docs/asciidoc/community/workflow.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/community/workflow.adoc b/src/docs/asciidoc/community/workflow.adoc
index 8e87411ae4..8ff2fba7fc 100644
--- a/src/docs/asciidoc/community/workflow.adoc
+++ b/src/docs/asciidoc/community/workflow.adoc
@@ -358,7 +358,8 @@ logic and not the framework itself)
 * Documentation has been updated (especially if configuration is needed)
 * Configuration examples have been updated (both for dev and docker)
 * Build and run OpFab locally to see the new feature or bug fix at work. In the case of a new feature, it's also a way
-of making sure that the configuration documentation is correct and easily understandable.
+of making sure that the configuration documentation is correct and easily understandable. 
+* Check for error messages in the browser console.
 * Depending on the scope of the PR , build docker images and test in docker mode
 * Check that the copyright header has been updated on the changed files if need be, and in the case of a first-time
     contributor, make sure they're added to the AUTHORS.txt file.
@@ -379,6 +380,7 @@ Compile and run OperatorFabric docker images is the most effective way to check
 . Run the following scripts: `./loadBundle.sh && ./setPerimeterForTest.sh && ./postTestCards.sh`;
 . Open the front-end in a browser and look for any regression.
 
+To automate build and API testing, you can use `${OF_HOME}/src/test/api/karate/buildAndLaunchAll.sh`. 
 
 === Merging a Pull Request
 

From ba7080dcc3a77ec0647e42f7038189b9eb94f6eb Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Tue, 2 Feb 2021 11:55:13 +0100
Subject: [PATCH 06/62] [OC-1430] Adapt api testing script

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 src/test/api/karate/buildAndLaunchAll.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/api/karate/buildAndLaunchAll.sh b/src/test/api/karate/buildAndLaunchAll.sh
index 4cb90df6cd..18160d0682 100755
--- a/src/test/api/karate/buildAndLaunchAll.sh
+++ b/src/test/api/karate/buildAndLaunchAll.sh
@@ -16,6 +16,12 @@ bin/run_all.sh stop
 sleep 5
 echo "Hard stop for cleaning if needed"
 bin/run_all.sh hardstop
+echo "Stop existing running opfab docker"
+cd config/dev
+docker-compose down
+cd ../docker
+docker-compose down
+cd ../..
 echo "Start docker compose for building" 
 docker-compose -f ${dockerComposeFile} up -d
 echo "Build all" 

From 6c9f15f80c15962e06b98d9ad508b6fd657bc215 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 27 Jan 2021 15:32:56 +0100
Subject: [PATCH 07/62] [OC-1191] Replace lib ng2-table by ag-grid in admin

---
 ui/main/package.json                          |   3 +-
 ui/main/src/app/app.module.ts                 |  46 ++-
 .../src/app/common/error/app-error-handler.ts |  20 +-
 ui/main/src/app/common/error/app-error.ts     |  11 +
 .../src/app/common/error/not-allowed-error.ts |  12 +-
 .../src/app/common/error/not-found-error.ts   |  12 +-
 .../app/modules/admin/admin-rooting.module.ts |   5 +-
 .../app/modules/admin/admin.component.html    |  30 +-
 .../app/modules/admin/admin.component.scss    |  17 ++
 .../src/app/modules/admin/admin.component.ts  |  33 ++-
 ui/main/src/app/modules/admin/admin.module.ts |  59 ++--
 .../confirmation-dialog.component.html        |   9 +
 .../confirmation-dialog.component.ts          |  14 +-
 .../edit-entity-group-modal.component.ts      |  37 +--
 .../edit-group-modal.component.html           |  19 +-
 .../edit-group-modal.component.scss           |  11 +-
 .../users/edit-user-modal.component.html      |  33 ++-
 .../users/edit-user-modal.component.scss      |  11 +-
 .../users/edit-user-modal.component.ts        |  45 +--
 .../entities/of-entities-table.component.ts   | 123 --------
 .../groups/of-groups-table.component.ts       | 121 --------
 .../ngtable/oftable/oftable.component.html    |  48 ---
 .../ngtable/oftable/oftable.component.ts      | 273 ------------------
 .../ngtable/users/ofuserstable.component.ts   | 151 ----------
 .../table/action-cell-renderer.component.html |  11 +
 .../table/action-cell-renderer.component.ts   |  43 +++
 .../table/admin-table.component.html          |  20 ++
 .../components/table/admin-table.component.ts | 205 +++++++++++++
 .../table/entities-table.component.ts         |  30 ++
 .../table/groups-table.component.ts           |  30 ++
 .../components/table/users-table.component.ts |  31 ++
 .../services/confirmation-dialog.service.ts   |  20 +-
 .../modules/admin/services/data.service.ts    |  49 ----
 .../admin/services/id-validator.service.ts    |   7 +-
 .../authentication/authentication.service.ts  |   5 +-
 ui/main/src/app/services/crud-service.ts      |  15 +-
 ui/main/src/app/services/entities.service.ts  |  22 +-
 ui/main/src/app/services/error-service.ts     |  24 +-
 ui/main/src/app/services/groups.service.ts    |  17 +-
 ui/main/src/app/services/services.module.ts   |  19 +-
 ui/main/src/app/services/user.service.ts      |  46 +--
 ui/main/src/assets/i18n/en.json               |  66 +++--
 ui/main/src/assets/i18n/fr.json               |  81 +++---
 ui/main/src/assets/styles/styles.scss         | 100 ++++---
 44 files changed, 911 insertions(+), 1073 deletions(-)
 create mode 100644 ui/main/src/app/modules/admin/admin.component.scss
 delete mode 100644 ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table.component.ts
 delete mode 100644 ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table.component.ts
 delete mode 100644 ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html
 delete mode 100644 ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts
 delete mode 100644 ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
 create mode 100644 ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/admin-table.component.html
 create mode 100644 ui/main/src/app/modules/admin/components/table/admin-table.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/entities-table.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/groups-table.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/users-table.component.ts
 delete mode 100644 ui/main/src/app/modules/admin/services/data.service.ts

diff --git a/ui/main/package.json b/ui/main/package.json
index 801abfd84f..1f8e40f012 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -42,6 +42,8 @@
     "@ngx-translate/http-loader": "^4.0.0",
     "@swimlane/ngx-charts": "^13.0.4",
     "@types/jwt-decode": "^2.2.1",
+    "ag-grid-angular": "^25.0.1",
+    "ag-grid-community": "^25.0.1",
     "angular-oauth2-oidc": "^8.0.4",
     "angular2-multiselect-dropdown": "4.6.3",
     "bootstrap": "^4.5.2",
@@ -54,7 +56,6 @@
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "ng-event-source": "^1.0.14",
-    "ng2-table": "^1.3.2",
     "ngrx-router": "^2.0.1",
     "ngx-bootstrap": "^5.6.1",
     "ngx-countdown": "^10.0.1",
diff --git a/ui/main/src/app/app.module.ts b/ui/main/src/app/app.module.ts
index bce58ed8f3..1adf290c6b 100644
--- a/ui/main/src/app/app.module.ts
+++ b/ui/main/src/app/app.module.ts
@@ -9,31 +9,29 @@
  */
 
 
-import { BrowserModule } from '@angular/platform-browser';
-import { ErrorHandler, NgModule } from '@angular/core';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HttpClientModule } from '@angular/common/http';
-import { CommonModule, HashLocationStrategy, LocationStrategy } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { StateModule } from '@ofStore/state.module';
-import { ServicesModule } from '@ofServices/services.module';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { LoginComponent } from './modules/login/login.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { OAuthModule } from 'angular-oauth2-oidc';
-import { LoggingModule } from './modules/logging/logging.module';
-import { MonitoringModule } from './modules/monitoring/monitoring.module';
-import { AdminModule } from './modules/admin/admin.module';
-
-import { CountdownModule, CountdownGlobalConfig, CountdownConfig } from 'ngx-countdown';
+import {BrowserModule} from '@angular/platform-browser';
+import {ErrorHandler, NgModule} from '@angular/core';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {HttpClientModule} from '@angular/common/http';
+import {CommonModule, HashLocationStrategy, LocationStrategy} from '@angular/common';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {StateModule} from '@ofStore/state.module';
+import {ServicesModule} from '@ofServices/services.module';
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
+import {LoginComponent} from './modules/login/login.component';
+import {TranslateModule} from '@ngx-translate/core';
+import {OAuthModule} from 'angular-oauth2-oidc';
+import {LoggingModule} from './modules/logging/logging.module';
+import {MonitoringModule} from './modules/monitoring/monitoring.module';
+import {AdminModule} from './modules/admin/admin.module';
+import {CountdownConfig, CountdownGlobalConfig, CountdownModule} from 'ngx-countdown';
 import {CalendarModule} from './modules/calendar/calendar.module';
-import { AppErrorHandler } from './common/error/app-error-handler';
-import { ArchivesModule } from './modules/archives/archives.module';
-import { NavbarModule } from './modules/navbar/navbar.module';
-import { NgbModalModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { FontAwesomeIconsModule } from './modules/utilities/fontawesome-icons.module';
-
+import {AppErrorHandler} from './common/error/app-error-handler';
+import {ArchivesModule} from './modules/archives/archives.module';
+import {NavbarModule} from './modules/navbar/navbar.module';
+import {NgbModalModule, NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import {FontAwesomeIconsModule} from './modules/utilities/fontawesome-icons.module';
 
 
 export function countdownConfigFactory(): CountdownConfig {
diff --git a/ui/main/src/app/common/error/app-error-handler.ts b/ui/main/src/app/common/error/app-error-handler.ts
index fef72f8bec..d298993705 100644
--- a/ui/main/src/app/common/error/app-error-handler.ts
+++ b/ui/main/src/app/common/error/app-error-handler.ts
@@ -1,7 +1,21 @@
-import { ErrorHandler } from '@angular/core';
-import { NotAllowedError } from './not-allowed-error';
-import { NotFoundError } from './not-found-error';
+/* 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 {ErrorHandler} from '@angular/core';
+import {NotAllowedError} from './not-allowed-error';
+import {NotFoundError} from './not-found-error';
+
+/** Declaring an `ErrorHandler` allows error handling to be centralized.
+ * By default, it will print messages to the console, and this class is a custom `ErrorHandler` that will override
+ * this default for certain error types.
+ */
 export class AppErrorHandler implements ErrorHandler {
 
   handleError(error) {
diff --git a/ui/main/src/app/common/error/app-error.ts b/ui/main/src/app/common/error/app-error.ts
index 8ce4add5bf..d2ed6fb2f7 100644
--- a/ui/main/src/app/common/error/app-error.ts
+++ b/ui/main/src/app/common/error/app-error.ts
@@ -1,3 +1,14 @@
+/* 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.
+ */
+
+// TODO I'm not sure why this class is necessary. What does new AppError(null) mean??
 export class AppError {
   constructor(originalError? ) {}
 }
diff --git a/ui/main/src/app/common/error/not-allowed-error.ts b/ui/main/src/app/common/error/not-allowed-error.ts
index 85ee39fe6b..f7da6c0a06 100644
--- a/ui/main/src/app/common/error/not-allowed-error.ts
+++ b/ui/main/src/app/common/error/not-allowed-error.ts
@@ -1,4 +1,14 @@
-import { AppError } from './app-error';
+/* 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 {AppError} from './app-error';
 
 export class NotAllowedError extends AppError {
 
diff --git a/ui/main/src/app/common/error/not-found-error.ts b/ui/main/src/app/common/error/not-found-error.ts
index 2a5a9d01b5..c7451e1016 100644
--- a/ui/main/src/app/common/error/not-found-error.ts
+++ b/ui/main/src/app/common/error/not-found-error.ts
@@ -1,4 +1,14 @@
-import { AppError } from './app-error';
+/* 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 {AppError} from './app-error';
 
 export class NotFoundError extends AppError {
 
diff --git a/ui/main/src/app/modules/admin/admin-rooting.module.ts b/ui/main/src/app/modules/admin/admin-rooting.module.ts
index f10de34c74..301898c00e 100644
--- a/ui/main/src/app/modules/admin/admin-rooting.module.ts
+++ b/ui/main/src/app/modules/admin/admin-rooting.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,10 +8,9 @@
  */
 
 
-
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
-import { AdminComponent } from './admin.component';
+import {AdminComponent} from './admin.component';
 
 const routes: Routes = [
     {
diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html
index 9d9ad2b153..1aad8ddc9c 100644
--- a/ui/main/src/app/modules/admin/admin.component.html
+++ b/ui/main/src/app/modules/admin/admin.component.html
@@ -1,3 +1,12 @@
+<!-- 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.                      -->
+
 <div id="tabs" #tabs>
 
   <ul class="nav nav-pills">
@@ -18,18 +27,31 @@
     <div class="tab-pane active" id="admin/users" [ngClass]="{ 'active':activeTab==='users'}">
       <br>
       <br>
-      <of-users-table></of-users-table>
+      <of-users-table [paginationPageSize]="paginationPageSize"></of-users-table>
     </div>
     <div class="tab-pane" id="admin/entities" [ngClass]="{ 'active':activeTab==='entities'}">
       <br>
       <br>
-     <of-entities-table></of-entities-table>
+      <of-entities-table [paginationPageSize]="paginationPageSize"></of-entities-table>
     </div>
     <div class="tab-pane" id="admin/groups" [ngClass]="{ 'active':activeTab==='groups'}">
       <br>
       <br>
-      <of-groups-table></of-groups-table>
+      <of-groups-table [paginationPageSize]="paginationPageSize"></of-groups-table>
     </div>
   </div>
 
-</div>
\ No newline at end of file
+  <br>
+  <br>
+  <div>
+    <select (change)="onPageSizeChanged()" id="page-size-select" label="page-size">
+      <option *ngFor="let option of paginationPageSizeOptions"
+              [value]="option"
+              [attr.selected]="option==paginationDefaultPageSize ? true : null">
+        {{option}}
+      </option>
+    </select>
+    <label for="page-size-select" translate>&nbsp;admin.input.lines</label>
+  </div>
+
+</div>
diff --git a/ui/main/src/app/modules/admin/admin.component.scss b/ui/main/src/app/modules/admin/admin.component.scss
new file mode 100644
index 0000000000..250adb5f48
--- /dev/null
+++ b/ui/main/src/app/modules/admin/admin.component.scss
@@ -0,0 +1,17 @@
+/* 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.
+ */
+
+
+
+#tabs {
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+
diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index 2f66947948..e4b806c6b3 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2020, RTEI (http://www.rte-international.com)
+/* 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
@@ -8,18 +8,20 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-import { AppState } from '@ofStore/index';
-import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors';
-import { Observable, Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+
+import {Component, OnDestroy, OnInit} from '@angular/core';
+import {ActivatedRoute} from '@angular/router';
+import {Store} from '@ngrx/store';
+import {TranslateService} from '@ngx-translate/core';
+import {AppState} from '@ofStore/index';
+import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors';
+import {Observable, Subject} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
 
 @Component({
   selector: 'of-admin',
-  templateUrl: './admin.component.html'
+  templateUrl: './admin.component.html',
+  styleUrls: ['./admin.component.scss']
 })
 export class AdminComponent implements OnInit, OnDestroy {
 
@@ -30,6 +32,11 @@ export class AdminComponent implements OnInit, OnDestroy {
   entitiesLabel: string;
   groupsLabel: string;
 
+  private paginationDefaultPageSize = 10;
+  private paginationPageSizeOptions = [5, 10, 25, 50, 100];
+  public paginationPageSize = this.paginationDefaultPageSize;
+
+  //TODO Why do we need to use translate.get and subscriptions rather than the translate directive like everywhere else?
   constructor(private route: ActivatedRoute, protected store: Store<AppState>, protected translate: TranslateService) {
     this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
       this.translate.use(locale);
@@ -60,4 +67,10 @@ export class AdminComponent implements OnInit, OnDestroy {
     this.unsubscribe$.complete();
   }
 
+  onPageSizeChanged() {
+    // Cast to get rid of "Property 'value' does not exist on type 'HTMLElement'."
+    const value = (<HTMLInputElement> document.getElementById('page-size-select')).value;
+    this.paginationPageSize = Number(value);
+  }
+
 }
diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts
index ec2faa2967..d808039d83 100644
--- a/ui/main/src/app/modules/admin/admin.module.ts
+++ b/ui/main/src/app/modules/admin/admin.module.ts
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTEI (http://www.rte-international.com)
+/* 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
@@ -7,41 +8,41 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { ErrorHandler, NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { AdminComponent } from './admin.component';
-import { PaginationModule } from 'ngx-bootstrap/pagination';
-import { AdminRoutingModule } from './admin-rooting.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { AppErrorHandler } from 'app/common/error/app-error-handler';
-import { OfUsersTableComponent } from './components/ngtable/users/ofuserstable.component';
-import { OfGroupsTableComponent } from './components/ngtable/groups/of-groups-table.component';
-import { OfEntitiesTableComponent } from './components/ngtable/entities/of-entities-table.component';
-import { OfTableComponent } from './components/ngtable/oftable/oftable.component';
-import { Ng2TableModule } from 'ng2-table';
-import { EditUsermodalComponent } from './components/editmodal/users/edit-user-modal.component';
-import { ConfirmationDialogComponent } from './components/confirmation-dialog/confirmation-dialog.component';
-import { MatInputModule, MatSelectModule } from '@angular/material';
-import { EditEntityGroupModalComponent } from './components/editmodal/groups-entities/edit-entity-group-modal.component';
 
+import {ErrorHandler, NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {AdminComponent} from './admin.component';
+import {PaginationModule} from 'ngx-bootstrap/pagination';
+import {AdminRoutingModule} from './admin-rooting.module';
+import {TranslateModule} from '@ngx-translate/core';
+import {AppErrorHandler} from 'app/common/error/app-error-handler';
+import {EditUserModalComponent} from './components/editmodal/users/edit-user-modal.component';
+import {ConfirmationDialogComponent} from './components/confirmation-dialog/confirmation-dialog.component';
+import {EditEntityGroupModalComponent} from './components/editmodal/groups-entities/edit-entity-group-modal.component';
+import {AgGridModule} from 'ag-grid-angular';
+import {UsersTableComponent} from './components/table/users-table.component';
+import {ActionCellRendererComponent} from './components/table/action-cell-renderer.component';
+import {MatInputModule, MatSelectModule} from '@angular/material';
+import {EntitiesTableComponent} from './components/table/entities-table.component';
+import {GroupsTableComponent} from './components/table/groups-table.component';
 
 
 @NgModule({
   declarations: [
     AdminComponent,
-    OfUsersTableComponent,
-    OfGroupsTableComponent,
-    OfEntitiesTableComponent,
-    OfTableComponent,
-    EditUsermodalComponent,
+    UsersTableComponent,
+    EntitiesTableComponent,
+    GroupsTableComponent,
+    EditUserModalComponent,
     ConfirmationDialogComponent,
-    EditEntityGroupModalComponent
+    EditEntityGroupModalComponent,
+    ActionCellRendererComponent
   ],
 
 
   entryComponents: [
-    EditUsermodalComponent,
+    EditUserModalComponent,
     ConfirmationDialogComponent,
     EditEntityGroupModalComponent
   ],
@@ -56,9 +57,13 @@ import { EditEntityGroupModalComponent } from './components/editmodal/groups-ent
     , MatSelectModule
     , MatInputModule
     , TranslateModule
-    , Ng2TableModule
+    , AgGridModule.withComponents([[
+      ActionCellRendererComponent,
+    ]]),
   ],
-  providers: [{ provide: ErrorHandler, useClass: AppErrorHandler }]
+  providers: [
+      { provide: ErrorHandler, useClass: AppErrorHandler },
+  ]
 })
 export class AdminModule { }
 
diff --git a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
index e95418d949..0e7cec7351 100644
--- a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
+++ b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
@@ -1,3 +1,12 @@
+<!-- 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.                      -->
+
 <div class="modal-header  bg-dark">
   <h4 class="modal-title">{{ title }}</h4>
     <button type="button" class="close" aria-label="Close" (click)="dismiss()">
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 4cd44f89dc..e50e36b944 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
@@ -1,5 +1,15 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+/* 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 {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'of-confirmation-dialog',
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/groups-entities/edit-entity-group-modal.component.ts
index 03b7190dd2..b7b24294cd 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/groups-entities/edit-entity-group-modal.component.ts
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTEI (http://www.rte-international.com)
+/* 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
@@ -7,13 +8,14 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { Component, Input, OnInit } from '@angular/core';
-import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { EntitiesService } from '@ofServices/entities.service';
-import { GroupsService } from '@ofServices/groups.service';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { IdValidatorService } from 'app/modules/admin/services/id-validator.service';
+
+import {Component, Input, OnInit} from '@angular/core';
+import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
+import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
+import {EntitiesService} from '@ofServices/entities.service';
+import {GroupsService} from '@ofServices/groups.service';
+import {IdValidatorService} from 'app/modules/admin/services/id-validator.service';
+import {AdminTableType} from "../../table/admin-table.component";
 
 @Component({
   selector: 'of-edit-group-modal',
@@ -31,11 +33,10 @@ export class EditEntityGroupModalComponent implements OnInit {
   });
 
   @Input() row: any;
-  @Input() type: string;
+  @Input() type: AdminTableType;
 
   constructor(
-    public activeModal: NgbActiveModal,
-    private data: DataTableShareService,
+    private activeModal: NgbActiveModal,
     private groupsService: GroupsService,
     private entitiesService: EntitiesService) {
   }
@@ -48,16 +49,18 @@ export class EditEntityGroupModalComponent implements OnInit {
 
   update() {
     this.cleanForm();
-    if (this.type === 'entity') {
+    // 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.
+    if (this.type === AdminTableType.ENTITY) {
       this.entitiesService.update(this.form.value).subscribe(() => {
-        this.data.changeEntityRow(this.form.value);
-        this.activeModal.dismiss('Update click');
+        this.activeModal.close('Update button clicked on ' + this.type + ' modal');
       });
     }
-    if (this.type === 'group') {
+    if (this.type === AdminTableType.GROUP) {
       this.groupsService.update(this.form.value).subscribe(() => {
-        this.data.changeGroupRow(this.form.value);
-        this.activeModal.dismiss('Update click');
+        this.activeModal.close('Update button clicked on ' + this.type + ' modal');
       });
     }
   }
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
index 9951798247..cb8e32eb9d 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
@@ -1,4 +1,13 @@
-<!-- Modal-content -->
+<!-- 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.                      -->
+
+
 <div class="modal-header bg-dark">
   <h5 class="modal-title" *ngIf="row">{{row.id}}</h5>
   <h5 class="modal-title" *ngIf="!row && type==='group'" translate>admin.input.group.add</h5>
@@ -17,7 +26,7 @@ <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.en
           <input matInput  formControlName="id" name="id" id="id" type="text"
             class="form-control bg-dark">
         </mat-form-field>
-        <div *ngIf="id.touched && id.invalid" class="alert alert-danger">
+        <div *ngIf="id.invalid" class="alert alert-danger">
           <div *ngIf="id.errors.required" translate>admin.input.id.required</div>
           <div *ngIf="id.errors.maxlength" translate>admin.input.id.maxLength</div>
           <div *ngIf="id.errors.minlength" translate>admin.input.id.minLength</div>
@@ -30,7 +39,7 @@ <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.en
       <mat-label for="name" translate>admin.input.name.label</mat-label>
       <input matInput formControlName="name" name="name" id="name" type="text" class="form-control bg-dark">
       </mat-form-field>
-      <div *ngIf="name.touched && name.invalid" class="alert alert-danger">
+      <div *ngIf="name.invalid" class="alert alert-danger">
         <div *ngIf="name.errors.required" translate>admin.input.name.required</div>
         <div *ngIf="name.errors.maxlength" translate>admin.input.name.maxLength</div>
       </div>
@@ -45,11 +54,11 @@ <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.en
 </div>
 <div class="modal-footer bg-dark">
   <button id="opfab-admin-edit-group-btn-cancel" type="button" (click)="activeModal.dismiss('Cross click')" class="opfab-btn-cancel" data-dismiss="modal"
-    translate>admin.input.user.close</button>
+    translate>admin.input.close</button>
   <button  id="opfab-admin-group-btn-add" [disabled]="!form.valid" *ngIf="!row && type==='group'" (click)="update()" class="opfab-btn"
     translate>admin.input.group.add</button>
   <button id="opfab-admin-entity-btn-add"[disabled]="!form.valid" *ngIf="!row && type==='entity'" (click)="update()" class="opfab-btn"
     translate>admin.input.entity.add</button>
   <button id="opfab-admin-user-btn-save" [disabled]="!form.valid" *ngIf="row" (click)="update()" class="opfab-btn"
-    translate>admin.input.user.save</button>
+    translate>admin.input.save</button>
 </div>
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss
index 50c203405e..8220852f7b 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss
@@ -1,3 +1,12 @@
+/* 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.
+ */
 
 .ng-valid[required], .ng-valid.required  {
   border-left: 5px solid #42A948; /* green */
@@ -37,4 +46,4 @@ form, input, label, p {
 
 ::ng-deep .mat-select-value {
     color: white;
-}
\ No newline at end of file
+}
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 aa2cfb3c14..3a50276e68 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
@@ -1,4 +1,13 @@
-<!-- Modal-content -->
+<!-- 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.                      -->
+
+
 <div class="modal-header bg-dark">
   <h5 class="modal-title" *ngIf="row">{{row.login}}</h5>
   <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
@@ -16,7 +25,7 @@ <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
           <input oninput="this.value = this.value.toLowerCase()" matInput  formControlName="login" name="login" id="login" type="text"
             class="form-control bg-dark">
         </mat-form-field>
-        <div *ngIf="login.touched && login.invalid" class="alert alert-danger">
+        <div *ngIf="login.invalid" class="alert alert-danger">
           <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
           <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
           <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
@@ -26,22 +35,22 @@ <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
     </div>
     <div class="form-group">
       <mat-form-field appearance="fill">
-      <mat-label for="firstName" translate>admin.input.user.firstname</mat-label>
+      <mat-label for="firstName" translate>admin.input.user.firstName</mat-label>
       <input matInput formControlName="firstName" name="firstName" id="firstName" type="text" class="form-control bg-dark">
       </mat-form-field>
-      <div *ngIf="firstName.touched && firstName.invalid" class="alert alert-danger">
-        <div *ngIf="firstName.errors.required" translate>admin.input.firstname.required</div>
-        <div *ngIf="firstName.errors.maxlength" translate>admin.input.firstname.maxLength</div>
+      <div *ngIf="firstName.invalid" class="alert alert-danger">
+        <div *ngIf="firstName.errors.required" translate>admin.input.firstName.required</div>
+        <div *ngIf="firstName.errors.maxlength" translate>admin.input.firstName.maxLength</div>
       </div>
     </div>
     <div class="form-group">
       <mat-form-field appearance="fill">
-      <mat-label for="lastName" translate>admin.input.user.lastname</mat-label>
+      <mat-label for="lastName" translate>admin.input.user.lastName</mat-label>
       <input matInput formControlName="lastName" name="lastName" id="lastName" type="text" class="form-control bg-dark">
       </mat-form-field>
-      <div *ngIf="lastName.touched && lastName.invalid" class="alert alert-danger">
-        <div *ngIf="lastName.errors.required" translate>admin.input.lastname.required</div>
-        <div *ngIf="lastName.errors.maxlength" translate>admin.input.lastname.maxLength</div>
+      <div *ngIf="lastName.invalid" class="alert alert-danger">
+        <div *ngIf="lastName.errors.required" translate>admin.input.lastName.required</div>
+        <div *ngIf="lastName.errors.maxlength" translate>admin.input.lastName.maxLength</div>
       </div>
     </div>
     <div class="form-group">
@@ -60,9 +69,9 @@ <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
 </div>
 <div class="modal-footer bg-dark">
   <button id="opfab-admin-user-btn-close" type="button" (click)="activeModal.dismiss('Cross click')" class="opfab-btn-cancel" data-dismiss="modal"
-    translate>admin.input.user.close</button>
+    translate>admin.input.close</button>
   <button id="opfab-admin-user-btn-add" [disabled]="!form.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
     translate>admin.input.user.add</button>
   <button id="opfab-admin-user-btn-save" [disabled]="!form.valid" *ngIf="row" (click)="update()" class="opfab-btn"
-    translate>admin.input.user.save</button>
+    translate>admin.input.save</button>
 </div>
diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
index 50c203405e..8220852f7b 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
+++ b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
@@ -1,3 +1,12 @@
+/* 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.
+ */
 
 .ng-valid[required], .ng-valid.required  {
   border-left: 5px solid #42A948; /* green */
@@ -37,4 +46,4 @@ form, input, label, p {
 
 ::ng-deep .mat-select-value {
     color: white;
-}
\ No newline at end of file
+}
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 335a3e9509..2d54512924 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
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTEI (http://www.rte-international.com)
+/* 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
@@ -7,24 +8,23 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { FormGroup, FormControl, Validators, AbstractControl } from '@angular/forms';
-import { OnInit, Component, Input } from '@angular/core';
-import { User } from '@ofModel/user.model';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { UserService } from '@ofServices/user.service';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { GroupsService } from '@ofServices/groups.service';
-import { EntitiesService } from '@ofServices/entities.service';
-import { Entity } from '@ofModel/entity.model';
-import { Group } from '@ofModel/group.model';
-import { IdValidatorService } from 'app/modules/admin/services/id-validator.service';
+import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
+import {Component, Input, OnInit} from '@angular/core';
+import {User} from '@ofModel/user.model';
+import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
+import {UserService} from '@ofServices/user.service';
+import {GroupsService} from '@ofServices/groups.service';
+import {EntitiesService} from '@ofServices/entities.service';
+import {Entity} from '@ofModel/entity.model';
+import {Group} from '@ofModel/group.model';
+import {IdValidatorService} from 'app/modules/admin/services/id-validator.service';
 
 @Component({
-  selector: 'of-editmodal',
+  selector: 'of-edit-user-modal',
   templateUrl: './edit-user-modal.component.html',
   styleUrls: ['./edit-user-modal.component.scss']
 })
-export class EditUsermodalComponent implements OnInit {
+export class EditUserModalComponent implements OnInit {
 
   form = new FormGroup({
     login: new FormControl(''
@@ -42,11 +42,10 @@ export class EditUsermodalComponent implements OnInit {
   @Input() row: User;
 
   constructor(
-    public activeModal: NgbActiveModal,
+    private activeModal: NgbActiveModal,
     private crudService: UserService,
-    private data: DataTableShareService,
     private groupsService: GroupsService,
-    private entitesService: EntitiesService) {
+    private entitiesService: EntitiesService) {
   }
 
   ngOnInit() {
@@ -55,6 +54,7 @@ export class EditUsermodalComponent implements OnInit {
     }
     this.initializeEntities();
     this.initializeGroups();
+
   }
 
   update() {
@@ -63,8 +63,11 @@ export class EditUsermodalComponent implements OnInit {
     this.groups.setValue(this.groups.value.filter((item: string) => item.length > 0));
     this.entities.setValue(this.entities.value.filter((item: string) => item.length > 0));
     this.crudService.update(this.form.value).subscribe(() => {
-      this.data.changeUserRow(this.form.value);
-      this.activeModal.dismiss('Update click');
+      this.activeModal.close('Update button clicked on user 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.
     });
   }
 
@@ -101,7 +104,7 @@ export class EditUsermodalComponent implements OnInit {
 
 
   private initializeEntities(): void {
-    this.entitesService.getAll().subscribe(response => {
+    this.entitiesService.getAll().subscribe(response => {
       this.entitiesList = response;
     });
 
@@ -125,4 +128,4 @@ export class EditUsermodalComponent implements OnInit {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table.component.ts b/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table.component.ts
deleted file mode 100644
index d6bb35a247..0000000000
--- a/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table.component.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright (c) 2018-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, OnDestroy, OnInit } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-import { EntitiesService } from '@ofServices/entities.service';
-import { AppState } from '@ofStore/index';
-import { AppError } from 'app/common/error/app-error';
-import { ConfirmationDialogService } from 'app/modules/admin/services/confirmation-dialog.service';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { Observable, Subject, throwError } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
-import { EditEntityGroupModalComponent } from '../../editmodal/groups-entities/edit-entity-group-modal.component';
-import { OfTableComponent } from '../oftable/oftable.component';
-
-@Component({
-  selector: 'of-entities-table',
-  templateUrl: '../oftable/oftable.component.html'
-})
-export class OfEntitiesTableComponent extends OfTableComponent implements OnInit, OnDestroy {
-
-  unsubscribe$: Subject<void> = new Subject<void>();
-
-  modalComponent = EditEntityGroupModalComponent;
-  typeModal = 'entity';
-  constructor(
-    protected crudService: EntitiesService,
-    protected modalService: NgbModal,
-    protected dataService: DataTableShareService,
-    protected translate: TranslateService,
-    private confirmationDialogService: ConfirmationDialogService,
-    protected store: Store<AppState>
-  ) {
-    super(modalService, dataService, store);
-    this.crudService = crudService;
-    this.config.sorting = { columns: this.columns };
-    this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
-      this.translate.use(locale);
-      this.translate.get(['admin.input.id.label', 'admin.input.name.label', 'admin.input.description',
-        'admin.input.user.edit', 'admin.input.user.delete', 'admin.input.user.filter', 'admin.pagination.firstText',
-        'admin.pagination.lastText', 'admin.pagination.nextText', 'admin.pagination.prevText'
-        , 'admin.input.entity.add', 'admin.input.lines', 'admin.input.user.filter', 'admin.input.user.filterAll'])
-        .subscribe(translations => {
-          this.columns = [
-            {
-              title: translations['admin.input.id.label'],
-              name: 'id',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.id.label']
-              },
-            },
-            {
-              title: translations['admin.input.name.label'],
-              name: 'name',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.name.label']
-              },
-            },
-            {
-              title: translations['admin.input.description'],
-              name: 'description',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.description']
-              }
-            },
-            {
-              title: translations['admin.input.user.edit'],
-              name: 'edit'
-            },
-            {
-              title: translations['admin.input.user.delete'],
-              name: 'delete'
-            }
-          ];
-          this.firstText = translations['admin.pagination.firstText'];
-          this.lastText = translations['admin.pagination.lastText'];
-          this.nextText = translations['admin.pagination.nextText'];
-          this.prevText = translations['admin.pagination.prevText'];
-          this.addLabel = translations['admin.input.entity.add'];
-          this.lineLabel = translations['admin.input.lines'];
-          this.filterAll = translations['admin.input.user.filterAll'];
-
-        });
-    });
-  }
-
-
-  openDeleteConfirmationDialog(row: any): any {
-    this.confirmationDialogService.confirm(
-      this.translate.instant('admin.input.user.confirm'),
-      this.translate.instant('admin.input.entity.delete') + ' ' + row.id + '?',
-      'OK',
-      this.translate.instant('admin.input.user.cancel')
-    ).then((confirmed) => {
-      if (confirmed) {
-        this.deleteItem(row.id, 'id');
-      }
-    }).catch(() => throwError(new AppError(null)));
-  }
-
-  getObservableRow(): Observable<any> {
-    return this.dataService.getEntityRowEvent();
-  }
-
-  ngOnDestroy() {
-    this.unsubscribe$.next();
-    this.unsubscribe$.complete();
-  }
-
-}
diff --git a/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table.component.ts b/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table.component.ts
deleted file mode 100644
index 500599541b..0000000000
--- a/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table.component.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 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, OnDestroy, OnInit } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-import { GroupsService } from '@ofServices/groups.service';
-import { AppState } from '@ofStore/index';
-import { AppError } from 'app/common/error/app-error';
-import { ConfirmationDialogService } from 'app/modules/admin/services/confirmation-dialog.service';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { Observable, Subject, throwError } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
-import { EditEntityGroupModalComponent } from '../../editmodal/groups-entities/edit-entity-group-modal.component';
-import { OfTableComponent } from '../oftable/oftable.component';
-
-@Component({
-  selector: 'of-groups-table',
-  templateUrl: '../oftable/oftable.component.html'
-})
-export class OfGroupsTableComponent extends OfTableComponent implements OnInit, OnDestroy {
-
-  unsubscribe$: Subject<void> = new Subject<void>();
-
-  modalComponent = EditEntityGroupModalComponent;
-  typeModal = 'group';
-  constructor(
-    protected crudService: GroupsService,
-    protected modalService: NgbModal,
-    protected dataService: DataTableShareService,
-    protected translate: TranslateService,
-    private confirmationDialogService: ConfirmationDialogService,
-    protected store: Store<AppState>
-  ) {
-    super(modalService, dataService, store);
-    this.crudService = crudService;
-    this.config.sorting = { columns: this.columns };
-    this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
-      this.translate.use(locale);
-      this.translate.get(['admin.input.id.label', 'admin.input.name.label', 'admin.input.description',
-        'admin.input.user.edit', 'admin.input.user.delete', 'admin.input.user.filter', 'admin.input.user.filter',
-        'admin.pagination.firstText', 'admin.pagination.lastText', 'admin.pagination.nextText', 'admin.pagination.prevText'
-        , 'admin.input.group.add', 'admin.input.lines', 'admin.input.user.filter', 'admin.input.user.filterAll'])
-        .subscribe(translations => {
-          this.columns = [
-            {
-              title: translations['admin.input.id.label'],
-              name: 'id',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.id.label']
-              },
-            },
-            {
-              title: translations['admin.input.name.label'],
-              name: 'name',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.name.label']
-              },
-            },
-            {
-              title: translations['admin.input.description'],
-              name: 'description',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.description']
-              }
-            },
-            {
-              title: translations['admin.input.user.edit'],
-              name: 'edit'
-            },
-            {
-              title: translations['admin.input.user.delete'],
-              name: 'delete'
-            }
-          ];
-          this.firstText = translations['admin.pagination.firstText'];
-          this.lastText = translations['admin.pagination.lastText'];
-          this.nextText = translations['admin.pagination.nextText'];
-          this.prevText = translations['admin.pagination.prevText'];
-          this.addLabel = translations['admin.input.group.add'];
-          this.lineLabel = translations['admin.input.lines'];
-          this.filterAll = translations['admin.input.user.filterAll'];
-
-        });
-    });
-  }
-
-
-  openDeleteConfirmationDialog(row: any): any {
-    this.confirmationDialogService.confirm(
-      this.translate.instant('admin.input.user.confirm'),
-      this.translate.instant('admin.input.group.delete') + ' ' + row.id + '?',
-      'OK',
-      this.translate.instant('admin.input.user.cancel')
-    ).then((confirmed) => {
-      if (confirmed) {
-        this.deleteItem(row.id, 'id');
-      }
-    }).catch(() => throwError(new AppError(null)));
-  }
-
-  getObservableRow(): Observable<any> {
-    return this.dataService.getGroupRowEvent();
-  }
-
-  ngOnDestroy() {
-    this.unsubscribe$.next();
-    this.unsubscribe$.complete();
-  }
-
-}
diff --git a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html b/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html
deleted file mode 100644
index a81e975359..0000000000
--- a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="row">
-  <div class="col-md-4">
-    <input *ngIf="config.filtering" placeholder={{filterAll}}
-           [ngTableFiltering]="config.filtering"
-           class="form-control"
-           (tableChanged)="onChangeTable(config)"/>
-  </div>
-  <div><a class="btn btn-primary" (click)="createNewItem()" id ="addUser">
-    <em class="fas fa-plus-circle"></em></a> 
-    <label for="addUser"> {{addLabel}} </label>
-  </div>
-</div>
-<br>
-<ng-table [config]="config"
-          (tableChanged)="onChangeTable(config)"
-          (cellClicked)="onCellClick($event)"
-          [rows]="rows" [columns]="columns">
-</ng-table>
-
-<pagination *ngIf="config.paging"
-            class="pagination-sm"
-            [(ngModel)]="page"
-            [totalItems]="length"
-            [itemsPerPage]="itemsPerPage"
-            [maxSize]="maxSize"
-            [boundaryLinks]="true"
-            [rotate]="false"
-            [firstText]="firstText" 
-            [lastText]="lastText"   
-            [previousText]="prevText"   
-            [nextText]="nextText"
-            (pageChanged)="onChangeTable(config, $event)"
-            (numPages)="numPages = $event">
-</pagination>
-
-
-
-<div class="form-group" class="bg-dark">
-      <select (change)="onChangeTable(config)" [(ngModel)]="itemsPerPage" >
-        <option [value]="5">5</option>
-        <option [value]="10">10</option>
-        <option [value]="25">25</option>
-        <option [value]="50">50</option>
-        <option [value]="75">75</option>
-        <option [value]="100">100</option>
-      </select>
-      <label for="itemsPerPage"> {{lineLabel}} </label>
-</div>
diff --git a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts b/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts
deleted file mode 100644
index ff1a686fcc..0000000000
--- a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright (c) 2018-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 { Component, OnInit } from '@angular/core';
-import {
-  NgbModalOptions,
-  ModalDismissReasons,
-  NgbModal
-} from '@ng-bootstrap/ng-bootstrap';
-import { Store } from '@ngrx/store';
-import { CrudService } from '@ofServices/crud-service';
-import { AppState } from '@ofStore/index';
-import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { Observable, Subject, Subscription } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
-
-@Component({
-  // tslint:disable-next-line: component-selector
-  selector: 'of-table',
-  templateUrl: './oftable.component.html'
-})
-
-export class OfTableComponent implements OnInit {
-
-  page = 1;
-  itemsPerPage = 5;
-  maxSize = 1000;
-  numPages = 1;
-  length = 0;
-  columns: Array<any> = [];
-  rows: Array<any> = [];
-  data: Array<any> = [];
-  firstText: string;
-  lastText: string;
-  prevText: string;
-  nextText: string;
-  protected crudService: CrudService;
-  protected actions = {
-    edit: '<a class="btn btn-primary"><em class="fas fa-pen-square"></em></a>',
-    delete: '<a class="btn btn-primary"><em class="far fa-trash-alt"></em></a>'
-  };
-  config: any = {
-    paging: true,
-    sorting: { columns: this.columns },
-    filtering: { filterString: '' },
-    className: ['table-striped', 'table-bordered', 'table-hover', 'table-dark'],
-  };
-  modalComponent: any;
-  addLabel: string;
-  lineLabel: string;
-  filterAll: any;
-
-  protected modalOptions: NgbModalOptions = {
-    backdrop: 'static',
-    backdropClass: 'customBackdrop',
-  };
-
-  protected closeResult: string;
-  private destroy$: Subject<void> = new Subject<void>();
-
-  constructor(
-    protected modalService: NgbModal,
-    protected dataService: DataTableShareService,
-    protected store: Store<AppState>
-  ) { }
-
-  typeModal: string;
-
-  ngOnInit() {
-    this.crudService.getAll().pipe(takeUntil(this.destroy$)).subscribe((response) => {
-      this.data = response;
-      // tslint:disable-next-line: no-console
-      console.info('All items table was loaded totally and successfully total ' + this.data.length);
-      this.onChangeTable(this.config);
-      this.subscribeTable();
-      /*;*/
-    });
-  }
-
-
-  onCellClick(data: any): any {
-    const column = data.column;
-    if (column === 'edit') {
-      const modalRef = this.modalService.open(this.modalComponent);
-      modalRef.componentInstance.row = data['row'];
-      modalRef.componentInstance.type = this.typeModal;
-    }
-    if (column === 'delete') {
-      this.openDeleteConfirmationDialog(data['row']);
-    }
-  }
-
-  createNewItem(): void {
-    const modalRef = this.modalService.open(this.modalComponent);
-    modalRef.componentInstance.type = this.typeModal;
-  }
-
-  openDeleteConfirmationDialog(row: any): any { }
-
-  public onChangeTable(config: any, page: any = { page: this.page, itemsPerPage: this.itemsPerPage }): any {
-    if (config.filtering) {
-      Object.assign(this.config.filtering, config.filtering);
-    }
-
-    if (config.sorting) {
-      Object.assign(this.config.sorting, config.sorting);
-    }
-
-    const filteredData = this.changeFilter(this.data, this.config);
-    const sortedData = this.changeSort(filteredData, this.config);
-    this.rows = page && config.paging ? this.changePage(page, sortedData) : sortedData;
-    this.length = sortedData.length;
-  }
-
-  deleteItem(id: string, key: string): Subscription {
-    return this.crudService.deleteById(id).pipe(takeUntil(this.destroy$)).subscribe(() => {
-      const itemIndex = this.data.findIndex((item) => item[key] === id);
-      this.data.splice(itemIndex, 1);
-      this.onChangeTable(this.config);
-      this.dataService.changeUsers(true);
-
-    });
-  }
-
-  getObservableRow(): Observable<any> {
-    return null;
-  }
-
-  protected subscribeTable(): void {
-    //refresh edited row event
-    this.getObservableRow().pipe(takeUntil(this.destroy$)).subscribe((row) => {
-      if (row) {
-        let itemIndex = -1;
-        if (row.login) {
-          itemIndex = this.data.findIndex((item) => item.login === row.login);
-        } else {
-          itemIndex = this.data.findIndex((item) => item.id === row.id);
-        }
-
-        if (itemIndex >= 0) {
-          this.data[itemIndex] = row;
-        } else {
-          this.data.push(row);
-        }
-        this.onChangeTable(this.config);
-      }
-    });
-  }
-
-  open(content) {
-    this.modalService.open(content, this.modalOptions).result.then(
-      (result) => {
-        this.closeResult = `Closed with: ${result}`;
-      },
-      (reason) => {
-        this.closeResult = `Dismissed ${this.getDismissReason(reason)}`;
-      }
-    );
-  }
-
-  private getDismissReason(reason: any): string {
-    if (reason === ModalDismissReasons.ESC) {
-      return 'by pressing ESC';
-    } else if (reason === ModalDismissReasons.BACKDROP_CLICK) {
-      return 'by clicking on a backdrop';
-    } else {
-      return `with: ${reason}`;
-    }
-  }
-
-  public changePage(page: any, data: Array<any> = this.data): Array<any> {
-    const start = (page.page - 1) * page.itemsPerPage;
-    const end = page.itemsPerPage > -1 ? (start + page.itemsPerPage) : data.length;
-    return data.slice(start, end);
-  }
-
-  public changeSort(data: any, config: any): any {
-    if (!config.sorting) {
-      return data;
-    }
-
-    const columns = this.config.sorting.columns || [];
-    let columnName: string = void 0;
-    let sort: string = void 0;
-
-    for (let i = 0; i < columns.length; i++) {
-      if (columns[i].sort !== '' && columns[i].sort !== false) {
-        columnName = columns[i].name;
-        sort = columns[i].sort;
-      }
-    }
-
-    if (!columnName) {
-      return data;
-    }
-
-    // simple sorting
-    return data.sort((previous: any, current: any) => {
-      if (previous[columnName] > current[columnName]) {
-        return sort === 'desc' ? -1 : 1;
-      } else if (previous[columnName] < current[columnName]) {
-        return sort === 'asc' ? -1 : 1;
-      }
-      return 0;
-    });
-  }
-
-  public changeFilter(data: any, config: any): any {
-    let filteredData: Array<any> = data;
-    this.columns.forEach((column: any) => {
-      if (column.filtering) {
-        filteredData = filteredData.filter((item: any) => {
-          if (!item[column.name]) {
-            item[column.name] = '';
-          }
-          return item[column.name]
-            .toString()
-            .match(column.filtering.filterString);
-        });
-      }
-    });
-
-    if (!config.filtering) {
-      return filteredData;
-    }
-
-    if (config.filtering.columnName) {
-      return filteredData.filter((item: any) =>
-        item[config.filtering.columnName].match(
-          this.config.filtering.filterString
-        )
-      );
-    }
-
-    const tempArray: Array<any> = [];
-    filteredData.forEach((item: any) => {
-      let flag = false;
-      this.columns.forEach((column: any) => {
-        if (column.name === 'edit') {
-          item[column.name] = this.actions['edit'];
-        }
-        if (column.name === 'delete') {
-          item[column.name] = this.actions['delete'];
-        }
-        if (
-          item[column.name].toString().match(this.config.filtering.filterString)
-        ) {
-          flag = true;
-        }
-      });
-      if (flag) {
-        tempArray.push(item);
-      }
-    });
-
-    filteredData = tempArray;
-
-    return filteredData;
-  }
-
-
-  protected getLocale(): Observable<string> {
-    return this.store.select(buildSettingsOrConfigSelector('locale'));
-  }
-
-}
diff --git a/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts b/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts
deleted file mode 100644
index e9b75a8afd..0000000000
--- a/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright (c) 2018-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, OnDestroy, OnInit } from '@angular/core';
-import { UserService } from '@ofServices/user.service';
-import { DataTableShareService } from '../../../services/data.service';
-import { OfTableComponent } from '../oftable/oftable.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
-import { ConfirmationDialogService } from 'app/modules/admin/services/confirmation-dialog.service';
-import { AppState } from '@ofStore/index';
-import { Store } from '@ngrx/store';
-import { Observable, Subject, throwError } from 'rxjs';
-import { AppError } from 'app/common/error/app-error';
-import { EditUsermodalComponent } from '../../editmodal/users/edit-user-modal.component';
-import { takeUntil } from 'rxjs/operators';
-
-
-@Component({
-  selector: 'of-users-table',
-  templateUrl: '../oftable/oftable.component.html'
-})
-export class OfUsersTableComponent extends OfTableComponent implements OnInit, OnDestroy {
-
-  unsubscribe$: Subject<void> = new Subject<void>();
-
-  modalComponent = EditUsermodalComponent;
-  typeModal = 'user';
-
-  constructor(
-    protected crudService: UserService,
-    protected modalService: NgbModal,
-    protected dataService: DataTableShareService,
-    protected translate: TranslateService,
-    private confirmationDialogService: ConfirmationDialogService,
-    protected store: Store<AppState>
-  ) {
-
-    super(modalService, dataService, store);
-    this.crudService = crudService;
-    this.config.sorting = { columns: this.columns };
-    this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
-      this.translate.use(locale);
-      this.translate.get(['admin.input.user.login', 'admin.input.user.firstname', 'admin.input.user.lastname',
-        'admin.input.user.groups', 'admin.input.user.entities', 'admin.input.user.edit', 'admin.input.user.delete',
-        'admin.pagination.firstText', 'admin.pagination.lastText', 'admin.pagination.nextText', 'admin.pagination.prevText'
-        , 'admin.input.user.add', 'admin.input.lines', 'admin.input.user.filter', 'admin.input.user.filterAll'])
-        .subscribe(translations => {
-          this.columns = [
-            {
-              title: translations['admin.input.user.login'],
-              name: 'login',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.user.login']
-              },
-            },
-            {
-              title: translations['admin.input.user.firstname'],
-              name: 'firstName',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.user.firstname']
-              },
-            },
-            {
-              title: translations['admin.input.user.lastname'],
-              name: 'lastName',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.user.lastname']
-              },
-            },
-            {
-              title: translations['admin.input.user.groups'],
-              name: 'groups',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.user.groups']
-              },
-            },
-            {
-              title: translations['admin.input.user.entities'],
-              name: 'entities',
-              filtering: {
-                filterString: '', placeholder: translations['admin.input.user.filter'] +
-                  translations['admin.input.user.entities']
-              },
-            },
-            {
-              title: translations['admin.input.user.edit'],
-              name: 'edit'
-            },
-            {
-              title: translations['admin.input.user.delete'],
-              name: 'delete'
-            }
-          ];
-          this.firstText = translations['admin.pagination.firstText'];
-          this.lastText = translations['admin.pagination.lastText'];
-          this.nextText = translations['admin.pagination.nextText'];
-          this.prevText = translations['admin.pagination.prevText'];
-          this.addLabel = translations['admin.input.user.add'];
-          this.lineLabel = translations['admin.input.lines'];
-          this.filterAll = translations['admin.input.user.filterAll'];
-
-        });
-    });
-  }
-
-  openDeleteConfirmationDialog(row: any): any {
-    this.confirmationDialogService.confirm(
-      this.translate.instant('admin.input.user.confirm'),
-      this.translate.instant('admin.input.delete') + ' ' + row.login + '?',
-      'OK',
-      this.translate.instant('admin.input.user.cancel')
-    ).then((confirmed) => {
-      if (confirmed) {
-        this.deleteItem(row.login, 'login');
-      }
-    }).catch(() => throwError(new AppError(null)));
-  }
-
-
-  protected subscribeTable(): void {
-    super.subscribeTable();
-    //regresh all users event
-    this.dataService.getUsersEvent().subscribe(() => {
-      this.crudService.getAll().subscribe((response) => {
-        this.data = response;
-        this.onChangeTable(this.config);
-      });
-    });
-  }
-
-  getObservableRow(): Observable<any> {
-    return this.dataService.getUserRowEvent();
-  }
-
-  ngOnDestroy() {
-    this.unsubscribe$.next();
-    this.unsubscribe$.complete();
-  }
-}
diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
new file mode 100644
index 0000000000..9335e1292c
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
@@ -0,0 +1,11 @@
+<!-- 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.                      -->
+
+<a (click)="openModalFromParent()" aria-hidden="" class="btn btn-primary btn-sm">
+        <em class="{{actionIconsMapping[actionType]}}"></em>
+</a>
diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
new file mode 100644
index 0000000000..a91f75b8c4
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
@@ -0,0 +1,43 @@
+/* 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';
+
+@Component({
+  selector: 'of-action-cell-renderer',
+  templateUrl: 'action-cell-renderer.component.html',
+})
+export class ActionCellRendererComponent implements ICellRendererAngularComp {
+
+  // For explanations regarding ag-grid CellRenderers see
+  // https://www.ag-grid.com/documentation/angular/component-cell-renderer/#example-rendering-using-angular-components
+  public params: any;
+  private actionType: string;
+
+  // Defines icons to display depending on action type
+  private actionIconsMapping = {
+    'edit': 'fas fa-pen',
+    'delete': 'far fa-trash-alt'
+  };
+
+  agInit(params: any): void {
+    this.params = params;
+    this.actionType = this.params.colDef.colId;
+  }
+
+  public openModalFromParent() {
+    this.params.context.componentParent.openActionModal(this.params);
+  }
+
+  refresh(): boolean {
+    return false;
+  }
+}
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.html b/ui/main/src/app/modules/admin/components/table/admin-table.component.html
new file mode 100644
index 0000000000..0a2d039459
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.component.html
@@ -0,0 +1,20 @@
+<!-- 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.                      -->
+
+<div style="padding: 10px"><a class="btn btn-primary" (click)="createNewItem()" id ="addItem">
+    <em class="fas fa-plus-circle"></em></a>
+    <span>&nbsp;<label for="addItem" translate> admin.input.{{this.tableType}}.add </label></span>
+</div>
+<br>
+<ag-grid-angular
+        (gridReady)="onGridReady($event)"
+        [gridOptions]="gridOptions"
+        [rowData]="rowData | async"
+        class="ag-theme-alpine opfab-ag-grid-theme"
+>
+</ag-grid-angular>
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
new file mode 100644
index 0000000000..c3367fec58
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
@@ -0,0 +1,205 @@
+/*
+ * 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 {ColDef, GridOptions, ICellRendererParams} from 'ag-grid-community';
+import {TranslateService} from '@ngx-translate/core';
+import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {throwError} from 'rxjs';
+import {ConfirmationDialogService} from "../../services/confirmation-dialog.service";
+import {ActionCellRendererComponent} from "./action-cell-renderer.component";
+import {AppError} from "../../../../common/error/app-error";
+import {CrudService} from "@ofServices/crud-service";
+
+@Component({
+  selector: 'of-admin-table',
+  templateUrl: 'admin-table.component.html'
+})
+export abstract class AdminTableComponent implements OnInit {
+
+  // These fields will be initialized in the concrete classes extending `AdminTableComponent`
+  // (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`) */
+  protected editModalComponent;
+  /** Type of data managed by the table (e.g. `AdminTableType.ENTITY`) */
+  protected tableType: AdminTableType;
+  /** Relevant fields for this data type. They will be used to populate the table columns */
+  protected fields: string[];
+  /** Among these fields, which one represents an item's unique id (e.g. `id`) */
+  protected idField: string;
+
+  // ag-grid configuration objects
+  protected gridOptions;
+  protected gridApi;
+  protected rowData: any;
+
+  @Input()
+  public paginationPageSize;
+
+  protected i18NPrefix = 'admin.input.';
+
+  constructor(
+      protected translateService: TranslateService,
+      protected confirmationDialogService: ConfirmationDialogService,
+      protected modalService: NgbModal,
+      protected crudService: CrudService) {
+
+    this.gridOptions = <GridOptions>{
+      context: {
+        componentParent: this
+      },
+      frameworkComponents : {
+        actionCellRenderer: ActionCellRendererComponent
+      },
+      domLayout: 'autoHeight',
+      defaultColDef : {
+        editable: false,
+        headerValueGetter: this.localizeHeader.bind(this)
+      },
+      columnTypes: {
+        'actionColumn': {
+          field: '',
+          sortable: false,
+          filter: false,
+          minWidth: 90,
+          flex: 1,
+          cellRenderer: 'actionCellRenderer',
+        },
+        'dataColumn': {
+          sortable: true,
+          filter: true,
+          flex: 3
+
+        }
+      },
+      localeTextFunc : function (key) {
+        // To avoid clashing with opfab assets, all keys defined by ag-grid are prefixed with "ag-grid."
+        // e.g. key "to" defined by ag-grid for use with pagination can be found under "ag-grid.to" in assets
+        return translateService.instant('ag-grid.' + key);
+        // Not this.translateService otherwise "undefined" error
+      },
+      pagination : true,
+      suppressCellSelection: true
+    };
+    // 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
+  }
+
+  ngOnInit() {
+    this.refreshData();
+  }
+
+  ngOnChanges() {
+    if(!!this.gridApi) this.gridApi.paginationSetPageSize(this.paginationPageSize);
+  }
+
+  public localizeHeader(parameters: ICellRendererParams): string {
+    const headerIdentifier = parameters.colDef.headerName;
+    return this.translateService.instant(this.i18NPrefix + headerIdentifier);
+  }
+
+  onGridReady(params) {
+    this.gridApi = params.api;
+    // Column definitions can't be managed in the constructor like the other grid options because they rely on the `fields`
+    // property that is defined in the classes implementing AdminTableComponent. As such, it is still undefined when the
+    // constructor from the supertype is called.
+    this.gridApi.setColumnDefs(this.createColumnDefs(this.fields,this.tableType+'.'));
+    this.gridApi.paginationSetPageSize(this.paginationPageSize);
+  }
+
+  /** This function generates the ag-grid `ColumnDefs` for the grid from a list of fields
+   * @param fields: string[] containing the name of the fields to display as columns in the table. They should match the
+   * name of the fields returned by the API for the type in question.
+   * @param i18nPrefixForHeader: optional prefix to add to the field name to create the relevant i18nKey
+   * @return ColDef[] object containing the column definitions for the grid
+   * */
+  createColumnDefs(fields: string[], i18nPrefixForHeader?: string): ColDef[] {
+    //if provided, i18nPrefixForHeader should have trailing dot
+
+    //Create data columns from fields
+    let columnDefs :ColDef[];
+    columnDefs = new Array(fields.length+2); //+2 because 2 action columns (see below)
+
+    fields.forEach((field : string, index:number) => {
+      columnDefs[index] = { headerName: i18nPrefixForHeader+field, field: field, type: 'dataColumn'}
+    });
+
+    //Add action columns
+    columnDefs[fields.length] = {
+      headerName: 'edit',
+      colId: 'edit',
+      type: 'actionColumn'
+    };
+    columnDefs[fields.length+1] = {
+      headerName: 'delete',
+      colId: 'delete',
+      type: 'actionColumn'
+    };
+
+    return columnDefs;
+  }
+
+  openActionModal(params) {
+    // 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);
+      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(
+          (result: any) => {
+            this.refreshData(); // This refreshes the data when the modal is closed after a change
+          },
+          (reason: any) => { }); // 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);
+    }
+
+  }
+
+  openDeleteConfirmationDialog(row: any): any {
+    this.confirmationDialogService.confirm(
+        this.translateService.instant('admin.input.confirm'),
+        this.translateService.instant('admin.input.user.confirmDelete') + ' ' + row[this.idField] + '?',
+        'OK', // TODO Refactor to avoid translate.instant ? OK is not i18ed ?
+        this.translateService.instant('admin.input.cancel')
+    ).then((confirmed) => {
+      if (confirmed) {
+        // The data refresh is launched inside the subscribe to make sure that the deletion request has been (correctly)
+        // handled first
+        this.crudService.deleteById(row[this.idField]).subscribe(x => this.refreshData()); // TODO unsubscribe on destroy?
+      }
+    }).catch(() => throwError(new AppError(null)));
+  }
+
+  createNewItem(): void {
+    const modalRef = this.modalService.open(this.editModalComponent);
+    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
+        // NGRX actions and effects for this sole purpose
+        (result: any) => {
+          this.refreshData();
+        },
+        (reason: any) => { });
+  }
+
+  refreshData() {
+    this.rowData = this.crudService.getAll();
+  }
+
+}
+
+export enum AdminTableType {
+  USER = 'user', ENTITY = 'entity', GROUP = 'group'
+}
+
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
new file mode 100644
index 0000000000..bb7971660e
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/entities-table.component.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 {CrudService} from "@ofServices/crud-service";
+import {HttpClient} from "@angular/common/http";
+import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+import {EntitiesService} from "@ofServices/entities.service";
+import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
+
+@Component({
+  templateUrl: 'admin-table.component.html',
+  providers:  [{provide: CrudService, useClass: EntitiesService, deps: [HttpClient]}],
+  selector: 'of-entities-table'
+})
+export class EntitiesTableComponent extends AdminTableComponent implements OnInit {
+
+  tableType = AdminTableType.ENTITY;
+  fields = ['id', 'name', 'description'];
+  idField = 'id';
+  editModalComponent = EditEntityGroupModalComponent;
+
+}
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
new file mode 100644
index 0000000000..671a958ce1
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/groups-table.component.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 {CrudService} from "@ofServices/crud-service";
+import {HttpClient} from "@angular/common/http";
+import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
+import {GroupsService} from "@ofServices/groups.service";
+
+@Component({
+  templateUrl: 'admin-table.component.html',
+  providers:  [{provide: CrudService, useClass: GroupsService, deps: [HttpClient]}],
+  selector: 'of-groups-table'
+})
+export class GroupsTableComponent extends AdminTableComponent implements OnInit {
+
+  tableType = AdminTableType.GROUP;
+  fields = ['id', 'name', 'description'];
+  idField = 'id';
+  editModalComponent = EditEntityGroupModalComponent;
+
+}
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
new file mode 100644
index 0000000000..871933df1a
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/users-table.component.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 {Component, OnInit} from '@angular/core';
+import {UserService} from '@ofServices/user.service';
+import {EditUserModalComponent} from '../editmodal/users/edit-user-modal.component';
+import {CrudService} from "@ofServices/crud-service";
+import {HttpClient} from "@angular/common/http";
+import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+
+@Component({
+  templateUrl: 'admin-table.component.html',
+  providers:  [{provide: CrudService, useClass: UserService, deps: [HttpClient]}],
+  selector: 'of-users-table'
+})
+export class UsersTableComponent extends AdminTableComponent implements OnInit {
+
+  tableType = AdminTableType.USER;
+  fields = ['login', 'firstName', 'lastName', 'groups', 'entities'];
+  idField = 'login';
+  editModalComponent = EditUserModalComponent;
+
+}
+
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 5f483abe71..c35533a9fe 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
@@ -1,18 +1,30 @@
-import { Injectable } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ConfirmationDialogComponent } from '../components/confirmation-dialog/confirmation-dialog.component';
+/* 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 {Injectable} from '@angular/core';
+import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
+import {ConfirmationDialogComponent} from '../components/confirmation-dialog/confirmation-dialog.component';
 
 @Injectable({
   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',
+    btnOkText: string = 'OK', // TODO I18N ?
     btnCancelText: string = 'Cancel'): Promise<boolean> {
     const modalRef = this.modalService.open(ConfirmationDialogComponent);
     modalRef.componentInstance.title = title;
diff --git a/ui/main/src/app/modules/admin/services/data.service.ts b/ui/main/src/app/modules/admin/services/data.service.ts
deleted file mode 100644
index 63dcb78226..0000000000
--- a/ui/main/src/app/modules/admin/services/data.service.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable, Subject } from 'rxjs';
-
-@Injectable()
-export class DataTableShareService {
-
-  private userRow = new Subject<any>();
-  private groupRow = new Subject<any>();
-  private entityRow = new Subject<any>();
-
-  private userRowData = this.userRow.asObservable();
-  private groupRowData = this.groupRow.asObservable();
-  private entityRowData = this.entityRow.asObservable();
-
-  private refreshUsers = new Subject<boolean>();
-
-
-
-
-  constructor() { }
-
-  changeUserRow(row: any) {
-    this.userRow.next(row);
-  }
-  changeGroupRow(row: any) {
-    this.groupRow.next(row);
-  }
-  changeEntityRow(row: any) {
-    this.entityRow.next(row);
-  }
-
-  getUserRowEvent(): Observable<any> {
-    return this.userRowData;
-  }
-  getGroupRowEvent(): Observable<any> {
-    return this.groupRowData;
-  }
-  getEntityRowEvent(): Observable<any> {
-    return this.entityRowData;
-  }
-
-  changeUsers(user: boolean) {
-    this.refreshUsers.next(true);
-  }
-  getUsersEvent(): Observable<boolean> {
-    return this.refreshUsers;
-  }
-
-}
diff --git a/ui/main/src/app/modules/admin/services/id-validator.service.ts b/ui/main/src/app/modules/admin/services/id-validator.service.ts
index 5b674bc212..e84944a77c 100644
--- a/ui/main/src/app/modules/admin/services/id-validator.service.ts
+++ b/ui/main/src/app/modules/admin/services/id-validator.service.ts
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTEI (http://www.rte-international.com)
+/* 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
@@ -7,8 +8,8 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { AbstractControl, ValidationErrors } from '@angular/forms';
-import { CrudService } from '@ofServices/crud-service';
+import {AbstractControl, ValidationErrors} from '@angular/forms';
+import {CrudService} from '@ofServices/crud-service';
 
 
 export class IdValidatorService {
diff --git a/ui/main/src/app/services/authentication/authentication.service.ts b/ui/main/src/app/services/authentication/authentication.service.ts
index 10ac26672f..2ac0e249e1 100644
--- a/ui/main/src/app/services/authentication/authentication.service.ts
+++ b/ui/main/src/app/services/authentication/authentication.service.ts
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com)
+/* 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
@@ -62,7 +63,6 @@ export class AuthenticationService {
     private mode: string;
     private authModeHandler: AuthenticationModeHandler;
     private implicitConf = implicitAuthenticationConfigFallback;
-    private authenticatedUser: User;
 
     /**
      * @constructor
@@ -247,7 +247,6 @@ export class AuthenticationService {
         return this.httpClient.get<User>(`${this.userDataUrl}/${auth.identifier}`)
             .pipe(
                 map(u => {
-                    this.authenticatedUser = u;
                     auth.firstName = u.firstName;
                     auth.lastName = u.lastName;
                     return auth;
diff --git a/ui/main/src/app/services/crud-service.ts b/ui/main/src/app/services/crud-service.ts
index 2cf7664930..518370fd0e 100644
--- a/ui/main/src/app/services/crud-service.ts
+++ b/ui/main/src/app/services/crud-service.ts
@@ -7,11 +7,16 @@
  * This file is part of the OperatorFabric project.
  */
 
- import { Observable } from 'rxjs';
+import {Observable} from 'rxjs';
+import {Injectable} from "@angular/core";
+import {ErrorService} from "@ofServices/error-service";
 
-export interface CrudService {
-  getAll(): Observable<Array<any>>;
-  update(data: any): Observable<any>;
-  deleteById(id: string): Observable<any>;
+@Injectable({
+    providedIn: 'root'
+})
+export abstract class CrudService extends ErrorService {
+  abstract getAll(): Observable<Array<any>>;
+  abstract update(data: any): Observable<any>;
+  abstract deleteById(id: string): Observable<any>;
 
 }
diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts
index 2ce2d9c4f1..fbd279af1e 100644
--- a/ui/main/src/app/services/entities.service.ts
+++ b/ui/main/src/app/services/entities.service.ts
@@ -7,24 +7,22 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { Injectable } from '@angular/core';
-import { environment } from '@env/environment';
-import { HttpClient } from '@angular/common/http';
-import { CrudService } from './crud-service';
-import { ErrorService } from './error-service';
-import { catchError } from 'rxjs/operators';
-import { Observable, Subject} from 'rxjs';
-import { Entity } from '@ofModel/entity.model';
-import { takeUntil } from 'rxjs/internal/operators/takeUntil';
-import { tap } from 'rxjs/operators';
+import {environment} from '@env/environment';
+import {HttpClient} from '@angular/common/http';
+import {CrudService} from './crud-service';
+import {catchError, tap} from 'rxjs/operators';
+import {Observable, Subject} from 'rxjs';
+import {Entity} from '@ofModel/entity.model';
+import {takeUntil} from 'rxjs/internal/operators/takeUntil';
+import {Injectable} from "@angular/core";
 
 
 declare const templateGateway: any;
 
 @Injectable({
-  providedIn: 'root'
+    providedIn: 'root'
 })
-export class EntitiesService extends ErrorService implements CrudService {
+export class EntitiesService extends CrudService {
 
  readonly entitiesUrl: string;
  private _entities: Entity[];
diff --git a/ui/main/src/app/services/error-service.ts b/ui/main/src/app/services/error-service.ts
index ace1c13d0e..02060a666c 100644
--- a/ui/main/src/app/services/error-service.ts
+++ b/ui/main/src/app/services/error-service.ts
@@ -1,9 +1,23 @@
-import { AppError } from 'app/common/error/app-error';
-import { NotAllowedError } from 'app/common/error/not-allowed-error';
-import { NotFoundError } from 'app/common/error/not-found-error';
-import { throwError } from 'rxjs';
+/* 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.
+ */
 
-export class ErrorService {
+import {AppError} from 'app/common/error/app-error';
+import {NotAllowedError} from 'app/common/error/not-allowed-error';
+import {NotFoundError} from 'app/common/error/not-found-error';
+import {throwError} from 'rxjs';
+
+/** This class describes what errors should be thrown depending on the API `Response`
+ * Services requiring this behaviour should extend this class (see `GroupService` for example).
+ * Note: This can't be an interface because Typescript doesn't allow default methods.
+ */
+export abstract class ErrorService {
 
   protected handleError(error: Response) {
     if (error.status === 404) {
diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts
index adadd223bc..3fb01248ae 100644
--- a/ui/main/src/app/services/groups.service.ts
+++ b/ui/main/src/app/services/groups.service.ts
@@ -7,19 +7,18 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { Injectable } from '@angular/core';
-import { CrudService } from './crud-service';
-import { Observable } from 'rxjs';
-import { Group } from '@ofModel/group.model';
-import { environment } from '@env/environment';
-import { HttpClient } from '@angular/common/http';
-import { catchError } from 'rxjs/operators';
-import { ErrorService } from './error-service';
+import {CrudService} from './crud-service';
+import {Observable} from 'rxjs';
+import {Group} from '@ofModel/group.model';
+import {environment} from '@env/environment';
+import {HttpClient} from '@angular/common/http';
+import {catchError} from 'rxjs/operators';
+import {Injectable} from "@angular/core";
 
 @Injectable({
   providedIn: 'root'
 })
-export class GroupsService extends ErrorService implements CrudService {
+export class GroupsService extends CrudService {
 
   readonly groupsUrl: string;
 
diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts
index 9fa3cc8e72..f33f3c178c 100644
--- a/ui/main/src/app/services/services.module.ts
+++ b/ui/main/src/app/services/services.module.ts
@@ -1,4 +1,5 @@
-/* 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)
+ * 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
@@ -7,8 +8,6 @@
  * This file is part of the OperatorFabric project.
  */
 
-
-
 import {ModuleWithProviders, NgModule, Optional, SkipSelf} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {HTTP_INTERCEPTORS} from '@angular/common/http';
@@ -22,15 +21,14 @@ import {FilterService} from '@ofServices/filter.service';
 import {ConfigService} from '@ofServices/config.service';
 import {I18nService} from '@ofServices/i18n.service';
 import {SettingsService} from '@ofServices/settings.service';
-import { UserService } from './user.service';
+import {UserService} from './user.service';
 import {SoundNotificationService} from '@ofServices/sound-notification.service';
 import {GlobalStyleService} from '@ofServices/global-style.service';
-import { AppService } from './app.service';
-import { DataTableShareService } from 'app/modules/admin/services/data.service';
-import { GroupsService } from './groups.service';
-import { EntitiesService } from './entities.service';
-import { ExportService } from './export.service';
-import { ReminderService} from '@ofServices/reminder/reminder.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({
     imports: [
@@ -58,7 +56,6 @@ import { ReminderService} from '@ofServices/reminder/reminder.service';
         SoundNotificationService,
         GlobalStyleService,
         AppService,
-        DataTableShareService,
         ReminderService
     ]
 })
diff --git a/ui/main/src/app/services/user.service.ts b/ui/main/src/app/services/user.service.ts
index c661a59c38..76e9a2d63a 100644
--- a/ui/main/src/app/services/user.service.ts
+++ b/ui/main/src/app/services/user.service.ts
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com)
+/* 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
@@ -8,21 +9,20 @@
  */
 
 
-import { Injectable } from '@angular/core';
-import { environment } from '@env/environment';
-import { Observable, Subject } from 'rxjs';
-import { Entity, User } from '@ofModel/user.model';
-import { UserWithPerimeters } from '@ofModel/userWithPerimeters.model';
-import { HttpClient } from '@angular/common/http';
-import { takeUntil } from 'rxjs/internal/operators/takeUntil';
-import { tap } from 'rxjs/operators';
-import { GroupsService } from './groups.service';
-import { CrudService } from './crud-service';
-import { catchError } from 'rxjs/operators';
-import { ErrorService } from './error-service';
-
-@Injectable()
-export class UserService extends ErrorService implements CrudService {
+import {environment} from '@env/environment';
+import {Observable, Subject} from 'rxjs';
+import {Entity, User} from '@ofModel/user.model';
+import {UserWithPerimeters} from '@ofModel/userWithPerimeters.model';
+import {HttpClient} from '@angular/common/http';
+import {takeUntil} from 'rxjs/internal/operators/takeUntil';
+import {catchError, tap} from 'rxjs/operators';
+import {CrudService} from './crud-service';
+import {Injectable} from "@angular/core";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserService extends CrudService {
   readonly userUrl: string;
   private _userWithPerimeters: UserWithPerimeters;
   private ngUnsubscribe = new Subject<void>();
@@ -31,7 +31,7 @@ export class UserService extends ErrorService implements CrudService {
    * @constructor
    * @param httpClient - Angular build-in
    */
-  constructor(private httpClient: HttpClient, private groupsService: GroupsService) {
+  constructor(private httpClient: HttpClient) {
     super();
     this.userUrl = `${environment.urls.users}`;
   }
@@ -62,7 +62,7 @@ export class UserService extends ErrorService implements CrudService {
 
   getAllUsers(): Observable<User[]> {
     return this.httpClient.get<User[]>(`${this.userUrl}`).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error))
     );
   }
 
@@ -72,7 +72,7 @@ export class UserService extends ErrorService implements CrudService {
 
   updateUser(userData: User): Observable<User> {
     return this.httpClient.post<User>(`${this.userUrl}`, userData).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error))
     );
   }
 
@@ -83,7 +83,7 @@ export class UserService extends ErrorService implements CrudService {
   queryAllEntities(): Observable<Entity[]> {
     const url = `${this.userUrl}/entities`;
     return this.httpClient.get<Entity[]>(url).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error))
     );
 
   }
@@ -112,18 +112,18 @@ export class UserService extends ErrorService implements CrudService {
         this._userWithPerimeters = userWithPerimeters;
       }, (error) => console.error(new Date().toISOString(), 'an error occurred', error));
     }
-    return (this.getCurrentUserWithPerimeters().userData.groups.filter(group => group === 'ADMIN').length > 0) ? true : false;
+    return (this.getCurrentUserWithPerimeters().userData.groups.filter(group => group === 'ADMIN').length > 0);
   }
 
   public isCurrentUserInAnyGroup(groups: string[]): boolean {
     if (!groups) {
-      return false
+      return false;
     }
     if (!this._userWithPerimeters) {
       this.currentUserWithPerimeters().subscribe((userWithPerimeters) => {
         this._userWithPerimeters = userWithPerimeters;
       }, (error) => console.error(new Date().toISOString(), 'an error occurred', error));
     }
-    return (this.getCurrentUserWithPerimeters().userData.groups.filter(group => groups.indexOf(group) >=0).length > 0) ? true : false;
+    return (this.getCurrentUserWithPerimeters().userData.groups.filter(group => groups.indexOf(group) >= 0).length > 0);
   }
 }
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 6deca3a7e8..1141ab16bd 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -184,7 +184,7 @@
     "delete": "Delete",
     "edit": "Edit",
     "yes": "YES",
-    "search" : "SEARCH" 
+    "search" : "SEARCH"
   },
   "feedConfiguration": {
     "title": "NOTIFICATION RECEPTION CONFIGURATION",
@@ -265,42 +265,45 @@
   "admin": {
     "input": {
       "group": {
-        "delete": "Do you really want to delete group",
+        "id": "Id",
+        "name": "Name",
+        "description": "Description",
+        "confirmDelete": "Do you really want to delete group",
         "add": "Add new group"
       },
       "entity": {
-        "delete": "Do you really want to delete entity",
+        "id": "Id",
+        "name": "Name",
+        "description": "Description",
+        "confirmDelete": "Do you really want to delete entity",
         "add": "Add new entity"
       },
       "user": {
         "login": "Login",
-        "lastname": "Last name",
-        "firstname": "First name",
+        "lastName": "Last name",
+        "firstName": "First name",
         "groups": "Groups",
         "entities": "Entities",
-        "add": "Add new user",
-        "edit": "Edit",
-        "delete": "Delete",
-        "save": "SAVE CHANGES",
-        "close": "CLOSE",
-        "cancel": "CANCEL",
-        "confirm": "Please confirm..",
-        "user": "user",
-        "filter": "filter by ",
-        "filterAll": "filter all columns"
+        "confirmDelete": "Do you really want to delete user",
+        "add": "Add new user"
       },
-      "delete": "Do you really want to delete user",
+      "edit": "Edit",
+      "delete": "Delete",
+      "save": "SAVE CHANGES",
+      "close": "CLOSE",
+      "cancel": "CANCEL",
+      "confirm": "Please confirm...",
       "login": {
         "required": "Login is required.",
         "minLength": "Login should be minimum 4 characters.",
         "maxLength": "Login should be maximum 20 characters.",
         "alreadyTaken": "Login is already taken."
       },
-      "firstname": {
+      "firstName": {
         "required": "First name is required.",
         "maxLength": "First name should be maximum 20 characters."
       },
-      "lastname": {
+      "lastName": {
         "required": "Last name is required.",
         "maxLength": "Last name should be maximum 20 characters."
       },
@@ -308,8 +311,7 @@
         "required": "Id is required.",
         "minLength": "Id should be minimum 2 characters.",
         "maxLength": "Id should be maximum 20 characters.",
-        "alreadyTaken": "ID is already taken.",
-        "label":"Id"
+        "alreadyTaken": "ID is already taken."
       },
       "name": {
         "required": "Name is required.",
@@ -317,18 +319,28 @@
         "label":"Name"
       },
       "description": "Description",
-      "lines": "lines"
+      "lines": "lines per page"
     },
     "tabs": {
       "users": "Users management",
       "groups": "Groups management",
       "entities": "Entities management"
-    },
-    "pagination": {
-      "firstText": "First",
-      "lastText": "Last",
-      "nextText": "Next",
-      "prevText": "Previous"
     }
+  },
+  "ag-grid": {
+    "loadingOoo": "Loading...",
+    "noRowsToShow": "No Rows To Show",
+    "filterOoo": "Filter...",
+    "equals": "Equals",
+    "notEqual": "Not equal",
+    "contains": "Contains",
+    "notContains": "Not contains",
+    "startsWith": "Starts with",
+    "endsWith": "Ends with",
+    "andCondition": "AND",
+    "orCondition": "OR",
+    "to": "to",
+    "of": "of",
+    "page": "Page"
   }
 }
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index df12f10c54..353f07b902 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -247,7 +247,8 @@
     "btnUnlock": "MODIFIER REPONSE",
     "error": {
       "submit": "La carte n'a pas pu être envoyée",
-      "form": "Le formulaire n'est pas correctement rempli"
+      "form": "Le formulaire n'est pas correctement rempli",
+      "ack": "Impossible d'agir sur l'acquittement de cette carte en raison d'un problème technique"
     },
     "submitSuccess": "Votre réponse est confirmée. Merci!",
     "answers": "Réponses",
@@ -263,71 +264,83 @@
   },
   "admin": {
     "input": {
-       "group": {
-         "delete": "Voulez vous vraiment supprimer le group",
-         "add":"Ajouter un nouveau groupe"
+      "group": {
+        "id": "Id",
+        "name": "Nom",
+        "description": "Description",
+        "confirmDelete": "Voulez vous vraiment supprimer le groupe",
+        "add":"Ajouter un nouveau groupe"
       },
       "entity": {
-         "delete": "Voulez vous vraiment supprimer l'entité",
-         "add":"Ajouter une nouvelle entité"
+        "id": "Id",
+        "name": "Nom",
+        "description": "Description",
+        "confirmDelete": "Voulez vous vraiment supprimer l'entité",
+        "add":"Ajouter une nouvelle entité"
       },
       "user": {
         "login": "Identifiant",
-        "lastname": "Nom",
-        "firstname": "Prénom",
+        "lastName": "Nom",
+        "firstName": "Prénom",
         "groups": "Groupes",
-        "entities": "Entitiés",
-        "add": "Ajouter un nouvel utilisateur",
-        "edit": "Editer",
-        "delete": "Supprimer",
-        "save": "SAUVEGARDER LES CHANGEMENTS",
-        "close": "FERMER",
-        "cancel": "ABANDONNER",
-        "confirm":"Confirmez..",
-        "user":"utilisateur",
-        "filter": "filtrer par ",
-        "filterAll": "filtrer toutes les colonnes"
+        "entities": "Entités",
+        "confirmDelete": "Voulez vous vraiment supprimer l'utilisateur",
+        "add":"Ajouter un nouvel utilisateur"
       },
-      "delete" :"Voulez vous vraiment supprimer l'utilisateur",
+      "edit": "Editer",
+      "delete": "Supprimer",
+      "save": "SAUVEGARDER LES CHANGEMENTS",
+      "close": "FERMER",
+      "cancel": "ABANDONNER",
+      "confirm":"Confirmez...",
       "login": {
         "required": "L'identifiant est obligatoire.",
         "minLength": "L'identifiant doit avoir au moins 4 caractères.",
         "maxLength": "L'identifiant doit avoir au maximum 20 caractères.",
-        "alreadyTaken": "Cet identifiant est déjà pris."
+        "alreadyTaken": "Cet identifiant existe déjà."
       },
-      "firstname": {
+      "firstName": {
         "required": "Le prénom est obligatoire.",
         "maxLength": "Le prénom doit avoir  au maximum 20 caractères."
       },
-      "lastname": {
+      "lastName": {
         "required": "Le nom est obligatoire.",
         "maxLength": "Le nom doit avoir  au maximum 20 caractères."
       },
-     "id": {
+      "id": {
         "required": "L'identifiant est obligatoire.",
         "minLength": "L'identifiant doit avoir au moins 2 caractères.",
         "maxLength": "L'identifiant doit avoir au maximum 20 caractères.",
-        "alreadyTaken": "Cet identifiant est déjà pris.",
-        "label":"Id"
+        "alreadyTaken": "Cet identifiant existe déjà."
       },
       "name": {
         "required": "Le nom est obligatoire.",
-        "maxLength": "Le nom doit avoir  au maximum 20 caractères.",
+        "maxLength": "Le nom doit avoir au maximum 20 caractères.",
         "label":"Nom"
       },
       "description": "Description",
-      "lines": "lines"
+      "lines": "lignes par page"
     },
     "tabs": {
       "users": "Gestion des utilisateurs",
       "groups": "Gestion des groupes",
       "entities": "Gestion des entités"
-    },
-    "pagination": {
-      "firstText": "Premier",
-      "lastText": "Dernier",
-      "nextText": "Suivant",
-      "prevText": "Précédent"
     }
+  },
+  "ag-grid": {
+    "loadingOoo": "Chargement en cours...",
+    "noRowsToShow": "Aucune donnée",
+    "filterOoo": "Filtrer...",
+    "equals": "Egal à",
+    "notEqual": "N'est pas égal à",
+    "contains": "Contient",
+    "notContains": "Ne contient pas",
+    "startsWith": "Commence par",
+    "endsWith": "Finit par",
+    "andCondition": "ET",
+    "orCondition": "OU",
+    "to": "à",
+    "of": "de",
+    "page": "Page"
   }
 }
diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss
index 7a6e978c96..50c2978674 100644
--- a/ui/main/src/assets/styles/styles.scss
+++ b/ui/main/src/assets/styles/styles.scss
@@ -1,4 +1,5 @@
-/* Copyright (c) 2018-2021, RTE (http://www.rte-france.com)
+/* 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
@@ -7,15 +8,17 @@
  * This file is part of the OperatorFabric project.
  */
 
-
-
 /* You can add global styles to this file, and also import other style files */
 
 @import "variables";
 /* import bootstrap*/
 @import '../../../node_modules/bootstrap/scss/bootstrap.scss';
 @import "navbar.scss";
-@import '@angular/material/prebuilt-themes/deeppurple-amber.css';
+//@import '../../../node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css';
+
+@import "../../../node_modules/ag-grid-community/dist/styles/ag-grid.css";
+@import "../../../node_modules/ag-grid-community/dist/styles/ag-theme-alpine.css";
+@import "../../../node_modules/ag-grid-community/dist/styles/ag-theme-alpine/sass/ag-theme-alpine-mixin.scss";
 
 
 body {
@@ -43,18 +46,18 @@ body {
 
 ::-webkit-scrollbar-track {
   border-radius: 8px;
-  background: var(--opfab-scrollbar-bgcolor); 
+  background: var(--opfab-scrollbar-bgcolor);
   border: solid 1px var(--opfab-scrollbar-border-color);
 }
- 
+
 ::-webkit-scrollbar-thumb {
-  background: var(--opfab-scrollbar-bar-bgcolor); 
+  background: var(--opfab-scrollbar-bar-bgcolor);
     border-radius: 8px;
     border: solid 1px var(--opfab-scrollbar-bar-border-color);
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: var(--opfab-scrollbar-bar-bgcolor); 
+  background: var(--opfab-scrollbar-bar-bgcolor);
     border-radius: 8px;
     border: solid 1px var(--opfab-scrollbar-bar-border-color);
 }
@@ -74,14 +77,14 @@ body {
   font-size: 14px;
   font-weight: 600;
   margin: 10px;
-  padding: 10px; 
+  padding: 10px;
   min-width: 150px;
 }
 
 .opfab-btn:hover {
   background-color: #2268FF;
 }
- 
+
 .opfab-btn:disabled {
   color: #606267 ;
   background-color: var(--opfab-button-disable-bgcolor);
@@ -97,7 +100,7 @@ body {
   font-size: 14px;
   font-weight: 600;
   margin: 10px;
-  padding: 10px; 
+  padding: 10px;
   min-width: 150px;
 }
 
@@ -125,7 +128,7 @@ body {
   color:var(--opfab-input-text-color);
   background-color: var(--opfab-bgcolor-darker);
   box-sizing: border-box;
-  
+
   border: 0.5px solid var(--opfab-form-border-color);
   border-radius: 3px;
   font-size: 13px;
@@ -154,7 +157,7 @@ body {
   padding-left: 10px;
   padding-right: 10px;
   position: absolute;
-  font-size: 11px;  
+  font-size: 11px;
   top: -10px;
   left:10;
   color: var(--opfab-form-label-text-color);
@@ -210,27 +213,27 @@ body {
   filter: none;
 }
 
-  // Chrome  : to avoid browser styling when auto-filling input field (example password) 
+  // Chrome  : to avoid browser styling when auto-filling input field (example password)
   // see https://stackoverflow.com/questions/2781549/removing-input-background-colour-for-chrome-autocomplete
   input:-webkit-autofill,
-  input:-webkit-autofill:hover, 
-  input:-webkit-autofill:focus, 
+  input:-webkit-autofill:hover,
+  input:-webkit-autofill:focus,
   input:-webkit-autofill:active  {
       -webkit-box-shadow: 0 0 0 30px var(--opfab-bgcolor-darker) inset !important;
   }
   input:-webkit-autofill {
     -webkit-text-fill-color: var(--opfab-text-color) !important;
   }
-  
 
-  
+
+
 
 .opfab-input > label {
   margin-left: 10px;
   padding-left: 10px;
   padding-right: 10px;
   position: absolute;
-  font-size: 11px;  
+  font-size: 11px;
   //top: 0px;
   margin-top: -10px;
   left:10;
@@ -288,7 +291,7 @@ body {
   width: 17px;
   border: 1px solid #979797;
   border-radius: 2px;
-  
+
 }
 
 /* Create the opfab-checkbox-checkmark/indicator (hidden when not checked) */
@@ -370,7 +373,7 @@ body {
 /* Style the indicator (dot/circle) */
 .opfab-radio-button .opfab-radio-button-checkmark:after {
   top: 17%;
-  left: 17%; 
+  left: 17%;
 	width: 65%;
 	height: 65%;
 	border-radius: 50%;
@@ -388,7 +391,7 @@ body {
   color:var(--opfab-input-text-color);
   background-color: var(--opfab-bgcolor-darker);
   box-sizing: border-box;
-  
+
   border: 1px solid var(--opfab-form-border-color);
   border-radius: 3px;
   font-size: 13px;
@@ -410,7 +413,7 @@ body {
   padding-left: 10px;
   padding-right: 10px;
   position: absolute;
-  font-size: 11px;  
+  font-size: 11px;
   margin-top: -10px;
   left:10;
   color: var(--opfab-form-label-text-color);
@@ -470,7 +473,7 @@ body {
   padding-left: 10px;
   padding-right: 10px;
   position: absolute;
-  font-size: 11px;  
+  font-size: 11px;
   margin-top: -10px;
   left:10;
   color: var(--opfab-form-label-text-color);
@@ -525,7 +528,7 @@ type-ahead > .badge-primary {
   padding-left: 10px;
   padding-right: 10px;
   position: absolute;
-  font-size: 11px;  
+  font-size: 11px;
   top: -10px;
   left:10;
   color: var(--opfab-form-label-text-color);
@@ -572,15 +575,15 @@ type-ahead > .badge-primary {
 
 .opfab-form-lighter {
   .opfab-input,
-  .opfab-input > input, 
-  .opfab-input label , 
-  .opfab-textarea, 
+  .opfab-input > input,
+  .opfab-input label ,
+  .opfab-textarea,
   .opfab-textarea  > textarea,
-  .opfab-textarea label , 
-  .form-control , 
-  .form-control:disabled , 
+  .opfab-textarea label ,
+  .form-control ,
+  .form-control:disabled ,
   .opfab-input > input ,
-  .opfab-multiselect, 
+  .opfab-multiselect,
   .opfab-multiselect > label,
   .opfab-multiselect  .c-btn,
   .opfab-select,
@@ -588,11 +591,11 @@ type-ahead > .badge-primary {
   .opfab-select > select option,
   .opfab-select > label,
   .opfab-input-type-ahead,
-  .opfab-input-type-ahead > input, 
-  .opfab-input-type-ahead label , 
+  .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);
   }
@@ -600,20 +603,20 @@ type-ahead > .badge-primary {
   .opfab-multiselect .selected-list .c-angle-down svg, .opfab-multiselect .selected-list .c-angle-up svg{
     fill: var(--opfab-bgcolor);
   }
-  
+
 }
 
 // Table 
 
 
 .opfab-table {
-  
+
   background-color: var(--opfab-bgcolor-darker);
   color: var(--opfab-lightcard-detail-textcolor);
   padding-left: 5px;
   padding-right: 5px;
   padding-bottom: 5px;
-  
+
 
   table {
     text-align: left;
@@ -781,4 +784,23 @@ html, body { height: 100%; }
   .arrow::after{
     border-bottom: 0px;
   }
-}
\ No newline at end of file
+}
+
+// OpFab customization of the alpine theme for ag-grid
+// It allows the colors to match the ones from the OpFab global style and to respond to the night/day mode
+.opfab-ag-grid-theme {
+  @include ag-theme-alpine((
+          background-color: var(--opfab-bgcolor),
+          header-background-color: var(--opfab-bgcolor-darker),
+          odd-row-background-color: var(--opfab-bgcolor-darker),
+          modal-overlay-background-color: var(--opfab-bgcolor),
+          data-color: var(--opfab-text-color),
+          header-foreground-color: var(--opfab-text-color),
+          secondary-foreground-color: var(--opfab-text-color),
+          border-color: var(--opfab-table-border-color),
+          input-disabled-background-color: var(--opfab-button-disable-bgcolor),
+          input-disabled-border-color: var(--opfab-button-disable-bgcolor),
+          header-column-resize-handle-color: var(--opfab-table-border-color)
+));
+
+}

From 2efc88a0714760e74d5985d8176f67c986e86fc3 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Mon, 1 Feb 2021 18:25:22 +0100
Subject: [PATCH 08/62] [OC-1409] When pushing the process group file check for
 duplicate process

---
 services/core/businessconfig/build.gradle     | 20 +++++++++++--
 .../services/ProcessesService.java            | 26 +++++++++++++++++
 ...ps_with_duplicate_in_different_groups.json | 29 +++++++++++++++++++
 ...ssgroups_with_duplicate_in_same_group.json | 29 +++++++++++++++++++
 .../GivenAdminUserThirdControllerShould.java  | 26 +++++++++++++++++
 .../services/ProcessesServiceShould.java      | 24 +++++++++++++++
 .../reference_doc/process_definition.adoc     | 12 +++++---
 ...s2_with_duplicate_in_different_groups.json | 29 +++++++++++++++++++
 ...sgroups2_with_duplicate_in_same_group.json | 29 +++++++++++++++++++
 .../uploadProcessGroupsFile.feature           | 16 ++++++++++
 10 files changed, 234 insertions(+), 6 deletions(-)
 create mode 100644 services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_different_groups.json
 create mode 100644 services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_same_group.json
 create mode 100644 src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_different_groups.json
 create mode 100644 src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_same_group.json

diff --git a/services/core/businessconfig/build.gradle b/services/core/businessconfig/build.gradle
index 2b35360501..e08c51d4d4 100755
--- a/services/core/businessconfig/build.gradle
+++ b/services/core/businessconfig/build.gradle
@@ -47,6 +47,20 @@ task copyProcessGroupsFile(type: Exec){
     args "-c", "cp processgroups.json $project.projectDir/build/test-data/"
 }
 
+task copyProcessGroupsFile2(type: Exec) {
+    description 'copy processgroups_with_duplicate_in_same_group.json file for businessconfig party configuration data for tests in build/test-data'
+    workingDir "$project.projectDir/src/test/data/"
+    executable "bash"
+    args "-c", "cp processgroups_with_duplicate_in_same_group.json $project.projectDir/build/test-data/"
+}
+
+task copyProcessGroupsFile3(type: Exec) {
+    description 'copy processgroups_with_duplicate_in_different_groups.json file for businessconfig party configuration data for tests in build/test-data'
+    workingDir "$project.projectDir/src/test/data/"
+    executable "bash"
+    args "-c", "cp processgroups_with_duplicate_in_different_groups.json $project.projectDir/build/test-data/"
+}
+
 task createDevData(type: Copy){
     description 'prepare data in build/test-data for running bootRun task during development'
     from 'src/main/docker/volume/businessconfig-storage'
@@ -86,8 +100,10 @@ createDevData.dependsOn prepareDevDataDir
 compressBundle1Data.dependsOn prepareTestDataDir
 compressBundle2Data.dependsOn prepareTestDataDir
 copyProcessGroupsFile.dependsOn prepareTestDataDir
-test.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile
-unitTest.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile
+copyProcessGroupsFile2.dependsOn prepareTestDataDir
+copyProcessGroupsFile3.dependsOn prepareTestDataDir
+test.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile,copyProcessGroupsFile2,copyProcessGroupsFile3
+unitTest.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile,copyProcessGroupsFile2,copyProcessGroupsFile3
 bootRun.dependsOn createDevData
 
 // <<<<< Test data tasks
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 5eae82e10b..ec19a806a0 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
@@ -37,12 +37,15 @@
 
 import org.lfenergy.operatorfabric.businessconfig.model.*;
 import org.lfenergy.operatorfabric.businessconfig.model.Process;
+import org.lfenergy.operatorfabric.springtools.error.model.ApiError;
+import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException;
 import org.lfenergy.operatorfabric.utilities.PathUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
@@ -62,6 +65,8 @@ public class ProcessesService implements ResourceLoaderAware {
 
 	private static final String PATH_PREFIX = "file:";
     private static final String CONFIG_FILE_NAME = "config.json";
+    private static final String DUPLICATE_PROCESS_IN_PROCESS_GROUPS_FILE = "There is a duplicate process in the file you have sent";
+
     @Value("${operatorfabric.businessconfig.storage.path}")
     private String storagePath;
     private ObjectMapper objectMapper;
@@ -309,6 +314,20 @@ public synchronized Process updateProcess(InputStream is) throws IOException {
 		}
     }
 
+    public boolean checkNoDuplicateProcessInUploadedFile(ProcessGroupsData newProcessGroups) {
+        HashMap<String, Integer> mapOfProcesses = new HashMap<>();
+
+        for (ProcessGroup group : newProcessGroups.getGroups()) {
+            for (String process : group.getProcesses()) {
+                if (mapOfProcesses.containsKey(process))
+                    return false;
+                else
+                    mapOfProcesses.put(process, 1);
+            }
+        }
+        return true;
+    }
+
     /**
      * Updates or creates processgroups file from a file uploaded from POST /businessconfig/processgroups
      *
@@ -325,6 +344,13 @@ public synchronized void updateProcessGroupsFile(InputStream is) throws IOExcept
         ProcessGroupsData newProcessGroups = objectMapper.readValue(is, ProcessGroupsData.class);
         is.reset();
 
+        if (! checkNoDuplicateProcessInUploadedFile(newProcessGroups))
+            throw new ApiErrorException(
+                    ApiError.builder()
+                            .status(HttpStatus.BAD_REQUEST)
+                            .message(DUPLICATE_PROCESS_IN_PROCESS_GROUPS_FILE)
+                            .build());
+
         //copy file
         PathUtils.copyInputStreamToFile(is, rootPath.toString() + "/processGroups.json");
 
diff --git a/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_different_groups.json b/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_different_groups.json
new file mode 100644
index 0000000000..60da6b7517
--- /dev/null
+++ b/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_different_groups.json
@@ -0,0 +1,29 @@
+{
+  "groups": [
+    {
+      "id": "processgroup1",
+      "processes": [
+        "id_process1",
+        "id_process2"
+      ]
+    },
+    {
+      "id": "processgroup2",
+      "processes": [
+        "id_process3",
+        "id_process4",
+        "id_process1"
+      ]
+    }
+  ],
+  "locale": {
+    "en": {
+      "processgroup1": "Process Group 1",
+      "processgroup2": "Process Group 2"
+    },
+    "fr": {
+      "processgroup1": "Groupe de process 1",
+      "processgroup2": "Groupe de process 2"
+    }
+  }
+}
diff --git a/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_same_group.json b/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_same_group.json
new file mode 100644
index 0000000000..9cb201ad41
--- /dev/null
+++ b/services/core/businessconfig/src/test/data/processgroups_with_duplicate_in_same_group.json
@@ -0,0 +1,29 @@
+{
+  "groups": [
+    {
+      "id": "processgroup1",
+      "processes": [
+        "id_process1",
+        "id_process2"
+      ]
+    },
+    {
+      "id": "processgroup2",
+      "processes": [
+        "id_process3",
+        "id_process4",
+        "id_process3"
+      ]
+    }
+  ],
+  "locale": {
+    "en": {
+      "processgroup1": "Process Group 1",
+      "processgroup2": "Process Group 2"
+    },
+    "fr": {
+      "processgroup1": "Groupe de process 1",
+      "processgroup2": "Groupe de process 2"
+    }
+  }
+}
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/GivenAdminUserThirdControllerShould.java
index 04934eeada..2823fb9a75 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/GivenAdminUserThirdControllerShould.java
@@ -282,6 +282,32 @@ void createProcessGroups() throws Exception {
                     .andExpect(jsonPath("$.locale.fr.processgroup1", is("Groupe de process 1")))
                     .andExpect(jsonPath("$.locale.fr.processgroup2", is("Groupe de process 2")));
         }
+
+        @Test
+        void createProcessGroupsWithDuplicateProcessInSameGroup() throws Exception {
+            Path pathToProcessGroupsFile = Paths.get("./build/test-data/processgroups_with_duplicate_in_same_group.json");
+
+            MockMultipartFile processGroupsFile = new MockMultipartFile("file",
+                    "processgroups_with_duplicate_in_same_group.json", MediaType.TEXT_PLAIN_VALUE, Files
+                    .readAllBytes(pathToProcessGroupsFile));
+
+            mockMvc.perform(multipart("/businessconfig/processgroups").file(processGroupsFile))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.message", is("There is a duplicate process in the file you have sent")));
+        }
+
+        @Test
+        void createProcessGroupsWithDuplicateProcessInDifferentGroups() throws Exception {
+            Path pathToProcessGroupsFile = Paths.get("./build/test-data/processgroups_with_duplicate_in_different_groups.json");
+
+            MockMultipartFile processGroupsFile = new MockMultipartFile("file",
+                    "processgroups_with_duplicate_in_different_groups.json", MediaType.TEXT_PLAIN_VALUE, Files
+                    .readAllBytes(pathToProcessGroupsFile));
+
+            mockMvc.perform(multipart("/businessconfig/processgroups").file(processGroupsFile))
+                    .andExpect(status().isBadRequest())
+                    .andExpect(jsonPath("$.message", is("There is a duplicate process in the file you have sent")));
+        }
         
         @Nested
         @WithMockOpFabUser(login="adminUser", roles = {"ADMIN"})
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 10e7d24477..045719954a 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
@@ -25,7 +25,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 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;
@@ -38,8 +40,13 @@
 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.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;
 
@@ -203,6 +210,23 @@ void fetchResourceError() {
     );
   }
 
+  @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)
diff --git a/src/docs/asciidoc/reference_doc/process_definition.adoc b/src/docs/asciidoc/reference_doc/process_definition.adoc
index 388275d13e..0f52b6b194 100644
--- a/src/docs/asciidoc/reference_doc/process_definition.adoc
+++ b/src/docs/asciidoc/reference_doc/process_definition.adoc
@@ -340,11 +340,15 @@ section which resumes how to resolve common problems.
 
 == Processes groups
 
-OperatorFabric offers the possibility of defining processes groups. These groups have an impact only on the UI, for example on the notification configuration screen, by offering a more organized view of all the processes.
+OperatorFabric offers the possibility of defining process groups. These groups have an impact only on the UI, for
+example on the notification configuration screen, by offering a more organized view of all the processes.
+
+IMPORTANT: A process can only belong to one process group.
 
 To define processes groups, you have to upload a file via a `POST` http request as described in the
-ifdef::single-page-doc[<<../api/businessconfig/#/businessconfig/uploadProcessgroups, Businessconfig Service API documentation>>]
-ifndef::single-page-doc[<<{gradle-rootdir}/documentation/current/api/businessconfig/#/businessconfig/uploadProcessgroups, Businessconfig Service API documentation>>]
+
+ifdef::single-page-doc[link:../api/businessconfig/index.html#/businessconfig/uploadProcessgroups[Businessconfig Service API documentation]]
+ifndef::single-page-doc[link:{gradle-rootdir}/documentation/current/api/businessconfig/index.html#/default/uploadProcessgroups[Businessconfig Service API documentation]]
 .
 
 *Example*
@@ -399,4 +403,4 @@ Example of content for uploaded file :
 
 ----
 
-These command line should return a `201 http status`.
\ No newline at end of file
+These command line should return a `201 http status`.
diff --git a/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_different_groups.json b/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_different_groups.json
new file mode 100644
index 0000000000..cb1a6c7343
--- /dev/null
+++ b/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_different_groups.json
@@ -0,0 +1,29 @@
+{
+  "groups": [
+    {
+      "id": "processgroupKarate3",
+      "processes": [
+        "id_process5",
+        "id_process6"
+      ]
+    },
+    {
+      "id": "processgroupKarate4",
+      "processes": [
+        "id_process7",
+        "id_process8",
+	"id_process6"
+      ]
+    }
+  ],
+  "locale": {
+    "en": {
+      "processgroupKarate3": "Process Group Karate 3",
+      "processgroupKarate4": "Process Group Karate 4"
+    },
+    "fr": {
+      "processgroupKarate3": "Groupe de process Karate 3",
+      "processgroupKarate4": "Groupe de process Karate 4"
+    }
+  }
+}
diff --git a/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_same_group.json b/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_same_group.json
new file mode 100644
index 0000000000..47829f8e41
--- /dev/null
+++ b/src/test/api/karate/businessconfig/resources/processgroups2_with_duplicate_in_same_group.json
@@ -0,0 +1,29 @@
+{
+  "groups": [
+    {
+      "id": "processgroupKarate3",
+      "processes": [
+        "id_process5",
+        "id_process6"
+      ]
+    },
+    {
+      "id": "processgroupKarate4",
+      "processes": [
+        "id_process7",
+        "id_process8",
+	"id_process7"
+      ]
+    }
+  ],
+  "locale": {
+    "en": {
+      "processgroupKarate3": "Process Group Karate 3",
+      "processgroupKarate4": "Process Group Karate 4"
+    },
+    "fr": {
+      "processgroupKarate3": "Groupe de process Karate 3",
+      "processgroupKarate4": "Groupe de process Karate 4"
+    }
+  }
+}
diff --git a/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature b/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature
index 370efa18f0..6a6d1f3f8c 100644
--- a/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature
+++ b/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature
@@ -25,6 +25,22 @@ Feature: uploadProcessGroups
     And status 403
 
 
+  Scenario: Post process groups file with duplicate process
+    Given url opfabUrl + '/businessconfig/processgroups'
+    And header Authorization = 'Bearer ' + authToken
+    And multipart file file = { read: 'resources/processgroups2_with_duplicate_in_different_groups.json' }
+    When method post
+    And status 400
+
+
+  Scenario: Post process groups file with duplicate process in the same group
+    Given url opfabUrl + '/businessconfig/processgroups'
+    And header Authorization = 'Bearer ' + authToken
+    And multipart file file = { read: 'resources/processgroups2_with_duplicate_in_same_group.json' }
+    When method post
+    And status 400
+
+
   Scenario: Post process groups file
     Given url opfabUrl + '/businessconfig/processgroups'
     And header Authorization = 'Bearer ' + authToken

From a93a1e80a1dd1f158ca9099393d324901e3f4a85 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Fri, 29 Jan 2021 16:52:55 +0100
Subject: [PATCH 09/62] [OC-1395] Memorize feed filter and sort options

---
 .../feed-filter/feed-filter.component.ts      | 137 +++++++++++-------
 .../filters/feed-sort/feed-sort.component.ts  |  80 ++++++----
 2 files changed, 138 insertions(+), 79 deletions(-)

diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
index 5127387d66..cb55aa53aa 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
@@ -10,18 +10,17 @@
 
 
 import {Component, Input, OnDestroy, OnInit, ViewEncapsulation} from '@angular/core';
-import {Observable, Subject, timer} from "rxjs";
-import {Filter} from "@ofModel/feed-filter.model";
+import {Subject, timer} from "rxjs";
 import {Store} from "@ngrx/store";
 import {AppState} from "@ofStore/index";
-import {buildFilterSelector} from "@ofSelectors/feed.selectors";
 import {AbstractControl, FormControl, FormGroup} from "@angular/forms";
 import {debounce, debounceTime, distinctUntilChanged, first, takeUntil} from "rxjs/operators";
 import {ApplyFilter} from "@ofActions/feed.actions";
 import * as _ from 'lodash';
 import {FilterType} from "@ofServices/filter.service";
 
-import { DateTimeNgb } from '@ofModel/datetime-ngb.model';
+import { DateTimeNgb, getDateTimeNgbFromMoment } from '@ofModel/datetime-ngb.model';
+import moment from 'moment';
 
 
 @Component({
@@ -44,19 +43,6 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
 
     private dateFilterType = FilterType.PUBLISHDATE_FILTER;
 
-    private _filter$: Observable<Filter>;
-    private _ackFilter$: Observable<Filter>;
-
-
-
-    get filter$(): Observable<Filter>{
-        return this._filter$;
-    }
-
-    get ackFilter$(): Observable<Filter>{
-        return this._ackFilter$;
-    }
-
     constructor(private store: Store<AppState>) {
         this.typeFilterForm = this.createFormGroup();
         this.ackFilterForm = this.createAckFormGroup();
@@ -94,27 +80,43 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
 
     ngOnInit() {
         this.initTypeFilter();
-        this.initAckFilter();
-        this.initDateTimeFilter();
+
+        if (!this.hideAckFilter) {
+            this.initAckFilter();
+        }
+
+        if (!this.hideTimerTags) {
+            this.initDateTimeFilter();
+        }
     }
 
     private initTypeFilter() {
-        this._filter$ = this.store.select(buildFilterSelector(FilterType.TYPE_FILTER));
-        this._filter$.pipe(takeUntil(this.ngUnsubscribe$)).subscribe((next: Filter) => {
-            if (next) {
-                this.typeFilterForm.get('alarm').setValue(!next.active || next.status.alarm, {emitEvent: false});
-                this.typeFilterForm.get('action').setValue(!next.active || next.status.action, {emitEvent: false});
-                this.typeFilterForm.get('compliant').setValue(!next.active || next.status.compliant, {emitEvent: false});
-                this.typeFilterForm.get('information').setValue(!next.active || next.status.information, {emitEvent: false});
-            } else {
-                this.typeFilterForm.get('alarm').setValue(true,{emitEvent: false});
-                this.typeFilterForm.get('action').setValue(true,{emitEvent: false});
-                this.typeFilterForm.get('compliant').setValue(true,{emitEvent: false});
-                this.typeFilterForm.get('information').setValue(true,{emitEvent: false});
-            }
-        });
-        this._filter$.pipe(first(),takeUntil(this.ngUnsubscribe$)).subscribe(()=>{
-            this.typeFilterForm
+        
+       const savedAlarm = localStorage.getItem("opfab.feed.filter.type.alarm");
+       const savedAction = localStorage.getItem("opfab.feed.filter.type.action");
+       const savedACompliant = localStorage.getItem("opfab.feed.filter.type.compliant");
+       const savedInformation = localStorage.getItem("opfab.feed.filter.type.information");
+      
+       const alarmUnset = savedAlarm && savedAlarm != "true";
+       const actionUnset = savedAction && savedAction != "true";
+       const compliantUnset = savedACompliant && savedACompliant != "true";
+       const informationUnset = savedInformation && savedInformation != "true";
+
+
+       this.typeFilterForm.get('alarm').setValue(!alarmUnset,{emitEvent: false});
+       this.typeFilterForm.get('action').setValue(!actionUnset,{emitEvent: false});
+       this.typeFilterForm.get('compliant').setValue(!compliantUnset,{emitEvent: false});
+       this.typeFilterForm.get('information').setValue(!informationUnset,{emitEvent: false});
+       
+       this.store.dispatch(
+        new ApplyFilter({
+            name: FilterType.TYPE_FILTER,
+            active: (alarmUnset || actionUnset || compliantUnset || informationUnset),
+            status: {'alarm' : !alarmUnset, 'action': !actionUnset, 'compliant' : !compliantUnset, 'information' : !informationUnset}
+        }));
+
+        
+        this.typeFilterForm
                 .valueChanges
                 .pipe(
                     takeUntil(this.ngUnsubscribe$),
@@ -122,7 +124,11 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
                         return _.isEqual(formA,formB);
                     }),
                     debounce(() => timer(500)))
-                .subscribe(form => { 
+                .subscribe(form => {
+                    localStorage.setItem("opfab.feed.filter.type.alarm", form.alarm);
+                    localStorage.setItem("opfab.feed.filter.type.action", form.action);
+                    localStorage.setItem("opfab.feed.filter.type.compliant", form.compliant);
+                    localStorage.setItem("opfab.feed.filter.type.information", form.information);
                     return this.store.dispatch(
                     new ApplyFilter({
                         name: FilterType.TYPE_FILTER,
@@ -130,19 +136,26 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
                         status: form
                     }));
                 });
-        });
     }
 
     private initAckFilter() {
-        this._ackFilter$ = this.store.select(buildFilterSelector(FilterType.ACKNOWLEDGEMENT_FILTER));
-        this._filter$.pipe(first(),takeUntil(this.ngUnsubscribe$))
-            .subscribe((next: Filter) => {
-                if (next) {                    
-                    this.ackFilterForm.get('ackControl').setValue(!next.active && "all" || next.status.ack && "ack" || "notack", {emitEvent: false});                    
-                } else {
-                    this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: false});
-                }
-            });
+
+        const ackValue = localStorage.getItem("opfab.feed.filter.ack");
+        if (!!ackValue) {
+            this.ackFilterForm.get('ackControl').setValue(ackValue,{emitEvent: false});
+            let active = !(ackValue === "all");
+            let ack = active && ackValue === "ack";
+            this.store.dispatch(
+                new ApplyFilter({
+                    name: FilterType.ACKNOWLEDGEMENT_FILTER,
+                    active: active,
+                    status: ack
+                }));
+
+        } else {
+            this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: false});
+        }
+
         this.ackFilterForm
             .valueChanges
             .pipe(
@@ -150,6 +163,8 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
             .subscribe(form => {
                 let active = !(form.ackControl === "all");
                 let ack = active && form.ackControl === "ack";
+                localStorage.setItem("opfab.feed.filter.ack", form.ackControl);
+
                 return this.store.dispatch(
                     new ApplyFilter({
                         name: FilterType.ACKNOWLEDGEMENT_FILTER,
@@ -160,9 +175,22 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
     }
 
     initDateTimeFilter() {
+
         if (this.filterByPublishDate) this.dateFilterType = FilterType.PUBLISHDATE_FILTER;
         else this.dateFilterType = FilterType.BUSINESSDATE_FILTER;
 
+        const savedStart = localStorage.getItem("opfab.feed.filter.start");
+        const savedEnd = localStorage.getItem("opfab.feed.filter.end");
+
+        if (!!savedStart) {
+            this.timeFilterForm.get("dateTimeFrom").setValue(getDateTimeNgbFromMoment(moment(+savedStart)));
+        }
+        if (!!savedEnd) {
+            this.timeFilterForm.get("dateTimeTo").setValue(getDateTimeNgbFromMoment(moment(+savedEnd)));
+        }
+        
+        this.setNewFilterValue();
+
         this.dateTimeFilterChange.pipe(
             takeUntil(this.ngUnsubscribe$),
             debounceTime(2000),
@@ -178,6 +206,9 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
         const status = { start: null, end: null };
         status.start = this.extractTime(this.timeFilterForm.get("dateTimeFrom"));
         status.end = this.extractTime(this.timeFilterForm.get("dateTimeTo"));
+       
+        localStorage.setItem("opfab.feed.filter.start", status.start);
+        localStorage.setItem("opfab.feed.filter.end", status.end);
 
         this.store.dispatch(
             new ApplyFilter({
@@ -215,13 +246,15 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
         this.typeFilterForm.get('action').setValue(true,{emitEvent: true});
         this.typeFilterForm.get('compliant').setValue(true,{emitEvent: true});
         this.typeFilterForm.get('information').setValue(true,{emitEvent: true});
+        if (!this.hideAckFilter) {
+            this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: true});
+        }
 
-        this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: true});
-
-        this.timeFilterForm.get('dateTimeFrom').setValue(null);
-        this.timeFilterForm.get('dateTimeTo').setValue(null);
-        this.setNewFilterValue();
-
+        if (!this.hideTimerTags) {
+            this.timeFilterForm.get('dateTimeFrom').setValue(null);
+            this.timeFilterForm.get('dateTimeTo').setValue(null);
+            this.setNewFilterValue();
+        }
     }
     
 }
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.ts
index 6e555d6aa3..03c7c58abd 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.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
@@ -15,6 +15,7 @@ import {ChangeReadSort, ChangeSort} from "@ofActions/feed.actions";
 import { FormControl, FormGroup } from '@angular/forms';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { selectSortByRead, selectSortBySeverity } from '@ofStore/selectors/feed.selectors';
 
 @Component({
   selector: 'of-feed-sort',
@@ -50,44 +51,69 @@ import { takeUntil } from 'rxjs/operators';
   }
 
   initSort() {
-    if (this.hideReadSort) {
-      this.readSorted = false;
+
+    this.store.select(selectSortBySeverity)
+    .pipe(takeUntil(this.ngUnsubscribe$))
+    .subscribe(bySev => {
+      this.severitySorted = bySev;
+    })
+    this.store.select(selectSortByRead)
+    .pipe(takeUntil(this.ngUnsubscribe$))
+    .subscribe(byRead => {
+      this.readSorted = byRead;
+    })
+
+    if (this.hideReadSort && this.readSorted) {
       this.store.dispatch(new ChangeReadSort());
     }
 
+    if (this.hideSeveritySort && this.severitySorted) {
+        this.store.dispatch(new ChangeSort());
+    }
+
+    const sorted = localStorage.getItem("opfab.feed.sort.type");
+    if (!!sorted) {
+      if (!(sorted === "unread" && this.hideReadSort) && !(sorted === "severity" && this.hideSeveritySort)) {
+        this.sortForm.get("sortControl").setValue(sorted);
+        this.setSortBy(sorted);
+      }
+    }
+
     this.sortForm
     .valueChanges
     .pipe(
         takeUntil(this.ngUnsubscribe$))
     .subscribe(form => {
+        localStorage.setItem("opfab.feed.sort.type", form.sortControl);
 
-        if (form.sortControl === "unread") {
-          if (this.severitySorted) {
-            this.severitySorted = false;
-            this.store.dispatch(new ChangeSort());
-          }
-          this.readSorted = true;
-          return this.store.dispatch(new ChangeReadSort());
-        }
-
-        if (this.readSorted) {
-          this.readSorted = false;
-          this.store.dispatch(new ChangeReadSort());
-        }
-
-        if (form.sortControl === "date" && this.severitySorted) {
-          this.severitySorted = false;
-          return this.store.dispatch(new ChangeSort());
-        }
-
-        if (form.sortControl === "severity" && !this.severitySorted) {
-          this.severitySorted = true;
-          return this.store.dispatch(new ChangeSort());
-        }
-
+        this.setSortBy(form.sortControl);
     });
   }
 
+  setSortBy(sortBy: string) {
+    if (sortBy === "unread") {
+      if (this.severitySorted) {
+        this.store.dispatch(new ChangeSort());
+      }
+      if (!this.readSorted) {
+        return this.store.dispatch(new ChangeReadSort());
+      }
+      return;
+    }
+
+    if (this.readSorted) {
+      this.store.dispatch(new ChangeReadSort());
+    }
+
+    if (sortBy === "date" && this.severitySorted) {
+      return this.store.dispatch(new ChangeSort());
+    }
+
+    if (sortBy === "severity" && !this.severitySorted) {
+      return this.store.dispatch(new ChangeSort());
+    }
+  }
+
   ngOnDestroy() {
     this.ngUnsubscribe$.next();
     this.ngUnsubscribe$.complete();

From 32e6ae7192ef1a2900904411cd11aedee8cc55d1 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Tue, 2 Feb 2021 18:29:44 +0100
Subject: [PATCH 10/62] [OC-1399] Notification Screen - Display the states in
 alphabetical order

---
 .../feedconfiguration.component.html          | 19 +++---
 .../feedconfiguration.component.ts            | 59 +++++++++++++++----
 ui/main/src/app/services/processes.service.ts |  6 +-
 3 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.html b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.html
index 64032f8b86..8e6bbf6e5f 100644
--- a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.html
+++ b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2020, RTE (http://www.rte-france.com)              -->
+<!-- Copyright (c) 2020-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   -->
@@ -13,15 +13,15 @@
   
 
     <form [formGroup]="feedConfigurationForm">
-        <div *ngFor="let processGroup of processGroups; " class="opfab-feedconfiguration-processlist">
-            <h5 class="font-weight-bold" translate>{{processGroup.id}}</h5>
+        <div *ngFor="let processGroup of processGroupsData; " class="opfab-feedconfiguration-processlist">
+            <h5 class="font-weight-bold">{{processGroup.groupLabel}}</h5>
             <div class="row">
                 <div class="col-md" *ngFor="let processKey of processGroup.processes; ">
                     <div *ngIf="processesStatesLabels.get(processKey)">
-                        <p class="font-weight-bold" translate>{{processesStatesLabels.get(processKey).processI18n}}</p>
+                        <p class="font-weight-bold">{{processesStatesLabels.get(processKey).processLabel}}</p>
                         <div style="margin-left: 20px;" >
                             <div class="row" formArrayName="processesStates" *ngFor="let state of processesStatesLabels.get(processKey).states; ">
-                                <label class="opfab-checkbox"> <span translate> {{state.stateLabel}} </span>
+                                <label class="opfab-checkbox">{{state.stateLabel}}
                                     <input type="checkbox"[formControlName]=state.stateControlIndex [id]=state.stateControlIndex >
                                     <span class="opfab-checkbox-checkmark"></span>
                                 </label>
@@ -36,13 +36,12 @@ <h5 class="font-weight-bold" translate>{{processGroup.id}}</h5>
         </div>
         <br />
         <div class="row opfab-feedconfiguration-processlist">
-            <div class="col-md" *ngFor="let processId of processesWithoutGroup; ">
-                <p class="font-weight-bold" translate>{{processesStatesLabels.get(processId).processI18n}}</p>
+            <div class="col-md" *ngFor="let process of processesWithoutGroup; ">
+                <p class="font-weight-bold">{{process.processLabel}}</p>
                 <div style="margin-left: 20px;">
-                    <div class="row" formArrayName="processesStates" *ngFor="let state of processesStatesLabels.get(processId).states; ">
+                    <div class="row" formArrayName="processesStates" *ngFor="let state of processesStatesLabels.get(process.idProcess).states; ">
 
-
-                            <label class="opfab-checkbox"> <span translate> {{state.stateLabel}} </span>
+                            <label class="opfab-checkbox"> {{state.stateLabel}}
                                 <input type="checkbox"[formControlName]=state.stateControlIndex [id]=state.stateControlIndex >
                                 <span class="opfab-checkbox-checkmark"></span>
                             </label>
diff --git a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts
index 9c62c349ee..bf55bb9378 100644
--- a/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts
+++ b/ui/main/src/app/modules/feedconfiguration/feedconfiguration.component.ts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, RTE (http://www.rte-france.com)
+/* Copyright (c) 2020-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
@@ -20,6 +20,7 @@ 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";
 
 
 @Component({
@@ -32,10 +33,11 @@ export class FeedconfigurationComponent implements OnInit {
     feedConfigurationForm: FormGroup;
 
     processesDefinition: Process[];
-    processGroups: {idGroup: string, processes: string[]}[];
-    processesWithoutGroup: string[];
+    processGroupsData: {id: string, groupLabel?: string, processes: string[]}[];
+    processesWithoutGroup: { idProcess: string,
+                             processLabel: string }[];
     currentUserWithPerimeters: UserWithPerimeters;
-    processesStatesLabels: Map<string, { processI18n: string,
+    processesStatesLabels: Map<string, { processLabel: string,
                                          states:
                                              { stateLabel: string,
                                                stateControlIndex: number
@@ -56,9 +58,10 @@ export class FeedconfigurationComponent implements OnInit {
                 private processesService: ProcessesService,
                 private modalService: NgbModal,
                 private settingsService: SettingsService,
-                private cardService: CardService
+                private cardService: CardService,
+                private translateService: TranslateService
     ) {
-        this.processesStatesLabels = new Map<string, {processI18n: string,
+        this.processesStatesLabels = new Map<string, {processLabel: string,
                                                       states:
                                                           { stateLabel: string,
                                                             stateControlIndex: number
@@ -75,7 +78,7 @@ export class FeedconfigurationComponent implements OnInit {
     }
 
     private findInProcessGroups(processIdToFind: string): boolean {
-        for (const processGroup of this.processGroups.values()) {
+        for (const processGroup of this.processGroupsData.values()) {
             if (processGroup.processes.includes(processIdToFind))
                 return true;
         }
@@ -84,9 +87,16 @@ export class FeedconfigurationComponent implements OnInit {
 
     private makeProcessesWithoutGroup() {
         this.processesDefinition.forEach(process => {
-            if (! this.findInProcessGroups(process.id))
-                this.processesWithoutGroup.push(process.id);
+            if (! this.findInProcessGroups(process.id)) {
+                let processLabel = (!!process.name) ? this.getI18nPrefixFromProcess(process) + process.name :
+                    this.getI18nPrefixFromProcess(process) + process.id;
+
+                this.translateService.get(processLabel).subscribe(translate => { processLabel = translate; });
+                this.processesWithoutGroup.push({idProcess: process.id,
+                                                 processLabel: processLabel});
+            }
         });
+        this.processesWithoutGroup.sort((obj1, obj2) => this.compareObj(obj1.processLabel, obj2.processLabel));
     }
 
     private addCheckboxesInFormArray() {
@@ -116,21 +126,25 @@ export class FeedconfigurationComponent implements OnInit {
                 const statesArray: { stateLabel: string, stateControlIndex: number }[]
                     = new Array<{stateLabel: string, stateControlIndex: number}>();
 
-                const processI18n = (!!process.name) ? this.getI18nPrefixFromProcess(process) + process.name :
+                let processLabel = (!!process.name) ? this.getI18nPrefixFromProcess(process) + process.name :
                     this.getI18nPrefixFromProcess(process) + process.id;
+                this.translateService.get(processLabel).subscribe(translate => { processLabel = translate; });
 
                 for (const key in process.states) {
                     const value = process.states[key];
-                    const stateLabel = (!!value.name) ? this.getI18nPrefixFromProcess(process) + value.name :
+                    let stateLabel = (!!value.name) ? this.getI18nPrefixFromProcess(process) + value.name :
                         this.getI18nPrefixFromProcess(process) + key;
 
+                    this.translateService.get(stateLabel).subscribe(translate => { stateLabel = translate; });
+
                     statesArray.push({stateLabel: stateLabel, stateControlIndex: stateControlIndex});
                     this.preparedListOfProcessesStates.push({
                         processId: process.id,
                         stateId: key});
                     stateControlIndex++;
                 }
-                this.processesStatesLabels.set(process.id, {processI18n: processI18n,
+                statesArray.sort((obj1, obj2) => this.compareObj(obj1.stateLabel, obj2.stateLabel));
+                this.processesStatesLabels.set(process.id, {processLabel: processLabel,
                                                             states: statesArray});
             }
         }
@@ -145,7 +159,18 @@ export class FeedconfigurationComponent implements OnInit {
     ngOnInit() {
         this.userService.currentUserWithPerimeters().subscribe(result => {
             this.currentUserWithPerimeters = result;
-            this.processGroups = this.processesService.getProcessGroups();
+
+            this.processGroupsData = this.processesService.getProcessGroups();
+            this.processGroupsData.forEach(group => {
+                this.translateService.get(group.id).subscribe(translate => {
+                    group.groupLabel = translate;
+                });
+
+                group.processes.sort();
+            });
+
+            this.processGroupsData.sort((obj1, obj2) => this.compareObj(obj1.groupLabel, obj2.groupLabel));
+
             this.computePreparedListOfProcessesStatesAndProcessesStatesLabels();
             this.makeProcessesWithoutGroup();
             this.addCheckboxesInFormArray();
@@ -201,4 +226,12 @@ export class FeedconfigurationComponent implements OnInit {
     open(content) {
         this.modalRef = this.modalService.open(content);
     }
+
+    compareObj(obj1, obj2) {
+        if (obj1 > obj2)
+            return 1;
+        if (obj1 < obj2)
+            return -1;
+        return 0;
+    }
 }
diff --git a/ui/main/src/app/services/processes.service.ts b/ui/main/src/app/services/processes.service.ts
index 5ca778fe64..be31151146 100644
--- a/ui/main/src/app/services/processes.service.ts
+++ b/ui/main/src/app/services/processes.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
@@ -32,7 +32,7 @@ export class ProcessesService {
     private processCache = new Map();
     private translationsAlreadyLoaded = new Set<string>();
     private processes: Process[];
-    private processGroups: {idGroup: string, processes: string[]}[];
+    private processGroups: {id: string, processes: string[]}[];
     private translationsLoaded = new Subject();
 
     constructor(private httpClient: HttpClient, private translateService: TranslateService, private store: Store<AppState>
@@ -133,7 +133,7 @@ export class ProcessesService {
         return this.processes;
     }
 
-    public getProcessGroups(): {idGroup: string, processes: string[]}[] {
+    public getProcessGroups(): {id: string, processes: string[]}[] {
         return this.processGroups;
     }
 

From 12915f6d68fcd3093f6fc45c6c876c266c168bae Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 3 Feb 2021 16:03:28 +0100
Subject: [PATCH 11/62] [OC-1191_fix] Fix errors detected in production mode

---
 .../src/app/modules/admin/admin.component.ts  |  4 +--
 .../edit-entity-group-modal.component.ts      |  6 ++++-
 .../edit-group-modal.component.html           |  4 +--
 .../users/edit-user-modal.component.html      |  4 +--
 .../users/edit-user-modal.component.ts        |  4 +++
 .../table/action-cell-renderer.component.html |  2 +-
 .../table/action-cell-renderer.component.ts   |  4 +++
 .../components/table/admin-table.component.ts | 25 ++++++++-----------
 8 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index e4b806c6b3..9f736c3fa7 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -32,8 +32,8 @@ export class AdminComponent implements OnInit, OnDestroy {
   entitiesLabel: string;
   groupsLabel: string;
 
-  private paginationDefaultPageSize = 10;
-  private paginationPageSizeOptions = [5, 10, 25, 50, 100];
+  public paginationDefaultPageSize = 10;
+  public paginationPageSizeOptions = [5, 10, 25, 50, 100];
   public paginationPageSize = this.paginationDefaultPageSize;
 
   //TODO Why do we need to use translate.get and subscriptions rather than the translate directive like everywhere else?
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/groups-entities/edit-entity-group-modal.component.ts
index b7b24294cd..42dd9ffc49 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/groups-entities/edit-entity-group-modal.component.ts
@@ -15,7 +15,7 @@ import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
 import {EntitiesService} from '@ofServices/entities.service';
 import {GroupsService} from '@ofServices/groups.service';
 import {IdValidatorService} from 'app/modules/admin/services/id-validator.service';
-import {AdminTableType} from "../../table/admin-table.component";
+import {AdminTableType} from '../../table/admin-table.component';
 
 @Component({
   selector: 'of-edit-group-modal',
@@ -101,4 +101,8 @@ export class EditEntityGroupModalComponent implements OnInit {
     }
   }
 
+  dismissModal(reason : string) : void {
+    this.activeModal.dismiss(reason);
+  }
+
 }
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
index cb8e32eb9d..7c06a71a44 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
@@ -12,7 +12,7 @@
   <h5 class="modal-title" *ngIf="row">{{row.id}}</h5>
   <h5 class="modal-title" *ngIf="!row && type==='group'" translate>admin.input.group.add</h5>
   <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.entity.add</h5>
-  <button id="opfab-admin-edit-group-btn-close"  (click)="activeModal.dismiss('Cross click')" type="button" class="close" data-dismiss="modal"
+  <button id="opfab-admin-edit-group-btn-close"  (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
     aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
@@ -53,7 +53,7 @@ <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.en
   </form>
 </div>
 <div class="modal-footer bg-dark">
-  <button id="opfab-admin-edit-group-btn-cancel" type="button" (click)="activeModal.dismiss('Cross click')" class="opfab-btn-cancel" data-dismiss="modal"
+  <button id="opfab-admin-edit-group-btn-cancel" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
     translate>admin.input.close</button>
   <button  id="opfab-admin-group-btn-add" [disabled]="!form.valid" *ngIf="!row && type==='group'" (click)="update()" class="opfab-btn"
     translate>admin.input.group.add</button>
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 3a50276e68..7de4ae4ef7 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
@@ -11,7 +11,7 @@
 <div class="modal-header bg-dark">
   <h5 class="modal-title" *ngIf="row">{{row.login}}</h5>
   <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
-  <button id="opfab-admin-edit-user-btn-close" (click)="activeModal.dismiss('Cross click')" type="button" class="close" data-dismiss="modal"
+  <button id="opfab-admin-edit-user-btn-close" (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
     aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
@@ -68,7 +68,7 @@ <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
   </form>
 </div>
 <div class="modal-footer bg-dark">
-  <button id="opfab-admin-user-btn-close" type="button" (click)="activeModal.dismiss('Cross click')" class="opfab-btn-cancel" data-dismiss="modal"
+  <button id="opfab-admin-user-btn-close" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
     translate>admin.input.close</button>
   <button id="opfab-admin-user-btn-add" [disabled]="!form.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
     translate>admin.input.user.add</button>
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 2d54512924..abb44fde64 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
@@ -128,4 +128,8 @@ export class EditUserModalComponent implements OnInit {
     }
   }
 
+  dismissModal(reason : string) : void {
+    this.activeModal.dismiss(reason);
+  }
+
 }
diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
index 9335e1292c..e4e80458ea 100644
--- a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
+++ b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.html
@@ -7,5 +7,5 @@
 <!-- This file is part of the OperatorFabric project.                      -->
 
 <a (click)="openModalFromParent()" aria-hidden="" class="btn btn-primary btn-sm">
-        <em class="{{actionIconsMapping[actionType]}}"></em>
+        <em class="{{getIconForAction()}}"></em>
 </a>
diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
index a91f75b8c4..a2bde64e44 100644
--- a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
@@ -40,4 +40,8 @@ export class ActionCellRendererComponent implements ICellRendererAngularComp {
   refresh(): boolean {
     return false;
   }
+
+  getIconForAction() : string {
+    return this.actionIconsMapping[this.actionType];
+  }
 }
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
index c3367fec58..4a5307bfe4 100644
--- a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
@@ -8,26 +8,23 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {Component, Input, OnInit} from '@angular/core';
+import {Injectable, Input, 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 {throwError} from 'rxjs';
-import {ConfirmationDialogService} from "../../services/confirmation-dialog.service";
-import {ActionCellRendererComponent} from "./action-cell-renderer.component";
-import {AppError} from "../../../../common/error/app-error";
-import {CrudService} from "@ofServices/crud-service";
-
-@Component({
-  selector: 'of-admin-table',
-  templateUrl: 'admin-table.component.html'
-})
+import {ConfirmationDialogService} from '../../services/confirmation-dialog.service';
+import {ActionCellRendererComponent} from './action-cell-renderer.component';
+import {AppError} from '../../../../common/error/app-error';
+import {CrudService} from '@ofServices/crud-service';
+
+@Injectable()
 export abstract class AdminTableComponent implements OnInit {
 
   // These fields will be initialized in the concrete classes extending `AdminTableComponent`
   // (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`) */
-  protected editModalComponent;
+  public editModalComponent;
   /** Type of data managed by the table (e.g. `AdminTableType.ENTITY`) */
   protected tableType: AdminTableType;
   /** Relevant fields for this data type. They will be used to populate the table columns */
@@ -36,9 +33,9 @@ export abstract class AdminTableComponent implements OnInit {
   protected idField: string;
 
   // ag-grid configuration objects
-  protected gridOptions;
-  protected gridApi;
-  protected rowData: any;
+  public gridOptions;
+  public gridApi;
+  public rowData: any;
 
   @Input()
   public paginationPageSize;

From de2554c15daa348926493bc69f59f0005e5a500c Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Wed, 3 Feb 2021 18:50:36 +0100
Subject: [PATCH 12/62] [OC-1436] BUG - Usercard - Error message When the user
 makes an error in the usercard input form the text of the error shall be
 display as define in the input template.

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 .../template/en/usercard_message.handlebars                  | 2 +-
 .../template/en/usercard_question.handlebars                 | 5 +++++
 .../template/fr/usercard_message.handlebars                  | 2 +-
 .../template/fr/usercard_question.handlebars                 | 5 +++++
 ui/main/src/app/modules/usercard/usercard.component.ts       | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars
index 6cda4bbfc8..7fe6cd0968 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars
@@ -11,7 +11,7 @@
         <div class="opfab-textarea">
             <label> MESSAGE </label>
             <textarea id="message" name="message" placeholder="Write something.."
-                style="width:100%"> {{card.data.message}} </textarea>
+                style="width:100%">{{card.data.message}}</textarea>
         </div>
 
 
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars
index e00ec695cb..66dc42c82d 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars
@@ -15,6 +15,11 @@
 <script>
     templateGateway.getSpecificCardInformation = function () {
         const question = document.getElementById('question').value;
+
+        if (question.length <1) return {
+            valid: false,
+            errorMsg : "You must provide a question"
+        }
       
         const card = {
             summary: { key: "question.summary" },
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars
index 5f5d601a87..bddf0becf6 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars
@@ -9,7 +9,7 @@
         <div class="opfab-textarea">
             <label> MESSAGE </label>
             <textarea id="message" name="message" placeholder="Ecrire un message ..."
-                style="width:100%"> {{card.data.message}} </textarea>
+                style="width:100%">{{card.data.message}}</textarea>
         </div>
 
 
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars
index bcdf33a768..f4edfce15f 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars
@@ -18,6 +18,11 @@
 <script>
     templateGateway.getSpecificCardInformation = function () {
         const question = document.getElementById('question').value;
+
+        if (question.length <1) return {
+            valid: false,
+            errorMsg : "Vous devez fournir une question"
+        }
       
         const card = {
             summary: { key: "question.summary" },
diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts
index a5cec69b28..cf7f2ce30f 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.ts
+++ b/ui/main/src/app/modules/usercard/usercard.component.ts
@@ -316,7 +316,7 @@ export class UserCardComponent implements OnDestroy, OnInit {
         }
 
         if (!specificInformation.valid) {
-            this.displayMessage('specificInformation.errorMsg', null, MessageLevel.ERROR);
+            this.displayMessage(specificInformation.errorMsg, null, MessageLevel.ERROR);
             return;
         }
 

From 8f4c55cac40cc6aa23b6fedc199362422e4fa253 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 3 Feb 2021 16:45:55 +0100
Subject: [PATCH 13/62] [OC-1405] - Fix Sonar Quality Gate

---
 .../controllers/BusinessconfigController.java |   8 +-
 .../model/ProcessStatesData.java              |   1 -
 .../model/LightCardConsultationData.java      |   2 +-
 .../repositories/CardCustomRepository.java    |   5 +-
 .../UserUtilitiesCommonToCardRepository.java  |   5 +-
 .../KafkaAvroWithoutRegistryDeserializer.java |   6 +-
 .../model/ArchivedCardPublicationData.java    |   1 -
 .../model/CardPublicationData.java            |   8 +-
 .../model/I18nPublicationData.java            |   1 -
 .../model/LightCardPublicationData.java       |   1 -
 .../model/RecipientPublicationData.java       |   1 -
 .../users/utils/EntityCycleDetector.java      |   6 +-
 ui/main/src/app/modules/admin/admin.module.ts |   1 -
 .../components/table/admin-table.component.ts |  20 +--
 .../modules/archives/archives.component.html  |   4 +-
 .../app/modules/archives/archives.module.ts   |   8 +-
 .../modules/calendar/calendar.component.ts    |  35 +++--
 .../components/detail/detail.component.scss   |   1 -
 .../feed-filter/feed-filter.component.html    |   4 +-
 .../feed-filter/feed-filter.component.scss    |   2 -
 .../feed-filter/feed-filter.component.ts      | 121 +++++++++---------
 .../feed-sort/feed-sort.component.scss        |   3 +-
 .../init-chart/init-chart.component.ts        |  11 +-
 .../src/app/modules/feed/feed.component.ts    |   9 +-
 .../logging-table.component.html              |   4 +-
 .../monitoring-table.component.html           |   2 +-
 .../modules/navbar/info/info.component.scss   |   1 -
 .../app/modules/navbar/navbar.component.scss  |   4 +-
 .../card-detail/card-detail.component.ts      |   2 +-
 .../datetime-filter.component.html            |   2 +-
 .../modules/usercard/usercard.component.html  |   4 +-
 ui/main/src/app/services/processes.service.ts |  18 +--
 ui/main/src/app/store/actions/feed.actions.ts |   4 +-
 .../app/store/effects/monitoring.effects.ts   |  10 +-
 ui/main/src/app/store/effects/user.effects.ts |   2 +-
 ui/main/src/assets/styles/styles.scss         |   5 +-
 36 files changed, 141 insertions(+), 181 deletions(-)

diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java
index bcfa9bf1aa..496cfbd243 100644
--- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java
+++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java
@@ -12,15 +12,14 @@
 package org.lfenergy.operatorfabric.businessconfig.controllers;
 
 import lombok.extern.slf4j.Slf4j;
-import org.lfenergy.operatorfabric.springtools.error.model.ApiError;
-import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException;
-import org.lfenergy.operatorfabric.businessconfig.model.*;
 import org.lfenergy.operatorfabric.businessconfig.model.Process;
+import org.lfenergy.operatorfabric.businessconfig.model.*;
 import org.lfenergy.operatorfabric.businessconfig.services.ProcessesService;
+import org.lfenergy.operatorfabric.springtools.error.model.ApiError;
+import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,7 +31,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Map;
 
 /**
  * BusinessconfigController, documented at {@link BusinessconfigApi}
diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
index 926acd2cee..671041cb51 100644
--- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
+++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
@@ -12,7 +12,6 @@
 
 import lombok.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Data
diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/LightCardConsultationData.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/LightCardConsultationData.java
index 58a625c707..decce99bbb 100644
--- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/LightCardConsultationData.java
+++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/LightCardConsultationData.java
@@ -122,7 +122,7 @@ public static LightCardConsultationData copy(Card other) {
                 .entitiesAllowedToRespond(other.getEntitiesAllowedToRespond())
                 .publisherType(other.getPublisherType())
                 .secondsBeforeTimeSpanForReminder(other.getSecondsBeforeTimeSpanForReminder());    
-                ;
+
         if(other.getTags()!=null && ! other.getTags().isEmpty())
             builder.tags(other.getTags());
         if(other.getTimeSpans()!=null && !other.getTimeSpans().isEmpty())
diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepository.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepository.java
index 48f69d4d01..47c6f73377 100644
--- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepository.java
+++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepository.java
@@ -10,14 +10,13 @@
 package org.lfenergy.operatorfabric.cards.consultation.repositories;
 
 
-import java.time.Instant;
-import java.util.List;
-
 import org.lfenergy.operatorfabric.cards.consultation.model.CardConsultationData;
 import org.lfenergy.operatorfabric.cards.consultation.model.CardOperation;
 import org.lfenergy.operatorfabric.users.model.CurrentUserWithPerimeters;
 import reactor.core.publisher.Flux;
 
+import java.time.Instant;
+
 
 /*
 * <p>Needed to avoid trouble at runtime when springframework try to create mongo request for findByIdWithUser method</p>
diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/UserUtilitiesCommonToCardRepository.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/UserUtilitiesCommonToCardRepository.java
index 146b815711..7ce122e545 100644
--- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/UserUtilitiesCommonToCardRepository.java
+++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/UserUtilitiesCommonToCardRepository.java
@@ -15,13 +15,12 @@
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-
-import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 public interface UserUtilitiesCommonToCardRepository<T extends Card> {
@@ -63,8 +62,6 @@ default List<Criteria> computeCriteriaToFindCardByIdWithUser(String id, CurrentU
     }
 
     default Criteria computeCriteriaForUser(CurrentUserWithPerimeters currentUserWithPerimeters) {
-        List<Criteria> criteriaList = new ArrayList<>();
-        List<Criteria> criteria = new ArrayList<>();
         String login = currentUserWithPerimeters.getUserData().getLogin();
         List<String> groups = currentUserWithPerimeters.getUserData().getGroups();
         List<String> entities = currentUserWithPerimeters.getUserData().getEntities();
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/kafka/consumer/KafkaAvroWithoutRegistryDeserializer.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/kafka/consumer/KafkaAvroWithoutRegistryDeserializer.java
index fc1bbe88b1..eeefbd19d2 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/kafka/consumer/KafkaAvroWithoutRegistryDeserializer.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/kafka/consumer/KafkaAvroWithoutRegistryDeserializer.java
@@ -1,4 +1,5 @@
 /* Copyright (c) 2020, Alliander (http://www.alliander.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
@@ -42,13 +43,10 @@ public CardCommand deserialize(String s, byte[] payload) {
             try {
                 ByteBuffer buffer = this.getByteBuffer(payload);
                 buffer.getInt();   // read next 4 bytes
-                String subject = null;
 
                 int length = buffer.limit() - 1 - 4;
                 int start = buffer.position() + buffer.arrayOffset();
-                CardCommand result = datumReader.read((CardCommand) null, this.decoderFactory.binaryDecoder(buffer.array(), start, length, (BinaryDecoder) null));
-
-                return result;
+                return datumReader.read((CardCommand) null, this.decoderFactory.binaryDecoder(buffer.array(), start, length, (BinaryDecoder) null));
             } catch (RuntimeException | IOException ex) {
                 throw new SerializationException("Error deserializing Avro message", ex);
             }
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java
index 3eae0bd6bb..3beb427944 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java
@@ -21,7 +21,6 @@
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
index 6c368a9211..5d8c893d35 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
@@ -13,11 +13,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Singular;
+import lombok.*;
 import org.lfenergy.operatorfabric.cards.model.SeverityEnum;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
@@ -160,7 +156,7 @@ public LightCardPublicationData toLightCard() {
                 .summary(((I18nPublicationData) this.getSummary()).copy())
                 .publisherType(this.getPublisherType())
                 .secondsBeforeTimeSpanForReminder(this.secondsBeforeTimeSpanForReminder);
-                ;
+
         if(this.getTimeSpans()!=null)
             result.timeSpansSet(new HashSet<>(this.getTimeSpans()));
         return result.build();
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/I18nPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/I18nPublicationData.java
index 205d6849e2..485db14f2e 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/I18nPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/I18nPublicationData.java
@@ -13,7 +13,6 @@
 
 import lombok.*;
 
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 /**
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/LightCardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/LightCardPublicationData.java
index 5cfceb500d..b85be908d6 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/LightCardPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/LightCardPublicationData.java
@@ -16,7 +16,6 @@
 import org.lfenergy.operatorfabric.cards.model.SeverityEnum;
 import org.springframework.data.annotation.Transient;
 
-import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/RecipientPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/RecipientPublicationData.java
index 9f3f49763e..b9c3f5f50b 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/RecipientPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/RecipientPublicationData.java
@@ -14,7 +14,6 @@
 import lombok.*;
 import org.lfenergy.operatorfabric.cards.model.RecipientEnum;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/utils/EntityCycleDetector.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/utils/EntityCycleDetector.java
index 4ed150a47e..be41698c81 100644
--- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/utils/EntityCycleDetector.java
+++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/utils/EntityCycleDetector.java
@@ -19,9 +19,9 @@
 public class EntityCycleDetector {
 
     static final String CYCLE_DETECTION = "A cycle has been detected: ";
-    final private List<String> visitedId;
-    final private Map<String, List<String>> graph;
-    final private String currentEntityId;
+    private final List<String> visitedId;
+    private final Map<String, List<String>> graph;
+    private final String currentEntityId;
     
 
     public EntityCycleDetector(Entity currentEntity, List<? extends Entity> allEntities) {
diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts
index d808039d83..675e352a70 100644
--- a/ui/main/src/app/modules/admin/admin.module.ts
+++ b/ui/main/src/app/modules/admin/admin.module.ts
@@ -27,7 +27,6 @@ import {MatInputModule, MatSelectModule} from '@angular/material';
 import {EntitiesTableComponent} from './components/table/entities-table.component';
 import {GroupsTableComponent} from './components/table/groups-table.component';
 
-
 @NgModule({
   declarations: [
     AdminComponent,
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
index 4a5307bfe4..834a5498b2 100644
--- a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
@@ -94,7 +94,7 @@ export abstract class AdminTableComponent implements OnInit {
   }
 
   ngOnChanges() {
-    if(!!this.gridApi) this.gridApi.paginationSetPageSize(this.paginationPageSize);
+    if (!!this.gridApi) this.gridApi.paginationSetPageSize(this.paginationPageSize);
   }
 
   public localizeHeader(parameters: ICellRendererParams): string {
@@ -107,7 +107,7 @@ export abstract class AdminTableComponent implements OnInit {
     // Column definitions can't be managed in the constructor like the other grid options because they rely on the `fields`
     // property that is defined in the classes implementing AdminTableComponent. As such, it is still undefined when the
     // constructor from the supertype is called.
-    this.gridApi.setColumnDefs(this.createColumnDefs(this.fields,this.tableType+'.'));
+    this.gridApi.setColumnDefs(this.createColumnDefs(this.fields, this.tableType + '.'));
     this.gridApi.paginationSetPageSize(this.paginationPageSize);
   }
 
@@ -118,23 +118,23 @@ export abstract class AdminTableComponent implements OnInit {
    * @return ColDef[] object containing the column definitions for the grid
    * */
   createColumnDefs(fields: string[], i18nPrefixForHeader?: string): ColDef[] {
-    //if provided, i18nPrefixForHeader should have trailing dot
+    // if provided, i18nPrefixForHeader should have trailing dot
 
-    //Create data columns from fields
-    let columnDefs :ColDef[];
-    columnDefs = new Array(fields.length+2); //+2 because 2 action columns (see below)
+    // Create data columns from fields
+    let columnDefs: ColDef[];
+    columnDefs = new Array(fields.length + 2); // +2 because 2 action columns (see below)
 
-    fields.forEach((field : string, index:number) => {
-      columnDefs[index] = { headerName: i18nPrefixForHeader+field, field: field, type: 'dataColumn'}
+    fields.forEach((field: string, index: number) => {
+      columnDefs[index] = { headerName: i18nPrefixForHeader + field, field: field, type: 'dataColumn'};
     });
 
-    //Add action columns
+    // Add action columns
     columnDefs[fields.length] = {
       headerName: 'edit',
       colId: 'edit',
       type: 'actionColumn'
     };
-    columnDefs[fields.length+1] = {
+    columnDefs[fields.length + 1] = {
       headerName: 'delete',
       colId: 'delete',
       type: 'actionColumn'
diff --git a/ui/main/src/app/modules/archives/archives.component.html b/ui/main/src/app/modules/archives/archives.component.html
index 71ab878c71..988c244798 100644
--- a/ui/main/src/app/modules/archives/archives.component.html
+++ b/ui/main/src/app/modules/archives/archives.component.html
@@ -64,7 +64,7 @@
 <div style="height:5%"> </div>
 <div *ngIf=" hasResult" style="margin-left:5%;margin-right:5%">
   <div class="opfab-table">
-    <table>
+    <table aria-describedby="Archive results table">
       <thead>
         <tr>
           <th scope="col"></th>
@@ -125,4 +125,4 @@
 
     </div>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/ui/main/src/app/modules/archives/archives.module.ts b/ui/main/src/app/modules/archives/archives.module.ts
index 417ef4638c..52e0d197f4 100644
--- a/ui/main/src/app/modules/archives/archives.module.ts
+++ b/ui/main/src/app/modules/archives/archives.module.ts
@@ -15,10 +15,10 @@ import {ArchivesComponent} from './archives.component';
 import {CardsModule} from '../cards/cards.module';
 import {TranslateModule} from '@ngx-translate/core';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
-import {DatetimeFilterModule} from '../../modules/share/datetime-filter/datetime-filter.module';
-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 {DatetimeFilterModule} from '../share/datetime-filter/datetime-filter.module';
+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';
 
 @NgModule({
   imports: [
diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts
index b5003157cf..0a2b3b499b 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.ts
+++ b/ui/main/src/app/modules/calendar/calendar.component.ts
@@ -8,28 +8,27 @@
  */
 
 
-import { AppState } from '@ofStore/index';
-import { select, Store } from '@ngrx/store';
-import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import {AppState} from '@ofStore/index';
+import {select, Store} from '@ngrx/store';
+import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
+import {Subject} from 'rxjs';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
-import { Component, ViewChild, OnDestroy, OnInit, AfterViewInit, ElementRef, HostListener } from '@angular/core';
-import { FullCalendarComponent } from '@fullcalendar/angular';
-import { EventInput } from '@fullcalendar/core';
+import {AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {FullCalendarComponent} from '@fullcalendar/angular';
+import {EventInput} from '@fullcalendar/core';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import timeGrigPlugin from '@fullcalendar/timegrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import allLocales from '@fullcalendar/core/locales-all';
 import bootstrapPlugin from '@fullcalendar/bootstrap';
-import { TranslateService } from '@ngx-translate/core';
-import { SelectLightCard } from '@ofActions/light-card.actions';
-import { LoadCard } from '@ofActions/card.actions';
-import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors';
-import { NgbModal, NgbModalOptions, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { ApplyFilter } from '@ofStore/actions/feed.actions';
-import { FilterType } from '@ofServices/filter.service';
-import moment from 'moment';
-import { HourAndMinutes } from '@ofModel/card.model';
+import {TranslateService} from '@ngx-translate/core';
+import {SelectLightCard} from '@ofActions/light-card.actions';
+import {LoadCard} from '@ofActions/card.actions';
+import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors';
+import {NgbModal, NgbModalOptions, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
+import {ApplyFilter} from '@ofStore/actions/feed.actions';
+import {FilterType} from '@ofServices/filter.service';
+import {HourAndMinutes} from '@ofModel/card.model';
 
 @Component({
   selector: 'of-calendar',
@@ -99,7 +98,7 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
                   allDay: false,
                   startRecur: startDate,
                   endRecur: endDate,
-                  className: ["opfab-calendar-event",'opfab-calendar-event-' + card.severity.toLowerCase()],
+                  className: ['opfab-calendar-event', 'opfab-calendar-event-' + card.severity.toLowerCase()],
                   daysOfWeek: timespan.recurrence ? timespan.recurrence.daysOfWeek.map(d => d % 7) : [],
                   startTime: timespan.recurrence.hoursAndMinutes ? this.formatTwoDigits(timespan.recurrence.hoursAndMinutes.hours) + ':' + this.formatTwoDigits(timespan.recurrence.hoursAndMinutes.minutes) : null,
                   endTime: timespan.recurrence.durationInMinutes ? this.getEndTime(timespan.recurrence.hoursAndMinutes, timespan.recurrence.durationInMinutes) : null
@@ -110,7 +109,7 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
                   title: title,
                   start: startDate,
                   end: endDate,
-                  className: ["opfab-calendar-event",'opfab-calendar-event-' + card.severity.toLowerCase()],
+                  className: ['opfab-calendar-event', 'opfab-calendar-event-' + card.severity.toLowerCase()],
                   allDay: false
                 });
               }
diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.scss b/ui/main/src/app/modules/cards/components/detail/detail.component.scss
index 021b072f96..b273034df3 100644
--- a/ui/main/src/app/modules/cards/components/detail/detail.component.scss
+++ b/ui/main/src/app/modules/cards/components/detail/detail.component.scss
@@ -151,7 +151,6 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask-size: cover;
   mask: url(assets/images/icons/help.svg);
 }
 
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.html b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.html
index 850efba158..8d27d3d8fb 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.html
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.html
@@ -83,7 +83,7 @@
                 </div>
             </div>
 
-            <div style="margin-left: 2px; margin-right: 2px;margin-top:-20px;;width:200px">
+            <div style="margin-left: 2px; margin-right: 2px;margin-top:-20px;width:200px">
                 <div class="form-group" id="end">
                     <of-datetime-filter id="opfab-feed-filter-dateTimeTo" filterPath="end.label" formControlName="dateTimeTo"
                         labelKey="feed.filters.time." (change)="onDateTimeChange($event)"></of-datetime-filter>
@@ -107,4 +107,4 @@
     <div id="opfab-feed-filter-btn-filter" [ngClass]="isFilterActive() ? 'opfab-icon-filter-active' :  'opfab-icon-filter'" popoverClass="opfab-filters-popover" placement="bottom-left" [ngbPopover]="filterTypeContent"
         container="body" [autoClose]="'outside'">
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
index 61359c75cc..a3c95e5306 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
@@ -77,7 +77,6 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask-size: cover;
   mask: url(assets/images/icons/filter.svg);
 }
 
@@ -89,7 +88,6 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask-size: cover;
   mask: url(assets/images/icons/filter-active.svg);
 }
 
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
index cb55aa53aa..b7290ecbe0 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
@@ -8,18 +8,17 @@
  */
 
 
-
 import {Component, Input, OnDestroy, OnInit, ViewEncapsulation} from '@angular/core';
-import {Subject, timer} from "rxjs";
-import {Store} from "@ngrx/store";
-import {AppState} from "@ofStore/index";
-import {AbstractControl, FormControl, FormGroup} from "@angular/forms";
-import {debounce, debounceTime, distinctUntilChanged, first, takeUntil} from "rxjs/operators";
-import {ApplyFilter} from "@ofActions/feed.actions";
+import {Subject, timer} from 'rxjs';
+import {Store} from '@ngrx/store';
+import {AppState} from '@ofStore/index';
+import {AbstractControl, FormControl, FormGroup} from '@angular/forms';
+import {debounce, debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
+import {ApplyFilter} from '@ofActions/feed.actions';
 import * as _ from 'lodash';
-import {FilterType} from "@ofServices/filter.service";
+import {FilterType} from '@ofServices/filter.service';
 
-import { DateTimeNgb, getDateTimeNgbFromMoment } from '@ofModel/datetime-ngb.model';
+import {DateTimeNgb, getDateTimeNgbFromMoment} from '@ofModel/datetime-ngb.model';
 import moment from 'moment';
 
 
@@ -46,7 +45,7 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
     constructor(private store: Store<AppState>) {
         this.typeFilterForm = this.createFormGroup();
         this.ackFilterForm = this.createAckFormGroup();
-        this.timeFilterForm = this.createDateTimeForm();        
+        this.timeFilterForm = this.createDateTimeForm();
     }
 
     private createFormGroup() {
@@ -55,13 +54,13 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
             action: new FormControl(),
             compliant: new FormControl(),
             information: new FormControl()
-        },{updateOn: 'change'});
+        }, {updateOn: 'change'});
     }
 
     private createAckFormGroup() {
         return new FormGroup({
-            ackControl: new FormControl("notack")            
-        },{updateOn: 'change'});
+            ackControl: new FormControl('notack')
+        }, {updateOn: 'change'});
     }
 
     private createDateTimeForm() {
@@ -91,23 +90,23 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
     }
 
     private initTypeFilter() {
-        
-       const savedAlarm = localStorage.getItem("opfab.feed.filter.type.alarm");
-       const savedAction = localStorage.getItem("opfab.feed.filter.type.action");
-       const savedACompliant = localStorage.getItem("opfab.feed.filter.type.compliant");
-       const savedInformation = localStorage.getItem("opfab.feed.filter.type.information");
-      
-       const alarmUnset = savedAlarm && savedAlarm != "true";
-       const actionUnset = savedAction && savedAction != "true";
-       const compliantUnset = savedACompliant && savedACompliant != "true";
-       const informationUnset = savedInformation && savedInformation != "true";
-
-
-       this.typeFilterForm.get('alarm').setValue(!alarmUnset,{emitEvent: false});
-       this.typeFilterForm.get('action').setValue(!actionUnset,{emitEvent: false});
-       this.typeFilterForm.get('compliant').setValue(!compliantUnset,{emitEvent: false});
-       this.typeFilterForm.get('information').setValue(!informationUnset,{emitEvent: false});
-       
+
+       const savedAlarm = localStorage.getItem('opfab.feed.filter.type.alarm');
+       const savedAction = localStorage.getItem('opfab.feed.filter.type.action');
+       const savedACompliant = localStorage.getItem('opfab.feed.filter.type.compliant');
+       const savedInformation = localStorage.getItem('opfab.feed.filter.type.information');
+
+       const alarmUnset = savedAlarm && savedAlarm != 'true';
+       const actionUnset = savedAction && savedAction != 'true';
+       const compliantUnset = savedACompliant && savedACompliant != 'true';
+       const informationUnset = savedInformation && savedInformation != 'true';
+
+
+       this.typeFilterForm.get('alarm').setValue(!alarmUnset, {emitEvent: false});
+       this.typeFilterForm.get('action').setValue(!actionUnset, {emitEvent: false});
+       this.typeFilterForm.get('compliant').setValue(!compliantUnset, {emitEvent: false});
+       this.typeFilterForm.get('information').setValue(!informationUnset, {emitEvent: false});
+
        this.store.dispatch(
         new ApplyFilter({
             name: FilterType.TYPE_FILTER,
@@ -115,20 +114,20 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
             status: {'alarm' : !alarmUnset, 'action': !actionUnset, 'compliant' : !compliantUnset, 'information' : !informationUnset}
         }));
 
-        
+
         this.typeFilterForm
                 .valueChanges
                 .pipe(
                     takeUntil(this.ngUnsubscribe$),
-                    distinctUntilChanged((formA, formB)=>{
-                        return _.isEqual(formA,formB);
+                    distinctUntilChanged((formA, formB) => {
+                        return _.isEqual(formA, formB);
                     }),
                     debounce(() => timer(500)))
                 .subscribe(form => {
-                    localStorage.setItem("opfab.feed.filter.type.alarm", form.alarm);
-                    localStorage.setItem("opfab.feed.filter.type.action", form.action);
-                    localStorage.setItem("opfab.feed.filter.type.compliant", form.compliant);
-                    localStorage.setItem("opfab.feed.filter.type.information", form.information);
+                    localStorage.setItem('opfab.feed.filter.type.alarm', form.alarm);
+                    localStorage.setItem('opfab.feed.filter.type.action', form.action);
+                    localStorage.setItem('opfab.feed.filter.type.compliant', form.compliant);
+                    localStorage.setItem('opfab.feed.filter.type.information', form.information);
                     return this.store.dispatch(
                     new ApplyFilter({
                         name: FilterType.TYPE_FILTER,
@@ -140,11 +139,11 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
 
     private initAckFilter() {
 
-        const ackValue = localStorage.getItem("opfab.feed.filter.ack");
+        const ackValue = localStorage.getItem('opfab.feed.filter.ack');
         if (!!ackValue) {
-            this.ackFilterForm.get('ackControl').setValue(ackValue,{emitEvent: false});
-            let active = !(ackValue === "all");
-            let ack = active && ackValue === "ack";
+            this.ackFilterForm.get('ackControl').setValue(ackValue, {emitEvent: false});
+            const active = ackValue !== 'all';
+            const ack = active && ackValue === 'ack';
             this.store.dispatch(
                 new ApplyFilter({
                     name: FilterType.ACKNOWLEDGEMENT_FILTER,
@@ -153,7 +152,7 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
                 }));
 
         } else {
-            this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: false});
+            this.ackFilterForm.get('ackControl').setValue('notack', {emitEvent: false});
         }
 
         this.ackFilterForm
@@ -161,9 +160,9 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
             .pipe(
                 takeUntil(this.ngUnsubscribe$))
             .subscribe(form => {
-                let active = !(form.ackControl === "all");
-                let ack = active && form.ackControl === "ack";
-                localStorage.setItem("opfab.feed.filter.ack", form.ackControl);
+                const active = form.ackControl !== 'all';
+                const ack = active && form.ackControl === 'ack';
+                localStorage.setItem('opfab.feed.filter.ack', form.ackControl);
 
                 return this.store.dispatch(
                     new ApplyFilter({
@@ -179,16 +178,16 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
         if (this.filterByPublishDate) this.dateFilterType = FilterType.PUBLISHDATE_FILTER;
         else this.dateFilterType = FilterType.BUSINESSDATE_FILTER;
 
-        const savedStart = localStorage.getItem("opfab.feed.filter.start");
-        const savedEnd = localStorage.getItem("opfab.feed.filter.end");
+        const savedStart = localStorage.getItem('opfab.feed.filter.start');
+        const savedEnd = localStorage.getItem('opfab.feed.filter.end');
 
         if (!!savedStart) {
-            this.timeFilterForm.get("dateTimeFrom").setValue(getDateTimeNgbFromMoment(moment(+savedStart)));
+            this.timeFilterForm.get('dateTimeFrom').setValue(getDateTimeNgbFromMoment(moment(+savedStart)));
         }
         if (!!savedEnd) {
-            this.timeFilterForm.get("dateTimeTo").setValue(getDateTimeNgbFromMoment(moment(+savedEnd)));
+            this.timeFilterForm.get('dateTimeTo').setValue(getDateTimeNgbFromMoment(moment(+savedEnd)));
         }
-        
+
         this.setNewFilterValue();
 
         this.dateTimeFilterChange.pipe(
@@ -204,11 +203,11 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
 
     private setNewFilterValue(): void {
         const status = { start: null, end: null };
-        status.start = this.extractTime(this.timeFilterForm.get("dateTimeFrom"));
-        status.end = this.extractTime(this.timeFilterForm.get("dateTimeTo"));
-       
-        localStorage.setItem("opfab.feed.filter.start", status.start);
-        localStorage.setItem("opfab.feed.filter.end", status.end);
+        status.start = this.extractTime(this.timeFilterForm.get('dateTimeFrom'));
+        status.end = this.extractTime(this.timeFilterForm.get('dateTimeTo'));
+
+        localStorage.setItem('opfab.feed.filter.start', status.start);
+        localStorage.setItem('opfab.feed.filter.end', status.end);
 
         this.store.dispatch(
             new ApplyFilter({
@@ -242,12 +241,12 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
     }
 
     reset() {
-        this.typeFilterForm.get('alarm').setValue(true,{emitEvent: true});
-        this.typeFilterForm.get('action').setValue(true,{emitEvent: true});
-        this.typeFilterForm.get('compliant').setValue(true,{emitEvent: true});
-        this.typeFilterForm.get('information').setValue(true,{emitEvent: true});
+        this.typeFilterForm.get('alarm').setValue(true, {emitEvent: true});
+        this.typeFilterForm.get('action').setValue(true, {emitEvent: true});
+        this.typeFilterForm.get('compliant').setValue(true, {emitEvent: true});
+        this.typeFilterForm.get('information').setValue(true, {emitEvent: true});
         if (!this.hideAckFilter) {
-            this.ackFilterForm.get('ackControl').setValue("notack",{emitEvent: true});
+            this.ackFilterForm.get('ackControl').setValue('notack', {emitEvent: true});
         }
 
         if (!this.hideTimerTags) {
@@ -256,5 +255,5 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
             this.setNewFilterValue();
         }
     }
-    
+
 }
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
index 4a8523f7c7..52d5bd5b1d 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
@@ -26,7 +26,6 @@
   margin-right: 5px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask-size: cover;
   mask: url(assets/images/icons/sort.svg);
 }
 
@@ -46,4 +45,4 @@
 
 .opfab-filters-popover {
   background-color:var(--opfab-popover-bgcolor);
-}
\ No newline at end of file
+}
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 2d02f1ab4d..aa827b787e 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
@@ -11,13 +11,12 @@
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
 import * as _ from 'lodash';
 import * as moment from 'moment';
-import {Subscription} from 'rxjs';
 import {Store} from '@ngrx/store';
 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';
+import {GlobalStyleService} from '@ofServices/global-style.service';
 
 
 const forwardWeekConf = {
@@ -38,7 +37,7 @@ export class InitChartComponent implements OnInit, OnDestroy {
     public cardsData: any[];
     public myDomain: number[];
     public domainId: string;
-    
+
 
     // required for domain movements specifications
     public followClockTick: boolean;
@@ -53,7 +52,7 @@ export class InitChartComponent implements OnInit, OnDestroy {
     public endDate;
 
 
-    constructor(private store: Store<AppState>, private time: TimeService,private globalStyleService: GlobalStyleService) {
+    constructor(private store: Store<AppState>, private time: TimeService, private globalStyleService: GlobalStyleService) {
     }
 
 
@@ -198,9 +197,9 @@ export class InitChartComponent implements OnInit, OnDestroy {
             case '7D':
                 return this.time.formatDateTime(value);
             case 'W':
-                return this.time.formatDate(value);;
+                return this.time.formatDate(value);
             case 'M':
-                return this.time.formatDate(value);;
+                return this.time.formatDate(value);
             case 'Y':
                 return date.format('yyyy');
             default:
diff --git a/ui/main/src/app/modules/feed/feed.component.ts b/ui/main/src/app/modules/feed/feed.component.ts
index 93fcd6c599..35ec2a21a2 100644
--- a/ui/main/src/app/modules/feed/feed.component.ts
+++ b/ui/main/src/app/modules/feed/feed.component.ts
@@ -8,18 +8,17 @@
  */
 
 
-
 import {Component, OnInit} from '@angular/core';
 import {select, Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
 import {Observable, of} from 'rxjs';
 import {LightCard} from '@ofModel/light-card.model';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
-import {catchError, map, delay} from 'rxjs/operators';
+import {catchError, delay, map} from 'rxjs/operators';
 import * as moment from 'moment';
-import { ConfigService} from '@ofServices/config.service';
-import { ApplyFilter } from '@ofStore/actions/feed.actions';
-import {BUSINESS_DATE_FILTER_INITIALISATION, FilterType} from '@ofServices/filter.service';
+import {ConfigService} from '@ofServices/config.service';
+import {ApplyFilter} from '@ofStore/actions/feed.actions';
+import {BUSINESS_DATE_FILTER_INITIALISATION} from '@ofServices/filter.service';
 
 @Component({
     selector: 'of-cards',
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 37391d6d42..2168442f6c 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
@@ -8,7 +8,7 @@
 <!-- This file is part of the OperatorFabric project.                      -->
 
 <div class="opfab-table">
-  <table>
+  <table  aria-describedby="Logging results table">
     <thead>
       <tr>
         <th scope="col"></th>
@@ -49,4 +49,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
index ea8b15c014..e971c6712d 100644
--- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
+++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
@@ -9,7 +9,7 @@
 
 
 <div class="opfab-table">
-<table>
+<table aria-describedby="Monitoring results table">
     <thead>
         <tr>
             <th scope="col"></th>
diff --git a/ui/main/src/app/modules/navbar/info/info.component.scss b/ui/main/src/app/modules/navbar/info/info.component.scss
index 36ad54d451..6bb1cb416a 100644
--- a/ui/main/src/app/modules/navbar/info/info.component.scss
+++ b/ui/main/src/app/modules/navbar/info/info.component.scss
@@ -34,5 +34,4 @@
   margin-right: auto;
   background: var( --opfab-text-color); 
   mask: url(assets/images/icons/profile.svg);
-  mask-size: cover;
 }
diff --git a/ui/main/src/app/modules/navbar/navbar.component.scss b/ui/main/src/app/modules/navbar/navbar.component.scss
index 310a7c7061..bccc4647b0 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.scss
+++ b/ui/main/src/app/modules/navbar/navbar.component.scss
@@ -150,7 +150,6 @@
   margin-top: -5px;
   background: var( --opfab-text-color); 
   mask: url(assets/images/icons/newcard.svg);
-  mask-size: cover;
 }
 
 
@@ -162,7 +161,6 @@
   margin-top: -5px;
   background: var( --opfab-text-color); 
   mask: url(assets/images/icons/calendar.svg);
-  mask-size: cover;
 }
 
 .opfab-menu-icon-calendar.active {
@@ -189,4 +187,4 @@
 
 .opfab-about-title {
   color:  var(--opfab-text-color-stronger);
-}
\ No newline at end of file
+}
diff --git a/ui/main/src/app/modules/share/card-detail/card-detail.component.ts b/ui/main/src/app/modules/share/card-detail/card-detail.component.ts
index d1df725ba9..321466aac8 100644
--- a/ui/main/src/app/modules/share/card-detail/card-detail.component.ts
+++ b/ui/main/src/app/modules/share/card-detail/card-detail.component.ts
@@ -11,7 +11,7 @@
 import {Component, ElementRef, Input, OnDestroy, OnInit} from '@angular/core';
 import {Card} from '@ofModel/card.model';
 import {ProcessesService} from '@ofServices/processes.service';
-import {HandlebarsService} from '../../../modules/cards/services/handlebars.service';
+import {HandlebarsService} from '../../cards/services/handlebars.service';
 import {DomSanitizer, SafeHtml, SafeResourceUrl} from '@angular/platform-browser';
 import {DetailContext} from '@ofModel/detail-context.model';
 import {Store} from '@ngrx/store';
diff --git a/ui/main/src/app/modules/share/datetime-filter/datetime-filter.component.html b/ui/main/src/app/modules/share/datetime-filter/datetime-filter.component.html
index d9a44f30b0..3f330746b2 100644
--- a/ui/main/src/app/modules/share/datetime-filter/datetime-filter.component.html
+++ b/ui/main/src/app/modules/share/datetime-filter/datetime-filter.component.html
@@ -8,7 +8,7 @@
 
 
 <ng-container [formGroup]="datetimeForm">
-    <table style="width:100%"> <tr>
+    <table aria-describedby="Date and time filter" role="presentation" style="width:100%"> <tr>
         <td>
         <div class="nopaddingrow opfab-input">
             <!--archive.filters.{{filterPath}}-->
diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html
index 06a1be4055..832ca1a2b4 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.html
+++ b/ui/main/src/app/modules/usercard/usercard.component.html
@@ -44,11 +44,11 @@
             </label>
         </div>
         <div class="justify-content-center" style="display:flex;width:100%;align-content:center;flex-wrap: wrap;">
-            <div *ngIf="startDateVisible" style="width:280px;margin-right: 50px;margin-left: 50px ;">
+            <div *ngIf="startDateVisible" style="width:280px; margin-right: 50px; margin-left: 50px;">
                 <of-datetime-filter filterPath="startDate" formControlName="startDate" labelKey="userCard.filters."
                     [offset]="[{amount:1,unit:'minute'}]" ></of-datetime-filter>
             </div>
-            <div *ngIf="endDateVisible" style="width: 280px;;margin-right: 50px;margin-left: 50px ;">
+            <div *ngIf="endDateVisible" style="width: 280px; margin-right: 50px; margin-left: 50px;">
                 <of-datetime-filter filterPath="endDate" formControlName="endDate" labelKey="userCard.filters."
                     [offset]="[{amount:1,unit:'day'}]"></of-datetime-filter>
             </div>
diff --git a/ui/main/src/app/services/processes.service.ts b/ui/main/src/app/services/processes.service.ts
index be31151146..b6f962153e 100644
--- a/ui/main/src/app/services/processes.service.ts
+++ b/ui/main/src/app/services/processes.service.ts
@@ -8,20 +8,18 @@
  */
 
 
-
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpParams, HttpUrlEncodingCodec} from '@angular/common/http';
 import {environment} from '@env/environment';
-import {Observable, of, Subject} from 'rxjs';
+import {merge, Observable, of, Subject} from 'rxjs';
 import {TranslateService} from '@ngx-translate/core';
 import {catchError, map, skip, tap} from 'rxjs/operators';
 import {Process} from '@ofModel/processes.model';
 import {Card} from '@ofModel/card.model';
-import {merge} from 'rxjs';
-import { Store, select } from '@ngrx/store';
-import { selectLinesOfLoggingResult } from '@ofStore/selectors/logging.selectors';
-import { AppState } from '@ofStore/index';
-import { selectFeed, selectLastCards } from '@ofStore/selectors/feed.selectors';
+import {select, Store} from '@ngrx/store';
+import {selectLinesOfLoggingResult} from '@ofStore/selectors/logging.selectors';
+import {AppState} from '@ofStore/index';
+import {selectLastCards} from '@ofStore/selectors/feed.selectors';
 
 
 @Injectable()
@@ -58,7 +56,7 @@ export class ProcessesService {
                 this.loadTranslationsForProcess(loggingResult.process, loggingResult.processVersion)));
     }
 
-    public loadTranslationsForProcess(process,version) {
+    public loadTranslationsForProcess(process, version) {
         this.translateService.getLangs().forEach(
             local => this.addTranslationIfNeeded(local, process, version ));
     }
@@ -80,9 +78,7 @@ export class ProcessesService {
                         if (this.processes.length === 0) {
                             console.log(new Date().toISOString(), 'WARNING : no processes configured');
                             this.translationsLoaded.next();
-                            }
-
-                        else {
+                            } else {
                             this.loadAllTranslations();
                             console.log(new Date().toISOString(), 'List of processes loaded');
                         }
diff --git a/ui/main/src/app/store/actions/feed.actions.ts b/ui/main/src/app/store/actions/feed.actions.ts
index ef2e4bf60c..36cbb07f76 100644
--- a/ui/main/src/app/store/actions/feed.actions.ts
+++ b/ui/main/src/app/store/actions/feed.actions.ts
@@ -10,7 +10,7 @@
 
 import {Action} from '@ngrx/store';
 import {FilterType} from '@ofServices/filter.service';
-import {Filter, FilterStatus} from '@ofModel/feed-filter.model';
+import {Filter} from '@ofModel/feed-filter.model';
 
 
 export enum FeedActionTypes {
@@ -19,7 +19,7 @@ export enum FeedActionTypes {
     ResetFilter = '[Feed] Reset filter Status',
     ResetFilterForMonitoring = '[Feed] Reset filter Status for monitoring screen',
     ApplySeveralFilters = '[Feed] Change several filters Status at Once',
-    ChangeReadSort = "[Feed] Sort by read"
+    ChangeReadSort = '[Feed] Sort by read'
 }
 
 export class ApplyFilter implements Action {
diff --git a/ui/main/src/app/store/effects/monitoring.effects.ts b/ui/main/src/app/store/effects/monitoring.effects.ts
index 204d95a4c8..64ea926f3f 100644
--- a/ui/main/src/app/store/effects/monitoring.effects.ts
+++ b/ui/main/src/app/store/effects/monitoring.effects.ts
@@ -9,17 +9,11 @@
 
 import {Injectable} from '@angular/core';
 import {AppState} from '@ofStore/index';
-import {CardService} from '@ofServices/card.service';
 import {Action, Store} from '@ngrx/store';
 import {Actions, Effect, ofType} from '@ngrx/effects';
 import {Observable} from 'rxjs';
-import {
-    HandleUnexpectedError,
-    MonitoringActionType,
-    SendMonitoringQuery,
-    UpdateMonitoringFilter
-} from '@ofActions/monitoring.actions';
-import {catchError, map, tap} from 'rxjs/operators';
+import {HandleUnexpectedError, MonitoringActionType, SendMonitoringQuery, UpdateMonitoringFilter} from '@ofActions/monitoring.actions';
+import {catchError, map} from 'rxjs/operators';
 
 @Injectable()
 export class MonitoringEffects {
diff --git a/ui/main/src/app/store/effects/user.effects.ts b/ui/main/src/app/store/effects/user.effects.ts
index 01d3b57309..658c9065f2 100644
--- a/ui/main/src/app/store/effects/user.effects.ts
+++ b/ui/main/src/app/store/effects/user.effects.ts
@@ -24,7 +24,7 @@ import {
     UserApplicationRegistered
 } from '@ofStore/actions/user.actions';
 import {AcceptLogIn, AuthenticationActionTypes} from '@ofStore/actions/authentication.actions';
-import {catchError, map, switchMap, tap} from 'rxjs/operators';
+import {catchError, map, switchMap} from 'rxjs/operators';
 import {Entity, User} from '@ofModel/user.model';
 import {AuthenticationService} from '@ofServices/authentication/authentication.service';
 
diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss
index 50c2978674..1351d9b223 100644
--- a/ui/main/src/assets/styles/styles.scss
+++ b/ui/main/src/assets/styles/styles.scss
@@ -11,10 +11,11 @@
 /* You can add global styles to this file, and also import other style files */
 
 @import "variables";
+
 /* import bootstrap*/
 @import '../../../node_modules/bootstrap/scss/bootstrap.scss';
+
 @import "navbar.scss";
-//@import '../../../node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css';
 
 @import "../../../node_modules/ag-grid-community/dist/styles/ag-grid.css";
 @import "../../../node_modules/ag-grid-community/dist/styles/ag-theme-alpine.css";
@@ -116,7 +117,6 @@ body {
   margin-top: 10px;
   background: var( --opfab-text-color);
   mask: url(assets/images/icons/export-data.svg);
-  mask-size: cover;
 }
 // END BUTTON STYLE 
 
@@ -713,7 +713,6 @@ html, body { height: 100%; }
 
 .modal-header{
   background-color: var(--opfab-bgcolor);
-  color: var(--opfab-textcolor);
   height: 60px;
   font-size: 20px;
   font-weight: bold;

From b499ec315cf67c7077a4994457681a517329be36 Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Wed, 3 Feb 2021 18:33:43 +0100
Subject: [PATCH 14/62] [OC-1438] Add the possibility to show environment name
 in the top right corner

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 config/dev/web-ui.json                          |  2 ++
 config/docker/web-ui.json                       |  2 ++
 .../configuration/web-ui_configuration.adoc     |  3 +++
 .../app/modules/navbar/navbar.component.html    | 17 +++++++++++++++++
 .../src/app/modules/navbar/navbar.component.ts  |  7 +++++++
 5 files changed, 31 insertions(+)

diff --git a/config/dev/web-ui.json b/config/dev/web-ui.json
index d959858ce4..e58664f32e 100644
--- a/config/dev/web-ui.json
+++ b/config/dev/web-ui.json
@@ -1,5 +1,7 @@
 {
   "title": "OperatorFabric (Dev Mode)",
+  "environmentName": "DEV ENV",
+  "environmentColor": "green",
   "checkPerimeterForResponseCard": true,
   "archive": {
     "filters": {
diff --git a/config/docker/web-ui.json b/config/docker/web-ui.json
index 633fdba78e..ad96e83095 100644
--- a/config/docker/web-ui.json
+++ b/config/docker/web-ui.json
@@ -1,4 +1,6 @@
 {
+  "environmentName": "TEST ENV",
+  "environmentColor": "blue",
   "checkPerimeterForResponseCard": true,
   "archive": {
     "filters": {
diff --git a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
index faa04cd702..d1ee6bb674 100644
--- a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
+++ b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc
@@ -42,6 +42,7 @@ The properties lie in the `web-ui.json`.The following table describes their mean
 |===
 |name|default|mandatory?|Description
 
+
 |security.provider-realm||yes|The realm name in keycloak server settings page. This is used for the log out process to know which realm should be affected.
 |security.provider-url||yes|The keycloak server instance
 |security.logout-url||yes
@@ -122,6 +123,8 @@ It should look like:
 |logo.width|150|no|The width of the logo (in px) (only taken into account if logo.base64 is set).
 |logo.limitSize|true|no|If it is true, the height limit is 32(px) and the width limit is 200(px), it means that if the height is over than 32, it will be set to 32, if the width is over than 200, it is set to 200. If it is false, no limit restriction for the height and the width. 
 |title|OperatorFabric|no|Title of the application, displayed on the browser
+|environmentName||no| Name of the environment to display on the top-right corner (examples: PROD , TEST .. ), if the value not set the environnement name is not shown .
+|environmentColor|blue|no| Color of the background of the environnement name. The format of color is css, for example : `red` , `#4052FF`
 |navbar.hidden|["logging","monitoring"]|no
 a| Lists the application menu to hide in the navbar. +
 The `keys` used are the `route.path` declared in the `${OF_HOME}ui/main/src/app/app-routing.module.ts` file. +
diff --git a/ui/main/src/app/modules/navbar/navbar.component.html b/ui/main/src/app/modules/navbar/navbar.component.html
index f94c30b2a4..6cfea4e487 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.html
+++ b/ui/main/src/app/modules/navbar/navbar.component.html
@@ -51,6 +51,12 @@
         </div>
       </li>
     </ul>
+<!-- KEEP IN COMMENTS UNTIL VALIDATION OF DESIGN 
+    <div style="width:120px;height:87px;overflow: hidden;margin-top: -30px;margin-bottom:-20px">
+    <div style="font-size:12px;transform:rotate(-45deg);color:white;background-color: red;margin-left:-20px;margin-top:20px;width:220px;padding-left:40px;font-weight: bold;">
+      INTEGRATION
+    </div>
+    </div> -->
 
     <ul class="navbar-nav navbar-right">
       <li style="display:flex;margin-top: 12px;cursor:pointer;margin-right:20px" (click)="openCardCreation()" *ngIf="(displayCreateUserCard)">
@@ -70,6 +76,17 @@
 
       </li>
     </ul>
+
+    <div *ngIf="displayEnvironmentName" 
+      style="width:80px;height:87px;overflow: hidden;margin-top: -30px;margin-bottom:-20px;
+      margin-left: -50px;margin-right: -15px;">
+      <div [style.background-color]="environmentColor" 
+          style="font-size:10px;transform:rotate(45deg);color:white;
+          margin-top:33px; margin-left: -57px; width:210px;
+          text-align: center; font-weight: bold;">
+        {{environmentName}}
+      </div>
+    </div>
   </div>
 
 </nav>
diff --git a/ui/main/src/app/modules/navbar/navbar.component.ts b/ui/main/src/app/modules/navbar/navbar.component.ts
index 031a4ef400..ec07536e70 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.ts
+++ b/ui/main/src/app/modules/navbar/navbar.component.ts
@@ -55,6 +55,9 @@ export class NavbarComponent implements OnInit {
   displayFeedConfiguration: boolean;
   displayCreateUserCard: boolean;
   displayCalendar: boolean;
+  displayEnvironmentName = false;
+  environmentName : string;
+  environmentColor : string;
   nightDayMode = false;
 
   constructor(private store: Store<AppState>, private globalStyleService: GlobalStyleService, private configService: ConfigService
@@ -116,6 +119,10 @@ export class NavbarComponent implements OnInit {
     this.displayFeedConfiguration = !this.configService.getConfigValue('feedConfiguration.hidden');
     this.displayCreateUserCard = ! hiddenMenus.includes("usercard");
     this.displayCalendar = ! hiddenMenus.includes("calendar");
+    this.environmentName = this.configService.getConfigValue('environmentName');
+    this.environmentColor = this.configService.getConfigValue('environmentColor','blue');
+    if (!!this.environmentName) this.displayEnvironmentName = true
+
   }
 
   private getCurrentUserMenus(menus: Menu[]): Menu[] {

From c069dddba0f95d03e9c2e4cc7a2553f37f782a9a Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Tue, 2 Feb 2021 15:42:23 +0100
Subject: [PATCH 15/62] [OC-1432] Remove unique id/login validation from modals
 for Admin UI

---
 .../edit-entity-group-modal.component.ts      | 33 +++++--------------
 .../edit-group-modal.component.html           |  1 -
 .../users/edit-user-modal.component.html      |  1 -
 .../users/edit-user-modal.component.ts        | 33 ++++++-------------
 ui/main/src/assets/i18n/en.json               |  5 ++-
 ui/main/src/assets/i18n/fr.json               |  5 ++-
 6 files changed, 22 insertions(+), 56 deletions(-)

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/groups-entities/edit-entity-group-modal.component.ts
index 42dd9ffc49..88cb15c264 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/groups-entities/edit-entity-group-modal.component.ts
@@ -9,13 +9,12 @@
  */
 
 
-import {Component, Input, OnInit} from '@angular/core';
-import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
-import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
-import {EntitiesService} from '@ofServices/entities.service';
-import {GroupsService} from '@ofServices/groups.service';
-import {IdValidatorService} from 'app/modules/admin/services/id-validator.service';
-import {AdminTableType} from '../../table/admin-table.component';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { EntitiesService } from '@ofServices/entities.service';
+import { GroupsService } from '@ofServices/groups.service';
+import { AdminTableType } from '../../table/admin-table.component';
 
 @Component({
   selector: 'of-edit-group-modal',
@@ -26,8 +25,7 @@ export class EditEntityGroupModalComponent implements OnInit {
 
   form = new FormGroup({
     id: new FormControl(''
-      , [Validators.required, Validators.minLength(2), Validators.maxLength(20)]
-      , this.existsId.bind(this)),
+      , [Validators.required, Validators.minLength(2), Validators.maxLength(20)]),
     name: new FormControl('', [Validators.required, Validators.maxLength(20)]),
     description: new FormControl('')
   });
@@ -87,22 +85,7 @@ export class EditEntityGroupModalComponent implements OnInit {
     return this.form.get('description') as FormControl;
   }
 
-  existsId(control: AbstractControl) {
-    // if create
-    if (!this.row) {
-      if (this.type === 'entity')
-        return new IdValidatorService(this.entitiesService).isIdAvailable(control);
-      else
-        return new IdValidatorService(this.groupsService).isIdAvailable(control);
-    } else {
-      return new Promise((resolve) => {
-        resolve(null);
-      });
-    }
-  }
-
-  dismissModal(reason : string) : void {
+  dismissModal(reason: string): void {
     this.activeModal.dismiss(reason);
   }
-
 }
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
index 7c06a71a44..4532e74a5e 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
@@ -30,7 +30,6 @@ <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.en
           <div *ngIf="id.errors.required" translate>admin.input.id.required</div>
           <div *ngIf="id.errors.maxlength" translate>admin.input.id.maxLength</div>
           <div *ngIf="id.errors.minlength" translate>admin.input.id.minLength</div>
-          <div *ngIf="id.errors.shouldbeUnique" translate>admin.input.id.alreadyTaken </div>
         </div>
       </div>
     </div>
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 7de4ae4ef7..3cec601fb6 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
@@ -29,7 +29,6 @@ <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
           <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
           <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
           <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
-          <div *ngIf="login.errors.shouldbeUnique" translate>admin.input.login.alreadyTaken </div>
         </div>
       </div>
     </div>
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 abb44fde64..521627172d 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
@@ -8,16 +8,15 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
-import {Component, Input, OnInit} from '@angular/core';
-import {User} from '@ofModel/user.model';
-import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
-import {UserService} from '@ofServices/user.service';
-import {GroupsService} from '@ofServices/groups.service';
-import {EntitiesService} from '@ofServices/entities.service';
-import {Entity} from '@ofModel/entity.model';
-import {Group} from '@ofModel/group.model';
-import {IdValidatorService} from 'app/modules/admin/services/id-validator.service';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { User } from '@ofModel/user.model';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { UserService } from '@ofServices/user.service';
+import { GroupsService } from '@ofServices/groups.service';
+import { EntitiesService } from '@ofServices/entities.service';
+import { Entity } from '@ofModel/entity.model';
+import { Group } from '@ofModel/group.model';
 
 @Component({
   selector: 'of-edit-user-modal',
@@ -28,8 +27,7 @@ export class EditUserModalComponent implements OnInit {
 
   form = new FormGroup({
     login: new FormControl(''
-      , [Validators.required, Validators.minLength(4), Validators.maxLength(20)]
-      , this.existsId.bind(this)),
+      , [Validators.required, Validators.minLength(4), Validators.maxLength(20)]),
     firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
     lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
     groups: new FormControl([]),
@@ -117,17 +115,6 @@ export class EditUserModalComponent implements OnInit {
 
   }
 
- existsId(control: AbstractControl) {
-    // if create
-    if (!this.row) {
-      return new IdValidatorService(this.crudService).isIdAvailable(control);
-    } else {
-      return new Promise((resolve) => {
-        resolve(null);
-      });
-    }
-  }
-
   dismissModal(reason : string) : void {
     this.activeModal.dismiss(reason);
   }
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 1141ab16bd..81147b53ed 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -296,8 +296,7 @@
       "login": {
         "required": "Login is required.",
         "minLength": "Login should be minimum 4 characters.",
-        "maxLength": "Login should be maximum 20 characters.",
-        "alreadyTaken": "Login is already taken."
+        "maxLength": "Login should be maximum 20 characters."
       },
       "firstName": {
         "required": "First name is required.",
@@ -311,7 +310,7 @@
         "required": "Id is required.",
         "minLength": "Id should be minimum 2 characters.",
         "maxLength": "Id should be maximum 20 characters.",
-        "alreadyTaken": "ID is already taken."
+        "label":"Id"
       },
       "name": {
         "required": "Name is required.",
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index 353f07b902..ade9b95d47 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -296,8 +296,7 @@
       "login": {
         "required": "L'identifiant est obligatoire.",
         "minLength": "L'identifiant doit avoir au moins 4 caractères.",
-        "maxLength": "L'identifiant doit avoir au maximum 20 caractères.",
-        "alreadyTaken": "Cet identifiant existe déjà."
+        "maxLength": "L'identifiant doit avoir au maximum 20 caractères."
       },
       "firstName": {
         "required": "Le prénom est obligatoire.",
@@ -311,7 +310,7 @@
         "required": "L'identifiant est obligatoire.",
         "minLength": "L'identifiant doit avoir au moins 2 caractères.",
         "maxLength": "L'identifiant doit avoir au maximum 20 caractères.",
-        "alreadyTaken": "Cet identifiant existe déjà."
+        "label":"Id"
       },
       "name": {
         "required": "Le nom est obligatoire.",

From 94298be709b7b73b6c8618ea7be3ce75695a59ba Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 3 Feb 2021 16:17:19 +0100
Subject: [PATCH 16/62] [OC-1437] Make AOT compilation the default for ng build

---
 ui/main/angular.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/main/angular.json b/ui/main/angular.json
index 049071b6b2..c3d8144d55 100755
--- a/ui/main/angular.json
+++ b/ui/main/angular.json
@@ -22,6 +22,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets",
@@ -57,7 +58,6 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
@@ -159,4 +159,4 @@
   "cli": {
     "defaultCollection": "@ngrx/schematics"
   }
-}
\ No newline at end of file
+}

From 4a9673a9ba18f5e73d44af0690ceca625f98e7d0 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Thu, 4 Feb 2021 19:47:15 +0100
Subject: [PATCH 17/62] [OC-1400] Add "service" field in the free message
 feature

---
 .../modules/usercard/usercard.component.html  |  9 ++-
 .../modules/usercard/usercard.component.ts    | 65 ++++++++++++++++++-
 ui/main/src/assets/i18n/en.json               |  3 +-
 ui/main/src/assets/i18n/fr.json               |  1 +
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html
index 832ca1a2b4..a78753bdfd 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.html
+++ b/ui/main/src/app/modules/usercard/usercard.component.html
@@ -11,9 +11,16 @@
     <form [formGroup]="messageForm" class="opfab-form-lighter">
         <div class="row">
 
+            <div class="col" *ngIf="displayServiceFilter()">
+                <of-single-filter i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="service"
+                    [values]="serviceOptions"></of-single-filter>
+            </div>
             <div class="col">
-                <of-single-filter i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
+                <of-single-filter [hidden]="!! isSelectedService" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
                     [values]="processOptions"></of-single-filter>
+
+                <of-single-filter [hidden]="! isSelectedService" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
+                                  [values]="processOptionsWhenSelectedService"></of-single-filter>
             </div>
             <div class="col">
                 <of-single-filter i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="state"
diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts
index cf7f2ce30f..ecc088ac58 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.ts
+++ b/ui/main/src/app/modules/usercard/usercard.component.ts
@@ -53,6 +53,7 @@ export class UserCardComponent implements OnDestroy, OnInit {
 
     processesDefinition: Process[];
     currentUserWithPerimeters: UserWithPerimeters;
+    processGroups: {id: string, processes: string[]}[];
 
     severityOptions = Object.keys(Severity).map(severity => {
         return {
@@ -66,9 +67,14 @@ export class UserCardComponent implements OnDestroy, OnInit {
     selectedRecipients = [];
     dropdownSettings = {};
     processOptions = new Array();
+    processOptionsWhenSelectedService = new Array();
+    serviceOptions = new Array();
 
+    public isSelectedService = false;
     selectedProcess: Process;
     selectedState: string;
+    processesPerServices = new Map();
+    servicePerProcesses = new Map();
     statesPerProcesses = new Map();
     userCardTemplate: SafeHtml;
     editCardMode = false;
@@ -94,6 +100,10 @@ export class UserCardComponent implements OnDestroy, OnInit {
         return !!this.processOptions && this.processOptions.length > 0;
     }
 
+    displayServiceFilter() {
+        return !!this.serviceOptions && this.serviceOptions.length > 1 ;
+    }
+
     constructor(private store: Store<AppState>,
         private cardService: CardService,
         private userService: UserService,
@@ -111,11 +121,14 @@ export class UserCardComponent implements OnDestroy, OnInit {
     ngOnInit() {
 
         this.currentUserWithPerimeters = this.userService.getCurrentUserWithPerimeters();
+        this.processGroups = this.processesService.getProcessGroups();
         this.loadAllEntities();
         this.loadAllProcessAndStateInUserPerimeter();
+        this.loadAllServicesRelatingToUserPerimeter();
 
         this.messageForm = new FormGroup({
             severity: new FormControl(''),
+            service: new FormControl(''),
             process: new FormControl(''),
             state: new FormControl(''),
             startDate: new FormControl(''),
@@ -130,6 +143,7 @@ export class UserCardComponent implements OnDestroy, OnInit {
 
         this.changeSeverityToDefaultValue();
         this.changeStatesWhenSelectProcess();
+        this.changeProcessesWhenSelectService();
         this.loadTemplateWhenStateChange();
 
         this.dropdownSettings = {
@@ -148,14 +162,15 @@ export class UserCardComponent implements OnDestroy, OnInit {
             this.cardService.loadCard(this.cardIdToEdit).subscribe(card => {
                         this.cardToEdit = card;
                         this.messageForm.get('severity').setValue(this.cardToEdit.card.severity);
+                        this.messageForm.get('service').setValue(this.servicePerProcesses.get(this.cardToEdit.card.process));
                         this.messageForm.get('process').setValue(this.cardToEdit.card.process);
                         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)));
                         this.selectedRecipients = this.cardToEdit.card.entityRecipients;
-                    });
-                }
-            }
+            });
+        }
+    }
 
 
     loadAllEntities(): void {
@@ -184,6 +199,37 @@ 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;
+    }
+
+    loadAllServicesRelatingToUserPerimeter(): void {
+        let numberOfProcessesAttachedToAService = 0;
+
+        this.processGroups.forEach(group => {
+
+            const processOptions = [];
+            this.processOptions.forEach(processOption => {
+                if (this.isProcessInProcessesGroup(processOption.value, group)) {
+                    processOptions.push(processOption);
+                    numberOfProcessesAttachedToAService++;
+
+                    this.servicePerProcesses.set(processOption.value, group.id);
+                }
+            });
+
+            if (processOptions.length > 0)
+                this.processesPerServices.set(group.id, processOptions);
+        });
+
+        if (this.processOptions.length > numberOfProcessesAttachedToAService)
+            this.serviceOptions.push({value: "", label: ""});
+        for (let serviceId of this.processesPerServices.keys())
+            this.serviceOptions.push({value: serviceId, label: serviceId});
+    }
+
 
     private userCanSendCard(perimeter: ComputedPerimeter): boolean {
         return ((perimeter.rights === RightsEnum.ReceiveAndWrite)
@@ -220,6 +266,19 @@ export class UserCardComponent implements OnDestroy, OnInit {
 
     }
 
+    changeProcessesWhenSelectService(): void {
+        this.messageForm.get('service').valueChanges.subscribe((service) => {
+            if (!!service) {
+                this.processOptionsWhenSelectedService = this.processesPerServices.get(service);
+                this.selectedProcess = this.processOptionsWhenSelectedService[0].value;
+                this.isSelectedService = true;
+                this.messageForm.get('process').setValue(this.selectedProcess);
+            }
+            else
+                this.isSelectedService = false;
+        });
+    }
+
     changeStatesWhenSelectProcess(): void {
         this.messageForm.get('process').valueChanges.subscribe((process) => {
             if (!!process) {
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 81147b53ed..bbf42523b8 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -199,7 +199,7 @@
   },
   "userCard": {
     "title": "CREATE A NEW CARD ",
-    "editTitle" : "EDIT A NEW CARS",
+    "editTitle" : "EDIT A NEW CARD",
     "error": {
       "notAvailable": "Feature not available",
       "noRecipientSelected": "You must at least choose one recipient",
@@ -208,6 +208,7 @@
     },
     "filters": {
       "severity": "SEVERITY",
+      "service": "SERVICE",
       "process": "PROCESS",
       "state": "STATE",
       "startDate":  "START DATE",
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index ade9b95d47..705f8a6c90 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -208,6 +208,7 @@
     },
     "filters": {
       "severity": "SEVERITE",
+      "service": "SERVICE",
       "process": "PROCESSUS",
       "state": "ETAT",
       "startDate": "DATE DE DEBUT ",

From 6970223691474e7d6f6143a009b03e2e4e34adb5 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Wed, 3 Feb 2021 16:31:02 +0100
Subject: [PATCH 18/62] [OC-1428] Fix bug on Feed Filter when setting only date
 and not hours/minute in publishdate

---
 .../feed-filter/feed-filter.component.ts      | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
index b7290ecbe0..49cb6f3fab 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
@@ -206,8 +206,16 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
         status.start = this.extractTime(this.timeFilterForm.get('dateTimeFrom'));
         status.end = this.extractTime(this.timeFilterForm.get('dateTimeTo'));
 
-        localStorage.setItem('opfab.feed.filter.start', status.start);
-        localStorage.setItem('opfab.feed.filter.end', status.end);
+        if (status.start == null) {
+            localStorage.removeItem('opfab.feed.filter.start');
+        } else {
+            localStorage.setItem('opfab.feed.filter.start', status.start);
+        }
+        if (status.end == null) {
+            localStorage.removeItem('opfab.feed.filter.end');
+        } else {
+            localStorage.setItem('opfab.feed.filter.end', status.end);
+        }
 
         this.store.dispatch(
             new ApplyFilter({
@@ -222,6 +230,17 @@ export class FeedFilterComponent implements OnInit, OnDestroy {
         if (!val || val == '')  {
             return null;
         }
+
+        if (isNaN(val.time.hour)) {
+            val.time.hour = 0;
+        }
+        if (isNaN(val.time.minute)) {
+            val.time.minute = 0;
+        }
+        if (isNaN(val.time.second)) {
+            val.time.second = 0;
+        }
+
         const converter = new DateTimeNgb(val.date, val.time);
         return converter.convertToNumber();
     }

From ae0c9193d33422fd0fa27af1b2e44e4646dd6436 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Wed, 3 Feb 2021 11:49:58 +0100
Subject: [PATCH 19/62] [OC-1201] Inform the template when lttd has expired

---
 .../asciidoc/reference_doc/response_cards.adoc     |  4 ++++
 .../template/en/question.handlebars                | 13 +++++++++++++
 .../template/fr/question.handlebars                | 14 ++++++++++++++
 .../cards/components/detail/detail.component.ts    | 10 +++++++++-
 ui/main/src/assets/js/templateGateway.js           |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc
index 2b9d3b0b49..4317870dfa 100644
--- a/src/docs/asciidoc/reference_doc/response_cards.adoc
+++ b/src/docs/asciidoc/reference_doc/response_cards.adoc
@@ -171,3 +171,7 @@ From there, as soon as they will open this card the button will be marked as "MO
 The user can then click on "MODIFY ANSWER" and the button will come back to its initial state ("VALIDATE ANSWER") and the information that the user wants to modify its initial answer will be sent to the third template (by calling the _templateGateway.unlockAnswer()_ function).
 
 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).
+
+== 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
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 34c0f9f36d..de1a80d87c 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
@@ -9,6 +9,7 @@
        <label class="opfab-checkbox" style="margin-left:40px"> The 10/08/2021 between 10PM and 12PM <input type="checkbox" id="choice2" name="choice2" >  <span class="opfab-checkbox-checkmark"> </span> </label>
        <label class="opfab-checkbox" style="margin-left:40px"> The 11/08/2021 between 8PM and 10PM <input type="checkbox" id="choice3" name="choice3" >  <span class="opfab-checkbox-checkmark"> </span> </label>
     </div>
+    <div id="responseDisabled" style="color: red"></div>
 </form> 
 
 <br/>
@@ -77,6 +78,18 @@
 
  }
 
+  templateGateway.setLttdExpired = function(expired) {
+      const responseEnabled = document.getElementById('responseDisabled');
+      if (responseEnabled != null) {
+        if (expired) {
+            responseEnabled.innerHTML="Response time has expired";
+            templateGateway.lockAnswer();
+        } else {
+            responseEnabled.innerHTML="";
+            templateGateway.unlockAnswer();
+        }
+      }
+  }
 
 </script>
 
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 f1a0dd7f6c..210a43c8de 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
@@ -11,6 +11,7 @@
        <label class="opfab-checkbox" style="margin-left:40px"> Le 10/08/2020 entre 10h and 12h <input type="checkbox" id="choice2" name="choice2" >  <span class="opfab-checkbox-checkmark"> </span> </label>
        <label class="opfab-checkbox" style="margin-left:40px"> Le 11/08/2020 entre 8h and 10h  <input type="checkbox" id="choice3" name="choice3" >  <span class="opfab-checkbox-checkmark"> </span> </label>
     </div>
+    <div id="responseDisabled" style="color: red"></div>
 </form> 
 
 <br/>
@@ -82,6 +83,19 @@
 
   }
 
+  templateGateway.setLttdExpired = function(expired) {
+      const responseEnabled = document.getElementById('responseDisabled');
+      if (responseEnabled != null) {
+        if (expired) {
+            responseEnabled.innerHTML="Response time has expired";
+            templateGateway.lockAnswer();
+        } else {
+            responseEnabled.innerHTML="";
+            templateGateway.unlockAnswer();
+        }
+      }
+  }
+
 </script>
 
 
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 a8e6948e55..07ef65a6d7 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
@@ -284,7 +284,11 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     }
 
     ngDoCheck() {
+        const previous = this.lttdExpiredIsTrue;
         this.checkLttdExpired();
+        if (previous != this.lttdExpiredIsTrue) {
+            templateGateway.setLttdExpired(this.lttdExpiredIsTrue);
+        }
     }
 
     checkLttdExpired(): void {
@@ -464,7 +468,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
         }
         this.setButtonsVisibility();
         this.setShowDetailCardHeader();
-
+        
     }
 
     private setEntitiesToRespond() {
@@ -594,6 +598,10 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
                             setTimeout(() => { // wait for script loading before calling them in template 
                                 templateGateway.applyChildCards();
                                 if (this.hasAlreadyResponded) templateGateway.lockAnswer();
+                                if (this.card.lttd && this.lttdExpiredIsTrue) {
+                                    templateGateway.setLttdExpired(true);
+                                }
+
                             }, 10);
                         }, 10);
                     }, () => {
diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js
index 13d99886d5..f523ad6295 100644
--- a/ui/main/src/assets/js/templateGateway.js
+++ b/ui/main/src/assets/js/templateGateway.js
@@ -35,6 +35,7 @@ const templateGateway = {
     lockAnswer: function() {},
     applyChildCards: function() {},
     unlockAnswer: function() {},
+    setLttdExpired: function(expired) {},
     childCards: []
     
 };

From 2fbc0574daedd7dc942b43139e19acfb9c6dde3d Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Fri, 5 Feb 2021 15:46:28 +0100
Subject: [PATCH 20/62] [OC-1452] Translation error : criticity --> criticality

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 ui/main/src/assets/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 81147b53ed..6feffd1b0f 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -81,7 +81,7 @@
     },
     "sort": {
       "title": "Sort by",
-      "severity": "Criticity  then date",
+      "severity": "Criticality then date",
       "publish": "Date",
       "unread": "Unread then date"
     },

From e039010cd42fc2bb6295989a244fd3bcf4b8fa7e Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Mon, 8 Feb 2021 08:14:01 +0100
Subject: [PATCH 21/62] [OC-890] When using PASSWORD flow, once the token is
 expired notify the user

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 ui/main/src/app/store/effects/authentication.effects.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/main/src/app/store/effects/authentication.effects.ts b/ui/main/src/app/store/effects/authentication.effects.ts
index e6b7ef8468..91f5e25e44 100644
--- a/ui/main/src/app/store/effects/authentication.effects.ts
+++ b/ui/main/src/app/store/effects/authentication.effects.ts
@@ -85,7 +85,10 @@ export class AuthenticationEffects {
                 switchMap((action: TryToLogIn) => {
                     const payload = action.payload;
                     return this.authService.askTokenFromPassword(payload.username, payload.password).pipe(
-                        map(authenticationInfo => new AcceptLogIn(authenticationInfo)),
+                        map(authenticationInfo => {
+                            this.authService.regularCheckTokenValidity();
+                            return new AcceptLogIn(authenticationInfo)}
+                            ),
                         catchError(errorResponse => {
                                 return this.handleErrorOnTokenGeneration(errorResponse, 'authenticate');
                             }
@@ -204,6 +207,7 @@ export class AuthenticationEffects {
                                 MessageLevel.ERROR,
                                 new I18n('login.error.token.invalid'))));
                         }
+                        return of(this.handleRejectedLogin(new Message('No token (password mode)')));
                     } else {
                         if (!this.authService.isExpirationDateOver()) {
                             const authInfo = this.authService.extractIdentificationInformation();

From 68491cc67a08c30045374e7fa33316c72cbd8ab0 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 8 Feb 2021 11:03:25 +0100
Subject: [PATCH 22/62] [OC-1455] Fix undefined currentPath error in console

---
 ui/main/src/app/modules/navbar/navbar.component.html | 4 ++--
 ui/main/src/app/modules/navbar/navbar.component.ts   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/main/src/app/modules/navbar/navbar.component.html b/ui/main/src/app/modules/navbar/navbar.component.html
index 6cfea4e487..039c1ea10f 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.html
+++ b/ui/main/src/app/modules/navbar/navbar.component.html
@@ -28,7 +28,7 @@
     <ul class="navbar-nav mr-auto ">
       <!-- Links to OperatorFabric pages as defined in app-rooting.module.ts (e.g. Card Feed, Archive) -->
       <li class="nav-item" *ngFor="let link of navigationRoutes, let i = index"
-        [class.active]="currentPath && link.path === currentPath[1]">
+        [class.active]="link.path === currentPath[1]">
         <a id="opfab-navbar-menu-{{link.path}}" class="nav-link" [routerLink]="link.path" routerLinkActive #rla="routerLinkActive"
           (click)="activeLinkIndex = i" translate>{{'menu.'+link.path}}</a>
       </li>
@@ -184,4 +184,4 @@
       </button>
     </div>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/ui/main/src/app/modules/navbar/navbar.component.ts b/ui/main/src/app/modules/navbar/navbar.component.ts
index ec07536e70..d3281f67b7 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.ts
+++ b/ui/main/src/app/modules/navbar/navbar.component.ts
@@ -63,6 +63,7 @@ export class NavbarComponent implements OnInit {
   constructor(private store: Store<AppState>, private globalStyleService: GlobalStyleService, private configService: ConfigService
     , private userService: UserService, private modalService: NgbModal, private appService: AppService) {
 
+      this.currentPath = ['']; // Initializing currentPath to avoid 'undefined' errors when it is used to determine 'active' look in template
   }
 
     ngOnInit() {

From 0546c4f13fb826aa69ef88642ecac7ee00d6360d Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Fri, 5 Feb 2021 15:26:37 +0100
Subject: [PATCH 23/62] [OC-1396] Communicate to the template the screen size

---
 .../reference_doc/template_description.adoc     |  9 +++++++++
 .../template/en/process.handlebars              | 17 ++++++++++++++++-
 .../template/fr/process.handlebars              | 17 ++++++++++++++++-
 .../modules/calendar/calendar.component.html    |  2 +-
 .../card-details/card-details.component.ts      |  5 +++--
 .../cards/components/detail/detail.component.ts |  5 ++++-
 .../monitoring-table.component.html             |  2 +-
 .../share/card-detail/card-detail.component.ts  |  6 +++++-
 ui/main/src/assets/js/templateGateway.js        |  1 +
 9 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc
index e929701bbb..7169867f2a 100644
--- a/src/docs/asciidoc/reference_doc/template_description.adoc
+++ b/src/docs/asciidoc/reference_doc/template_description.adoc
@@ -466,3 +466,12 @@ Your can find example using these classes in the OperatorFabric core repository
 
 The library https://www.chartjs.org/[charts.js] is integrated in OperatorFabric, it means it's possible to show charts in cards, you can find a bundle example in the operator fabric git (https://github.com/opfab/operatorfabric-core/tree/develop/src/test/utils/karate/businessconfig/resources/bundle_defautlProcess[src/test/utils/karate/businessconfig/resources/bundle_defaultProcess]).
 
+
+== OperatorFabric specific functions
+
+=== Set screen size
+
+To adapt the template content on screen size it is possible to receive from OperatorFabric information on the size of the window where the template will be rendered. To receive screen size information you need to implement a javascript function in your template called templateGateway.setScreenSize(size) which receives as input a string parameter with one of the following values :
+
+- 'md' : medium size window
+- 'lg' : large size window
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/process.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/process.handlebars
index 8e906ab7ff..795bc33f79 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/process.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/process.handlebars
@@ -3,7 +3,7 @@
 
 <br/><br/>
 
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="121px" height="311px" viewBox="-0.5 -0.5 121 311" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2020-06-19T20:07:15.439Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;axyNPicFnS1ZRxzsM76B&quot; version=&quot;13.2.6&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;C5RBs43oDa-KdzZeNtuy&quot; name=&quot;Page-1&quot;&gt;7Vhbl5owEP41PG4PEFft48qqvWx76nG3dh+zEIEaGRqCyv76JhBuUhW7rva09fiQGSbDZL5vZgANWcvNmOHQ+wQOoZqpOxsN3WqmaXRMU5N/3UkyTa/byxQu8x1lVCqm/jNRSl1pY98hUc2QA1Duh3WlDUFAbF7TYcZgXTebA63fNcQuaSimNqZN7cx3uJdp+2av1L8jvuvldza6b7MrS5wbq5NEHnZgXVGhoYYsBsCz1XJjESqTl+dl9j6Z0btFd/xhEv3AD4OP95+/XmXORsdsKY7ASMBP61qBu8I0VvlSZ+VJnkAGceAQ6UTX0MDjSyqWhlh+J5wnCnAccxAqYNwDFwJM7wBCZTeHgCszQ8okcG4ksEJ+omAvMtXIp1TdQ0jKvi+kiDNYFNhJBwUQ0pjiJ0IH2F64aaAWUGDiUgABka4cQQZ1ljK4YakdtMytwiCCmNlkjx3K7OR9K/xTiIwJLAlniTBghGLur+okxYrrbmFXbP0CvojP1FVdFqRUVWn09LoLjplLuNpVskIsKmGUqpQrR/AGNXgTMrBJFKXcwYzvoZGEcO35nExDnOZyLTpPnVpVyogUDFyKo0gBfoAPx+G5IoyTzV6k8qvdesb7SlyXTcXIQfEqDaWj78a2hsqxEBhGAwML2zSWG/dV8eumf0c5aiaapz/pXVR6RT8aGR2jc0bkzO7FoWu2XQtTO4VOnEW/GHrngqBoV+eA4GaynKzN++SKB0b8vArHYD2rWfkvDz4BMUu+SWdvrnPxsQhECLebmpTk0sbnlW1CelThyXW5SQpJjVdbQ/GEUzcvqGzqHWyapx/HaIvfaIu32Qka4/iwo367uS54hZOKWSgNovbPD3mh7Yxrv71YZBH87kPGL2v0jxxwO1pfWzK3bpHo+tIt8v+7wV/VIvOX70qL3F11r94hi4by0g5ptnzzeWmHROi4Drllf2yHFGL5ZSEzL7/PoOFP&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><path d="M 60 40 L 60 79.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 88.88 L 55.5 79.88 L 64.5 79.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_start" x="0" y="0" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 20px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">process start</div></div></div></foreignObject><text x="60" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">process start</text></switch></g>
+<svg id="chart" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="121px" height="311px" viewBox="-0.5 -0.5 121 311" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2020-06-19T20:07:15.439Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;axyNPicFnS1ZRxzsM76B&quot; version=&quot;13.2.6&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;C5RBs43oDa-KdzZeNtuy&quot; name=&quot;Page-1&quot;&gt;7Vhbl5owEP41PG4PEFft48qqvWx76nG3dh+zEIEaGRqCyv76JhBuUhW7rva09fiQGSbDZL5vZgANWcvNmOHQ+wQOoZqpOxsN3WqmaXRMU5N/3UkyTa/byxQu8x1lVCqm/jNRSl1pY98hUc2QA1Duh3WlDUFAbF7TYcZgXTebA63fNcQuaSimNqZN7cx3uJdp+2av1L8jvuvldza6b7MrS5wbq5NEHnZgXVGhoYYsBsCz1XJjESqTl+dl9j6Z0btFd/xhEv3AD4OP95+/XmXORsdsKY7ASMBP61qBu8I0VvlSZ+VJnkAGceAQ6UTX0MDjSyqWhlh+J5wnCnAccxAqYNwDFwJM7wBCZTeHgCszQ8okcG4ksEJ+omAvMtXIp1TdQ0jKvi+kiDNYFNhJBwUQ0pjiJ0IH2F64aaAWUGDiUgABka4cQQZ1ljK4YakdtMytwiCCmNlkjx3K7OR9K/xTiIwJLAlniTBghGLur+okxYrrbmFXbP0CvojP1FVdFqRUVWn09LoLjplLuNpVskIsKmGUqpQrR/AGNXgTMrBJFKXcwYzvoZGEcO35nExDnOZyLTpPnVpVyogUDFyKo0gBfoAPx+G5IoyTzV6k8qvdesb7SlyXTcXIQfEqDaWj78a2hsqxEBhGAwML2zSWG/dV8eumf0c5aiaapz/pXVR6RT8aGR2jc0bkzO7FoWu2XQtTO4VOnEW/GHrngqBoV+eA4GaynKzN++SKB0b8vArHYD2rWfkvDz4BMUu+SWdvrnPxsQhECLebmpTk0sbnlW1CelThyXW5SQpJjVdbQ/GEUzcvqGzqHWyapx/HaIvfaIu32Qka4/iwo367uS54hZOKWSgNovbPD3mh7Yxrv71YZBH87kPGL2v0jxxwO1pfWzK3bpHo+tIt8v+7wV/VIvOX70qL3F11r94hi4by0g5ptnzzeWmHROi4Drllf2yHFGL5ZSEzL7/PoOFP&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><path d="M 60 40 L 60 79.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 88.88 L 55.5 79.88 L 64.5 79.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_start" x="0" y="0" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 20px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">process start</div></div></div></foreignObject><text x="60" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">process start</text></switch></g>
 <rect id="rect_calcul2" x="0" y="180" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/>
 <g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 200px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div id="text_calcul2" style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 2</div></div></div></foreignObject><text x="60" y="204" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 2</text></switch></g><rect id="rect_calcul1" x="0" y="90" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 110px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 1 </div></div></div></foreignObject><text x="60" y="114" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 1 </text></switch></g><path d="M 60 130 L 60 160 L 60 169.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 178.88 L 55.5 169.88 L 64.5 169.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_calcul3" x="0" y="270" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 290px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 3</div></div></div></foreignObject><text x="60" y="294" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 3</text></switch></g><path d="M 60 220 L 60 250 L 60 259.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 268.88 L 55.5 259.88 L 64.5 259.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://desk.draw.io/support/solutions/articles/16000042487" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
 
@@ -16,5 +16,20 @@ var stateColor = "#aaffaa";
 if (document.getElementById("error").getAttribute("value")=="true") stateColor="red";
 console.log("color  = " + stateColor );
 document.getElementById(rect).setAttribute("fill",stateColor);
+
+templateGateway.setScreenSize = function(size) {
+    const chart = document.getElementById('chart');
+    if (chart) {
+        if (size === 'lg') {
+        chart.setAttribute("width", "181px");
+        chart.setAttribute("height", "466px");
+        } else {
+        chart.setAttribute("width", "111px");
+        chart.setAttribute("height", "311px");
+        }
+    }
+
+ }
+
 </script>
 </center> 
\ No newline at end of file
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/process.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/process.handlebars
index 3d1588d372..af085df586 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/process.handlebars
+++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/process.handlebars
@@ -3,7 +3,7 @@
 
 <br/><br/>
 
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="121px" height="311px" viewBox="-0.5 -0.5 121 311" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2020-06-19T20:07:15.439Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;axyNPicFnS1ZRxzsM76B&quot; version=&quot;13.2.6&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;C5RBs43oDa-KdzZeNtuy&quot; name=&quot;Page-1&quot;&gt;7Vhbl5owEP41PG4PEFft48qqvWx76nG3dh+zEIEaGRqCyv76JhBuUhW7rva09fiQGSbDZL5vZgANWcvNmOHQ+wQOoZqpOxsN3WqmaXRMU5N/3UkyTa/byxQu8x1lVCqm/jNRSl1pY98hUc2QA1Duh3WlDUFAbF7TYcZgXTebA63fNcQuaSimNqZN7cx3uJdp+2av1L8jvuvldza6b7MrS5wbq5NEHnZgXVGhoYYsBsCz1XJjESqTl+dl9j6Z0btFd/xhEv3AD4OP95+/XmXORsdsKY7ASMBP61qBu8I0VvlSZ+VJnkAGceAQ6UTX0MDjSyqWhlh+J5wnCnAccxAqYNwDFwJM7wBCZTeHgCszQ8okcG4ksEJ+omAvMtXIp1TdQ0jKvi+kiDNYFNhJBwUQ0pjiJ0IH2F64aaAWUGDiUgABka4cQQZ1ljK4YakdtMytwiCCmNlkjx3K7OR9K/xTiIwJLAlniTBghGLur+okxYrrbmFXbP0CvojP1FVdFqRUVWn09LoLjplLuNpVskIsKmGUqpQrR/AGNXgTMrBJFKXcwYzvoZGEcO35nExDnOZyLTpPnVpVyogUDFyKo0gBfoAPx+G5IoyTzV6k8qvdesb7SlyXTcXIQfEqDaWj78a2hsqxEBhGAwML2zSWG/dV8eumf0c5aiaapz/pXVR6RT8aGR2jc0bkzO7FoWu2XQtTO4VOnEW/GHrngqBoV+eA4GaynKzN++SKB0b8vArHYD2rWfkvDz4BMUu+SWdvrnPxsQhECLebmpTk0sbnlW1CelThyXW5SQpJjVdbQ/GEUzcvqGzqHWyapx/HaIvfaIu32Qka4/iwo367uS54hZOKWSgNovbPD3mh7Yxrv71YZBH87kPGL2v0jxxwO1pfWzK3bpHo+tIt8v+7wV/VIvOX70qL3F11r94hi4by0g5ptnzzeWmHROi4Drllf2yHFGL5ZSEzL7/PoOFP&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><path d="M 60 40 L 60 79.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 88.88 L 55.5 79.88 L 64.5 79.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_start" x="0" y="0" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 20px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">process start</div></div></div></foreignObject><text x="60" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">process start</text></switch></g>
+<svg id="chart" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="121px" height="311px" viewBox="-0.5 -0.5 121 311" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2020-06-19T20:07:15.439Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;axyNPicFnS1ZRxzsM76B&quot; version=&quot;13.2.6&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;C5RBs43oDa-KdzZeNtuy&quot; name=&quot;Page-1&quot;&gt;7Vhbl5owEP41PG4PEFft48qqvWx76nG3dh+zEIEaGRqCyv76JhBuUhW7rva09fiQGSbDZL5vZgANWcvNmOHQ+wQOoZqpOxsN3WqmaXRMU5N/3UkyTa/byxQu8x1lVCqm/jNRSl1pY98hUc2QA1Duh3WlDUFAbF7TYcZgXTebA63fNcQuaSimNqZN7cx3uJdp+2av1L8jvuvldza6b7MrS5wbq5NEHnZgXVGhoYYsBsCz1XJjESqTl+dl9j6Z0btFd/xhEv3AD4OP95+/XmXORsdsKY7ASMBP61qBu8I0VvlSZ+VJnkAGceAQ6UTX0MDjSyqWhlh+J5wnCnAccxAqYNwDFwJM7wBCZTeHgCszQ8okcG4ksEJ+omAvMtXIp1TdQ0jKvi+kiDNYFNhJBwUQ0pjiJ0IH2F64aaAWUGDiUgABka4cQQZ1ljK4YakdtMytwiCCmNlkjx3K7OR9K/xTiIwJLAlniTBghGLur+okxYrrbmFXbP0CvojP1FVdFqRUVWn09LoLjplLuNpVskIsKmGUqpQrR/AGNXgTMrBJFKXcwYzvoZGEcO35nExDnOZyLTpPnVpVyogUDFyKo0gBfoAPx+G5IoyTzV6k8qvdesb7SlyXTcXIQfEqDaWj78a2hsqxEBhGAwML2zSWG/dV8eumf0c5aiaapz/pXVR6RT8aGR2jc0bkzO7FoWu2XQtTO4VOnEW/GHrngqBoV+eA4GaynKzN++SKB0b8vArHYD2rWfkvDz4BMUu+SWdvrnPxsQhECLebmpTk0sbnlW1CelThyXW5SQpJjVdbQ/GEUzcvqGzqHWyapx/HaIvfaIu32Qka4/iwo367uS54hZOKWSgNovbPD3mh7Yxrv71YZBH87kPGL2v0jxxwO1pfWzK3bpHo+tIt8v+7wV/VIvOX70qL3F11r94hi4by0g5ptnzzeWmHROi4Drllf2yHFGL5ZSEzL7/PoOFP&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><path d="M 60 40 L 60 79.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 88.88 L 55.5 79.88 L 64.5 79.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_start" x="0" y="0" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 20px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">process start</div></div></div></foreignObject><text x="60" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">process start</text></switch></g>
 <rect id="rect_calcul2" x="0" y="180" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/>
 <g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 200px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div id="text_calcul2" style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 2</div></div></div></foreignObject><text x="60" y="204" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 2</text></switch></g><rect id="rect_calcul1" x="0" y="90" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 110px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 1 </div></div></div></foreignObject><text x="60" y="114" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 1 </text></switch></g><path d="M 60 130 L 60 160 L 60 169.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 178.88 L 55.5 169.88 L 64.5 169.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/><rect id="rect_calcul3" x="0" y="270" width="120" height="40" rx="6" ry="6" fill="none" stroke="#aaaaaa" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 290px; margin-left: 1px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #888888; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Calcul 3</div></div></div></foreignObject><text x="60" y="294" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Calcul 3</text></switch></g><path d="M 60 220 L 60 250 L 60 259.88" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 60 268.88 L 55.5 259.88 L 64.5 259.88 Z" fill="none" stroke="#aaaaaa" stroke-miterlimit="10" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://desk.draw.io/support/solutions/articles/16000042487" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
 
@@ -16,5 +16,20 @@ var stateColor = "#aaffaa";
 if (document.getElementById("error").getAttribute("value")=="true") stateColor="red";
 console.log("color  = " + stateColor );
 document.getElementById(rect).setAttribute("fill",stateColor);
+
+templateGateway.setScreenSize = function(size) {
+    const chart = document.getElementById('chart');
+    if (chart) {
+        if (size === 'lg') {
+        chart.setAttribute("width", "181px");
+        chart.setAttribute("height", "466px");
+        } else {
+        chart.setAttribute("width", "111px");
+        chart.setAttribute("height", "311px");
+        }
+    }
+
+ }
+ 
 </script>
 </center> 
\ No newline at end of file
diff --git a/ui/main/src/app/modules/calendar/calendar.component.html b/ui/main/src/app/modules/calendar/calendar.component.html
index 614be81956..fa3eae4714 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.html
+++ b/ui/main/src/app/modules/calendar/calendar.component.html
@@ -40,7 +40,7 @@
     <ng-template #cardDetail let-modal>
       <div class="modal-body">
         <div>
-          <of-card-details [parentModalRef] = "modalRef"> </of-card-details>
+          <of-card-details [parentModalRef] = "modalRef" [screenSize]="'lg'"> </of-card-details>
         </div>
       </div>
   </ng-template>
\ No newline at end of file
diff --git a/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts b/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts
index cc1d560e6b..34119d6b04 100644
--- a/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts
+++ b/ui/main/src/app/modules/cards/components/card-details/card-details.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
@@ -28,7 +28,7 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
             <div *ngIf="card && cardState">
                 <of-detail   [cardState]="cardState" [card]="card" [childCards]="childCards"
-                           [user]="user" [currentPath]="_currentPath" [parentModalRef]="parentModalRef">
+                           [user]="user" [currentPath]="_currentPath" [parentModalRef]="parentModalRef" [screenSize]="screenSize">
                 </of-detail>
             </div>
         `
@@ -37,6 +37,7 @@ export class CardDetailsComponent implements OnInit, OnDestroy {
 
 
     @Input() parentModalRef: NgbModalRef;
+    @Input() screenSize: string = 'md';
 
     card: Card;
     childCards: Card[];
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 07ef65a6d7..db6ad500ff 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
@@ -111,6 +111,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     @Input() user: User;
     @Input() currentPath: string;
     @Input() parentModalRef: NgbModalRef;
+    @Input() screenSize: string;
 
     @ViewChild('cardDeletedWithNoErrorPopup', null) cardDeletedWithNoErrorPopupRef: TemplateRef<any>;
     @ViewChild('impossibleToDeleteCardPopup', null) impossibleToDeleteCardPopupRef: TemplateRef<any>;
@@ -259,7 +260,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
 
     private initAllBindedVariables()
     {
-        this._htmlContent = ""; 
+        this._htmlContent = "";
         this.fullscreen = false;
         this.showMaxAndReduceButton = false;
         this.showAckButton = false;
@@ -602,6 +603,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
                                     templateGateway.setLttdExpired(true);
                                 }
 
+                                templateGateway.setScreenSize(this.screenSize);
                             }, 10);
                         }, 10);
                     }, () => {
@@ -690,6 +692,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
 
     setFullScreen(active) {
         this.fullscreen = active;
+        templateGateway.setScreenSize(active? 'lg' : 'md');
     }
 
     ngOnDestroy() {
diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
index e971c6712d..6d8be1bdc8 100644
--- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
+++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html
@@ -47,7 +47,7 @@
 <ng-template #cardDetail let-modal>
     <div class="modal-body">
         <div>
-            <of-card-details [parentModalRef] = "modalRef"> </of-card-details>
+            <of-card-details [parentModalRef] = "modalRef" [screenSize]="'lg'"> </of-card-details>
         </div>
     </div>
 </ng-template>
diff --git a/ui/main/src/app/modules/share/card-detail/card-detail.component.ts b/ui/main/src/app/modules/share/card-detail/card-detail.component.ts
index 321466aac8..cbb7a603fb 100644
--- a/ui/main/src/app/modules/share/card-detail/card-detail.component.ts
+++ b/ui/main/src/app/modules/share/card-detail/card-detail.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
@@ -22,6 +22,9 @@ import {UserContext} from '@ofModel/user-context.model';
 import {skip, switchMap, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 
+
+declare const templateGateway: any;
+
 @Component({
     selector: 'of-card-detail',
     templateUrl: './card-detail.component.html',
@@ -115,6 +118,7 @@ export class CardDetailComponent implements OnInit, OnDestroy {
                     this._htmlContent = this.sanitizer.bypassSecurityTrustHtml(html);
                     setTimeout(() => { // wait for DOM rendering
                         this.reinsertScripts();
+                        templateGateway.setScreenSize('lg');
                     }, 10);
                 }, () =>  {
                     console.log('WARNING impossible to load template ', this.templateName);
diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js
index f523ad6295..7825b5ab36 100644
--- a/ui/main/src/assets/js/templateGateway.js
+++ b/ui/main/src/assets/js/templateGateway.js
@@ -36,6 +36,7 @@ const templateGateway = {
     applyChildCards: function() {},
     unlockAnswer: function() {},
     setLttdExpired: function(expired) {},
+    setScreenSize: function(size) {},
     childCards: []
     
 };

From 53fa73a7f3112d8380e6c12a0644409f67d36cd1 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 8 Feb 2021 13:20:39 +0100
Subject: [PATCH 24/62] [OC-1434] Rework admin screen modals

---
 ui/main/src/app/app.component.ts              |  66 +++++-----
 .../app/modules/admin/admin.component.html    |   8 +-
 .../src/app/modules/admin/admin.component.ts  |  31 +----
 ui/main/src/app/modules/admin/admin.module.ts |  16 +--
 .../edit-entity-group-modal.component.html    |  61 +++++++++
 .../edit-entity-group-modal.component.scss    |  13 ++
 .../edit-entity-group-modal.component.ts      |  36 ++---
 .../edit-group-modal.component.html           |  63 ---------
 .../edit-group-modal.component.scss           |  49 -------
 .../users/edit-user-modal.component.html      | 124 +++++++++---------
 .../users/edit-user-modal.component.scss      |  40 +-----
 .../users/edit-user-modal.component.ts        | 122 ++++++++++-------
 .../multi-filter/multi-filter.component.ts    |  75 ++++++-----
 ui/main/src/app/services/entities.service.ts  |  19 ++-
 ui/main/src/app/services/groups.service.ts    |  50 +++++--
 15 files changed, 374 insertions(+), 399 deletions(-)
 create mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.html
 create mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.scss
 delete mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
 delete mode 100644 ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss

diff --git a/ui/main/src/app/app.component.ts b/ui/main/src/app/app.component.ts
index d2ac0fe8a5..75f7f2f5ca 100644
--- a/ui/main/src/app/app.component.ts
+++ b/ui/main/src/app/app.component.ts
@@ -8,28 +8,28 @@
  */
 
 
-
-import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
-import { Store } from '@ngrx/store';
-import { AppState } from '@ofStore/index';
-import { AuthenticationService } from '@ofServices/authentication/authentication.service';
-import { LoadConfigSuccess } from '@ofActions/config.actions';
-import { selectIdentifier } from '@ofSelectors/authentication.selectors';
-import { ConfigService } from '@ofServices/config.service';
-import { TranslateService } from '@ngx-translate/core';
-import { catchError, skip } from 'rxjs/operators';
-import { merge } from 'rxjs';
-import { I18nService } from '@ofServices/i18n.service';
-import { CardService } from '@ofServices/card.service';
-import { UserService } from '@ofServices/user.service';
-import { EntitiesService } from '@ofServices/entities.service';
-import { ProcessesService } from '@ofServices/processes.service';
-import { ReminderService } from '@ofServices/reminder/reminder.service';
-import { selectSubscriptionOpen } from '@ofStore/selectors/cards-subscription.selectors';
-import { Actions, ofType } from '@ngrx/effects';
-import { AlertActions, AlertActionTypes } from '@ofStore/actions/alert.actions';
-import { Message, MessageLevel } from '@ofModel/message.model';
+import {Component, OnInit} from '@angular/core';
+import {Title} from '@angular/platform-browser';
+import {Store} from '@ngrx/store';
+import {AppState} from '@ofStore/index';
+import {AuthenticationService} from '@ofServices/authentication/authentication.service';
+import {LoadConfigSuccess} from '@ofActions/config.actions';
+import {selectIdentifier} from '@ofSelectors/authentication.selectors';
+import {ConfigService} from '@ofServices/config.service';
+import {TranslateService} from '@ngx-translate/core';
+import {catchError, skip} from 'rxjs/operators';
+import {merge} from 'rxjs';
+import {I18nService} from '@ofServices/i18n.service';
+import {CardService} from '@ofServices/card.service';
+import {UserService} from '@ofServices/user.service';
+import {EntitiesService} from '@ofServices/entities.service';
+import {ProcessesService} from '@ofServices/processes.service';
+import {ReminderService} from '@ofServices/reminder/reminder.service';
+import {selectSubscriptionOpen} from '@ofStore/selectors/cards-subscription.selectors';
+import {Actions, ofType} from '@ngrx/effects';
+import {AlertActions, AlertActionTypes} from '@ofStore/actions/alert.actions';
+import {Message, MessageLevel} from '@ofModel/message.model';
+import {GroupsService} from '@ofServices/groups.service';
 
 class Alert {
   alert: Message;
@@ -48,7 +48,7 @@ export class AppComponent implements OnInit {
   isAuthenticated = false;
   loaded = false;
   useCodeOrImplicitFlow = true;
-  connectionLost = false; 
+  connectionLost = false;
   connectionLostForMoreThanTenSeconds = false;
   alertMessage: Alert = {alert: undefined, className: undefined, display: false};
 
@@ -64,6 +64,7 @@ export class AppComponent implements OnInit {
     , private cardService: CardService
     , private userService: UserService
     , private entitiesService: EntitiesService
+    , private groupsService: GroupsService
     , private processesService: ProcessesService
     , private reminderService: ReminderService
     , private actions$: Actions) {
@@ -88,7 +89,7 @@ export class AppComponent implements OnInit {
       console.error('Impossible to load configuration file web-ui.json', err);
       return caught;
     }));
-    
+
   }
 
   private setTitle() {
@@ -98,7 +99,7 @@ export class AppComponent implements OnInit {
 
   private loadTranslationForMenu() {
     this.configService.loadMenuTranslations().subscribe(locales => locales.forEach(locale =>
-      this.translateService.setTranslation(locale.language, locale.i18n, true)))
+      this.translateService.setTranslation(locale.language, locale.i18n, true)));
     catchError((err, caught) => {
       console.error('Impossible to load configuration file ui-menu.json', err);
       return caught;
@@ -116,7 +117,7 @@ export class AppComponent implements OnInit {
         this.launchAuthenticationProcess();
       });
     }
-    
+
   }
 
   private launchAuthenticationProcess() {
@@ -144,6 +145,9 @@ export class AppComponent implements OnInit {
             .subscribe(() => {
               this.loaded = true;
               this.reminderService.startService(identifier);
+              // This can only be done once the main initialization above is complete as user data is necessary to determine if the user
+              // has the required admin privileges.
+              if (this.userService.isCurrentUserAdmin()) this.groupsService.loadAllGroupsData();
             });
         }
       });
@@ -164,21 +168,21 @@ export class AppComponent implements OnInit {
     this.actions$.pipe(
       ofType<AlertActions>(AlertActionTypes.AlertMessage)).subscribe( alert => {
         this.displayAlert(alert.payload.alertMessage);
-      })
+      });
   }
 
   private displayAlert(message: Message) {
     let className = 'opfab-alert-info';
     switch (message.level) {
       case MessageLevel.DEBUG:
-        className = "opfab-alert-debug";
+        className = 'opfab-alert-debug';
         break;
       case MessageLevel.INFO:
-        className = "opfab-alert-info";
+        className = 'opfab-alert-info';
         break;
       case MessageLevel.ERROR:
-        className = "opfab-alert-error";
-        break;       
+        className = 'opfab-alert-error';
+        break;
     }
     this.alertMessage = {
         alert: message,
diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html
index 1aad8ddc9c..700a78f6c6 100644
--- a/ui/main/src/app/modules/admin/admin.component.html
+++ b/ui/main/src/app/modules/admin/admin.component.html
@@ -7,18 +7,18 @@
 <!-- SPDX-License-Identifier: MPL-2.0                                      -->
 <!-- This file is part of the OperatorFabric project.                      -->
 
-<div id="tabs" #tabs>
+<div id="tabs">
 
   <ul class="nav nav-pills">
 
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='users'}" data-toggle="tab" href="#admin/users" (click)="setActiveTab('users')" > {{usersLabel}} </a>
+      <a class="nav-link" [ngClass]="{ 'active':activeTab==='users'}" data-toggle="tab" href="#admin/users" (click)="setActiveTab('users')" translate> admin.tabs.users </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='entities'}" data-toggle="tab" href="#admin/entities" (click)="setActiveTab('entities')"> {{entitiesLabel}} </a>
+      <a class="nav-link" [ngClass]="{ 'active':activeTab==='entities'}" data-toggle="tab" href="#admin/entities" (click)="setActiveTab('entities')" translate> admin.tabs.entities </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='groups'}" data-toggle="tab" href="#admin/groups" (click)="setActiveTab('groups')"> {{groupsLabel}} </a>
+      <a class="nav-link" [ngClass]="{ 'active':activeTab==='groups'}" data-toggle="tab" href="#admin/groups" (click)="setActiveTab('groups')" translate> admin.tabs.groups </a>
     </li>
 
   </ul>
diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index 9f736c3fa7..5f1a3137a0 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -9,44 +9,26 @@
  */
 
 
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {Store} from '@ngrx/store';
 import {TranslateService} from '@ngx-translate/core';
 import {AppState} from '@ofStore/index';
-import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors';
-import {Observable, Subject} from 'rxjs';
-import {takeUntil} from 'rxjs/operators';
 
 @Component({
   selector: 'of-admin',
   templateUrl: './admin.component.html',
   styleUrls: ['./admin.component.scss']
 })
-export class AdminComponent implements OnInit, OnDestroy {
-
-  unsubscribe$: Subject<void> = new Subject<void>();
+export class AdminComponent implements OnInit {
 
   activeTab: string;
-  usersLabel: string;
-  entitiesLabel: string;
-  groupsLabel: string;
 
   public paginationDefaultPageSize = 10;
   public paginationPageSizeOptions = [5, 10, 25, 50, 100];
   public paginationPageSize = this.paginationDefaultPageSize;
 
-  //TODO Why do we need to use translate.get and subscriptions rather than the translate directive like everywhere else?
   constructor(private route: ActivatedRoute, protected store: Store<AppState>, protected translate: TranslateService) {
-    this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
-      this.translate.use(locale);
-      this.translate.get(['admin.tabs.users', 'admin.tabs.entities', 'admin.tabs.groups'])
-        .subscribe(translations => {
-          this.usersLabel = translations['admin.tabs.users'];
-          this.entitiesLabel = translations['admin.tabs.entities'];
-          this.groupsLabel = translations['admin.tabs.groups'];
-        });
-    });
   }
 
   ngOnInit() {
@@ -58,15 +40,6 @@ export class AdminComponent implements OnInit, OnDestroy {
     this.activeTab = tab;
   }
 
-  private getLocale(): Observable<string> {
-    return this.store.select(buildSettingsOrConfigSelector('locale'));
-  }
-
-  ngOnDestroy() {
-    this.unsubscribe$.next();
-    this.unsubscribe$.complete();
-  }
-
   onPageSizeChanged() {
     // Cast to get rid of "Property 'value' does not exist on type 'HTMLElement'."
     const value = (<HTMLInputElement> document.getElementById('page-size-select')).value;
diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts
index 675e352a70..99e5675865 100644
--- a/ui/main/src/app/modules/admin/admin.module.ts
+++ b/ui/main/src/app/modules/admin/admin.module.ts
@@ -1,5 +1,5 @@
 /* Copyright (c) 2020, RTEi (http://www.rte-international.com)
- * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * Copyright (c) 2019-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 @@
  * This file is part of the OperatorFabric project.
  */
 
-
 import {ErrorHandler, NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -17,15 +16,15 @@ import {PaginationModule} from 'ngx-bootstrap/pagination';
 import {AdminRoutingModule} from './admin-rooting.module';
 import {TranslateModule} from '@ngx-translate/core';
 import {AppErrorHandler} from 'app/common/error/app-error-handler';
-import {EditUserModalComponent} from './components/editmodal/users/edit-user-modal.component';
 import {ConfirmationDialogComponent} from './components/confirmation-dialog/confirmation-dialog.component';
 import {EditEntityGroupModalComponent} from './components/editmodal/groups-entities/edit-entity-group-modal.component';
-import {AgGridModule} from 'ag-grid-angular';
 import {UsersTableComponent} from './components/table/users-table.component';
-import {ActionCellRendererComponent} from './components/table/action-cell-renderer.component';
-import {MatInputModule, MatSelectModule} from '@angular/material';
+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 {ActionCellRendererComponent} from './components/table/action-cell-renderer.component';
+import {AgGridModule} from 'ag-grid-angular';
+import {MultiFilterModule} from '../share/multi-filter/multi-filter.module';
 
 @NgModule({
   declarations: [
@@ -53,12 +52,11 @@ import {GroupsTableComponent} from './components/table/groups-table.component';
     , AdminRoutingModule
     , PaginationModule.forRoot()
     , CommonModule
-    , MatSelectModule
-    , MatInputModule
+    , MultiFilterModule
     , TranslateModule
     , AgGridModule.withComponents([[
       ActionCellRendererComponent,
-    ]]),
+    ]])
   ],
   providers: [
       { provide: ErrorHandler, useClass: AppErrorHandler },
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/groups-entities/edit-entity-group-modal.component.html
new file mode 100644
index 0000000000..c1af6d9042
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.html
@@ -0,0 +1,61 @@
+<!-- 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.                      -->
+
+<div class="modal-content">
+  <div class="modal-header">
+    <span class="modal-title" *ngIf="row">{{row.id}}</span>
+    <span class="modal-title" *ngIf="!row && type==='group'" translate>admin.input.group.add</span>
+    <span class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.entity.add</span>
+    <button id="opfab-admin-edit-group-btn-close"  (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
+            aria-label="Close"><span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <form [formGroup]="entityGroupForm" class="opfab-form-lighter">
+      <div class="container">
+        <div class="col">
+
+          <div *ngIf="!row" class="opfab-input row">
+            <label for="id" translate>admin.input.id.label</label>
+            <input formControlName="id" name="id" id="id" type="text">
+          </div>
+          <div *ngIf="id.invalid" class="row alert alert-danger">
+            <div *ngIf="id.errors.required" translate>admin.input.id.required</div>
+            <div *ngIf="id.errors.maxlength" translate>admin.input.id.maxLength</div>
+            <div *ngIf="id.errors.minlength" translate>admin.input.id.minLength</div>
+          </div>
+
+          <div class="opfab-input row">
+            <label for="name" translate>admin.input.name.label</label>
+            <input formControlName="name" name="name" id="name" type="text">
+          </div>
+          <div *ngIf="name.invalid" class=" row alert alert-danger">
+            <div *ngIf="name.errors.required" translate>admin.input.name.required</div>
+            <div *ngIf="name.errors.maxlength" translate>admin.input.name.maxLength</div>
+          </div>
+
+          <div class="opfab-input row">
+            <label for="description" translate>admin.input.description</label>
+            <input formControlName="description" name="description" id="description" type="text">
+          </div>
+        </div>
+      </div>
+    </form>
+    <div class="modal-footer" style="border-top: none">
+      <button id="opfab-admin-edit-group-btn-cancel" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
+              translate>admin.input.close</button>
+      <button id="opfab-admin-group-btn-add" [disabled]="!entityGroupForm.valid" *ngIf="!row && type==='group'" (click)="update()" class="opfab-btn"
+              translate>admin.input.group.add</button>
+      <button id="opfab-admin-entity-btn-add" [disabled]="!entityGroupForm.valid" *ngIf="!row && type==='entity'" (click)="update()" class="opfab-btn"
+              translate>admin.input.entity.add</button>
+      <button id="opfab-admin-user-btn-save" [disabled]="!entityGroupForm.valid" *ngIf="row" (click)="update()" class="opfab-btn"
+              translate>admin.input.save</button>
+    </div>
+  </div>
+</div>
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/groups-entities/edit-entity-group-modal.component.scss
new file mode 100644
index 0000000000..e37cfdf1e6
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-entity-group-modal.component.scss
@@ -0,0 +1,13 @@
+/* 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;
+}
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/groups-entities/edit-entity-group-modal.component.ts
index 88cb15c264..d2596bd760 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/groups-entities/edit-entity-group-modal.component.ts
@@ -9,21 +9,21 @@
  */
 
 
-import { Component, Input, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { EntitiesService } from '@ofServices/entities.service';
-import { GroupsService } from '@ofServices/groups.service';
-import { AdminTableType } from '../../table/admin-table.component';
+import {Component, Input, OnInit} from '@angular/core';
+import {FormControl, FormGroup, Validators} from '@angular/forms';
+import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
+import {EntitiesService} from '@ofServices/entities.service';
+import {GroupsService} from '@ofServices/groups.service';
+import {AdminTableType} from '../../table/admin-table.component';
 
 @Component({
-  selector: 'of-edit-group-modal',
-  templateUrl: './edit-group-modal.component.html',
-  styleUrls: ['./edit-group-modal.component.scss']
+  selector: 'of-edit-entity-group-modal',
+  templateUrl: './edit-entity-group-modal.component.html',
+  styleUrls: ['./edit-entity-group-modal.component.scss']
 })
 export class EditEntityGroupModalComponent implements OnInit {
 
-  form = new FormGroup({
+  entityGroupForm = new FormGroup({
     id: new FormControl(''
       , [Validators.required, Validators.minLength(2), Validators.maxLength(20)]),
     name: new FormControl('', [Validators.required, Validators.maxLength(20)]),
@@ -40,8 +40,8 @@ export class EditEntityGroupModalComponent implements OnInit {
   }
 
   ngOnInit() {
-    if (this.row) {
-      this.form.patchValue(this.row, { onlySelf: true });
+    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 });
     }
   }
 
@@ -52,12 +52,12 @@ export class EditEntityGroupModalComponent implements OnInit {
     // 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.
     if (this.type === AdminTableType.ENTITY) {
-      this.entitiesService.update(this.form.value).subscribe(() => {
+      this.entitiesService.update(this.entityGroupForm.value).subscribe(() => {
         this.activeModal.close('Update button clicked on ' + this.type + ' modal');
       });
     }
     if (this.type === AdminTableType.GROUP) {
-      this.groupsService.update(this.form.value).subscribe(() => {
+      this.groupsService.update(this.entityGroupForm.value).subscribe(() => {
         this.activeModal.close('Update button clicked on ' + this.type + ' modal');
       });
     }
@@ -65,7 +65,7 @@ export class EditEntityGroupModalComponent implements OnInit {
 
   private cleanForm() {
     if (this.row) {
-      this.form.value['id'] = this.row.id;
+      this.entityGroupForm.value['id'] = this.row.id;
     }
     this.id.setValue((this.id.value as string).trim());
     this.name.setValue((this.name.value as string).trim());
@@ -74,15 +74,15 @@ export class EditEntityGroupModalComponent implements OnInit {
   }
 
   get id() {
-    return this.form.get('id') as FormControl;
+    return this.entityGroupForm.get('id') as FormControl;
   }
 
   get name() {
-    return this.form.get('name') as FormControl;
+    return this.entityGroupForm.get('name') as FormControl;
   }
 
   get description() {
-    return this.form.get('description') as FormControl;
+    return this.entityGroupForm.get('description') as FormControl;
   }
 
   dismissModal(reason: string): void {
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
deleted file mode 100644
index 4532e74a5e..0000000000
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- 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.                      -->
-
-
-<div class="modal-header bg-dark">
-  <h5 class="modal-title" *ngIf="row">{{row.id}}</h5>
-  <h5 class="modal-title" *ngIf="!row && type==='group'" translate>admin.input.group.add</h5>
-  <h5 class="modal-title" *ngIf="!row && type==='entity'" translate>admin.input.entity.add</h5>
-  <button id="opfab-admin-edit-group-btn-close"  (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
-    aria-label="Close">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
-<div class="border border-primary p-4 bg-dark">
-  <form [formGroup]="form">
-    <div class="form-group">
-      <div *ngIf="!row">
-        <mat-form-field appearance="fill" color="primary">
-          <mat-label for="id" translate>admin.input.id.label</mat-label>
-          <input matInput  formControlName="id" name="id" id="id" type="text"
-            class="form-control bg-dark">
-        </mat-form-field>
-        <div *ngIf="id.invalid" class="alert alert-danger">
-          <div *ngIf="id.errors.required" translate>admin.input.id.required</div>
-          <div *ngIf="id.errors.maxlength" translate>admin.input.id.maxLength</div>
-          <div *ngIf="id.errors.minlength" translate>admin.input.id.minLength</div>
-        </div>
-      </div>
-    </div>
-    <div class="form-group">
-      <mat-form-field appearance="fill">
-      <mat-label for="name" translate>admin.input.name.label</mat-label>
-      <input matInput formControlName="name" name="name" id="name" type="text" class="form-control bg-dark">
-      </mat-form-field>
-      <div *ngIf="name.invalid" class="alert alert-danger">
-        <div *ngIf="name.errors.required" translate>admin.input.name.required</div>
-        <div *ngIf="name.errors.maxlength" translate>admin.input.name.maxLength</div>
-      </div>
-    </div>
-    <div class="form-group">
-      <mat-form-field appearance="fill">
-      <mat-label for="description" translate>admin.input.description</mat-label>
-      <input matInput formControlName="description" name="description" id="description" type="text" class="form-control bg-dark">
-      </mat-form-field>
-    </div>
-  </form>
-</div>
-<div class="modal-footer bg-dark">
-  <button id="opfab-admin-edit-group-btn-cancel" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
-    translate>admin.input.close</button>
-  <button  id="opfab-admin-group-btn-add" [disabled]="!form.valid" *ngIf="!row && type==='group'" (click)="update()" class="opfab-btn"
-    translate>admin.input.group.add</button>
-  <button id="opfab-admin-entity-btn-add"[disabled]="!form.valid" *ngIf="!row && type==='entity'" (click)="update()" class="opfab-btn"
-    translate>admin.input.entity.add</button>
-  <button id="opfab-admin-user-btn-save" [disabled]="!form.valid" *ngIf="row" (click)="update()" class="opfab-btn"
-    translate>admin.input.save</button>
-</div>
diff --git a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss
deleted file mode 100644
index 8220852f7b..0000000000
--- a/ui/main/src/app/modules/admin/components/editmodal/groups-entities/edit-group-modal.component.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 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.
- */
-
-.ng-valid[required], .ng-valid.required  {
-  border-left: 5px solid #42A948; /* green */
-}
-form, input, label, p {
-    color: white !important;
-}
-
-.tp-container {
-   display: flex;
-   flex-direction: column;
-}
-.tp-container > * {
-   width: 100%;
-}
-
-::ng-deep .mat-form-field {
-    .mat-form-field-label {
-        color: white;
-    }
-}
-
-::ng-deep .mat-form-field.mat-focused {
-    .mat-form-field-label {
-        color: #ff884d;
-    }
-}
-
-::ng-deep .not-empty-select.mat-selected {
-  color: green !important;
-  background-color: red;
-}
-
-::ng-deep .mat-option-text {
-    color: white;
-}
-
-::ng-deep .mat-select-value {
-    color: white;
-}
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 3cec601fb6..c3d58250b0 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
@@ -7,70 +7,68 @@
 <!-- SPDX-License-Identifier: MPL-2.0                                      -->
 <!-- This file is part of the OperatorFabric project.                      -->
 
+<div class="modal-content">
+  <div class="modal-header">
+    <span class="modal-title" *ngIf="row">{{row.login}}</span>
+    <span class="modal-title" *ngIf="!row" translate>admin.input.user.add</span>
+    <button id="opfab-admin-edit-user-btn-close" (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
+            aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <form [formGroup]="userForm" class="opfab-form-lighter">
+      <div class="container">
+        <div class="col">
 
-<div class="modal-header bg-dark">
-  <h5 class="modal-title" *ngIf="row">{{row.login}}</h5>
-  <h5 class="modal-title" *ngIf="!row" translate>admin.input.user.add</h5>
-  <button id="opfab-admin-edit-user-btn-close" (click)="dismissModal('Cross click')" type="button" class="close" data-dismiss="modal"
-    aria-label="Close">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
-<div class="border border-primary p-4 bg-dark">
-  <form [formGroup]="form">
-    <div class="form-group">
-      <div *ngIf="!row">
-        <mat-form-field appearance="fill" color="primary">
-          <mat-label for="login" translate>admin.input.user.login</mat-label>
-          <input oninput="this.value = this.value.toLowerCase()" matInput  formControlName="login" name="login" id="login" type="text"
-            class="form-control bg-dark">
-        </mat-form-field>
-        <div *ngIf="login.invalid" class="alert alert-danger">
-          <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
-          <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
-          <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
+          <div *ngIf="!row" class="opfab-input row">
+            <label for="login" translate>admin.input.user.login</label>
+            <input oninput="this.value = this.value.toLowerCase()" formControlName="login" name="login" id="login" type="text">
+            <div *ngIf="login.invalid" class="row alert alert-danger">
+              <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
+              <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
+              <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
+            </div>
+          </div>
+
+          <div class="opfab-input row">
+            <label for="firstName" translate>admin.input.user.firstName</label>
+            <input formControlName="firstName" name="firstName" id="firstName" type="text">
+          </div>
+          <div *ngIf="firstName.invalid" class="row alert alert-danger">
+            <div *ngIf="firstName.errors.required" translate>admin.input.firstName.required</div>
+            <div *ngIf="firstName.errors.maxlength" translate>admin.input.firstName.maxLength</div>
+          </div>
+          <div class="opfab-input row">
+            <label for="lastName" translate>admin.input.user.lastName</label>
+            <input formControlName="lastName" name="lastName" id="lastName" type="text">
+          </div>
+          <div *ngIf="lastName.invalid" class="row alert alert-danger">
+            <div *ngIf="lastName.errors.required" translate>admin.input.lastName.required</div>
+            <div *ngIf="lastName.errors.maxlength" translate>admin.input.lastName.maxLength</div>
+          </div>
+          <div class="row">
+            <of-multi-filter filterPath="groups" id="groups" [parentForm]="userForm"
+                             [values]="groupsDropdownList" [dropdownSettings]="groupsDropdownSettings" [selectedItems]="selectedGroups"
+                             i18nRootLabelKey="admin.input.user.">
+            </of-multi-filter>
+          </div>
+          <div class="row">
+            <of-multi-filter filterPath="entities" id="entities" [parentForm]="userForm"
+                             [values]="entitiesDropdownList" [dropdownSettings]="entitiesDropdownSettings" [selectedItems]="selectedEntities"
+                             i18nRootLabelKey="admin.input.user.">
+            </of-multi-filter>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <mat-form-field appearance="fill">
-      <mat-label for="firstName" translate>admin.input.user.firstName</mat-label>
-      <input matInput formControlName="firstName" name="firstName" id="firstName" type="text" class="form-control bg-dark">
-      </mat-form-field>
-      <div *ngIf="firstName.invalid" class="alert alert-danger">
-        <div *ngIf="firstName.errors.required" translate>admin.input.firstName.required</div>
-        <div *ngIf="firstName.errors.maxlength" translate>admin.input.firstName.maxLength</div>
-      </div>
-    </div>
-    <div class="form-group">
-      <mat-form-field appearance="fill">
-      <mat-label for="lastName" translate>admin.input.user.lastName</mat-label>
-      <input matInput formControlName="lastName" name="lastName" id="lastName" type="text" class="form-control bg-dark">
-      </mat-form-field>
-      <div *ngIf="lastName.invalid" class="alert alert-danger">
-        <div *ngIf="lastName.errors.required" translate>admin.input.lastName.required</div>
-        <div *ngIf="lastName.errors.maxlength" translate>admin.input.lastName.maxLength</div>
-      </div>
-    </div>
-    <div class="form-group">
-      <mat-label for="groups" translate>admin.input.user.groups</mat-label>
-      <mat-select multiple formControlName="groups" name="groups" id="groups" class="form-control bg-dark">
-        <mat-option *ngFor="let group of groupsList" [value]="group.id">{{group.id}}</mat-option>
-      </mat-select>
-    </div>
-    <div class="form-group">
-      <mat-label for="entities" translate>admin.input.user.entities</mat-label>
-      <mat-select multiple formControlName="entities" name="entities" id="entities" class="form-control bg-dark">
-        <mat-option *ngFor="let entity of entitiesList" [value]="entity.id">{{entity.id}}</mat-option>
-      </mat-select>
-    </div>
-  </form>
-</div>
-<div class="modal-footer bg-dark">
-  <button id="opfab-admin-user-btn-close" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
-    translate>admin.input.close</button>
-  <button id="opfab-admin-user-btn-add" [disabled]="!form.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
-    translate>admin.input.user.add</button>
-  <button id="opfab-admin-user-btn-save" [disabled]="!form.valid" *ngIf="row" (click)="update()" class="opfab-btn"
-    translate>admin.input.save</button>
+    </form>
+  </div>
+  <div class="modal-footer" style="border-top: none">
+    <button id="opfab-admin-user-btn-close" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
+            translate>admin.input.close</button>
+    <button id="opfab-admin-user-btn-add" [disabled]="!userForm.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
+            translate>admin.input.user.add</button>
+    <button id="opfab-admin-user-btn-save" [disabled]="!userForm.valid" *ngIf="row" (click)="update()" class="opfab-btn"
+            translate>admin.input.save</button>
+  </div>
 </div>
diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
index 8220852f7b..81f3c8cca2 100644
--- a/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
+++ b/ui/main/src/app/modules/admin/components/editmodal/users/edit-user-modal.component.scss
@@ -8,42 +8,10 @@
  * This file is part of the OperatorFabric project.
  */
 
-.ng-valid[required], .ng-valid.required  {
-  border-left: 5px solid #42A948; /* green */
-}
-form, input, label, p {
-    color: white !important;
-}
-
-.tp-container {
-   display: flex;
-   flex-direction: column;
-}
-.tp-container > * {
-   width: 100%;
-}
-
-::ng-deep .mat-form-field {
-    .mat-form-field-label {
-        color: white;
-    }
-}
-
-::ng-deep .mat-form-field.mat-focused {
-    .mat-form-field-label {
-        color: #ff884d;
-    }
-}
-
-::ng-deep .not-empty-select.mat-selected {
-  color: green !important;
-  background-color: red;
-}
-
-::ng-deep .mat-option-text {
-    color: white;
+.row {
+  margin-bottom: 15px;
 }
 
-::ng-deep .mat-select-value {
-    color: white;
+of-multi-filter {
+  width: 100%;
 }
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 521627172d..80a96c67e9 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
@@ -8,15 +8,13 @@
  * This file is part of the OperatorFabric project.
  */
 
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Component, Input, OnInit } from '@angular/core';
-import { User } from '@ofModel/user.model';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { UserService } from '@ofServices/user.service';
-import { GroupsService } from '@ofServices/groups.service';
-import { EntitiesService } from '@ofServices/entities.service';
-import { Entity } from '@ofModel/entity.model';
-import { Group } from '@ofModel/group.model';
+import {FormControl, FormGroup, Validators} from '@angular/forms';
+import {Component, Input, OnInit} from '@angular/core';
+import {User} from '@ofModel/user.model';
+import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
+import {UserService} from '@ofServices/user.service';
+import {GroupsService} from '@ofServices/groups.service';
+import {EntitiesService} from '@ofServices/entities.service';
 
 @Component({
   selector: 'of-edit-user-modal',
@@ -25,17 +23,21 @@ import { Group } from '@ofModel/group.model';
 })
 export class EditUserModalComponent implements OnInit {
 
-  form = new FormGroup({
-    login: new FormControl(''
-      , [Validators.required, Validators.minLength(4), Validators.maxLength(20)]),
-    firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
-    lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
-    groups: new FormControl([]),
-    entities: new FormControl([])
-  });
+  userForm: FormGroup;
 
-  entitiesList: Array<Entity>;
-  groupsList: Array<Group>;
+  entitiesDropdownList = [];
+  selectedEntities = [];
+  entitiesDropdownSettings = {
+    badgeShowLimit: 3,
+    enableSearchFilter: true
+  };
+
+  groupsDropdownList = [];
+  selectedGroups = [];
+  groupsDropdownSettings = {
+    badgeShowLimit: 3,
+    enableSearchFilter: true
+  };
 
   @Input() row: User;
 
@@ -44,23 +46,59 @@ export class EditUserModalComponent implements OnInit {
     private crudService: UserService,
     private groupsService: GroupsService,
     private entitiesService: EntitiesService) {
+
+    this.userForm = new FormGroup({
+      login: new FormControl(''
+          , [Validators.required, Validators.minLength(4), Validators.maxLength(20)]),
+      firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+      lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+      groups: new FormControl([]),
+      entities: new FormControl([])
+    });
+
   }
 
   ngOnInit() {
-    if (this.row) {
-      this.form.patchValue(this.row, { onlySelf: true });
+    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
+      const {login, firstName, lastName} = this.row;
+      this.userForm.patchValue({login, firstName, lastName}, { onlySelf: false });
+
+      // Otherwise, we use the selectedItems property of the of-multiselect component
+      this.selectedGroups = this.row.groups;
+      this.selectedEntities = this.row.entities;
+
     }
-    this.initializeEntities();
-    this.initializeGroups();
+
+
+    // Initialize value lists for Entities and Groups inputs
+    this.entitiesService.getEntities().forEach((entity) => {
+      const id = entity.id;
+      let itemName = entity.name;
+      if (!itemName) {
+        itemName = id;
+      }
+      this.entitiesDropdownList.push({ id: id, itemName: itemName });
+    });
+
+    this.groupsService.getGroups().forEach((group) => {
+      const id = group.id;
+      let itemName = group.name;
+      if (!itemName) {
+        itemName = id;
+      }
+      this.groupsDropdownList.push({ id: id, itemName: itemName });
+    });
+
 
   }
 
   update() {
-
     this.cleanForm();
-    this.groups.setValue(this.groups.value.filter((item: string) => item.length > 0));
-    this.entities.setValue(this.entities.value.filter((item: string) => item.length > 0));
-    this.crudService.update(this.form.value).subscribe(() => {
+    this.groups.setValue(this.groups.value.map(group => group.id));
+    this.entities.setValue(this.entities.value.map(entity => entity.id));
+    this.crudService.update(this.userForm.value).subscribe(() => {
       this.activeModal.close('Update button clicked on user 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).
@@ -71,7 +109,7 @@ export class EditUserModalComponent implements OnInit {
 
   private cleanForm() {
     if (this.row) {
-      this.form.value['login'] = this.row.login;
+      this.userForm.value['login'] = this.row.login;
     }
     this.login.setValue((this.login.value as string).trim());
     this.lastName.setValue((this.lastName.value as string).trim());
@@ -80,42 +118,26 @@ export class EditUserModalComponent implements OnInit {
   }
 
   get login() {
-    return this.form.get('login') as FormControl;
+    return this.userForm.get('login') as FormControl;
   }
 
   get firstName() {
-    return this.form.get('firstName') as FormControl;
+    return this.userForm.get('firstName') as FormControl;
   }
 
   get lastName() {
-    return this.form.get('lastName') as FormControl;
+    return this.userForm.get('lastName') as FormControl;
   }
 
   get groups() {
-    return this.form.get('groups') as FormControl;
+    return this.userForm.get('groups') as FormControl;
   }
 
   get entities() {
-    return this.form.get('entities') as FormControl;
-  }
-
-
-
-  private initializeEntities(): void {
-    this.entitiesService.getAll().subscribe(response => {
-      this.entitiesList = response;
-    });
-
-  }
-
-  private initializeGroups(): void {
-    this.groupsService.getAll().subscribe(response => {
-      this.groupsList = response;
-    });
-
+    return this.userForm.get('entities') as FormControl;
   }
 
-  dismissModal(reason : string) : void {
+  dismissModal(reason: string): void {
     this.activeModal.dismiss(reason);
   }
 
diff --git a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
index 2115262f76..e3e9879613 100644
--- a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
+++ b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
@@ -11,11 +11,11 @@ import {Component, Input, OnChanges, OnDestroy, OnInit} from '@angular/core';
 import {FormControl, FormGroup} from '@angular/forms';
 import {I18n} from '@ofModel/i18n.model';
 import {TranslateService} from '@ngx-translate/core';
-import { Store } from '@ngrx/store';
-import { AppState } from '@ofStore/index';
-import { Observable, Subject } from 'rxjs';
-import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors';
-import { takeUntil } from 'rxjs/operators';
+import {Store} from '@ngrx/store';
+import {AppState} from '@ofStore/index';
+import {Observable, Subject} from 'rxjs';
+import {buildSettingsOrConfigSelector} from '@ofStore/selectors/settings.x.config.selectors';
+import {takeUntil} from 'rxjs/operators';
 
 @Component({
     selector: 'of-multi-filter',
@@ -31,7 +31,15 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
     @Input() public parentForm: FormGroup;
     @Input() public dropdownSettings = {};
     @Input() public filterPath: string;
-    @Input() public selectedItems ;
+    /** `selectedItems` is an array containing the ids of items that have been selected */
+    @Input() public selectedItems;
+    /** `selection` is an array containing {id,itemName} pairs representing the selection that will actually be passed by the component.
+     * In particular, if `selectedItems` is undefined, `selection` will be equal to the full list of possible values (`dropDownList`).
+     * This behaviour is useful if the component is being used as a filter and when no values are selected, we don't want to restrict search
+     * results based on this criteria (e.g. archive screen filters).
+     * In other cases, when no items are selected we want the passed selection to be empty as well (e.g. edition modals in the admin
+     * screen). In this case, `selectedItems` should be set to [].
+     * */
     public selection = [];
 
     constructor(private store: Store<AppState>, private translateService: TranslateService) {
@@ -41,20 +49,44 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     ngOnInit() {
-        this.initComponentValues();
 
+        // Subscribe to locale changes and handle translations for placeholders
+        this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
+            this.translateService.use(locale);
+            this.translateService.get(['multiFilter.searchPlaceholderText', 'multiFilter.selectAllText', 'multiFilter.unSelectAllText',
+                'multiFilter.filterSelectAllText', 'multiFilter.filterUnSelectAllText'])
+                .subscribe(translations => {
+                    this.dropdownSettings = {...{
+                            searchPlaceholderText: translations['multiFilter.searchPlaceholderText'],
+                            selectAllText: translations['multiFilter.selectAllText'],
+                            unSelectAllText: translations['multiFilter.unSelectAllText'],
+                            filterSelectAllText: translations['multiFilter.filterSelectAllText'],
+                            filterUnSelectAllText: translations['multiFilter.filterUnSelectAllText'],
+                            noDataLabel: translations['multiFilter.noDataLabel'],
+                        }, ...this.dropdownSettings};
+                });
+        });
     }
 
-    initComponentValues() {
 
+    onDeSelectAll(items: any) {
+        this.selection = [];
+        this.parentForm.get(this.filterPath).setValue(this.selection);
+    }
+
+    ngOnChanges() {
+
+        // Initialisation of component values
+        this.selection = [];
         this.dropdownList = [];
         if (!!this.values) {
             this.dropdownList = this.values.map(entry => this.computeValueAndLabel(entry));
         } else {
             // should throws an error ?
-            console.error('there is currently no values', this.values);
+            console.error('There are currently no values for ' + this.filterPath);
         }
-        if (!this.selectedItems) this.selection = this.dropdownList.map(item => item);
+        if (!this.selectedItems) this.selection = this.dropdownList.map(item => item); // If selectedItems haven't been defined,
+        // selection is set to a copy of all values so no filter is applied for this field
         else {
             this.selectedItems.forEach(element => {
                 const items = this.dropdownList.filter(item  => item.id === element);
@@ -64,29 +96,6 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
         }
         this.parentForm.get(this.filterPath).setValue(this.selection);
 
-        this.getLocale().pipe(takeUntil(this.unsubscribe$)).subscribe(locale => {
-            this.translateService.use(locale);
-            this.translateService.get(['multiFilter.searchPlaceholderText','multiFilter.selectAllText', 'multiFilter.unSelectAllText', 'multiFilter.filterSelectAllText', 'multiFilter.filterUnSelectAllText'])
-              .subscribe(translations => {
-                this.dropdownSettings = {...{
-                    searchPlaceholderText: translations['multiFilter.searchPlaceholderText'],
-                    selectAllText: translations['multiFilter.selectAllText'],
-                    unSelectAllText: translations['multiFilter.unSelectAllText'],
-                    filterSelectAllText: translations['multiFilter.filterSelectAllText'],
-                    filterUnSelectAllText: translations['multiFilter.filterUnSelectAllText'],
-                    noDataLabel: translations['multiFilter.noDataLabel'],
-                },...this.dropdownSettings};
-              })
-            });
-    }
-
-    onDeSelectAll(items: any) {
-        this.selection = [];
-        this.parentForm.get(this.filterPath).setValue(this.selection);
-    }
-
-    ngOnChanges() {
-        this.initComponentValues();
     }
 
     protected getLocale(): Observable<string> {
diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts
index fbd279af1e..9363cf3e28 100644
--- a/ui/main/src/app/services/entities.service.ts
+++ b/ui/main/src/app/services/entities.service.ts
@@ -14,7 +14,7 @@ import {catchError, tap} from 'rxjs/operators';
 import {Observable, Subject} from 'rxjs';
 import {Entity} from '@ofModel/entity.model';
 import {takeUntil} from 'rxjs/internal/operators/takeUntil';
-import {Injectable} from "@angular/core";
+import {Injectable} from '@angular/core';
 
 
 declare const templateGateway: any;
@@ -44,18 +44,25 @@ export class EntitiesService extends CrudService {
 
   getAllEntities(): Observable<Entity[]> {
     return this.httpClient.get<Entity[]>(`${this.entitiesUrl}`).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error))
     );
   }
 
-
-
- updateEntity(entityData: Entity): Observable<Entity> {
+  updateEntity(entityData: Entity): Observable<Entity> {
     return this.httpClient.post<Entity>(`${this.entitiesUrl}`, entityData).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error)),
+        tap(next => {
+            this.updateCachedEntity(entityData);
+        })
     );
   }
 
+  private updateCachedEntity(entityData: Entity): void {
+      const updatedEntities = this._entities.filter(entity => entity.id !== entityData.id);
+      updatedEntities.push(entityData);
+      this._entities = updatedEntities;
+  }
+
 
   getAll(): Observable<any[]> {
     return this.getAllEntities();
diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts
index 3fb01248ae..7cba149da5 100644
--- a/ui/main/src/app/services/groups.service.ts
+++ b/ui/main/src/app/services/groups.service.ts
@@ -8,19 +8,23 @@
  */
 
 import {CrudService} from './crud-service';
-import {Observable} from 'rxjs';
+import {Observable, Subject} from 'rxjs';
 import {Group} from '@ofModel/group.model';
 import {environment} from '@env/environment';
 import {HttpClient} from '@angular/common/http';
-import {catchError} from 'rxjs/operators';
-import {Injectable} from "@angular/core";
+import {catchError, tap} from 'rxjs/operators';
+import {Injectable, OnDestroy} from '@angular/core';
+import {takeUntil} from 'rxjs/internal/operators/takeUntil';
 
 @Injectable({
   providedIn: 'root'
 })
-export class GroupsService extends CrudService {
+export class GroupsService extends CrudService implements OnDestroy {
 
   readonly groupsUrl: string;
+  private _groups: Group[];
+
+  private ngUnsubscribe$ = new Subject<void>();
 
   /**
    * @constructor
@@ -30,6 +34,12 @@ export class GroupsService extends CrudService {
     super();
     this.groupsUrl = `${environment.urls.groups}`;
   }
+
+  ngOnDestroy() {
+    this.ngUnsubscribe$.next();
+    this.ngUnsubscribe$.complete();
+  }
+
   deleteById(id: string) {
     const url = `${this.groupsUrl}/groups/${id}`;
     return this.httpClient.delete(url).pipe(
@@ -37,17 +47,41 @@ export class GroupsService extends CrudService {
     );
   }
 
+  private updateCachedGroups(groupData: Group): void {
+    const updatedGroups = this._groups.filter(group => group.id !== groupData.id);
+    updatedGroups.push(groupData);
+    this._groups = updatedGroups;
+  }
+
   getAllGroups(): Observable<Group[]> {
     return this.httpClient.get<Group[]>(`${this.groupsUrl}`).pipe(
-      catchError((error: Response) => this.handleError)
+      catchError((error: Response) => this.handleError(error))
     );
   }
 
+  public loadAllGroupsData(): Observable<any> {
+    return this.getAllGroups()
+        .pipe(takeUntil(this.ngUnsubscribe$)
+            , tap(
+                (groups) => {
+                  if (!!groups) {
+                    this._groups = groups;
+                    console.log(new Date().toISOString(), 'List of groups loaded');
+                  }
+                }, (error) => console.error(new Date().toISOString(), 'an error occurred', error)
+            ));
+  }
 
+  public getGroups(): Group[] {
+    return this._groups;
+  }
 
-  updateGroup(groupsData: Group): Observable<Group> {
-    return this.httpClient.post<Group>(`${this.groupsUrl}`, groupsData).pipe(
-      catchError((error: Response) => this.handleError)
+  updateGroup(groupData: Group): Observable<Group> {
+    return this.httpClient.post<Group>(`${this.groupsUrl}`, groupData).pipe(
+      catchError((error: Response) => this.handleError(error)),
+        tap(next => {
+          this.updateCachedGroups(groupData);
+        })
     );
   }
 

From be8f48622a837011f597767ebe22906696d2dd89 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Fri, 5 Feb 2021 16:35:41 +0100
Subject: [PATCH 25/62] [OC-1400] adding of 2 new processes and process groups
 in utils

---
 .../postBundleUserCardExamples.feature        |  6 +-
 .../postBundleUserCardExamples2.feature       | 30 ++++++++++
 .../postBundleUserCardExamples3.feature       | 25 ++++++++
 .../businessconfig/postProcessGroups.feature  | 22 +++++++
 .../bundle_userCardExamples/config.json       | 38 -------------
 .../bundle_userCardExamples/i18n/en.json      | 12 ----
 .../bundle_userCardExamples/i18n/fr.json      | 12 ----
 .../bundle_userCardExamples2/config.json      | 39 +++++++++++++
 .../bundle_userCardExamples2/i18n/en.json     | 11 ++++
 .../bundle_userCardExamples2/i18n/fr.json     | 11 ++++
 .../template/en/message.handlebars            |  0
 .../template/en/question.handlebars           |  0
 .../template/en/usercard_message.handlebars   |  0
 .../template/en/usercard_question.handlebars  |  0
 .../template/fr/message.handlebars            |  0
 .../template/fr/question.handlebars           |  0
 .../template/fr/usercard_message.handlebars   |  0
 .../template/fr/usercard_question.handlebars  |  0
 .../bundle_userCardExamples3/config.json      | 23 ++++++++
 .../bundle_userCardExamples3/i18n/en.json     |  7 +++
 .../bundle_userCardExamples3/i18n/fr.json     |  7 +++
 .../template/en/task.handlebars               |  0
 .../template/en/usercard_task.handlebars      |  0
 .../template/fr/task.handlebars               |  0
 .../template/fr/usercard_task.handlebars      |  0
 .../businessconfig/resources/packageBundle.sh |  8 +++
 .../resources/processgroups.json              | 27 +++++++++
 .../setPerimeterForUserCardExamples.feature   | 12 ----
 .../setPerimeterForUserCardExamples2.feature  | 57 +++++++++++++++++++
 .../setPerimeterForUserCardExamples3.feature  | 53 +++++++++++++++++
 src/test/utils/karate/loadBundle.sh           |  4 +-
 src/test/utils/karate/loadProcessGroups.sh    | 16 ++++++
 src/test/utils/karate/setPerimeterForTest.sh  |  4 +-
 .../modules/usercard/usercard.component.html  |  4 +-
 .../modules/usercard/usercard.component.ts    | 29 +++++++---
 ui/main/src/assets/i18n/en.json               |  3 +
 ui/main/src/assets/i18n/fr.json               |  3 +
 37 files changed, 372 insertions(+), 91 deletions(-)
 create mode 100644 src/test/utils/karate/businessconfig/postBundleUserCardExamples2.feature
 create mode 100644 src/test/utils/karate/businessconfig/postBundleUserCardExamples3.feature
 create mode 100644 src/test/utils/karate/businessconfig/postProcessGroups.feature
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/en.json
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/fr.json
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/en/message.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/en/question.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/en/usercard_message.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/en/usercard_question.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/fr/message.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/fr/question.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/fr/usercard_message.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples2}/template/fr/usercard_question.handlebars (100%)
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/en.json
 create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/fr.json
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples3}/template/en/task.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples3}/template/en/usercard_task.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples3}/template/fr/task.handlebars (100%)
 rename src/test/utils/karate/businessconfig/resources/{bundle_userCardExamples => bundle_userCardExamples3}/template/fr/usercard_task.handlebars (100%)
 create mode 100644 src/test/utils/karate/businessconfig/resources/processgroups.json
 create mode 100644 src/test/utils/karate/cards/setPerimeterForUserCardExamples2.feature
 create mode 100644 src/test/utils/karate/cards/setPerimeterForUserCardExamples3.feature
 create mode 100755 src/test/utils/karate/loadProcessGroups.sh

diff --git a/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature b/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature
index aaf7e9bbb4..9ffaa28cb5 100644
--- a/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature
+++ b/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature
@@ -22,11 +22,7 @@ Feature: Bundle
     When method GET
     Then status 200
     And match response.id == 'userCardExamples'
-    And match response.states.questionState.userCard.template == 'usercard_question'
-    And match response.states.questionState.userCard.severityVisible == false
-    And match response.states.questionState.userCard.startDateVisible == true
-    And match response.states.questionState.userCard.endDateVisible == true
-    And match response.states.questionState.showDetailCardHeader == false
+    And match response.states.conferenceState.userCard.template == 'usercard_conference'
     And match response.states.incidentInProgressState.userCard.template == 'usercard_incidentInProgress'
     And match response.states.incidentInProgressState.userCard.severityVisible == true
     And match response.states.incidentInProgressState.userCard.startDateVisible == false
diff --git a/src/test/utils/karate/businessconfig/postBundleUserCardExamples2.feature b/src/test/utils/karate/businessconfig/postBundleUserCardExamples2.feature
new file mode 100644
index 0000000000..832f3a6600
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/postBundleUserCardExamples2.feature
@@ -0,0 +1,30 @@
+Feature: Bundle
+
+  Background:
+    # Get admin token
+    * def signIn = call read('../common/getToken.feature') { username: 'admin'}
+    * def authToken = signIn.authToken
+
+
+  Scenario: Post Bundle
+
+
+     # Push bundle
+    Given url opfabUrl + 'businessconfig/processes'
+    And header Authorization = 'Bearer ' + authToken
+    And multipart field file = read('resources/bundle_userCardExamples2.tar.gz')
+    When method post
+    Then status 201
+
+    # Check bundle
+    Given url opfabUrl + 'businessconfig/processes/userCardExamples2'
+    And header Authorization = 'Bearer ' + authToken
+    When method GET
+    Then status 200
+    And match response.id == 'userCardExamples2'
+    And match response.states.questionState.userCard.template == 'usercard_question'
+    And match response.states.questionState.userCard.severityVisible == false
+    And match response.states.questionState.userCard.startDateVisible == true
+    And match response.states.questionState.userCard.endDateVisible == true
+    And match response.states.questionState.showDetailCardHeader == false
+    And match response.states.messageState.userCard.template == 'usercard_message'
diff --git a/src/test/utils/karate/businessconfig/postBundleUserCardExamples3.feature b/src/test/utils/karate/businessconfig/postBundleUserCardExamples3.feature
new file mode 100644
index 0000000000..1701dc8e64
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/postBundleUserCardExamples3.feature
@@ -0,0 +1,25 @@
+Feature: Bundle
+
+  Background:
+    # Get admin token
+    * def signIn = call read('../common/getToken.feature') { username: 'admin'}
+    * def authToken = signIn.authToken
+
+
+  Scenario: Post Bundle
+
+
+     # Push bundle
+    Given url opfabUrl + 'businessconfig/processes'
+    And header Authorization = 'Bearer ' + authToken
+    And multipart field file = read('resources/bundle_userCardExamples3.tar.gz')
+    When method post
+    Then status 201
+
+    # Check bundle
+    Given url opfabUrl + 'businessconfig/processes/userCardExamples3'
+    And header Authorization = 'Bearer ' + authToken
+    When method GET
+    Then status 200
+    And match response.id == 'userCardExamples3'
+    And match response.states.taskState.userCard.template == 'usercard_task'
diff --git a/src/test/utils/karate/businessconfig/postProcessGroups.feature b/src/test/utils/karate/businessconfig/postProcessGroups.feature
new file mode 100644
index 0000000000..efe74c0f25
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/postProcessGroups.feature
@@ -0,0 +1,22 @@
+Feature: Process groups
+
+  Background:
+    # Get admin token
+    * def signIn = call read('../common/getToken.feature') { username: 'admin'}
+    * def authToken = signIn.authToken
+
+
+  Scenario: Post process groups file
+    Given url opfabUrl + '/businessconfig/processgroups'
+    And header Authorization = 'Bearer ' + authToken
+    And multipart file file = { read: 'resources/processgroups.json' }
+    When method post
+    And status 201
+
+
+  Scenario: Check that process groups have been updated
+    Given url opfabUrl + '/businessconfig/processgroups'
+    And header Authorization = 'Bearer ' + authToken
+    When method GET
+    Then status 200
+
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 cf4ffba761..20ae8aa492 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json
@@ -8,16 +8,6 @@
     "calendar": true
   },
   "states": {
-    "messageState": {
-      "name": "message.title",
-      "color": "#CC9900",
-      "userCard" : {
-        "template" : "usercard_message"
-      },
-      "templateName": "message",
-      "styles": [],
-      "acknowledgmentAllowed": "Always"
-    },
     "conferenceState": {
       "name": "conference.title",
       "color": "#CC9900",
@@ -28,34 +18,6 @@
       "styles": [],
       "acknowledgmentAllowed": "Always"
     },
-    "questionState": {
-      "name": "question.title",
-      "showDetailCardHeader": false,
-      "color": "#0070C0",
-      "userCard" : {
-				"template" : "usercard_question",
-				"severityVisible" : false,
-				"startDateVisible" : true,
-				"endDateVisible" : true
-			},
-      "response": {
-        "state": "questionState"
-      },
-      "templateName": "question",
-      "styles": [],
-      "acknowledgmentAllowed": "Never"
-    },
-    "taskState": {
-      "name": "task.title",
-      "color": "#0070C0",
-      "userCard" : {
-        "template" : "usercard_task"
-      },
-      "templateName": "task",
-      "styles": [
-      ],
-      "acknowledgmentAllowed": "Always"
-    },    
     "incidentInProgressState": {
       "name": "incidentInProgress.name",
       "userCard" : {
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json
index c2a0ebe90f..688d6e8eaf 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json
@@ -1,21 +1,9 @@
 {
 	"userCardExamples": {"label": "Examples for new cards "},
-	"message":{
-		"title":"Message",
-		"summary":"Message received"
-	},
 	"conference":{
 		"title":"Conference Call ☏",
 		"summary":"You are invited to a conference"
 	},
-	"question":{
-		"title":"Question ",
-		"summary":"There is a question for you"
-	},
-	"task":{
-		"title":"Task ",
-		"summary":"There is something to do"
-  },
 	"incidentInProgress":{
 		"name":"IT Incident",
 		"title":"IT Incident ",
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json
index 984d49bbf6..963b87904a 100644
--- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json
@@ -1,21 +1,9 @@
 {
 	"userCardExamples": {"label": "Exemples de nouvelles cartes "},
-	"message":{
-		"title":"Message",
-		"summary":"Message reçu"
-	},
 	"conference":{
 		"title":"Conférence téléphonique ☏",
 		"summary":"Vous êtes invité à une conférence téléphonique"
 	},
-	"question":{
-		"title":"Question",
-		"summary":"Il y a une question pour vous"
-	},
-	"task":{
-		"title":"Tâche ",
-		"summary":"Il y a quelque chose à faire "
-  },
 	"incidentInProgress":{
 		"name":"Incident SI",
 		"title":"Incident SI ",
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json
new file mode 100644
index 0000000000..2d521ddf1f
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/config.json
@@ -0,0 +1,39 @@
+{
+  "id": "userCardExamples2",
+  "name": "userCardExamples2.label",
+  "version": "1",
+  "uiVisibility": {
+    "monitoring": true,
+    "logging": true,
+    "calendar": true
+  },
+  "states": {
+    "messageState": {
+      "name": "message.title",
+      "color": "#CC9900",
+      "userCard" : {
+        "template" : "usercard_message"
+      },
+      "templateName": "message",
+      "styles": [],
+      "acknowledgmentAllowed": "Always"
+    },
+    "questionState": {
+      "name": "question.title",
+      "showDetailCardHeader": false,
+      "color": "#0070C0",
+      "userCard" : {
+				"template" : "usercard_question",
+				"severityVisible" : false,
+				"startDateVisible" : true,
+				"endDateVisible" : true
+			},
+      "response": {
+        "state": "questionState"
+      },
+      "templateName": "question",
+      "styles": [],
+      "acknowledgmentAllowed": "Never"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/en.json
new file mode 100644
index 0000000000..b14ca21c05
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/en.json
@@ -0,0 +1,11 @@
+{
+	"userCardExamples2": {"label": "Examples for new cards 2"},
+	"message":{
+		"title":"Message",
+		"summary":"Message received"
+	},
+	"question":{
+		"title":"Question ",
+		"summary":"There is a question for you"
+	}
+}
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/fr.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/fr.json
new file mode 100644
index 0000000000..b4d111debe
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/i18n/fr.json
@@ -0,0 +1,11 @@
+{
+	"userCardExamples2": {"label": "Exemples de nouvelles cartes 2"},
+	"message":{
+		"title":"Message",
+		"summary":"Message reçu"
+	},
+	"question":{
+		"title":"Question",
+		"summary":"Il y a une question pour vous"
+	}
+}
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/message.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/message.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/question.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/question.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/question.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/usercard_message.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/usercard_message.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/usercard_question.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_question.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/en/usercard_question.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/message.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/message.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/question.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/question.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/question.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/usercard_message.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/usercard_message.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/usercard_question.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_question.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples2/template/fr/usercard_question.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json
new file mode 100644
index 0000000000..792e8e1f83
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/config.json
@@ -0,0 +1,23 @@
+{
+  "id": "userCardExamples3",
+  "name": "userCardExamples3.label",
+  "version": "1",
+  "uiVisibility": {
+    "monitoring": true,
+    "logging": true,
+    "calendar": true
+  },
+  "states": {
+    "taskState": {
+      "name": "task.title",
+      "color": "#0070C0",
+      "userCard" : {
+        "template" : "usercard_task"
+      },
+      "templateName": "task",
+      "styles": [
+      ],
+      "acknowledgmentAllowed": "Always"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/en.json
new file mode 100644
index 0000000000..9e4b72fb4d
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"userCardExamples3": {"label": "Examples for new cards 3"},
+	"task":{
+		"title":"Task ",
+		"summary":"There is something to do"
+    }
+}
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/fr.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/fr.json
new file mode 100644
index 0000000000..8412c4a14a
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/i18n/fr.json
@@ -0,0 +1,7 @@
+{
+	"userCardExamples3": {"label": "Exemples de nouvelles cartes 3"},
+	"task":{
+		"title":"Tâche ",
+		"summary":"Il y a quelque chose à faire "
+    }
+}
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/task.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/task.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/task.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_task.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/en/usercard_task.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/task.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/task.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/task.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_task.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars
similarity index 100%
rename from src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_task.handlebars
rename to src/test/utils/karate/businessconfig/resources/bundle_userCardExamples3/template/fr/usercard_task.handlebars
diff --git a/src/test/utils/karate/businessconfig/resources/packageBundle.sh b/src/test/utils/karate/businessconfig/resources/packageBundle.sh
index 0a0f33ef92..1c68b27fae 100755
--- a/src/test/utils/karate/businessconfig/resources/packageBundle.sh
+++ b/src/test/utils/karate/businessconfig/resources/packageBundle.sh
@@ -9,3 +9,11 @@ cd ..
 cd bundle_userCardExamples
 tar -czvf bundle_userCardExamples.tar.gz config.json template/ i18n/
 mv bundle_userCardExamples.tar.gz ../
+cd ..
+cd bundle_userCardExamples2
+tar -czvf bundle_userCardExamples2.tar.gz config.json template/ i18n/
+mv bundle_userCardExamples2.tar.gz ../
+cd ..
+cd bundle_userCardExamples3
+tar -czvf bundle_userCardExamples3.tar.gz config.json template/ i18n/
+mv bundle_userCardExamples3.tar.gz ../
diff --git a/src/test/utils/karate/businessconfig/resources/processgroups.json b/src/test/utils/karate/businessconfig/resources/processgroups.json
new file mode 100644
index 0000000000..85d82238d3
--- /dev/null
+++ b/src/test/utils/karate/businessconfig/resources/processgroups.json
@@ -0,0 +1,27 @@
+{
+  "groups": [
+    {
+      "id": "service1",
+      "processes": [
+        "defaultProcess",
+        "userCardExamples"
+      ]
+    },
+    {
+      "id": "service2",
+      "processes": [
+        "userCardExamples2"
+      ]
+    }
+  ],
+  "locale": {
+    "en": {
+      "service1": "Service number 1",
+      "service2": "Service number 2"
+    },
+    "fr": {
+      "service1": "Service numéro 1",
+      "service2": "Service numéro 2"
+    }
+  }
+}
diff --git a/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature
index f28f2fd557..7430d36fcb 100644
--- a/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature
+++ b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature
@@ -13,22 +13,10 @@ Feature: Add perimeters/group for action test
   "id" : "perimeterUserCardExamples",
   "process" : "userCardExamples",
   "stateRights" : [
-    {
-      "state" : "messageState",
-      "right" : "ReceiveAndWrite"
-    },
     {
       "state" : "conferenceState",
       "right" : "ReceiveAndWrite"
     },
-    {
-      "state" : "questionState",
-      "right" : "ReceiveAndWrite"
-    },
-    {
-      "state" : "taskState",
-      "right" : "ReceiveAndWrite"
-    },
     {
       "state" : "incidentInProgressState",
       "right" : "ReceiveAndWrite"
diff --git a/src/test/utils/karate/cards/setPerimeterForUserCardExamples2.feature b/src/test/utils/karate/cards/setPerimeterForUserCardExamples2.feature
new file mode 100644
index 0000000000..eb8c3595f4
--- /dev/null
+++ b/src/test/utils/karate/cards/setPerimeterForUserCardExamples2.feature
@@ -0,0 +1,57 @@
+Feature: Add perimeters/group for action test 
+
+  Background:
+   #Getting token for admin and operator1 user calling getToken.feature
+    * def signIn = call read('../common/getToken.feature') { username: 'admin'}
+    * def authToken = signIn.authToken
+
+
+
+    * def perimeterUserCardExamples2 =
+"""
+{
+  "id" : "perimeterUserCardExamples2",
+  "process" : "userCardExamples2",
+  "stateRights" : [
+    {
+      "state" : "messageState",
+      "right" : "ReceiveAndWrite"
+    },
+    {
+      "state" : "questionState",
+      "right" : "ReceiveAndWrite"
+    }
+  ]
+}
+"""
+
+
+  Scenario: Create perimeterUserCardExamples2
+    Given url opfabUrl + 'users/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request perimeterUserCardExamples2
+    When method post
+    Then status 201
+
+
+  Scenario: Add perimeterUserCardExamples2 for groups Dispatcher
+    Given url opfabUrl + 'users/groups/Dispatcher/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples2"]
+    When method patch
+    Then status 200
+
+  Scenario: Add perimeterUserCardExamples2 for groups Planner
+    Given url opfabUrl + 'users/groups/Planner/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples2"]
+    When method patch
+    Then status 200
+
+  Scenario: Add perimeterUserCardExamples2 for groups Supervisor
+    Given url opfabUrl + 'users/groups/Supervisor/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples2"]
+    When method patch
+    Then status 200
+
diff --git a/src/test/utils/karate/cards/setPerimeterForUserCardExamples3.feature b/src/test/utils/karate/cards/setPerimeterForUserCardExamples3.feature
new file mode 100644
index 0000000000..02475a34d9
--- /dev/null
+++ b/src/test/utils/karate/cards/setPerimeterForUserCardExamples3.feature
@@ -0,0 +1,53 @@
+Feature: Add perimeters/group for action test 
+
+  Background:
+   #Getting token for admin and operator1 user calling getToken.feature
+    * def signIn = call read('../common/getToken.feature') { username: 'admin'}
+    * def authToken = signIn.authToken
+
+
+
+    * def perimeterUserCardExamples3 =
+"""
+{
+  "id" : "perimeterUserCardExamples3",
+  "process" : "userCardExamples3",
+  "stateRights" : [
+    {
+      "state" : "taskState",
+      "right" : "ReceiveAndWrite"
+    }
+  ]
+}
+"""
+
+
+  Scenario: Create perimeterUserCardExamples3
+    Given url opfabUrl + 'users/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request perimeterUserCardExamples3
+    When method post
+    Then status 201
+
+
+  Scenario: Add perimeterUserCardExamples3 for groups Dispatcher
+    Given url opfabUrl + 'users/groups/Dispatcher/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples3"]
+    When method patch
+    Then status 200
+
+  Scenario: Add perimeterUserCardExamples3 for groups Planner
+    Given url opfabUrl + 'users/groups/Planner/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples3"]
+    When method patch
+    Then status 200
+
+  Scenario: Add perimeterUserCardExamples3 for groups Supervisor
+    Given url opfabUrl + 'users/groups/Supervisor/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request ["perimeterUserCardExamples3"]
+    When method patch
+    Then status 200
+
diff --git a/src/test/utils/karate/loadBundle.sh b/src/test/utils/karate/loadBundle.sh
index b9a8755936..65f7dd99ec 100755
--- a/src/test/utils/karate/loadBundle.sh
+++ b/src/test/utils/karate/loadBundle.sh
@@ -1,6 +1,6 @@
 #/bin/sh
 
-# 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
@@ -18,6 +18,8 @@ echo "Launch Karate test"
 java -jar karate.jar                           \
       businessconfig/postBundleDefaultProcess.feature         \
       businessconfig/postBundleUserCardExamples.feature       \
+      businessconfig/postBundleUserCardExamples2.feature      \
+      businessconfig/postBundleUserCardExamples3.feature      \
 
 
 
diff --git a/src/test/utils/karate/loadProcessGroups.sh b/src/test/utils/karate/loadProcessGroups.sh
new file mode 100755
index 0000000000..a5094f0518
--- /dev/null
+++ b/src/test/utils/karate/loadProcessGroups.sh
@@ -0,0 +1,16 @@
+#/bin/sh
+
+# 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
+# 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.
+
+echo "Launch Karate test"
+java -jar karate.jar                           \
+      businessconfig/postProcessGroups.feature
+
+
+
diff --git a/src/test/utils/karate/setPerimeterForTest.sh b/src/test/utils/karate/setPerimeterForTest.sh
index 2cc90830f2..e301893cf4 100755
--- a/src/test/utils/karate/setPerimeterForTest.sh
+++ b/src/test/utils/karate/setPerimeterForTest.sh
@@ -1,6 +1,6 @@
 #/bin/sh
 
-# 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,4 +11,6 @@
 java -jar karate.jar                           \
       cards/setPerimeterFor6Cards.feature         \
       cards/setPerimeterForUserCardExamples.feature  \
+      cards/setPerimeterForUserCardExamples2.feature  \
+      cards/setPerimeterForUserCardExamples3.feature  \
 
diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html
index a78753bdfd..2bcd6f4193 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.html
+++ b/ui/main/src/app/modules/usercard/usercard.component.html
@@ -16,10 +16,10 @@
                     [values]="serviceOptions"></of-single-filter>
             </div>
             <div class="col">
-                <of-single-filter [hidden]="!! isSelectedService" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
+                <of-single-filter [hidden]="displayServiceFilter()" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
                     [values]="processOptions"></of-single-filter>
 
-                <of-single-filter [hidden]="! isSelectedService" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
+                <of-single-filter [hidden]="! displayServiceFilter()" i18nRootLabelKey="userCard.filters." [parentForm]="messageForm" filterPath="process"
                                   [values]="processOptionsWhenSelectedService"></of-single-filter>
             </div>
             <div class="col">
diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts
index ecc088ac58..6217633599 100644
--- a/ui/main/src/app/modules/usercard/usercard.component.ts
+++ b/ui/main/src/app/modules/usercard/usercard.component.ts
@@ -70,11 +70,11 @@ export class UserCardComponent implements OnDestroy, OnInit {
     processOptionsWhenSelectedService = new Array();
     serviceOptions = new Array();
 
-    public isSelectedService = false;
     selectedProcess: Process;
     selectedState: string;
     processesPerServices = new Map();
     servicePerProcesses = new Map();
+    processesWithoutService = new Array();
     statesPerProcesses = new Map();
     userCardTemplate: SafeHtml;
     editCardMode = false;
@@ -162,7 +162,13 @@ export class UserCardComponent implements OnDestroy, OnInit {
             this.cardService.loadCard(this.cardIdToEdit).subscribe(card => {
                         this.cardToEdit = card;
                         this.messageForm.get('severity').setValue(this.cardToEdit.card.severity);
-                        this.messageForm.get('service').setValue(this.servicePerProcesses.get(this.cardToEdit.card.process));
+
+                        const serviceForCardToEdit = this.servicePerProcesses.get(this.cardToEdit.card.process);
+                        if (serviceForCardToEdit)
+                            this.messageForm.get('service').setValue(serviceForCardToEdit);
+                        else
+                            this.messageForm.get('service').setValue("--");
+
                         this.messageForm.get('process').setValue(this.cardToEdit.card.process);
                         this.messageForm.get('state').setValue(this.cardToEdit.card.state);
                         this.messageForm.get('startDate').setValue(getDateTimeNgbFromMoment(moment(this.cardToEdit.card.startDate)));
@@ -224,12 +230,18 @@ export class UserCardComponent implements OnDestroy, OnInit {
                 this.processesPerServices.set(group.id, processOptions);
         });
 
-        if (this.processOptions.length > numberOfProcessesAttachedToAService)
-            this.serviceOptions.push({value: "", label: ""});
+        if (this.processOptions.length > numberOfProcessesAttachedToAService) {
+            this.loadProcessesWithoutService();
+            this.serviceOptions.push({value: "--", label: "service.defaultLabel"});
+        }
         for (let serviceId of this.processesPerServices.keys())
             this.serviceOptions.push({value: serviceId, label: serviceId});
     }
 
+    loadProcessesWithoutService(): void {
+        const processesWithService = Array.from(this.servicePerProcesses.keys());
+        this.processesWithoutService = this.processOptions.filter(processOption => processesWithService.indexOf(processOption.value) < 0);
+    }
 
     private userCanSendCard(perimeter: ComputedPerimeter): boolean {
         return ((perimeter.rights === RightsEnum.ReceiveAndWrite)
@@ -269,13 +281,14 @@ export class UserCardComponent implements OnDestroy, OnInit {
     changeProcessesWhenSelectService(): void {
         this.messageForm.get('service').valueChanges.subscribe((service) => {
             if (!!service) {
-                this.processOptionsWhenSelectedService = this.processesPerServices.get(service);
+                if (service == '--')
+                    this.processOptionsWhenSelectedService = this.processesWithoutService;
+                else
+                    this.processOptionsWhenSelectedService = this.processesPerServices.get(service);
+
                 this.selectedProcess = this.processOptionsWhenSelectedService[0].value;
-                this.isSelectedService = true;
                 this.messageForm.get('process').setValue(this.selectedProcess);
             }
-            else
-                this.isSelectedService = false;
         });
     }
 
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index bbf42523b8..0ac24a1e56 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -327,6 +327,9 @@
       "entities": "Entities management"
     }
   },
+  "service": {
+    "defaultLabel": "--"
+  },
   "ag-grid": {
     "loadingOoo": "Loading...",
     "noRowsToShow": "No Rows To Show",
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index 705f8a6c90..586c0fcb79 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -327,6 +327,9 @@
       "entities": "Gestion des entités"
     }
   },
+  "service": {
+    "defaultLabel": "--"
+  },
   "ag-grid": {
     "loadingOoo": "Chargement en cours...",
     "noRowsToShow": "Aucune donnée",

From 204c4c6934cc284b5d153929fbee14bd49b45c26 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Fri, 5 Feb 2021 21:56:37 +0100
Subject: [PATCH 26/62] [OC-1434] Rework admin screen modals

---
 .../editmodal/users/edit-user-modal.component.ts          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 80a96c67e9..9ca115f2db 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
@@ -42,10 +42,10 @@ export class EditUserModalComponent implements OnInit {
   @Input() row: User;
 
   constructor(
-    private activeModal: NgbActiveModal,
-    private crudService: UserService,
-    private groupsService: GroupsService,
-    private entitiesService: EntitiesService) {
+      private activeModal: NgbActiveModal,
+      private crudService: UserService,
+      private groupsService: GroupsService,
+      private entitiesService: EntitiesService) {
 
     this.userForm = new FormGroup({
       login: new FormControl(''

From 78065db179aef5cb42dd852a21c5bc976d234ea6 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Fri, 5 Feb 2021 22:09:54 +0100
Subject: [PATCH 27/62] [OC-1392] Remove Material dependencies

---
 ui/main/angular.json                          |   2 -
 ui/main/package.json                          |   1 -
 .../assets/fonts/MaterialIcons-Regular.eot    | Bin 143258 -> 0 bytes
 .../assets/fonts/MaterialIcons-Regular.ttf    | Bin 128180 -> 0 bytes
 .../assets/fonts/MaterialIcons-Regular.woff   | Bin 57620 -> 0 bytes
 .../assets/fonts/MaterialIcons-Regular.woff2  | Bin 44300 -> 0 bytes
 ui/main/src/assets/fonts/README.md            |   4 +-
 ui/main/src/assets/styles/style.css           |  43 +-----------------
 8 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 ui/main/src/assets/fonts/MaterialIcons-Regular.eot
 delete mode 100644 ui/main/src/assets/fonts/MaterialIcons-Regular.ttf
 delete mode 100644 ui/main/src/assets/fonts/MaterialIcons-Regular.woff
 delete mode 100644 ui/main/src/assets/fonts/MaterialIcons-Regular.woff2

diff --git a/ui/main/angular.json b/ui/main/angular.json
index c3d8144d55..06540edf20 100755
--- a/ui/main/angular.json
+++ b/ui/main/angular.json
@@ -29,7 +29,6 @@
               "src/silent-refresh.html"
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
               "node_modules/@fortawesome/fontawesome-free/css/all.css",
               "node_modules/@fullcalendar/core/main.css",
               "node_modules/@fullcalendar/daygrid/main.css",
@@ -100,7 +99,6 @@
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
               "./node_modules/bootstrap/dist/css/bootstrap.min.css",
               "node_modules/@fortawesome/fontawesome-free/css/all.css",
               "src/assets/styles/style.css",
diff --git a/ui/main/package.json b/ui/main/package.json
index 1f8e40f012..a21235d933 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -20,7 +20,6 @@
     "@angular/compiler": "^8.2.14",
     "@angular/core": "^8.2.14",
     "@angular/forms": "^8.2.14",
-    "@angular/material": "^8.2.3",
     "@angular/platform-browser": "^8.2.14",
     "@angular/platform-browser-dynamic": "^8.2.14",
     "@angular/router": "^8.2.14",
diff --git a/ui/main/src/assets/fonts/MaterialIcons-Regular.eot b/ui/main/src/assets/fonts/MaterialIcons-Regular.eot
deleted file mode 100644
index 70508ebabc9992e64f1314f866b2d7ab90438c58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143258
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
Hzx)3OGG_Ot

diff --git a/ui/main/src/assets/fonts/MaterialIcons-Regular.ttf b/ui/main/src/assets/fonts/MaterialIcons-Regular.ttf
deleted file mode 100644
index 7015564ad166a3e9d88c82f17829f0cc01ebe29a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128180
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

diff --git a/ui/main/src/assets/fonts/MaterialIcons-Regular.woff b/ui/main/src/assets/fonts/MaterialIcons-Regular.woff
deleted file mode 100644
index b648a3eea2d16b6ce783906d6b7d5f251b9eb56c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 57620
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
BJ$(QG

diff --git a/ui/main/src/assets/fonts/MaterialIcons-Regular.woff2 b/ui/main/src/assets/fonts/MaterialIcons-Regular.woff2
deleted file mode 100644
index 9fa211252080046a23b2449dbdced6abc2b0bb34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44300
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
QW8}wPUeo^@jR61v08@RD2LJ#7

diff --git a/ui/main/src/assets/fonts/README.md b/ui/main/src/assets/fonts/README.md
index 1fb7d7e005..2455bdee88 100644
--- a/ui/main/src/assets/fonts/README.md
+++ b/ui/main/src/assets/fonts/README.md
@@ -1,3 +1 @@
-The MaterialIcons fonts are provided by https://material.io/ under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
-
-The Open Sans fonts  are provided by https://fonts.google.com/  under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
\ No newline at end of file
+The Open Sans fonts  are provided by https://fonts.google.com/  under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
diff --git a/ui/main/src/assets/styles/style.css b/ui/main/src/assets/styles/style.css
index 23e5ca7041..ebec3cb35a 100644
--- a/ui/main/src/assets/styles/style.css
+++ b/ui/main/src/assets/styles/style.css
@@ -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,45 +7,6 @@
  * This file is part of the OperatorFabric project.
  */
 
-
-@font-face {
-    font-family: 'Material Icons';
-    font-style: normal;
-    font-weight: 400;
-    src: url(../fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
-    src: local('Material Icons'),
-      local('MaterialIcons-Regular'),
-      url(../fonts/MaterialIcons-Regular.woff2) format('woff2'),
-      url(../fonts/MaterialIcons-Regular.woff) format('woff'),
-      url(../fonts/MaterialIcons-Regular.ttf) format('truetype');
-  }
-  
-  .material-icons {
-    font-family: 'Material Icons', sans-serif;
-    font-weight: normal;
-    font-style: normal;
-    font-size: 24px;  /* Preferred icon size */
-    display: inline-block;
-    line-height: 1;
-    text-transform: none;
-    letter-spacing: normal;
-    word-wrap: normal;
-    white-space: nowrap;
-    direction: ltr;
-  
-    /* Support for all WebKit browsers. */
-    -webkit-font-smoothing: antialiased;
-    /* Support for Safari and Chrome. */
-    text-rendering: optimizeLegibility;
-  
-    /* Support for Firefox. */
-    -moz-osx-font-smoothing: grayscale;
-  
-    /* Support for IE. */
-    font-feature-settings: 'liga';
-  }
-
-
 @font-face {
   font-family: 'Open Sans';
   src: url('../fonts/OpenSans-Bold.ttf') format('truetype');
@@ -68,4 +29,4 @@
   font-weight: normal;
   font-style: normal;
   font-display: swap;
-}
\ No newline at end of file
+}

From b7202cd892a36787a9296f269816d8802a3e3dae Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Mon, 8 Feb 2021 16:20:54 +0100
Subject: [PATCH 28/62] [OC-1447] Introduce notion of type of state

---
 .../businessconfig/model/TypeOfStateEnum.java | 27 +++++++++++++++++++
 .../src/main/modeling/config.json             |  1 +
 .../model/ProcessStatesData.java              |  7 +++++
 .../src/main/modeling/swagger.yaml            | 15 +++++++++++
 .../businessconfig/getABusinessconfig.feature |  3 +++
 .../resources/bundle_api_test_v2/config.json  |  9 ++++---
 6 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/TypeOfStateEnum.java

diff --git a/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/TypeOfStateEnum.java b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/TypeOfStateEnum.java
new file mode 100644
index 0000000000..cff34fd347
--- /dev/null
+++ b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/TypeOfStateEnum.java
@@ -0,0 +1,27 @@
+/* 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
+ * 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.businessconfig.model;
+
+/**
+ * Type of state
+ * <dl>
+ *     <dt>INPROGRESS</dt><dd>In progress</dd>
+ *     <dt>FINISHED</dt><dd>Finished</dd>
+ *     <dt>CANCELED</dt><dd>Canceled</dd>
+ * </dl>
+ * Note : This enum is created by hand because Swagger can't handle enums. It should match the corresponding
+ * enum definition in the Cards API.
+ *
+ *
+ */
+public enum TypeOfStateEnum {
+    INPROGRESS, FINISHED, CANCELED
+}
+
diff --git a/client/businessconfig/src/main/modeling/config.json b/client/businessconfig/src/main/modeling/config.json
index 65fdd8dd78..e74ee4f015 100755
--- a/client/businessconfig/src/main/modeling/config.json
+++ b/client/businessconfig/src/main/modeling/config.json
@@ -16,6 +16,7 @@
     "ActionEnum": "org.lfenergy.operatorfabric.businessconfig.model.ActionEnum",
     "ResponseBtnColorEnum": "org.lfenergy.operatorfabric.businessconfig.model.ResponseBtnColorEnum",
     "LinkTypeEnum":         "org.lfenergy.operatorfabric.businessconfig.model.LinkTypeEnum",
+    "TypeOfStateEnum": "org.lfenergy.operatorfabric.businessconfig.model.TypeOfStateEnum",
     "EpochDate": "java.time.Instant",
     "LongInteger": "java.lang.Long"
   }
diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
index 671041cb51..55d7380501 100644
--- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
+++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java
@@ -29,6 +29,7 @@ public class ProcessStatesData implements ProcessStates {
     private String templateName;
     @Singular
     private List<String> styles;
+    private TypeOfStateEnum type;
 
     @Override
     public Response getResponse() {
@@ -45,4 +46,10 @@ public void setResponse(Response responseData) {
 
     @Override
     public void setAcknowledgmentAllowed(AcknowledgmentAllowedEnum acknowledgmentAllowed) { this.acknowledgmentAllowed = acknowledgmentAllowed; }
+
+    @Override
+    public TypeOfStateEnum getType() { return this.type; }
+
+    @Override
+    public void setType(TypeOfStateEnum type) { this.type = type; }
 }
diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml
index b2819f24ff..373006c01a 100755
--- a/services/core/businessconfig/src/main/modeling/swagger.yaml
+++ b/services/core/businessconfig/src/main/modeling/swagger.yaml
@@ -381,6 +381,9 @@ definitions:
               type: array
               items:
                 type: string
+            type:
+              description: Type of state ("INPROGRESS", "FINISHED" or "CANCELED")
+              $ref: '#/definitions/TypeOfStateEnum'
       uiVisibility:
         type: object
         properties:
@@ -473,6 +476,18 @@ definitions:
       - Never
       - OnlyWhenResponseDisabledForUser
 
+  TypeOfStateEnum:
+    type: string
+    description: |-
+      Type of state >
+      * INPROGRESS - In Progress
+      * FINISHED - Finished
+      * CANCELED - Canceled
+    enum:
+      - INPROGRESS
+      - FINISHED
+      - CANCELED
+
   ProcessGroup:
     description: Object containing a list of processes.
     properties:
diff --git a/src/test/api/karate/businessconfig/getABusinessconfig.feature b/src/test/api/karate/businessconfig/getABusinessconfig.feature
index 49d1af3b30..e86e2d9f97 100644
--- a/src/test/api/karate/businessconfig/getABusinessconfig.feature
+++ b/src/test/api/karate/businessconfig/getABusinessconfig.feature
@@ -20,11 +20,14 @@ Feature: Bundle
     And match response.states.questionState.userCard.severityVisible == false
     And match response.states.questionState.userCard.startDateVisible == true
     And match response.states.questionState.userCard.endDateVisible == true
+    And match response.states.questionState.type == 'INPROGRESS'
+    And match response.states.messageState.type == 'CANCELED'
     And match response.states.incidentInProgressState.userCard.template == 'usercard_incidentInProgress'
     And match response.states.incidentInProgressState.userCard.severityVisible == true
     And match response.states.incidentInProgressState.userCard.startDateVisible == false
     And match response.states.incidentInProgressState.userCard.endDateVisible == false
     And match response.states.incidentInProgressState.acknowledgmentAllowed == 'Always'
+    And match response.states.incidentInProgressState.type == 'FINISHED'
 
 
 
diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
index bd4e376040..2bd0b3e655 100644
--- a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
+++ b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json
@@ -9,7 +9,8 @@
 	"states": {
 		"messageState" : {
 			"templateName" : "template",
-			"styles" : [ "style" ]
+			"styles" : [ "style" ],
+			"type" : "CANCELED"
 		},
 		"questionState": {
 		  "name": "question.title",
@@ -25,7 +26,8 @@
 		  },
 		  "templateName": "question",
 		  "styles": [],
-		  "acknowledgmentAllowed": "Never"
+		  "acknowledgmentAllowed": "Never",
+		  "type" : "INPROGRESS"
 		},   
 		"incidentInProgressState": {
 		  "name": "incidentInProgress.name",
@@ -41,7 +43,8 @@
 		  },
 		  "templateName": "incidentInProgress",
 		  "styles": [],
-		  "acknowledgmentAllowed": "Always"
+		  "acknowledgmentAllowed": "Always",
+		  "type" : "FINISHED"
 		}
 	  }
 }

From ecf6aaa6e1a370561947204870f03d83cfc34640 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Mon, 8 Feb 2021 16:28:19 +0100
Subject: [PATCH 29/62] [OC-1270] Timeline circles to open popover on mouseover

---
 .../custom-timeline-chart.component.html               |  6 +++---
 .../custom-timeline-chart.component.spec.ts            |  4 +++-
 .../custom-timeline-chart.component.ts                 | 10 ++++++++--
 .../time-line/init-chart/init-chart.component.spec.ts  |  6 ++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.html b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.html
index a275ab1843..93e0d1b685 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.html
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.html
@@ -113,7 +113,7 @@
 
         <svg:g *ngFor="let circle of circles" type="button">
 
-        <svg:g *ngIf="(circle.count>1)" (click)="feedCircleHovered(circle)" container="body"   [ngbPopover]="tooltipTemplate"   [autoClose]="true" popoverClass="opfab-popover">
+        <svg:g *ngIf="(circle.count>1)" (mouseenter)="feedCircleHovered(circle, p1)" container="body" #p1="ngbPopover"   [ngbPopover]="tooltipTemplate"    triggers="mouseenter:mouseleave" closeDelay="3000" popoverClass="opfab-popover">
             <svg:circle [attr.cx]="xScale(circle.date)"
                 [attr.cy]="yScale(circle.circleYPosition)" [attr.r]="'10'" [attr.fill]=circle.color [attr.stroke]="'stroke'"
                 />
@@ -124,7 +124,7 @@
                 [attr.font-size]="15" dy=".3em">{{circle.count}} </text>
         </svg:g>
 
-        <svg:g *ngIf="(circle.count==1)" (click)="showCard(circle.summary[0].cardId)" >
+        <svg:g *ngIf="(circle.count==1)" (click)="showCard(circle.summary[0].cardId)" (mouseenter)="feedCircleHovered(circle, p2)"  container="body" #p2="ngbPopover" [ngbPopover]="tooltipTemplate"  triggers="mouseenter:mouseleave" closeDelay="3000" popoverClass="opfab-popover" >
             <svg:circle [attr.cx]="xScale(circle.date)"
                 [attr.cy]="yScale(circle.circleYPosition)" [attr.r]="'10'" [attr.fill]=circle.color [attr.stroke]="'stroke'"
                 />
@@ -140,7 +140,7 @@
     <ng-template #tooltipTemplate>
         <div *ngFor="let title of currentCircleHovered.summary;let i=index" style="padding: 0px;margin: 0px;line-height: 8px">
             <div *ngIf="i<maxNumberLinesForBubblePopover">
-                <br/>
+                <br *ngIf="i > 0"/>
                 <button id="opfab-timeline-bubble-btn" class="btn btn-cardlink btn-sm" (click)="showCard(title.cardId)">
                     <div style="text-align:left">
                         {{title.summaryDate}}
diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
index c944e9bc96..2a6e954eaf 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.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
@@ -25,6 +25,7 @@ import {TimeService} from '@ofServices/time.service';
 import {appReducer, storeConfig} from '@ofStore/index';
 import {RouterTestingModule} from '@angular/router/testing';
 import {HttpClientTestingModule} from '@angular/common/http/testing';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 describe('CustomTimelineChartComponent', () => {
   let component: CustomTimelineChartComponent;
@@ -42,6 +43,7 @@ describe('CustomTimelineChartComponent', () => {
         RouterTestingModule,
         StoreRouterConnectingModule,
         NgxChartsModule,
+        NgbModule,
         HttpClientTestingModule],
       declarations: [ CustomTimelineChartComponent,
    MouseWheelDirective],
diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
index 7f0604deac..e011b5d7c6 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
@@ -32,6 +32,8 @@ import { Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
 import { getNextTimeForRepeating } from '@ofServices/reminder/reminderUtils';
+import {ConditionalExpr} from '@angular/compiler';
+import {NgbPopover} from '@ng-bootstrap/ng-bootstrap';
 
 
 @Component({
@@ -50,7 +52,7 @@ export class CustomTimelineChartComponent extends BaseChartComponent implements
   public xTicksTwoFormat: string;
   public title: string;
   public oldWidth = 0;
-  
+  public openPopover: NgbPopover;
 
 
   @ViewChild(ChartComponent, { read: ElementRef, static: false }) chart: ElementRef;
@@ -520,7 +522,11 @@ export class CustomTimelineChartComponent extends BaseChartComponent implements
     return Math.max(this.xScale(this.xRealTimeLine),50); // To avoid going to much on the left, 50px min
   }
 
-  feedCircleHovered(myCircle): void {
+  feedCircleHovered(myCircle, p): void {
+    if (this.openPopover) {
+      this.openPopover.close();
+    }
+    this.openPopover = p;
     this.currentCircleHovered = myCircle;
   }
 
diff --git a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts
index ef7202fafe..b0b10b1a75 100644
--- a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.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
@@ -24,6 +24,7 @@ import {RouterTestingModule} from '@angular/router/testing';
 import {MouseWheelDirective} from '../directives/mouse-wheel.directive';
 import {TimeService} from '@ofServices/time.service';
 import {GlobalStyleService} from "@ofServices/global-style.service";
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 
 describe('InitChartComponent', () => {
@@ -38,7 +39,8 @@ describe('InitChartComponent', () => {
         StoreModule.forRoot(appReducer, storeConfig),
         RouterTestingModule,
         StoreRouterConnectingModule,
-        NgxChartsModule ],
+        NgxChartsModule,
+        NgbModule],
       declarations: [ InitChartComponent, CustomTimelineChartComponent, MouseWheelDirective],
       providers: [{provide: APP_BASE_HREF, useValue: '/'},
         {provide: Store, useClass: Store},

From 2627ca2b1416531504b5cda8439c5e1273c86b3c Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Wed, 10 Feb 2021 09:04:31 +0100
Subject: [PATCH 30/62] [OC-1472] Card detail show last seen card for few
 instants before showing the selected card (issuer OC-1419 reopen)

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 .../components/detail/detail.component.ts     | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

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 db6ad500ff..1756a45aa7 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
@@ -41,7 +41,7 @@ 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 {UpdateALightCard} from '@ofStore/actions/light-card.actions';
+import {ClearLightCardSelection, UpdateALightCard} from '@ofStore/actions/light-card.actions';
 import {UserService} from '@ofServices/user.service';
 import {EntitiesService} from '@ofServices/entities.service';
 import {Entity} from '@ofModel/entity.model';
@@ -139,7 +139,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     public showActionButton = false;
     public showEditAndDeleteButton = false ;
     public showDetailCardHeader = false;
-
     private cardSetToReadButNotYetOnUI;
 
     modalRef: NgbModalRef;
@@ -158,7 +157,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
                 private modalService: NgbModal,
                 private configService: ConfigService,
                 private time: TimeService) {
-
     }
 
     get isLocked() {
@@ -250,28 +248,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
         }
     }
 
-    // When we load the component , we need first  to reset all values of the previous version of the component
-    //
-    // Even if the previous component has been destroy, the values that was bind to an element in the DOM 
-    // are still present "somewhere" in angular "structure".
-    // When we load the component , angular will first initialize the values with the old one before binding it to 
-    // the new one . Depending on the performance of network / browser , we can see briefly on the screen the previous values.
-    // To avoid that , we shall init as soon as possible the values bind in the HTML.
-
-    private initAllBindedVariables()
-    {
-        this._htmlContent = "";
-        this.fullscreen = false;
-        this.showMaxAndReduceButton = false;
-        this.showAckButton = false;
-        this.showActionButton = false;
-        this.showEditAndDeleteButton = false ;
-        this.showDetailCardHeader = false;
-        this.isActionEnabled = false;
-        this.lttdExpiredIsTrue = false;
-        this.displayDeleteResult = false;
-    }
-
     private setButtonsVisibility() {
         if (this._appService.pageType === PageType.ARCHIVE) this.showButtons = false;
         else this.showButtons = true;
@@ -441,7 +417,10 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
 
     closeDetails() {
         this.updateReadCardStatusOnUI();
-        if (this.parentModalRef) this.parentModalRef.close();
+        if (this.parentModalRef)  {
+            this.parentModalRef.close();
+            this.store.dispatch(new ClearLightCardSelection());
+        }
         else this._appService.closeDetails(this.currentPath);
     }
 
@@ -454,7 +433,6 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     }
 
     ngOnChanges(): void {
-        this.initAllBindedVariables();
         this.initializeHrefsOfCssLink();
         this.checkIfHasAlreadyResponded();
         this.initializeHandlebarsTemplates();

From bea21b5f3fa8ec29aa067ab54e352e8c0f23d2e5 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Sun, 7 Feb 2021 21:30:00 +0100
Subject: [PATCH 31/62] [OC-1061] Remove ngrx-router dependency

---
 ui/main/package.json           | 1 -
 ui/main/src/app/store/index.ts | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index a21235d933..7e363b6800 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -55,7 +55,6 @@
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "ng-event-source": "^1.0.14",
-    "ngrx-router": "^2.0.1",
     "ngx-bootstrap": "^5.6.1",
     "ngx-countdown": "^10.0.1",
     "ngx-type-ahead": "^2.0.1",
diff --git a/ui/main/src/app/store/index.ts b/ui/main/src/app/store/index.ts
index 8fb0b6ef00..2d09fcd16e 100644
--- a/ui/main/src/app/store/index.ts
+++ b/ui/main/src/app/store/index.ts
@@ -18,7 +18,6 @@ import {storeFreeze} from 'ngrx-store-freeze';
 import {CardEffects} from '@ofEffects/card.effects';
 import {CardOperationEffects} from '@ofEffects/card-operation.effects';
 import {AuthenticationEffects} from '@ofEffects/authentication.effects';
-import {RouterEffects} from 'ngrx-router';
 import {CardFeedState} from '@ofStates/feed.state';
 import {reducer as lightCardReducer} from '@ofStore/reducers/light-card.reducer';
 import {reducer as cardReducer} from '@ofStore/reducers/card.reducer';
@@ -45,7 +44,7 @@ import {UserEffects} from '@ofEffects/user.effects';
 
 import {CardsSubscriptionState} from '@ofStates/cards-subscription.state';
 import {cardsSubscriptionReducer} from '@ofStore/reducers/cards-subscription.reducer';
-import {GlobalStyleState } from './states/global-style.state';
+import {GlobalStyleState} from './states/global-style.state';
 import {LoggingState} from '@ofStates/loggingState';
 import {LoggingEffects} from '@ofEffects/logging.effects';
 import {MonitoringState} from '@ofStates/monitoring.state';
@@ -71,7 +70,6 @@ export const appEffects = [
     CardEffects,
     SettingsEffects,
     CardOperationEffects,
-    RouterEffects,
     CustomRouterEffects,
     AuthenticationEffects,
     MenuEffects,

From 8f91c678b210984d6539c0085cca62ddfa934738 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 8 Feb 2021 07:22:46 +0100
Subject: [PATCH 32/62] [OC-1061] Updating ngrx to v8

---
 ui/main/package.json                                 | 12 ++++++------
 .../custom-timeline-chart.component.spec.ts          |  2 +-
 .../init-chart/init-chart.component.spec.ts          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index 7e363b6800..25f215bd05 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -32,11 +32,11 @@
     "@fullcalendar/interaction": "^4.2.2",
     "@fullcalendar/timegrid": "^4.2.2",
     "@ng-bootstrap/ng-bootstrap": "5.3.0",
-    "@ngrx/effects": "^7.4.0",
-    "@ngrx/entity": "^7.1.0",
-    "@ngrx/router-store": "^7.1.0",
-    "@ngrx/store": "^7.1.0",
-    "@ngrx/store-devtools": "^7.1.0",
+    "@ngrx/effects": "^8.6.1",
+    "@ngrx/entity": "^8.6.1",
+    "@ngrx/router-store": "^8.6.1",
+    "@ngrx/store": "^8.6.1",
+    "@ngrx/store-devtools": "^8.6.1",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
     "@swimlane/ngx-charts": "^13.0.4",
@@ -72,7 +72,7 @@
     "@babel/compat-data": "~7.8.0",
     "@compodoc/compodoc": "^1.1.10",
     "@fortawesome/fontawesome-free": "^5.15.0",
-    "@ngrx/schematics": "^7.1.0",
+    "@ngrx/schematics": "^8.6.1",
     "@types/file-saver": "^2.0.1",
     "@types/handlebars": "^4.0.40",
     "@types/jasmine": "~3.3.7",
diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
index 2a6e954eaf..dd502271e5 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
@@ -41,7 +41,7 @@ describe('CustomTimelineChartComponent', () => {
         FormsModule,
         StoreModule.forRoot(appReducer, storeConfig),
         RouterTestingModule,
-        StoreRouterConnectingModule,
+        StoreRouterConnectingModule.forRoot(),
         NgxChartsModule,
         NgbModule,
         HttpClientTestingModule],
diff --git a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts
index b0b10b1a75..8714d7d72c 100644
--- a/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/init-chart/init-chart.component.spec.ts
@@ -38,7 +38,7 @@ describe('InitChartComponent', () => {
         FormsModule,
         StoreModule.forRoot(appReducer, storeConfig),
         RouterTestingModule,
-        StoreRouterConnectingModule,
+        StoreRouterConnectingModule.forRoot(),
         NgxChartsModule,
         NgbModule],
       declarations: [ InitChartComponent, CustomTimelineChartComponent, MouseWheelDirective],

From ab25533dc9af396092005445f0f6d7b9a2021a37 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 8 Feb 2021 14:44:06 +0100
Subject: [PATCH 33/62] [OC-1061] Update to Angular 9 - KO with FullCalendar
 bug

---
 ui/main/angular.json                          | 14 +++++++-
 ui/main/package.json                          | 34 +++++++++----------
 .../src/app/common/error/app-error-handler.ts |  3 +-
 .../components/table/admin-table.component.ts |  3 +-
 ui/main/src/app/modules/cards/cards.module.ts |  2 +-
 .../custom-timeline-chart.component.ts        | 14 ++++----
 .../app/modules/logging/logging.component.ts  |  8 ++---
 .../monitoring/monitoring.component.ts        |  4 +--
 .../src/app/services/global-style.service.ts  |  6 ++--
 ui/main/src/app/services/guid.service.ts      |  7 ++--
 ui/main/src/app/services/services.module.ts   |  2 +-
 ui/main/src/app/store/state.module.ts         |  2 +-
 ui/main/src/tsconfig.app.json                 |  9 +++--
 13 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/ui/main/angular.json b/ui/main/angular.json
index 06540edf20..2554ecee81 100755
--- a/ui/main/angular.json
+++ b/ui/main/angular.json
@@ -10,7 +10,7 @@
       "prefix": "of",
       "schematics": {
         "@schematics/angular:component": {
-          "styleext": "scss"
+          "style": "scss"
         }
       },
       "architect": {
@@ -46,6 +46,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -62,6 +68,12 @@
               "buildOptimizer": true
             },
             "productionDebug": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
diff --git a/ui/main/package.json b/ui/main/package.json
index 25f215bd05..ec5a7b32c6 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -14,15 +14,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.2.14",
+    "@angular/animations": "^9.1.13",
     "@angular/cdk": "^8.2.3",
-    "@angular/common": "^8.2.14",
-    "@angular/compiler": "^8.2.14",
-    "@angular/core": "^8.2.14",
-    "@angular/forms": "^8.2.14",
-    "@angular/platform-browser": "^8.2.14",
-    "@angular/platform-browser-dynamic": "^8.2.14",
-    "@angular/router": "^8.2.14",
+    "@angular/common": "^9.1.13",
+    "@angular/compiler": "^9.1.13",
+    "@angular/core": "^9.1.13",
+    "@angular/forms": "^9.1.13",
+    "@angular/platform-browser": "^9.1.13",
+    "@angular/platform-browser-dynamic": "^9.1.13",
+    "@angular/router": "^9.1.13",
     "@fortawesome/angular-fontawesome": "^0.5.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.31",
     "@fortawesome/free-solid-svg-icons": "^5.15.0",
@@ -60,15 +60,15 @@
     "ngx-type-ahead": "^2.0.1",
     "rxjs": "^6.6.3",
     "svg-pan-zoom": "^3.6.1",
-    "tslib": "^1.13.0",
+    "tslib": "^1.10.0",
     "xlsx": "^0.16.7",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.29",
-    "@angular/cli": "^8.3.29",
-    "@angular/compiler-cli": "^8.2.14",
-    "@angular/language-service": "^8.2.14",
+    "@angular-devkit/build-angular": "~0.901.14",
+    "@angular/cli": "^9.1.14",
+    "@angular/compiler-cli": "^9.1.13",
+    "@angular/language-service": "^9.1.13",
     "@babel/compat-data": "~7.8.0",
     "@compodoc/compodoc": "^1.1.10",
     "@fortawesome/fontawesome-free": "^5.15.0",
@@ -79,8 +79,8 @@
     "@types/jasminewd2": "~2.0.6",
     "@types/lodash": "^4.14.161",
     "@types/moment": "^2.13.0",
-    "@types/node": "~10.10.0",
-    "codelyzer": "^5.2.2",
+    "@types/node": "^12.11.1",
+    "codelyzer": "^5.1.2",
     "jasmine-core": "^3.6.0",
     "jasmine-marbles": "^0.6.0",
     "jasmine-spec-reporter": "^4.2.1",
@@ -97,6 +97,6 @@
     "ts-mockito": "^2.6.1",
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.5.3"
+    "typescript": "~3.8.3"
   }
 }
diff --git a/ui/main/src/app/common/error/app-error-handler.ts b/ui/main/src/app/common/error/app-error-handler.ts
index d298993705..e31c6c3584 100644
--- a/ui/main/src/app/common/error/app-error-handler.ts
+++ b/ui/main/src/app/common/error/app-error-handler.ts
@@ -8,7 +8,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {ErrorHandler} from '@angular/core';
+import {ErrorHandler, Injectable} from '@angular/core';
 import {NotAllowedError} from './not-allowed-error';
 import {NotFoundError} from './not-found-error';
 
@@ -16,6 +16,7 @@ import {NotFoundError} from './not-found-error';
  * By default, it will print messages to the console, and this class is a custom `ErrorHandler` that will override
  * this default for certain error types.
  */
+@Injectable()
 export class AppErrorHandler implements ErrorHandler {
 
   handleError(error) {
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
index 834a5498b2..ab2155a7a9 100644
--- a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
@@ -8,7 +8,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {Injectable, Input, OnInit} from '@angular/core';
+import {Directive, Injectable, Input, 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';
@@ -18,6 +18,7 @@ import {ActionCellRendererComponent} from './action-cell-renderer.component';
 import {AppError} from '../../../../common/error/app-error';
 import {CrudService} from '@ofServices/crud-service';
 
+@Directive()
 @Injectable()
 export abstract class AdminTableComponent implements OnInit {
 
diff --git a/ui/main/src/app/modules/cards/cards.module.ts b/ui/main/src/app/modules/cards/cards.module.ts
index 95c5077ec4..c277316651 100644
--- a/ui/main/src/app/modules/cards/cards.module.ts
+++ b/ui/main/src/app/modules/cards/cards.module.ts
@@ -43,7 +43,7 @@ import {UserCardModule} from '../usercard/usercard.module';
 })
 
 export class CardsModule {
-    static forRoot(): ModuleWithProviders {
+    static forRoot(): ModuleWithProviders<CardsModule> {
         return {
             ngModule: CardsModule,
             providers: [ProcessesService]
diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
index e011b5d7c6..682decf348 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.ts
@@ -21,17 +21,17 @@ import {
   ViewEncapsulation,
   OnDestroy
 } from '@angular/core';
-import { scaleLinear, scaleTime } from 'd3-scale';
-import { BaseChartComponent, calculateViewDimensions, ChartComponent, ViewDimensions } from '@swimlane/ngx-charts';
+import {scaleLinear, scaleTime} from 'd3-scale';
+import {BaseChartComponent, calculateViewDimensions, ChartComponent, ViewDimensions} from '@swimlane/ngx-charts';
 import * as moment from 'moment';
 import {select, Store} from '@ngrx/store';
 import {selectCurrentUrl} from '@ofStore/selectors/router.selectors';
 import {AppState} from '@ofStore/index';
-import { Router } from '@angular/router';
-import { Subject } from 'rxjs';
-import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
+import {Router} from '@angular/router';
+import {Subject} from 'rxjs';
+import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
-import { getNextTimeForRepeating } from '@ofServices/reminder/reminderUtils';
+import {getNextTimeForRepeating} from '@ofServices/reminder/reminderUtils';
 import {ConditionalExpr} from '@angular/compiler';
 import {NgbPopover} from '@ng-bootstrap/ng-bootstrap';
 
@@ -55,7 +55,7 @@ export class CustomTimelineChartComponent extends BaseChartComponent implements
   public openPopover: NgbPopover;
 
 
-  @ViewChild(ChartComponent, { read: ElementRef, static: false }) chart: ElementRef;
+  @ViewChild(ChartComponent, { read: ElementRef }) chart: ElementRef;
   public dims: ViewDimensions;
   public xDomain: any;
   public yScale: any;
diff --git a/ui/main/src/app/modules/logging/logging.component.ts b/ui/main/src/app/modules/logging/logging.component.ts
index 1f97070d7a..4d046abcb0 100644
--- a/ui/main/src/app/modules/logging/logging.component.ts
+++ b/ui/main/src/app/modules/logging/logging.component.ts
@@ -7,7 +7,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {OnInit, Component, OnDestroy, ViewChild} from '@angular/core';
+import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
 import {Observable, Subject} from 'rxjs';
@@ -15,8 +15,8 @@ import {LineOfLoggingResult} from '@ofModel/line-of-logging-result.model';
 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 {ProcessesService} from '@ofServices/processes.service';
+import {Process} from '@ofModel/processes.model';
 
 @Component({
     selector: 'of-logging',
@@ -25,7 +25,7 @@ import {Process} from "@ofModel/processes.model";
 })
 export class LoggingComponent implements OnInit, OnDestroy {
 
-    @ViewChild(LoggingFiltersComponent, {static: false})
+    @ViewChild(LoggingFiltersComponent)
     filters: LoggingFiltersComponent;
 
     loggingResult$: Observable<LineOfLoggingResult[]>;
diff --git a/ui/main/src/app/modules/monitoring/monitoring.component.ts b/ui/main/src/app/modules/monitoring/monitoring.component.ts
index b7aadaf431..6e823a39fc 100644
--- a/ui/main/src/app/modules/monitoring/monitoring.component.ts
+++ b/ui/main/src/app/modules/monitoring/monitoring.component.ts
@@ -19,7 +19,7 @@ import * as moment from 'moment';
 import {I18n} from '@ofModel/i18n.model';
 import {MonitoringFiltersComponent} from './components/monitoring-filters/monitoring-filters.component';
 import {Process} from '@ofModel/processes.model';
-import { ProcessesService } from '@ofServices/processes.service';
+import {ProcessesService} from '@ofServices/processes.service';
 
 @Component({
     selector: 'of-monitoring',
@@ -28,7 +28,7 @@ import { ProcessesService } from '@ofServices/processes.service';
 })
 export class MonitoringComponent implements OnInit, OnDestroy {
 
-    @ViewChild(MonitoringFiltersComponent, {static: false})
+    @ViewChild(MonitoringFiltersComponent)
     filters: MonitoringFiltersComponent;
 
     monitoringResult$: Observable<LineOfMonitoringResult[]>;
diff --git a/ui/main/src/app/services/global-style.service.ts b/ui/main/src/app/services/global-style.service.ts
index 9c33493ffb..354c8ab180 100644
--- a/ui/main/src/app/services/global-style.service.ts
+++ b/ui/main/src/app/services/global-style.service.ts
@@ -8,14 +8,12 @@
  */
 
 
-import {Inject} from '@angular/core';
+import {Injectable} from '@angular/core';
 import {Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
 import {GlobalStyleUpdate} from '@ofActions/global-style.actions';
 
-@Inject({
-    providedIn: 'root'
-})
+@Injectable()
 export class GlobalStyleService {
 
     private static style: string;
diff --git a/ui/main/src/app/services/guid.service.ts b/ui/main/src/app/services/guid.service.ts
index ebb207dc67..ca92b41c96 100644
--- a/ui/main/src/app/services/guid.service.ts
+++ b/ui/main/src/app/services/guid.service.ts
@@ -8,13 +8,10 @@
  */
 
 
-
-import {Inject} from '@angular/core';
+import {Injectable} from '@angular/core';
 import {Guid} from 'guid-typescript';
 
-@Inject({
-    providedIn: 'root'
-})
+@Injectable()
 export class GuidService {
 
     private readonly guid: Guid;
diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts
index f33f3c178c..b16100d548 100644
--- a/ui/main/src/app/services/services.module.ts
+++ b/ui/main/src/app/services/services.module.ts
@@ -60,7 +60,7 @@ import {ReminderService} from '@ofServices/reminder/reminder.service';
     ]
 })
 export class ServicesModule {
-    static forRoot(): ModuleWithProviders {
+    static forRoot(): ModuleWithProviders<ServicesModule> {
         return {
             ngModule: ServicesModule
         };
diff --git a/ui/main/src/app/store/state.module.ts b/ui/main/src/app/store/state.module.ts
index c595e5057d..ea3264538f 100644
--- a/ui/main/src/app/store/state.module.ts
+++ b/ui/main/src/app/store/state.module.ts
@@ -33,7 +33,7 @@ import {CustomRouterStateSerializer} from '@ofStore/states/router.state';
     providers: [{provide: 'configRetryDelay', useValue: 5000}]
 })
 export class StateModule {
-    static forRoot(): ModuleWithProviders {
+    static forRoot(): ModuleWithProviders<StateModule> {
         return {
             ngModule: StateModule
             ,
diff --git a/ui/main/src/tsconfig.app.json b/ui/main/src/tsconfig.app.json
index 8ea061ea1b..f3a1b80180 100755
--- a/ui/main/src/tsconfig.app.json
+++ b/ui/main/src/tsconfig.app.json
@@ -4,8 +4,11 @@
     "outDir": "../out-tsc/app",
     "types": []
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts"
   ]
 }

From 36d323ecaa0bb249db3794ec2126d43e4b5ab7ae Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 8 Feb 2021 16:12:56 +0100
Subject: [PATCH 34/62] [OC-1061] Updating FullCalendar to fix error - build ok
 test KO

---
 ui/main/package.json                          | 10 ++---
 .../modules/archives/archives.component.ts    | 40 +++++++++----------
 .../modules/calendar/calendar.component.ts    |  4 +-
 .../components/detail/detail.component.ts     | 17 ++++----
 .../logging-filters.component.ts              | 15 ++++---
 .../monitoring-table.component.ts             |  2 +-
 .../app/modules/navbar/navbar.component.ts    | 34 ++++++++--------
 7 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index ec5a7b32c6..d187d19c57 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -26,11 +26,11 @@
     "@fortawesome/angular-fontawesome": "^0.5.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.31",
     "@fortawesome/free-solid-svg-icons": "^5.15.0",
-    "@fullcalendar/angular": "^4.2.2",
-    "@fullcalendar/bootstrap": "^4.2.2",
-    "@fullcalendar/daygrid": "^4.2.2",
-    "@fullcalendar/interaction": "^4.2.2",
-    "@fullcalendar/timegrid": "^4.2.2",
+    "@fullcalendar/angular": "^5.5.0",
+    "@fullcalendar/bootstrap": "^5.5.0",
+    "@fullcalendar/daygrid": "^5.5.0",
+    "@fullcalendar/interaction": "^5.5.0",
+    "@fullcalendar/timegrid": "^5.5.1",
     "@ng-bootstrap/ng-bootstrap": "5.3.0",
     "@ngrx/effects": "^8.6.1",
     "@ngrx/entity": "^8.6.1",
diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts
index 632832e3c7..b90b5eb351 100644
--- a/ui/main/src/app/modules/archives/archives.component.ts
+++ b/ui/main/src/app/modules/archives/archives.component.ts
@@ -8,24 +8,24 @@
  */
 
 
-import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Observable, Subject } from 'rxjs';
-import { AppState } from '@ofStore/index';
-import { ProcessesService } from '@ofServices/processes.service';
-import { Store } from '@ngrx/store';
-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 { 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 {Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {Observable, Subject} from 'rxjs';
+import {AppState} from '@ofStore/index';
+import {ProcessesService} from '@ofServices/processes.service';
+import {Store} from '@ngrx/store';
+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 {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';
 
 export enum FilterDateTypes {
     PUBLISH_DATE_FROM_PARAM = 'publishDateFrom',
@@ -37,7 +37,7 @@ export enum FilterDateTypes {
 
 export const checkElement = (enumeration: typeof FilterDateTypes, value: string): boolean => {
     let result = false;
-    if (Object.values(enumeration).includes(value)) {
+    if (Object.values(enumeration).map(enumValue => enumValue.toString()).includes(value)) {
         result = true;
     }
     return result;
@@ -75,7 +75,7 @@ export class ArchivesComponent implements OnDestroy, OnInit {
 
     // View card 
     modalRef: NgbModalRef;
-    @ViewChild('cardDetail', null) cardDetailTemplate: ElementRef;
+    @ViewChild('cardDetail') cardDetailTemplate: ElementRef;
     selectedCard : Card; 
 
     constructor(private store: Store<AppState>,
diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts
index 0a2b3b499b..94ccbc8a86 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.ts
+++ b/ui/main/src/app/modules/calendar/calendar.component.ts
@@ -37,8 +37,8 @@ import {HourAndMinutes} from '@ofModel/card.model';
 })
 export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
 
-  @ViewChild('calendar', null) calendarComponent: FullCalendarComponent; // the #calendar in the template
-  @ViewChild('cardDetail', null) cardDetailTemplate: ElementRef; // the #calendar in the template
+  @ViewChild('calendar') calendarComponent: FullCalendarComponent; // the #calendar in the template
+  @ViewChild('cardDetail') cardDetailTemplate: ElementRef; // the #calendar in the template
 
   private unsubscribe$ = new Subject<void>();
   calendarVisible = true;
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 1756a45aa7..824ef74fac 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
@@ -25,7 +25,7 @@ import {Card, CardForPublishing} from '@ofModel/card.model';
 import {ProcessesService} from '@ofServices/processes.service';
 import {HandlebarsService} from '../../services/handlebars.service';
 import {DomSanitizer, SafeHtml, SafeResourceUrl} from '@angular/platform-browser';
-import {AcknowledgmentAllowedEnum, Response} from '@ofModel/processes.model';
+import {AcknowledgmentAllowedEnum, Response, State as CardState} from '@ofModel/processes.model';
 import {DetailContext} from '@ofModel/detail-context.model';
 import {Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
@@ -45,12 +45,11 @@ import {ClearLightCardSelection, UpdateALightCard} from '@ofStore/actions/light-
 import {UserService} from '@ofServices/user.service';
 import {EntitiesService} from '@ofServices/entities.service';
 import {Entity} from '@ofModel/entity.model';
-import {NgbModal,NgbModalOptions,NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModal, NgbModalOptions, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
 import {ConfigService} from '@ofServices/config.service';
-import {State as CardState} from '@ofModel/processes.model';
-import { TimeService } from '@ofServices/time.service';
-import { AlertMessage } from '@ofStore/actions/alert.actions';
-import { MessageLevel } from '@ofModel/message.model';
+import {TimeService} from '@ofServices/time.service';
+import {AlertMessage} from '@ofStore/actions/alert.actions';
+import {MessageLevel} from '@ofModel/message.model';
 
 
 declare const templateGateway: any;
@@ -113,9 +112,9 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     @Input() parentModalRef: NgbModalRef;
     @Input() screenSize: string;
 
-    @ViewChild('cardDeletedWithNoErrorPopup', null) cardDeletedWithNoErrorPopupRef: TemplateRef<any>;
-    @ViewChild('impossibleToDeleteCardPopup', null) impossibleToDeleteCardPopupRef: TemplateRef<any>;
-    @ViewChild('userCard', null) userCardTemplate: TemplateRef<any>;
+    @ViewChild('cardDeletedWithNoErrorPopup') cardDeletedWithNoErrorPopupRef: TemplateRef<any>;
+    @ViewChild('impossibleToDeleteCardPopup') impossibleToDeleteCardPopupRef: TemplateRef<any>;
+    @ViewChild('userCard') userCardTemplate: TemplateRef<any>;
 
     public isActionEnabled = false;
     public lttdExpiredIsTrue: boolean;
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 231ccf35b1..9e40418ee9 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
@@ -15,13 +15,12 @@ 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 {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';
 
 
 export enum FilterDateTypes {
@@ -35,7 +34,7 @@ export enum FilterDateTypes {
 
 export const checkElement = (enumeration: typeof FilterDateTypes, value: string): boolean => {
     let result = false;
-    if (Object.values(enumeration).includes(value)) {
+    if (Object.values(enumeration).map(enumValue => enumValue.toString()).includes(value)) {
         result = true;
     }
     return result;
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 81114908db..2584d2b424 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
@@ -30,7 +30,7 @@ import {AppState} from '@ofStore/index';
 })
 export class MonitoringTableComponent implements OnDestroy {
 
-    @ViewChild('cardDetail', null) cardDetailTemplate: ElementRef;
+    @ViewChild('cardDetail') cardDetailTemplate: ElementRef;
     @Input() result: LineOfMonitoringResult[];
     exportMonitoringData: Array<any> = [];
     unsubscribe$: Subject<void> = new Subject<void>();
diff --git a/ui/main/src/app/modules/navbar/navbar.component.ts b/ui/main/src/app/modules/navbar/navbar.component.ts
index d3281f67b7..4ac6a183d0 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.ts
+++ b/ui/main/src/app/modules/navbar/navbar.component.ts
@@ -8,25 +8,25 @@
  */
 
 
-import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { navigationRoutes } from '../../app-routing.module';
-import { Store } from '@ngrx/store';
-import { TryToLogOut } from '@ofActions/authentication.actions';
-import { AppState } from '@ofStore/index';
-import { selectCurrentUrl } from '@ofSelectors/router.selectors';
-import { LoadMenu } from '@ofActions/menu.actions';
-import { selectMenuStateMenu } from '@ofSelectors/menu.selectors';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { Menu } from '@ofModel/menu.model';
-import { map, tap } from 'rxjs/operators';
+import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+import {navigationRoutes} from '../../app-routing.module';
+import {Store} from '@ngrx/store';
+import {TryToLogOut} from '@ofActions/authentication.actions';
+import {AppState} from '@ofStore/index';
+import {selectCurrentUrl} from '@ofSelectors/router.selectors';
+import {LoadMenu} from '@ofActions/menu.actions';
+import {selectMenuStateMenu} from '@ofSelectors/menu.selectors';
+import {BehaviorSubject, Observable} from 'rxjs';
+import {Menu} from '@ofModel/menu.model';
+import {map, tap} from 'rxjs/operators';
 import * as _ from 'lodash';
 import {GlobalStyleService} from '@ofServices/global-style.service';
 import {Route} from '@angular/router';
 import {ConfigService} from '@ofServices/config.service';
-import {QueryAllEntities} from "@ofActions/user.actions";
-import { UserService } from '@ofServices/user.service';
-import { NgbModal, NgbModalOptions, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { AppService } from '@ofServices/app.service';
+import {QueryAllEntities} from '@ofActions/user.actions';
+import {UserService} from '@ofServices/user.service';
+import {NgbModal, NgbModalOptions, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
+import {AppService} from '@ofServices/app.service';
 
 @Component({
     selector: 'of-navbar',
@@ -43,9 +43,9 @@ export class NavbarComponent implements OnInit {
   expandedMenu: boolean[] = [];
   
   modalRef: NgbModalRef;
-  @ViewChild('userCard', null) userCardTemplate: ElementRef;
+  @ViewChild('userCard') userCardTemplate: ElementRef;
 
-  @ViewChild('about', null) aboutTemplate: ElementRef;
+  @ViewChild('about') aboutTemplate: ElementRef;
 
   customLogo: string;
   height: number;

From c88d090827e1bd7956fc9c8c9e2f4202fd12e6ab Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Tue, 9 Feb 2021 16:49:12 +0100
Subject: [PATCH 35/62] [OC-1061] Mostly fixes calendar (css issues left)

---
 ui/main/angular.json                          |  3 -
 ui/main/package.json                          |  2 +
 .../modules/calendar/calendar.component.html  | 26 +------
 .../modules/calendar/calendar.component.scss  | 21 ++++--
 .../modules/calendar/calendar.component.ts    | 69 ++++++++++++-------
 .../app/modules/calendar/calendar.module.ts   | 15 +++-
 ui/main/src/polyfills.ts                      | 19 ++---
 7 files changed, 85 insertions(+), 70 deletions(-)

diff --git a/ui/main/angular.json b/ui/main/angular.json
index 2554ecee81..776f01043b 100755
--- a/ui/main/angular.json
+++ b/ui/main/angular.json
@@ -30,9 +30,6 @@
             ],
             "styles": [
               "node_modules/@fortawesome/fontawesome-free/css/all.css",
-              "node_modules/@fullcalendar/core/main.css",
-              "node_modules/@fullcalendar/daygrid/main.css",
-              "node_modules/@fullcalendar/timegrid/main.css",
               "node_modules/@fullcalendar/bootstrap/main.css",
               "node_modules/angular2-multiselect-dropdown/themes/default.theme.css",
               "src/assets/styles/style.css",
diff --git a/ui/main/package.json b/ui/main/package.json
index d187d19c57..22820c53aa 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -20,6 +20,7 @@
     "@angular/compiler": "^9.1.13",
     "@angular/core": "^9.1.13",
     "@angular/forms": "^9.1.13",
+    "@angular/localize": "^9.1.13",
     "@angular/platform-browser": "^9.1.13",
     "@angular/platform-browser-dynamic": "^9.1.13",
     "@angular/router": "^9.1.13",
@@ -27,6 +28,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.31",
     "@fortawesome/free-solid-svg-icons": "^5.15.0",
     "@fullcalendar/angular": "^5.5.0",
+    "@fullcalendar/core": "^5.5.0",
     "@fullcalendar/bootstrap": "^5.5.0",
     "@fullcalendar/daygrid": "^5.5.0",
     "@fullcalendar/interaction": "^5.5.0",
diff --git a/ui/main/src/app/modules/calendar/calendar.component.html b/ui/main/src/app/modules/calendar/calendar.component.html
index fa3eae4714..d3edb5709c 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.html
+++ b/ui/main/src/app/modules/calendar/calendar.component.html
@@ -7,30 +7,10 @@
 <!-- This file is part of the OperatorFabric project.                      -->
 
 
-    <div id="opfab-calendar" class='opfab-app-calendar' *ngIf="calendarVisible">
+    <div id="opfab-calendar" class="opfab-app-calendar" *ngIf="calendarVisible">
       <full-calendar
         #calendar
-        defaultView="dayGridMonth"
-        [header]="{
-          left: 'prev,today,next',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,timeGridDay'
-        }"
-        [plugins]="calendarPlugins"
-        [weekends]="true"
-        [scrollTime]="'00:00'"
-        [contentHeight]='748'
-        [timeGridEventMinHeight]='18'
-        [slotDuration] = "'01:00:00'"
-        [allDaySlot] = "false"
-        [selectable]="false"
-        [columnHeaderFormat]="{ weekday: 'long' }"
-        [events]="calendarEvents"
-        [locales]="locales"
-        [themeSystem]="themeSystem"
-        (datesRender)="datesRangeChange($event)"
-        (dateClick)="handleDateClick($event)"
-        (eventClick)="selectCard($event)"
+        [options]="calendarOptions"
       ></full-calendar>
 
 
@@ -43,4 +23,4 @@
           <of-card-details [parentModalRef] = "modalRef" [screenSize]="'lg'"> </of-card-details>
         </div>
       </div>
-  </ng-template>
\ No newline at end of file
+  </ng-template>
diff --git a/ui/main/src/app/modules/calendar/calendar.component.scss b/ui/main/src/app/modules/calendar/calendar.component.scss
index 77a8481a56..0e7555dfb1 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.scss
+++ b/ui/main/src/app/modules/calendar/calendar.component.scss
@@ -35,6 +35,12 @@ td.fc-today
   padding: 16px;
 }
 
+// This is necessary because from v5 days are links (even if navLinks : false) rather than spans so these properties
+  // are overridden by the style for links rather than inherited from the main OpFab look.
+.fc a:not([href]) {
+  color: var(--opfab-color);
+  text-decoration: none;
+}
 
 
 // EVENTS SETTINGS
@@ -43,6 +49,7 @@ td.fc-today
   border-width: 0 0 0 4px;
   border-radius: 0 4px 4px 0;
   background-color: var(--opfab-bgcolor);
+  min-height: 18px;
   font-size: 13px;
   color: var(--opfab-color); 
   }
@@ -69,14 +76,14 @@ td.fc-today
   
 // LINKS IN CALENDAR HEADER
 
-.fc-button-primary
+.fc .fc-button-primary, .fc .fc-button-primary:disabled
 {
   background-color: var(--opfab-bgcolor-darker);
   border-color: var(--opfab-bgcolor-darker);
   color:var(--opfab-text-color);
 }
 
-.fc-button-primary:not(:disabled).fc-button-active
+.fc .fc-button-primary:not(:disabled).fc-button-active
 {
   background-color: var(--opfab-bgcolor-darker);
   border-color:  var(--opfab-bgcolor-darker);
@@ -86,8 +93,8 @@ td.fc-today
 }
 
 
-.fc-next-button,
-.fc-prev-button{
+.fc .fc-next-button,
+.fc .fc-prev-button{
   margin-bottom: 7px;
 }
 
@@ -112,14 +119,14 @@ td.fc-today
 
 // MONTH VIEW
 .fc th,
-.fc-day-header,
+.fc-col-header-cell-cushion,
 .fc-widget-header
 {
   border-style: hidden;
 }
 
 // Day name in uppercase 
-.fc-day-header {
+.fc-col-header-cell-cushion {
   text-transform: uppercase;
 }
 
@@ -159,4 +166,4 @@ hr {
 
 // END DAY AND WEEK VIEW 
 
-}
\ No newline at end of file
+}
diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts
index 94ccbc8a86..a6166f2a00 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.ts
+++ b/ui/main/src/app/modules/calendar/calendar.component.ts
@@ -14,13 +14,9 @@ import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
 import {AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core';
-import {FullCalendarComponent} from '@fullcalendar/angular';
+import {CalendarOptions, FullCalendarComponent} from '@fullcalendar/angular';
 import {EventInput} from '@fullcalendar/core';
-import dayGridPlugin from '@fullcalendar/daygrid';
-import timeGrigPlugin from '@fullcalendar/timegrid';
-import interactionPlugin from '@fullcalendar/interaction';
 import allLocales from '@fullcalendar/core/locales-all';
-import bootstrapPlugin from '@fullcalendar/bootstrap';
 import {TranslateService} from '@ngx-translate/core';
 import {SelectLightCard} from '@ofActions/light-card.actions';
 import {LoadCard} from '@ofActions/card.actions';
@@ -38,16 +34,38 @@ import {HourAndMinutes} from '@ofModel/card.model';
 export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
 
   @ViewChild('calendar') calendarComponent: FullCalendarComponent; // the #calendar in the template
-  @ViewChild('cardDetail') cardDetailTemplate: ElementRef; // the #calendar in the template
+  @ViewChild('cardDetail') cardDetailTemplate: ElementRef; // the #cardDetail in the template
 
   private unsubscribe$ = new Subject<void>();
   calendarVisible = true;
-  calendarPlugins = [dayGridPlugin, timeGrigPlugin, interactionPlugin, bootstrapPlugin];
   locales = allLocales;
-  themeSystem = 'standard';
-  calendarEvents: EventInput[] = [];
+  calendarEvents: EventInput[];
   modalRef: NgbModalRef;
 
+  // allDaySlot is now specific to timeGrid views (since v4), so it generate an error in build if we specify that the type of calendarOptions is
+  // CalendarOptions... Yet it seems to be the correct way to set this property since it works as intended.
+  calendarOptions = {
+    initialView: 'dayGridMonth',
+    headerToolbar : {
+      left: 'prev,today,next',
+      center: 'title',
+      right: 'dayGridMonth,timeGridWeek,timeGridDay'
+    },
+    weekends: true,
+    scrollTime: '\'00:00\'',
+    contentHeight: '748',
+    slotDuration: '01:00:00',
+    allDaySlot: false,
+    selectable: false,
+    navLinks: false,
+    dayHeaderFormat: { weekday: 'long' },
+    events: this.calendarEvents,
+    locales: this.locales,
+    themeSystem: 'standard',
+    datesSet: this.datesRangeChange.bind(this),
+    eventClick: this.selectCard.bind(this)
+  };
+
 
   constructor(private store: Store<AppState>,
               private translate: TranslateService,
@@ -100,8 +118,8 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
                   endRecur: endDate,
                   className: ['opfab-calendar-event', 'opfab-calendar-event-' + card.severity.toLowerCase()],
                   daysOfWeek: timespan.recurrence ? timespan.recurrence.daysOfWeek.map(d => d % 7) : [],
-                  startTime: timespan.recurrence.hoursAndMinutes ? this.formatTwoDigits(timespan.recurrence.hoursAndMinutes.hours) + ':' + this.formatTwoDigits(timespan.recurrence.hoursAndMinutes.minutes) : null,
-                  endTime: timespan.recurrence.durationInMinutes ? this.getEndTime(timespan.recurrence.hoursAndMinutes, timespan.recurrence.durationInMinutes) : null
+                  startTime: timespan.recurrence.hoursAndMinutes ? CalendarComponent.formatTwoDigits(timespan.recurrence.hoursAndMinutes.hours) + ':' + CalendarComponent.formatTwoDigits(timespan.recurrence.hoursAndMinutes.minutes) : null,
+                  endTime: timespan.recurrence.durationInMinutes ? CalendarComponent.getEndTime(timespan.recurrence.hoursAndMinutes, timespan.recurrence.durationInMinutes) : null
                 });
               } else {
                 this.calendarEvents = this.calendarEvents.concat({ // add new event data. must create new array
@@ -120,19 +138,9 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
       }
       );
     }
-  }
-
-  private formatTwoDigits(time: number) {
-    return time < 10 ? '0' + time : time;
-  }
-
-  private getEndTime(hourAndMinutes: HourAndMinutes, duration: number) {
-    duration = Math.min(duration, 30);
-    return this.formatTwoDigits(hourAndMinutes.hours + Math.floor(duration / 60)) + ':' + this.formatTwoDigits(hourAndMinutes.minutes + duration % 60);
-  }
-
-  handleDateClick(arg) {
-
+    // It is necessary to reassign the updated events to the corresponding options property to trigger change detection
+    // See https://fullcalendar.io/docs/angular §Modifying properties
+    this.calendarOptions.events = this.calendarEvents;
   }
 
   selectCard(info) {
@@ -145,10 +153,10 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
 
   }
 
-  datesRangeChange(info) {
+  datesRangeChange(dateInfo) {
     this.store.dispatch(new ApplyFilter({
       name: FilterType.BUSINESSDATE_FILTER, active: true,
-      status: {start: info.view.activeStart.getTime(), end: info.view.activeEnd.getTime()}
+      status: {start: dateInfo.view.activeStart.getTime(), end: dateInfo.view.activeEnd.getTime()}
       }));
   }
 
@@ -157,4 +165,13 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
     this.unsubscribe$.complete();
   }
 
+  private static formatTwoDigits(time: number) {
+    return time < 10 ? '0' + time : time;
+  }
+
+  private static getEndTime(hourAndMinutes: HourAndMinutes, duration: number) {
+    duration = Math.min(duration, 30);
+    return CalendarComponent.formatTwoDigits(hourAndMinutes.hours + Math.floor(duration / 60)) + ':' + CalendarComponent.formatTwoDigits(hourAndMinutes.minutes + duration % 60);
+  }
+
 }
diff --git a/ui/main/src/app/modules/calendar/calendar.module.ts b/ui/main/src/app/modules/calendar/calendar.module.ts
index 3fddc3649b..b11dd74bd3 100644
--- a/ui/main/src/app/modules/calendar/calendar.module.ts
+++ b/ui/main/src/app/modules/calendar/calendar.module.ts
@@ -8,14 +8,23 @@
  */
 
 
-
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {CalendarComponent} from './calendar.component';
-import {FullCalendarModule } from '@fullcalendar/angular';
+import {FullCalendarModule} from '@fullcalendar/angular';
 import {CardsModule} from '../cards/cards.module';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import timeGridPlugin from '@fullcalendar/timegrid';
+import interactionPlugin from '@fullcalendar/interaction';
+import bootstrapPlugin from '@fullcalendar/bootstrap';
 
+FullCalendarModule.registerPlugins([
+  dayGridPlugin,
+  timeGridPlugin,
+  interactionPlugin,
+  bootstrapPlugin
+]);
 
 @NgModule({
   declarations: [CalendarComponent],
diff --git a/ui/main/src/polyfills.ts b/ui/main/src/polyfills.ts
index f661c7ea71..85d1361ed8 100644
--- a/ui/main/src/polyfills.ts
+++ b/ui/main/src/polyfills.ts
@@ -1,3 +1,14 @@
+/***************************************************************************************************
+ * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
+ */
+import '@angular/localize/init';
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+import 'core-js/es7/reflect';
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
 /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com)
  * See AUTHORS.txt
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -51,14 +62,6 @@
 /** IE10 and IE11 requires the following for the Reflect API. */
 // import 'core-js/es6/reflect';
 
-/** Evergreen browsers require these. **/
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js/dist/zone'; // Included with Angular CLI.
-
 
 /**
  * Web Animations `@angular/platform-browser/animations`

From efce0089110e9f152a407cf59ca0601b85ee006f Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Tue, 9 Feb 2021 21:38:13 +0100
Subject: [PATCH 36/62] [OC-1061] Applying post-update reco for v9

---
 ui/main/src/app/modules/admin/admin.module.ts   |  7 -------
 ui/main/src/app/modules/cards/cards.module.ts   |  1 -
 .../cards/services/handlebars.service.spec.ts   |  6 +++---
 .../tags-filter/tags-filter.component.spec.ts   |  4 ++--
 .../app/modules/login/login.component.spec.ts   |  2 +-
 .../list-setting/list-setting.component.spec.ts |  6 +++---
 .../text-setting/text-setting.component.spec.ts |  4 ++--
 .../type-ahead-settings.component.spec.ts       |  4 ++--
 .../light-card/light-card.component.spec.ts     |  7 ++++---
 ui/main/src/app/services/card.service.spec.ts   |  5 +++--
 ui/main/src/app/services/config.service.spec.ts |  4 ++--
 .../src/app/services/entities.service.spec.ts   |  4 ++--
 ui/main/src/app/services/export.service.spec.ts |  2 +-
 ui/main/src/app/services/filter.service.spec.ts |  4 ++--
 ui/main/src/app/services/groups.service.spec.ts |  4 ++--
 .../app/services/interceptors.service.spec.ts   |  4 ++--
 .../src/app/services/processes.service.spec.ts  |  4 ++--
 .../src/app/services/settings.service.spec.ts   |  4 ++--
 .../services/sound-notification.service.spec.ts |  4 ++--
 ui/main/src/app/services/time.service.spec.ts   |  4 ++--
 .../effects/authentication.effects.spec.ts      | 17 +++++++++--------
 .../effects/card-operation.effects.spec.ts      |  4 ++--
 ui/main/src/tests/helpers.ts                    | 12 ++++++++++++
 23 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts
index 99e5675865..cb7f29d8f1 100644
--- a/ui/main/src/app/modules/admin/admin.module.ts
+++ b/ui/main/src/app/modules/admin/admin.module.ts
@@ -39,13 +39,6 @@ import {MultiFilterModule} from '../share/multi-filter/multi-filter.module';
   ],
 
 
-  entryComponents: [
-    EditUserModalComponent,
-    ConfirmationDialogComponent,
-    EditEntityGroupModalComponent
-  ],
-
-
   imports: [
     FormsModule
     , ReactiveFormsModule
diff --git a/ui/main/src/app/modules/cards/cards.module.ts b/ui/main/src/app/modules/cards/cards.module.ts
index c277316651..9f1cd547ff 100644
--- a/ui/main/src/app/modules/cards/cards.module.ts
+++ b/ui/main/src/app/modules/cards/cards.module.ts
@@ -39,7 +39,6 @@ import {UserCardModule} from '../usercard/usercard.module';
         NO_ERRORS_SCHEMA
       ],
     providers: [HandlebarsService],
-    entryComponents: []
 })
 
 export class CardsModule {
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 8547e9d0ca..60657a41f2 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
@@ -64,11 +64,11 @@ describe('Handlebars Services', () => {
             ]
         });
         injector = getTestBed();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         spyOn(store, 'dispatch').and.callThrough();
         httpMock = injector.get(HttpTestingController);
-        handlebarsService = TestBed.get(HandlebarsService);
-        translate = TestBed.get(TranslateService)
+        handlebarsService = TestBed.inject(HandlebarsService);
+        translate = TestBed.inject(TranslateService)
     });
     afterEach(() => {
         httpMock.verify();
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.spec.ts b/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.spec.ts
index 7e13425482..c2867641ce 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.spec.ts
@@ -45,9 +45,9 @@ describe('TagsFilterComponent', () => {
     }));
 
     beforeEach(() => {
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         spyOn(store, 'dispatch').and.callThrough();
-        filterService = TestBed.get(FilterService);
+        filterService = TestBed.inject(FilterService);
         fixture = TestBed.createComponent(TagsFilterComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
diff --git a/ui/main/src/app/modules/login/login.component.spec.ts b/ui/main/src/app/modules/login/login.component.spec.ts
index 71779521e5..0985535b9f 100644
--- a/ui/main/src/app/modules/login/login.component.spec.ts
+++ b/ui/main/src/app/modules/login/login.component.spec.ts
@@ -64,7 +64,7 @@ describe('LoginComponent', () => {
             ]
         })
             .compileComponents();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         // store.select.and.callThrough();
         // avoid exceptions during construction and init of the component
     }));
diff --git a/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.spec.ts b/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.spec.ts
index d04ca7d5e8..3b374a373e 100644
--- a/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.spec.ts
+++ b/ui/main/src/app/modules/settings/components/settings/list-setting/list-setting.component.spec.ts
@@ -21,7 +21,7 @@ import {map} from "rxjs/operators";
 import {PatchSettings} from "@ofActions/settings.actions";
 import {TranslateModule, TranslateService} from "@ngx-translate/core";
 import {I18n} from "@ofModel/i18n.model";
-import {emptyAppState4Test} from "@tests/helpers";
+import {emptyAppState4Test, injectedSpy} from '@tests/helpers';
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
 import {authInitialState} from "@ofStates/authentication.state";
@@ -53,8 +53,8 @@ describe('ListSettingComponent', () => {
     }));
 
     beforeEach(() => {
-        translateService = TestBed.get(TranslateService);
-        mockStore = TestBed.get(Store);
+        translateService = TestBed.inject(TranslateService);
+        mockStore = injectedSpy(Store);
         mockStore.select.and.callFake(selector => {
             return of({
                 ...emptyAppState, settings: {
diff --git a/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.spec.ts b/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.spec.ts
index 9e5934569f..e065b8d5be 100644
--- a/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.spec.ts
+++ b/ui/main/src/app/modules/settings/components/settings/text-setting/text-setting.component.spec.ts
@@ -19,7 +19,7 @@ import {of} from "rxjs";
 import {settingsInitialState} from "@ofStates/settings.state";
 import {map} from "rxjs/operators";
 import {PatchSettings} from "@ofActions/settings.actions";
-import {emptyAppState4Test} from "@tests/helpers";
+import {emptyAppState4Test, injectedSpy} from '@tests/helpers';
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
 import {authInitialState} from "@ofStates/authentication.state";
@@ -49,7 +49,7 @@ describe('TextSettingComponent', () => {
     }));
 
     beforeEach(() => {
-        mockStore = TestBed.get(Store);
+        mockStore = injectedSpy(Store);
         mockStore.select.and.callFake(selector => {
             return of({
                 ...emptyAppState, settings: {
diff --git a/ui/main/src/app/modules/settings/components/settings/type-ahead-settings/type-ahead-settings.component.spec.ts b/ui/main/src/app/modules/settings/components/settings/type-ahead-settings/type-ahead-settings.component.spec.ts
index 020ceb844e..64da9e1567 100644
--- a/ui/main/src/app/modules/settings/components/settings/type-ahead-settings/type-ahead-settings.component.spec.ts
+++ b/ui/main/src/app/modules/settings/components/settings/type-ahead-settings/type-ahead-settings.component.spec.ts
@@ -20,7 +20,7 @@ import {of} from "rxjs";
 import {settingsInitialState} from "@ofStates/settings.state";
 import {map} from "rxjs/operators";
 import {PatchSettings} from "@ofActions/settings.actions";
-import {emptyAppState4Test} from "@tests/helpers";
+import {emptyAppState4Test, injectedSpy} from '@tests/helpers';
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
 import {authInitialState} from "@ofStates/authentication.state";
@@ -51,7 +51,7 @@ describe('TypeAheadSettingsComponent', () => {
     }));
 
     beforeEach(() => {
-        store = TestBed.get(Store);
+        store = injectedSpy(Store);
         store.select.and.callFake(selector => {
             return of({
                 ...emptyAppState, settings: {
diff --git a/ui/main/src/app/modules/share/light-card/light-card.component.spec.ts b/ui/main/src/app/modules/share/light-card/light-card.component.spec.ts
index bc7b2668be..f6105000fb 100644
--- a/ui/main/src/app/modules/share/light-card/light-card.component.spec.ts
+++ b/ui/main/src/app/modules/share/light-card/light-card.component.spec.ts
@@ -13,7 +13,7 @@ import {async, ComponentFixture, getTestBed, TestBed} from '@angular/core/testin
 
 
 import {LightCardComponent} from './light-card.component';
-import {BusinessconfigI18nLoaderFactory} from '@tests/helpers';
+import {BusinessconfigI18nLoaderFactory, injectedSpy} from '@tests/helpers';
 import {RouterTestingModule} from '@angular/router/testing';
 import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
 import {Store, StoreModule} from '@ngrx/store';
@@ -30,6 +30,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 import SpyObj = jasmine.SpyObj;
 import createSpyObj = jasmine.createSpyObj;
 import {CountDownModule} from '../countdown/countdown.module';
+import {CardService} from '@ofServices/card.service';
 
 export function countdownConfigFactory(): CountdownConfig {
     return { format: `mm:ss` };
@@ -76,7 +77,7 @@ describe('LightCardComponent', () => {
                 {provide: 'TimeEventSource', useValue: null},
                 TimeService, I18nService
             ]}).compileComponents();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         spyOn(store, 'dispatch').and.callThrough();
         // avoid exceptions during construction and init of the component
         injector = getTestBed();
@@ -92,7 +93,7 @@ describe('LightCardComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(LightCardComponent);
         lightCardDetailsComp = fixture.debugElement.componentInstance;
-        router = TestBed.get(Router);
+        router = injectedSpy(Router);
     });
     it('should handle non existent timestamp with an empty string', () => {
         const expectedEmptyString = lightCardDetailsComp.handleDate(undefined);
diff --git a/ui/main/src/app/services/card.service.spec.ts b/ui/main/src/app/services/card.service.spec.ts
index cb1802621e..e07aa382e4 100644
--- a/ui/main/src/app/services/card.service.spec.ts
+++ b/ui/main/src/app/services/card.service.spec.ts
@@ -18,6 +18,7 @@ import {StoreModule} from "@ngrx/store";
 import {appReducer} from "@ofStore/index";
 import SpyObj = jasmine.SpyObj;
 import createSpyObj = jasmine.createSpyObj;
+import {injectedSpy} from '@tests/helpers';
 
 
 describe('CardService', () => {
@@ -40,7 +41,7 @@ describe('CardService', () => {
                 ,GuidService
             ]
         });
-        httpMock = TestBed.get(HttpTestingController);
-        authenticationService = TestBed.get(AuthenticationService);
+        httpMock = TestBed.inject(HttpTestingController);
+        authenticationService = injectedSpy(AuthenticationService);
     });
 });
diff --git a/ui/main/src/app/services/config.service.spec.ts b/ui/main/src/app/services/config.service.spec.ts
index b084899a3b..1db919f59e 100644
--- a/ui/main/src/app/services/config.service.spec.ts
+++ b/ui/main/src/app/services/config.service.spec.ts
@@ -41,12 +41,12 @@ describe('Businessconfig Services', () => {
             ]
         });
         injector = getTestBed();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         // spyOn(store, 'dispatch').and.callThrough();
         // avoid exceptions during construction and init of the component
         // spyOn(store, 'select').and.callFake(() => of('/test/url'));
         httpMock = injector.get(HttpTestingController);
-        configService = TestBed.get(ConfigService);
+        configService = TestBed.inject(ConfigService);
         store.dispatch(new AcceptLogIn(new PayloadForSuccessfulAuthentication('test-user',null,null,null)))
     });
     afterEach(() => {
diff --git a/ui/main/src/app/services/entities.service.spec.ts b/ui/main/src/app/services/entities.service.spec.ts
index 20721f33e0..60eea88aa3 100644
--- a/ui/main/src/app/services/entities.service.spec.ts
+++ b/ui/main/src/app/services/entities.service.spec.ts
@@ -26,8 +26,8 @@ describe('EntitiesService', () => {
         StoreModule.forRoot(appReducer)
       ],
     });
-    httpMock = TestBed.get(HttpTestingController);
-    entitiesService = TestBed.get(EntitiesService);
+    httpMock = TestBed.inject(HttpTestingController);
+    entitiesService = TestBed.inject(EntitiesService);
   });
   afterEach(() => {
     httpMock.verify();
diff --git a/ui/main/src/app/services/export.service.spec.ts b/ui/main/src/app/services/export.service.spec.ts
index 3524467003..2ee87475ae 100644
--- a/ui/main/src/app/services/export.service.spec.ts
+++ b/ui/main/src/app/services/export.service.spec.ts
@@ -25,7 +25,7 @@ describe('ExportService', () => {
       providers: [ExportService]
 
     });
-    service = TestBed.get(ExportService);
+    service = TestBed.inject(ExportService);
 
   });
   it('should be created', () => {
diff --git a/ui/main/src/app/services/filter.service.spec.ts b/ui/main/src/app/services/filter.service.spec.ts
index 622d8d9607..1b3a6cb1bd 100644
--- a/ui/main/src/app/services/filter.service.spec.ts
+++ b/ui/main/src/app/services/filter.service.spec.ts
@@ -61,8 +61,8 @@ describe('FilterService', () => {
             imports: [
                 StoreModule.forRoot(appReducer),]
         });
-        service = TestBed.get(FilterService);
-        store = TestBed.get(Store);
+        service = TestBed.inject(FilterService);
+        store = TestBed.inject(Store);
 
     });
 
diff --git a/ui/main/src/app/services/groups.service.spec.ts b/ui/main/src/app/services/groups.service.spec.ts
index c02140d17a..2b7b759bf7 100644
--- a/ui/main/src/app/services/groups.service.spec.ts
+++ b/ui/main/src/app/services/groups.service.spec.ts
@@ -22,8 +22,8 @@ describe('GroupsService', () => {
       imports:[  HttpClientTestingModule],
 
   });
-  httpMock = TestBed.get(HttpTestingController);
-  service = TestBed.get(GroupsService);
+  httpMock = TestBed.inject(HttpTestingController);
+  service = TestBed.inject(GroupsService);
   });
   it('should be created', () => {
     expect(service).toBeTruthy();
diff --git a/ui/main/src/app/services/interceptors.service.spec.ts b/ui/main/src/app/services/interceptors.service.spec.ts
index cd3e2e9498..788fea5581 100644
--- a/ui/main/src/app/services/interceptors.service.spec.ts
+++ b/ui/main/src/app/services/interceptors.service.spec.ts
@@ -13,7 +13,7 @@ import {inject, TestBed} from '@angular/core/testing';
 import {TokenInjector} from '@ofServices/interceptors.service';
 import {HttpRequest} from '@angular/common/http';
 import {AuthenticationService} from '@ofServices/authentication/authentication.service';
-import {getRandomAlphanumericValue} from '@tests/helpers';
+import {getRandomAlphanumericValue, injectedSpy} from '@tests/helpers';
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
 
@@ -28,7 +28,7 @@ describe('Interceptor', () => {
                 {provide: AuthenticationService, useValue: authenticationServiceSpy},
             ]
         });
-        authenticationService = TestBed.get(AuthenticationService);
+        authenticationService = injectedSpy(AuthenticationService);
         authenticationServiceSpy.getSecurityHeader.and.returnValue({'Authorization': `Bearer dummyToken`});
     });
 
diff --git a/ui/main/src/app/services/processes.service.spec.ts b/ui/main/src/app/services/processes.service.spec.ts
index 6e2f69b4e9..8d6675fab6 100644
--- a/ui/main/src/app/services/processes.service.spec.ts
+++ b/ui/main/src/app/services/processes.service.spec.ts
@@ -56,12 +56,12 @@ describe('Processes Services', () => {
             ]
         });
         injector = getTestBed();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         spyOn(store, 'dispatch').and.callThrough();
         // avoid exceptions during construction and init of the component
         // spyOn(store, 'select').and.callFake(() => of('/test/url'));
         httpMock = injector.get(HttpTestingController);
-        processesService = TestBed.get(ProcessesService);
+        processesService = TestBed.inject(ProcessesService);
         translateService = injector.get(TranslateService);
         translateService.addLangs(['en', 'fr']);
         translateService.setDefaultLang('en');
diff --git a/ui/main/src/app/services/settings.service.spec.ts b/ui/main/src/app/services/settings.service.spec.ts
index e168d6755b..f880a402da 100644
--- a/ui/main/src/app/services/settings.service.spec.ts
+++ b/ui/main/src/app/services/settings.service.spec.ts
@@ -40,12 +40,12 @@ describe('Businessconfig Services', () => {
             ]
         });
         injector = getTestBed();
-        store = TestBed.get(Store);
+        store = TestBed.inject(Store);
         // spyOn(store, 'dispatch').and.callThrough();
         // avoid exceptions during construction and init of the component
         // spyOn(store, 'select').and.callFake(() => of('/test/url'));
         httpMock = injector.get(HttpTestingController);
-        settingsService = TestBed.get(SettingsService);
+        settingsService = TestBed.inject(SettingsService);
         store.dispatch(new AcceptLogIn(new PayloadForSuccessfulAuthentication('test-user',null,null,null)))
     });
     afterEach(() => {
diff --git a/ui/main/src/app/services/sound-notification.service.spec.ts b/ui/main/src/app/services/sound-notification.service.spec.ts
index ee297995c5..9bfa44a8ac 100644
--- a/ui/main/src/app/services/sound-notification.service.spec.ts
+++ b/ui/main/src/app/services/sound-notification.service.spec.ts
@@ -56,12 +56,12 @@ describe('SoundNotificationService', () => {
       providers: [SoundNotificationService
       ]
     });
-    service = TestBed.get(SoundNotificationService);
+    service = TestBed.inject(SoundNotificationService);
     playSound = spyOn(service, 'playSound').and.callThrough();
   });
 
   it('should be created', () => {
-    const service: SoundNotificationService = TestBed.get(SoundNotificationService);
+    const service: SoundNotificationService = TestBed.inject(SoundNotificationService);
     expect(service).toBeTruthy();
   });
 
diff --git a/ui/main/src/app/services/time.service.spec.ts b/ui/main/src/app/services/time.service.spec.ts
index cc954cb3b9..42c9134395 100644
--- a/ui/main/src/app/services/time.service.spec.ts
+++ b/ui/main/src/app/services/time.service.spec.ts
@@ -36,8 +36,8 @@ describe('TimeService', () => {
                     ],
         });
 
-        httpMock = TestBed.get(HttpTestingController);
-        service = TestBed.get(TimeService);
+        httpMock = TestBed.inject(HttpTestingController);
+        service = TestBed.inject(TimeService);
     });
 
     afterEach(()=>{
diff --git a/ui/main/src/app/store/effects/authentication.effects.spec.ts b/ui/main/src/app/store/effects/authentication.effects.spec.ts
index 99099d9513..b29b3aab07 100644
--- a/ui/main/src/app/store/effects/authentication.effects.spec.ts
+++ b/ui/main/src/app/store/effects/authentication.effects.spec.ts
@@ -41,6 +41,7 @@ import SpyObj = jasmine.SpyObj;
 import createSpyObj = jasmine.createSpyObj;
 import { TranslateModule, TranslateService} from "@ngx-translate/core";
 import { ConfigService } from '@ofServices/config.service';
+import {injectedSpy} from '@tests/helpers';
 
 describe('AuthenticationEffects', () => {
     let actions$: Observable<any>;
@@ -86,19 +87,19 @@ describe('AuthenticationEffects', () => {
             ]
         });
 
-        effects = TestBed.get(AuthenticationEffects);
-        translate = TestBed.get(TranslateService);
+        effects = TestBed.inject(AuthenticationEffects);
+        translate = TestBed.inject(TranslateService);
        
 
     }));
 
     beforeEach(() => {
-        actions$ = TestBed.get(Actions);
-        authenticationService = TestBed.get(AuthenticationService);
-        cardService = TestBed.get(CardService);
-        router = TestBed.get(Router);
-        mockStore = TestBed.get(Store);
-        configService = TestBed.get(ConfigService);
+        actions$ = TestBed.inject(Actions);
+        authenticationService = injectedSpy(AuthenticationService);
+        cardService = injectedSpy(CardService);
+        router = injectedSpy(Router);
+        mockStore = injectedSpy(Store);
+        configService = injectedSpy(ConfigService);
     });
 
     it('should be created', () => {
diff --git a/ui/main/src/app/store/effects/card-operation.effects.spec.ts b/ui/main/src/app/store/effects/card-operation.effects.spec.ts
index 045dfb4161..62f0e0642d 100644
--- a/ui/main/src/app/store/effects/card-operation.effects.spec.ts
+++ b/ui/main/src/app/store/effects/card-operation.effects.spec.ts
@@ -54,8 +54,8 @@ describe('CardOperationEffects', () => {
         });
 
 
-        store = TestBed.get(Store);
-        effects = TestBed.get(CardOperationEffects);
+        store = TestBed.inject(Store) as MockStore<AppState>;
+        effects = TestBed.inject(CardOperationEffects);
     }));
 
     describe( 'refreshIfSelectedCard', () => {
diff --git a/ui/main/src/tests/helpers.ts b/ui/main/src/tests/helpers.ts
index 9d7288d9e6..a28ae4f608 100644
--- a/ui/main/src/tests/helpers.ts
+++ b/ui/main/src/tests/helpers.ts
@@ -22,6 +22,9 @@ import {GuidService} from '@ofServices/guid.service';
 import {OAuthLogger, OAuthService, UrlHelperService} from 'angular-oauth2-oidc';
 import {TranslateLoader} from '@ngx-translate/core';
 import { Observable, of } from 'rxjs';
+import {Type} from '@angular/core';
+import SpyObj = jasmine.SpyObj;
+import {TestBed} from '@angular/core/testing';
 
 export const emptyAppState4Test: AppState = {
     router: null,
@@ -325,3 +328,12 @@ export function BusinessconfigI18nLoaderFactory(): TranslateLoader {
     return new BusinessconfigI18nLoader();
 }
 
+/** This function helps get around the fact that TestBed.inject() which replaces TestBed.get in Angular v9 is type-safe, so it returns the
+ * type of the actual object, which often clashes with the expected type (mock or spy) of the variable. We can't use the "real" type on the
+ * variable because we usually need to access methods from the spy or mock.
+ * It generate errors such as "Type 'Store<any>' is not assignable to type 'SpyObj<Store<AppState>>'".
+ * See https://github.com/angular/angular/issues/35944
+ * */
+export function injectedSpy<S>(service: Type<S>): SpyObj<S> {
+    return TestBed.inject(service) as SpyObj<S>;
+}

From c2cc89623d471b5da8dba1fc19c621117c4b1f6e Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 10 Feb 2021 09:11:14 +0100
Subject: [PATCH 37/62] [OC-1061] Updating outdated dependencies ng build test
 serve ok

---
 ui/main/package.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index 22820c53aa..743c7e3fb1 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -25,11 +25,11 @@
     "@angular/platform-browser-dynamic": "^9.1.13",
     "@angular/router": "^9.1.13",
     "@fortawesome/angular-fontawesome": "^0.5.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.31",
-    "@fortawesome/free-solid-svg-icons": "^5.15.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fullcalendar/angular": "^5.5.0",
-    "@fullcalendar/core": "^5.5.0",
     "@fullcalendar/bootstrap": "^5.5.0",
+    "@fullcalendar/core": "^5.5.0",
     "@fullcalendar/daygrid": "^5.5.0",
     "@fullcalendar/interaction": "^5.5.0",
     "@fullcalendar/timegrid": "^5.5.1",
@@ -47,22 +47,22 @@
     "ag-grid-community": "^25.0.1",
     "angular-oauth2-oidc": "^8.0.4",
     "angular2-multiselect-dropdown": "4.6.3",
-    "bootstrap": "^4.5.2",
-    "core-js": "^2.6.3",
+    "bootstrap": "^4.6.0",
+    "core-js": "^2.6.12",
     "file-saver": "^2.0.2",
     "guid-typescript": "^1.0.9",
     "handlebars": "^4.7.6",
     "jwt-decode": "^2.2.0",
     "lodash": "^4.17.20",
     "moment": "^2.29.0",
-    "moment-timezone": "^0.5.31",
+    "moment-timezone": "^0.5.33",
     "ng-event-source": "^1.0.14",
     "ngx-bootstrap": "^5.6.1",
     "ngx-countdown": "^10.0.1",
     "ngx-type-ahead": "^2.0.1",
     "rxjs": "^6.6.3",
     "svg-pan-zoom": "^3.6.1",
-    "tslib": "^1.10.0",
+    "tslib": "^1.14.1",
     "xlsx": "^0.16.7",
     "zone.js": "~0.10.2"
   },
@@ -73,13 +73,13 @@
     "@angular/language-service": "^9.1.13",
     "@babel/compat-data": "~7.8.0",
     "@compodoc/compodoc": "^1.1.10",
-    "@fortawesome/fontawesome-free": "^5.15.0",
+    "@fortawesome/fontawesome-free": "^5.15.2",
     "@ngrx/schematics": "^8.6.1",
     "@types/file-saver": "^2.0.1",
     "@types/handlebars": "^4.0.40",
     "@types/jasmine": "~3.3.7",
     "@types/jasminewd2": "~2.0.6",
-    "@types/lodash": "^4.14.161",
+    "@types/lodash": "^4.14.168",
     "@types/moment": "^2.13.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^5.1.2",

From 27eb19b6d91413ab46d551e77ac33588ab40da1f Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 10 Feb 2021 09:44:43 +0100
Subject: [PATCH 38/62] [OC-1061] Updating conflicting deps before v10

---
 ui/main/package.json                             | 16 ++++++++--------
 .../store/reducers/light-card.reducer.spec.ts    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index 743c7e3fb1..4bf6c20eba 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -24,7 +24,7 @@
     "@angular/platform-browser": "^9.1.13",
     "@angular/platform-browser-dynamic": "^9.1.13",
     "@angular/router": "^9.1.13",
-    "@fortawesome/angular-fontawesome": "^0.5.0",
+    "@fortawesome/angular-fontawesome": "^0.7.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fullcalendar/angular": "^5.5.0",
@@ -33,12 +33,12 @@
     "@fullcalendar/daygrid": "^5.5.0",
     "@fullcalendar/interaction": "^5.5.0",
     "@fullcalendar/timegrid": "^5.5.1",
-    "@ng-bootstrap/ng-bootstrap": "5.3.0",
-    "@ngrx/effects": "^8.6.1",
-    "@ngrx/entity": "^8.6.1",
-    "@ngrx/router-store": "^8.6.1",
-    "@ngrx/store": "^8.6.1",
-    "@ngrx/store-devtools": "^8.6.1",
+    "@ng-bootstrap/ng-bootstrap": "^8.0.4",
+    "@ngrx/effects": "^9.2.1",
+    "@ngrx/entity": "^9.2.1",
+    "@ngrx/router-store": "^9.2.1",
+    "@ngrx/store": "^9.2.1",
+    "@ngrx/store-devtools": "^9.2.1",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
     "@swimlane/ngx-charts": "^13.0.4",
@@ -74,7 +74,7 @@
     "@babel/compat-data": "~7.8.0",
     "@compodoc/compodoc": "^1.1.10",
     "@fortawesome/fontawesome-free": "^5.15.2",
-    "@ngrx/schematics": "^8.6.1",
+    "@ngrx/schematics": "^9.2.1",
     "@types/file-saver": "^2.0.1",
     "@types/handlebars": "^4.0.40",
     "@types/jasmine": "~3.3.7",
diff --git a/ui/main/src/app/store/reducers/light-card.reducer.spec.ts b/ui/main/src/app/store/reducers/light-card.reducer.spec.ts
index 2581037b21..5706099bdf 100644
--- a/ui/main/src/app/store/reducers/light-card.reducer.spec.ts
+++ b/ui/main/src/app/store/reducers/light-card.reducer.spec.ts
@@ -59,7 +59,7 @@ describe('LightCard Reducer', () => {
 
             const severalRandomLightCards = getSeveralRandomLightCards(5);
 
-            const previousState = lightCardEntityAdapter.addAll(severalRandomLightCards, feedInitialState);
+            const previousState = lightCardEntityAdapter.setAll(severalRandomLightCards, feedInitialState);
 
             const currentError = new Error(getRandomAlphanumericValue(5, 12));
             const loadLightCardsFailureAction = new LoadLightCardsFailure({error: currentError});
@@ -77,7 +77,7 @@ describe('LightCard Reducer', () => {
     describe('EmptyLightCards', () => {
         it('should empty entities', () => {
             const severalRandomLightCards = getSeveralRandomLightCards(5);
-            const previousState = lightCardEntityAdapter.addAll(severalRandomLightCards, feedInitialState);
+            const previousState = lightCardEntityAdapter.setAll(severalRandomLightCards, feedInitialState);
             const actualState = reducer(previousState, new EmptyLightCards());
             expect(actualState).toBeTruthy();
             expect(actualState.loading).toEqual(false);
@@ -101,7 +101,7 @@ describe('LightCard Reducer', () => {
     describe('AddLightCardFailure', () => {
         it('should leave state unchanged with an additional message message', () => {
             const severalRandomLightCards = getSeveralRandomLightCards(5);
-            const previousState = lightCardEntityAdapter.addAll(severalRandomLightCards, feedInitialState);
+            const previousState = lightCardEntityAdapter.setAll(severalRandomLightCards, feedInitialState);
 
             const currentError = new Error(getRandomAlphanumericValue(5, 12));
             const addLightCardFailureAction = new AddLightCardFailure({error: currentError});

From 7ed023518751a827b228ca8aa99e092ef3cd8444 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 10 Feb 2021 10:21:53 +0100
Subject: [PATCH 39/62] [OC-1061] Fixing tsconfig.json before v10

---
 ui/main/tsconfig.json | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ui/main/tsconfig.json b/ui/main/tsconfig.json
index 4f935743bc..0f020b37a1 100755
--- a/ui/main/tsconfig.json
+++ b/ui/main/tsconfig.json
@@ -14,15 +14,7 @@
       "@ofStates/*": ["app/store/states/*"],
       "@ofServices/*": ["app/services/*"],
       "@ofModel/*": ["app/model/*"],
-      "@tests/*": ["tests/*"],
-//      "moment": [
-//        "../node_modules/moment/min/moment.min.js",
-//        "../node_modules/moment/locale/fr.js",
-//        "../node_modules/moment/locale/en-gb.js"
-//      ],
-//      "moment-timezone": [
-//        "../node_modules/moment-timezone/builds/moment-timezone-with-data-2012-2022.min.js"
-//      ]
+      "@tests/*": ["tests/*"]
     },
     "outDir": "./dist/out-tsc",
     "sourceMap": true,

From 0680c522f714787b8b0b34aff3af9aca387c2eef Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 10 Feb 2021 10:55:03 +0100
Subject: [PATCH 40/62] [OC-1061] Angular automatic update to v10 - KO with
 assets issue

---
 ui/main/package.json                          | 46 +++++++++----------
 .../modules/calendar/calendar.component.ts    |  4 +-
 ui/main/tsconfig.json                         |  2 +-
 ui/main/tslint.json                           |  1 -
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/ui/main/package.json b/ui/main/package.json
index 4bf6c20eba..e06f2eee7a 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -14,16 +14,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^9.1.13",
+    "@angular/animations": "^10.2.4",
     "@angular/cdk": "^8.2.3",
-    "@angular/common": "^9.1.13",
-    "@angular/compiler": "^9.1.13",
-    "@angular/core": "^9.1.13",
-    "@angular/forms": "^9.1.13",
-    "@angular/localize": "^9.1.13",
-    "@angular/platform-browser": "^9.1.13",
-    "@angular/platform-browser-dynamic": "^9.1.13",
-    "@angular/router": "^9.1.13",
+    "@angular/common": "^10.2.4",
+    "@angular/compiler": "^10.2.4",
+    "@angular/core": "^10.2.4",
+    "@angular/forms": "^10.2.4",
+    "@angular/localize": "^10.2.4",
+    "@angular/platform-browser": "^10.2.4",
+    "@angular/platform-browser-dynamic": "^10.2.4",
+    "@angular/router": "^10.2.4",
     "@fortawesome/angular-fontawesome": "^0.7.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
@@ -62,15 +62,15 @@
     "ngx-type-ahead": "^2.0.1",
     "rxjs": "^6.6.3",
     "svg-pan-zoom": "^3.6.1",
-    "tslib": "^1.14.1",
+    "tslib": "^2.0.0",
     "xlsx": "^0.16.7",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.14",
-    "@angular/cli": "^9.1.14",
-    "@angular/compiler-cli": "^9.1.13",
-    "@angular/language-service": "^9.1.13",
+    "@angular-devkit/build-angular": "~0.1002.2",
+    "@angular/cli": "^10.2.2",
+    "@angular/compiler-cli": "^10.2.4",
+    "@angular/language-service": "^10.2.4",
     "@babel/compat-data": "~7.8.0",
     "@compodoc/compodoc": "^1.1.10",
     "@fortawesome/fontawesome-free": "^5.15.2",
@@ -83,22 +83,22 @@
     "@types/moment": "^2.13.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^5.1.2",
-    "jasmine-core": "^3.6.0",
+    "jasmine-core": "~3.5.0",
     "jasmine-marbles": "^0.6.0",
-    "jasmine-spec-reporter": "^4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "jasmine-sse": "^0.2.0",
-    "karma": "^5.2.2",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.4",
-    "karma-jasmine": "^2.0.1",
-    "karma-jasmine-html-reporter": "^1.5.4",
+    "karma": "~5.0.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "karma-junit-reporter": "^1.2.0",
     "karma-mocha-reporter": "^2.2.5",
     "ngrx-store-freeze": "^0.2.4",
     "npm-audit-html": "^1.4.3",
     "ts-mockito": "^2.6.1",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.8.3"
+    "tslint": "~6.1.0",
+    "typescript": "~4.0.6"
   }
 }
diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts
index a6166f2a00..683f2c78a4 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.ts
+++ b/ui/main/src/app/modules/calendar/calendar.component.ts
@@ -14,7 +14,7 @@ import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import * as feedSelectors from '@ofSelectors/feed.selectors';
 import {AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core';
-import {CalendarOptions, FullCalendarComponent} from '@fullcalendar/angular';
+import {FullCalendarComponent} from '@fullcalendar/angular';
 import {EventInput} from '@fullcalendar/core';
 import allLocales from '@fullcalendar/core/locales-all';
 import {TranslateService} from '@ngx-translate/core';
@@ -39,7 +39,7 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
   private unsubscribe$ = new Subject<void>();
   calendarVisible = true;
   locales = allLocales;
-  calendarEvents: EventInput[];
+  calendarEvents: EventInput[] = [];
   modalRef: NgbModalRef;
 
   // allDaySlot is now specific to timeGrid views (since v4), so it generate an error in build if we specify that the type of calendarOptions is
diff --git a/ui/main/tsconfig.json b/ui/main/tsconfig.json
index 0f020b37a1..1e72714aca 100755
--- a/ui/main/tsconfig.json
+++ b/ui/main/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "baseUrl": "./src",
     "importHelpers": true,
-    "module": "esnext",
+    "module": "es2020",
     "allowSyntheticDefaultImports": true,
     "paths": {
       "@env/*": ["environments/*"],
diff --git a/ui/main/tslint.json b/ui/main/tslint.json
index a34d89a3c4..48e1beeeab 100755
--- a/ui/main/tslint.json
+++ b/ui/main/tslint.json
@@ -71,7 +71,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

From 6a9048cd203e2e87534606adb8fb2d6b9f123199 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Wed, 10 Feb 2021 11:19:35 +0100
Subject: [PATCH 41/62] [OC-1061] Fixing assets issue - build test serve OK
 with warnings

---
 .../components/detail/detail.component.scss      | 10 +++++-----
 .../feed-filter/feed-filter.component.scss       |  4 ++--
 .../filters/feed-sort/feed-sort.component.scss   |  2 +-
 .../app/modules/navbar/info/info.component.scss  |  2 +-
 .../src/app/modules/navbar/navbar.component.scss | 16 ++++++++--------
 ui/main/src/assets/styles/styles.scss            |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.scss b/ui/main/src/app/modules/cards/components/detail/detail.component.scss
index b273034df3..eb62d56561 100644
--- a/ui/main/src/app/modules/cards/components/detail/detail.component.scss
+++ b/ui/main/src/app/modules/cards/components/detail/detail.component.scss
@@ -64,19 +64,19 @@
 }
 
 .opfab-icon-edit {
-  mask: url(assets/images/icons/edit.svg);
+  mask: url(../../../../../assets/images/icons/edit.svg);
 }
 
 .opfab-icon-trash {
-  mask: url(assets/images/icons/trash.svg);
+  mask: url(../../../../../assets/images/icons/trash.svg);
 }
 
 .opfab-icon-maximize {
-  mask: url(assets/images/icons/maximize.svg);
+  mask: url(../../../../../assets/images/icons/maximize.svg);
 }
 
 .opfab-icon-reduce {
-  mask: url(assets/images/icons/reduce.svg);
+  mask: url(../../../../../assets/images/icons/reduce.svg);
 }
 
 .opfab-right-menu-item {
@@ -151,7 +151,7 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask: url(assets/images/icons/help.svg);
+  mask: url(../../../../../assets/images/icons/help.svg);
 }
 
 .opfab-question-card-state-name{
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
index a3c95e5306..bc8d70722b 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.scss
@@ -77,7 +77,7 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask: url(assets/images/icons/filter.svg);
+  mask: url(../../../../../../../assets/images/icons/filter.svg);
 }
 
 .opfab-icon-filter-active {
@@ -88,7 +88,7 @@
   margin-right: 10px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask: url(assets/images/icons/filter-active.svg);
+  mask: url(../../../../../../../assets/images/icons/filter-active.svg);
 }
 
 .opfab-icon-filter:hover {
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
index 52d5bd5b1d..3e98d29674 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-sort/feed-sort.component.scss
@@ -26,7 +26,7 @@
   margin-right: 5px;
   border-width: 0px;
   background: var( --opfab-navbar-color-hover);
-  mask: url(assets/images/icons/sort.svg);
+  mask: url(../../../../../../../assets/images/icons/sort.svg);
 }
 
 .opfab-icon-sort:hover {
diff --git a/ui/main/src/app/modules/navbar/info/info.component.scss b/ui/main/src/app/modules/navbar/info/info.component.scss
index 6bb1cb416a..06681fc56c 100644
--- a/ui/main/src/app/modules/navbar/info/info.component.scss
+++ b/ui/main/src/app/modules/navbar/info/info.component.scss
@@ -33,5 +33,5 @@
   margin-left: auto;
   margin-right: auto;
   background: var( --opfab-text-color); 
-  mask: url(assets/images/icons/profile.svg);
+  mask: url(../../../../assets/images/icons/profile.svg);
 }
diff --git a/ui/main/src/app/modules/navbar/navbar.component.scss b/ui/main/src/app/modules/navbar/navbar.component.scss
index bccc4647b0..a4bf350333 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.scss
+++ b/ui/main/src/app/modules/navbar/navbar.component.scss
@@ -119,27 +119,27 @@
 }
 
 .opfab-menu-icon-parameters {
-  mask: url(assets/images/icons/parameters.svg);
+  mask: url(../../../assets/images/icons/parameters.svg);
 }
 
 .opfab-menu-icon-notification {
-  mask: url(assets/images/icons/notification.svg);
+  mask: url(../../../assets/images/icons/notification.svg);
 }
 
 .opfab-menu-icon-about {
-  mask: url(assets/images/icons/about.svg);
+  mask: url(../../../assets/images/icons/about.svg);
 }
 
 .opfab-menu-icon-logout {
-  mask: url(assets/images/icons/logout.svg);
+  mask: url(../../../assets/images/icons/logout.svg);
 }
 
 .opfab-menu-icon-admin {
-  mask: url(assets/images/icons/administration.svg);
+  mask: url(../../../assets/images/icons/administration.svg);
 }
 
 .opfab-menu-icon-dark-light {
-  mask: url(assets/images/icons/dark-light.svg);
+  mask: url(../../../assets/images/icons/dark-light.svg);
 }
 
 .opfab-menu-icon-newcard {
@@ -149,7 +149,7 @@
   margin-right: 10px;
   margin-top: -5px;
   background: var( --opfab-text-color); 
-  mask: url(assets/images/icons/newcard.svg);
+  mask: url(../../../assets/images/icons/newcard.svg);
 }
 
 
@@ -160,7 +160,7 @@
   margin-right: 10px;
   margin-top: -5px;
   background: var( --opfab-text-color); 
-  mask: url(assets/images/icons/calendar.svg);
+  mask: url(../../../assets/images/icons/calendar.svg);
 }
 
 .opfab-menu-icon-calendar.active {
diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss
index 1351d9b223..2eba12e22e 100644
--- a/ui/main/src/assets/styles/styles.scss
+++ b/ui/main/src/assets/styles/styles.scss
@@ -116,7 +116,7 @@ body {
   margin-right: 10px;
   margin-top: 10px;
   background: var( --opfab-text-color);
-  mask: url(assets/images/icons/export-data.svg);
+  mask: url(../images/icons/export-data.svg);
 }
 // END BUTTON STYLE 
 

From ff6f4ca163f8e374393968ea03e50ae6170b46c4 Mon Sep 17 00:00:00 2001
From: freddidierRTE <frederic-f.didier@rte-france.com>
Date: Wed, 10 Feb 2021 18:23:55 +0100
Subject: [PATCH 42/62] [OC-1470] Fix CSS for calendar after Angular migration

Signed-off-by: freddidierRTE <frederic-f.didier@rte-france.com>
---
 .../modules/calendar/calendar.component.scss  | 63 +++++++++++++++----
 .../modules/calendar/calendar.component.ts    |  8 +--
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/ui/main/src/app/modules/calendar/calendar.component.scss b/ui/main/src/app/modules/calendar/calendar.component.scss
index 0e7555dfb1..f7bbfdc207 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.scss
+++ b/ui/main/src/app/modules/calendar/calendar.component.scss
@@ -11,11 +11,11 @@
 
 ::ng-deep .opfab-app-calendar{
 
-
 // GLOBAL SETTINGS 
 .fc-header-toolbar,
 .fc-view,
-td.fc-today
+.fc .fc-daygrid-day.fc-day-today,   // no specific bgcolor for today 
+.fc .fc-timegrid-col.fc-day-today  // no specific bgcolor for today 
 {
   background-color: var(--opfab-bgcolor-darker);
 }
@@ -117,13 +117,26 @@ td.fc-today
 }
 
 
+
 // MONTH VIEW
 .fc th,
-.fc-col-header-cell-cushion,
-.fc-widget-header
+.fc .fc-scrollgrid
 {
   border-style: hidden;
 }
+// remove grid border on header 
+.fc-scrollgrid-section-header td
+{
+   border-style: hidden;
+}
+
+// Current Day 
+.fc-daygrid .fc-daygrid-day.fc-day-today
+{
+  border-width: 2px;
+  border-color: #2268FF;
+}
+
 
 // Day name in uppercase 
 .fc-col-header-cell-cushion {
@@ -131,8 +144,8 @@ td.fc-today
 }
 
 // Day number on the top left of the cell  
-.fc-ltr .fc-dayGrid-view .fc-day-top .fc-day-number{
-  float: left;
+.fc .fc-daygrid-day-top{
+  flex-direction: row;
 }
 
 .fc th
@@ -140,23 +153,47 @@ td.fc-today
   height: 40px;
 }
 
-.fc tbody td{
+.fc-daygrid tbody td{
   border-left-width: 0;
   border-bottom-width: 1px;
-  border-top-width: 1px;
+  border-top-width: 0px;
+}
+
+
+// change the color of default bullet point 
+.opfab-calendar-event-action .fc-daygrid-event-dot  {
+  border-color: $sev-action;
 }
+
+.opfab-calendar-event-alarm  .fc-daygrid-event-dot {
+  border-color: $sev-alarm;
+}
+
+.opfab-calendar-event-compliant .fc-daygrid-event-dot  {
+  border-color: $sev-compliant;
+}
+
+.opfab-calendar-event-information .fc-daygrid-event-dot  {
+  border-color: $sev-information;
+}
+
 // END MONTH VIEW 
 
 // DAY AND WEEK VIEW 
-.fc-time-grid  td
+.fc .fc-timegrid-slot
 {
-  height: 27px;
+  height: 28px;
 }
 
-// remove border for certain event 
-.fc-time-grid-event-inset
+// to see border right for current day in week view
+.fc-timegrid-cols .fc-day-today {
+  border-width: 2px;
+}
+
+// text color in event  
+.fc-v-event .fc-event-main
 {
-  box-shadow: none;
+  color: var(--opfab-color);
 }
 
 // remove line on bottom
diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts
index 683f2c78a4..a06b96fcde 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.ts
+++ b/ui/main/src/app/modules/calendar/calendar.component.ts
@@ -53,7 +53,7 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
     },
     weekends: true,
     scrollTime: '\'00:00\'',
-    contentHeight: '748',
+    contentHeight: 750,
     slotDuration: '01:00:00',
     allDaySlot: false,
     selectable: false,
@@ -78,14 +78,10 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit {
 
   ngAfterViewInit() {
     this.setLocale();
-    this.resizeCalendar();
-  }
 
-  @HostListener('window:resize')
-  resizeCalendar() {
-    this.calendarComponent.getApi().setOption('height', window.innerHeight - 150);
   }
 
+
   private setLocale() {
     this.store.select(buildSettingsOrConfigSelector('locale'))
       .pipe(takeUntil(this.unsubscribe$))

From 9e6783b3db40bd82ca032a7cb7c5b1863efa7cfa Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Thu, 11 Feb 2021 13:35:07 +0100
Subject: [PATCH 43/62] [OC-1474] Fix style of administration edit/create
 modals

---
 .../users/edit-user-modal.component.html      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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 c3d58250b0..ee1eef3c9c 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
@@ -24,11 +24,11 @@
           <div *ngIf="!row" class="opfab-input row">
             <label for="login" translate>admin.input.user.login</label>
             <input oninput="this.value = this.value.toLowerCase()" formControlName="login" name="login" id="login" type="text">
-            <div *ngIf="login.invalid" class="row alert alert-danger">
-              <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
-              <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
-              <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
-            </div>
+          </div>
+          <div *ngIf="login.invalid" class="row alert alert-danger">
+            <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
+            <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
+            <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
           </div>
 
           <div class="opfab-input row">
@@ -62,13 +62,14 @@
         </div>
       </div>
     </form>
-  </div>
-  <div class="modal-footer" style="border-top: none">
-    <button id="opfab-admin-user-btn-close" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
-            translate>admin.input.close</button>
-    <button id="opfab-admin-user-btn-add" [disabled]="!userForm.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
-            translate>admin.input.user.add</button>
-    <button id="opfab-admin-user-btn-save" [disabled]="!userForm.valid" *ngIf="row" (click)="update()" class="opfab-btn"
-            translate>admin.input.save</button>
+
+    <div class="modal-footer" style="border-top: none">
+      <button id="opfab-admin-user-btn-close" type="button" (click)="dismissModal('Cancel click')" class="opfab-btn-cancel" data-dismiss="modal"
+              translate>admin.input.close</button>
+      <button id="opfab-admin-user-btn-add" [disabled]="!userForm.valid" *ngIf="!row" (click)="update()" class="opfab-btn"
+              translate>admin.input.user.add</button>
+      <button id="opfab-admin-user-btn-save" [disabled]="!userForm.valid" *ngIf="row" (click)="update()" class="opfab-btn"
+              translate>admin.input.save</button>
+    </div>
   </div>
 </div>

From d3f868eec91f51debfec0b8e12c4804d336de6b8 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Thu, 11 Feb 2021 13:30:04 +0100
Subject: [PATCH 44/62] [OC-1475] Fix Groups dropdown for users edit/create
 modal in admin

---
 ui/main/src/app/app.component.ts              |  3 ---
 .../src/app/modules/admin/admin.component.ts  | 22 ++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ui/main/src/app/app.component.ts b/ui/main/src/app/app.component.ts
index 75f7f2f5ca..490dd70559 100644
--- a/ui/main/src/app/app.component.ts
+++ b/ui/main/src/app/app.component.ts
@@ -145,9 +145,6 @@ export class AppComponent implements OnInit {
             .subscribe(() => {
               this.loaded = true;
               this.reminderService.startService(identifier);
-              // This can only be done once the main initialization above is complete as user data is necessary to determine if the user
-              // has the required admin privileges.
-              if (this.userService.isCurrentUserAdmin()) this.groupsService.loadAllGroupsData();
             });
         }
       });
diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index 5f1a3137a0..62115a974a 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -9,18 +9,23 @@
  */
 
 
-import {Component, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {Store} from '@ngrx/store';
 import {TranslateService} from '@ngx-translate/core';
 import {AppState} from '@ofStore/index';
+import {GroupsService} from '@ofServices/groups.service';
+import {Subject} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
 
 @Component({
   selector: 'of-admin',
   templateUrl: './admin.component.html',
   styleUrls: ['./admin.component.scss']
 })
-export class AdminComponent implements OnInit {
+export class AdminComponent implements OnInit, OnDestroy {
+
+  unsubscribe$: Subject<void> = new Subject<void>();
 
   activeTab: string;
 
@@ -28,12 +33,19 @@ export class AdminComponent implements OnInit {
   public paginationPageSizeOptions = [5, 10, 25, 50, 100];
   public paginationPageSize = this.paginationDefaultPageSize;
 
-  constructor(private route: ActivatedRoute, protected store: Store<AppState>, protected translate: TranslateService) {
+  constructor(private route: ActivatedRoute,
+              protected store: Store<AppState>,
+              protected translate: TranslateService,
+              private groupsService: GroupsService) {
   }
 
   ngOnInit() {
     const url = this.route.snapshot.url.join('').trim();
     this.activeTab = (url.length !== 0) ? url : 'users';
+
+    // Initialization necessary for groups 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();
   }
 
   setActiveTab(tab: string): void {
@@ -46,4 +58,8 @@ export class AdminComponent implements OnInit {
     this.paginationPageSize = Number(value);
   }
 
+  ngOnDestroy() {
+    this.unsubscribe$.next();
+    this.unsubscribe$.complete();
+  }
 }

From 74226cb1e46f4373a27005606c75243f1d12c774 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Wed, 10 Feb 2021 11:28:26 +0100
Subject: [PATCH 45/62] [OC-1347] Fix bug with value keepChilCards default
 value

---
 .../model/CardPublicationData.java            |  9 +++++
 .../services/CardProcessingService.java       |  3 +-
 .../services/CardProcessServiceShould.java    | 23 ++++++++++-
 src/test/api/karate/cards/cards.feature       | 38 ++++++++++++++++++-
 4 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
index 5d8c893d35..2399c13e8e 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java
@@ -161,4 +161,13 @@ public LightCardPublicationData toLightCard() {
             result.timeSpansSet(new HashSet<>(this.getTimeSpans()));
         return result.build();
     }
+
+
+    public Boolean getKeepChildCards() {
+        return keepChildCards;
+    }
+
+    public void setKeepChildCards(Boolean keepChildCards) {
+        this.keepChildCards = keepChildCards != null ? keepChildCards : false;
+    }
 }
diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java
index 321055c822..8fcfa0f9a7 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.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
@@ -71,6 +71,7 @@ private Mono<CardCreationReportData> processCards(Flux<CardPublicationData> push
 
         long windowStart = Instant.now().toEpochMilli();
 
+        
         //delete child cards process should be prior to cards updates
         Flux<CardPublicationData> cards = deleteChildCardsProcess(pushedCards);
         cards = registerRecipientProcess(cards);
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 d186cd8c51..db572ae3a4 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
@@ -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
@@ -1034,4 +1034,25 @@ void isUserAllowedToDeleteThisCard() {
         assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity4, currentUserWithPerimeters)).isTrue();
         assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity5, currentUserWithPerimeters)).isTrue();
     }
+
+    @Test
+    void processKeepChildCardsNull() {
+        EasyRandom easyRandom = instantiateRandomCardGenerator();
+        int numberOfCards = 1;
+        List<CardPublicationData> cards = instantiateSeveralRandomCards(easyRandom, numberOfCards);
+        cards.get(0).setParentCardId(null);
+        cards.get(0).setInitialParentCardUid(null);
+        cards.get(0).setKeepChildCards(null);
+        cardProcessingService.processCards(Flux.just(cards.toArray(new CardPublicationData[numberOfCards])))
+                        .subscribe();
+
+        Long block = cardRepository.count().block();
+        Assertions.assertThat(block).withFailMessage(
+                        "The number of registered cards should be '%d' but is " + "'%d' actually",
+                        numberOfCards, block).isEqualTo(numberOfCards);
+
+        CardPublicationData firstCard = cardRepository.findById(cards.get(0).getId()).block();
+        Assertions.assertThat(firstCard.getKeepChildCards()).isNotNull();
+        Assertions.assertThat(firstCard.getKeepChildCards()).isFalse();
+    }
 }
diff --git a/src/test/api/karate/cards/cards.feature b/src/test/api/karate/cards/cards.feature
index 1d4930d86c..41ee7d9027 100644
--- a/src/test/api/karate/cards/cards.feature
+++ b/src/test/api/karate/cards/cards.feature
@@ -509,4 +509,40 @@ Scenario: Push a card for a user with no group and no entity
     And header Authorization = 'Bearer ' + authTokenUserWithNoGroupNoEntity
     When method get
     Then status 200
-    And match response.data.message == 'a message for user with no group and no entity'
\ No newline at end of file
+    And match response.data.message == 'a message for user with no group and no entity'
+
+
+Scenario: Push card with null keepChilCards
+
+    * def parentCard2 =
+"""
+{
+	"publisher" : "api_test",
+	"processVersion" : "1",
+	"process"  :"api_test",
+	"processInstanceId" : "processKeepChildCardsNull",
+	"state": "messageState",
+	"groupRecipients": ["Dispatcher"],
+	"severity" : "INFORMATION",
+	"startDate" : 1553186770681,
+    "keepChildCards": null,
+	"summary" : {"key" : "defaultProcess.summary"},
+	"title" : {"key" : "defaultProcess.title2"},
+	"data" : {"message":"test externalRecipients"}
+}
+"""
+
+# Push parent card
+    Given url opfabPublishCardUrl + 'cards'
+    And request parentCard2
+    When method post
+    Then status 201
+    And match response.count == 1
+    And match response.message == "All pushedCards were successfully handled"
+
+#get parent card id
+    Given url opfabUrl + 'cards/cards/api_test.processKeepChildCardsNull'
+    And header Authorization = 'Bearer ' + authToken
+    When method get
+    Then status 200
+    And match response.card.keepChildCards == false

From 48167a0708bf594a9c653a91559579b4b1cea3fd Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Thu, 11 Feb 2021 17:17:07 +0100
Subject: [PATCH 46/62] [OC-1458] Fixing delete message for entities and groups
 in admin

---
 .../edit-entity-group-modal.component.ts               |  2 +-
 ...min-table.component.ts => admin-table.directive.ts} | 10 +++++-----
 .../admin/components/table/entities-table.component.ts |  4 ++--
 .../admin/components/table/groups-table.component.ts   |  4 ++--
 .../admin/components/table/users-table.component.ts    |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename ui/main/src/app/modules/admin/components/table/{admin-table.component.ts => admin-table.directive.ts} (95%)

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/groups-entities/edit-entity-group-modal.component.ts
index d2596bd760..8865ef3b18 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/groups-entities/edit-entity-group-modal.component.ts
@@ -14,7 +14,7 @@ import {FormControl, FormGroup, Validators} from '@angular/forms';
 import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
 import {EntitiesService} from '@ofServices/entities.service';
 import {GroupsService} from '@ofServices/groups.service';
-import {AdminTableType} from '../../table/admin-table.component';
+import {AdminTableType} from '../../table/admin-table.directive';
 
 @Component({
   selector: 'of-edit-entity-group-modal',
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts
similarity index 95%
rename from ui/main/src/app/modules/admin/components/table/admin-table.component.ts
rename to ui/main/src/app/modules/admin/components/table/admin-table.directive.ts
index ab2155a7a9..497ca59c5a 100644
--- a/ui/main/src/app/modules/admin/components/table/admin-table.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/admin-table.directive.ts
@@ -8,7 +8,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {Directive, Injectable, Input, OnInit} from '@angular/core';
+import {Directive, Injectable, Input, OnChanges, 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';
@@ -20,9 +20,9 @@ import {CrudService} from '@ofServices/crud-service';
 
 @Directive()
 @Injectable()
-export abstract class AdminTableComponent implements OnInit {
+export abstract class AdminTableDirective implements OnInit, OnChanges {
 
-  // These fields will be initialized in the concrete classes extending `AdminTableComponent`
+  // 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;
@@ -106,7 +106,7 @@ export abstract class AdminTableComponent implements OnInit {
   onGridReady(params) {
     this.gridApi = params.api;
     // Column definitions can't be managed in the constructor like the other grid options because they rely on the `fields`
-    // property that is defined in the classes implementing AdminTableComponent. As such, it is still undefined when the
+    // property that is defined in the classes implementing AdminTableDirective. As such, it is still undefined when the
     // constructor from the supertype is called.
     this.gridApi.setColumnDefs(this.createColumnDefs(this.fields, this.tableType + '.'));
     this.gridApi.paginationSetPageSize(this.paginationPageSize);
@@ -167,7 +167,7 @@ export abstract class AdminTableComponent implements OnInit {
   openDeleteConfirmationDialog(row: any): any {
     this.confirmationDialogService.confirm(
         this.translateService.instant('admin.input.confirm'),
-        this.translateService.instant('admin.input.user.confirmDelete') + ' ' + row[this.idField] + '?',
+        this.translateService.instant('admin.input.' + this.tableType + '.confirmDelete') + ' ' + row[this.idField] + '?',
         'OK', // TODO Refactor to avoid translate.instant ? OK is not i18ed ?
         this.translateService.instant('admin.input.cancel')
     ).then((confirmed) => {
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 bb7971660e..8f0965c313 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
@@ -11,7 +11,7 @@
 import {Component, OnInit} from '@angular/core';
 import {CrudService} from "@ofServices/crud-service";
 import {HttpClient} from "@angular/common/http";
-import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
 import {EntitiesService} from "@ofServices/entities.service";
 import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
 
@@ -20,7 +20,7 @@ import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-e
   providers:  [{provide: CrudService, useClass: EntitiesService, deps: [HttpClient]}],
   selector: 'of-entities-table'
 })
-export class EntitiesTableComponent extends AdminTableComponent implements OnInit {
+export class EntitiesTableComponent extends AdminTableDirective implements OnInit {
 
   tableType = AdminTableType.ENTITY;
   fields = ['id', 'name', 'description'];
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 671a958ce1..a38925c84b 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
@@ -11,7 +11,7 @@
 import {Component, OnInit} from '@angular/core';
 import {CrudService} from "@ofServices/crud-service";
 import {HttpClient} from "@angular/common/http";
-import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
 import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
 import {GroupsService} from "@ofServices/groups.service";
 
@@ -20,7 +20,7 @@ import {GroupsService} from "@ofServices/groups.service";
   providers:  [{provide: CrudService, useClass: GroupsService, deps: [HttpClient]}],
   selector: 'of-groups-table'
 })
-export class GroupsTableComponent extends AdminTableComponent implements OnInit {
+export class GroupsTableComponent extends AdminTableDirective implements OnInit {
 
   tableType = AdminTableType.GROUP;
   fields = ['id', 'name', 'description'];
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 871933df1a..02f73a561d 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
@@ -13,14 +13,14 @@ import {UserService} from '@ofServices/user.service';
 import {EditUserModalComponent} from '../editmodal/users/edit-user-modal.component';
 import {CrudService} from "@ofServices/crud-service";
 import {HttpClient} from "@angular/common/http";
-import {AdminTableComponent, AdminTableType} from "./admin-table.component";
+import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
 
 @Component({
   templateUrl: 'admin-table.component.html',
   providers:  [{provide: CrudService, useClass: UserService, deps: [HttpClient]}],
   selector: 'of-users-table'
 })
-export class UsersTableComponent extends AdminTableComponent implements OnInit {
+export class UsersTableComponent extends AdminTableDirective implements OnInit {
 
   tableType = AdminTableType.USER;
   fields = ['login', 'firstName', 'lastName', 'groups', 'entities'];

From d296c9934c5c96088c386c6b39dd1684f1613ee6 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Thu, 11 Feb 2021 11:07:16 +0100
Subject: [PATCH 47/62] [OC-1468] Addressing CommonJs dependencies warnings

---
 ui/main/angular.json                                      | 7 +++++++
 ui/main/package.json                                      | 6 +++---
 ui/main/src/app/modules/about/about.component.ts          | 4 ++--
 .../filters/feed-filter/feed-filter.component.ts          | 2 +-
 .../filters/tags-filter/tags-filter.component.ts          | 2 +-
 .../custom-timeline-chart.component.spec.ts               | 3 +--
 .../time-line/init-chart/init-chart.component.ts          | 2 +-
 ui/main/src/app/modules/navbar/navbar.component.ts        | 2 +-
 .../settings/base-setting/base-setting.component.ts       | 3 +--
 .../app/services/authentication/authentication.service.ts | 4 ++--
 ui/main/src/app/services/config.service.ts                | 7 +++----
 ui/main/src/app/services/entities.service.ts              | 3 +--
 ui/main/src/app/services/export.service.ts                | 8 ++++----
 ui/main/src/app/services/filter.service.ts                | 2 +-
 ui/main/src/app/services/groups.service.ts                | 3 +--
 ui/main/src/app/services/processes.service.spec.ts        | 5 ++---
 ui/main/src/app/services/user.service.ts                  | 5 ++---
 .../src/app/store/selectors/authentication.selectors.ts   | 3 +--
 ui/main/src/app/store/selectors/settings.selectors.ts     | 2 +-
 .../app/store/selectors/settings.x.config.selectors.ts    | 4 ++--
 ui/main/tsconfig.json                                     | 5 ++++-
 21 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/ui/main/angular.json b/ui/main/angular.json
index 776f01043b..7b42920801 100755
--- a/ui/main/angular.json
+++ b/ui/main/angular.json
@@ -39,6 +39,13 @@
               "node_modules/svg-pan-zoom/dist/svg-pan-zoom.js",
               "src/assets/js/templateGateway.js",
               "src/assets/js/Chart.min.js"
+            ],
+            "allowedCommonJsDependencies": [
+              "rxjs/internal/Subject",
+              "@tweenjs/tween.js",
+              "xlsx",
+              "file-saver",
+              "moment-timezone"
             ]
           },
           "configurations": {
diff --git a/ui/main/package.json b/ui/main/package.json
index e06f2eee7a..3ddbdb2c41 100755
--- a/ui/main/package.json
+++ b/ui/main/package.json
@@ -49,11 +49,11 @@
     "angular2-multiselect-dropdown": "4.6.3",
     "bootstrap": "^4.6.0",
     "core-js": "^2.6.12",
-    "file-saver": "^2.0.2",
+    "file-saver-es": "^2.0.5",
     "guid-typescript": "^1.0.9",
     "handlebars": "^4.7.6",
-    "jwt-decode": "^2.2.0",
-    "lodash": "^4.17.20",
+    "jwt-decode": "^3.1.2",
+    "lodash-es": "^4.17.20",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.33",
     "ng-event-source": "^1.0.14",
diff --git a/ui/main/src/app/modules/about/about.component.ts b/ui/main/src/app/modules/about/about.component.ts
index d21b616798..eb5b7996aa 100644
--- a/ui/main/src/app/modules/about/about.component.ts
+++ b/ui/main/src/app/modules/about/about.component.ts
@@ -9,8 +9,8 @@
 
 
 import {Component, OnInit} from '@angular/core';
-import _ from 'lodash';
-import {ConfigService} from "@ofServices/config.service";
+import _ from 'lodash-es';
+import {ConfigService} from '@ofServices/config.service';
 
 
 /**
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
index 49cb6f3fab..b70bdc95ff 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/feed-filter/feed-filter.component.ts
@@ -15,7 +15,7 @@ import {AppState} from '@ofStore/index';
 import {AbstractControl, FormControl, FormGroup} from '@angular/forms';
 import {debounce, debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';
 import {ApplyFilter} from '@ofActions/feed.actions';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 import {FilterType} from '@ofServices/filter.service';
 
 import {DateTimeNgb, getDateTimeNgbFromMoment} from '@ofModel/datetime-ngb.model';
diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.ts b/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.ts
index bc765f3bb8..97efa44783 100644
--- a/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.ts
+++ b/ui/main/src/app/modules/feed/components/card-list/filters/tags-filter/tags-filter.component.ts
@@ -17,7 +17,7 @@ import {buildFilterSelector} from '@ofSelectors/feed.selectors';
 import {FilterType} from '@ofServices/filter.service';
 import {debounce, distinctUntilChanged, first, takeUntil} from 'rxjs/operators';
 import {Filter} from '@ofModel/feed-filter.model';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 import {ApplyFilter} from '@ofActions/feed.actions';
 
 @Component({
diff --git a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
index dd502271e5..a56f65b084 100644
--- a/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
+++ b/ui/main/src/app/modules/feed/components/time-line/custom-timeline-chart/custom-timeline-chart.component.spec.ts
@@ -14,10 +14,9 @@ import {APP_BASE_HREF, CommonModule} from '@angular/common';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {FormsModule} from '@angular/forms';
 import {NgxChartsModule} from '@swimlane/ngx-charts';
-import {DebugElement, NO_ERRORS_SCHEMA} from '@angular/core';
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import * as moment from 'moment';
 import {MouseWheelDirective} from '../directives/mouse-wheel.directive';
-import * as _ from 'lodash';
 import {Store, StoreModule} from '@ngrx/store';
 import {RouterStateSerializer, StoreRouterConnectingModule} from '@ngrx/router-store';
 import {CustomRouterStateSerializer} from '@ofStates/router.state';
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 aa827b787e..a0baeab192 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
@@ -9,7 +9,7 @@
 
 
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 import * as moment from 'moment';
 import {Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
diff --git a/ui/main/src/app/modules/navbar/navbar.component.ts b/ui/main/src/app/modules/navbar/navbar.component.ts
index 4ac6a183d0..e9568ce068 100644
--- a/ui/main/src/app/modules/navbar/navbar.component.ts
+++ b/ui/main/src/app/modules/navbar/navbar.component.ts
@@ -19,7 +19,7 @@ import {selectMenuStateMenu} from '@ofSelectors/menu.selectors';
 import {BehaviorSubject, Observable} from 'rxjs';
 import {Menu} from '@ofModel/menu.model';
 import {map, tap} from 'rxjs/operators';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 import {GlobalStyleService} from '@ofServices/global-style.service';
 import {Route} from '@angular/router';
 import {ConfigService} from '@ofServices/config.service';
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.component.ts
index 2aac2d6057..1bea7b6c10 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.component.ts
@@ -8,7 +8,6 @@
  */
 
 
-
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
 import {AppState} from '@ofStore/index';
 import {Store} from '@ngrx/store';
@@ -17,7 +16,7 @@ import {buildSettingsSelector} from '@ofSelectors/settings.selectors';
 import {Subject, timer} from 'rxjs';
 import {debounce, distinctUntilChanged, filter, first, map, takeUntil} from 'rxjs/operators';
 import {FormGroup} from '@angular/forms';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 import {selectIdentifier} from '@ofSelectors/authentication.selectors';
 
 @Component({
diff --git a/ui/main/src/app/services/authentication/authentication.service.ts b/ui/main/src/app/services/authentication/authentication.service.ts
index 2ac0e249e1..7edb95997d 100644
--- a/ui/main/src/app/services/authentication/authentication.service.ts
+++ b/ui/main/src/app/services/authentication/authentication.service.ts
@@ -27,8 +27,8 @@ import {GuidService} from '@ofServices/guid.service';
 import {AppState} from '@ofStore/index';
 import {Store} from '@ngrx/store';
 import {ConfigService} from '@ofServices/config.service';
-import * as jwt_decode from 'jwt-decode';
-import * as _ from 'lodash';
+import jwt_decode from 'jwt-decode';
+import * as _ from 'lodash-es';
 import {User} from '@ofModel/user.model';
 import {EventType as OAuthType, JwksValidationHandler, OAuthEvent, OAuthService} from 'angular-oauth2-oidc';
 import {implicitAuthenticationConfigFallback} from '@ofServices/authentication/auth-implicit-flow.config';
diff --git a/ui/main/src/app/services/config.service.ts b/ui/main/src/app/services/config.service.ts
index 8137da84a3..2df8cac319 100644
--- a/ui/main/src/app/services/config.service.ts
+++ b/ui/main/src/app/services/config.service.ts
@@ -8,16 +8,15 @@
  */
 
 
-
 import {Injectable} from '@angular/core';
-import {map, mergeMap,} from 'rxjs/operators';
-import * as _ from 'lodash';
+import {map, mergeMap} from 'rxjs/operators';
+import * as _ from 'lodash-es';
 import {Observable, of, throwError} from 'rxjs';
 import {HttpClient} from '@angular/common/http';
 import {Store} from '@ngrx/store';
 import {AppState} from '@ofStore/index';
 import {environment} from '@env/environment';
-import { Locale, Menu, MenuConfig } from '@ofModel/menu.model';
+import {Locale, Menu, MenuConfig} from '@ofModel/menu.model';
 
 @Injectable()
 export class ConfigService {
diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts
index 9363cf3e28..7540680a10 100644
--- a/ui/main/src/app/services/entities.service.ts
+++ b/ui/main/src/app/services/entities.service.ts
@@ -10,10 +10,9 @@
 import {environment} from '@env/environment';
 import {HttpClient} from '@angular/common/http';
 import {CrudService} from './crud-service';
-import {catchError, tap} from 'rxjs/operators';
+import {catchError, takeUntil, tap} from 'rxjs/operators';
 import {Observable, Subject} from 'rxjs';
 import {Entity} from '@ofModel/entity.model';
-import {takeUntil} from 'rxjs/internal/operators/takeUntil';
 import {Injectable} from '@angular/core';
 
 
diff --git a/ui/main/src/app/services/export.service.ts b/ui/main/src/app/services/export.service.ts
index 28a4a47b1d..1c1cb56d9f 100644
--- a/ui/main/src/app/services/export.service.ts
+++ b/ui/main/src/app/services/export.service.ts
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: MPL-2.0
  * This file is part of the OperatorFabric project.
  */
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 import * as XLSX from 'xlsx';
-import FileSaver from 'file-saver';
+import {saveAs} from 'file-saver-es';
 
 const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
 const EXCEL_EXTENSION = '.xlsx';
@@ -31,7 +31,7 @@ export class ExportService {
     const data: Blob = new Blob([buffer], {
       type: EXCEL_TYPE
     });
-    FileSaver.saveAs(data, fileName + '_export_' + new Date().getTime() + EXCEL_EXTENSION);
+    saveAs(data, fileName + '_export_' + new Date().getTime() + EXCEL_EXTENSION);
   }
 
-}
\ No newline at end of file
+}
diff --git a/ui/main/src/app/services/filter.service.ts b/ui/main/src/app/services/filter.service.ts
index a276c0acfd..83e3d9c4af 100644
--- a/ui/main/src/app/services/filter.service.ts
+++ b/ui/main/src/app/services/filter.service.ts
@@ -11,7 +11,7 @@
 import {Injectable} from '@angular/core';
 import {Filter} from '@ofModel/feed-filter.model';
 import {LightCard, Severity} from '@ofModel/light-card.model';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 
 @Injectable({
     providedIn: 'root'
diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts
index 7cba149da5..a02ce02517 100644
--- a/ui/main/src/app/services/groups.service.ts
+++ b/ui/main/src/app/services/groups.service.ts
@@ -12,9 +12,8 @@ import {Observable, Subject} from 'rxjs';
 import {Group} from '@ofModel/group.model';
 import {environment} from '@env/environment';
 import {HttpClient} from '@angular/common/http';
-import {catchError, tap} from 'rxjs/operators';
+import {catchError, takeUntil, tap} from 'rxjs/operators';
 import {Injectable, OnDestroy} from '@angular/core';
-import {takeUntil} from 'rxjs/internal/operators/takeUntil';
 
 @Injectable({
   providedIn: 'root'
diff --git a/ui/main/src/app/services/processes.service.spec.ts b/ui/main/src/app/services/processes.service.spec.ts
index 8d6675fab6..4e52daa9c4 100644
--- a/ui/main/src/app/services/processes.service.spec.ts
+++ b/ui/main/src/app/services/processes.service.spec.ts
@@ -11,14 +11,13 @@
 import {getTestBed, TestBed} from '@angular/core/testing';
 
 import {ProcessesService} from './processes.service';
-import {HttpClientTestingModule, HttpTestingController, TestRequest} from '@angular/common/http/testing';
+import {HttpClientTestingModule, HttpTestingController} 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 {getRandomAlphanumericValue, BusinessconfigI18nLoaderFactory} from '@tests/helpers';
-import * as _ from 'lodash';
+import {BusinessconfigI18nLoaderFactory, getRandomAlphanumericValue} from '@tests/helpers';
 import {AuthenticationService} from '@ofServices/authentication/authentication.service';
 import {GuidService} from '@ofServices/guid.service';
 import {ConfigService} from '@ofServices/config.service';
diff --git a/ui/main/src/app/services/user.service.ts b/ui/main/src/app/services/user.service.ts
index 76e9a2d63a..488edb49b5 100644
--- a/ui/main/src/app/services/user.service.ts
+++ b/ui/main/src/app/services/user.service.ts
@@ -14,10 +14,9 @@ import {Observable, Subject} from 'rxjs';
 import {Entity, User} from '@ofModel/user.model';
 import {UserWithPerimeters} from '@ofModel/userWithPerimeters.model';
 import {HttpClient} from '@angular/common/http';
-import {takeUntil} from 'rxjs/internal/operators/takeUntil';
-import {catchError, tap} from 'rxjs/operators';
+import {catchError, takeUntil, tap} from 'rxjs/operators';
 import {CrudService} from './crud-service';
-import {Injectable} from "@angular/core";
+import {Injectable} from '@angular/core';
 
 @Injectable({
   providedIn: 'root'
diff --git a/ui/main/src/app/store/selectors/authentication.selectors.ts b/ui/main/src/app/store/selectors/authentication.selectors.ts
index 98cb62e224..6a6cd2c094 100644
--- a/ui/main/src/app/store/selectors/authentication.selectors.ts
+++ b/ui/main/src/app/store/selectors/authentication.selectors.ts
@@ -8,11 +8,10 @@
  */
 
 
-
 import {createFeatureSelector, createSelector} from '@ngrx/store';
 import * as fromAuthentication from '@ofStore/reducers/authentication.reducer';
 import {AuthState} from '@ofStates/authentication.state';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 
 export const selectAuthenticationState = createFeatureSelector<AuthState>('authentication');
 
diff --git a/ui/main/src/app/store/selectors/settings.selectors.ts b/ui/main/src/app/store/selectors/settings.selectors.ts
index 7bfca4d0e8..a7136a192c 100644
--- a/ui/main/src/app/store/selectors/settings.selectors.ts
+++ b/ui/main/src/app/store/selectors/settings.selectors.ts
@@ -11,7 +11,7 @@
 import {AppState} from '@ofStore/index';
 import {createSelector} from '@ngrx/store';
 import {SettingsState} from '@ofStates/settings.state';
-import * as _ from 'lodash';
+import * as _ from 'lodash-es';
 
 export const selectSettings = (state: AppState) => state.settings;
 export const selectSettingsLoaded = createSelector(selectSettings, (settingsState: SettingsState) => settingsState.loaded);
diff --git a/ui/main/src/app/store/selectors/settings.x.config.selectors.ts b/ui/main/src/app/store/selectors/settings.x.config.selectors.ts
index e25be8238b..58e208c5c3 100644
--- a/ui/main/src/app/store/selectors/settings.x.config.selectors.ts
+++ b/ui/main/src/app/store/selectors/settings.x.config.selectors.ts
@@ -8,8 +8,8 @@
  */
 
 
-import {AppState} from "@ofStore/index";
-import * as _ from 'lodash';
+import {AppState} from '@ofStore/index';
+import * as _ from 'lodash-es';
 
 export function buildSettingsOrConfigSelector(path: string, fallback: any = null) {
     return (state: AppState) => {
diff --git a/ui/main/tsconfig.json b/ui/main/tsconfig.json
index 1e72714aca..c100e2e6e6 100755
--- a/ui/main/tsconfig.json
+++ b/ui/main/tsconfig.json
@@ -14,7 +14,10 @@
       "@ofStates/*": ["app/store/states/*"],
       "@ofServices/*": ["app/services/*"],
       "@ofModel/*": ["app/model/*"],
-      "@tests/*": ["tests/*"]
+      "@tests/*": ["tests/*"],
+      "file-saver-es": [
+        "@types/file-saver"
+      ]
     },
     "outDir": "./dist/out-tsc",
     "sourceMap": true,

From bf841d46c498ba47380886a84697d7ef1f12a8a8 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 15 Feb 2021 09:57:55 +0100
Subject: [PATCH 48/62] [OC-1459] Admin - Propagate entity/group update to
 users

---
 .../app/modules/admin/admin.component.html    |  8 +++---
 .../src/app/modules/admin/admin.component.ts  | 15 ++++++++++-
 .../components/table/admin-table.directive.ts | 26 ++++++++++++++-----
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html
index 700a78f6c6..58722dbada 100644
--- a/ui/main/src/app/modules/admin/admin.component.html
+++ b/ui/main/src/app/modules/admin/admin.component.html
@@ -27,24 +27,24 @@
     <div class="tab-pane active" id="admin/users" [ngClass]="{ 'active':activeTab==='users'}">
       <br>
       <br>
-      <of-users-table [paginationPageSize]="paginationPageSize"></of-users-table>
+      <of-users-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-users-table>
     </div>
     <div class="tab-pane" id="admin/entities" [ngClass]="{ 'active':activeTab==='entities'}">
       <br>
       <br>
-      <of-entities-table [paginationPageSize]="paginationPageSize"></of-entities-table>
+      <of-entities-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-entities-table>
     </div>
     <div class="tab-pane" id="admin/groups" [ngClass]="{ 'active':activeTab==='groups'}">
       <br>
       <br>
-      <of-groups-table [paginationPageSize]="paginationPageSize"></of-groups-table>
+      <of-groups-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-groups-table>
     </div>
   </div>
 
   <br>
   <br>
   <div>
-    <select (change)="onPageSizeChanged()" id="page-size-select" label="page-size">
+    <select (change)="onPageSizeChanged()" id="page-size-select">
       <option *ngFor="let option of paginationPageSizeOptions"
               [value]="option"
               [attr.selected]="option==paginationDefaultPageSize ? true : null">
diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index 62115a974a..501941fb6e 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -9,7 +9,7 @@
  */
 
 
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {Store} from '@ngrx/store';
 import {TranslateService} from '@ngx-translate/core';
@@ -17,6 +17,8 @@ import {AppState} from '@ofStore/index';
 import {GroupsService} from '@ofServices/groups.service';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
+import {AdminTableType} from './components/table/admin-table.directive';
+import {UsersTableComponent} from './components/table/users-table.component';
 
 @Component({
   selector: 'of-admin',
@@ -33,6 +35,9 @@ export class AdminComponent implements OnInit, OnDestroy {
   public paginationPageSizeOptions = [5, 10, 25, 50, 100];
   public paginationPageSize = this.paginationDefaultPageSize;
 
+  @ViewChild(UsersTableComponent)
+  private usersTableComponent: UsersTableComponent;
+
   constructor(private route: ActivatedRoute,
               protected store: Store<AppState>,
               protected translate: TranslateService,
@@ -62,4 +67,12 @@ export class AdminComponent implements OnInit, OnDestroy {
     this.unsubscribe$.next();
     this.unsubscribe$.complete();
   }
+
+/** After an update on the entities (resp. groups) screen, both entity and user data need to be refreshed as changes to an
+ * entity (deletion, name change) need to be taken into account in users that belonged to this entity as well. */
+  propagateUpdate(event) {
+      if (event === AdminTableType.ENTITY || event === AdminTableType.GROUP) {
+        this.usersTableComponent.refreshData();
+      }
+  }
 }
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 497ca59c5a..9119c6927b 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
@@ -8,7 +8,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {Directive, Injectable, Input, OnChanges, OnInit} from '@angular/core';
+import {Directive, EventEmitter, Injectable, Input, OnChanges, OnInit, Output} from '@angular/core';
 import {ColDef, GridOptions, ICellRendererParams} from 'ag-grid-community';
 import {TranslateService} from '@ngx-translate/core';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
@@ -41,6 +41,11 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
   @Input()
   public paginationPageSize;
 
+  /** This is used to notify the admin component that data has been changed so it can trigger a refresh for related data, passing the
+   * tableType as payload to know which data has been changed. */
+  @Output()
+  public dataUpdate = new EventEmitter<AdminTableType>();
+
   protected i18NPrefix = 'admin.input.';
 
   constructor(
@@ -152,10 +157,11 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
       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(
-          (result: any) => {
+          () => { // If modal is closed
             this.refreshData(); // This refreshes the data when the modal is closed after a change
+            this.dataUpdate.emit(this.tableType);
           },
-          (reason: any) => { }); // If the modal is dismissed (by clicking the "close" button, the top right cross icon
+          () => { }); // 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') {
@@ -174,7 +180,11 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
       if (confirmed) {
         // The data refresh is launched inside the subscribe to make sure that the deletion request has been (correctly)
         // handled first
-        this.crudService.deleteById(row[this.idField]).subscribe(x => this.refreshData()); // TODO unsubscribe on destroy?
+        this.crudService.deleteById(row[this.idField])
+            .subscribe(() => {
+          this.refreshData();
+          this.dataUpdate.emit(this.tableType);
+        }); // TODO unsubscribe on destroy?
       }
     }).catch(() => throwError(new AppError(null)));
   }
@@ -185,10 +195,12 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
     modalRef.result.then(
         // Hooking the refresh of the data to the closing of the modal seemed simpler than setting up
         // NGRX actions and effects for this sole purpose
-        (result: any) => {
-          this.refreshData();
+        () => { // If modal is closed
+          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
         },
-        (reason: any) => { });
+        () => { }); // 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() {

From 76227db0f900378b60f1df7136fc28fade910bff Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Mon, 15 Feb 2021 10:55:30 +0100
Subject: [PATCH 49/62] [OC-1083] Refactoring of ngnix endpoints for groups and
 entities

---
 config/dev/nginx.conf.template               | 70 +-------------------
 config/docker/nginx-cors-permissive.conf     | 68 -------------------
 config/docker/nginx.conf                     | 17 -----
 ui/main/src/app/services/entities.service.ts |  4 +-
 ui/main/src/app/services/groups.service.ts   |  4 +-
 ui/main/src/environments/environment.prod.ts |  6 +-
 ui/main/src/environments/environment.ts      |  6 +-
 7 files changed, 11 insertions(+), 164 deletions(-)

diff --git a/config/dev/nginx.conf.template b/config/dev/nginx.conf.template
index 6b9c67d86c..7ca8893dd7 100644
--- a/config/dev/nginx.conf.template
+++ b/config/dev/nginx.conf.template
@@ -111,75 +111,7 @@ server {
     proxy_pass http://${MY_DOCKER_HOST}:2103/users;
   }
 
-  location ~ "^/users/(.*)" {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://${MY_DOCKER_HOST}:2103/$1;
-  }
-
-  location /groups {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://${MY_DOCKER_HOST}:2103/groups;
-  }
-
-  location ~ "^/groups/(.*)" {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://${MY_DOCKER_HOST}:2103/$1;
-  }
-
-  location /entities {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://${MY_DOCKER_HOST}:2103/entities;
-  }
-
-  location ~ "^/entities/(.*)" {
+    location ~ "^/users/(.*)" {
     # enables `ng serve` mode
     if ($request_method = 'OPTIONS') {
       add_header 'Access-Control-Allow-Origin' '*';
diff --git a/config/docker/nginx-cors-permissive.conf b/config/docker/nginx-cors-permissive.conf
index 2607a933f3..6afac828d0 100644
--- a/config/docker/nginx-cors-permissive.conf
+++ b/config/docker/nginx-cors-permissive.conf
@@ -127,74 +127,6 @@ server {
     proxy_pass http://users:8080/users;
   }
 
- location /groups {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/groups;
-  }
-
-  location ~ "^/groups/(.*)" {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/$1;
-  }
-
-  location /entities {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/entities;
-  }
-
-  location ~ "^/entities/(.*)" {
-    # enables `ng serve` mode
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' '*';
-      add_header 'Access-Control-Allow-Headers' '*';
-      add_header 'Content-Length' 0;
-      add_header 'Vary' 'Origin';
-      add_header 'Vary' 'Access-Control-Request-Method' ;
-      add_header 'Vary' 'Access-Control-Request-Headers';
-      return 204;
-    }
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/$1;
-  }
-
   location /cards/ {
     # enables `ng serve` mode
     if ($request_method = 'OPTIONS') {
diff --git a/config/docker/nginx.conf b/config/docker/nginx.conf
index ee9aca4b4a..1d7d65f73e 100644
--- a/config/docker/nginx.conf
+++ b/config/docker/nginx.conf
@@ -50,23 +50,6 @@ server {
   location ~ "^/users/(.*)" {
     proxy_set_header Host $http_host;
     proxy_pass http://users:8080/$1;
-  }
-    location ~ "^/entities/(.*)" {
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/$1;
-  }
-   location /entities {
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/entities;
-  }
-
-  location ~ "^/groups/(.*)" {
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/$1;
-  }
-  location /groups {
-    proxy_set_header Host $http_host;
-    proxy_pass http://users:8080/groups;
   }
   location /cards/ {
     proxy_set_header Host $http_host;
diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts
index 7540680a10..44c922ccfb 100644
--- a/ui/main/src/app/services/entities.service.ts
+++ b/ui/main/src/app/services/entities.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
@@ -35,7 +35,7 @@ export class EntitiesService extends CrudService {
     this.entitiesUrl = `${environment.urls.entities}`;
   }
   deleteById(id: string) {
-      const url = `${this.entitiesUrl}/entities/${id}`;
+      const url = `${this.entitiesUrl}/${id}`;
     return this.httpClient.delete(url).pipe(
       catchError((error: Response) => this.handleError(error))
     );
diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts
index a02ce02517..7861eb6cfa 100644
--- a/ui/main/src/app/services/groups.service.ts
+++ b/ui/main/src/app/services/groups.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
@@ -40,7 +40,7 @@ export class GroupsService extends CrudService implements OnDestroy {
   }
 
   deleteById(id: string) {
-    const url = `${this.groupsUrl}/groups/${id}`;
+    const url = `${this.groupsUrl}/${id}`;
     return this.httpClient.delete(url).pipe(
       catchError((error: Response) => this.handleError(error))
     );
diff --git a/ui/main/src/environments/environment.prod.ts b/ui/main/src/environments/environment.prod.ts
index d829f0ec73..8cd0a06051 100644
--- a/ui/main/src/environments/environment.prod.ts
+++ b/ui/main/src/environments/environment.prod.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
@@ -17,8 +17,8 @@ export const environment = {
         cards: '/cards',
         cardspub: '/cardspub',
         users: '/users',
-        groups: '/groups',
-        entities: '/entities',
+        groups: '/users/groups',
+        entities: '/users/entities',
         archives : '',
         processes: '/businessconfig/processes',
         processGroups: '/businessconfig/processgroups',
diff --git a/ui/main/src/environments/environment.ts b/ui/main/src/environments/environment.ts
index bac32130d1..1a25f2c143 100644
--- a/ui/main/src/environments/environment.ts
+++ b/ui/main/src/environments/environment.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
@@ -21,8 +21,8 @@ export const environment = {
         cards: 'http://localhost:2002/cards',
         cardspub: 'http://localhost:2002/cardspub',
         users: 'http://localhost:2002/users',
-        groups: 'http://localhost:2002/groups',
-        entities: 'http://localhost:2002/entities',
+        groups: 'http://localhost:2002/users/groups',
+        entities: 'http://localhost:2002/users/entities',
         archives: '',
         processes: 'http://localhost:2002/businessconfig/processes',
         processGroups: 'http://localhost:2002/businessconfig/processgroups',

From bd843164bbada8bb7e17d5002a3b8ebebc2ed44c Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Mon, 15 Feb 2021 15:36:19 +0100
Subject: [PATCH 50/62] [OC-1469] Fix Bug - publisherType not always set to
 external when receiving a card via card endPoint

---
 .../cards/publication/controllers/CardController.java      | 7 +++++--
 src/test/api/karate/cards/cards.feature                    | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java
index 68d59948f3..6c571b593f 100644
--- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java
+++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.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
@@ -52,7 +52,10 @@ public class CardController {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public @Valid Mono<CardCreationReportData> createCards(@Valid @RequestBody Flux<CardPublicationData> cards) {
-        return cardProcessingService.processCards(cards);
+        return cardProcessingService.processCards(cards.map(card -> {
+            card.setPublisherType(PublisherTypeEnum.EXTERNAL);
+            return card;
+        }));
 
     }
 
diff --git a/src/test/api/karate/cards/cards.feature b/src/test/api/karate/cards/cards.feature
index 41ee7d9027..53e71155c8 100644
--- a/src/test/api/karate/cards/cards.feature
+++ b/src/test/api/karate/cards/cards.feature
@@ -512,7 +512,7 @@ Scenario: Push a card for a user with no group and no entity
     And match response.data.message == 'a message for user with no group and no entity'
 
 
-Scenario: Push card with null keepChilCards
+Scenario: Push card with null keepChilCards and publisherType
 
     * def parentCard2 =
 """
@@ -526,6 +526,7 @@ Scenario: Push card with null keepChilCards
 	"severity" : "INFORMATION",
 	"startDate" : 1553186770681,
     "keepChildCards": null,
+	"publisherType": null,
 	"summary" : {"key" : "defaultProcess.summary"},
 	"title" : {"key" : "defaultProcess.title2"},
 	"data" : {"message":"test externalRecipients"}
@@ -546,3 +547,4 @@ Scenario: Push card with null keepChilCards
     When method get
     Then status 200
     And match response.card.keepChildCards == false
+	And match response.card.publisherType == "EXTERNAL"

From 57e74ac03955167d2740e0170bb76b0c52095405 Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Tue, 16 Feb 2021 10:27:05 +0100
Subject: [PATCH 51/62] [OC-1478] Fix Bug in day mode for calendar when event
 spans multiple days

---
 ui/main/src/app/modules/calendar/calendar.component.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/main/src/app/modules/calendar/calendar.component.scss b/ui/main/src/app/modules/calendar/calendar.component.scss
index f7bbfdc207..14609089e0 100644
--- a/ui/main/src/app/modules/calendar/calendar.component.scss
+++ b/ui/main/src/app/modules/calendar/calendar.component.scss
@@ -53,7 +53,7 @@
   font-size: 13px;
   color: var(--opfab-color); 
   }
-  
+
 .opfab-calendar-event:hover {
   color: var(--opfab-text-color-stronger); 
   }
@@ -159,6 +159,9 @@
   border-top-width: 0px;
 }
 
+.fc-h-event .fc-event-main {
+  color: var(--opfab-color); 
+}
 
 // change the color of default bullet point 
 .opfab-calendar-event-action .fc-daygrid-event-dot  {

From c70a57c2d61efd947b71fb2fca35835b182635bb Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Tue, 16 Feb 2021 11:56:48 +0100
Subject: [PATCH 52/62] [OC-1469] update deleteUserCard.featurefor api karate
 tests

---
 .../api/karate/cards/deleteUserCard.feature   | 80 +++++++++++++++++--
 1 file changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/test/api/karate/cards/deleteUserCard.feature b/src/test/api/karate/cards/deleteUserCard.feature
index d5f3e1074f..6e7273de26 100644
--- a/src/test/api/karate/cards/deleteUserCard.feature
+++ b/src/test/api/karate/cards/deleteUserCard.feature
@@ -6,6 +6,8 @@ Feature: deleteUserCards tests
     * def authToken = signIn.authToken
     * def signInAsTSO = call read('../common/getToken.feature') { username: 'operator1'}
     * def authTokenAsTSO = signInAsTSO.authToken
+    * def signInAsTSO2 = call read('../common/getToken.feature') { username: 'operator2'}
+    * def authTokenAsTSO2 = signInAsTSO2.authToken
 
     * def groupKarate =
 """
@@ -14,6 +16,14 @@ Feature: deleteUserCards tests
   "name" : "groupKarate name",
   "description" : "groupKarate description"
 }
+"""
+    * def groupKarate2 =
+"""
+{
+  "id" : "groupKarateDeleteUserCards2",
+  "name" : "groupKarate name",
+  "description" : "groupKarate description"
+}
 """
 
 
@@ -33,17 +43,45 @@ Feature: deleteUserCards tests
       }
   ]
 }
+"""
+
+    * def perimeterWriteForState2 =
+"""
+{
+  "id" : "perimeterKarateDeleteUserCards2",
+  "process" : "processDeleteUserCard",
+  "stateRights" : [
+      {
+        "state" : "state1",
+        "right" : "Write"
+      },
+      {
+        "state" : "state2",
+        "right" : "Write"
+      }
+  ]
+}
 """
 
     * def operator1Array =
 """
 [   "operator1"
 ]
+"""
+    * def operator2Array =
+"""
+[   "operator2"
+]
 """
     * def groupArray =
 """
 [   "groupKarateDeleteUserCards"
 ]
+"""
+    * def group2Array =
+"""
+[   "groupKarateDeleteUserCards2"
+]
 """
 
   Scenario: Create groupKarate
@@ -55,6 +93,15 @@ Feature: deleteUserCards tests
     And match response.name == groupKarate.name
     And match response.id == groupKarate.id
 
+  Scenario: Create groupKarate2
+    Given url opfabUrl + 'users/groups'
+    And header Authorization = 'Bearer ' + authToken
+    And request groupKarate2
+    When method post
+    Then match response.description == groupKarate2.description
+    And match response.name == groupKarate2.name
+    And match response.id == groupKarate2.id
+
 
   Scenario: Add operator1 to groupKarate
     Given url opfabUrl + 'users/groups/' + groupKarate.id + '/users'
@@ -63,6 +110,13 @@ Feature: deleteUserCards tests
     When method patch
     And status 200
 
+  Scenario: Add operator2 to groupKarate2
+    Given url opfabUrl + 'users/groups/' + groupKarate2.id + '/users'
+    And header Authorization = 'Bearer ' + authToken
+    And request operator2Array
+    When method patch
+    And status 200
+
 
   Scenario: Create perimeter
     Given url opfabUrl + 'users/perimeters'
@@ -70,6 +124,12 @@ Feature: deleteUserCards tests
     And request perimeter
     When method post
 
+  Scenario: Create perimeterWriteForState2
+    Given url opfabUrl + 'users/perimeters'
+    And header Authorization = 'Bearer ' + authToken
+    And request perimeterWriteForState2
+    When method post
+
 
   Scenario: Put groupKarate for perimeter
     Given url opfabUrl + 'users/perimeters/'+ perimeter.id + '/groups'
@@ -78,13 +138,19 @@ Feature: deleteUserCards tests
     When method put
     Then status 200
 
+  Scenario: Put groupKarate2 for perimeterWriteForState2
+    Given url opfabUrl + 'users/perimeters/'+ perimeterWriteForState2.id + '/groups'
+    And header Authorization = 'Bearer ' + authToken
+    And request group2Array
+    When method put
+    Then status 200
+
 
   Scenario: Push user card
     * def cardForDeleteOk =
 """
 {
 	"publisher" : "ENTITY1",
-	"publisherType" : "ENTITY",
 	"processVersion" : "1",
 	"process"  :"processDeleteUserCard",
 	"processInstanceId" : "processDeleteUserCardOk",
@@ -102,7 +168,6 @@ Feature: deleteUserCards tests
 """
 {
 	"publisher" : "publisherKarate",
-	"publisherType" : "EXTERNAL",
 	"processVersion" : "1",
 	"process"  :"processDeleteUserCard",
 	"processInstanceId" : "processDeleteUserCardForbidden1",
@@ -120,7 +185,6 @@ Feature: deleteUserCards tests
 """
 {
 	"publisher" : "ENTITY2",
-	"publisherType" : "ENTITY",
 	"processVersion" : "1",
 	"process"  :"processDeleteUserCard",
 	"processInstanceId" : "processDeleteUserCardForbidden2",
@@ -138,7 +202,6 @@ Feature: deleteUserCards tests
 """
 {
 	"publisher" : "ENTITY1",
-	"publisherType" : "ENTITY",
 	"processVersion" : "1",
 	"process"  :"processDeleteUserCard",
 	"processInstanceId" : "processDeleteUserCardForbidden3",
@@ -153,7 +216,8 @@ Feature: deleteUserCards tests
 """
 
 # Push cardForDeleteOk
-  Given url opfabPublishCardUrl + 'cards'
+  Given url opfabPublishCardUrl + 'cards/userCard'
+  And header Authorization = 'Bearer ' + authTokenAsTSO
   And request cardForDeleteOk
   When method post
   Then status 201
@@ -168,7 +232,8 @@ Feature: deleteUserCards tests
   And match response.count == 1
 
 # Push cardForDeleteForbidden2
-   Given url opfabPublishCardUrl + 'cards'
+   Given url opfabPublishCardUrl + 'cards/userCard'
+   And header Authorization = 'Bearer ' + authTokenAsTSO2
    And request cardForDeleteForbidden2
    When method post
    Then status 201
@@ -176,7 +241,8 @@ Feature: deleteUserCards tests
 
 
 # Push cardForDeleteForbidden3
-   Given url opfabPublishCardUrl + 'cards'
+   Given url opfabPublishCardUrl + 'cards/userCard'
+   And header Authorization = 'Bearer ' + authTokenAsTSO2
    And request cardForDeleteForbidden3
    When method post
    Then status 201

From c3186476d89cad9808a340164d73340c2ef07efc Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Tue, 16 Feb 2021 15:11:07 +0100
Subject: [PATCH 53/62] [OC-1457] Admin : Do not limit size of input field

---
 .../edit-entity-group-modal.component.html            |  2 --
 .../edit-entity-group-modal.component.ts              |  4 ++--
 .../editmodal/users/edit-user-modal.component.html    |  3 ---
 .../editmodal/users/edit-user-modal.component.ts      |  6 +++---
 ui/main/src/assets/i18n/en.json                       | 11 +++--------
 ui/main/src/assets/i18n/fr.json                       | 11 +++--------
 6 files changed, 11 insertions(+), 26 deletions(-)

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/groups-entities/edit-entity-group-modal.component.html
index c1af6d9042..a455c7024b 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/groups-entities/edit-entity-group-modal.component.html
@@ -27,7 +27,6 @@
           </div>
           <div *ngIf="id.invalid" class="row alert alert-danger">
             <div *ngIf="id.errors.required" translate>admin.input.id.required</div>
-            <div *ngIf="id.errors.maxlength" translate>admin.input.id.maxLength</div>
             <div *ngIf="id.errors.minlength" translate>admin.input.id.minLength</div>
           </div>
 
@@ -37,7 +36,6 @@
           </div>
           <div *ngIf="name.invalid" class=" row alert alert-danger">
             <div *ngIf="name.errors.required" translate>admin.input.name.required</div>
-            <div *ngIf="name.errors.maxlength" translate>admin.input.name.maxLength</div>
           </div>
 
           <div class="opfab-input row">
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/groups-entities/edit-entity-group-modal.component.ts
index 8865ef3b18..31d6a49221 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/groups-entities/edit-entity-group-modal.component.ts
@@ -25,8 +25,8 @@ export class EditEntityGroupModalComponent implements OnInit {
 
   entityGroupForm = new FormGroup({
     id: new FormControl(''
-      , [Validators.required, Validators.minLength(2), Validators.maxLength(20)]),
-    name: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+      , [Validators.required, Validators.minLength(2)]),
+    name: new FormControl('', [Validators.required]),
     description: new FormControl('')
   });
 
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 ee1eef3c9c..3984c6276f 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
@@ -27,7 +27,6 @@
           </div>
           <div *ngIf="login.invalid" class="row alert alert-danger">
             <div *ngIf="login.errors.required" translate>admin.input.login.required</div>
-            <div *ngIf="login.errors.maxlength" translate>admin.input.login.maxLength</div>
             <div *ngIf="login.errors.minlength" translate>admin.input.login.minLength</div>
           </div>
 
@@ -37,7 +36,6 @@
           </div>
           <div *ngIf="firstName.invalid" class="row alert alert-danger">
             <div *ngIf="firstName.errors.required" translate>admin.input.firstName.required</div>
-            <div *ngIf="firstName.errors.maxlength" translate>admin.input.firstName.maxLength</div>
           </div>
           <div class="opfab-input row">
             <label for="lastName" translate>admin.input.user.lastName</label>
@@ -45,7 +43,6 @@
           </div>
           <div *ngIf="lastName.invalid" class="row alert alert-danger">
             <div *ngIf="lastName.errors.required" translate>admin.input.lastName.required</div>
-            <div *ngIf="lastName.errors.maxlength" translate>admin.input.lastName.maxLength</div>
           </div>
           <div class="row">
             <of-multi-filter filterPath="groups" id="groups" [parentForm]="userForm"
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 9ca115f2db..df67f25d6b 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,9 +49,9 @@ export class EditUserModalComponent implements OnInit {
 
     this.userForm = new FormGroup({
       login: new FormControl(''
-          , [Validators.required, Validators.minLength(4), Validators.maxLength(20)]),
-      firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
-      lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+          , [Validators.required, Validators.minLength(4)]),
+      firstName: new FormControl('', [Validators.required]),
+      lastName: new FormControl('', [Validators.required]),
       groups: new FormControl([]),
       entities: new FormControl([])
     });
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 56c84907f2..8ee4517ff9 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -296,26 +296,21 @@
       "confirm": "Please confirm...",
       "login": {
         "required": "Login is required.",
-        "minLength": "Login should be minimum 4 characters.",
-        "maxLength": "Login should be maximum 20 characters."
+        "minLength": "Login should be minimum 4 characters."
       },
       "firstName": {
-        "required": "First name is required.",
-        "maxLength": "First name should be maximum 20 characters."
+        "required": "First name is required."
       },
       "lastName": {
-        "required": "Last name is required.",
-        "maxLength": "Last name should be maximum 20 characters."
+        "required": "Last name is required."
       },
       "id": {
         "required": "Id is required.",
         "minLength": "Id should be minimum 2 characters.",
-        "maxLength": "Id should be maximum 20 characters.",
         "label":"Id"
       },
       "name": {
         "required": "Name is required.",
-        "maxLength": "Name should be maximum 20 characters.",
         "label":"Name"
       },
       "description": "Description",
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index 586c0fcb79..26f8067acd 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -296,26 +296,21 @@
       "confirm":"Confirmez...",
       "login": {
         "required": "L'identifiant est obligatoire.",
-        "minLength": "L'identifiant doit avoir au moins 4 caractères.",
-        "maxLength": "L'identifiant doit avoir au maximum 20 caractères."
+        "minLength": "L'identifiant doit avoir au moins 4 caractères."
       },
       "firstName": {
-        "required": "Le prénom est obligatoire.",
-        "maxLength": "Le prénom doit avoir  au maximum 20 caractères."
+        "required": "Le prénom est obligatoire."
       },
       "lastName": {
-        "required": "Le nom est obligatoire.",
-        "maxLength": "Le nom doit avoir  au maximum 20 caractères."
+        "required": "Le nom est obligatoire."
       },
       "id": {
         "required": "L'identifiant est obligatoire.",
         "minLength": "L'identifiant doit avoir au moins 2 caractères.",
-        "maxLength": "L'identifiant doit avoir au maximum 20 caractères.",
         "label":"Id"
       },
       "name": {
         "required": "Le nom est obligatoire.",
-        "maxLength": "Le nom doit avoir au maximum 20 caractères.",
         "label":"Nom"
       },
       "description": "Description",

From 2066f24a4e79e60019f4d041cbee840dd0fdb03b Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Wed, 10 Feb 2021 17:26:41 +0100
Subject: [PATCH 54/62] [OC-1439] New archives screen filters

---
 .../modules/archives/archives.component.html  |  55 +++-
 .../modules/archives/archives.component.ts    | 245 ++++++++++++++----
 .../multi-filter/multi-filter.component.ts    |  19 +-
 ui/main/src/assets/i18n/en.json               |   7 +-
 ui/main/src/assets/i18n/fr.json               |   7 +-
 ui/main/src/assets/styles/styles.scss         |   4 +
 6 files changed, 269 insertions(+), 68 deletions(-)

diff --git a/ui/main/src/app/modules/archives/archives.component.html b/ui/main/src/app/modules/archives/archives.component.html
index 988c244798..fa72fe36f9 100644
--- a/ui/main/src/app/modules/archives/archives.component.html
+++ b/ui/main/src/app/modules/archives/archives.component.html
@@ -11,21 +11,62 @@
     <form [formGroup]="archiveForm" #currentForm>
       <div class="opfab-archives">
         <div style="display: flex;">
-          <div style="margin-right:40px">
-            <div style="min-width:300px;max-width:400px;margin-top:28px;margin-bottom: 54px;">
-              <of-multi-filter filterPath="process" id="process" [parentForm]="archiveForm"
-                               [values]="processDropdownList" [dropdownSettings]="processDropdownSettings" [selectedItems]="[]"
+
+          <!--2 columns in this case-->
+          <!--First column-->
+          <div *ngIf="displayServiceFilter() || tags" style="margin-right:40px">
+            <div  style="min-width:300px;max-width:400px;margin-top: 28px;margin-bottom: 54px;">
+              <of-multi-filter *ngIf="displayServiceFilter()" filterPath="service" id="service" [parentForm]="archiveForm"
+                               [values]="serviceDropdownList" [dropdownSettings]="serviceDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+              <of-multi-filter *ngIf="! displayServiceFilter() && tags" filterPath="tags" id="tags" [parentForm]="archiveForm"
+                               [values]="tagsDropdownList" [dropdownSettings]="tagsDropdownSettings" [selectedItems]="[]"
                                i18nRootLabelKey="archive.filters.">
               </of-multi-filter>
             </div>
-
-            <div *ngIf="tags" style="min-width:300px;max-width:400px;margin-top: 28px;">
+            <div *ngIf="displayServiceFilter() && tags" style="min-width:300px;max-width:400px;">
               <of-multi-filter filterPath="tags" id="tags" [parentForm]="archiveForm" [values]="tagsDropdownList"
                                [dropdownSettings]="tagsDropdownSettings" [selectedItems]="[]" i18nRootLabelKey="archive.filters.">
               </of-multi-filter>
             </div>
           </div>
 
+          <!--Second column-->
+          <div *ngIf="displayServiceFilter() || tags" style="margin-right:40px">
+            <div style="min-width:300px;max-width:400px;margin-top:28px;margin-bottom: 54px;">
+              <of-multi-filter [hidden]="displayServiceFilter()" filterPath="process" id="process" [parentForm]="archiveForm"
+                               [values]="processDropdownList" [dropdownSettings]="processDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+              <of-multi-filter [hidden]="! displayServiceFilter()" filterPath="process" id="process" [parentForm]="archiveForm"
+                               [values]="processDropdownListWhenSelectedService" [dropdownSettings]="processDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+            </div>
+            <div style="min-width:300px;max-width:400px;">
+              <of-multi-filter filterPath="state" id="state" [parentForm]="archiveForm"
+                               [values]="stateDropdownListWhenSelectedProcess" [dropdownSettings]="stateDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+            </div>
+          </div>
+
+          <!--Only one column in this case-->
+          <div *ngIf="! displayServiceFilter() && ! tags" style="margin-right:40px">
+            <div style="min-width:300px;max-width:400px;margin-top:28px;margin-bottom: 54px;">
+              <of-multi-filter filterPath="process" id="process" [parentForm]="archiveForm"
+                               [values]="processDropdownList" [dropdownSettings]="processDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+            </div>
+            <div style="min-width:300px;max-width:400px;">
+              <of-multi-filter filterPath="state" id="state" [parentForm]="archiveForm"
+                               [values]="stateDropdownListWhenSelectedProcess" [dropdownSettings]="stateDropdownSettings" [selectedItems]="[]"
+                               i18nRootLabelKey="archive.filters.">
+              </of-multi-filter>
+            </div>
+          </div>
 
           <div class="opfab-vertical-bar"></div>
           <div style="margin-left:40px;margin-right: 30px;width:230px; min-width: 230px;">
@@ -72,6 +113,7 @@
           <th scope="col" translate>archive.result.businessPeriod</th>
           <th scope="col" translate>archive.result.title</th>
           <th scope="col" translate>archive.result.summary</th>
+          <th *ngIf="displayServiceFilter()" scope="col" translate>archive.result.service</th>
         </tr>
       </thead>
 
@@ -85,6 +127,7 @@
         <td translate [translateParams]="card.summary.parameters">
           {{ card.process + '.' + card.processVersion + '.' + card.summary.key}}
         </td>
+        <td *ngIf="displayServiceFilter()" translate>{{ findServiceLabelForProcess(card.process) }}</td>
       </tr>
     </table>
     <div class="opfab-archive-pagination">
diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts
index b90b5eb351..b0c1e04cfb 100644
--- a/ui/main/src/app/modules/archives/archives.component.ts
+++ b/ui/main/src/app/modules/archives/archives.component.ts
@@ -67,30 +67,42 @@ export class ArchivesComponent implements OnDestroy, OnInit {
     hasResult = false;
     firstQueryHasBeenDone = false;
 
-    // Filter values 
+    // Filter values
+    serviceDropdownList = [];
+    serviceDropdownSettings = {};
     processDropdownList = [];
+    processDropdownListWhenSelectedService = [];
+    processesWithoutServiceDropdownList = [];
     processDropdownSettings = {};
+    stateDropdownListWhenSelectedProcess = [];
+    stateDropdownSettings = {};
     tagsDropdownList = [];
     tagsDropdownSettings = {};
 
-    // View card 
+    // View card
     modalRef: NgbModalRef;
     @ViewChild('cardDetail') cardDetailTemplate: ElementRef;
-    selectedCard : Card; 
+    selectedCard : Card;
+
+    processesDropdownListPerServices = new Map();
+    statesDropdownListPerProcesses = new Map();
+    processesGroups: {id: string, processes: string[]}[];
 
     constructor(private store: Store<AppState>,
-        private processesService: ProcessesService,
-        private configService: ConfigService,
-        private timeService: TimeService,
-        private cardService: CardService,
-        private exportService: ExportService,
-        private translate: TranslateService,
-        private modalService: NgbModal
+                private processesService: ProcessesService,
+                private configService: ConfigService,
+                private timeService: TimeService,
+                private cardService: CardService,
+                private exportService: ExportService,
+                private translate: TranslateService,
+                private modalService: NgbModal
     ) {
 
         this.archiveForm = new FormGroup({
             tags: new FormControl([]),
+            state: new FormControl([]),
             process: new FormControl([]),
+            service: new FormControl([]),
             publishDateFrom: new FormControl(),
             publishDateTo: new FormControl(''),
             activeFrom: new FormControl(''),
@@ -104,6 +116,7 @@ export class ArchivesComponent implements OnDestroy, OnInit {
         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;
@@ -112,60 +125,194 @@ export class ArchivesComponent implements OnDestroy, OnInit {
             }
             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.selectProcessText','archive.selectTagText'])
-              .subscribe(translations => {
-                this.processDropdownSettings = {
-                    text: translations['archive.selectProcessText'],
-                    badgeShowLimit: 3,
-                    enableSearchFilter: true
-                }
-                this.tagsDropdownSettings = {
-                    text: translations['archive.selectTagText'],
-                    badgeShowLimit: 3,
-                    enableSearchFilter: true
-                };
-              })
-            });
+            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<string> {
         return this.store.select(buildSettingsOrConfigSelector('locale'));
     }
-    
+
     /**
      * Transforms the filters list to Map
      */
-    filtersToMap = (filters: any): Map<string, string[]> => {
-        const params = new 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)) {
-                    const { date, time } = element;
-                    if (date) {
-                        const timeStamp = this.timeService.toNgBTimestamp(transformToTimestamp(date, time));
-                        if (timeStamp !== 'NaN') {
-                            params.set(key, [timeStamp]);
-                        }
-                    }
-                } else {
+                if (checkElement(FilterDateTypes, key))
+                    this.dateFilterToMap(key, element);
+                else {
                     if (element.length) {
                         const ids = [];
-                        element.forEach(val => ids.push(val.id));
-                        params.set(key, 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);
+                        }
                     }
                 }
             }
         });
-        return params;
+    }
+
+    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() {
@@ -178,7 +325,7 @@ export class ArchivesComponent implements OnDestroy, OnInit {
 
     sendQuery(page_number): void {
         const { value } = this.archiveForm;
-        this.filters = this.filtersToMap(value);
+        this.filtersToMap(value);
         this.filters.set('size', [this.size.toString()]);
         this.filters.set('page', [page_number]);
         this.cardService.fetchArchivedCards(this.filters)
@@ -209,12 +356,12 @@ export class ArchivesComponent implements OnDestroy, OnInit {
     }
 
 
-    // EXPORT TO EXCEL 
+    // EXPORT TO EXCEL
 
     initExportArchiveData(): void {
         const exportArchiveData = [];
 
-       
+
         this.filters.set('size', [this.resultsNumber.toString()]);
         this.filters.set('page', [0]);
 
@@ -224,7 +371,7 @@ export class ArchivesComponent implements OnDestroy, OnInit {
 
                 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 
+                        // TO DO translation for old process should be done  , but loading local arrive to late , solution to find
                         exportArchiveData.push({
                             severity: card.severity,
                             publishDate: this.timeService.formatDateTime(card.publishDate),
@@ -255,12 +402,12 @@ export class ArchivesComponent implements OnDestroy, OnInit {
 
     openCard(cardId) {
         this.cardService.loadArchivedCard(cardId).subscribe((card: Card) => {
-            this.selectedCard = card;
-            const options: NgbModalOptions = {
-                size: 'fullscreen'
-            };
-            this.modalRef = this.modalService.open(this.cardDetailTemplate, options);
-        }
+                this.selectedCard = card;
+                const options: NgbModalOptions = {
+                    size: 'fullscreen'
+                };
+                this.modalRef = this.modalService.open(this.cardDetailTemplate, options);
+            }
         );
     }
 
diff --git a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
index e3e9879613..970b05e450 100644
--- a/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
+++ b/ui/main/src/app/modules/share/multi-filter/multi-filter.component.ts
@@ -111,17 +111,14 @@ export class MultiFilterComponent implements OnInit, OnChanges, OnDestroy {
         if (typeof entry === 'string') {
             return {id: entry, itemName: entry};
         } else if (typeof entry.itemName === 'string') {
-            if (!!entry.i18nPrefix) { // need mutualisation
-                const firstI18nPrefix = (entry.i18nPrefix) ? `${entry.i18nPrefix}.` : '';
-                let firstTranslatedItemName = entry.id;
-                this.translateService.get(`${firstI18nPrefix}${entry.itemName}`
-                    , null).subscribe(result => firstTranslatedItemName = result);
-                return {
-                    id: entry.id,
-                    itemName: firstTranslatedItemName
-                };
-            }
-            return {id: entry.id, itemName: entry.itemName};
+            const firstI18nPrefix = (entry.i18nPrefix) ? `${entry.i18nPrefix}.` : '';
+            let firstTranslatedItemName = entry.id;
+            this.translateService.get(`${firstI18nPrefix}${entry.itemName}`
+                , null).subscribe(result => firstTranslatedItemName = result);
+            return {
+                id: entry.id,
+                itemName: firstTranslatedItemName
+            };
         } else if (!entry.itemName) {
             return {id: entry.id, itemName: entry.id};
         }
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 8ee4517ff9..79a7aba82b 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -128,7 +128,9 @@
   },
   "archive": {
     "filters": {
+      "service": "SERVICE",
       "process": "PROCESS",
+      "state": "STATE",
       "tags": "TAGS",
       "publishDateFrom": "PUBLISH FROM",
       "publishDateTo": "PUBLISH TO",
@@ -139,12 +141,15 @@
       "publishDate" : "PUBLICATION DATE",
       "businessPeriod" : "BUSINESS PERIOD",
       "title" : "TITLE",
-      "summary": "SUMMARY"
+      "summary": "SUMMARY",
+      "service": "SERVICE"
     },
     "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"
   },
   "logging": {
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index 26f8067acd..8a99ebc52b 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -128,7 +128,9 @@
   },
   "archive": {
     "filters": {
+      "service": "SERVICE",
       "process": "PROCESSUS",
+      "state": "ETAT",
       "tags": "ETIQUETTES",
       "publishDateFrom": "PUBLIE A PARTIR DE",
       "publishDateTo": "PUBLIE JUSQU'A",
@@ -139,12 +141,15 @@
       "publishDate" : "DATE DE PUBLICATION",
       "businessPeriod" : "PERIODE METIER",
       "title" : "TITRE",
-      "summary": "RESUME"
+      "summary": "RESUME",
+      "service": "SERVICE"
     },
     "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"
   },
   "logging": {
diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss
index 2eba12e22e..b176a90895 100644
--- a/ui/main/src/assets/styles/styles.scss
+++ b/ui/main/src/assets/styles/styles.scss
@@ -545,6 +545,10 @@ type-ahead > .badge-primary {
 
 }
 
+.opfab-multiselect .c-token {
+  width: 85%;
+}
+
 .opfab-multiselect::after {
   content: "V";
   transform: scaleY(0.5);

From 1c36bc28d4e80685eb6aeb1d8085d957c9aba5ab Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Wed, 17 Feb 2021 15:29:22 +0100
Subject: [PATCH 55/62] [OC-1489] Fix bug on delayed display of countdown
 counter

---
 .../share/countdown/countdown.component.ts        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/main/src/app/modules/share/countdown/countdown.component.ts b/ui/main/src/app/modules/share/countdown/countdown.component.ts
index 3c66f8aea6..cad97e985e 100644
--- a/ui/main/src/app/modules/share/countdown/countdown.component.ts
+++ b/ui/main/src/app/modules/share/countdown/countdown.component.ts
@@ -103,16 +103,21 @@ export class CountDownComponent implements OnInit, DoCheck, OnChanges, OnDestroy
         } else if (this.getSecondsBeforeLttd() <= 0) {
             this.stopCountDown();
         } else {
+            this.startCountDownConfigWhenNecessary();
             this.interval = setInterval(() => {
-                if (this.isTimeToStartCountDown()) {
-                    this.startCountDownConfig();
-                    clearInterval(this.interval);
-                    return;
-                }
+                this.startCountDownConfigWhenNecessary()
             }, this.MILLISECONDS_SECOND);
         }
     }
 
+    startCountDownConfigWhenNecessary() {
+        if (this.isTimeToStartCountDown()) {
+            this.startCountDownConfig();
+            clearInterval(this.interval);
+            return;
+        }
+    }
+
     stopCountDown() {
         this.enableLastTimeToAct = true;
         this.stopTime = true;

From 525b87b98ce21e6cdc16fc4962108d3c8e671dd9 Mon Sep 17 00:00:00 2001
From: Sjoerd Adema <sjoerd@kristalsoftware.nl>
Date: Tue, 5 Jan 2021 13:17:10 +0100
Subject: [PATCH 56/62] [OC-1283] Allow external config location for
 docker-compose and making run_all work on mac

---
 README.adoc                                      |  3 ++-
 bin/run_all.sh                                   |  6 +++---
 config/docker/docker-compose.sh                  | 14 ++++++++++++++
 config/docker/docker-compose.yml                 | 12 ++++++++++++
 .../businessconfig/src/main/docker/Dockerfile    |  3 +++
 .../src/main/docker/Dockerfile                   |  5 ++++-
 .../cards-publication/src/main/docker/Dockerfile |  5 ++++-
 services/core/users/src/main/docker/Dockerfile   |  3 +++
 .../deployment/configuration/configuration.adoc  | 16 ++++++++++++++++
 src/main/docker/java-config-docker-entrypoint.sh |  2 +-
 10 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/README.adoc b/README.adoc
index 4b96f57b2b..92615b494f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -82,7 +82,8 @@ cd operatorfabric-core
 . Launch our demo docker-compose file
 +
 ----
-./config/docker/docker-compose.sh
+cd ./config/docker
+./docker-compose.sh
 ----
 
 . After a little while, log into the application UI at *localhost:2002/ui/* using admin/test as credentials.
diff --git a/bin/run_all.sh b/bin/run_all.sh
index fc38dd0dee..d573970160 100755
--- a/bin/run_all.sh
+++ b/bin/run_all.sh
@@ -118,7 +118,7 @@ startProject(){
         cd $OF_HOME
         java -Xss512k -XX:MaxRAM=512m $debugOptions \
              -jar $projectBuildPath/libs/$1-$version.jar \
-             $applicationOptions 2>&1 > $projectBuildPath/logs/$(date -I).log &
+             $applicationOptions 2>&1 > $projectBuildPath/logs/$(date \+"%y-%m-%d").log &
 #        set +x
         echo $! > $projectBuildPath/PIDFILE
 
@@ -166,7 +166,7 @@ stopCommand(){
   for ((i=0; i<${#dependentProjects[*]}; ));
   do
     stopProject ${dependentProjects[i]} ${dependentProjects[i+1]}
-    i=$((i+"$PRJ_STRC_FIELDS"))
+    i=$((i+$PRJ_STRC_FIELDS))
   done
 }
 
@@ -192,7 +192,7 @@ hardstopCommand(){
   for ((i=0; i<${#dependentProjects[*]}; ));
   do
     hardstopProject ${dependentProjects[i]} ${dependentProjects[i+1]}
-    i=$((i+"$PRJ_STRC_FIELDS"))
+    i=$((i+$PRJ_STRC_FIELDS))
   done
 }
 
diff --git a/config/docker/docker-compose.sh b/config/docker/docker-compose.sh
index 576d47d5b3..1e3bffa846 100755
--- a/config/docker/docker-compose.sh
+++ b/config/docker/docker-compose.sh
@@ -1,7 +1,21 @@
 #!/bin/bash
 
+echo "Usage: "
+echo "   1: ./docker-compose.sh"
+echo "   2: ./docker-compose.sh <pathToExternalEnvironmentFile>"
+
 echo USER_ID="$(id -u)" > .env
 echo USER_GID="$(id -g)" >> .env
 # create directory for bundle storage if not existing
 mkdir -p businessconfig-storage
+if [ "$#" -eq 0 ]; then
+  echo CONFIG_PATH=./ >> .env
+  echo SPRING_PROFILES_ACTIVE=docker >> .env
+else
+  EXTERNAL_CONFIGURATION_FILE=$1
+  CONFIG_PATH=$(dirname "$1")
+  cat ${EXTERNAL_CONFIGURATION_FILE} >> .env
+  echo CONFIG_PATH="$CONFIG_PATH" >> .env
+fi
+cat .env
 docker-compose up -d
diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml
index d959fc10c9..6014b88650 100755
--- a/config/docker/docker-compose.yml
+++ b/config/docker/docker-compose.yml
@@ -34,10 +34,13 @@ services:
      - "2103:8080"
 #    Debug port closed for security reasons, be careful if you open it 
 #     - "4103:5005"
+    environment:
+      - SPRING_PROFILES_ACTIVE
     volumes:
     - "../certificates:/certificates_to_add"
     - "./users-docker.yml:/config/application.yml"
     - "./common-docker.yml:/config/common-docker.yml"
+    - ${CONFIG_PATH}:/external-config
   businessconfig:
     container_name: businessconfig
     image: "lfeoperatorfabric/of-businessconfig-business-service:SNAPSHOT"
@@ -48,11 +51,14 @@ services:
      - "2100:8080"
 #    Debug port closed for security reasons, be careful if you open it 
 #     - "4100:5005"
+    environment:
+      - SPRING_PROFILES_ACTIVE
     volumes:
      - "../certificates:/certificates_to_add"
      - "./businessconfig-storage:/businessconfig-storage"
      - "./common-docker.yml:/config/common-docker.yml"
      - "./businessconfig-docker.yml:/config/application-docker.yml"
+     - ${CONFIG_PATH}:/external-config
   cards-publication:
     container_name: cards-publication
     image: "lfeoperatorfabric/of-cards-publication-business-service:SNAPSHOT"
@@ -63,10 +69,13 @@ services:
      - "2102:8080"
 #    Debug port closed for security reasons, be careful if you open it 
 #     - "4102:5005"
+    environment:
+      - SPRING_PROFILES_ACTIVE
     volumes:
       - "../certificates:/certificates_to_add"
       - "./common-docker.yml:/config/common-docker.yml"
       - "./cards-publication-docker.yml:/config/application-docker.yml"
+      - ${CONFIG_PATH}:/external-config
   cards-consultation:
     container_name: cards-consultation
     image: "lfeoperatorfabric/of-cards-consultation-business-service:SNAPSHOT"
@@ -75,10 +84,13 @@ services:
      - "2104:8080"
 #    Debug port closed for security reasons, be careful if you open it 
 #     - "4104:5005"
+    environment:
+      - SPRING_PROFILES_ACTIVE
     volumes:
       - "../certificates:/certificates_to_add"
       - "./common-docker.yml:/config/common-docker.yml"
       - "./cards-consultation-docker.yml:/config/application-docker.yml"
+      - ${CONFIG_PATH}:/external-config
   web-ui:
     image: "lfeoperatorfabric/of-web-ui:SNAPSHOT"
     ports:
diff --git a/services/core/businessconfig/src/main/docker/Dockerfile b/services/core/businessconfig/src/main/docker/Dockerfile
index 09d933de60..3edfe32b9f 100755
--- a/services/core/businessconfig/src/main/docker/Dockerfile
+++ b/services/core/businessconfig/src/main/docker/Dockerfile
@@ -12,6 +12,9 @@ RUN apk add bash curl --no-cache
 ENV http_proxy=""
 ENV https_proxy=""
 ENV HTTP_PROXY_AUTH=""
+ENV SPRING_CONFIG_NAME common,application,businessconfig
+ENV SPRING_PROFILES_ACTIVE docker
+ENV SPRING_CONFIG_LOCATION ./config/,./external-config/
 RUN env
 COPY add-certificates.sh /add-certificates.sh
 COPY java-config-docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/services/core/cards-consultation/src/main/docker/Dockerfile b/services/core/cards-consultation/src/main/docker/Dockerfile
index a34e52320a..9e7494d740 100755
--- a/services/core/cards-consultation/src/main/docker/Dockerfile
+++ b/services/core/cards-consultation/src/main/docker/Dockerfile
@@ -12,10 +12,13 @@ RUN apk add bash curl --no-cache
 ENV http_proxy=""
 ENV https_proxy=""
 ENV HTTP_PROXY_AUTH=""
+ENV SPRING_CONFIG_NAME common,application,cards-consultation
+ENV SPRING_PROFILES_ACTIVE docker
+ENV SPRING_CONFIG_LOCATION ./config/,./external-config/
 RUN env
 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/application-docker.yml
+COPY cards-consultation-docker.yml /config/
 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 c169911006..f62492b8ab 100755
--- a/services/core/cards-publication/src/main/docker/Dockerfile
+++ b/services/core/cards-publication/src/main/docker/Dockerfile
@@ -12,10 +12,13 @@ RUN apk add bash curl --no-cache
 ENV http_proxy=""
 ENV https_proxy=""
 ENV HTTP_PROXY_AUTH=""
+ENV SPRING_CONFIG_NAME common,application,cards-publication
+ENV SPRING_PROFILES_ACTIVE docker
+ENV SPRING_CONFIG_LOCATION ./config/,./external-config/
 RUN env
 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/application-docker.yml
+COPY cards-publication-docker.yml /config/
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/services/core/users/src/main/docker/Dockerfile b/services/core/users/src/main/docker/Dockerfile
index c5ece31060..f8ea4299f8 100755
--- a/services/core/users/src/main/docker/Dockerfile
+++ b/services/core/users/src/main/docker/Dockerfile
@@ -12,6 +12,9 @@ RUN apk add bash curl --no-cache
 ENV http_proxy=""
 ENV https_proxy=""
 ENV HTTP_PROXY_AUTH=""
+ENV SPRING_CONFIG_NAME common,application,users
+ENV SPRING_PROFILES_ACTIVE docker
+ENV SPRING_CONFIG_LOCATION ./config/,./external-config/
 RUN env
 COPY add-certificates.sh /add-certificates.sh
 COPY java-config-docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/src/docs/asciidoc/deployment/configuration/configuration.adoc b/src/docs/asciidoc/deployment/configuration/configuration.adoc
index 1d54b1491d..6fb2346ba8 100644
--- a/src/docs/asciidoc/deployment/configuration/configuration.adoc
+++ b/src/docs/asciidoc/deployment/configuration/configuration.adoc
@@ -34,6 +34,22 @@ while the *docker* sub-directory is a specific configuration meant for use in a
 
 == Business service configuration
 
+=== Specify an external configuration
+
+When starting docker in the full docker environment an external environment file could be provided like:
+
+----
+cd ./config/docker
+./docker-compose.sh ~/config/local.env
+----
+In the provided environment file the Spring active profiles can be set.
+
+----
+SPRING_PROFILES_ACTIVE=docker,local
+----
+This way the configuration file 'cards-publication-local.yml' can be provided in the same configuration directory and can be read by SpringBoot
+
+
 === Shared business service configuration
 
 The configuration shared by all business services is in a yaml file, you can find an example with the file
diff --git a/src/main/docker/java-config-docker-entrypoint.sh b/src/main/docker/java-config-docker-entrypoint.sh
index 8864447c07..4a3175a83e 100755
--- a/src/main/docker/java-config-docker-entrypoint.sh
+++ b/src/main/docker/java-config-docker-entrypoint.sh
@@ -13,5 +13,5 @@ cp $JAVA_HOME/jre/lib/security/cacerts /tmp
 chmod u+w /tmp/cacerts
 ./add-certificates.sh /certificates_to_add /tmp/cacerts
 
-java -agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=n -Djavax.net.ssl.trustStore=/tmp/cacerts -Djava.security.egd=file:/dev/./urandom  -jar /app.jar --spring.profiles.active=docker --spring.config.name=common,application $JAVA_OPTIONS
+java -agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=n -Djavax.net.ssl.trustStore=/tmp/cacerts -Djava.security.egd=file:/dev/./urandom  -jar /app.jar $JAVA_OPTIONS
 

From 812fc48d1bce758823d6adec9dd7957c6434975a Mon Sep 17 00:00:00 2001
From: Giovanni Ferrari <giovanni.ferrari@soft.it>
Date: Thu, 18 Feb 2021 10:18:02 +0100
Subject: [PATCH 57/62] [OC-964] Deal with user in more than one entity

---
 .../cards/components/detail/detail.component.ts     | 13 +++++++++----
 .../modules/share/countdown/countdown.component.ts  |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

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 824ef74fac..8540764857 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
@@ -124,6 +124,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
     unsubscribe$: Subject<void> = new Subject<void>();
     public hrefsOfCssLink = new Array<SafeResourceUrl>();
     private _listEntitiesToRespond = new Array<EntityMessage>();
+    private _userEntitiesAllowedToRespond: string[];
     private _htmlContent: SafeHtml;
     private _userContext: UserContext;
     private _lastCards$: Observable<LightCard[]>;
@@ -308,11 +309,11 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
         if (formResult.valid) {
 
             const card: CardForPublishing = {
-                publisher: this.user.entities[0],
+                publisher: this.getUserEntityToRespond(),
                 publisherType: 'ENTITY',
                 processVersion: this.card.processVersion,
                 process: this.card.process,
-                processInstanceId: `${this.card.processInstanceId}_${this.user.entities[0]}`,
+                processInstanceId: `${this.card.processInstanceId}_${this.getUserEntityToRespond()}`,
                 state: this._responseData.state,
                 startDate: this.card.startDate,
                 endDate: this.card.endDate,
@@ -451,6 +452,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
 
     private setEntitiesToRespond() {
         this._listEntitiesToRespond = new Array<EntityMessage>();
+        this._userEntitiesAllowedToRespond = [];
         if (this.card.entitiesAllowedToRespond) {
             this.card.entitiesAllowedToRespond.forEach(entity => {
                 const entityName = this.getEntityName(entity);
@@ -462,6 +464,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
                         });
                 }
             });
+            this._userEntitiesAllowedToRespond = this.card.entitiesAllowedToRespond.filter(x => this.user.entities.includes(x));
         }
     }
 
@@ -481,10 +484,12 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC
 
 
     private isUserInEntityAllowedToRespond(): boolean {
-        if (this.card.entitiesAllowedToRespond) return this.card.entitiesAllowedToRespond.includes(this.user.entities[0]);
-        else return false;
+        return this._userEntitiesAllowedToRespond.length === 1;
     }
 
+    private getUserEntityToRespond() : string {
+        return this._userEntitiesAllowedToRespond.length === 1 ? this._userEntitiesAllowedToRespond[0] : null;
+    }
 
     private doesTheUserHavePermissionToRespond(): boolean {
         let permission = false;
diff --git a/ui/main/src/app/modules/share/countdown/countdown.component.ts b/ui/main/src/app/modules/share/countdown/countdown.component.ts
index cad97e985e..99b0e30865 100644
--- a/ui/main/src/app/modules/share/countdown/countdown.component.ts
+++ b/ui/main/src/app/modules/share/countdown/countdown.component.ts
@@ -63,11 +63,11 @@ export class CountDownComponent implements OnInit, DoCheck, OnChanges, OnDestroy
     }
 
     public isValidatelttd(): boolean {
-        const entityUser = this.userService.getCurrentUserWithPerimeters().userData.entities[0];
 
         if (!this.isArchivePageType()) {
             if (!!this.card.entitiesAllowedToRespond) {
-                return this.card.entitiesAllowedToRespond.includes(entityUser);
+                const intersection = this.card.entitiesAllowedToRespond.filter(x => this.userService.getCurrentUserWithPerimeters().userData.entities.includes(x));
+                return intersection.length === 1;
             } else {
                 return true;
             }

From 6e3fd6834e65b3b2cd2d939896ec0e84bc405782 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 15 Feb 2021 10:25:32 +0100
Subject: [PATCH 58/62] Removing caution comment in users API

---
 .../core/users/src/main/modeling/swagger.yaml | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/services/core/users/src/main/modeling/swagger.yaml b/services/core/users/src/main/modeling/swagger.yaml
index 2543054ee4..9ec614579a 100755
--- a/services/core/users/src/main/modeling/swagger.yaml
+++ b/services/core/users/src/main/modeling/swagger.yaml
@@ -785,7 +785,7 @@ paths:
       tags:
         - entities
       summary: Fetch a list of all existing entities.
-      description: 'Fetch a list of all existing entities, with pagination and filter options. Caution : work is still in progress, please do not use it.'
+      description: 'Fetch a list of all existing entities, with pagination and filter options.'
       operationId: fetchEntities
       produces:
         - application/json
@@ -810,7 +810,7 @@ paths:
       tags:
         - entities
       summary: Create a new entity of users
-      description: 'Create a new entity of users. Caution : work is still in progress, please do not use it.'
+      description: 'Create a new entity of users.'
       operationId: createEntity
       consumes:
         - application/json
@@ -842,7 +842,7 @@ paths:
       tags:
         - entities
       summary: Update existing entity
-      description: 'Update existing entity. Caution : work is still in progress, please do not use it.'
+      description: 'Update existing entity.'
       operationId: updateEntity
       consumes:
         - application/json
@@ -878,7 +878,7 @@ paths:
       tags:
         - entities
       summary: Fetch an existing entity of users
-      description: 'Fetch an existing entity of users. Caution : work is still in progress, please do not use it.'
+      description: 'Fetch an existing entity of users.'
       operationId: fetchEntity
       produces:
         - application/json
@@ -932,7 +932,7 @@ paths:
       summary: Update list of entity users
       description: >-
         Update list of entity users, users not included in given list are removed
-        from entity. Caution : work is still in progress, please do not use it.
+        from entity.
       operationId: updateEntityUsers
       produces:
         - application/json
@@ -969,7 +969,7 @@ paths:
         - entities
         - users
       summary: Add users to entity
-      description: 'ONLY add users to entity (no deletion). Caution : work is still in progress, please do not use it.'
+      description: 'ONLY add users to entity (no deletion).'
       operationId: addEntityUsers
       produces:
         - application/json
@@ -1004,7 +1004,7 @@ paths:
         - entities
         - users
       summary: Remove all users from entity
-      description: 'remove all users from entity. Caution : work is still in progress, please do not use it.'
+      description: 'remove all users from entity.'
       operationId: deleteEntityUsers
       produces:
         - application/json
@@ -1031,7 +1031,7 @@ paths:
         - entities
         - users
       summary: Remove user from entity
-      description: 'ONLY remove user from entity (no addition). Caution : work is still in progress, please do not use it.'
+      description: 'ONLY remove user from entity (no addition).'
       operationId: deleteEntityUser
       produces:
         - application/json
@@ -1062,7 +1062,7 @@ paths:
       tags:
         - perimeters
       summary: Fetch a list of all existing perimeters
-      description: 'Fetch a list of all existing perimeters. Caution : work is still in progress, please do not use it.'
+      description: 'Fetch a list of all existing perimeters.'
       operationId: fetchPerimeters
       produces:
         - application/json
@@ -1097,7 +1097,7 @@ paths:
       tags:
         - perimeters
       summary: Create a new perimeter
-      description: 'Create a new perimeter. Caution : work is still in progress, please do not use it.'
+      description: 'Create a new perimeter.'
       operationId: createPerimeter
       consumes:
         - application/json
@@ -1125,7 +1125,7 @@ paths:
       tags:
         - perimeters
       summary: Update existing perimeter
-      description: 'Update existing perimeter. Caution : work is still in progress, please do not use it.'
+      description: 'Update existing perimeter.'
       operationId: updatePerimeter
       consumes:
         - application/json
@@ -1161,7 +1161,7 @@ paths:
       tags:
         - perimeters
       summary: Fetch an existing perimeter
-      description: 'Fetch an existing perimeter. Caution : work is still in progress, please do not use it.'
+      description: 'Fetch an existing perimeter.'
       operationId: fetchPerimeter
       produces:
         - application/json
@@ -1214,7 +1214,7 @@ paths:
         - groups
       summary: Update list of groups that have this perimeter
       description: >-
-        Update list of groups that have this perimeter, groups not included in given list lose this perimeter. Caution : work is still in progress, please do not use it.
+        Update list of groups that have this perimeter, groups not included in given list lose this perimeter.
       operationId: updatePerimeterGroups
       produces:
         - application/json
@@ -1250,7 +1250,7 @@ paths:
         - perimeters
         - groups
       summary: Add groups to perimeter
-      description: 'ONLY add groups to perimeter (no deletion). Caution : work is still in progress, please do not use it.'
+      description: 'ONLY add groups to perimeter (no deletion).'
       operationId: addPerimeterGroups
       produces:
         - application/json
@@ -1285,7 +1285,7 @@ paths:
         - perimeters
         - groups
       summary: Remove all groups from perimeter
-      description: 'remove all groups from perimeter. Caution : work is still in progress, please do not use it.'
+      description: 'remove all groups from perimeter.'
       operationId: deletePerimeterGroups
       produces:
         - application/json
@@ -1312,7 +1312,7 @@ paths:
         - perimeters
         - groups
       summary: Remove group from perimeter
-      description: 'ONLY remove group from perimeter (no addition). Caution : work is still in progress, please do not use it.'
+      description: 'ONLY remove group from perimeter (no addition).'
       operationId: deletePerimeterGroup
       produces:
         - application/json
@@ -1344,7 +1344,7 @@ paths:
         - groups
         - perimeters
       summary: Fetch an existing group's perimeters
-      description: "Fetch existing group's perimeters from their id. Caution : work is still in progress, please do not use it."
+      description: "Fetch existing group's perimeters from their id."
       operationId: fetchGroupPerimeters
       produces:
         - application/json
@@ -1389,7 +1389,7 @@ paths:
         - perimeters
       summary: Update list of perimeters for group
       description: >-
-        Update list of perimeters for group, perimeters not included in given list are no longer linked to the group. Caution : work is still in progress, please do not use it.
+        Update list of perimeters for group, perimeters not included in given list are no longer linked to the group.
       operationId: updateGroupPerimeters
       produces:
         - application/json
@@ -1425,7 +1425,7 @@ paths:
         - groups
         - perimeters
       summary: Add perimeters to group
-      description: 'ONLY add perimeters to group (no deletion). Caution : work is still in progress, please do not use it.'
+      description: 'ONLY add perimeters to group (no deletion).'
       operationId: addGroupPerimeters
       produces:
         - application/json
@@ -1461,7 +1461,7 @@ paths:
         - users
         - perimeters
       summary: Fetch an existing user's perimeters
-      description: "Fetch existing user's perimeters from their login. Caution : work is still in progress, please do not use it."
+      description: "Fetch existing user's perimeters from their login."
       operationId: fetchUserPerimeters
       produces:
         - application/json
@@ -1507,7 +1507,7 @@ paths:
       tags:
         - users
       summary: Get information about the user connected and his perimeters
-      description: 'Get information about the user connected and his perimeters. Caution : work is still in progress, please do not use it.'
+      description: 'Get information about the user connected and his perimeters.'
       operationId: fetchCurrentUserWithPerimeters
       produces:
         - application/json

From 071807fd498948f302bce5cbd471f221c1408e7b Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Tue, 16 Feb 2021 15:26:07 +0100
Subject: [PATCH 59/62] OC-1431 - Display names rather than IDs for
 entities/groups in the users table

---
 .../app/modules/admin/admin-rooting.module.ts | 26 ------
 .../app/modules/admin/admin-routing.module.ts | 48 ++++++++++
 .../app/modules/admin/admin.component.html    | 26 ++----
 .../src/app/modules/admin/admin.component.ts  | 45 ++-------
 ui/main/src/app/modules/admin/admin.module.ts | 19 +++-
 .../edit-entity-group-modal.component.ts      | 29 +++---
 .../table/action-cell-renderer.component.ts   | 12 ++-
 ...ponent.html => admin-table.directive.html} |  0
 .../components/table/admin-table.directive.ts | 92 ++++++++++++-------
 .../table/array-cell-renderer.component.html  |  9 ++
 .../table/array-cell-renderer.component.ts    | 72 +++++++++++++++
 .../table/entities-table.component.ts         | 15 ++-
 .../table/entity-cell-renderer.component.ts   | 26 ++++++
 .../table/group-cell-renderer.component.ts    | 25 +++++
 .../table/groups-table.component.ts           | 15 ++-
 .../components/table/users-table.component.ts | 14 ++-
 .../admin/services/id-validator.service.ts    | 38 --------
 .../modules/admin/services/sharing.service.ts | 85 +++++++++++++++++
 .../src/app/services/cached-crud-service.ts   | 21 +++++
 ui/main/src/app/services/crud-service.ts      |  4 +-
 ui/main/src/app/services/entities.service.ts  | 33 +++++--
 ui/main/src/app/services/groups.service.ts    | 19 +++-
 22 files changed, 452 insertions(+), 221 deletions(-)
 delete mode 100644 ui/main/src/app/modules/admin/admin-rooting.module.ts
 create mode 100644 ui/main/src/app/modules/admin/admin-routing.module.ts
 rename ui/main/src/app/modules/admin/components/table/{admin-table.component.html => admin-table.directive.html} (100%)
 create mode 100644 ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html
 create mode 100644 ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts
 create mode 100644 ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts
 delete mode 100644 ui/main/src/app/modules/admin/services/id-validator.service.ts
 create mode 100644 ui/main/src/app/modules/admin/services/sharing.service.ts
 create mode 100644 ui/main/src/app/services/cached-crud-service.ts

diff --git a/ui/main/src/app/modules/admin/admin-rooting.module.ts b/ui/main/src/app/modules/admin/admin-rooting.module.ts
deleted file mode 100644
index 301898c00e..0000000000
--- a/ui/main/src/app/modules/admin/admin-rooting.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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
- * 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 {RouterModule, Routes} from '@angular/router';
-import {AdminComponent} from './admin.component';
-
-const routes: Routes = [
-    {
-        path: '**',
-        component: AdminComponent
-    }
-];
-
-@NgModule({
-    imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule]
-})
-export class AdminRoutingModule { }
diff --git a/ui/main/src/app/modules/admin/admin-routing.module.ts b/ui/main/src/app/modules/admin/admin-routing.module.ts
new file mode 100644
index 0000000000..0c1a443ef3
--- /dev/null
+++ b/ui/main/src/app/modules/admin/admin-routing.module.ts
@@ -0,0 +1,48 @@
+/* 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
+ * 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 {RouterModule, Routes} from '@angular/router';
+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';
+
+const defaultPath = 'users';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: AdminComponent,
+        children: [
+            {
+                path: 'users',
+                component: UsersTableComponent
+            },
+            {
+                path: 'entities',
+                component: EntitiesTableComponent
+            },
+            {
+                path: 'groups',
+                component: GroupsTableComponent
+            },
+            {   path: '**',
+                redirectTo: defaultPath
+            }
+        ]
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class AdminRoutingModule { }
diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html
index 58722dbada..d123337ffa 100644
--- a/ui/main/src/app/modules/admin/admin.component.html
+++ b/ui/main/src/app/modules/admin/admin.component.html
@@ -12,34 +12,20 @@
   <ul class="nav nav-pills">
 
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='users'}" data-toggle="tab" href="#admin/users" (click)="setActiveTab('users')" translate> admin.tabs.users </a>
+      <a class="nav-link" data-toggle="tab" routerLink="/admin/users" routerLinkActive="active" translate> admin.tabs.users </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='entities'}" data-toggle="tab" href="#admin/entities" (click)="setActiveTab('entities')" translate> admin.tabs.entities </a>
+      <a class="nav-link" data-toggle="tab" routerLink="/admin/entities" routerLinkActive="active" translate> admin.tabs.entities </a>
     </li>
     <li class="nav-item">
-      <a class="nav-link" [ngClass]="{ 'active':activeTab==='groups'}" data-toggle="tab" href="#admin/groups" (click)="setActiveTab('groups')" translate> admin.tabs.groups </a>
+      <a class="nav-link" data-toggle="tab" routerLink="/admin/groups" routerLinkActive="active" translate> admin.tabs.groups </a>
     </li>
 
   </ul>
+  <br>
+  <br>
 
-  <div class="tab-content">
-    <div class="tab-pane active" id="admin/users" [ngClass]="{ 'active':activeTab==='users'}">
-      <br>
-      <br>
-      <of-users-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-users-table>
-    </div>
-    <div class="tab-pane" id="admin/entities" [ngClass]="{ 'active':activeTab==='entities'}">
-      <br>
-      <br>
-      <of-entities-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-entities-table>
-    </div>
-    <div class="tab-pane" id="admin/groups" [ngClass]="{ 'active':activeTab==='groups'}">
-      <br>
-      <br>
-      <of-groups-table (dataUpdate)="propagateUpdate($event)" [paginationPageSize]="paginationPageSize"></of-groups-table>
-    </div>
-  </div>
+  <router-outlet></router-outlet>
 
   <br>
   <br>
diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts
index 501941fb6e..3a425d4e4c 100644
--- a/ui/main/src/app/modules/admin/admin.component.ts
+++ b/ui/main/src/app/modules/admin/admin.component.ts
@@ -9,70 +9,37 @@
  */
 
 
-import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {Store} from '@ngrx/store';
 import {TranslateService} from '@ngx-translate/core';
 import {AppState} from '@ofStore/index';
-import {GroupsService} from '@ofServices/groups.service';
-import {Subject} from 'rxjs';
-import {takeUntil} from 'rxjs/operators';
-import {AdminTableType} from './components/table/admin-table.directive';
-import {UsersTableComponent} from './components/table/users-table.component';
+import {SharingService} from './services/sharing.service';
 
 @Component({
   selector: 'of-admin',
   templateUrl: './admin.component.html',
   styleUrls: ['./admin.component.scss']
 })
-export class AdminComponent implements OnInit, OnDestroy {
-
-  unsubscribe$: Subject<void> = new Subject<void>();
-
-  activeTab: string;
+export class AdminComponent implements OnInit {
 
   public paginationDefaultPageSize = 10;
   public paginationPageSizeOptions = [5, 10, 25, 50, 100];
-  public paginationPageSize = this.paginationDefaultPageSize;
-
-  @ViewChild(UsersTableComponent)
-  private usersTableComponent: UsersTableComponent;
 
   constructor(private route: ActivatedRoute,
               protected store: Store<AppState>,
               protected translate: TranslateService,
-              private groupsService: GroupsService) {
+              private dataHandlingService: SharingService) {
   }
 
   ngOnInit() {
-    const url = this.route.snapshot.url.join('').trim();
-    this.activeTab = (url.length !== 0) ? url : 'users';
-
-    // Initialization necessary for groups 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();
-  }
-
-  setActiveTab(tab: string): void {
-    this.activeTab = tab;
+    this.dataHandlingService.changePaginationPageSize(this.paginationDefaultPageSize);
   }
 
   onPageSizeChanged() {
     // Cast to get rid of "Property 'value' does not exist on type 'HTMLElement'."
     const value = (<HTMLInputElement> document.getElementById('page-size-select')).value;
-    this.paginationPageSize = Number(value);
-  }
-
-  ngOnDestroy() {
-    this.unsubscribe$.next();
-    this.unsubscribe$.complete();
+    this.dataHandlingService.changePaginationPageSize(Number(value));
   }
 
-/** After an update on the entities (resp. groups) screen, both entity and user data need to be refreshed as changes to an
- * entity (deletion, name change) need to be taken into account in users that belonged to this entity as well. */
-  propagateUpdate(event) {
-      if (event === AdminTableType.ENTITY || event === AdminTableType.GROUP) {
-        this.usersTableComponent.refreshData();
-      }
-  }
 }
diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts
index cb7f29d8f1..6aad6ba628 100644
--- a/ui/main/src/app/modules/admin/admin.module.ts
+++ b/ui/main/src/app/modules/admin/admin.module.ts
@@ -13,7 +13,7 @@ import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AdminComponent} from './admin.component';
 import {PaginationModule} from 'ngx-bootstrap/pagination';
-import {AdminRoutingModule} from './admin-rooting.module';
+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';
@@ -22,9 +22,13 @@ 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 {ActionCellRendererComponent} from './components/table/action-cell-renderer.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 {SharingService} from './services/sharing.service';
 
 @NgModule({
   declarations: [
@@ -35,7 +39,10 @@ import {MultiFilterModule} from '../share/multi-filter/multi-filter.module';
     EditUserModalComponent,
     ConfirmationDialogComponent,
     EditEntityGroupModalComponent,
-    ActionCellRendererComponent
+    ActionCellRendererComponent,
+    ArrayCellRendererComponent,
+    GroupCellRendererComponent,
+    EntityCellRendererComponent
   ],
 
 
@@ -49,10 +56,14 @@ import {MultiFilterModule} from '../share/multi-filter/multi-filter.module';
     , TranslateModule
     , AgGridModule.withComponents([[
       ActionCellRendererComponent,
+      ArrayCellRendererComponent,
+      GroupCellRendererComponent,
+      EntityCellRendererComponent
     ]])
   ],
   providers: [
-      { provide: ErrorHandler, useClass: AppErrorHandler },
+    { provide: ErrorHandler, useClass: AppErrorHandler },
+    { provide: SharingService, useClass: SharingService}
   ]
 })
 export class AdminModule { }
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/groups-entities/edit-entity-group-modal.component.ts
index 31d6a49221..6f464e1e68 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/groups-entities/edit-entity-group-modal.component.ts
@@ -12,9 +12,8 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {FormControl, FormGroup, Validators} from '@angular/forms';
 import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
-import {EntitiesService} from '@ofServices/entities.service';
-import {GroupsService} from '@ofServices/groups.service';
-import {AdminTableType} from '../../table/admin-table.directive';
+import {AdminItemType, SharingService} from '../../../services/sharing.service';
+import {CrudService} from '@ofServices/crud-service';
 
 @Component({
   selector: 'of-edit-entity-group-modal',
@@ -31,15 +30,18 @@ export class EditEntityGroupModalComponent implements OnInit {
   });
 
   @Input() row: any;
-  @Input() type: AdminTableType;
+  @Input() type: AdminItemType;
+
+  private crudService: CrudService;
 
   constructor(
     private activeModal: NgbActiveModal,
-    private groupsService: GroupsService,
-    private entitiesService: EntitiesService) {
+    private dataHandlingService: SharingService
+  ) {
   }
 
   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 });
     }
@@ -50,17 +52,10 @@ export class EditEntityGroupModalComponent implements OnInit {
     // 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.
-    if (this.type === AdminTableType.ENTITY) {
-      this.entitiesService.update(this.entityGroupForm.value).subscribe(() => {
-        this.activeModal.close('Update button clicked on ' + this.type + ' modal');
-      });
-    }
-    if (this.type === AdminTableType.GROUP) {
-      this.groupsService.update(this.entityGroupForm.value).subscribe(() => {
-        this.activeModal.close('Update button clicked on ' + this.type + ' modal');
-      });
-    }
+    // `NgbModalRef.result` promise to trigger a refresh of the data shown on the table.
+    this.crudService.update(this.entityGroupForm.value).subscribe(() => {
+      this.activeModal.close('Update button clicked on ' + this.type + ' modal');
+    });
   }
 
   private cleanForm() {
diff --git a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
index a2bde64e44..b8ac94b7eb 100644
--- a/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
+++ b/ui/main/src/app/modules/admin/components/table/action-cell-renderer.component.ts
@@ -10,6 +10,7 @@
 
 import {Component} from '@angular/core';
 import {ICellRendererAngularComp} from 'ag-grid-angular';
+import {ICellRendererParams} from 'ag-grid-community';
 
 @Component({
   selector: 'of-action-cell-renderer',
@@ -37,11 +38,16 @@ export class ActionCellRendererComponent implements ICellRendererAngularComp {
     this.params.context.componentParent.openActionModal(this.params);
   }
 
-  refresh(): boolean {
-    return false;
+
+  // noinspection JSUnusedLocalSymbols
+  /** 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;
   }
 
-  getIconForAction() : string {
+  getIconForAction(): string {
     return this.actionIconsMapping[this.actionType];
   }
 }
diff --git a/ui/main/src/app/modules/admin/components/table/admin-table.component.html b/ui/main/src/app/modules/admin/components/table/admin-table.directive.html
similarity index 100%
rename from ui/main/src/app/modules/admin/components/table/admin-table.component.html
rename to ui/main/src/app/modules/admin/components/table/admin-table.directive.html
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 9119c6927b..4d25e5eac0 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
@@ -8,28 +8,34 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {Directive, EventEmitter, Injectable, Input, OnChanges, OnInit, Output} from '@angular/core';
+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 {throwError} from 'rxjs';
+import {Subject, throwError} from 'rxjs';
 import {ConfirmationDialogService} from '../../services/confirmation-dialog.service';
-import {ActionCellRendererComponent} from './action-cell-renderer.component';
 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 {AdminItemType, SharingService} from '../../services/sharing.service';
+import {takeUntil} from 'rxjs/operators';
 
 @Directive()
 @Injectable()
-export abstract class AdminTableDirective implements OnInit, OnChanges {
+export abstract class AdminTableDirective implements OnInit, OnDestroy {
+
+  unsubscribe$: Subject<void> = new Subject<void>();
 
   // 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;
-  /** Type of data managed by the table (e.g. `AdminTableType.ENTITY`) */
-  protected tableType: AdminTableType;
+  /** 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: string[];
+  protected fields: Field[];
   /** Among these fields, which one represents an item's unique id (e.g. `id`) */
   protected idField: string;
 
@@ -38,28 +44,23 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
   public gridApi;
   public rowData: any;
 
-  @Input()
-  public paginationPageSize;
-
-  /** This is used to notify the admin component that data has been changed so it can trigger a refresh for related data, passing the
-   * tableType as payload to know which data has been changed. */
-  @Output()
-  public dataUpdate = new EventEmitter<AdminTableType>();
-
   protected i18NPrefix = 'admin.input.';
+  protected crudService: CrudService;
 
   constructor(
       protected translateService: TranslateService,
       protected confirmationDialogService: ConfirmationDialogService,
       protected modalService: NgbModal,
-      protected crudService: CrudService) {
+      protected dataHandlingService: SharingService) {
 
     this.gridOptions = <GridOptions>{
       context: {
         componentParent: this
       },
       frameworkComponents : {
-        actionCellRenderer: ActionCellRendererComponent
+        actionCellRenderer: ActionCellRendererComponent,
+        groupCellRenderer: GroupCellRendererComponent,
+        entityCellRenderer: EntityCellRendererComponent
       },
       domLayout: 'autoHeight',
       defaultColDef : {
@@ -78,8 +79,7 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
         'dataColumn': {
           sortable: true,
           filter: true,
-          flex: 3
-
+          flex: 2
         }
       },
       localeTextFunc : function (key) {
@@ -96,13 +96,10 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
   }
 
   ngOnInit() {
+    this.crudService = this.dataHandlingService.resolveCrudServiceDependingOnType(this.tableType);
     this.refreshData();
   }
 
-  ngOnChanges() {
-    if (!!this.gridApi) this.gridApi.paginationSetPageSize(this.paginationPageSize);
-  }
-
   public localizeHeader(parameters: ICellRendererParams): string {
     const headerIdentifier = parameters.colDef.headerName;
     return this.translateService.instant(this.i18NPrefix + headerIdentifier);
@@ -114,7 +111,12 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
     // property that is defined in the classes implementing AdminTableDirective. As such, it is still undefined when the
     // constructor from the supertype is called.
     this.gridApi.setColumnDefs(this.createColumnDefs(this.fields, this.tableType + '.'));
-    this.gridApi.paginationSetPageSize(this.paginationPageSize);
+    this.dataHandlingService.paginationPageSize$
+        .pipe(takeUntil(this.unsubscribe$))
+        .subscribe(pageSize => {
+          this.gridApi.paginationSetPageSize(pageSize);
+        });
+
   }
 
   /** This function generates the ag-grid `ColumnDefs` for the grid from a list of fields
@@ -123,15 +125,22 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
    * @param i18nPrefixForHeader: optional prefix to add to the field name to create the relevant i18nKey
    * @return ColDef[] object containing the column definitions for the grid
    * */
-  createColumnDefs(fields: string[], i18nPrefixForHeader?: string): ColDef[] {
+  createColumnDefs(fields: Field[], i18nPrefixForHeader?: string): ColDef[] {
     // if provided, i18nPrefixForHeader should have trailing dot
 
     // Create data columns from fields
     let columnDefs: ColDef[];
     columnDefs = new Array(fields.length + 2); // +2 because 2 action columns (see below)
 
-    fields.forEach((field: string, index: number) => {
-      columnDefs[index] = { headerName: i18nPrefixForHeader + field, field: field, type: 'dataColumn'};
+    fields.forEach((field: Field, index: number) => {
+      const columnDef = {
+        type: 'dataColumn',
+        headerName: i18nPrefixForHeader + field.name,
+        field: field.name
+      };
+      if (!!field.flex) columnDef['flex'] = field.flex;
+      if (!!field.cellRendererName) columnDef['cellRenderer'] = field.cellRendererName;
+      columnDefs[index] = columnDef;
     });
 
     // Add action columns
@@ -159,7 +168,6 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
       modalRef.result.then(
           () => { // If modal is closed
             this.refreshData(); // This refreshes the data when the modal is closed after a change
-            this.dataUpdate.emit(this.tableType);
           },
           () => { }); // 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
@@ -182,9 +190,8 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
         // handled first
         this.crudService.deleteById(row[this.idField])
             .subscribe(() => {
-          this.refreshData();
-          this.dataUpdate.emit(this.tableType);
-        }); // TODO unsubscribe on destroy?
+              this.refreshData();
+            });
       }
     }).catch(() => throwError(new AppError(null)));
   }
@@ -207,9 +214,26 @@ export abstract class AdminTableDirective implements OnInit, OnChanges {
     this.rowData = this.crudService.getAll();
   }
 
-}
+  ngOnDestroy() {
+    this.unsubscribe$.next();
+    this.unsubscribe$.complete();
+  }
 
-export enum AdminTableType {
-  USER = 'user', ENTITY = 'entity', GROUP = 'group'
 }
 
+export class Field {
+
+  public name: string;
+  public flex: number;
+  public cellRendererName: string;
+
+  /**@param name: should match the property name in the underlying row data. Will be used as key to find i18n label for the column header.
+   @param flex: Sets the column size relative to others
+   @param cellRendererName: needs to match one of the renderers defined under `frameworkComponents` in the `gridOptions` above.
+   * */
+  constructor(name: string, flex?: number, cellRendererName?: string) {
+    this.name = name;
+    this.flex = flex;
+    this.cellRendererName = cellRendererName;
+  }
+}
diff --git a/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html b/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html
new file mode 100644
index 0000000000..1d2d34eee5
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.html
@@ -0,0 +1,9 @@
+<!-- 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.                      -->
+
+<span>{{nameValues}}</span>
diff --git a/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts
new file mode 100644
index 0000000000..5514d73a42
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/array-cell-renderer.component.ts
@@ -0,0 +1,72 @@
+/* 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 {CachedCrudService} from '@ofServices/cached-crud-service';
+import {AdminItemType, SharingService} from '../../services/sharing.service';
+
+@Component({
+  selector: 'of-array-cell-renderer',
+  templateUrl: 'array-cell-renderer.component.html'
+})
+export class ArrayCellRendererComponent implements ICellRendererAngularComp {
+
+    protected itemType: AdminItemType;
+    private mapping: any[];
+    private cachedCrudService: CachedCrudService;
+
+  constructor(protected dataHandlingService: SharingService) {
+  }
+
+  // For explanations regarding ag-grid CellRenderers see
+  // https://www.ag-grid.com/documentation/angular/component-cell-renderer/#example-rendering-using-angular-components
+  private _nameValues: string;
+
+
+  agInit(params: any): void {
+
+      this.cachedCrudService = this.dataHandlingService.resolveCachedCrudServiceDependingOnType(this.itemType);
+      this.mapping = this.cachedCrudService.getCachedValues();
+    // Look up code in values returned by the corresponding service, if it exists return corresponding name, otherwise return code
+      if (!!this.mapping) {
+          this._nameValues = params.getValue().map(code  => {
+                  // This entails that the items that need to be rendered have an `id` and a `name` property.
+                  // I tried defining an interface to enforce that but it made the code very cumbersome so it didn't look worth the effort
+                  // for now.
+                  const lookedUpName = this.mapping.filter(cachedItem => code === cachedItem['id'])
+                                                    .map(cachedItem => cachedItem['name']);
+                  if (lookedUpName.length !== 0) {
+                      return lookedUpName[0] ? lookedUpName[0] : code;
+                  } else {
+                      return code;
+                  }
+              }
+          ).join(', ');
+      } else {
+          console.log('Admin table: id/name mapping was undefined for ' + this.itemType);
+          this._nameValues = 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 nameValues(): string {
+    return this._nameValues;
+  }
+
+}
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 8f0965c313..76b42ece02 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
@@ -9,21 +9,18 @@
  */
 
 import {Component, OnInit} from '@angular/core';
-import {CrudService} from "@ofServices/crud-service";
-import {HttpClient} from "@angular/common/http";
-import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
-import {EntitiesService} from "@ofServices/entities.service";
-import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
+import {AdminTableDirective, Field} from './admin-table.directive';
+import {EditEntityGroupModalComponent} from '../editmodal/groups-entities/edit-entity-group-modal.component';
+import {AdminItemType} from '../../services/sharing.service';
 
 @Component({
-  templateUrl: 'admin-table.component.html',
-  providers:  [{provide: CrudService, useClass: EntitiesService, deps: [HttpClient]}],
+  templateUrl: 'admin-table.directive.html',
   selector: 'of-entities-table'
 })
 export class EntitiesTableComponent extends AdminTableDirective implements OnInit {
 
-  tableType = AdminTableType.ENTITY;
-  fields = ['id', 'name', 'description'];
+  tableType = AdminItemType.ENTITY;
+  fields = [new Field('id'), new Field('name'), new Field('description')];
   idField = 'id';
   editModalComponent = EditEntityGroupModalComponent;
 
diff --git a/ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts
new file mode 100644
index 0000000000..d11924bb7b
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/entity-cell-renderer.component.ts
@@ -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.
+ */
+
+import {Component} from '@angular/core';
+import {ArrayCellRendererComponent} from './array-cell-renderer.component';
+import {AdminItemType} from '../../services/sharing.service';
+
+
+@Component({
+    selector: 'of-entity-cell-renderer',
+    templateUrl: 'array-cell-renderer.component.html'
+})
+export class EntityCellRendererComponent 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.ENTITY;
+}
diff --git a/ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts b/ui/main/src/app/modules/admin/components/table/group-cell-renderer.component.ts
new file mode 100644
index 0000000000..eea8b0df2c
--- /dev/null
+++ b/ui/main/src/app/modules/admin/components/table/group-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-group-cell-renderer',
+    templateUrl: 'array-cell-renderer.component.html',
+})
+export class GroupCellRendererComponent 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/table/groups-table.component.ts b/ui/main/src/app/modules/admin/components/table/groups-table.component.ts
index a38925c84b..64397e50c7 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
@@ -9,21 +9,18 @@
  */
 
 import {Component, OnInit} from '@angular/core';
-import {CrudService} from "@ofServices/crud-service";
-import {HttpClient} from "@angular/common/http";
-import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
-import {EditEntityGroupModalComponent} from "../editmodal/groups-entities/edit-entity-group-modal.component";
-import {GroupsService} from "@ofServices/groups.service";
+import {AdminTableDirective, Field} from './admin-table.directive';
+import {EditEntityGroupModalComponent} from '../editmodal/groups-entities/edit-entity-group-modal.component';
+import {AdminItemType} from '../../services/sharing.service';
 
 @Component({
-  templateUrl: 'admin-table.component.html',
-  providers:  [{provide: CrudService, useClass: GroupsService, deps: [HttpClient]}],
+  templateUrl: 'admin-table.directive.html',
   selector: 'of-groups-table'
 })
 export class GroupsTableComponent extends AdminTableDirective implements OnInit {
 
-  tableType = AdminTableType.GROUP;
-  fields = ['id', 'name', 'description'];
+  tableType = AdminItemType.GROUP;
+  fields = [new Field('id'), new Field('name'), new Field('description')];
   idField = 'id';
   editModalComponent = EditEntityGroupModalComponent;
 
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 02f73a561d..1e2e9a35fb 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
@@ -9,21 +9,19 @@
  */
 
 import {Component, OnInit} from '@angular/core';
-import {UserService} from '@ofServices/user.service';
 import {EditUserModalComponent} from '../editmodal/users/edit-user-modal.component';
-import {CrudService} from "@ofServices/crud-service";
-import {HttpClient} from "@angular/common/http";
-import {AdminTableDirective, AdminTableType} from "./admin-table.directive";
+import {AdminTableDirective, Field} from './admin-table.directive';
+import {AdminItemType} from '../../services/sharing.service';
 
 @Component({
-  templateUrl: 'admin-table.component.html',
-  providers:  [{provide: CrudService, useClass: UserService, deps: [HttpClient]}],
+  templateUrl: 'admin-table.directive.html',
   selector: 'of-users-table'
 })
 export class UsersTableComponent extends AdminTableDirective implements OnInit {
 
-  tableType = AdminTableType.USER;
-  fields = ['login', 'firstName', 'lastName', 'groups', 'entities'];
+  tableType = AdminItemType.USER;
+  fields = [new Field('login'), new Field('firstName'), new Field('lastName'),
+    new Field('groups', 5, 'groupCellRenderer'), new Field('entities', 5, 'entityCellRenderer')];
   idField = 'login';
   editModalComponent = EditUserModalComponent;
 
diff --git a/ui/main/src/app/modules/admin/services/id-validator.service.ts b/ui/main/src/app/modules/admin/services/id-validator.service.ts
deleted file mode 100644
index e84944a77c..0000000000
--- a/ui/main/src/app/modules/admin/services/id-validator.service.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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 {AbstractControl, ValidationErrors} from '@angular/forms';
-import {CrudService} from '@ofServices/crud-service';
-
-
-export class IdValidatorService {
-
-  constructor(
-    private crudService: CrudService) {
-  }
-
-  isIdAvailable(control: AbstractControl): Promise<ValidationErrors> | null {
-    return new Promise((resolve, reject) => {
-      this.crudService.getAll().subscribe((response) => {
-        if (response.filter(
-          row => {
-            let id: string;
-            if (row.login) id = row.login;
-            else id = row.id;
-            return id.toLowerCase().trim() === (control.value as string).toLowerCase().trim();
-          }).length > 0) {
-          resolve({ shouldbeUnique: true });
-        } else {
-          resolve(null);
-        }
-      });
-    });
-  }
-}
diff --git a/ui/main/src/app/modules/admin/services/sharing.service.ts b/ui/main/src/app/modules/admin/services/sharing.service.ts
new file mode 100644
index 0000000000..e47e4f748a
--- /dev/null
+++ b/ui/main/src/app/modules/admin/services/sharing.service.ts
@@ -0,0 +1,85 @@
+/* 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 {Injectable, OnDestroy} from '@angular/core';
+import {EntitiesService} from '@ofServices/entities.service';
+import {GroupsService} from '@ofServices/groups.service';
+import {UserService} from '@ofServices/user.service';
+import {CrudService} from '@ofServices/crud-service';
+import {CachedCrudService} from '@ofServices/cached-crud-service';
+import {Observable, ReplaySubject, Subject} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
+
+/** 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.
+ * This is normally doable by defining the providers for Angular's DI in the correct place, but then I couldn't get Angular to provide the
+ * appropriate subclass of `CrudService` depending on the context (I tried making it generic, to no avail).
+ * */
+
+@Injectable()
+export class SharingService implements OnDestroy {
+
+    private readonly _paginationPageSize$: ReplaySubject<number>;
+    private unsubscribe$: Subject<void> = new Subject<void>();
+
+    constructor(private entitiesService: EntitiesService,
+                private groupsService: GroupsService,
+                private userService: UserService) {
+
+        this._paginationPageSize$ = new ReplaySubject<number>();
+
+        // Initialization necessary for groups 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 is a factory method returning the appropriate `CrudService` depending on the type passed as parameter.
+     * */
+    public resolveCrudServiceDependingOnType(adminItemType: AdminItemType): CrudService {
+        switch (adminItemType) {
+            case AdminItemType.ENTITY: return this.entitiesService;
+            case AdminItemType.GROUP: return this.groupsService;
+            case AdminItemType.USER: return this.userService;
+            default: throw Error('No CrudService associated with ' + adminItemType);
+        }
+    }
+
+    /** This is a factory method returning the appropriate `CachedCrudService` depending on the type passed as parameter.
+     * */
+    public resolveCachedCrudServiceDependingOnType(adminItemType: AdminItemType): CachedCrudService {
+        switch (adminItemType) {
+            case AdminItemType.ENTITY: return this.entitiesService;
+            case AdminItemType.GROUP: return this.groupsService;
+            default: throw Error('No CachedCrudService associated with ' + adminItemType);
+        }
+    }
+
+    get paginationPageSize$(): Observable<number> {
+        return this._paginationPageSize$;
+    }
+
+    changePaginationPageSize(value: number) {
+        this._paginationPageSize$.next(value);
+    }
+
+    ngOnDestroy() {
+        this.unsubscribe$.next();
+        this.unsubscribe$.complete();
+    }
+}
+
+/** This enum defines the type of the data managed by an admin table or renderer. When adding a type to this list, please make sure
+ * to also add the corresponding handling to the methods above.
+ * */
+export enum AdminItemType {
+    USER = 'user',
+    ENTITY = 'entity',
+    GROUP = 'group'
+}
diff --git a/ui/main/src/app/services/cached-crud-service.ts b/ui/main/src/app/services/cached-crud-service.ts
new file mode 100644
index 0000000000..67fad1f54b
--- /dev/null
+++ b/ui/main/src/app/services/cached-crud-service.ts
@@ -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 {Injectable} from '@angular/core';
+import {CrudService} from '@ofServices/crud-service';
+
+/** This class further specifies `CrudServices` that maintain a cache of returned values and as such can synchronously provide a
+ * cached version. It inheritance becomes an issue, it could be replaced by a mixin. */
+
+@Injectable({
+    providedIn: 'root'
+})
+export abstract class CachedCrudService extends CrudService {
+  abstract getCachedValues(): Array<any>;
+}
diff --git a/ui/main/src/app/services/crud-service.ts b/ui/main/src/app/services/crud-service.ts
index 518370fd0e..5a3de961b1 100644
--- a/ui/main/src/app/services/crud-service.ts
+++ b/ui/main/src/app/services/crud-service.ts
@@ -8,8 +8,8 @@
  */
 
 import {Observable} from 'rxjs';
-import {Injectable} from "@angular/core";
-import {ErrorService} from "@ofServices/error-service";
+import {Injectable} from '@angular/core';
+import {ErrorService} from '@ofServices/error-service';
 
 @Injectable({
     providedIn: 'root'
diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts
index 44c922ccfb..b853d1669c 100644
--- a/ui/main/src/app/services/entities.service.ts
+++ b/ui/main/src/app/services/entities.service.ts
@@ -9,11 +9,11 @@
 
 import {environment} from '@env/environment';
 import {HttpClient} from '@angular/common/http';
-import {CrudService} from './crud-service';
 import {catchError, takeUntil, tap} from 'rxjs/operators';
 import {Observable, Subject} from 'rxjs';
 import {Entity} from '@ofModel/entity.model';
-import {Injectable} from '@angular/core';
+import {Injectable, OnDestroy} from '@angular/core';
+import {CachedCrudService} from '@ofServices/cached-crud-service';
 
 
 declare const templateGateway: any;
@@ -21,11 +21,11 @@ declare const templateGateway: any;
 @Injectable({
     providedIn: 'root'
 })
-export class EntitiesService extends CrudService {
+export class EntitiesService extends CachedCrudService implements OnDestroy {
 
  readonly entitiesUrl: string;
  private _entities: Entity[];
- private ngUnsubscribe = new Subject<void>();
+ private ngUnsubscribe$ = new Subject<void>();
   /**
    * @constructor
    * @param httpClient - Angular build-in
@@ -34,13 +34,26 @@ export class EntitiesService extends CrudService {
     super();
     this.entitiesUrl = `${environment.urls.entities}`;
   }
+
+  ngOnDestroy() {
+        this.ngUnsubscribe$.next();
+        this.ngUnsubscribe$.complete();
+  }
+
   deleteById(id: string) {
       const url = `${this.entitiesUrl}/${id}`;
     return this.httpClient.delete(url).pipe(
-      catchError((error: Response) => this.handleError(error))
+      catchError((error: Response) => this.handleError(error)),
+        tap(() => {
+            this.deleteFromCachedEntities(id);
+        })
     );
   }
 
+  private deleteFromCachedEntities(id: string): void {
+        this._entities = this._entities.filter(entity => entity.id !== id);
+  }
+
   getAllEntities(): Observable<Entity[]> {
     return this.httpClient.get<Entity[]>(`${this.entitiesUrl}`).pipe(
       catchError((error: Response) => this.handleError(error))
@@ -50,7 +63,7 @@ export class EntitiesService extends CrudService {
   updateEntity(entityData: Entity): Observable<Entity> {
     return this.httpClient.post<Entity>(`${this.entitiesUrl}`, entityData).pipe(
       catchError((error: Response) => this.handleError(error)),
-        tap(next => {
+        tap(() => {
             this.updateCachedEntity(entityData);
         })
     );
@@ -73,7 +86,7 @@ export class EntitiesService extends CrudService {
 
   public loadAllEntitiesData(): Observable<any> {
     return this.getAllEntities()
-      .pipe(takeUntil(this.ngUnsubscribe)
+      .pipe(takeUntil(this.ngUnsubscribe$)
       , tap(
         (entities) => {
           if (!!entities) {
@@ -89,7 +102,11 @@ export class EntitiesService extends CrudService {
     return this._entities;
   }
 
-  public getEntityName(idEntity: string): string {
+  public getCachedValues(): Array<Entity> {
+      return this.getEntities();
+  }
+
+    public getEntityName(idEntity: string): string {
       const name = this._entities.find(entity => entity.id === idEntity).name;
       return (name ? name : idEntity);
     }
diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts
index 7861eb6cfa..34f88d4b01 100644
--- a/ui/main/src/app/services/groups.service.ts
+++ b/ui/main/src/app/services/groups.service.ts
@@ -7,18 +7,18 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {CrudService} from './crud-service';
 import {Observable, Subject} from 'rxjs';
 import {Group} from '@ofModel/group.model';
 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';
 
 @Injectable({
   providedIn: 'root'
 })
-export class GroupsService extends CrudService implements OnDestroy {
+export class GroupsService extends CachedCrudService implements OnDestroy {
 
   readonly groupsUrl: string;
   private _groups: Group[];
@@ -42,10 +42,17 @@ export class GroupsService extends CrudService implements OnDestroy {
   deleteById(id: string) {
     const url = `${this.groupsUrl}/${id}`;
     return this.httpClient.delete(url).pipe(
-      catchError((error: Response) => this.handleError(error))
+      catchError((error: Response) => this.handleError(error)),
+        tap(() => {
+          this.deleteFromCachedGroups(id);
+        })
     );
   }
 
+  private deleteFromCachedGroups(id: string): void {
+    this._groups = this._groups.filter(group => group.id !== id);
+  }
+
   private updateCachedGroups(groupData: Group): void {
     const updatedGroups = this._groups.filter(group => group.id !== groupData.id);
     updatedGroups.push(groupData);
@@ -75,10 +82,14 @@ export class GroupsService extends CrudService implements OnDestroy {
     return this._groups;
   }
 
+  public getCachedValues(): Array<Group> {
+    return this.getGroups();
+  }
+
   updateGroup(groupData: Group): Observable<Group> {
     return this.httpClient.post<Group>(`${this.groupsUrl}`, groupData).pipe(
       catchError((error: Response) => this.handleError(error)),
-        tap(next => {
+        tap(() => {
           this.updateCachedGroups(groupData);
         })
     );

From 607f89df6179a1463cc09d3453382546b9e289b1 Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Thu, 18 Feb 2021 19:54:19 +0100
Subject: [PATCH 60/62] [OC-1425] Export data : title of the columns are not
 translated

---
 .../modules/archives/archives.component.ts    | 17 +++++++++-----
 .../logging-table/logging-table.component.ts  | 16 +++++++++-----
 .../monitoring-table.component.ts             | 22 +++++++++++++------
 ui/main/src/assets/i18n/en.json               |  2 ++
 ui/main/src/assets/i18n/fr.json               |  2 ++
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/ui/main/src/app/modules/archives/archives.component.ts b/ui/main/src/app/modules/archives/archives.component.ts
index b0c1e04cfb..580f3da503 100644
--- a/ui/main/src/app/modules/archives/archives.component.ts
+++ b/ui/main/src/app/modules/archives/archives.component.ts
@@ -361,7 +361,6 @@ export class ArchivesComponent implements OnDestroy, OnInit {
     initExportArchiveData(): void {
         const exportArchiveData = [];
 
-
         this.filters.set('size', [this.resultsNumber.toString()]);
         this.filters.set('page', [0]);
 
@@ -369,15 +368,21 @@ export class ArchivesComponent implements OnDestroy, OnInit {
             .subscribe((page: Page<LightCard>) => {
                 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');
+
                 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({
-                            severity: card.severity,
-                            publishDate: this.timeService.formatDateTime(card.publishDate),
-                            businessDate: this.displayTime(card.startDate) + '-' + this.displayTime(card.endDate),
-                            title: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.title.key, card.title.parameters),
-                            summary: this.translateColomn(card.process + '.' + card.processVersion + '.' + card.summary.key, card.summary.parameters),
+                            [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)
                         });
                     }
                 });
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 c133f4dd69..fb6c2316ad 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
@@ -87,14 +87,20 @@ export class LoggingTableComponent implements OnInit, OnDestroy {
             .subscribe((page: Page<LineOfLoggingResult>) => {
                 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');
+
                 lines.forEach( (line: LineOfLoggingResult) => {
                     if (typeof line !== undefined) {
                         this.exportLoggingData.push({
-                            timeOfAction: this.timeService.formatDateTime(line.businessDate),
-                            title: this.translateColomn(line.i18nKeyForTitle.key, line.i18nKeyForTitle.parameters),
-                            summary: this.translateColomn(line.i18nKeyForSummary.key, line.i18nKeyForSummary.parameters),
-                            description: this.translateColomn(this.processStateDescription.get(line.process + '.' + line.state)),
-                            sender: line.sender
+                            [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
                         });
                     }
                 });
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 2584d2b424..58ea674b22 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
@@ -59,6 +59,14 @@ 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');
+
         this.result.forEach((line: LineOfMonitoringResult) => {
             if (typeof line !== undefined) {
                 time = this.displayTime(line.creationDateTime);
@@ -69,13 +77,13 @@ export class MonitoringTableComponent implements OnDestroy {
                 status = this.translateColomn(line.coordinationStatus);
 
                 this.exportMonitoringData.push({
-                    time: time,
-                    businessPeriod: businessPeriod,
-                    process: processName,
-                    title: title,
-                    summary: summary,
-                    status: status,
-                    severity: line.severity
+                    [timeColumnName]: time,
+                    [businessPeriodColumnName]: businessPeriod,
+                    [processColumnName]: processName,
+                    [titleColumnName]: title,
+                    [summaryColumnName]: summary,
+                    [statusColumnName]: status,
+                    [severityColumnName]: line.severity
                 });
             }
         });
diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json
index 79a7aba82b..0016005b1b 100755
--- a/ui/main/src/assets/i18n/en.json
+++ b/ui/main/src/assets/i18n/en.json
@@ -138,6 +138,7 @@
       "activeTo": "ACTIVE TO"
     },
     "result": {
+      "severity": "SEVERITY",
       "publishDate" : "PUBLICATION DATE",
       "businessPeriod" : "BUSINESS PERIOD",
       "title" : "TITLE",
@@ -179,6 +180,7 @@
     "title": "TITLE",
     "summary": "SUMMARY",
     "status": "STATUS",
+    "severity": "SEVERITY",
     "seeDetails": "SEE DETAILS",
     "ExportTOExcel": "Export data"
   },
diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json
index 8a99ebc52b..b14f355303 100755
--- a/ui/main/src/assets/i18n/fr.json
+++ b/ui/main/src/assets/i18n/fr.json
@@ -138,6 +138,7 @@
       "activeTo": "ACTIVE JUSQU'A"
     },
     "result": {
+      "severity": "SEVERITE",
       "publishDate" : "DATE DE PUBLICATION",
       "businessPeriod" : "PERIODE METIER",
       "title" : "TITRE",
@@ -179,6 +180,7 @@
     "title": "TITRE",
     "summary": "RESUME",
     "status": "STATUS",
+    "severity": "SEVERITE",
     "seeDetails": "VOIR LES DETAILS",
     "ExportTOExcel": "Exporter les données"
   },

From 6a6b5830ff11073e9f69f6e5013db033cb0f429d Mon Sep 17 00:00:00 2001
From: vlo-rte <valerie.longa@rte-france.com>
Date: Fri, 19 Feb 2021 15:53:46 +0100
Subject: [PATCH 61/62] [OC-1496] Admin UI : In day mode : when trying to
 delete user/group/entity, popup displayed in night mode

---
 .../confirmation-dialog.component.html        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
index 0e7cec7351..ffd46f8654 100644
--- a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
+++ b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html
@@ -7,16 +7,15 @@
 <!-- SPDX-License-Identifier: MPL-2.0                                      -->
 <!-- This file is part of the OperatorFabric project.                      -->
 
-<div class="modal-header  bg-dark">
+<div class="modal-header">
   <h4 class="modal-title">{{ title }}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="dismiss()">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="modal-body  bg-dark">
-    {{ message }}
-  </div>
-  <div class="modal-footer  bg-dark">
-    <button id="opfab-admin-confirmation-btn-cancel" type="button" class="opfab-btn-cancel" (click)="decline()">{{ btnCancelText }}</button>
-    <button id="opfab-admin-confirmation-btn-ok"  type="button" class="opfab-btn" (click)="accept()">{{ btnOkText }}</button>
-  </div>
+  <button type="button" class="close" aria-label="Close" (click)="dismiss()">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body text-center">
+  <p>{{ message }}</p>
+  <button id="opfab-admin-confirmation-btn-cancel" type="button" class="opfab-btn-cancel" (click)="decline()">{{ btnCancelText }}</button>
+  <button id="opfab-admin-confirmation-btn-ok"  type="button" class="opfab-btn" (click)="accept()">{{ btnOkText }}</button>
+</div>
+

From 034d01139bfda996c22a09cd7e97d9cb86002622 Mon Sep 17 00:00:00 2001
From: Alexandra Guironnet <alexandra.guironnet@rte-france.com>
Date: Mon, 22 Feb 2021 10:53:10 +0100
Subject: [PATCH 62/62] [RELEASE] 2.1.0.RELEASE

---
 VERSION                                       |  2 +-
 config/dev/docker-compose.yml                 |  4 +-
 config/docker/docker-compose.yml              | 12 ++--
 .../src/main/modeling/swagger.yaml            |  2 +-
 .../src/main/modeling/swagger.yaml            |  2 +-
 .../core/users/src/main/modeling/swagger.yaml |  2 +-
 src/docs/asciidoc/docs/release_notes.adoc     | 63 +++++++++++++++++--
 7 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/VERSION b/VERSION
index fc1dd57365..b62f96aa2f 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-SNAPSHOT
+2.1.0.RELEASE
diff --git a/config/dev/docker-compose.yml b/config/dev/docker-compose.yml
index 666c204f9d..ca37db1af9 100755
--- a/config/dev/docker-compose.yml
+++ b/config/dev/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - "89:8080"
       - "90:9990"
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:SNAPSHOT"
+    image: "lfeoperatorfabric/of-web-ui:2.1.0.RELEASE"
     #user: ${USER_ID}:${USER_GID}
     ports:
       - "2002:80"
@@ -38,6 +38,6 @@ services:
       - "./nginx.conf:/etc/nginx/conf.d/default.conf"
       - "./loggingResults:/etc/nginx/html/logging"
   ext-app:
-    image: "lfeoperatorfabric/of-external-app:SNAPSHOT"
+    image: "lfeoperatorfabric/of-external-app:2.1.0.RELEASE"
     ports:
       - "8090:8090"
diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml
index 6014b88650..fa60811700 100755
--- a/config/docker/docker-compose.yml
+++ b/config/docker/docker-compose.yml
@@ -28,7 +28,7 @@ services:
 #    - "90:9990"
   users:
     container_name: users
-    image: "lfeoperatorfabric/of-users-business-service:SNAPSHOT"
+    image: "lfeoperatorfabric/of-users-business-service:2.1.0.RELEASE"
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2103:8080"
@@ -43,7 +43,7 @@ services:
     - ${CONFIG_PATH}:/external-config
   businessconfig:
     container_name: businessconfig
-    image: "lfeoperatorfabric/of-businessconfig-business-service:SNAPSHOT"
+    image: "lfeoperatorfabric/of-businessconfig-business-service:2.1.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
@@ -61,7 +61,7 @@ services:
      - ${CONFIG_PATH}:/external-config
   cards-publication:
     container_name: cards-publication
-    image: "lfeoperatorfabric/of-cards-publication-business-service:SNAPSHOT"
+    image: "lfeoperatorfabric/of-cards-publication-business-service:2.1.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
@@ -78,7 +78,7 @@ services:
       - ${CONFIG_PATH}:/external-config
   cards-consultation:
     container_name: cards-consultation
-    image: "lfeoperatorfabric/of-cards-consultation-business-service:SNAPSHOT"
+    image: "lfeoperatorfabric/of-cards-consultation-business-service:2.1.0.RELEASE"
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2104:8080"
@@ -92,7 +92,7 @@ services:
       - "./cards-consultation-docker.yml:/config/application-docker.yml"
       - ${CONFIG_PATH}:/external-config
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:SNAPSHOT"
+    image: "lfeoperatorfabric/of-web-ui:2.1.0.RELEASE"
     ports:
     - "2002:80"
     depends_on:
@@ -105,6 +105,6 @@ services:
       - "./nginx.conf:/etc/nginx/conf.d/default.conf"
   ext-app:
 # External application example, must not be activated in production mode
-    image: "lfeoperatorfabric/of-external-app:SNAPSHOT"
+    image: "lfeoperatorfabric/of-external-app:2.1.0.RELEASE"
     ports:
       - "8090:8090"
diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml
index 373006c01a..c192a1fef4 100755
--- a/services/core/businessconfig/src/main/modeling/swagger.yaml
+++ b/services/core/businessconfig/src/main/modeling/swagger.yaml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   description: OperatorFabric BusinessconfigParty Management API
-  version: SNAPSHOT
+  version: 2.1.0.RELEASE
   title: Businessconfig Management
   termsOfService: ''
   contact:
diff --git a/services/core/cards-publication/src/main/modeling/swagger.yaml b/services/core/cards-publication/src/main/modeling/swagger.yaml
index 5069ee095b..5bce42a61b 100755
--- a/services/core/cards-publication/src/main/modeling/swagger.yaml
+++ b/services/core/cards-publication/src/main/modeling/swagger.yaml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   description: OperatorFabric Card Consumer Service
-  version: SNAPSHOT
+  version: 2.1.0.RELEASE
   title: Card Management API
   termsOfService: ''
   contact:
diff --git a/services/core/users/src/main/modeling/swagger.yaml b/services/core/users/src/main/modeling/swagger.yaml
index 9ec614579a..7ee4aac60e 100755
--- a/services/core/users/src/main/modeling/swagger.yaml
+++ b/services/core/users/src/main/modeling/swagger.yaml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   description: OperatorFabric User Management API
-  version: SNAPSHOT
+  version: 2.1.0.RELEASE
   title: User Management
   termsOfService: ''
   contact:
diff --git a/src/docs/asciidoc/docs/release_notes.adoc b/src/docs/asciidoc/docs/release_notes.adoc
index 5a40793cac..16cb59297b 100644
--- a/src/docs/asciidoc/docs/release_notes.adoc
+++ b/src/docs/asciidoc/docs/release_notes.adoc
@@ -1,14 +1,67 @@
-// Copyright (c) 2018-2020 RTE (http://www.rte-france.com)
+// Copyright (c) 2018-2021 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
 
+= Version 2.1.0.RELEASE
 
-= Version SNAPSHOT
+== Features
 
-//The release notes are managed in an outside repository to avoid constantly having conflicts when merging PRs on the
-//develop branch. See https://github.com/opfab/release-notes/.
-//The content from this repository is then pasted back to this file during the release process.
+- OC-1395 : When user exits the feed screen or exits operator fabric his filters/sorts options are memorized, when he
+goes back the filters/sorts options are set to the memorized values.
+- OC-1399 : Notification Screen - Display the states, process and process groups in alphabetical order
+- OC-1438 : Add the possibility to show environment name in the top right corner
+- OC-1201 : Inform the template when lttd has expired
+- OC-1396 : Communicate to the template the screen size calling setScreenSize() method
+- OC-1400 : Add "service" field in the free message feature
+- OC-1270 : Timeline circles : open popover on mouseover
+- OC-964 : Deal with user in more than one entity
++
+Now if the entity to respond with cannot be resolved because a user is a member of several entities that are allowed to
+respond to a card, the response action is disabled.
+- OC-1431 - Display names rather than IDs for entities/groups in the users table (Administration)
 
+== Bugs
+
+- OC-1428 : Fix bug on Feed Filter when setting only date and not time
+- OC-1436 : Error message does not appear correctly in usercard
+- OC-1452 : Translation error : criticity -> criticality
+- OC-890 : When using PASSWORD flow, once the token is expired the user isn't notified
+- OC-1472 : Card detail show last seen card for few instants before showing the selected card (rework of OC-1419)
+- OC-1347 : Fix bug with keepChildCards default value
+- OC-1459 : Admin - Propagate entity/group update to users
+- OC-1469 : Fix Bug - publisherType not set to external when receiving a card via card endPoint
+- OC-1478 : Fix Bug in calendar day mode when event spans multiple days
+- OC-1489 : Fix bug on delayed display of countdown counter
+- OC-1425 : Export data : title of the columns are not translated
+- OC-1496 : Admin UI : In day mode : when trying to delete user/group/entity, popup is displayed in night mode
+
+== Tasks
+
+- OC-1283 : Allow external config location for docker-compose
++
+This can be useful to avoid committing test or demo-specific configuration.
+See https://opfab.github.io/documentation/archives/2.1.0.RELEASE/docs/single_page_doc.html#_specify_an_external_configuration[documentation].
+- OC-1361 : Remove old notification feature via the browser
+- OC-1407 : Remove detailTitle in bundle config -> the title of the card always comes from the title field of the card
++
+IMPORTANT: Please remove detailTitle properties from your bundles.
++
+- Rework of the admin screen (OC-1191, OC-1434, OC-1457)
+- Upgrade Angular from v8.2 to v10.2 and related tasks (OC-1061, OC-1392, OC-1437, OC-1468)
+- OC-1409 : When pushing the process group file check for duplicate processes
+- OC-1430 : Adapt api testing script to first stop and remove existing containers
+- OC-1447 : Introduce notion of type of state
++
+NOTE: This shouldn't have any impact for deployments using docker. If you need to build the UI however,
+you need to run "npm install" first to get the new dependencies. We found it best to delete the node_modules folder
+before running npm_install to avoid errors.
+In addition, see the https://opfab.github.io/documentation/archives/2.1.0.RELEASE/docs/single_page_doc.html#_build[documentation]
+to troubleshoot any errors.
++
+- Documentation updates (OC-1427, OC-1429)
+- OC-1083 : Refactoring of NGNX endpoints for groups and entities : "/users/entities" instead of "/entities"
+and "/users/groups" instead of "/groups"
+- OC-1439 : New archives screen filters