Permit to receive mail for not notified state in UI (#7564)

Signed-off-by: vlo-rte <[email protected]>
opfab · Nov 25, 2024 · 2ec604f · 2ec604f
1 parent f626042
commit 2ec604f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/node-services/cards-external-diffusion/src/domain/application/cardRoutingUtilities.ts b/node-services/cards-external-diffusion/src/domain/application/cardRoutingUtilities.ts
@@ -33,8 +33,7 @@ export default class CardsRoutingUtilities {
                     userWithPerimeters,
                     card.process,
                     perim.state as string
-                ) &&
-                CardsRoutingUtilities.checkFilteringNotification(userWithPerimeters, card.process, perim)
+                )
             );
         });
 

diff --git a/node-services/cards-external-diffusion/src/tests/cardRoutingUtilities.test.ts b/node-services/cards-external-diffusion/src/tests/cardRoutingUtilities.test.ts
@@ -381,7 +381,7 @@ describe('Card routing', function () {
                 currentUserWithReceiveAndWriteRightWithFilteringNotification,
                 card
             )
-        ).toBeFalsy();
+        ).toBeTruthy();
         expect(
             CardsRoutingUtilities.shouldUserReceiveTheCard(
                 currentUserWithReceiveAndWriteRightWithFilteringNotificationNotForProcessState,
@@ -392,7 +392,7 @@ describe('Card routing', function () {
         expect(CardsRoutingUtilities.shouldUserReceiveTheCard(currentUserWithReceiveRight, card)).toBeTruthy();
         expect(
             CardsRoutingUtilities.shouldUserReceiveTheCard(currentUserWithReceiveRightWithFilteringNotification, card)
-        ).toBeFalsy();
+        ).toBeTruthy();
         expect(
             CardsRoutingUtilities.shouldUserReceiveTheCard(
                 currentUserWithReceiveRightWithFilteringNotificationNotForProcessState,

diff --git a/...ess/view/notificationConfiguration/notificationConfiguration-userInteraction.view.spec.ts b/...ess/view/notificationConfiguration/notificationConfiguration-userInteraction.view.spec.ts
@@ -338,10 +338,10 @@ describe('Notification configuration view - User interaction ', () => {
                 notificationConfigurationView.clickOnStateNotificationByEmail('process1', 'state1_1');
                 expect(emailEnabledActivated).toEqual('p:process1,s:state1_1,v:false;');
             });
-            it('should not set state notification by email if notification is not set for state', async () => {
+            it('should set state notification by email even if notification is not set for state', async () => {
                 notificationConfigurationView.clickOnState('process1', 'state1_2');
                 notificationConfigurationView.clickOnStateNotificationByEmail('process1', 'state1_2');
-                expect(emailEnabledActivated).toEqual('');
+                expect(emailEnabledActivated).toEqual('p:process1,s:state1_2,v:true;');
             });
         });
         describe('User click on save button', () => {

diff --git a/ui/main/src/app/business/view/notificationConfiguration/notificationConfiguration.view.ts b/ui/main/src/app/business/view/notificationConfiguration/notificationConfiguration.view.ts
@@ -266,11 +266,14 @@ export class NotificationConfigurationView {
 
     public clickOnStateNotificationByEmail(processId: string, stateId: string): void {
         const process = this.processList.find(({id}) => id === processId);
-        if (!process) return;
+        if (!process) {
+            return;
+        }
 
         const state = process.states.find(({id}) => id === stateId);
-        if (!state) return;
-        if (!state.checked) return;
+        if (!state) {
+            return;
+        }
         state.notificationByEmail = !state.notificationByEmail;
         this.setEmailEnabled(processId, stateId, state.notificationByEmail);
     }