fix: text labeling fixes (#1226)

fix: text labeling fixes

Author: katrinan029

src/components/learner-credit-management/BudgetStatusSubtitle.jsx

@@ -37,7 +37,7 @@ const BudgetStatusSubtitle = ({
       enrollmentType:
       intl.formatMessage({
         id: 'lcm.budget.detail.page.overview.enroll.assignable',
-        defaultMessage: 'Assignable',
+        defaultMessage: 'Assignment',
         description: 'Enrollment type for budgets that are assignable',
       }),
       popoverText:

src/components/learner-credit-management/cards/data/utils.js

@@ -156,7 +156,7 @@ export const isInviteEmailAddressesInputValueValid = ({ learnerEmails }) => {
     ensureValidationErrorObjectExists();
     if (learnerEmailsCount > MAX_EMAIL_ENTRY_LIMIT) {
       validationError.reason = 'over_email_max';
-      validationError.message = `${learnerEmailsCount} emails entered (${MAX_EMAIL_ENTRY_LIMIT}} maximum).`
+      validationError.message = `${learnerEmailsCount} emails entered (${MAX_EMAIL_ENTRY_LIMIT} maximum). `
       + `Delete ${learnerEmailsCount - MAX_EMAIL_ENTRY_LIMIT} emails to proceed.`;
     }
     if (invalidEmails.length > 0) {

src/components/learner-credit-management/invite-modal/FileUpload.jsx

@@ -45,7 +45,7 @@ const FileUpload = ({ memberInviteMetadata, setEmailAddressesInputValue }) => {
           multipleDragged: 'Cannot upload more than one file.',
         }}
       />
-      <InviteModalInputFeedback memberInviteMetadata={memberInviteMetadata} />
+      <InviteModalInputFeedback memberInviteMetadata={memberInviteMetadata} isCsvUpload />
     </Form.Group>
   );
 };

src/components/learner-credit-management/invite-modal/InviteModalContent.jsx

@@ -86,7 +86,7 @@ const InviteModalContent = ({ onEmailAddressesChange, subsidyAccessPolicy }) =>
               rows={10}
               data-hj-suppress
             />
-            <InviteModalInputFeedback memberInviteMetadata={memberInviteMetadata} />
+            <InviteModalInputFeedback memberInviteMetadata={memberInviteMetadata} isCsvUpload={false} />
           </Form.Group>
           )}
           {inputType === INPUT_TYPE.CSV && (

src/components/learner-credit-management/invite-modal/InviteModalInputFeedback.jsx

@@ -2,8 +2,7 @@ import { Form } from '@edx/paragon';
 import PropTypes from 'prop-types';
 import { MAX_EMAIL_ENTRY_LIMIT } from '../cards/data';
 
-const InviteModalInputFeedback = (metadata) => {
-  const { memberInviteMetadata } = metadata;
+const InviteModalInputFeedback = ({ memberInviteMetadata, isCsvUpload }) => {
   if (memberInviteMetadata.validationError) {
     if (!memberInviteMetadata.isValidInput) {
       return (
@@ -18,6 +17,18 @@ const InviteModalInputFeedback = (metadata) => {
       </Form.Control.Feedback>
     );
   }
+  if (isCsvUpload) {
+    return (
+      <div>
+        {!memberInviteMetadata.lowerCasedEmails.length > 0 ? (
+          <Form.Control.Feedback>
+            <p className="mb-0">Maximum invite at a time: {MAX_EMAIL_ENTRY_LIMIT} emails</p>
+          </Form.Control.Feedback>
+        ) : null}
+      </div>
+    );
+  }
+
   return (
     <Form.Control.Feedback>
       <p className="mb-0">Maximum invite at a time: {MAX_EMAIL_ENTRY_LIMIT} emails</p>
@@ -27,14 +38,16 @@ const InviteModalInputFeedback = (metadata) => {
 };
 
 InviteModalInputFeedback.propTypes = {
-  metadata: PropTypes.shape({
-    memberInviteMetadata: PropTypes.shape({
-      isValidInput: PropTypes.bool,
-      validationError: PropTypes.shape({
-        message: PropTypes.number,
-      }),
+  memberInviteMetadata: PropTypes.shape({
+    isValidInput: PropTypes.bool,
+    validationError: PropTypes.shape({
+      message: PropTypes.number,
     }),
+    lowerCasedEmails: PropTypes.arrayOf(
+      PropTypes.shape({}),
+    ),
   }),
+  isCsvUpload: PropTypes.bool,
 };
 
 export default InviteModalInputFeedback;

src/components/learner-credit-management/invite-modal/tests/InviteMemberModal.test.jsx

@@ -16,7 +16,6 @@ import {
   useBudgetId, useEnterpriseGroupLearners, useSubsidyAccessPolicy, useContentMetadata,
 } from '../../data';
 import { EMAIL_ADDRESSES_INPUT_VALUE_DEBOUNCE_DELAY } from '../../cards/data';
-
 import { queryClient } from '../../../test/testUtils';
 
 import InviteMembersModalWrapper from '../InviteMembersModalWrapper';
@@ -163,6 +162,8 @@ describe('<InviteMemberModal />', () => {
       expect(screen.getByText('emails.csv')).toBeInTheDocument();
       expect(screen.getByText('Summary (1)')).toBeInTheDocument();
       expect(screen.getByText('[email protected]')).toBeInTheDocument();
+      const formFeedbackText = 'Maximum invite at a time: 1000';
+      expect(screen.queryByText(formFeedbackText)).not.toBeInTheDocument();
     }, { timeout: EMAIL_ADDRESSES_INPUT_VALUE_DEBOUNCE_DELAY + 1000 });
   });
   it('does not allow non-csv files', async () => {

src/components/learner-credit-management/members-tab/LearnerCreditGroupMembersTable.jsx

@@ -53,6 +53,7 @@ const KabobMenu = ({
         removeAllUsers={removeModal.allUsersSelected}
         totalToRemove={totalToRemove}
         groupUuid={groupUuid}
+        isRemoveIndividualUser
       />
     </>
   );

src/components/learner-credit-management/members-tab/bulk-actions/MemberRemoveModal.jsx

@@ -18,10 +18,12 @@ import { useBudgetId, useSubsidyAccessPolicy } from '../../data';
  * @param {number} totalToRemove
  * @returns {Object}
  */
-const generateRemoveModalSubmitLabel = (totalToRemove) => {
+const generateRemoveModalSubmitLabel = (totalToRemove, isRemoveIndividualUser) => {
   let buttonNumberLabel = 'all';
 
-  if (Number.isFinite(totalToRemove)) {
+  if (isRemoveIndividualUser) {
+    buttonNumberLabel = 'member';
+  } else if (Number.isFinite(totalToRemove)) {
     buttonNumberLabel = `(${totalToRemove})`;
   }
 
@@ -41,9 +43,10 @@ const MemberRemoveModal = ({
   removeAllUsers,
   totalToRemove,
   groupUuid,
+  isRemoveIndividualUser,
 }) => {
   const [requestState, setRequestState, initialRequestState] = useRequestState(isOpen);
-  const buttonLabels = generateRemoveModalSubmitLabel(totalToRemove);
+  const buttonLabels = generateRemoveModalSubmitLabel(totalToRemove, isRemoveIndividualUser);
 
   const title = `Remove member${removeAllUsers || totalToRemove > 1 ? 's' : ''}?`;
   const { subsidyAccessPolicyId } = useBudgetId();
@@ -155,6 +158,7 @@ const MemberRemoveModal = ({
 MemberRemoveModal.defaultProps = {
   removeAllUsers: false,
   totalToRemove: -1,
+  isRemoveIndividualUser: false,
 };
 
 MemberRemoveModal.propTypes = {
@@ -170,6 +174,7 @@ MemberRemoveModal.propTypes = {
   removeAllUsers: PropTypes.bool,
   totalToRemove: PropTypes.number,
   groupUuid: PropTypes.string.isRequired,
+  isRemoveIndividualUser: PropTypes.bool,
 };
 
 export default MemberRemoveModal;

src/components/learner-credit-management/members-tab/tests/MembersTab.test.jsx

@@ -508,6 +508,7 @@ describe('<BudgetDetailPage />', () => {
 
     expect(screen.queryByText('Remove members?')).toBeInTheDocument();
     const modalRemoveButton = screen.getByTestId('modal-remove-button');
+    expect(modalRemoveButton).toHaveTextContent('Remove (2)');
     userEvent.click(modalRemoveButton);
     expect(mockRemoveSpy).toHaveBeenCalled();
     await waitForElementToBeRemoved(() => screen.queryByText('Removing (2)'));
@@ -578,6 +579,7 @@ describe('<BudgetDetailPage />', () => {
 
     await waitFor(() => expect(screen.queryByText('Remove member?')).toBeInTheDocument());
     const modalRemoveButton = screen.getByTestId('modal-remove-button');
+    expect(modalRemoveButton).toHaveTextContent('Remove member');
     userEvent.click(modalRemoveButton);
     expect(mockRemoveSpy).toHaveBeenCalled();
     await waitFor(() => expect(screen.queryByText('1 member successfully removed')).toBeInTheDocument());