diff --git a/src/registrar/models/utility/generic_helper.py b/src/registrar/models/utility/generic_helper.py index 0befd6627..3a6e04d4e 100644 --- a/src/registrar/models/utility/generic_helper.py +++ b/src/registrar/models/utility/generic_helper.py @@ -2,6 +2,8 @@ import time import logging +from typing import Any +from urllib.parse import urlparse, urlunparse, urlencode logger = logging.getLogger(__name__) @@ -266,3 +268,29 @@ class CreateOrUpdateOrganizationTypeHelper: return False else: return True + + +def replace_url_queryparams(url_to_modify: str, query_params: dict[Any, list]): + """ + Replaces the query parameters of a given URL. + Because this replaces them, this can be used to either add, delete, or modify. + Args: + url_to_modify (str): The URL whose query parameters need to be modified. + query_params (dict): Dictionary of query parameters to use. + Returns: + str: The modified URL with the updated query parameters. + """ + + # Ensure each key in query_params maps to a single value, not a list + query_params = {k: v[0] if isinstance(v, list) else v for k, v in query_params.items()} + + # Split the URL into parts + url_parts = list(urlparse(url_to_modify)) + + # Modify the query param bit + url_parts[4] = urlencode(query_params) + + # Reassemble the URL + new_url = urlunparse(url_parts) + + return new_url \ No newline at end of file diff --git a/src/registrar/templates/domain_request_intro.html b/src/registrar/templates/domain_request_intro.html index d6d3b3b7f..285777a80 100644 --- a/src/registrar/templates/domain_request_intro.html +++ b/src/registrar/templates/domain_request_intro.html @@ -13,12 +13,12 @@

We’ll use the information you provide to verify your organization’s eligibility for a .gov domain. We’ll also verify that the domain you request meets our guidelines.

Time to complete the form

If you have all the information you need, - completing your domain request might take around 15 minutes.

- {% if has_profile_feature_flag %} -

How we’ll reach you

-

While reviewing your domain request, we may need to reach out with questions. We’ll also email you when we complete our review If the contact information below is not correct, visit your profile to make updates.

- {% include "includes/profile_information.html" with user=user%} - {% endif %} + completing your domain request might take around 15 minutes.

+ {% if has_profile_feature_flag %} +

How we’ll reach you

+

While reviewing your domain request, we may need to reach out with questions. We’ll also email you when we complete our review If the contact information below is not correct, visit your profile to make updates.

+ {% include "includes/profile_information.html" with user=user%} + {% endif %} {% block form_buttons %} diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html index 13179e4ac..368bc7367 100644 --- a/src/registrar/templates/profile.html +++ b/src/registrar/templates/profile.html @@ -10,14 +10,19 @@ Edit your User Profile | {% block content %}
- + - + {% if not return_to_request %}

Back to manage your domains

+ {% else %} +

+ Go back to your domain request +

+ {% endif %} {# messages block is under the back breadcrumb link #} {% if messages %} diff --git a/src/registrar/views/user_profile.py b/src/registrar/views/user_profile.py index b386e6a62..9662f71e4 100644 --- a/src/registrar/views/user_profile.py +++ b/src/registrar/views/user_profile.py @@ -3,6 +3,7 @@ """ import logging +from urllib.parse import parse_qs, unquote, urlencode from django.contrib import messages from django.views.generic.edit import FormMixin @@ -11,6 +12,7 @@ from django.urls import reverse from registrar.models import ( Contact, ) +from registrar.models.utility.generic_helper import replace_url_queryparams from registrar.views.utility.permission_views import UserProfilePermissionView from waffle.decorators import flag_is_active, waffle_flag @@ -30,13 +32,26 @@ class UserProfileView(UserProfilePermissionView, FormMixin): def get(self, request, *args, **kwargs): """Handle get requests by getting user's contact object and setting object and form to context before rendering.""" - self.object = self.get_object() + self._refresh_session_and_object(request) form = self.form_class(instance=self.object) context = self.get_context_data(object=self.object, form=form) + + return_to_request = request.GET.get("return_to_request") + if return_to_request: + context["return_to_request"] = True + return self.render_to_response(context) + def _refresh_session_and_object(self, request): + """Sets the current session to self.session and the current object to self.object""" + self.session = request.session + self.object = self.get_object() + @waffle_flag("profile_feature") # type: ignore def dispatch(self, request, *args, **kwargs): # type: ignore + # Store the original queryparams to persist them + query_params = request.META["QUERY_STRING"] + request.session["query_params"] = query_params return super().dispatch(request, *args, **kwargs) def get_context_data(self, **kwargs): @@ -48,11 +63,20 @@ class UserProfileView(UserProfilePermissionView, FormMixin): def get_success_url(self): """Redirect to the user's profile page.""" - return reverse("user-profile") + + query_params = {} + if "query_params" in self.session: + params = unquote(self.session["query_params"]) + query_params = parse_qs(params) + + # Preserve queryparams and add them back to the url + base_url = reverse("user-profile") + new_redirect = replace_url_queryparams(base_url, query_params) if query_params else base_url + return new_redirect def post(self, request, *args, **kwargs): """Handle post requests (form submissions)""" - self.object = self.get_object() + self._refresh_session_and_object(request) form = self.form_class(request.POST, instance=self.object) if form.is_valid():