feat/pnp#958 Add selected items for groups

a1exymoroz · Jul 19, 2021 · b11c175 · b11c175
1 parent 2fc3d2e
commit b11c175
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/controls/peoplepicker/IPeoplePicker.ts b/src/controls/peoplepicker/IPeoplePicker.ts
@@ -96,9 +96,12 @@ export interface IPeoplePickerProps {
    */
   errorMessageClassName?: string;
   /**
-   * Default Selected User Emails
+   * Default Selected Items
+   * User -> Email
+   * Sharepoint Group -> Title
+   * Security Group -> Email
    */
-  defaultSelectedUsers?: string[];
+  defaultSelectedItems?: string[];
   /**
    * @deprecated
    * Show users which are hidden from the UI

diff --git a/src/controls/peoplepicker/PeoplePickerComponent.tsx b/src/controls/peoplepicker/PeoplePickerComponent.tsx
@@ -54,7 +54,7 @@ export class PeoplePicker extends React.Component<IPeoplePickerProps, IPeoplePic
    * componentWillUpdate lifecycle hook
    */
   public componentWillUpdate(nextProps: IPeoplePickerProps, nextState: IPeoplePickerState): void {
-    if (!isEqual(this.props.defaultSelectedUsers, nextProps.defaultSelectedUsers) ||
+    if (!isEqual(this.props.defaultSelectedItems, nextProps.defaultSelectedItems) ||
       this.props.groupName !== nextProps.groupName ||
       this.props.webAbsoluteUrl !== nextProps.webAbsoluteUrl ||
       this.peopleSearchService.getSumOfPrincipalTypes(this.props.principalTypes) !== this.peopleSearchService.getSumOfPrincipalTypes(nextProps.principalTypes)) {
@@ -75,7 +75,7 @@ export class PeoplePicker extends React.Component<IPeoplePickerProps, IPeoplePic
    * Get initial persons
    */
   private async getInitialPersons(props: IPeoplePickerProps) {
-    const { groupName, groupId, webAbsoluteUrl, defaultSelectedUsers, ensureUser, principalTypes } = props;
+    const { groupName, groupId, webAbsoluteUrl, defaultSelectedItems, ensureUser, principalTypes } = props;
     // Check if a group property was provided, and get the group ID
     if (groupName) {
       this.groupId = await this.peopleSearchService.getGroupId(groupName, webAbsoluteUrl);
@@ -92,9 +92,9 @@ export class PeoplePicker extends React.Component<IPeoplePickerProps, IPeoplePic
     }
 
     // Check for default user values
-    if (defaultSelectedUsers) {
+    if (defaultSelectedItems) {
       let selectedPersons: IPersonaProps[] = [];
-      for (const userValue of props.defaultSelectedUsers) {
+      for (const userValue of props.defaultSelectedItems) {
         let valueAndTitle: string[] = [];
         valueAndTitle.push(userValue);
         if (userValue && userValue.indexOf('/') > -1) {

diff --git a/src/services/PeopleSearchService.ts b/src/services/PeopleSearchService.ts
@@ -245,7 +245,7 @@ export default class SPPeopleSearchService {
                   loginName: element.LoginName ? element.LoginName : element.Key,
                   imageInitials: this.getFullNameInitials(element.DisplayText),
                   text: element.DisplayText,
-                  secondaryText: element.ProviderName
+                  secondaryText: element.EntityData.Email || element.ProviderName
                 } as IPeoplePickerUserItem;
               case 'FormsRole':
                 return {