Merge pull request #2144 from betagouv/refactor/reco-push-next-field#2027

✅ refactor(actions): Suppression du champs `next` du pousse reco

Author: alice-telescoop

recoco/apps/projects/templates/projects/project/conversations_new.html

@@ -129,9 +129,9 @@ <h3 class="fr-mt-2w conversation-new__topics-list-member-subtitle">Equipe de sui
                             is_staff : staff on current site
                             {% endcomment %}
                             {% if advising_position.is_advisor or is_switchtender or is_staff %}
-                                {% include "tools/editor.html" with model="message" input_name=posting_form.content.name initial_content=posting_form.content.value|default:'' errors=posting_form.content.errors input_required=True can_add_reco=True next_url_add_reco="projects-project-detail-conversations" can_attach_files=True can_attach_contact=True show_send_button=True form_id="conversation-form" placeholder="Écrivez votre message ici. Ajoutez des fichiers, contacts ou une recommandation…" can_compress_editor=True on_leave_alert=True is_notification_alert=True %}
+                                {% include "tools/editor.html" with model="message" input_name=posting_form.content.name initial_content=posting_form.content.value|default:'' errors=posting_form.content.errors input_required=True can_add_reco=True can_attach_files=True can_attach_contact=True show_send_button=True form_id="conversation-form" placeholder="Écrivez votre message ici. Ajoutez des fichiers, contacts ou une recommandation…" can_compress_editor=True on_leave_alert=True is_notification_alert=True %}
                             {% else %}
-                                {% include "tools/editor.html" with model="message" input_name=posting_form.content.name initial_content=posting_form.content.value|default:'' errors=posting_form.content.errors input_required=True can_add_reco=False next_url_add_reco="projects-project-detail-conversations" can_attach_files=True can_attach_contact=False show_send_button=True form_id="conversation-form" placeholder="Écrivez votre message ici. Vous pouvez ajouter des fichiers." can_compress_editor=True on_leave_alert=True is_notification_alert=True %}
+                                {% include "tools/editor.html" with model="message" input_name=posting_form.content.name initial_content=posting_form.content.value|default:'' errors=posting_form.content.errors input_required=True can_add_reco=False can_attach_files=True can_attach_contact=False show_send_button=True form_id="conversation-form" placeholder="Écrivez votre message ici. Vous pouvez ajouter des fichiers." can_compress_editor=True on_leave_alert=True is_notification_alert=True %}
                             {% endif %}
                             <input type="hidden" name="contact" :value="message?.contact?.id">
                         </div>

recoco/apps/tasks/forms.py

@@ -96,7 +96,6 @@ def __init__(self, user, *args, **kwargs):
     )
 
     push_type = forms.ChoiceField(choices=PUSH_TYPES)
-    next = forms.CharField(required=False)
     project = forms.ModelChoiceField(
         queryset=projects_models.Project.objects.none(),
         empty_label="(Veuillez sélectionner un dossier)",
@@ -181,7 +180,6 @@ class UpdateTaskForm(forms.ModelForm):
 
     content = MarkdownxFormField(required=False)
     topic_name = forms.CharField(required=False)
-    next = forms.CharField(required=False)
 
     class Meta:
         model = models.Task

recoco/apps/tasks/templates/tasks/tasks/task_create.html

@@ -29,8 +29,6 @@ <h2 class="push-reco__main-title">Créer une recommandation</h2>
                 {% include "projects/project/fragments/action_pusher/type.html" %}
                 {% include "projects/project/fragments/action_pusher/resource_search.html" %}
                 {% include "projects/project/fragments/action_pusher/details_form.html" with form=type_form %}
-                {% comment %} TODO remove this next field when recommendation tab will be removed {% endcomment %}
-                <input type="hidden" name="next" value="{{ type_form.next.value }}">
                 <input type="hidden" name="public" x-model="public">
             </form>
         </div>

recoco/apps/tasks/templates/tasks/tasks/task_update.html

@@ -33,8 +33,6 @@ <h1 class=" align-items-center">
                     {% include "projects/project/fragments/action_pusher/type.html" with disable_multi=True %}
                     {% include "projects/project/fragments/action_pusher/resource_search.html" %}
                     {% include "projects/project/fragments/action_pusher/details_form.html" with disable_draft=task.public form=form %}
-                    {% comment %} TODO remove this next field when recommendation tab will be removed {% endcomment %}
-                    <input type="hidden" name="next" value="{{ form.next.value }}">
                     <input type="hidden" name="public" x-model="public">
                     {{ form.media }}
                 </form>

recoco/apps/tasks/views/tasks.py

@@ -124,19 +124,12 @@ def create_task(request):
                 user=request.user,
             )
 
-            # Redirect to `action-inline` if we're coming
-            # from `action-inline` after create
-            # TODO remove the logic about 'next' field in the form when the recommendation tab is removed
-            next_url = type_form.cleaned_data["next"]
             conversation_url = reverse(
                 "projects-project-detail-conversations", args=[project.id]
             )
-            if not next_url or next_url == "None":
-                next_url = conversation_url
-
-            if not action.public and next_url == conversation_url:
-                next_url += "#drafts"
-            return redirect(next_url)
+            if not action.public:
+                conversation_url += "#drafts"
+            return redirect(conversation_url)
 
     else:
         type_form = PushTypeActionForm(request.user, request.GET)
@@ -300,16 +293,12 @@ def update_task(request, task_id=None):
                     user=request.user,
                 )
 
-            if form.cleaned_data["next"] and form.cleaned_data["next"] != "None":
-                return redirect(form.cleaned_data["next"])
-
             return redirect(
                 reverse("projects-project-detail-conversations", args=[task.project_id])
             )
     else:
         initial = {
             "topic_name": task.topic.name if task.topic else None,
-            "next": request.GET.get("next"),
         }
         form = UpdateTaskForm(instance=task, initial=initial)
         # Initialize preserved_content for template compatibility

recoco/templates/default_site/tools/editor.html

@@ -7,7 +7,6 @@
 - initial_content: string
 - can_attach_contact (boolean)
 - can_add_reco (boolean)
-- next_url_add_reco (string)
 - input_name (string)
 - input_required (boolean)
 - input_file_name (string)
@@ -176,8 +175,8 @@
                             class="common-dropdown common-dropdown__top-menu list-unstyled flex-column item-no-space">
                             <li>
                                 <button class="fr-btn fr-btn--sm fr-btn--secondary w-100 justify-content-center"
-                                        @click.prevent="goToCreateRecommendation(`{% url 'projects-create-task' %}?project_id={{ project.pk }}{% if next_url_add_reco %}&next={% url next_url_add_reco project.pk %}{% endif %}&content=${encodeURIComponent(markdownContent || '')}`)">
-                                    Nouvelle recommandation
+                                        @click.prevent="goToCreateRecommendation(`{% url 'projects-create-task' %}?project_id={{ project.pk }}&content=${encodeURIComponent(markdownContent || '')}`)">
+                                    Recommandation vierge
                                 </button>
                             </li>
                             {% flag "suggest_reco_btn" %}