Fix coco 5302 message can be send multiple times

admin/src/main/resources/i18n/fr.json

@@ -25,6 +25,7 @@
   "actualites.infos.list": "Actualités : lister les actualités",
   "actualites.threads.list": "Actualités : lister les fils d'actualités",
   "actualites.view": "Actualités : accéder au service actualités",
+  "actualites.genai.falc": "Utiliser la simplification de texte (FALC)",
   "add.child": "Ajouter un enfant",
   "add.class": "Ajouter une classe",
   "add.group": "Ajouter un groupe",
@@ -679,6 +680,17 @@
   "management.structure.informations.attach.parent.error.title": "Erreur d'ajout",
   "management.structure.informations.attach.parent.success.content": "Cette structure a bien été attachée à une structure parente",
   "management.structure.informations.attach.parent.success.title": "Structure parente attachée",
+  "management.structure.informations.communications.title": "Droits de communications",
+  "management.structure.informations.communications.description": "Ré-initialisation des droits de communications de l'établissement",
+  "management.structure.informations.communications.reset.action": "Ré-initialiser",
+  "management.structure.informations.communications.warning.title": "Réinitialisation",
+  "management.structure.informations.communications.warning.content": "La réinitialisation des droits de communication est une action irréversible. Elle supprimera les modifications apportées aux règles de communication entre les différents groupe (sauf groupes manuels) de votre établissement pour remettre la configuration par défaut.",
+  "management.structure.informations.communications.warning.continue": "Continuer",
+  "management.structure.informations.communications.confirm.content": "Êtes-vous sur de vouloir réinitialiser les règles de communications",
+  "management.structure.informations.communications.notify.success.content" : "Les règles de communications ont bien été réinitialisées",
+  "management.structure.informations.communications.notify.success.title": "Réinitialisation",
+  "management.structure.informations.communications.notify.error.content" : "Les règles de communications n'ont pas pu être réinitialisées",
+  "management.structure.informations.communications.notify.error.title": "Erreur de réinitialisation",
   "management.structure.informations.detach.parent.error.content": "Cette structure n'a pas pu être détachée de son parent",
   "management.structure.informations.detach.parent.error.title": "Erreur lors de la suppression",
   "management.structure.informations.detach.parent.success.content": "Cette structure a bien été détachée de son parent",

admin/src/main/ts/package.json

@@ -34,9 +34,9 @@
     "font-awesome": "4.7.0",
     "jquery": "^3.4.1",
     "ngx-infinite-scroll": "14.0.1",
-    "ngx-ode-core": "dev",
-    "ngx-ode-sijil": "dev",
-    "ngx-ode-ui": "dev",
+    "ngx-ode-core": "develop-b2school",
+    "ngx-ode-sijil": "develop-b2school",
+    "ngx-ode-ui": "develop-b2school",
     "ngx-trumbowyg": "^6.0.7",
     "noty": "2.4.1",
     "reflect-metadata": "0.1.10",
@@ -72,4 +72,4 @@
     "typescript": "~4.6.4",
     "webpack": "^5.70.0"
   }
-}
+}

admin/src/main/ts/src/app/communication/communication-rules.service.ts

@@ -185,6 +185,10 @@ export class CommunicationRulesService {
             .filter(group => !!group)
             .filter(group => group.id === groupId);
     }
+
+    public resetCommunication(structureId: string): Observable<any> {
+        return this.http.post(`/communication/rules/${structureId}/reset`, null);
+    }
 }
 
 export interface BidirectionalCommunicationRules {

admin/src/main/ts/src/app/management/management.module.ts

@@ -46,6 +46,7 @@ import { MatDialogModule } from '@angular/material/dialog';
 import { StructureUserPositionsComponent } from './structure-user-positions/structure-user-positions.component';
 import { SharedModule } from '../_shared/shared.module';
 import { ConfigResolver } from '../core/resolvers/config.resolver';
+import {CommunicationRulesService} from "../communication/communication-rules.service";
 
 @NgModule({
     imports: [
@@ -117,7 +118,8 @@ import { ConfigResolver } from '../core/resolvers/config.resolver';
         SubjectsService,
         CalendarService,
         ImportEDTReportsService,
-        SubjectsGuardService
+        SubjectsGuardService,
+        CommunicationRulesService
     ]
 })
 export class ManagementModule {}

admin/src/main/ts/src/app/management/structure-informations/structure-informations.component.html

@@ -320,3 +320,38 @@ <h3>
     </p>
   </ode-lightbox-confirm>
 </div>
+
+
+<div class="container has-shadow settings" *ngIf="isADMC == true">
+  <h2>
+    <s5l>management.structure.informations.communications.title</s5l>
+  </h2>
+  <s5l>management.structure.informations.communications.description</s5l>
+  <form #settingsForm="ngForm" (ngSubmit)="showResetCommunicationWarningLightBox = true;">
+    <div class="action-communication">
+      <button class="is-danger">
+        <s5l>management.structure.informations.communications.reset.action</s5l>
+      </button>
+    </div>
+  </form>
+  <ode-lightbox-confirm
+          [show]="showResetCommunicationWarningLightBox"
+          lightboxTitle="management.structure.informations.communications.warning.title"
+          (onCancel)="closeLightbox()"
+          (onConfirm)="openConfirmResetConfirmation()"
+          confirmText="management.structure.informations.communications.warning.continue">
+    <p>
+        <s5l>management.structure.informations.communications.warning.content</s5l>
+    </p>
+  </ode-lightbox-confirm>
+  <ode-lightbox-confirm
+          [show]="showResetCommunicationConfirmLightBox"
+          lightboxTitle="management.structure.informations.communications.warning.title"
+          (onCancel)="closeLightbox()"
+          (onConfirm)="resetCommunicationRules()">
+      <p>
+          <s5l>management.structure.informations.communications.confirm.content</s5l>
+      </p>
+  </ode-lightbox-confirm>
+</div>
+

admin/src/main/ts/src/app/management/structure-informations/structure-informations.component.scss

@@ -3,6 +3,11 @@
   justify-content: flex-end;
 }
 
+.action-communication {
+  display: flex;
+  margin-top: 1em;
+}
+
 input[type="checkbox"],
 button.cancel,
 ode-message-sticker,

admin/src/main/ts/src/app/management/structure-informations/structure-informations.component.ts

@@ -11,6 +11,7 @@ import { BundlesService } from 'ngx-ode-sijil';
 import { Context } from 'src/app/core/store/mappings/context';
 import { Config } from 'src/app/core/resolvers/Config';
 import { HttpClient } from '@angular/common/http';
+import {CommunicationRulesService} from "../../communication/communication-rules.service";
 
 class UserMetric {
   active: number = 0;
@@ -68,6 +69,8 @@ export class StructureInformationsComponent extends OdeComponent implements OnIn
   public showMfaWarningLightbox = false;
   public isADMC: boolean = false;
   public showSettingsLightbox = false;
+  public showResetCommunicationWarningLightBox = false;
+  public showResetCommunicationConfirmLightBox = false;
 
   private config: Config;
 
@@ -78,7 +81,8 @@ export class StructureInformationsComponent extends OdeComponent implements OnIn
     private infoService: StructureInformationsService,
     private notify: NotifyService,
     private bundles: BundlesService,
-    private http: HttpClient) {
+    private http: HttpClient,
+    private communicationService: CommunicationRulesService) {
     super(injector);
   }
 
@@ -267,6 +271,8 @@ export class StructureInformationsComponent extends OdeComponent implements OnIn
   closeLightbox(): void
   {
     this.showSettingsLightbox = false;
+    this.showResetCommunicationConfirmLightBox = false;
+    this.showResetCommunicationWarningLightBox = false;
     this.changeDetector.markForCheck();
   }
 
@@ -277,4 +283,18 @@ export class StructureInformationsComponent extends OdeComponent implements OnIn
 
     return this.config['allow-adml-structure-name-change'];
   }
+  openConfirmResetConfirmation(): void {
+    this.closeLightbox();
+    this.showResetCommunicationConfirmLightBox = true;
+  }
+
+  resetCommunicationRules(): void {
+    this.closeLightbox();
+    this.communicationService.resetCommunication(this.structure._id).subscribe(
+        {
+          next: (data) =>  this.notify.success("management.structure.informations.communications.notify.success.content", "management.structure.informations.communications.notify.success.title"),
+          error: (error) => this.notify.notify("management.structure.informations.communications.notify.error.content", "management.structure.informations.communications.notify.error.title", error, "error")
+        });
+  }
+
 }

app-registry/src/main/java/org/entcore/registry/services/impl/DefaultWidgetService.java

@@ -22,10 +22,9 @@
 import static fr.wseduc.webutils.Utils.defaultValidationParamsNull;
 import static org.entcore.common.neo4j.Neo4jResult.validEmptyHandler;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.function.Function;
-import java.util.stream.Collector;
 
 import org.entcore.common.neo4j.Neo4j;
 import org.entcore.common.neo4j.Neo4jResult;
@@ -235,84 +234,143 @@ public void massAuthorize(String widgetId, String structureId, List<String> prof
 		if(structureId == null || structureId .trim().isEmpty() ||
 				widgetId == null || widgetId.trim().isEmpty() || profiles == null || profiles.isEmpty()){
 			handler.handle(new Either.Left<String, JsonObject>("invalid.parameters"));
+			return;
 		}
 
-		String query =
+		final boolean includeAdml = profiles.contains("AdminLocal");
+		final List<String> filteredProfiles = includeAdml ? new ArrayList<>(profiles) : profiles;
+		if (includeAdml) filteredProfiles.remove("AdminLocal");
+
+		JsonObject params = new JsonObject()
+				.put("widgetId", widgetId)
+				.put("structureId", structureId);
+
+		String queryAdml =
+			"MATCH (w:Widget {id: {widgetId}}), " +
+			"(parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(fg:FunctionGroup) " +
+			"WHERE fg.filter = 'AdminLocal' AND NOT(fg-[:AUTHORIZED]->w) " +
+			"CREATE UNIQUE fg-[:AUTHORIZED]->w";
+
+		String queryProfile =
 			"MATCH (w:Widget {id: {widgetId}}), " +
 			"(parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(g:ProfileGroup)-[:HAS_PROFILE]->(p:Profile) " +
 			"WHERE p.name IN {profiles} AND NOT(g-[:AUTHORIZED]->w) " +
 			"CREATE UNIQUE g-[:AUTHORIZED]->w";
 
-		JsonObject params = new JsonObject()
-				.put("widgetId", widgetId)
-				.put("structureId", structureId)
-				.put("profiles", new JsonArray(profiles));
-
-		neo.execute(query, params, validEmptyHandler(handler));
+		executeMassDispatch(includeAdml, filteredProfiles, params, queryAdml, queryProfile, handler);
 	}
 
 	@Override
 	public void massUnauthorize(String widgetId, String structureId, List<String> profiles, final Handler<Either<String, JsonObject>> handler){
 		if(structureId == null || structureId .trim().isEmpty() ||
 				widgetId == null || widgetId.trim().isEmpty() || profiles == null || profiles.isEmpty()){
 			handler.handle(new Either.Left<String, JsonObject>("invalid.parameters"));
+			return;
 		}
 
-		String query =
+		final boolean includeAdml = profiles.contains("AdminLocal");
+		final List<String> filteredProfiles = includeAdml ? new ArrayList<>(profiles) : profiles;
+		if (includeAdml) filteredProfiles.remove("AdminLocal");
+
+		JsonObject params = new JsonObject()
+				.put("widgetId", widgetId)
+				.put("structureId", structureId);
+
+		String queryAdml =
+			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(fg:FunctionGroup), " +
+			"fg-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
+			"WHERE fg.filter = 'AdminLocal' " +
+			"DELETE rel";
+
+		String queryProfile =
 			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(g:ProfileGroup)-[:HAS_PROFILE]->(p:Profile), " +
 			"g-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
 			"WHERE p.name IN {profiles} " +
 			"DELETE rel";
 
-		JsonObject params = new JsonObject()
-				.put("widgetId", widgetId)
-				.put("structureId", structureId)
-				.put("profiles", new JsonArray(profiles));
-
-			neo.execute(query, params, validEmptyHandler(handler));
+		executeMassDispatch(includeAdml, filteredProfiles, params, queryAdml, queryProfile, handler);
 	}
 
 	@Override
 	public void massSetMandatory(String widgetId, String structureId, List<String> profiles, final Handler<Either<String, JsonObject>> handler){
 		if(structureId == null || structureId .trim().isEmpty() ||
 				widgetId == null || widgetId.trim().isEmpty() || profiles == null || profiles.isEmpty()){
 			handler.handle(new Either.Left<String, JsonObject>("invalid.parameters"));
+			return;
 		}
 
-		String query =
+		final boolean includeAdml = profiles.contains("AdminLocal");
+		final List<String> filteredProfiles = includeAdml ? new ArrayList<>(profiles) : profiles;
+		if (includeAdml) filteredProfiles.remove("AdminLocal");
+
+		JsonObject params = new JsonObject()
+				.put("widgetId", widgetId)
+				.put("structureId", structureId);
+
+		String queryAdml =
+			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(fg:FunctionGroup), " +
+			"fg-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
+			"WHERE fg.filter = 'AdminLocal' " +
+			"SET rel.mandatory = true";
+
+		String queryProfile =
 			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(g:ProfileGroup)-[:HAS_PROFILE]->(p:Profile), " +
 			"g-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
 			"WHERE p.name IN {profiles} " +
 			"SET rel.mandatory = true";
 
-		JsonObject params = new JsonObject()
-				.put("widgetId", widgetId)
-				.put("structureId", structureId)
-				.put("profiles", new JsonArray(profiles));
-
-		neo.execute(query, params, validEmptyHandler(handler));
+		executeMassDispatch(includeAdml, filteredProfiles, params, queryAdml, queryProfile, handler);
 	}
 
 	@Override
 	public void massRemoveMandatory(String widgetId, String structureId, List<String> profiles, final Handler<Either<String, JsonObject>> handler){
 		if(structureId == null || structureId .trim().isEmpty() ||
 				widgetId == null || widgetId.trim().isEmpty() || profiles == null || profiles.isEmpty()){
 			handler.handle(new Either.Left<String, JsonObject>("invalid.parameters"));
+			return;
 		}
 
-		String query =
+		final boolean includeAdml = profiles.contains("AdminLocal");
+		final List<String> filteredProfiles = includeAdml ? new ArrayList<>(profiles) : profiles;
+		if (includeAdml) filteredProfiles.remove("AdminLocal");
+
+		JsonObject params = new JsonObject()
+				.put("widgetId", widgetId)
+				.put("structureId", structureId);
+
+		String queryAdml =
+			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(fg:FunctionGroup), " +
+			"fg-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
+			"WHERE fg.filter = 'AdminLocal' " +
+			"AND COALESCE(w.locked ,false) = false " +
+			"REMOVE rel.mandatory";
+
+		String queryProfile =
 			"MATCH (parentStructure:Structure {id: {structureId}})<-[:HAS_ATTACHMENT*0..]-(s:Structure)<-[:DEPENDS]-(g:ProfileGroup)-[:HAS_PROFILE]->(p:Profile), " +
 			"g-[rel:AUTHORIZED]->(w:Widget {id: {widgetId}}) " +
 			"WHERE p.name IN {profiles} " +
 			"AND COALESCE(w.locked ,false) = false " +
 			"REMOVE rel.mandatory";
 
-		JsonObject params = new JsonObject()
-				.put("widgetId", widgetId)
-				.put("structureId", structureId)
-				.put("profiles", new JsonArray(profiles));
+		executeMassDispatch(includeAdml, filteredProfiles, params, queryAdml, queryProfile, handler);
+	}
 
-		neo.execute(query, params, validEmptyHandler(handler));
+	/** Dispatch mass operation: ADML only, profiles only, or both sequentially. */
+	private void executeMassDispatch(boolean includeAdml, List<String> filteredProfiles,
+			JsonObject params, String queryAdml, String queryProfile,
+			Handler<Either<String, JsonObject>> handler) {
+		if (includeAdml && !filteredProfiles.isEmpty()) {
+			params.put("profiles", new JsonArray(filteredProfiles));
+			neo.execute(queryAdml, params, validEmptyHandler(r -> {
+				if (r.isLeft()) handler.handle(r);
+				else neo.execute(queryProfile, params, validEmptyHandler(handler));
+			}));
+		} else if (includeAdml) {
+			neo.execute(queryAdml, params, validEmptyHandler(handler));
+		} else {
+			params.put("profiles", new JsonArray(filteredProfiles));
+			neo.execute(queryProfile, params, validEmptyHandler(handler));
+		}
 	}
 
 	@Override

audience/src/main/java/org/entcore/audience/controllers/AudienceController.java

@@ -112,7 +112,7 @@ public void deleteReaction(final HttpServerRequest request) {
     final String resourceId = request.getParam("resourceId");
     verify(module, resourceType, Collections.singleton(resourceId), request)
         .onSuccess(user -> reactionService.deleteReaction(module, resourceType, resourceId, user)
-            .onSuccess(e -> Renders.ok(request))
+            .onSuccess(e -> Renders.render(request, e))
             .onFailure(th -> {
               Renders.log.error("Error while deleting reaction for user and resource " + module + "@" + resourceType + "@" + resourceId, th);
               Renders.renderError(request);

audience/src/main/java/org/entcore/audience/reaction/service/ReactionService.java

@@ -12,9 +12,9 @@ public interface ReactionService {
 
     Future<ReactionDetailsResponse> getReactionDetails(String module, String resourceType, String resourceId, int page, int size);
 
-    Future<Void> upsertReaction(String module, String resourceType, String resourceId, UserInfos userInfos, String reactionType);
+    Future<ReactionsSummaryResponse> upsertReaction(String module, String resourceType, String resourceId, UserInfos userInfos, String reactionType);
 
-    Future<Void> deleteReaction(String module, String resourceType, String resourceId, UserInfos user);
+    Future<ReactionsSummaryResponse> deleteReaction(String module, String resourceType, String resourceId, UserInfos user);
 
     Future<Void> deleteAllReactionsOfUsers(Set<String> userIds);