Skip to content

Commit 06067a7

Browse files
freddidierRTEfreddidierRTE
committed
Solve issue #9027 by adding a vertical scroll bar if ack list is too long
Signed-off-by: freddidierRTE <[email protected]>
1 parent 79073f5 commit 06067a7

File tree

4 files changed

+187
-112
lines changed

4 files changed

+187
-112
lines changed

‎config/services/users.yml‎

Lines changed: 169 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ operatorfabric.users:
88
users:
99
- login: admin
1010
groups: ["ADMIN"]
11-
entities: ["ENTITY1_FR","ENTITY2_FR"]
11+
entities: ["ENTITY1_FR", "ENTITY2_FR"]
1212
- login: operator1_fr
13-
firstname : John
14-
lastname : Doe
15-
groups: ["Dispatcher","Maintainer"]
13+
firstname: John
14+
lastname: Doe
15+
groups: ["Dispatcher", "Maintainer"]
1616
entities: ["ENTITY1_FR"]
1717
- login: operator2_fr
1818
groups: ["Planner", "Maintainer", "Manager"]
1919
entities: ["ENTITY2_FR"]
2020
- login: operator3_fr
21-
groups: [ "RTE","ADMIN","Maintainer","Dispatcher"]
22-
entities: [ "ENTITY3_FR" ]
21+
groups: ["RTE", "ADMIN", "Maintainer", "Dispatcher"]
22+
entities: ["ENTITY3_FR"]
2323
- login: operator4_fr
24-
groups: ["Maintainer","Dispatcher"]
25-
entities: ["ENTITY1_FR", "ENTITY2_FR", "ENTITY3_FR", "ENTITY4_FR" ]
24+
groups: ["Maintainer", "Dispatcher"]
25+
entities: ["ENTITY1_FR", "ENTITY2_FR", "ENTITY3_FR", "ENTITY4_FR"]
2626
- login: operator5_fr
27-
groups: [ "RTE","ADMIN","Maintainer","Dispatcher"]
28-
entities: [ "ENTITY1_FR" ]
27+
groups: ["RTE", "ADMIN", "Maintainer", "Dispatcher"]
28+
entities: ["ENTITY1_FR"]
2929
- login: operator6_fr
3030
groups: ["Maintainer"]
3131
entities: ["ENTITY1_FR"]
@@ -59,7 +59,7 @@ operatorfabric.users:
5959
- login: publisher_test
6060
groups: ["Dispatcher", "Maintainer", "Manager"]
6161
- login: opfab
62-
groups: ["Dispatcher", "Maintainer", "Manager","ADMIN"]
62+
groups: ["Dispatcher", "Maintainer", "Manager", "ADMIN"]
6363
groups:
6464
- id: ADMIN
6565
name: ADMINISTRATORS
@@ -81,7 +81,7 @@ operatorfabric.users:
8181
name: Supervisor
8282
description: Supervisor Group
8383
realtime: true
84-
permissions: ["READONLY","ADMIN_BUSINESS_PROCESS","VIEW_ALL_CARDS"]
84+
permissions: ["READONLY", "ADMIN_BUSINESS_PROCESS", "VIEW_ALL_CARDS"]
8585
- id: Manager
8686
name: Manager
8787
description: Manager Group
@@ -92,79 +92,160 @@ operatorfabric.users:
9292
description: Maintainer Group
9393
realtime: false
9494
entities:
95-
- id: ENTITY1_FR
96-
name: Control Center FR North
97-
description: Control Center FR North
98-
parents : ["ENTITY_FR"]
99-
labels: ["FR1 label"]
100-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
101-
- id: ENTITY2_FR
102-
name: Control Center FR South
103-
description: Control Center FR South
104-
parents : ["ENTITY_FR"]
105-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
106-
- id: ENTITY3_FR
107-
name: Control Center FR East
108-
description: Control Center FR East
109-
parents : ["ENTITY_FR"]
110-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
111-
- id: ENTITY4_FR
112-
name: Control Center FR West
113-
description: Control Center FR West
114-
parents : ["ENTITY_FR"]
115-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
116-
- id: ENTITY_FR
117-
name: French Control Centers
118-
description: French Control Centers
119-
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
120-
- id: EUROPEAN_SUPERVISION_CENTERS
121-
name: European Supervision Centers
122-
description: European Supervision Centers
123-
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
124-
- id: IT_SUPERVISOR_ENTITY
125-
name: IT SUPERVISION CENTER
126-
description: IT SUPERVISION CENTER
127-
parents : ["EUROPEAN_SUPERVISION_CENTERS"]
128-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
129-
- id: ENTITY1_IT
130-
name: Control Center IT North
131-
description: Control Center IT North
132-
parents : ["ENTITY_IT"]
133-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
134-
- id: ENTITY2_IT
135-
name: Control Center IT Center
136-
description: Control Center IT Center
137-
parents : ["ENTITY_IT"]
138-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
139-
- id: ENTITY3_IT
140-
name: Control Center IT South
141-
description: Control Center IT South
142-
parents : ["ENTITY_IT"]
143-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
144-
- id: ENTITY_IT
145-
name: Italian Control Centers
146-
description: Italian Control Centers
147-
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
148-
- id: ENTITY1_NL
149-
name: Control Center NL North
150-
description: Control Center NL North
151-
parents : ["ENTITY_NL"]
152-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
153-
- id: ENTITY2_NL
154-
name: Control Center NL South
155-
description: Control Center NL South
156-
parents : ["ENTITY_NL"]
157-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
158-
- id: ENTITY_NL
159-
name: Dutch Control Centers
160-
description: Dutch Control Centers
161-
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
162-
- id: ENTITY1_EU
163-
name: North Europe Control Center
164-
description: North Europe Control Center
165-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
166-
- id: ENTITY2_EU
167-
name: South Europe Control Center
168-
description: South Europe Control Center
169-
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
170-
#logging.level.org.opfab: debug
95+
- id: ENTITY1_FR
96+
name: Control Center FR North
97+
description: Control Center FR North
98+
parents: ["ENTITY_FR"]
99+
labels: ["FR1 label"]
100+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
101+
- id: ENTITY2_FR
102+
name: Control Center FR South
103+
description: Control Center FR South
104+
parents: ["ENTITY_FR"]
105+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
106+
- id: ENTITY3_FR
107+
name: Control Center FR East
108+
description: Control Center FR East
109+
parents: ["ENTITY_FR"]
110+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
111+
- id: ENTITY4_FR
112+
name: Control Center FR West
113+
description: Control Center FR West
114+
parents: ["ENTITY_FR"]
115+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
116+
- id: ENTITY_FR
117+
name: French Control Centers
118+
description: French Control Centers
119+
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
120+
- id: EUROPEAN_SUPERVISION_CENTERS
121+
name: European Supervision Centers
122+
description: European Supervision Centers
123+
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
124+
- id: IT_SUPERVISOR_ENTITY
125+
name: IT SUPERVISION CENTER
126+
description: IT SUPERVISION CENTER
127+
parents: ["EUROPEAN_SUPERVISION_CENTERS"]
128+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
129+
- id: ENTITY1_IT
130+
name: Control Center IT North
131+
description: Control Center IT North
132+
parents: ["ENTITY_IT"]
133+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
134+
- id: ENTITY2_IT
135+
name: Control Center IT Center
136+
description: Control Center IT Center
137+
parents: ["ENTITY_IT"]
138+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
139+
- id: ENTITY3_IT
140+
name: Control Center IT South
141+
description: Control Center IT South
142+
parents: ["ENTITY_IT"]
143+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
144+
- id: ENTITY_IT
145+
name: Italian Control Centers
146+
description: Italian Control Centers
147+
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
148+
- id: ENTITY1_NL
149+
name: Control Center NL North
150+
description: Control Center NL North
151+
parents: ["ENTITY_NL"]
152+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
153+
- id: ENTITY2_NL
154+
name: Control Center NL South
155+
description: Control Center NL South
156+
parents: ["ENTITY_NL"]
157+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
158+
- id: ENTITY_NL
159+
name: Dutch Control Centers
160+
description: Dutch Control Centers
161+
roles: ["ACTIVITY_AREA_GROUP", "CARD_RECEIVER"]
162+
- id: ENTITY1_EU
163+
name: North Europe Control Center
164+
description: North Europe Control Center
165+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
166+
- id: ENTITY2_EU
167+
name: South Europe Control Center
168+
description: South Europe Control Center
169+
roles: ["ACTIVITY_AREA", "CARD_RECEIVER", "CARD_SENDER"]
170+
- id: TEST1
171+
name: Test Entity 1
172+
description: Test Entity 1
173+
roles: ["CARD_RECEIVER"]
174+
- id: TEST2
175+
name: Test Entity 2
176+
description: Test Entity 2
177+
roles: ["CARD_RECEIVER"]
178+
- id: TEST3
179+
name: Test Entity 3
180+
description: Test Entity 3
181+
roles: ["CARD_RECEIVER"]
182+
- id: TEST4
183+
name: Test Entity 4
184+
description: Test Entity 4
185+
roles: ["CARD_RECEIVER"]
186+
- id: TEST5
187+
name: Test Entity 5
188+
description: Test Entity 5
189+
roles: ["CARD_RECEIVER"]
190+
- id: TEST6
191+
name: Test Entity 6
192+
description: Test Entity 6
193+
roles: ["CARD_RECEIVER"]
194+
- id: TEST7
195+
name: Test Entity 7
196+
description: Test Entity 7
197+
roles: ["CARD_RECEIVER"]
198+
- id: TEST8
199+
name: Test Entity 8
200+
description: Test Entity 8
201+
roles: ["CARD_RECEIVER"]
202+
- id: TEST9
203+
name: Test Entity 9
204+
description: Test Entity 9
205+
roles: ["CARD_RECEIVER"]
206+
- id: TEST10
207+
name: Test Entity 10
208+
description: Test Entity 10
209+
roles: ["CARD_RECEIVER"]
210+
- id: TEST11
211+
name: Test Entity 11
212+
description: Test Entity 11
213+
roles: ["CARD_RECEIVER"]
214+
- id: TEST12
215+
name: Test Entity 12
216+
description: Test Entity 12
217+
roles: ["CARD_RECEIVER"]
218+
- id: TEST13
219+
name: Test Entity 13
220+
description: Test Entity 13
221+
roles: ["CARD_RECEIVER"]
222+
- id: TEST14
223+
name: Test Entity 14
224+
description: Test Entity 14
225+
roles: ["CARD_RECEIVER"]
226+
- id: TEST15
227+
name: Test Entity 15
228+
description: Test Entity 15
229+
roles: ["CARD_RECEIVER"]
230+
- id: TEST16
231+
name: Test Entity 16
232+
description: Test Entity 16
233+
roles: ["CARD_RECEIVER"]
234+
- id: TEST17
235+
name: Test Entity 17
236+
description: Test Entity 17
237+
roles: ["CARD_RECEIVER"]
238+
- id: TEST18
239+
name: Test Entity 18
240+
description: Test Entity 18
241+
roles: ["CARD_RECEIVER"]
242+
- id: TEST19
243+
name: Test Entity 19
244+
description: Test Entity 19
245+
roles: ["CARD_RECEIVER"]
246+
- id: TEST20
247+
name: Test Entity 20
248+
description: Test Entity 20
249+
roles: ["CARD_RECEIVER"]
250+
#logging.level.org.opfab: debug
251+

‎frontend/src/scss/styles.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@ ngb-pagination {
281281
@extend %opfab-popover;
282282

283283
max-width: 100%;
284+
285+
.popover-body {
286+
max-height: 600px;
287+
overflow: auto;
288+
}
284289
}
285290

286291
.opfab-popover-arrow-shift-right {

‎tests/cypress/cypress/integration/Acknowledgment.spec.js‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ describe('Acknowledgment tests', function() {
222222
);
223223
cy.get('#opfab-card-acknowledged-footer').should('not.exist');
224224

225-
// We create a usercard sent to several entities
225+
// We create a usercard sent to all entities
226226
opfab.navigateToUserCard();
227227
cy.get('#message').find('div').eq(0).should('be.visible').type('Test message for entities acks');
228228
cy.get('#opfab-recipients').click();
@@ -233,11 +233,9 @@ describe('Acknowledgment tests', function() {
233233
cy.waitDefaultTime();
234234

235235
// We display the created card
236-
// And we check there are 13 entities names displayed in acknowledgements footer, and we check all the entities have orange color
237236
cy.get('of-light-card').eq(0).click();
238237
cy.get('#opfab-selected-card-summary').should('have.text', 'Message received : Message received');
239238
cy.get('#opfab-card-acknowledged-footer').should('exist');
240-
cy.get('#opfab-card-acknowledged-footer').find('span').should('have.length', 13); // 12 single entities (no group entities) + 1 for 'Acknowledged :' label
241239
cy.get('#opfab-card-acknowledged-footer')
242240
.find('span')
243241
.eq(1)
@@ -315,7 +313,7 @@ describe('Acknowledgment tests', function() {
315313
cy.get('ngb-popover-window').should('exist');
316314

317315
cy.get('#opfab-acknowledged-list').find('span').should('have.length', 0);
318-
cy.get('#opfab-not-acknowledged-list').find('span').should('have.length', 12);
316+
cy.get('#opfab-not-acknowledged-list').find('span').should('have.length', 32);
319317
});
320318

321319
it('operator4_fr (member of 4 FR entities) acknowledges the previous card created by operator1_fr ', function() {
@@ -327,7 +325,6 @@ describe('Acknowledgment tests', function() {
327325
cy.get('of-light-card').eq(0).click();
328326
cy.get('#opfab-selected-card-summary').should('have.text', 'Message received : Message received');
329327
cy.get('#opfab-card-acknowledged-footer').should('exist');
330-
cy.get('#opfab-card-acknowledged-footer').find('span').should('have.length', 13); // 12 single entities (no group entities) + 1 for 'Acknowledged :' label
331328
cy.get('#opfab-card-acknowledged-footer')
332329
.find('span')
333330
.eq(1)
@@ -424,7 +421,6 @@ describe('Acknowledgment tests', function() {
424421
cy.get('#opfab-card-acknowledged-footer').should('exist');
425422

426423
// We check we have ENTITY1_FR, ENTITY2_FR, ENTITY3_FR and ENTITY4_FR now displayed in green, all other entities in orange
427-
cy.get('#opfab-card-acknowledged-footer').find('span').should('have.length', 13); // 12 single entities (no group entities) + 1 for 'Acknowledged :' label
428424
cy.get('#opfab-card-acknowledged-footer')
429425
.find('span')
430426
.eq(1)
@@ -501,7 +497,7 @@ describe('Acknowledgment tests', function() {
501497
cy.get('#opfab-card-acknowledged-footer').click();
502498
cy.get('ngb-popover-window').should('exist');
503499
cy.get('#opfab-acknowledged-list').find('span').should('have.length', 4);
504-
cy.get('#opfab-not-acknowledged-list').find('span').should('have.length', 8);
500+
cy.get('#opfab-not-acknowledged-list').find('span').should('have.length', 28);
505501

506502
// Footer should contain 'Addressed to' with 4 FR control centers each with ack icon
507503
cy.get('#opfab-card-details-address-to').find('span').eq(0).contains('Addressed to :');
@@ -564,11 +560,10 @@ describe('Acknowledgment tests', function() {
564560

565561
cy.get('of-light-card').should('have.length', 7);
566562
// We display the previous card (acknowledged by operator4_fr)
567-
// And we check there are 13 entities names displayed in acknowledgements footer, 4 entities with green color and 9 with orange color
563+
// And we check there are entities names displayed in acknowledgements footer, 4 entities with green color and the others with orange color
568564
cy.get('of-light-card').eq(0).click();
569565
cy.get('#opfab-selected-card-summary').should('have.text', 'Message received : Message received');
570566
cy.get('#opfab-card-acknowledged-footer').should('exist');
571-
cy.get('#opfab-card-acknowledged-footer').find('span').should('have.length', 13); // 12 single entities (no group entities) + 1 for 'Acknowledged :' label
572567
cy.get('#opfab-card-acknowledged-footer')
573568
.find('span')
574569
.eq(1)

0 commit comments

Comments
 (0)