Merge pull request #1338 from joaojmendes/bugfix-tree-organization

samples/react-tree-orgchart/README.md

@@ -41,6 +41,7 @@ Tree Organization WebPart|João Mendes
 
 Version|Date|Comments
 -------|----|--------
+1.0.2|June 12, 2020|Added exception handler for profiles missing display name
 1.0.1|Jan 28, 2020|Update to SPFx 1.10, minor fixes and refactoring.
 1.0.0|Feb 25, 2019|Initial release
 

samples/react-tree-orgchart/config/package-solution.json

@@ -3,7 +3,7 @@
   "solution": {
     "name": "react-tree-orgchart-client-side-solution",
     "id": "d76a0c4f-d669-42eb-9533-68d5cec5e9d3",
-    "version": "1.0.1.0",
+    "version": "1.0.2.0",
     "includeClientSideAssets": true,
     "skipFeatureDeployment": true,
     "isDomainIsolated": false

samples/react-tree-orgchart/package-lock.json

@@ -10111,8 +10111,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -10133,14 +10132,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -10155,20 +10152,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -10285,8 +10279,7 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -10298,7 +10291,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -10313,7 +10305,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -10321,14 +10312,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -10347,7 +10336,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -10437,8 +10425,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -10450,7 +10437,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -10536,8 +10522,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -10573,7 +10558,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -10593,7 +10577,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -10637,14 +10620,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         }
       }
     },

samples/react-tree-orgchart/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-tree-orgchart",
-  "version": "0.0.1",
+  "version": "1.0.2",
   "private": true,
   "engines": {
     "node": ">=0.10.0"

samples/react-tree-orgchart/src/webparts/treeOrgChart/components/TreeOrgChart.tsx

@@ -114,12 +114,15 @@ export default class TreeOrgChart extends React.Component<
     let spUser: IPersonaSharedProps = {};
     // Get User Properties
     const managerProperties = await this.SPService.getUserProperties(manager);
-    const imageInitials: string[] = managerProperties.DisplayName.split(" ");
+
+
+    let imageInitials: string[] =  managerProperties.DisplayName.split(" ");
+    
     // Persona Card Properties
     spUser.imageUrl = `/_layouts/15/userphoto.aspx?size=L&username=${managerProperties.Email}`;
-    spUser.imageInitials = `${imageInitials[0]
+    spUser.imageInitials = imageInitials && imageInitials.length > 0 ?  `${imageInitials[0]
       .substring(0, 1)
-      .toUpperCase()}${imageInitials[1].substring(0, 1).toUpperCase()}`;
+      .toUpperCase()}${imageInitials[1] ? imageInitials[1].substring(0, 1).toUpperCase():''}` : '';
     spUser.text = managerProperties.DisplayName;
     spUser.tertiaryText = managerProperties.Email;
     spUser.secondaryText = managerProperties.Title;
@@ -157,9 +160,9 @@ export default class TreeOrgChart extends React.Component<
       const imageInitials: string[] = managerProperties.DisplayName.split(" ");
 
       spUser.imageUrl = `/_layouts/15/userphoto.aspx?size=L&username=${managerProperties.Email}`;
-      spUser.imageInitials = `${imageInitials[0]
+      spUser.imageInitials = imageInitials && imageInitials.length > 0 ?  `${imageInitials[0]
         .substring(0, 1)
-        .toUpperCase()}${imageInitials[1].substring(0, 1).toUpperCase()}`;
+        .toUpperCase()}${imageInitials[1] ? imageInitials[1].substring(0, 1).toUpperCase(): ''}` : '';
       spUser.text = managerProperties.DisplayName;
       spUser.tertiaryText = managerProperties.Email;
       spUser.secondaryText = managerProperties.Title;
@@ -207,7 +210,7 @@ export default class TreeOrgChart extends React.Component<
       // PersonaCard Props
       manager.imageUrl = `/_layouts/15/userphoto.aspx?size=L&username=${managerProperties.Email}`;
       if (imageInitials)
-        manager.imageInitials = `${imageInitials[0]}${imageInitials[1]}`.toUpperCase();
+        manager.imageInitials = `${imageInitials[0]}${imageInitials[1] ? imageInitials[1]: ''}`.toUpperCase();
       manager.text = managerProperties.DisplayName;
       manager.tertiaryText = managerProperties.Email;
       manager.secondaryText = managerProperties.Title;
@@ -227,9 +230,9 @@ export default class TreeOrgChart extends React.Component<
       " "
     );
     me.imageUrl = `/_layouts/15/userphoto.aspx?size=L&username=${currentUserProperties.Email}`;
-    me.imageInitials = `${meImageInitials[0]
+    me.imageInitials =    me.imageInitials &&   me.imageInitials.length > 0  ?`${meImageInitials[0]
       .substring(0, 1)
-      .toUpperCase()}${meImageInitials[1].substring(0, 1).toUpperCase()}`;
+      .toUpperCase()}${meImageInitials[1] ? meImageInitials[1].substring(0, 1).toUpperCase():''}` : '';
     me.text = currentUserProperties.DisplayName;
     me.tertiaryText = currentUserProperties.Email;
     me.secondaryText = currentUserProperties.Title;
@@ -256,9 +259,9 @@ export default class TreeOrgChart extends React.Component<
       const peerProperties = await this.SPService.getUserProperties(userPeer);
       imageInitials = peerProperties.DisplayName.split(" ");
       peer.imageUrl = `/_layouts/15/userphoto.aspx?size=L&username=${peerProperties.Email}`;
-      peer.imageInitials = `${imageInitials[0]
+      peer.imageInitials =   peer.imageInitials && peer.imageInitials.length>0 ? `${imageInitials[0]
         .substring(0, 1)
-        .toUpperCase()}${imageInitials[1].substring(0, 1).toUpperCase()}`;
+        .toUpperCase()}${imageInitials[1] ? imageInitials[1].substring(0, 1).toUpperCase():''}` : '';
       peer.text = peerProperties.DisplayName;
       peer.tertiaryText = peerProperties.Email;
       peer.secondaryText = peerProperties.Title;