Make lead update modals UI same for both projects and applications (#4306)

Fixes #4288

Author: sandeepsajan0

.gitignore

@@ -51,6 +51,7 @@ npm-debug.log
 
 # IntelliJ
 out/
+.idea/*
 
 # JIRA plugin
 atlassian-ide-plugin.xml

hypha/apply/funds/forms.py

@@ -83,7 +83,9 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         lead_field = self.fields["lead"]
-        lead_field.label = _("New lead")
+        lead_field.label = _("Update lead from {lead} to").format(
+            lead=self.instance.lead
+        )
         lead_field.queryset = lead_field.queryset.exclude(id=self.instance.lead.id)
 
 

hypha/apply/funds/templates/submissions/partials/submission-lead.html

@@ -1,12 +1,13 @@
-{% load i18n %}
+{% load i18n heroicons %}
 {% if request.user.is_apply_staff %}
-    <span>
-        {% trans "Lead" %}:
-        <a class="text-white underline"
-           href="{% url 'apply:submissions:list' %}?lead={{ submission.lead.id }}">
-            {{ submission.lead }}
-        </a>
-    </span>
+    <a class="link link--edit-lead is-active link--transparent hover:opacity-70 transition-opacity"
+       href="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
+       hx-get="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
+       hx-target="#htmx-modal"
+    >
+        <u>{% trans "Lead" %}: {{ submission.lead }}</u>
+        {% heroicon_micro "pencil-square" class="inline ms-1" aria_hidden=true %}
+    </a>
 {% elif request.user.is_org_faculty or not HIDE_STAFF_IDENTITY %}
     <span>{% trans "Lead" %}: {{ submission.lead }}</span>
 {% endif %}

hypha/apply/funds/views/submission_edit.py

@@ -533,7 +533,7 @@ def get(self, *args, **kwargs):
             self.template,
             context={
                 "form": lead_form,
-                "value": _("Submit"),
+                "value": _("Update"),
                 "object": self.object,
             },
         )

hypha/apply/projects/templates/application_projects/modals/lead_update.html

@@ -1,7 +1,14 @@
 {% load i18n %}
-{% modal_title %}{% trans "Assign Lead" %}{% endmodal_title %}
+{% modal_title %}{% trans "Update Lead" %}{% endmodal_title %}
 
 <div class="p-4">
+    <div>
+        <dl class="mb-4">
+            <dt class="font-semibold">{% trans "Current Lead" %}</dt>
+            <dd class="truncate">{{ object.lead }} &lt;{{object.lead.email}}&gt;</dd>
+        </dl>
+    </div>
+
     {% url 'apply:projects:lead_update' object.id as url %}
     {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=url %}
 </div>