From fdc5916ada80d336c66afaa68953a14b8dad3cf7 Mon Sep 17 00:00:00 2001
From: Kristin Aoki <42981026+KristinAoki@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:45:17 -0400
Subject: [PATCH] fix: course team UI bugs (#592)

---
 src/course-team/CourseTeam.jsx                |  4 +--
 .../add-team-member/AddTeamMember.jsx         |  2 +-
 src/course-team/constants.js                  | 10 +++++++
 .../course-team-member/CourseTeamMember.jsx   | 29 ++++++++++++-------
 .../course-team-member/CourseTeamMember.scss  | 11 -------
 .../course-team-member/messages.js            |  4 +++
 src/course-team/info-modal/InfoModal.jsx      |  1 -
 src/course-team/info-modal/messages.js        |  2 +-
 src/course-team/utils.js                      |  4 +--
 9 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/course-team/CourseTeam.jsx b/src/course-team/CourseTeam.jsx
index e5a3c1b84..e7b96bdf8 100644
--- a/src/course-team/CourseTeam.jsx
+++ b/src/course-team/CourseTeam.jsx
@@ -62,7 +62,7 @@ const CourseTeam = ({ courseId }) => {
 
   return (
     <>
-      <Container size="xl" className="m-4">
+      <Container size="xl" className="px-4">
         <section className="course-team-container mb-4">
           <Layout
             lg={[{ span: 9 }, { span: 3 }]}
@@ -79,7 +79,7 @@ const CourseTeam = ({ courseId }) => {
                     subtitle={intl.formatMessage(messages.headingSubtitle)}
                     headerActions={isAllowActions && (
                       <Button
-                        variant="outline-success"
+                        variant="primary"
                         iconBefore={IconAdd}
                         size="sm"
                         onClick={openForm}
diff --git a/src/course-team/add-team-member/AddTeamMember.jsx b/src/course-team/add-team-member/AddTeamMember.jsx
index 427534dc0..e6e08dcd4 100644
--- a/src/course-team/add-team-member/AddTeamMember.jsx
+++ b/src/course-team/add-team-member/AddTeamMember.jsx
@@ -16,7 +16,7 @@ const AddTeamMember = ({ onFormOpen, isButtonDisable }) => {
         <span className="text-gray-500 small">{intl.formatMessage(messages.description)}</span>
       </div>
       <Button
-        variant="outline-success"
+        variant="primary"
         iconBefore={IconAdd}
         onClick={onFormOpen}
         disabled={isButtonDisable}
diff --git a/src/course-team/constants.js b/src/course-team/constants.js
index f6b603a17..f7d6a11d2 100644
--- a/src/course-team/constants.js
+++ b/src/course-team/constants.js
@@ -4,4 +4,14 @@ export const MODAL_TYPES = {
   warning: 'warning',
 };
 
+export const BADGE_STATES = {
+  admin: 'primary-700',
+  staff: 'gray-500',
+};
+
+export const USER_ROLES = {
+  admin: 'instructor',
+  staff: 'staff',
+};
+
 export const EXAMPLE_USER_EMAIL = 'username@domain.com';
diff --git a/src/course-team/course-team-member/CourseTeamMember.jsx b/src/course-team/course-team-member/CourseTeamMember.jsx
index 333be2ba2..d0e53709a 100644
--- a/src/course-team/course-team-member/CourseTeamMember.jsx
+++ b/src/course-team/course-team-member/CourseTeamMember.jsx
@@ -1,11 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Badge, Button, MailtoLink } from '@edx/paragon';
-import { DeleteOutline as DeleteOutlineIcon } from '@edx/paragon/icons';
+import {
+  Badge,
+  Button,
+  Icon,
+  IconButtonWithTooltip,
+  MailtoLink,
+} from '@edx/paragon';
+import { DeleteOutline } from '@edx/paragon/icons';
 
 import messages from './messages';
-import { USER_ROLES, BADGE_STATES } from '../../constants';
+import { USER_ROLES, BADGE_STATES } from '../constants';
 
 const CourseTeamMember = ({
   userName,
@@ -19,16 +25,17 @@ const CourseTeamMember = ({
 }) => {
   const intl = useIntl();
   const isAdminRole = role === USER_ROLES.admin;
+  const badgeColor = isAdminRole ? BADGE_STATES.admin : BADGE_STATES.staff;
 
   return (
     <div className="course-team-member" data-testid="course-team-member">
       <div className="member-info">
-        <Badge variant={isAdminRole ? BADGE_STATES.danger : BADGE_STATES.secondary} className="badge-current-user">
+        <Badge className={`badge-current-user bg-${badgeColor} text-light-100`}>
           {isAdminRole
             ? intl.formatMessage(messages.roleAdmin)
             : intl.formatMessage(messages.roleStaff)}
           {currentUserEmail === email && (
-            <span className="badge-current-user">{intl.formatMessage(messages.roleYou)}</span>
+            <span className="badge-current-user x-small text-light-500">{intl.formatMessage(messages.roleYou)}</span>
           )}
         </Badge>
         <span className="member-info-name font-weight-bold">{userName}</span>
@@ -45,13 +52,13 @@ const CourseTeamMember = ({
             >
               {isAdminRole ? intl.formatMessage(messages.removeButton) : intl.formatMessage(messages.addButton)}
             </Button>
-            <Button
-              className="delete-button"
-              variant="tertiary"
-              size="sm"
-              data-testid="delete-button"
-              iconBefore={DeleteOutlineIcon}
+            <IconButtonWithTooltip
+              src={DeleteOutline}
+              tooltipContent={intl.formatMessage(messages.deleteUserButton)}
               onClick={() => onDelete(email)}
+              iconAs={Icon}
+              alt={intl.formatMessage(messages.deleteUserButton)}
+              data-testid="delete-button"
             />
           </div>
         ) : (
diff --git a/src/course-team/course-team-member/CourseTeamMember.scss b/src/course-team/course-team-member/CourseTeamMember.scss
index 0285f13a9..61969a3cf 100644
--- a/src/course-team/course-team-member/CourseTeamMember.scss
+++ b/src/course-team/course-team-member/CourseTeamMember.scss
@@ -29,7 +29,6 @@
     }
 
     .badge-current-user {
-      color: $gray-100;
       margin-left: .25rem;
     }
 
@@ -49,15 +48,5 @@
   .member-actions {
     display: flex;
     gap: $spacer;
-
-    .delete-button {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      & > span {
-        margin: 0;
-      }
-    }
   }
 }
diff --git a/src/course-team/course-team-member/messages.js b/src/course-team/course-team-member/messages.js
index 784319b35..87bb37168 100644
--- a/src/course-team/course-team-member/messages.js
+++ b/src/course-team/course-team-member/messages.js
@@ -25,6 +25,10 @@ const messages = defineMessages({
     id: 'course-authoring.course-team.member.button.remove',
     defaultMessage: 'Remove admin access',
   },
+  deleteUserButton: {
+    id: 'course-authoring.course-team.member.button.delete',
+    defaultMessage: 'Delete user',
+  },
 });
 
 export default messages;
diff --git a/src/course-team/info-modal/InfoModal.jsx b/src/course-team/info-modal/InfoModal.jsx
index 4b9f5a995..3c489bfe5 100644
--- a/src/course-team/info-modal/InfoModal.jsx
+++ b/src/course-team/info-modal/InfoModal.jsx
@@ -45,7 +45,6 @@ const InfoModal = ({
           </Button>
           {modalType === MODAL_TYPES.delete && (
             <Button
-              variant="danger"
               onClick={(e) => {
                 e.preventDefault();
                 onDeleteSubmit();
diff --git a/src/course-team/info-modal/messages.js b/src/course-team/info-modal/messages.js
index 9a3dd74be..8e8a965e6 100644
--- a/src/course-team/info-modal/messages.js
+++ b/src/course-team/info-modal/messages.js
@@ -3,7 +3,7 @@ import { defineMessages } from '@edx/frontend-platform/i18n';
 const messages = defineMessages({
   deleteModalTitle: {
     id: 'course-authoring.course-team.member.button.remove',
-    defaultMessage: 'Are you sure?',
+    defaultMessage: 'Delete course team member',
   },
   deleteModalMessage: {
     id: 'course-authoring.course-team.delete-modal.message',
diff --git a/src/course-team/utils.js b/src/course-team/utils.js
index 53604cf72..ee8a15d2a 100644
--- a/src/course-team/utils.js
+++ b/src/course-team/utils.js
@@ -23,7 +23,7 @@ const getInfoModalSettings = (modalType, currentEmail, errorMessage, courseName,
     return {
       title: intl.formatMessage(messages.deleteModalTitle),
       message: intl.formatMessage(messages.deleteModalMessage, { email: currentEmail, courseName }),
-      variant: 'danger',
+      variant: '',
       closeButtonText: intl.formatMessage(messages.deleteModalCancelButton),
       submitButtonText: intl.formatMessage(messages.deleteModalDeleteButton),
       closeButtonVariant: 'tertiary',
@@ -34,7 +34,7 @@ const getInfoModalSettings = (modalType, currentEmail, errorMessage, courseName,
       message: errorMessage,
       variant: 'danger',
       closeButtonText: intl.formatMessage(messages.errorModalOkButton),
-      closeButtonVariant: 'danger',
+      closeButtonVariant: 'primary',
     };
   case MODAL_TYPES.warning:
     return {