@antscorp/antsomi-ui 2.0.114 → 2.0.116

package/es/components/molecules/TagifyInput/utils.style.js

@@ -3,7 +3,7 @@ import { css } from 'styled-components';
 import { isString } from 'lodash';
 // Constants
 import { globalToken } from '@antscorp/antsomi-ui/es/constants';
-import { DETECT_LINK, EMOJI, INVALID_TAG, MIN_H_WRAPPER, NO_VIEW_TAG, READONLY_TAG, REMOVED_TAG, SHORT_LINK, SHORT_LINK_TYPE, SHORT_LINK_V2, TAG_COLOR, TAG_H, TAG_TYPE, } from './constants';
+import { DETECT_LINK, EMOJI, ERROR_TAG, MIN_H_WRAPPER, READONLY_TAG, SHORT_LINK, SHORT_LINK_TYPE, SHORT_LINK_V2, TAG_COLOR, TAG_H, TAG_TYPE, WARNING_TAG, TAG_TYPE_LIST, PREPARING_ST, } from './constants';
 export const getTagifyStyled = ({ $maxHeight, $tagifyFullWidth }) => css `
   ${$maxHeight &&
     css `
@@ -55,62 +55,62 @@ export const getTagifyInputStyled = ({ $minWidth, $placeholder, $minWidthPlaceho
 
   ${$isSingleLineText &&
     css `
-      white-space: nowrap;
-      overflow: auto;
+    white-space: nowrap;
+    overflow: auto;
 
-      br {
-        display: none;
-      }
+    br {
+      display: none;
+    }
 
-      div, p {
-        display: inline-block;
-        white-space: nowrap;
-        overflow: auto
-        overflow-y: hidden;
-      }
-`}
+    div,
+    p {
+      display: inline-block;
+      white-space: nowrap;
+    }
+  `}
 `;
-export const getStyledTags = () => {
-    const getBackgroundColor = (tag) => {
-        const { type } = tag;
-        switch (type) {
-            case TAG_TYPE.SHORT_LINK: {
-                const { shortlinkType } = tag;
-                if (!shortlinkType)
-                    break;
-                return TAG_COLOR[SHORT_LINK][shortlinkType];
-            }
-            case TAG_TYPE.SHORT_LINK_V2: {
-                const { shortlinkType } = tag;
-                if (!shortlinkType)
-                    break;
-                return TAG_COLOR[SHORT_LINK_V2][shortlinkType];
-            }
-            default: {
-                if (!type)
-                    return 'white';
-                return TAG_COLOR[type];
-            }
+const getBackgroundColor = (tag) => {
+    const { type } = tag;
+    switch (type) {
+        case TAG_TYPE.SHORT_LINK: {
+            const { shortlinkType } = tag;
+            if (!shortlinkType)
+                break;
+            return TAG_COLOR[SHORT_LINK][shortlinkType];
         }
-        return null;
-    };
-    const tagTypes = Object.values(TAG_TYPE);
-    const backgroundStyles = tagTypes
-        .map(type => {
-        const background = getBackgroundColor({ type });
-        if (!background)
-            return '';
-        return `
-        &[data-tag-type~='${type}'] {
-          background: ${getBackgroundColor({ type })};
-        };
-      `;
-    })
-        .join(' ');
+        case TAG_TYPE.SHORT_LINK_V2: {
+            const { shortlinkType } = tag;
+            if (!shortlinkType)
+                break;
+            return TAG_COLOR[SHORT_LINK_V2][shortlinkType];
+        }
+        default: {
+            if (!type)
+                return 'white';
+            return TAG_COLOR[type];
+        }
+    }
+    return null;
+};
+const tagListString = TAG_TYPE_LIST.map(tagType => `[data-tag-type~='${tagType}']`).join(',');
+const backgroundStyles = TAG_TYPE_LIST.map(type => {
+    const background = getBackgroundColor({ type });
+    if (!background)
+        return '';
     return `
+    &[data-tag-type~='${type}'] {
+      background: ${background};
+    }
+
+    &[data-priority-color-type~='${type}'][data-bg-color-personalize-type~='${type}'] {
+      background: ${background};
+    }
+  `;
+}).join(' ');
+export const getStyledTags = () => `
     // For case unknown tag
     &[data-tag-type]:not(:is(
-      ${tagTypes.map(tagType => `[data-tag-type~='${tagType}']`).join(',')}
+      ${tagListString}
     )) {
       background: ${globalToken?.accent7};
     };
@@ -122,45 +122,60 @@ export const getStyledTags = () => {
       padding: 0;
     };
 
+    &[data-tag-type~='${DETECT_LINK}'] {
+      border-radius: unset;
+      max-height: fit-content;
+
+      .tagify__tag-text {
+        max-width: fit-content;
+        white-space: normal;
+      }
+    };
+
     &[data-tag-type~='${TAG_TYPE.SHORT_LINK}'] {
       &[data-tag-${TAG_TYPE.SHORT_LINK}-type~='${SHORT_LINK_TYPE.INDIVIDUAL}'] {
         background: ${getBackgroundColor({
-        type: TAG_TYPE.SHORT_LINK,
-        shortlinkType: SHORT_LINK_TYPE.INDIVIDUAL,
-    })};
+    type: TAG_TYPE.SHORT_LINK,
+    shortlinkType: SHORT_LINK_TYPE.INDIVIDUAL,
+})};
       };
 
       &[data-tag-${TAG_TYPE.SHORT_LINK}-type~='${SHORT_LINK_TYPE.GENERAL}'] {
         background: ${getBackgroundColor({
-        type: TAG_TYPE.SHORT_LINK,
-        shortlinkType: SHORT_LINK_TYPE.GENERAL,
-    })};
+    type: TAG_TYPE.SHORT_LINK,
+    shortlinkType: SHORT_LINK_TYPE.GENERAL,
+})};
       };
     }
     
     &[data-tag-type~='${TAG_TYPE.SHORT_LINK_V2}'] {
       &[data-tag-${TAG_TYPE.SHORT_LINK_V2}-type~='${SHORT_LINK_TYPE.INDIVIDUAL}'] {
         background: ${getBackgroundColor({
-        type: TAG_TYPE.SHORT_LINK_V2,
-        shortlinkType: SHORT_LINK_TYPE.INDIVIDUAL,
-    })};
+    type: TAG_TYPE.SHORT_LINK_V2,
+    shortlinkType: SHORT_LINK_TYPE.INDIVIDUAL,
+})};
       };
 
       &[data-tag-${TAG_TYPE.SHORT_LINK_V2}-type~='${SHORT_LINK_TYPE.GENERAL}'] {
         background: ${getBackgroundColor({
-        type: TAG_TYPE.SHORT_LINK_V2,
-        shortlinkType: SHORT_LINK_TYPE.GENERAL,
-    })};
+    type: TAG_TYPE.SHORT_LINK_V2,
+    shortlinkType: SHORT_LINK_TYPE.GENERAL,
+})};
       };
     }
   `;
-};
 export const getTagifyTagStyled = (_wrapperProps) => css `
-  &[${READONLY_TAG}='true'] {
+  &[type='${DETECT_LINK}'] {
+    max-width: fit-content;
+    height: fit-content;
+  }
+
+  &[${READONLY_TAG}='true'],
+  &[${PREPARING_ST}='true'] {
     cursor: not-allowed;
   }
 
-  &[${REMOVED_TAG}='true'] {
+  &[${ERROR_TAG}='true'] {
     ${({ $tagErrorIcon }) => $tagErrorIcon &&
     css `
         > div {
@@ -190,7 +205,7 @@ export const getTagifyTagStyled = (_wrapperProps) => css `
       `}
   }
 
-  &[${NO_VIEW_TAG}='true'] {
+  &[${WARNING_TAG}='true'] {
     ${({ $tagInvalidIcon }) => $tagInvalidIcon &&
     css `
         > div {
@@ -220,36 +235,6 @@ export const getTagifyTagStyled = (_wrapperProps) => css `
       `}
   }
 
-  &[${INVALID_TAG}='true'] {
-    ${({ $tagInvalidIcon }) => $tagInvalidIcon &&
-    css `
-        > div {
-          padding-right: 22px;
-          position: relative;
-
-          > span {
-            &::after {
-              content: '';
-              position: absolute;
-              top: 50%;
-              right: 5px;
-              transform: translateY(calc(-50% - 1px));
-              width: 14px;
-              height: 14px;
-              display: inline-block;
-              background-image: url(${$tagInvalidIcon});
-              background-size: contain;
-              background-repeat: no-repeat;
-            }
-          }
-        }
-        > div[data-tag-type] {
-          background-color: white !important;
-          border: 1px solid red;
-        }
-      `}
-  }
-
   height: ${TAG_H}px;
   cursor: pointer;
 

package/es/components/molecules/index.d.ts

@@ -69,6 +69,7 @@ export * from './EmojiCollections';
 export * from './EmojiPopover';
 export * from './DisplayFormat';
 export * from './CodeStructure';
+export { default as InputSelectAttribute } from './InputSelectAttribute';
 export * from './FontSizeInput';
 export * from './ItemNotFound';
 export { EditorScript } from './EditorScript';

package/es/components/molecules/index.js

@@ -69,6 +69,7 @@ export * from './EmojiCollections';
 export * from './EmojiPopover';
 export * from './DisplayFormat';
 export * from './CodeStructure';
+export { default as InputSelectAttribute } from './InputSelectAttribute';
 export * from './FontSizeInput';
 export * from './ItemNotFound';
 export { EditorScript } from './EditorScript';

package/es/components/organism/AccountSharing/AccountSharing.js

@@ -159,21 +159,29 @@ export const AccountSharing = props => {
         return arrMenus;
     };
     const checkRedirectHomePage = (homePage, data, userId, newNetworkId) => {
-        const convertedHomePage = String(homePage).replace(/:user_id/g, userId);
+        const newHomePage = String(homePage).replace(/:user_id/g, userId);
         if (!Array.isArray(data) || !data.length) {
-            window.location.href = convertedHomePage;
+            window.location.href = newHomePage;
             return;
         }
         const arrMenus = buildListAppMenus(data, userId);
-        if (!arrMenus.some(url => convertedHomePage.includes(url))) {
-            // Redirect to recommendation
-            if (env !== ENV.DEV) {
-                window.location.assign(`${CDP_ROUTE[env || 'development']}/gen2/${newNetworkId}/dashboard/recommendation`);
-                return;
-            }
-            // return redirectFirstMenu(data, userId);
+        if (arrMenus.some(url => newHomePage.includes(url) || url.includes(newHomePage))) {
+            window.location.href = newHomePage;
+            return;
+        }
+        const recommendationPath = `/gen2/${newNetworkId}/dashboard/recommendation`;
+        if (newHomePage) {
+            const homeUrlObj = new URL(newHomePage);
+            window.location.assign(`${homeUrlObj?.origin}${recommendationPath}`);
+            return;
         }
-        window.location.href = convertedHomePage;
+        const targetEnv = {
+            33167: ENV.SANDBOX,
+            564890547: ENV.SANDBOX,
+            564888929: ENV.STAGING,
+            564891336: ENV.STAGING,
+        }[+newNetworkId] || ENV.PROD;
+        window.location.assign(`${CDP_ROUTE[targetEnv]}${recommendationPath}`);
     };
     const getAppsMenus = ({ token, userId, accountId, homePage, newNetworkId }) => {
         if (permissionDomain && token && userId && accountId) {

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

@@ -229,6 +229,170 @@ const handleScreenviewEvent = (itemEvent, validateExtra, data) => {
         }
     }
 };
+const handleLeadFormEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    if (validateExtra.form_name && validateExtra.lead_source) {
+        valuesReplace.form_name = validateExtra.form_name;
+        valuesReplace.lead_source = validateExtra.lead_source;
+        infoEvent.translateCode = translations._EVENT_DES_LEAD_3_INFO;
+    }
+    else if (validateExtra.lead_source) {
+        valuesReplace.lead_source = validateExtra.lead_source;
+        infoEvent.translateCode = translations._EVENT_DES_LEAD_2_INFO;
+    }
+    else {
+        infoEvent.translateCode = translations._EVENT_DES_LEAD_0_INFO;
+    }
+};
+const handleQrScanEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    valuesReplace.qr_code_id = validateExtra.qr_code?.id || 'N/A';
+    valuesReplace.status = validateExtra.status || 'N/A';
+    if (validateExtra.message_content) {
+        valuesReplace.message_content = validateExtra.message_content;
+        infoEvent.translateCode = translations._EVENT_DES_SCAN_FULL;
+    }
+    else {
+        infoEvent.translateCode = translations._EVENT_DES_SCAN_NO_ERR;
+    }
+};
+const handleClickBannerEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    valuesReplace.position = validateExtra.position || 'N/A';
+    infoEvent.translateCode = translations._EVENT_DES_CLICK_BANNER;
+};
+const handleClickButtonEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    valuesReplace.button_label = validateExtra.button_label || 'N/A';
+    valuesReplace.page_cate = validateExtra.page_cate || 'N/A';
+    infoEvent.translateCode = translations._EVENT_DES_CLICK_BUTTON;
+};
+const handleViewSchemeEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    valuesReplace.scheme_code =
+        validateExtra.scheme_marketing?.scheme_code ||
+            validateExtra.scheme_code ||
+            validateExtra.scheme_marketing?.id ||
+            'N/A';
+    infoEvent.translateCode = translations._EVENT_DES_VIEW_SCHEME_DETAILS;
+};
+const handleRedeemPointEvent = (validateExtra, valuesReplace, infoEvent, isSuccess) => {
+    delete valuesReplace.event_name;
+    valuesReplace.scheme_code =
+        validateExtra.scheme_marketing?.scheme_code ||
+            validateExtra.scheme_code ||
+            validateExtra.scheme_marketing?.id ||
+            'N/A';
+    if (isSuccess) {
+        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, isVisitorProfile) => {
+    delete valuesReplace.event_name;
+    valuesReplace.visitor_name = isVisitorProfile
+        ? translate(translations._THIS_PERSON_UPPERCASE, 'This user')
+        : validateExtra.users?.name || valuesReplace.customer_name;
+    valuesReplace.name = 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.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) => {
+    delete valuesReplace.event_name;
+    valuesReplace.visitor_name = valuesReplace.customer_name;
+    valuesReplace.customer_name =
+        validateExtra.customers?.name || validateExtra.customer_name || 'N/A';
+    infoEvent.translateCode = translations._EVENT_DES_ADD_MEM;
+};
+const handleRemoveMemberEvent = (validateExtra, valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    valuesReplace.name = validateExtra.user_update_name || 'N/A';
+    infoEvent.translateCode = translations._EVENT_DES_REMOVE_MEM;
+};
+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;
+};
+const handleShareProgramEvent = (valuesReplace, infoEvent) => {
+    delete valuesReplace.event_name;
+    infoEvent.translateCode = translations._EVENT_DES_SHARE_PROGRAM;
+};
+const handleEarnRewardEvent = (validateExtra, valuesReplace, infoEvent, isReferrer) => {
+    delete valuesReplace.event_name;
+    valuesReplace.reward_value = validateExtra.reward_value || 'N/A';
+    valuesReplace.reward_type = validateExtra.reward_type || 'N/A';
+    if (isReferrer) {
+        infoEvent.translateCode = translations._EVENT_DES_EARN_REWARD_REFERRER;
+    }
+    else {
+        infoEvent.translateCode = translations._EVENT_DES_EARN_REWARD_REFEREE;
+    }
+};
+const handleCustomEventByEcEa = (eType, pageType, validateExtra, valuesReplace, infoEvent, isVisitorProfile) => {
+    if ((eType === 'lead_formated' && pageType === 'sync') ||
+        (eType === 'lead_form' && pageType === 'submit')) {
+        handleLeadFormEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'qr_code' && pageType === 'scan') {
+        handleQrScanEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'banner' && pageType === 'click') {
+        handleClickBannerEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'button' && pageType === 'click') {
+        handleClickButtonEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'scheme_marketing' && pageType === 'view') {
+        handleViewSchemeEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'point' && pageType === 'redeem_point') {
+        handleRedeemPointEvent(validateExtra, valuesReplace, infoEvent, true);
+    }
+    else if (eType === 'point' && pageType === 'redeem_point_fail') {
+        handleRedeemPointEvent(validateExtra, valuesReplace, infoEvent, false);
+    }
+    else if (eType === 'role' && pageType === 'update') {
+        handleUpdateRoleEvent(validateExtra, valuesReplace, infoEvent, isVisitorProfile);
+    }
+    else if (eType === 'request' && pageType === 'approve') {
+        handleApproveRequestEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'member' && pageType.toLowerCase() === 'add') {
+        handleAddMemberEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'member' && pageType.toLowerCase() === 'remove') {
+        handleRemoveMemberEvent(validateExtra, valuesReplace, infoEvent);
+    }
+    else if (eType === 'access' && pageType === 'request') {
+        handleRequestAccessEvent(validateExtra, valuesReplace, infoEvent, isVisitorProfile);
+    }
+    else if (eType === 'program' && pageType === 'share') {
+        handleShareProgramEvent(valuesReplace, infoEvent);
+    }
+    else if (eType === 'referrer' && pageType === 'earn_reward') {
+        handleEarnRewardEvent(validateExtra, valuesReplace, infoEvent, true);
+    }
+    else if (eType === 'referee' && pageType === 'earn_reward') {
+        handleEarnRewardEvent(validateExtra, valuesReplace, infoEvent, false);
+    }
+};
 const handleEventTrackingCode = (eventTracking, keyTitleEvent, validateExtra, valuesReplace, infoEvent, config) => {
     const { story = {} } = validateExtra;
     if (eventTracking.map[keyTitleEvent]?.eventTrackingCode === 'promotion_code_sent_tracking') {
@@ -353,7 +517,7 @@ const processEventByType = (eType, itemEvent, validateExtra, data) => {
         handleScreenviewEvent(itemEvent, validateExtra, data);
     }
 };
-const buildInfoEvent = (infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config) => {
+const buildInfoEvent = (infoEvent, eventTracking, keyTitleEvent, validateExtra, data, config, eType, pageType, isVisitorProfile) => {
     let valuesReplace = {};
     if (infoEvent) {
         infoEvent.iconName = get(eventTracking, `map.${keyTitleEvent}.iconUrl`);
@@ -375,6 +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, isVisitorProfile);
     return { infoEvent, valuesReplace };
 };
 const buildFullContentEvent = (infoEvent, titleEvent, valuesReplace, data) => {
@@ -403,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
@@ -414,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);
+    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/es/components/organism/LeftMenu/components/HomeMenu/styled.d.ts

@@ -1,4 +1,15 @@
 /// <reference types="react" />
 export declare const HomeMenuWrapper: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("antd/es/flex/interface").FlexProps<import("antd/es/_util/type").AnyObject> & import("react").RefAttributes<HTMLElement>>, any, {}, never>;
 export declare const CreateButton: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("antd").ButtonProps & import("react").RefAttributes<import("react").LegacyRef<HTMLElement>>>, any, {}, never>;
-export declare const ModalWrapper: import("styled-components").StyledComponent<import("react").ComponentType<any> | keyof import("react").JSX.IntrinsicElements, any, any, any>;
+export declare const ModalWrapper: import("styled-components").StyledComponent<import("react").FC<import("@antscorp/antsomi-ui/es/components/molecules/Modal").ModalProps> & {
+    confirm: (props: import("antd").ModalFuncProps) => {
+        destroy: () => void;
+        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    };
+    useModal: typeof import("antd/es/modal/useModal").default;
+    success: import("antd/es/modal/confirm").ModalFunc;
+    info: import("antd/es/modal/confirm").ModalFunc;
+    error: import("antd/es/modal/confirm").ModalFunc;
+    warning: import("antd/es/modal/confirm").ModalFunc;
+    destroyAll: () => void;
+}, any, {}, never>;

package/es/components/organism/LeftMenu/hooks/usePermission.js

@@ -115,7 +115,7 @@ export const usePermission = () => {
         },
     });
     const flattenMenuPermission = flattenMenuArray(menuListPermission || [], 'childs');
-    const permissionMenu = useMemo(() => recursivePermissionMenu(sortBy(menuList?.rows || [], ['level_position']), flattenMenuPermission), [menuList?.rows, flattenMenuPermission]);
+    const permissionMenu = useMemo(() => recursivePermissionMenu(sortBy(menuList?.rows || [], [item => Number(item?.level_position)]), flattenMenuPermission), [menuList?.rows, flattenMenuPermission]);
     const mappingChildrenMenu = useMemo(() => getMappingAppChildren({
         menuList: permissionMenu,
         auth,

package/es/components/organism/LeftMenu/utils/index.js

@@ -86,7 +86,7 @@ export const recursivePermissionMenu = (menuItems, menuPermissions) => {
         ...item,
         ...(isArray(item.children)
             ? {
-                children: recursivePermissionMenu(sortBy(item.children || [], ['level_position']), menuPermissions),
+                children: recursivePermissionMenu(sortBy(item.children || [], [item => Number(item.level_position)]), menuPermissions),
             }
             : {}),
     }))

package/es/components/organism/PreviewTemplateModal/styled.d.ts

@@ -1,4 +1,15 @@
 /// <reference types="react" />
-export declare const ModalContainer: import("styled-components").StyledComponent<import("react").ComponentType<any> | keyof import("react").JSX.IntrinsicElements, any, any, any>;
+export declare const ModalContainer: import("styled-components").StyledComponent<import("react").FC<import("../../molecules/Modal").ModalProps> & {
+    confirm: (props: import("antd").ModalFuncProps) => {
+        destroy: () => void;
+        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    };
+    useModal: typeof import("antd/es/modal/useModal").default;
+    success: import("antd/es/modal/confirm").ModalFunc;
+    info: import("antd/es/modal/confirm").ModalFunc;
+    error: import("antd/es/modal/confirm").ModalFunc;
+    warning: import("antd/es/modal/confirm").ModalFunc;
+    destroyAll: () => void;
+}, any, {}, never>;
 export declare const ModalWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
 export declare const ImageWrapper: import("styled-components").StyledComponent<"img", any, {}, never>;

package/es/components/organism/SQLGeneration/components/styled.d.ts

@@ -24,7 +24,18 @@ export declare const CautionLink: import("styled-components").StyledComponent<im
 export declare const RatingSection: import("styled-components").StyledComponent<"div", any, {}, never>;
 export declare const RatingText: import("styled-components").StyledComponent<"span", any, {}, never>;
 export declare const RatingButton: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("antd").ButtonProps & import("react").RefAttributes<import("react").LegacyRef<HTMLElement>>>, any, {}, never>;
-export declare const StyledModal: import("styled-components").StyledComponent<import("react").ComponentType<any> | keyof import("react").JSX.IntrinsicElements, any, any, any>;
+export declare const StyledModal: import("styled-components").StyledComponent<import("react").FC<import("../../../molecules/Modal").ModalProps> & {
+    confirm: (props: import("antd").ModalFuncProps) => {
+        destroy: () => void;
+        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    };
+    useModal: typeof import("antd/es/modal/useModal").default;
+    success: import("antd/es/modal/confirm").ModalFunc;
+    info: import("antd/es/modal/confirm").ModalFunc;
+    error: import("antd/es/modal/confirm").ModalFunc;
+    warning: import("antd/es/modal/confirm").ModalFunc;
+    destroyAll: () => void;
+}, any, {}, never>;
 export declare const ModalDescription: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("antd/es/typography/Text").TextProps & import("react").RefAttributes<HTMLSpanElement>>, any, {}, never>;
 export declare const SearchSection: import("styled-components").StyledComponent<"div", any, {}, never>;
 export declare const LanguageSelector: import("styled-components").StyledComponent<"div", any, {}, never>;

package/es/utils/cookie.js

@@ -27,6 +27,15 @@ export const removeCookieSubDomain = ({ name, env = 'development', cookieOptions
         secure: true,
         ...cookieOptions,
     });
+    // Remove redundant cookies setted for full domain
+    if (['api_token', 'api_r_token', 'api_pid'].includes(name)) {
+        cookies.remove(name, {
+            path: '/',
+            sameSite: 'none',
+            secure: true,
+            ...cookieOptions,
+        });
+    }
 };
 export const removeAppCookieSessionSubdomain = (args) => {
     removeCookieSubDomain(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "2.0.114",
+  "version": "2.0.116",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -91,7 +91,7 @@
     "@tiptap/react": "3.10.2",
     "@tiptap/starter-kit": "3.10.2",
     "@tiptap/suggestion": "3.10.2",
-    "@yaireo/tagify": "^4.31.2",
+    "@yaireo/tagify": "4.31.2",
     "ace-builds": "1.4.14",
     "animate.css": "^4.1.1",
     "antd": "5.12.6",
@@ -159,8 +159,8 @@
   },
   "devDependencies": {
     "@antscorp/antsomi-constants": "1.0.8-beta.1",
+    "@antscorp/antsomi-locales": "^1.0.92",
     "@antscorp/eslint-config-antsomi": "1.0.4",
-    "@antscorp/antsomi-locales": "^1.0.79",
     "@babel/cli": "^7.23.4",
     "@babel/core": "^7.21.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
@@ -267,10 +267,10 @@
     "webpack-cli": "^5.1.4"
   },
   "peerDependencies": {
+    "@antscorp/antsomi-constants": ">=1.0.8-beta.1",
+    "@antscorp/antsomi-locales": ">=1.0.79",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "react-router-dom": ">= 5.1.0",
-    "@antscorp/antsomi-constants": ">=1.0.8-beta.1",
-    "@antscorp/antsomi-locales": ">=1.0.79"
+    "react-router-dom": ">= 5.1.0"
   }
 }