Concept & Proposal both show up in user dashboard

[wes-otf]

Describe the bug

Concept & Proposal both show up in the user's dashboard and they both contain the combined CN + Proposal timeline, which makes them feel like two separate applications

To Reproduce

Steps to reproduce the behavior:

1. Create a new Concept Note as applicant role
2. Send an approval determination
3. Navigate to dashboard
4. See both concept note & proposal appear separately, both displaying the combined CN + Proposal timeline

Expected behavior

Either the proposal just shows, OR (maybe more ideal) both show up but the timelines are split, ie. the furthest the CN would go would be Concept Accepted & the Proposal would start with Invited to Proposal

Priority

• Low priority (annoying, would be nice to not see)

Affected roles

• Applicants

Screenshots

[wes-otf]

both show up but the timelines are split, ie. the furthest the CN would go would be Concept Accepted & the Proposal would start with Invited to Proposal

would also be nice to indicate to the user the two were associated somehow in that quick glance

[frjo]

Looks like the query is missing the "current" filter.

hypha/hypha/apply/dashboard/views_partials.py

Lines 12 to 25 in d26405a

	def my_active_submissions(user):
	active_subs = (
	ApplicationSubmission.objects.filter(
	Q(user=user) | Q(co_applicants__user=user),
	)
	.annotate(
	is_active=Case(When(status__in=active_statuses, then=True), default=False)
	)
	.select_related("draft_revision")
	.order_by("-is_active", "-submit_time")
	.distinct()
	)
	for submission in active_subs:
	yield submission.from_draft()

To filter out concept notes that have a proposal this function is used:

hypha/hypha/apply/funds/models/submissions.py

Lines 194 to 196 in d26405a

	def current(self):
	# Applications which have the current stage active (have not been progressed) or not archived yet.
	return self.exclude(Q(next__isnull=False) | Q(is_archive=True))