Addressed feedback

src/registrar/assets/src/js/getgov/portfolio-member-page.js

@@ -1,4 +1,5 @@
 import { uswdsInitializeModals } from './helpers-uswds.js';
+import { getCsrfToken } from './helpers.js';
 import { generateKebabHTML } from './table-base.js';
 import { MembersTable } from './table-members.js';
 
@@ -82,6 +83,14 @@ export function initAddNewMemberPageListeners() {
     });
   });
 
+  /*
+    Helper function to capitalize the first letter in a string (for display purposes)
+  */
+  function capitalizeFirstLetter(text) {
+    if (!text) return ''; // Return empty string if input is falsy
+    return text.charAt(0).toUpperCase() + text.slice(1);
+  }
+
   /*
     Populates contents of the "Add Member" confirmation modal
   */
@@ -90,7 +99,7 @@ export function initAddNewMemberPageListeners() {
     permissionDetailsContainer.innerHTML = ""; // Clear previous content
 
     // Get all permission sections (divs with h3 and radio inputs)
-    const permissionSections = document.querySelectorAll("#"+permission_details_div_id+" > h3");
+    const permissionSections = document.querySelectorAll(`#${permission_details_div_id} > h3`);
 
     permissionSections.forEach(section => {
         // Find the <h3> element text
@@ -138,12 +147,14 @@ export function initAddNewMemberPageListeners() {
 
       // Get selected radio button for access level
       let selectedAccess = document.querySelector('input[name="member_access_level"]:checked');
-      let accessText = selectedAccess ? selectedAccess.value : "No access level selected"; //nextElementSibling.textContent.trim()
+      // Set the selected permission text to 'Basic' or 'Admin' (the value of the selected radio button)
+      // This value does not have the first letter capitalized so let's capitalize it
+      let accessText = selectedAccess ? capitalizeFirstLetter(selectedAccess.value) : "No access level selected";
       document.getElementById('modalAccessLevel').textContent = accessText;
 
       // Populate permission details based on access level
       if (selectedAccess && selectedAccess.value === 'admin') {
-          populatePermissionDetails('new-member-admin-permissions')
+        populatePermissionDetails('new-member-admin-permissions')
       } else {
         populatePermissionDetails('new-member-basic-permissions')
       }

src/registrar/tests/test_views_portfolio.py

@@ -1876,7 +1876,7 @@ class TestPortfolio(WebTest):
             portfolio=self.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
         )
-        with patch("django.contrib.messages.success") as mock_success:
+e        with patch("django.contrib.messages.success") as mock_success:
             self.client.force_login(self.user)
             response = self.client.post(
                 reverse("invitedmember-delete", kwargs={"pk": invitation.pk}),

src/registrar/views/portfolios.py

@@ -548,17 +548,19 @@ class NewMemberView(PortfolioMembersPermissionView, FormMixin):
         # Check to see if an invite has already been sent
         try:
             invite = PortfolioInvitation.objects.get(email=email, portfolio=self.object)
-            # check if the invite has already been accepted
-            if invite.status == PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED:
-                add_success = False
-                messages.warning(
-                    self.request,
-                    f"{email} is already a manager for this portfolio.",
-                )
-            else:
-                add_success = False
-                # else if it has been sent but not accepted
-                messages.warning(self.request, f"{email} has already been invited to this portfolio")
+            if invite: # We have an existin invite
+                # check if the invite has already been accepted
+                if invite.status == PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED:
+                    add_success = False
+                    messages.warning(
+                        self.request,
+                        f"{email} is already a manager for this portfolio.",
+                    )
+                else:
+                    add_success = False
+                    # it has been sent but not accepted
+                    messages.warning(self.request, f"{email} has already been invited to this portfolio")
+                return
         except Exception:
             logger.error("An error occured")
 
@@ -586,11 +588,23 @@ class NewMemberView(PortfolioMembersPermissionView, FormMixin):
             if add_success:
                 messages.success(self.request, f"{email} has been invited.")
 
-    def _make_invitation(self, email_address: str, requestor: User):
+    def _make_invitation(self, email_address: str, requestor: User, add_success=True):
         """Make a Member invitation for this email and redirect with a message."""
         try:
-            self._send_portfolio_invitation_email(email=email_address, requestor=requestor)
+            self._send_portfolio_invitation_email(email=email_address, requestor=requestor, add_success=add_success)
         except EmailSendingError:
+            logger.warn(
+                "Could not send email invitation (EmailSendingError)",
+                self.object,
+                exc_info=True,
+            )
+            messages.warning(self.request, "Could not send email invitation.")
+        except Exception:
+            logger.warn(
+                "Could not send email invitation (Other Exception)",
+                self.object,
+                exc_info=True,
+            )
             messages.warning(self.request, "Could not send email invitation.")
         else:
             # (NOTE: only create a MemberInvitation if the e-mail sends correctly)
@@ -604,6 +618,21 @@ class NewMemberView(PortfolioMembersPermissionView, FormMixin):
         requested_email = form.cleaned_data["email"]
         requestor = self.request.user
 
+        requested_user = User.objects.filter(email=requested_email).first()
+        permission_exists = UserPortfolioPermission.objects.filter(user=requested_user, portfolio=self.object).exists()
+        if not requested_user or not permission_exists:
+             return self._make_invitation(requested_email, requestor)
+        else:
+            if permission_exists:
+                messages.warning(self.request, "User is already a member of this portfolio.")
+        return redirect(self.get_success_url())
+
+
+
+
+
+
+
         # look up a user with that email
         try:
             requested_user = User.objects.get(email=requested_email)