Merge branch 'main' into develop

Author: glibersat

recoco/__init__.py

@@ -1 +1 @@
-__version__ = "2.64.2"
+__version__ = "2.65.1"

recoco/apps/projects/templates/projects/project/fragments/tasks_modal/task_modal.html

@@ -55,11 +55,11 @@
                         <div class="d-flex flex-grow-1 align-items-stretch w-65 task-modal-content"
                              :class="!contentIsLoading && 'visible'"
                              x-effect="taskId && loadContent()">
-                            <template x-if="currentTask && taskId && currentTask?.resource_id">
+                            <template x-if="taskId && currentTask.resource_id">
                                 <iframe class="w-100 d-flex flex-column rounded"
-                                        :src="resourcePreviewUrl(currentTask?.resource_id, taskId)"></iframe>
+                                        :src="resourcePreviewUrl(currentTask.resource_id, taskId)"></iframe>
                             </template>
-                            <template x-if="currentTask && taskId && !currentTask?.resource_id">
+                            <template x-if="taskId && !currentTask.resource_id">
                                 <div class="w-100 text-break fr-p-2w specific-maxheight-90vh scroll-gestion">
                                     <div class="resource-details">
                                         <h1 x-text="currentTask?.intent" class="fr-mb-2w"></h1>

recoco/apps/tasks/serializers.py

@@ -113,7 +113,7 @@ class Meta:
     contact_id = serializers.IntegerField(write_only=True, required=False)
 
     resource = ResourceSerializer(read_only=True)
-    resource_id = serializers.IntegerField(write_only=True, required=False)
+    resource_id = serializers.IntegerField(required=False)
 
     created_by = UserSerializer(read_only=True)
     document = DocumentSerializer(read_only=True, many=True)

recoco/frontend/src/js/components/PreviewModal.js

@@ -48,6 +48,8 @@ export default function PreviewModal() {
       return `${this.index + 1} sur ${this.newTasks.length} nouvelle${this.newTasks.length > 0 ? 's' : ''} recommandation${this.newTasks.length > 0 ? 's' : ''}`;
     },
     hasNotification(followupId) {
+      if (this.notifications) return false;
+
       return (
         this.notifications.filter(
           (n) => n.action_object.who && n.action_object.id === followupId
@@ -63,7 +65,7 @@ export default function PreviewModal() {
           this.currentTask,
           undefined,
           content,
-          contactAdded??null
+          contactAdded ?? null
         );
         await this.$store.previewModal.loadFollowups();
         await this.$store.tasksView.updateView();

recoco/frontend/src/js/components/Tutorial.js

@@ -21,7 +21,7 @@ function Tutorial(challengeCode) {
       this.challengeCode = challengeCode;
       const challengeDefinition =
         await this.getChallengeDefinition(challengeCode);
-
+      if (!challengeDefinition) return;
       //Get current challenge for current user
       //Can be empty object
       const challenge = await this.getChallenge(this.challengeCode);

recoco/frontend/src/js/store/previewModal.js

@@ -17,6 +17,8 @@ document.addEventListener('alpine:init', () => {
     index: null,
     scrollY: null,
 
+    notifications: [],
+
     contact: null,
 
     get projectId() {