@salesforcedevs/dx-components 1.2.2-avatar-button-7 → 1.2.2-avatar-button-9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.2.2-avatar-button-7",
+    "version": "1.2.2-avatar-button-9",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -18,6 +18,7 @@
         "coveo-search-ui": "^2.10082.5",
         "debounce": "^1.2.0",
         "js-cookie": "^3.0.1",
+        "lodash.defaults": "^4.2.0",
         "lodash.get": "^4.4.2",
         "lodash.kebabcase": "^4.1.1",
         "microtip": "0.2.2",
@@ -27,6 +28,7 @@
         "@types/classnames": "^2.2.10",
         "@types/debounce": "^1.2.0",
         "@types/js-cookie": "^3.0.2",
+        "@types/lodash.defaults": "^4.2.7",
         "@types/lodash.get": "^4.4.6",
         "@types/lodash.kebabcase": "^4.1.7",
         "@types/vimeo__player": "^2.16.2"

package/src/modules/dx/avatarButton/avatarButton.ts

@@ -1,6 +1,7 @@
 import { api, LightningElement } from "lwc";
-import Cookies from 'js-cookie';
+import Cookies from "js-cookie";
 import { track } from "dxUtils/analytics";
+import { defaults } from "lodash";
 
 // TODO: move to environment variable
 const TBID_BASE_URL = "https://dev1-trailblazer-identity.cs192.force.com";
@@ -36,7 +37,7 @@ export interface UserInfo {
     relationship?: string;
     role?: string;
     username?: string;
-    readonly fullName: string;
+    fullName?: string;
 }
 
 interface EventSourceEvent extends Event {
@@ -63,14 +64,7 @@ const trackableUserInfo = new Set([
 export default class AvatarButton extends LightningElement {
     @api size: "small" | "medium" | "large" = "medium";
 
-    private userInfo: UserInfo = {
-        get fullName() {
-            if (this.firstName && this.lastName) {
-                return `${this.firstName} ${this.lastName}`;
-            }
-            return this.firstName || this.lastName || "";
-        }
-    };
+    private userInfo: UserInfo = {};
     private isLoading = false;
     private settingsUrl = TBID_SETTINGS_URL;
     private profileUrl = TBID_PROFILE_URL;
@@ -89,11 +83,12 @@ export default class AvatarButton extends LightningElement {
     }
 
     connectedCallback() {
-        const isLoginSuccessRedirect = Cookies.get('tbidLoginSuccess') === 'true';
+        const isLoginSuccessRedirect =
+            Cookies.get("tbidLoginSuccess") === "true";
 
         if (isLoginSuccessRedirect) {
             this.isLoading = true;
-            Cookies.remove('tbidLoginSuccess'); // cleanup
+            Cookies.remove("tbidLoginSuccess"); // cleanup
         }
 
         window.addEventListener("tbid-login", this.handleSsoLogin);
@@ -307,13 +302,17 @@ export default class AvatarButton extends LightningElement {
             return;
         }
 
-        const nextUserInfo: Omit<UserInfo, 'fullName'> = {};
+        const nextUserInfo: UserInfo = {};
         nextUserInfo.avatarImgSrc = userInfo.photos?.thumbnail;
         nextUserInfo.firstName = userInfo.given_name;
         nextUserInfo.lastName = userInfo.family_name;
         nextUserInfo.username = userInfo.preferred_username;
         nextUserInfo.id = userInfo.user_id;
         nextUserInfo.orgId = userInfo.organization_id;
+        nextUserInfo.fullName =
+            nextUserInfo.firstName && nextUserInfo.lastName
+                ? `${nextUserInfo.firstName} ${nextUserInfo.lastName}`
+                : nextUserInfo.firstName || nextUserInfo.lastName || "";
 
         if (userInfo.custom_attributes) {
             nextUserInfo.company = userInfo.custom_attributes.CompanyName;
@@ -323,10 +322,7 @@ export default class AvatarButton extends LightningElement {
         }
         // TODO: Consider displaying initials if no photo. Is there always a photo even if just a default one?
 
-        this.userInfo = {
-            ...this.userInfo,
-            ...nextUserInfo,
-        };
+        this.userInfo = defaults(nextUserInfo, this.userInfo);
     };
 
     private requestUserInfo = async () => {