@antscorp/antsomi-ui 2.0.64-staging.59 → 2.0.64-staging.60

package/CHANGELOG.md

@@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v2.0.64-staging.59](https://bitbucket.org/git-vn/at.packages.frontend/compare/v2.0.64-staging.59..v2.0.64-staging.58)
+#### [v2.0.64-staging.60](https://bitbucket.org/git-vn/at.packages.frontend/compare/v2.0.64-staging.60..v2.0.64-staging.58)
 
+- feat: update message activity timeline [`7a3bc15`](https://bitbucket.org/git-vn/at.packages.frontend/commits/7a3bc15dd2e2eb7caf91e6bf064edd48e97dcdb2)
 - feat: add fallback scheme_code [`ecb8e67`](https://bitbucket.org/git-vn/at.packages.frontend/commits/ecb8e67a56b93610df913c2f7c37d89b8be98ad6)
+- feat: update extra keys [`da5b04e`](https://bitbucket.org/git-vn/at.packages.frontend/commits/da5b04e9e1c6b5d0c3584c4e08ffe70733ad4e77)
 
 #### [v2.0.64-staging.58](https://bitbucket.org/git-vn/at.packages.frontend/compare/v2.0.64-staging.58..v2.0.64-staging.54)
 

package/es/components/organism/ActivityTimeline/utils.js

@@ -287,18 +287,24 @@ const handleRedeemPointEvent = (validateExtra, valuesReplace, infoEvent, isSucce
         infoEvent.translateCode = translations._EVENT_DES_REDEEM_SUCCESS;
     }
     else {
+        valuesReplace.reason_fail = validateExtra.reason_fail || 'N/A';
         infoEvent.translateCode = translations._EVENT_DES_REDEEM_FAIL;
     }
 };
-const handleUpdateRoleEvent = (validateExtra, valuesReplace, infoEvent) => {
+const handleUpdateRoleEvent = (validateExtra, valuesReplace, infoEvent, isVisitorProfile) => {
     delete valuesReplace.event_name;
-    valuesReplace.name = validateExtra.name || 'N/A';
-    valuesReplace.role = validateExtra.role || 'N/A';
+    valuesReplace.visitor_name = validateExtra.users?.name || valuesReplace.customer_name;
+    valuesReplace.name = isVisitorProfile
+        ? translate(translations._THIS_PERSON_LOWERCASE, 'this user')
+        : validateExtra.user_update_name || 'N/A';
+    valuesReplace.role = validateExtra.user_update_role || 'N/A';
     infoEvent.translateCode = translations._EVENT_DES_UPDATE_ROLE;
 };
 const handleApproveRequestEvent = (validateExtra, valuesReplace, infoEvent) => {
     delete valuesReplace.event_name;
-    valuesReplace.name = validateExtra.name || 'N/A';
+    valuesReplace.visitor_name = validateExtra.users?.name || valuesReplace.customer_name;
+    valuesReplace.name = validateExtra.user_update_name || 'N/A';
+    valuesReplace.reason_fail = validateExtra.reason_fail || 'N/A';
     infoEvent.translateCode = translations._EVENT_DES_APPROVE_REQ;
 };
 const handleAddMemberEvent = (validateExtra, valuesReplace, infoEvent) => {
@@ -310,11 +316,16 @@ const handleAddMemberEvent = (validateExtra, valuesReplace, infoEvent) => {
 };
 const handleRemoveMemberEvent = (validateExtra, valuesReplace, infoEvent) => {
     delete valuesReplace.event_name;
-    valuesReplace.name = validateExtra.name || 'N/A';
+    valuesReplace.name = validateExtra.user_update_name || 'N/A';
     infoEvent.translateCode = translations._EVENT_DES_REMOVE_MEM;
 };
-const handleRequestAccessEvent = (validateExtra, valuesReplace, infoEvent) => {
+const handleRequestAccessEvent = (validateExtra, valuesReplace, infoEvent, isVisitorProfile) => {
     delete valuesReplace.event_name;
+    // Visitor page: "This user requested to join {customer_name}"
+    // Customer page: "{requester_name} requested to join {customer_name}"
+    valuesReplace.visitor_name = isVisitorProfile
+        ? valuesReplace.customer_name
+        : validateExtra.users?.name || 'A user';
     valuesReplace.customer_name =
         validateExtra.customer_name || validateExtra.customers?.name || valuesReplace.customer_name;
     infoEvent.translateCode = translations._EVENT_DES_REQ_ACCESS;
@@ -334,7 +345,7 @@ const handleEarnRewardEvent = (validateExtra, valuesReplace, infoEvent, isReferr
         infoEvent.translateCode = translations._EVENT_DES_EARN_REWARD_REFEREE;
     }
 };
-const handleCustomEventByEcEa = (eType, pageType, validateExtra, valuesReplace, infoEvent) => {
+const handleCustomEventByEcEa = (eType, pageType, validateExtra, valuesReplace, infoEvent, isVisitorProfile) => {
     if ((eType === 'lead_formated' && pageType === 'sync') ||
         (eType === 'lead_form' && pageType === 'submit')) {
         handleLeadFormEvent(validateExtra, valuesReplace, infoEvent);
@@ -358,19 +369,19 @@ const handleCustomEventByEcEa = (eType, pageType, validateExtra, valuesReplace,
         handleRedeemPointEvent(validateExtra, valuesReplace, infoEvent, false);
     }
     else if (eType === 'role' && pageType === 'update') {
-        handleUpdateRoleEvent(validateExtra, valuesReplace, infoEvent);
+        handleUpdateRoleEvent(validateExtra, valuesReplace, infoEvent, isVisitorProfile);
     }
     else if (eType === 'request' && pageType === 'approve') {
         handleApproveRequestEvent(validateExtra, valuesReplace, infoEvent);
     }
-    else if (eType === 'member' && pageType === 'add') {
+    else if (eType === 'member' && pageType.toLowerCase() === 'add') {
         handleAddMemberEvent(validateExtra, valuesReplace, infoEvent);
     }
-    else if (eType === 'member' && pageType === 'remove') {
+    else if (eType === 'member' && pageType.toLowerCase() === 'remove') {
         handleRemoveMemberEvent(validateExtra, valuesReplace, infoEvent);
     }
     else if (eType === 'access' && pageType === 'request') {
-        handleRequestAccessEvent(validateExtra, valuesReplace, infoEvent);
+        handleRequestAccessEvent(validateExtra, valuesReplace, infoEvent, isVisitorProfile);
     }
     else if (eType === 'program' && pageType === 'share') {
         handleShareProgramEvent(valuesReplace, infoEvent);
@@ -506,7 +517,7 @@ const processEventByType = (eType, itemEvent, validateExtra, data) => {
         handleScreenviewEvent(itemEvent, validateExtra, data);
     }
 };
-const buildInfoEvent = (infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config, eType, pageType) => {
+const buildInfoEvent = (infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config, eType, pageType, isVisitorProfile) => {
     let valuesReplace = {};
     if (infoEvent) {
         infoEvent.iconName = get(eventTracking, `map.${keyTitleEvent}.iconUrl`);
@@ -528,7 +539,7 @@ const buildInfoEvent = (infoEvent, eventTracking, keyTitleEvent, validateExtra,
         valuesReplace = getValuesReplace(infoEvent.objectReplace, data);
         handleEventTrackingCode(eventTracking, keyTitleEvent, validateExtra, valuesReplace, infoEvent, config);
     }
-    handleCustomEventByEcEa(eType, pageType, validateExtra, valuesReplace, infoEvent);
+    handleCustomEventByEcEa(eType, pageType, validateExtra, valuesReplace, infoEvent, isVisitorProfile);
     return { infoEvent, valuesReplace };
 };
 const buildFullContentEvent = (infoEvent, titleEvent, valuesReplace, data) => {
@@ -557,6 +568,7 @@ const calculateSlideSettings = (itemEvent, infoEvent) => {
 export const getInfoEvent = (params) => {
     const { eType, itemEvent, eventTracking, config, customerName: customerNameParam } = params;
     const customerName = customerNameParam || '_THIS_PERSON_UPPERCASE';
+    const isVisitorProfile = customerName === '_THIS_PERSON_UPPERCASE';
     // Step 1: Prepare initial data and extract common fields
     const { keyTitleEvent, validateExtra, titleEvent: initialTitleEvent, data, } = prepareInitialData(itemEvent, eType, eventTracking, customerName);
     // Step 2: Update titleEvent if eventTracking has a mapping
@@ -568,7 +580,7 @@ export const getInfoEvent = (params) => {
     processEventByType(eType, itemEvent, validateExtra, data);
     // Step 4: Build infoEvent and valuesReplace
     let infoEvent = DATA_EVENT.map[`${itemEvent.pageType} ${eType}`];
-    const { infoEvent: processedInfoEvent, valuesReplace } = buildInfoEvent(infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config, eType, itemEvent.pageType);
+    const { infoEvent: processedInfoEvent, valuesReplace } = buildInfoEvent(infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config, eType, itemEvent.pageType, isVisitorProfile);
     infoEvent = processedInfoEvent;
     // Step 5: Build full content event text
     const fullContentEvent = buildFullContentEvent(infoEvent, titleEvent, valuesReplace, data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "2.0.64-staging.59",
+  "version": "2.0.64-staging.60",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -159,7 +159,7 @@
   },
   "devDependencies": {
     "@antscorp/antsomi-constants": "1.0.8-beta.1",
-    "@antscorp/antsomi-locales": "^1.0.89",
+    "@antscorp/antsomi-locales": "^1.0.92",
     "@antscorp/eslint-config-antsomi": "1.0.4",
     "@babel/cli": "^7.23.4",
     "@babel/core": "^7.21.3",