box-ui-elements 16.0.0-beta.9 → 16.0.0

package/src/features/unified-share-modal/__tests__/UnifiedShareForm.test.js

@@ -20,17 +20,14 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
     };
     const defaultContacts = [
         {
-            value: 'x@example.com',
-            email: 'x@example.com',
-            id: '12345',
-            isExternalUser: false,
+            id: 12345,
             name: 'X User',
             type: 'group',
         },
         {
             value: 'y@example.com',
             email: 'y@example.com',
-            id: '23456',
+            id: 23456,
             isExternalUser: true,
             name: 'Y User',
             type: 'user',
@@ -38,12 +35,13 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
         {
             value: 'z@example.com',
             email: 'z@example.com',
-            id: '34567',
+            id: 34567,
             isExternalUser: true,
             name: 'Z User',
             type: 'user',
         },
     ];
+    const defaultUserContacts = defaultContacts.filter(({ type }) => type === 'user');
     const testPermission = {
         text: 'Editor',
         value: 'Editor',
@@ -69,6 +67,7 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
                 intl={intl}
                 inviteePermissions={[testPermission]}
                 item={defaultItem}
+                restrictedGroups={[]}
                 sharedLink={{}}
                 trackingProps={props.trackingProps || defaultTrackingProps}
                 {...props}
@@ -629,39 +628,63 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
         });
     });
 
-    describe('componendDidUpdate()', () => {
+    describe('componentDidUpdate()', () => {
         test.each`
-            isCollabRestrictionJustificationAllowed | restrictedCollabEmails                       | shouldFetch | actionDescription | conditionDescription
-            ${false}                                | ${[]}                                        | ${false}    | ${'not fetch'}    | ${'collab restrictions do not change'}
-            ${false}                                | ${defaultContacts.map(({ email }) => email)} | ${false}    | ${'not fetch'}    | ${'collab restrictions change but justification is not allowed'}
-            ${true}                                 | ${['unmatched_email@example.com']}           | ${false}    | ${'not fetch'}    | ${'collab restrictions change but no restricted collabs are present'}
-            ${true}                                 | ${defaultContacts.map(({ email }) => email)} | ${true}     | ${'fetch'}        | ${'collab restrictions change, justification is allowed and restricted collabs are present'}
+            isCollabRestrictionJustificationAllowed | restrictedCollabEmails                           | restrictedGroups | conditionDescription
+            ${false}                                | ${[]}                                            | ${[]}            | ${'collab restrictions do not change'}
+            ${false}                                | ${defaultUserContacts.map(({ email }) => email)} | ${[]}            | ${'collab restrictions change but justification is not allowed'}
+            ${true}                                 | ${['unmatched_email@example.com']}               | ${[]}            | ${'collab restrictions change but no restricted collabs are present'}
         `(
-            'should $actionDescription justification reasons when $conditionDescription',
-            ({ isCollabRestrictionJustificationAllowed, restrictedCollabEmails, shouldFetch }) => {
+            'should not fetch justification reasons when $conditionDescription',
+            ({ isCollabRestrictionJustificationAllowed, restrictedCollabEmails, restrictedGroups }) => {
                 const getJustificationReasons = jest.fn().mockResolvedValue({});
                 const wrapper = getWrapper({
                     getJustificationReasons,
                     isCollabRestrictionJustificationAllowed: false,
                     item: defaultItem,
                     restrictedCollabEmails: [],
+                    restrictedGroups: [],
                 });
 
                 wrapper.instance().updateInviteCollabsContacts(defaultContacts);
                 wrapper.setProps({
                     isCollabRestrictionJustificationAllowed,
                     restrictedCollabEmails,
+                    restrictedGroups,
                 });
 
-                if (shouldFetch) {
-                    expect(getJustificationReasons).toHaveBeenCalledTimes(1);
-                    expect(getJustificationReasons).toHaveBeenCalledWith(
-                        defaultItem.typedID,
-                        JUSTIFICATION_CHECKPOINT_EXTERNAL_COLLAB,
-                    );
-                } else {
-                    expect(getJustificationReasons).toHaveBeenCalledTimes(0);
-                }
+                expect(getJustificationReasons).toHaveBeenCalledTimes(0);
+            },
+        );
+
+        test.each`
+            isCollabRestrictionJustificationAllowed | restrictedCollabEmails                           | restrictedGroups | conditionDescription
+            ${true}                                 | ${defaultUserContacts.map(({ email }) => email)} | ${[]}            | ${'collab restrictions change, justification is allowed and restricted collabs are present'}
+            ${true}                                 | ${[]}                                            | ${[12345]}       | ${'collab group restrictions change, justification is allowed and restricted collabs are present'}
+        `(
+            'should fetch justification reasons when $conditionDescription',
+            ({ isCollabRestrictionJustificationAllowed, restrictedCollabEmails, restrictedGroups }) => {
+                const getJustificationReasons = jest.fn().mockResolvedValue({});
+                const wrapper = getWrapper({
+                    getJustificationReasons,
+                    isCollabRestrictionJustificationAllowed: false,
+                    item: defaultItem,
+                    restrictedCollabEmails: [],
+                    restrictedGroups: [],
+                });
+
+                wrapper.instance().updateInviteCollabsContacts(defaultContacts);
+                wrapper.setProps({
+                    isCollabRestrictionJustificationAllowed,
+                    restrictedCollabEmails,
+                    restrictedGroups,
+                });
+
+                expect(getJustificationReasons).toHaveBeenCalledTimes(1);
+                expect(getJustificationReasons).toHaveBeenCalledWith(
+                    defaultItem.typedID,
+                    JUSTIFICATION_CHECKPOINT_EXTERNAL_COLLAB,
+                );
             },
         );
     });
@@ -741,37 +764,68 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
 
         test('should call onRemoveAllRestrictedCollabs when update results in all restricted contacts being removed', () => {
             const onRemoveAllRestrictedCollabs = jest.fn();
-            const restrictedCollabEmails = ['x@example.com', 'y@example.com'];
+            const restrictedCollabEmails = ['y@example.com', 'z@example.com'];
+            const contactsMinusOneRestriction = defaultContacts.filter(value => value !== 'y@example.com');
+            const contactsMinusAllRestrictions = defaultContacts.filter(value =>
+                restrictedCollabEmails.includes(value),
+            );
+            const wrapper = getWrapper({
+                onRemoveAllRestrictedCollabs,
+                restrictedCollabEmails,
+            });
+
+            // Adding new contacts, no call expected
+            wrapper.instance().updateInviteCollabsContacts(defaultContacts);
+            expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(0);
+            // Minus one restricted contact
+            wrapper.instance().updateInviteCollabsContacts(contactsMinusOneRestriction);
+            expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(0);
+            // Minus all restricted contacts
+            wrapper.instance().updateInviteCollabsContacts(contactsMinusAllRestrictions);
+            expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(1);
+        });
+
+        test('should call onRemoveAllRestrictedCollabs when update results in all restricted contacts including groups being removed', () => {
+            const onRemoveAllRestrictedCollabs = jest.fn();
+            const restrictedCollabEmails = ['y@example.com'];
+            const restrictedGroups = ['12345'];
+            const contactsMinusOneRestriction = defaultContacts.filter(value => value !== 'y@example.com');
+            const contactsMinusAllRestrictions = defaultContacts.filter(
+                (id, value) => restrictedGroups.includes(id) || restrictedCollabEmails.includes(value),
+            );
             const wrapper = getWrapper({
                 onRemoveAllRestrictedCollabs,
                 restrictedCollabEmails,
             });
 
+            // Adding new contacts, no call expected
             wrapper.instance().updateInviteCollabsContacts(defaultContacts);
             expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(0);
-            // Minus first contact, which is restricted
-            wrapper.instance().updateInviteCollabsContacts(defaultContacts.slice(1));
+            // Minus one restricted contact, group still remains
+            wrapper.instance().updateInviteCollabsContacts(contactsMinusOneRestriction);
             expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(0);
-            // Minus two first contacts, which are all the restricted ones
-            wrapper.instance().updateInviteCollabsContacts(defaultContacts.slice(2));
+            // Minus all restricted contacts, including the group
+            wrapper.instance().updateInviteCollabsContacts(contactsMinusAllRestrictions);
             expect(onRemoveAllRestrictedCollabs).toHaveBeenCalledTimes(1);
         });
     });
 
     describe('shouldRequireCollabJustification()', () => {
         test.each`
-            isCollabRestrictionJustificationAllowed | restrictedCollabEmails                       | expectedResult
-            ${false}                                | ${[]}                                        | ${false}
-            ${true}                                 | ${[]}                                        | ${false}
-            ${true}                                 | ${[defaultContacts[0].value]}                | ${true}
-            ${true}                                 | ${defaultContacts.map(({ value }) => value)} | ${true}
+            isCollabRestrictionJustificationAllowed | restrictedCollabEmails                           | restrictedGroups | expectedResult
+            ${false}                                | ${[]}                                            | ${[]}            | ${false}
+            ${true}                                 | ${[]}                                            | ${[]}            | ${false}
+            ${true}                                 | ${[defaultUserContacts[0].value]}                | ${[]}            | ${true}
+            ${true}                                 | ${defaultUserContacts.map(({ value }) => value)} | ${[]}            | ${true}
+            ${true}                                 | ${[]}                                            | ${[12345]}       | ${true}
         `(
-            'should return $expectedResult when isCollabRestrictionJustificationAllowed is $isCollabRestrictionJustificationAllowed and restrictedCollabEmails is $restrictedCollabEmails',
-            ({ isCollabRestrictionJustificationAllowed, restrictedCollabEmails, expectedResult }) => {
+            'should return $expectedResult when isCollabRestrictionJustificationAllowed is $isCollabRestrictionJustificationAllowed, restrictedCollabEmails is $restrictedCollabEmails and restrictedGroups is $restrictedGroups',
+            ({ isCollabRestrictionJustificationAllowed, restrictedCollabEmails, restrictedGroups, expectedResult }) => {
                 const wrapper = getWrapper({
                     isCollabRestrictionJustificationAllowed,
                     item: defaultItem,
                     restrictedCollabEmails,
+                    restrictedGroups,
                 });
 
                 wrapper.instance().updateInviteCollabsContacts(defaultContacts);

package/src/features/unified-share-modal/__tests__/__snapshots__/UnifiedShareForm.test.js.snap

@@ -107,6 +107,7 @@ exports[`features/unified-share-modal/UnifiedShareForm closeEmailSharedLinkForm(
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -306,6 +307,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should not rende
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -469,6 +471,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should not rende
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -632,6 +635,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -800,6 +804,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -964,6 +969,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1129,6 +1135,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1264,6 +1271,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1429,6 +1437,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1594,6 +1603,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1760,6 +1770,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -1935,6 +1946,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -2099,6 +2111,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -2267,6 +2280,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}
@@ -2433,6 +2447,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           submitting={false}
@@ -2599,6 +2614,7 @@ exports[`features/unified-share-modal/UnifiedShareForm render() should render a
           openInviteCollaboratorsSection={[Function]}
           recommendedSharingTooltipCalloutName={null}
           restrictedEmails={Array []}
+          restrictedGroups={Array []}
           selectedContacts={Array []}
           showEnterEmailsCallout={false}
           updateSelectedContacts={[Function]}

package/src/features/unified-share-modal/__tests__/__snapshots__/UnifiedShareModal.test.js.snap

@@ -76,6 +76,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should not rend
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={true}
@@ -171,6 +172,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should not rend
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -266,6 +268,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={
         Object {
           "url": "https://foo.com",
@@ -364,6 +367,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={true}
@@ -459,6 +463,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -553,6 +558,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -648,6 +654,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -743,6 +750,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -838,6 +846,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -933,6 +942,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -1036,6 +1046,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -1131,6 +1142,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -1230,6 +1242,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={
         Object {
           "url": "https://foo.com",
@@ -1328,6 +1341,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -1420,6 +1434,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}
@@ -1516,6 +1531,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sendInvitesError={
         <span>
           Some Error
@@ -1616,6 +1632,7 @@ exports[`features/unified-share-modal/UnifiedShareModal render() should render a
       }
       openConfirmModal={[Function]}
       restrictedCollabEmails={Array []}
+      restrictedGroups={Array []}
       sharedLink={Object {}}
       sharedLinkLoaded={false}
       shouldRenderFTUXTooltip={false}

package/src/features/unified-share-modal/flowTypes.js

@@ -246,7 +246,7 @@ export type CollabRestrictionType =
     | typeof constants.COLLAB_RESTRICTION_TYPE_ACCESS_POLICY
     | typeof constants.COLLAB_RESTRICTION_TYPE_INFORMATION_BARRIER;
 
-type ExternalCollabRestrictionsTypes = {
+type CollabRestrictionsTypes = {
     /** The type of restriction that applies to restrictedCollabEmails */
     collabRestrictionType?: CollabRestrictionType,
     /** Function that fetches the array of justification reason options to display on the justification select field */
@@ -260,6 +260,8 @@ type ExternalCollabRestrictionsTypes = {
     onRemoveAllRestrictedCollabs?: () => void,
     /** An array of all the collab email addresses that have been determined to be restricted by a security policy. */
     restrictedCollabEmails: Array<string>,
+    /** An array of all the group ids that have been determined to be restricted by a security policy. */
+    restrictedGroups: Array<number>,
 };
 
 // Prop types used in the shared link section of the Unified Share Form
@@ -326,7 +328,7 @@ export type USMConfig = {
 // Prop types shared by both the Unified Share Modal and the Unified Share Form
 type BaseUnifiedShareProps = CollaboratorAvatarsTypes &
     EmailFormTypes &
-    ExternalCollabRestrictionsTypes &
+    CollabRestrictionsTypes &
     InviteSectionTypes &
     SharedLinkSectionTypes & {
         /** Inline message */

package/src/features/unified-share-modal/messages.js

@@ -458,27 +458,27 @@ const messages = defineMessages({
         id: 'boxui.unifiedShare.recommendedSharingTooltipCalloutText',
     },
 
-    // External collab restrictions and business justifications
+    // Information Barrier restrictions, external collab restrictions and business justifications
     justificationSelectPlaceholder: {
         defaultMessage: 'Select Justification',
         description: 'The placeholder text of the select field that allows selecting a business justification reason',
         id: 'boxui.unifiedShare.justificationSelectPlaceholder',
     },
     justificationRequiredError: {
-        defaultMessage: 'Select a justification or remove people to continue',
+        defaultMessage: 'Select a justification or remove to continue',
         description:
             'The error message that is displayed when a user tries to send invitations to external collaborators, but a business justification is required before proceeding',
         id: 'boxui.unifiedShare.justificationRequiredError',
     },
     restrictedContactsError: {
-        defaultMessage: 'Remove people to continue',
+        defaultMessage: 'Remove to continue',
         description:
             'The error message that is displayed when a user tries to send invitations to external collaborators, but restricted contacts need to be removed before proceeding',
         id: 'boxui.unifiedShare.restrictedContactsError',
     },
     justifiableContactRestrictionNotice: {
         defaultMessage:
-            'This content requires a business justification to invite {count, plural, one {{count} person} other {{count} people}}. Please select a business justification below.',
+            'This content requires a business justification for {count, plural, one {{count} invitation} other {{count} invitations}}. Please select a business justification below.',
         description:
             'Text for the notice that is displayed when there are collaboration restrictions that apply to one or more of the selected contacts and business justifications are allowed for bypassing restrictions',
         id: 'boxui.unifiedShare.justifiableContactRestrictionNotice',
@@ -491,14 +491,14 @@ const messages = defineMessages({
         id: 'boxui.unifiedShare.justifiableContactRestrictionNoticeSingular',
     },
     justifiableContactRestrictionRemoveButtonLabel: {
-        defaultMessage: 'Alternatively, remove {count, plural, one {the person} other {{count} people}} and continue',
+        defaultMessage: 'Alternatively, remove to continue',
         description:
             'Label for the button that removes restricted contacts on the contact restriction notice when business justifications are allowed for bypassing restrictions',
         id: 'boxui.unifiedShare.justifiableContactRestrictionRemoveButtonLabel',
     },
     contactRestrictionNotice: {
         defaultMessage:
-            'Invitations cannot be sent to {count, plural, one {{count} person} other {{count} people}} because external collaboration is restricted due to the applied security policy.',
+            '{count, plural, one {{count} invitation} other {{count} invitations}} cannot be sent because external collaboration is restricted due to the applied security policy.',
         description:
             'Text for the notice that is displayed when there are collaboration restrictions that apply to one or more of the selected contacts',
         id: 'boxui.unifiedShare.contactRestrictionNotice',
@@ -512,7 +512,7 @@ const messages = defineMessages({
     },
     contactRestrictionNoticeInformationBarrier: {
         defaultMessage:
-            'Invitations cannot be sent to {count, plural, one {{count} person} other {{count} people}} due to a security policy.',
+            '{count, plural, one {{count} invitation} other {{count} invitations}} cannot be sent due to a security policy.',
         description:
             'Text for the notice that is displayed when there are Information Barrier collaboration restrictions that apply to one or more of the selected contacts',
         id: 'boxui.unifiedShare.contactRestrictionNoticeInformationBarrier',
@@ -523,8 +523,14 @@ const messages = defineMessages({
             'Text for the notice that is displayed when there are Information Barrier collaboration restrictions that apply to only one of the selected contacts',
         id: 'boxui.unifiedShare.contactRestrictionNoticeInformationBarrierSingular',
     },
+    contactRestrictionNoticeInformationBarrierSingularGroup: {
+        defaultMessage: 'Invitations cannot be sent to "{groupName}" due to a security policy.',
+        description:
+            'Text for the notice that is displayed when there are Information Barrier collaboration restrictions that apply to only one of the selected contacts, which is a group',
+        id: 'boxui.unifiedShare.contactRestrictionNoticeInformationBarrierSingularGroup',
+    },
     contactRestrictionRemoveButtonLabel: {
-        defaultMessage: 'Remove {count, plural, one {the person} other {{count} people}} and continue',
+        defaultMessage: 'Remove to continue',
         description: 'Label for the button that removes restricted contacts on the contact restriction notice',
         id: 'boxui.unifiedShare.contactRestrictionRemoveButtonLabel',
     },

package/src/features/unified-share-modal/utils/__tests__/hasRestrictedContacts.test.js

@@ -3,22 +3,20 @@ import hasRestrictedContacts from '../hasRestrictedContacts';
 describe('features/unified-share-modal/utils/hasRestrictedContacts', () => {
     const contacts = [
         {
-            email: 'x@example.com',
-            id: '12345',
+            id: 12345,
             text: 'X User',
             type: 'group',
-            value: 'x@example.com',
         },
         {
             email: 'y@example.com',
-            id: '23456',
+            id: 23456,
             text: 'Y User',
             type: 'user',
             value: 'y@example.com',
         },
         {
             email: 'z@example.com',
-            id: '34567',
+            id: 34567,
             text: 'Z User',
             type: 'user',
             value: 'z@example.com',
@@ -29,19 +27,35 @@ describe('features/unified-share-modal/utils/hasRestrictedContacts', () => {
         let restrictedEmails;
 
         restrictedEmails = [];
-        expect(hasRestrictedContacts(contacts, restrictedEmails)).toBe(false);
+        expect(hasRestrictedContacts(contacts, restrictedEmails, [])).toBe(false);
 
         restrictedEmails = ['a@example.com', 'b@example.com'];
-        expect(hasRestrictedContacts(contacts, restrictedEmails)).toBe(false);
+        expect(hasRestrictedContacts(contacts, restrictedEmails, [])).toBe(false);
+    });
+
+    test('should return false when no restricted groups are found within contacts', () => {
+        let restrictedGroups = [];
+
+        restrictedGroups = [];
+        expect(hasRestrictedContacts(contacts, [], restrictedGroups)).toBe(false);
+
+        restrictedGroups = [1111];
+        expect(hasRestrictedContacts(contacts, [], restrictedGroups)).toBe(false);
     });
 
     test('should return true when at least one restricted email is found within contacts', () => {
         let restrictedEmails;
 
         restrictedEmails = ['z@example.com'];
-        expect(hasRestrictedContacts(contacts, restrictedEmails)).toBe(true);
+        expect(hasRestrictedContacts(contacts, restrictedEmails, [])).toBe(true);
+
+        restrictedEmails = ['y@example.com', 'z@example.com'];
+        expect(hasRestrictedContacts(contacts, restrictedEmails, [])).toBe(true);
+    });
+
+    test('should return true when at least one restricted group is found within contacts', () => {
+        const restrictedGroups = [12345];
 
-        restrictedEmails = ['x@example.com', 'y@example.com', 'z@example.com'];
-        expect(hasRestrictedContacts(contacts, restrictedEmails)).toBe(true);
+        expect(hasRestrictedContacts(contacts, [], restrictedGroups)).toBe(true);
     });
 });