Allow WebUser invites to be editable before the invited user accepts it

corehq/apps/registration/forms.py

@@ -22,6 +22,7 @@
 from corehq.apps.domain.models import Domain
 from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.programs.models import Program
+from corehq.apps.reports.models import TableauUser
 from corehq.toggles import WEB_USER_INVITE_ADDITIONAL_FIELDS
 from corehq.apps.users.forms import SelectUserLocationForm, BaseTableauUserForm
 from corehq.apps.users.models import CouchUser
@@ -494,8 +495,9 @@ class AdminInvitesUserForm(SelectUserLocationForm):
 
     def __init__(self, data=None, is_add_user=None,
                  role_choices=(), should_show_location=False, can_edit_tableau_config=False,
-                 custom_data=None, *, domain, **kwargs):
+                 custom_data=None, invitation=None, *, domain, **kwargs):
         self.custom_data = custom_data
+        self.invite = invitation
         if data and self.custom_data:
             data = data.copy()
             custom_data_post_dict = self.custom_data.form.data
@@ -519,19 +521,30 @@ def __init__(self, data=None, is_add_user=None,
                 programs = Program.by_domain(domain_obj.name)
                 choices = [('', '')] + list((prog.get_id, prog.name) for prog in programs)
                 self.fields['program'].choices = choices
+                if self.invite:
+                    self.fields['program'].initial = self.invite.program
 
         if self.can_edit_tableau_config:
-            self._initialize_tableau_fields(data, domain)
+            self._initialize_tableau_fields(data, domain, self.invite)
 
         self.helper = FormHelper()
         self.helper.form_method = 'POST'
         self.helper.form_class = 'form-horizontal form-ko-validation'
 
         self.helper.label_class = 'col-sm-3 col-md-2'
         self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
+
+        save_button_text = _("Send Invite")
+        header_text = _("Information for new Web User")
+        add_user_text = _("Add User")
+        if self.invite:
+            self.fields['email'].widget.attrs["readonly"] = True
+            save_button_text = _("Update Invite")
+            header_text = _("Update invitation for new Web User")
+
         fields = [
             crispy.Fieldset(
-                gettext("Information for new Web User"),
+                gettext(header_text),
                 crispy.Field(
                     "email",
                     autocomplete="off",
@@ -575,8 +588,7 @@ def __init__(self, data=None, is_add_user=None,
             ),
             hqcrispy.FormActions(
                 twbscrispy.StrictButton(
-                    (gettext("Add User") if is_add_user
-                     else gettext("Send Invite")),
+                    (gettext(add_user_text) if is_add_user else gettext(save_button_text)),
                     type="submit",
                     css_class="btn-primary",
                     data_bind="enable: isSubmitEnabled",
@@ -594,7 +606,7 @@ def clean_email(self):
         email = self.cleaned_data['email'].strip()
 
         from corehq.apps.registration.validation import AdminInvitesUserFormValidator
-        error = AdminInvitesUserFormValidator.validate_email(self.domain, email)
+        error = AdminInvitesUserFormValidator.validate_email(self.domain, email, bool(self.invite))
         if error:
             raise forms.ValidationError(error)
         return email
@@ -632,9 +644,22 @@ def clean(self):
             raise forms.ValidationError(error)
         return cleaned_data
 
-    def _initialize_tableau_fields(self, data, domain):
-        self.tableau_form = BaseTableauUserForm(data, domain=domain)
+    def _initialize_tableau_fields(self, data, domain, invitation=None):
+        readonly = not self.request.couch_user.has_permission(domain, 'edit_user_tableau_config')
+        self.tableau_form = BaseTableauUserForm(data, domain=domain, readonly=readonly)
         self.fields['tableau_group_indices'] = self.tableau_form.fields["groups"]
         self.fields['tableau_group_indices'].label = _('Tableau Groups')
         self.fields['tableau_role'] = self.tableau_form.fields['role']
         self.fields['tableau_role'].label = _('Tableau Role')
+        if invitation:
+            if invitation.tableau_group_ids:
+                initial_groups_indicies = []
+                for group_index in invitation.tableau_group_ids:
+                    for i, group in enumerate(self.tableau_form.allowed_tableau_groups):
+                        if group_index == group.id:
+                            initial_groups_indicies.append(i)
+                self.fields['tableau_group_indices'].initial = initial_groups_indicies
+            try:
+                self.fields['tableau_role'].initial = TableauUser.Roles(invitation.tableau_role)
+            except ValueError:
+                pass

corehq/apps/registration/validation.py

@@ -26,12 +26,12 @@ def validate_parameters(domain, upload_user, parameters):
             return _("This domain does not have locations privileges.")
 
     @staticmethod
-    def validate_email(domain, email):
+    def validate_email(domain, email, is_invite_edit=False):
         current_users = [user.username.lower() for user in WebUser.by_domain(domain)]
         pending_invites = [di.email.lower() for di in Invitation.by_domain(domain)]
         current_users_and_pending_invites = current_users + pending_invites
 
-        if email.lower() in current_users_and_pending_invites:
+        if email.lower() in current_users_and_pending_invites and not is_invite_edit:
             return _("A user with this email address is already in "
                     "this project or has a pending invitation.")
         web_user = WebUser.get_by_username(email)

corehq/apps/users/forms.py

@@ -1729,8 +1729,13 @@ class BaseTableauUserForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.domain = kwargs.pop('domain', None)
+        readonly = kwargs.pop('readonly', True)
         super(BaseTableauUserForm, self).__init__(*args, **kwargs)
 
+        if readonly:
+            self.fields['role'].widget.attrs['readonly'] = True
+            self.fields['groups'].widget.attrs['disabled'] = True
+
         self.allowed_tableau_groups = [
             TableauGroupTuple(group.name, group.id) for group in get_all_tableau_groups(self.domain)
             if group.name in get_allowed_tableau_groups_for_domain(self.domain)]
@@ -1745,7 +1750,6 @@ class TableauUserForm(BaseTableauUserForm):
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs.pop('request')
-        readonly = kwargs.pop('readonly', True)
         self.username = kwargs.pop('username', None)
         super(TableauUserForm, self).__init__(*args, **kwargs)
 
@@ -1755,10 +1759,6 @@ def __init__(self, *args, **kwargs):
                 # Pre-choose groups that the user already belongs to
                 self.fields['groups'].initial.append(i)
 
-        if readonly:
-            self.fields['role'].widget.attrs['readonly'] = True
-            self.fields['groups'].widget.attrs['disabled'] = True
-
         self.helper = FormHelper()
 
         self.helper.form_method = 'POST'

corehq/apps/users/static/users/js/custom_data_fields.js

@@ -1,7 +1,7 @@
 /**
  *  This file defines a model for editing custom data fields while creating or editing a mobile user.
  */
 'use strict';
 
 hqDefine("users/js/custom_data_fields", [
     'knockout',
@@ -36,7 +36,7 @@
         var originalProfileFields = {},
             originalProfileId,
             originalProfile;
-        if (options.user_data) {
+        if (Object.keys(options.user_data).length) {
             originalProfileId = options.user_data[options.profile_slug];
             if (originalProfileId) {
                 originalProfile = self.profiles[originalProfileId];

corehq/apps/users/static/users/js/invite_web_user.js

@@ -12,7 +12,7 @@
     initialPageData,
     customDataFields
 ) {
     'use strict';
 
     var inviteWebUserFormHandler = function () {
         var self = {},
@@ -78,6 +78,7 @@
                 profile_slug: initialPageData.get('custom_fields_profile_slug'),
                 slugs: initialPageData.get('custom_fields_slugs'),
                 can_edit_original_profile: true,
+                user_data: initialPageData.get('user_data'),
             });
         }
 

corehq/apps/users/static/users/js/web_users.js

@@ -88,6 +88,8 @@ hqDefine("users/js/web_users",[
             });
         };
 
+        self.inviteEditUrl = initialPageData.reverse("edit_invitation", self.uuid);
+
         return self;
     };
 

corehq/apps/users/templates/users/invite_web_user.html

@@ -9,6 +9,7 @@
   {% initial_page_data 'custom_fields_slugs' custom_fields_slugs %}
   {% initial_page_data 'custom_fields_profiles' custom_fields_profiles %}
   {% initial_page_data 'custom_fields_profile_slug' custom_fields_profile_slug %}
+  {% initial_page_data 'user_data' user_data %}
   {% registerurl "check_sso_trust" domain %}
 
   <div id="invite-web-user-form"

corehq/apps/users/templates/users/web_users.html

@@ -12,6 +12,7 @@
   {% registerurl "delete_request" domain %}
   {% registerurl "paginate_web_users" domain %}
   {% registerurl "reinvite_web_user" domain %}
+  {% registerurl "edit_invitation" domain '---' %}
 
   <p class="lead">
     {% blocktrans with hq_name=commcare_hq_names.COMMCARE_HQ_NAME cc_name=commcare_hq_names.COMMCARE_NAME %}
@@ -270,10 +271,16 @@ <h3 class="panel-title" style="padding-top: 7px;">{% trans 'Pending Invitations'
               <td>
                 {% if not request.is_view_only %}
                 <div data-bind="visible: !actionMessage()">
+                  <a data-bind="attr: {href: inviteEditUrl}" style="text-decoration:none;">
+                    <button type="button" class="btn btn-default" data-bind="disable: actionInProgress">
+                      <i class="fa-regular fa-edit"></i>
+                      {% trans "Edit" %}
+                    </button>
+                  </a>
                   <button type="button" class="resend-invite btn btn-default"
                           data-bind="click: resend, disable: actionInProgress">
                     <i class="fa-regular fa-envelope"></i>
-                    {% trans "Resend Invitation" %}
+                    {% trans "Resend" %}
                   </button>
                   <button type="button" class="btn btn-danger delete-invitation"
                           data-bind="click: $root.confirmRemoveInvitation, disable: actionInProgress">

corehq/apps/users/urls.py

@@ -108,6 +108,7 @@
     url(r'^web/remove/(?P<couch_user_id>[ \w-]+)/$', remove_web_user, name='remove_web_user'),
     url(r'^web/undo_remove/(?P<record_id>[ \w-]+)/$', undo_remove_web_user, name='undo_remove_web_user'),
     url(r'^web/invite/$', InviteWebUserView.as_view(), name=InviteWebUserView.urlname),
+    url(r'^web/invite/edit/(?P<invitation_id>[ \w-]+)/$', InviteWebUserView.as_view(), name='edit_invitation'),
     url(r'^web/reinvite/$', reinvite_web_user, name='reinvite_web_user'),
     url(r'^web/request/$', DomainRequestView.as_view(), name=DomainRequestView.urlname),
     url(r'^web/delete_invitation/$', delete_invitation, name='delete_invitation'),

corehq/apps/users/views/__init__.py

@@ -12,7 +12,7 @@
 
 from corehq.apps.cloudcare.dbaccessors import get_cloudcare_apps, get_application_access_for_domain
 from corehq.apps.custom_data_fields.edit_entity import CustomDataEditor
-from corehq.apps.custom_data_fields.models import CustomDataFieldsProfile, CustomDataFieldsDefinition
+from corehq.apps.custom_data_fields.models import CustomDataFieldsProfile, CustomDataFieldsDefinition, PROFILE_SLUG
 from corehq.apps.registry.utils import get_data_registry_dropdown_options
 from corehq.apps.reports.models import TableauVisualization, TableauUser
 from corehq.apps.sso.models import IdentityProvider
@@ -1140,9 +1140,20 @@ def invite_web_user_form(self):
         role_choices = get_editable_role_choices(self.domain, self.request.couch_user, allow_admin_role=True)
         domain_request = DomainRequest.objects.get(id=self.request_id) if self.request_id else None
         is_add_user = self.request_id is not None
-        initial = {
-            'email': domain_request.email if domain_request else None,
-        }
+        invitation = self.invitation
+        if invitation:
+            assigned_location_ids = list(invitation.assigned_locations.all().values_list('location_id', flat=True))
+            primary_location_id = getattr(invitation.primary_location, "location_id", None)
+            initial = {
+                'email': invitation.email,
+                'role': invitation.role,
+                'assigned_locations': assigned_location_ids,
+                'primary_location': primary_location_id,
+            }
+        else:
+            initial = {
+                'email': domain_request.email if domain_request else None,
+            }
         can_edit_tableau_config = (self.request.couch_user.has_permission(self.domain, 'edit_user_tableau_config')
                                 and toggles.TABLEAU_USER_SYNCING.enabled(self.domain))
         if self.request.method == 'POST':
@@ -1154,7 +1165,8 @@ def invite_web_user_form(self):
                 should_show_location=self.request.project.uses_locations,
                 can_edit_tableau_config=can_edit_tableau_config,
                 request=self.request,
-                custom_data=self.custom_data
+                custom_data=self.custom_data,
+                invitation=invitation
             )
         return AdminInvitesUserForm(
             initial=initial,
@@ -1164,7 +1176,8 @@ def invite_web_user_form(self):
             should_show_location=self.request.project.uses_locations,
             can_edit_tableau_config=can_edit_tableau_config,
             request=self.request,
-            custom_data=self.custom_data
+            custom_data=self.custom_data,
+            invitation=invitation
         )
 
     @cached_property
@@ -1191,8 +1204,15 @@ def request_id(self):
 
     @property
     def page_context(self):
+        initial_values = {}
+        if self.invitation:
+            initial_values = {f.slug: self.invitation.custom_user_data.get(f.slug)
+                              for f in self.custom_data.fields}
+            if self.invitation.profile:
+                initial_values[PROFILE_SLUG] = self.invitation.profile.id
         ctx = {
             'registration_form': self.invite_web_user_form,
+            'user_data': initial_values,
             **self.custom_data.field_view.get_field_page_context(
                 self.domain, self.request.couch_user, self.custom_data, None
             )
@@ -1204,6 +1224,14 @@ def _assert_user_has_permission_to_access_locations(self, assigned_location_ids)
                 self.domain, self.request.couch_user).values_list('location_id', flat=True))):
             raise Http404()
 
+    @property
+    def invitation(self):
+        invitation_id = self.kwargs.get("invitation_id")
+        try:
+            return Invitation.objects.get(uuid=invitation_id)
+        except Invitation.DoesNotExist:
+            return None
+
     def post(self, request, *args, **kwargs):
         if self.invite_web_user_form.is_valid():
             # If user exists and has already requested access, just add them to the project
@@ -1215,7 +1243,22 @@ def post(self, request, *args, **kwargs):
             profile = CustomDataFieldsProfile.objects.get(
                 id=profile_id,
                 definition__domain=self.domain) if profile_id else None
-            if domain_request is not None:
+            invitation = self.invitation
+            if invitation:
+                create_invitation = False
+                invitation.profile = profile
+                invitation.primary_location, assigned_locations = self._get_sql_locations(
+                    data.pop("primary_location", None), data.pop("assigned_locations", []))
+                invitation.assigned_locations.set(assigned_locations)
+                invitation.custom_user_data = data.get("custom_user_data", {})
+
+                invitation.role = data.get("role")
+                invitation.program = data.get("program", None)
+                invitation.tableau_role = data.get("tableau_role", None)
+                invitation.tableau_group_ids = data.get("tableau_group_ids", None)
+                invitation.save()
+                messages.success(request, "Invite to %s was successfully updated." % data["email"])
+            elif domain_request is not None:
                 domain_request.is_approved = True
                 domain_request.save()
                 user = CouchUser.get_by_username(domain_request.email)
@@ -1243,20 +1286,11 @@ def post(self, request, *args, **kwargs):
                 data["invited_by"] = request.couch_user.user_id
                 data["invited_on"] = datetime.utcnow()
                 data["domain"] = self.domain
-                primary_location_id = data.pop("primary_location", None)
-                data["primary_location"] = (SQLLocation.by_location_id(primary_location_id)
-                                        if primary_location_id else None)
-                assigned_location_ids = data.pop("assigned_locations", [])
-                if primary_location_id:
-                    assert primary_location_id in assigned_location_ids
-                self._assert_user_has_permission_to_access_locations(assigned_location_ids)
                 data["profile"] = profile
+                data["primary_location"], assigned_locations = self._get_sql_locations(
+                    data.pop("primary_location", None), data.pop("assigned_locations", []))
                 invite = Invitation(**data)
                 invite.save()
-
-                assigned_locations = [SQLLocation.by_location_id(assigned_location_id)
-                        for assigned_location_id in assigned_location_ids
-                        if assigned_location_id is not None]
                 invite.assigned_locations.set(assigned_locations)
                 invite.send_activation_email()
 
@@ -1271,6 +1305,16 @@ def post(self, request, *args, **kwargs):
             ))
         return self.get(request, *args, **kwargs)
 
+    def _get_sql_locations(self, primary_location_id, assigned_location_ids):
+        primary_location = (SQLLocation.by_location_id(primary_location_id) if primary_location_id else None)
+        if primary_location_id:
+            assert primary_location_id in assigned_location_ids
+        self._assert_user_has_permission_to_access_locations(assigned_location_ids)
+        assigned_locations = [SQLLocation.by_location_id(assigned_location_id)
+                              for assigned_location_id in assigned_location_ids
+                              if assigned_location_id is not None]
+        return primary_location, assigned_locations
+
 
 class BaseUploadUser(BaseUserSettingsView):
     def post(self, request, *args, **kwargs):

corehq/apps/users/views/mobile/custom_data_fields.py

@@ -102,7 +102,7 @@ def get_displayable_profiles_and_edit_permission(cls, original_profile_id, domai
 
     @classmethod
     def get_field_page_context(cls, domain, couch_user, custom_data_editor: CustomDataEditor,
-                            original_profile_id=None):
+                               original_profile_id=None):
         profiles, can_edit_original_profile = (
             cls.get_displayable_profiles_and_edit_permission(
                 original_profile_id, domain, couch_user

corehq/tabs/tabclasses.py

@@ -1649,6 +1649,10 @@ def _get_web_username(request=None, couch_user=None, **context):
                         'title': _("Invite Web User"),
                         'urlname': 'invite_web_user'
                     },
+                    {
+                        'title': _("Edit Web User Invite"),
+                        'urlname': 'edit_invitation'
+                    },
                     {
                         'title': _get_web_username,
                         'urlname': EditWebUserView.urlname