Add Co-applicants feature to submissions by sandeepsajan0 · Pull Request #4492 · HyphaApp/hypha

sandeepsajan0 · 2025-04-10T07:57:59Z

Fixes #3919

Applicant UI, default open

Invite co-applicant, (on click invite button).

Update roles, after accept

Staff UI, default collapsed.

Co-applicant UI, invite landing page

Invalid invite page

Test Steps

…

frjo · 2025-04-22T13:20:42Z

@sandeepsajan0 Add some sane max limit and ratelimit the feature. @frankduncan mentioned on a meeting today that they had issues with spammers etc. misusing the ability to create accounts.

Account creation is ratelimited and since this feature will be a way to create accounts we should rarelimit.

Adding a sane max number of co-applicants is a good precaution as well.

@wes-otf Maybe ten (10)?

wes-otf · 2025-04-22T13:43:40Z

yeah I think 10 would be perfect

sandeepsajan0 · 2025-05-14T10:34:29Z

Add some sane max limit and ratelimit the feature. @frankduncan mentioned on a meeting today that they had issues with spammers etc. misusing the ability to create accounts.

@frjo We are creating users after the co-applicant accepts the invite, so we are safe from user creation spam.

Also, there is an env var for the max number of invites for a submission, so invite spam is also handled.

wes-otf · 2025-05-14T19:49:01Z

This functionality is so fantastic! Been playing with it a little bit locally today and will have a few tweaks, but overall really nice job!

frjo

Works really well overall, nice! Some minor text changes.

frjo · 2025-05-15T12:56:18Z

+{% if not can_accept %}
+{% trans "But You can't accept this invite because you already hold a responsible position in" %} {{ ORG_SHORT_NAME }}
+{% else %}
+{% blocktrans %} Click on link if you want to accept it.{% endblocktrans %}


Remove space before "Click". Also add empty line after.

frjo · 2025-05-15T13:50:50Z

+    <div class="bg-gray-100 max-w-[70%] mx-auto mt-6 px-10 pt-6 pb-4 border border-gray-300 rounded-sm">
+        {% if is_valid %}
+            <p>{% trans "You've been invited to join the submission" %} "{{ invite.submission.title }}" {% trans "as a co-applicant with email" %} <i>{{ invite.invited_user_email }}</i>. {% trans "Please respond to the invitation by choosing accept or decline." %}</p>
+            <p>{% trans "If you accept, you’ll be automatically signed up or logged in and taken directly to" %} {% if two_factor_required %}{% trans "two factor authentication and then to" %} {% endif %} {% trans "the submission." %}</p>


"the application" instead of "the submission"

frjo · 2025-05-15T13:51:41Z

+        {% if is_valid %}
+            <p>{% trans "You've been invited to join the submission" %} "{{ invite.submission.title }}" {% trans "as a co-applicant with email" %} <i>{{ invite.invited_user_email }}</i>. {% trans "Please respond to the invitation by choosing accept or decline." %}</p>
+            <p>{% trans "If you accept, you’ll be automatically signed up or logged in and taken directly to" %} {% if two_factor_required %}{% trans "two factor authentication and then to" %} {% endif %} {% trans "the submission." %}</p>
+            <p>{% trans "We recommend updating your profile after accepting the invite. You’ll also have the option to update your name and email in 'My account' section." %}</p>


These two sentences can be merged it to one I believe.

frjo · 2025-05-15T13:53:33Z

+                hx-target="#htmx-modal"
+                {% if object.co_applicant_invites.count >= invite_max_limit %}disabled title='{% trans "Max limit reached" %}'{% endif %}
+                role="button"
+                aria-label="{% trans "Invite CoApplicant" %}"


User facing text should say "co-applicant".

wes-otf

really nice work! all my changes were super minor things, the functionality seems great.

wes-otf · 2025-05-14T19:49:58Z

+    <details {% if user.is_applicant %} open {% endif %}>
+        <summary class="flex gap-4 justify-between items-center">
+            <p class="flex items-center text-lg font-bold">
+                {% trans "Co-applicants" %}
+                {% heroicon_solid "chevron-down" size="16" class="w-4 h-4 ms-2" %}


Suggested change

<details {% if user.is_applicant %} open {% endif %}>

<summary class="flex gap-4 justify-between items-center">

<p class="flex items-center text-lg font-bold">

{% trans "Co-applicants" %}

{% heroicon_solid "chevron-down" size="16" class="w-4 h-4 ms-2" %}

<details {% if user.is_applicant or not co_applicants %} open {% endif %} class="group">

<summary class="flex gap-4 justify-between items-center list-none">

<p class="flex items-center text-lg font-bold">

{% trans "Co-applicants" %}

{% heroicon_solid "chevron-down" size="16" class="rotate-90 w-4 h-4 ms-2 group-open:rotate-0" %}

This might make things a bit more intuitive - don't hide no applicants and have the chevron indicate when things are hidden

also might be nice to include the number of co-applicants next to the Co-applicants text just to get the idea at a glace

Updated! It looks better. The number of co-applicants is also included there.

wes-otf · 2025-05-14T20:15:23Z

+            </div>
+        {% else %}
+            <div>
+                {% trans "No co-applicant yet" %}


Suggested change

{% trans "No co-applicant yet" %}

{% trans "No co-applicants yet." %}

To be consistent with the other blocks

wes-otf · 2025-05-15T14:56:16Z

+                            class="font-bold line-clamp-2"
+                            href="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"
+                            hx-get="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"
+                            hx-target="#htmx-modal"
+                        >
+                            <div class="flex justify-between">
+                                {% if invite.status == "accepted" %}
+                                    {{ invite.co_applicant.user }}
+                                {% else %}
+                                    {{ invite.invited_user_email }}
+                                {% endif %}
+
+                                {% heroicon_solid "pencil" class="inline align-middle me-1" width=16 height=16 stroke_width=2 aria_hidden=true %}


Suggested change

class="font-bold line-clamp-2"

href="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"

hx-get="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"

hx-target="#htmx-modal"

>

<div class="flex justify-between">

{% if invite.status == "accepted" %}

{{ invite.co_applicant.user }}

{% else %}

{{ invite.invited_user_email }}

{% endif %}

{% heroicon_solid "pencil" class="inline align-middle me-1" width=16 height=16 stroke_width=2 aria_hidden=true %}

class="font-bold line-clamp-2 group/coapplicant"

href="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"

hx-get="{% url 'apply:submissions:edit_co_applicant' invite_pk=invite.id %}"

hx-target="#htmx-modal"

>

<div class="flex justify-between">

{% if invite.status == "accepted" %}

{{ invite.co_applicant.user }}

{% else %}

{{ invite.invited_user_email }}

{% endif %}

{% heroicon_solid "pencil" class="hidden align-middle me-1 group-hover/coapplicant:inline" width=16 height=16 stroke_width=2 aria_hidden=true %}

I think @theskumar mentioned this in the last dev call but might make sense to keep this similar to the todo list's functionality and only show the edit button on hover.

(edited to not conflict w groups in this comment)

wes-otf · 2025-05-15T15:40:15Z

+    def handle_co_applicant_invite(self, source, related, **kwargs):
+        from hypha.apply.funds.utils import generate_invite_path
+
+        invited_user = User.objects.filter(email=related.invited_user_email).first()


if you're already querying for the existing user here it might be cool to pass their name to the template so they won't get something different in the salutation than their set name in Hypha. not mission critical though

Updated. Using the invited user name if it exists, else the trimmed email name.

wes-otf · 2025-05-15T16:05:20Z

My last comment is for permissions I think it might make more sense to always allow commenting (both read only & editing) and maybe renaming read only to view?

…rmission for coapplicant

… on accept, Updated permissions and dashboard for co-applicants, Update listing and modals UI

…sues

sandeepsajan0 · 2025-05-20T13:51:17Z

@frjo It is ready for testing.

My last comment is for permissions I think it might make more sense to always allow commenting (both read only & editing) and maybe renaming read only to view?

@wes-otf As I will work on the project part permissions, we can decide about it and use the same pattern for both.

Fixed

Extension of #4492

sandeepsajan0 force-pushed the enhancement/gh-3919-co-applicant-feature branch from c55867f to be48f51 Compare April 24, 2025 07:09

frjo added Type: Feature This is something new (not an enhancement of an existing thing). Type: Minor Minor change, used in release drafter labels May 6, 2025

frjo changed the title ~~Co-applicants feature~~ Add Co-applicants feature to submissions May 6, 2025

sandeepsajan0 force-pushed the enhancement/gh-3919-co-applicant-feature branch from ed56b85 to 1bc2891 Compare May 12, 2025 12:34

sandeepsajan0 marked this pull request as ready for review May 14, 2025 09:51

sandeepsajan0 requested review from frjo, theskumar and wes-otf and removed request for theskumar and wes-otf May 14, 2025 10:35

frjo requested changes May 15, 2025

View reviewed changes

wes-otf previously requested changes May 15, 2025

View reviewed changes

sandeepsajan0 added 6 commits May 20, 2025 17:40

Update co-applicant model

b2cf621

Add Invite Coapplicant model/feature, list their email ids

c1c70e2

Fix token for invite link, updated accpet/reject invite functionality

a08ca1c

Updated respond invite functionality, fixed submission detail page pe…

3eb0881

…rmission for coapplicant

Use Passward reset token generator, add auto login and signup feature…

8664feb

… on accept, Updated permissions and dashboard for co-applicants, Update listing and modals UI

Updated ordering of invites, limit no of coapplicants

3243df9

sandeepsajan0 added 11 commits May 20, 2025 17:44

Remove unnecessary changes

fc9a3d7

Add email notifications to co-applicant based on their roles

a2dcd0c

Fix collapsible, expiry update, role in invie form and other small is…

de1b3df

…sues

Fix determination view permission for co-applicants

ba289e3

Update Ful-access to edit

bb88c1a

Keep co-applicant section default open for applicants

a931dff

Fix email recipeints for project

27f727f

Fix migrations

77a5007

Fix bug of logged in user with another email

8e535bb

Add co-applicant invites limit, set a env var for that

fbaedeb

Updated suggestions

c47fd00

sandeepsajan0 force-pushed the enhancement/gh-3919-co-applicant-feature branch from 9f43d3e to c47fd00 Compare May 20, 2025 13:12

sandeepsajan0 added 2 commits May 20, 2025 18:51

Fix migration conflict issue

c2e4c82

Fix lint issue:not sure why it was missed by precommit

f88ce56

frjo added Status: Needs testing Tickets that need testing/qa Status: Needs dev testing 🧑‍💻 Tasks that should be tested by the dev team labels May 20, 2025

frjo temporarily deployed to test-hypha-app May 20, 2025 15:34 Inactive

frjo removed Status: Needs testing Tickets that need testing/qa Status: Needs dev testing 🧑‍💻 Tasks that should be tested by the dev team labels May 22, 2025

frjo requested review from frjo and wes-otf May 22, 2025 07:58

frjo approved these changes May 22, 2025

View reviewed changes

frjo merged commit ddd37e6 into main May 22, 2025
12 checks passed

sandeepsajan0 mentioned this pull request May 26, 2025

Expand co-applicant feature to projects #4552

Merged

1 task

frjo pushed a commit that referenced this pull request Jun 7, 2025

Expand co-applicant feature to projects (#4552)

56b31c9

Extension of #4492

theskumar deleted the enhancement/gh-3919-co-applicant-feature branch July 20, 2025 09:14

	{% trans "No co-applicant yet" %}
	{% trans "No co-applicants yet." %}

Conversation

sandeepsajan0 commented Apr 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Steps

Uh oh!

frjo commented Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wes-otf commented Apr 22, 2025

Uh oh!

sandeepsajan0 commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wes-otf commented May 14, 2025

Uh oh!

frjo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wes-otf left a comment

Choose a reason for hiding this comment

Uh oh!

wes-otf May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wes-otf May 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wes-otf commented May 15, 2025

Uh oh!

sandeepsajan0 commented May 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sandeepsajan0 commented Apr 10, 2025 •

edited

Loading

frjo commented Apr 22, 2025 •

edited

Loading

sandeepsajan0 commented May 14, 2025 •

edited

Loading

wes-otf May 14, 2025 •

edited

Loading

wes-otf May 15, 2025 •

edited

Loading