@antscorp/antsomi-ui 2.0.39 → 2.0.41

package/es/components/molecules/HeaderV2/HeaderV2.js

@@ -26,7 +26,11 @@ export const HeaderV2 = memo(props => {
     // * Prefer to use Header in AppConfigContext
     const { show = true, className, style, breadcrumbs, showLogo = false, rightContent, pageTitle = '', accountSelection = {}, helpConfig, notificationConfig = {}, accountSharingConfig, useURLParam, config, onCLickLogo, } = props;
     /** General config for children component */
-    const { env = envContext, language = languageCode, userId = isNaN(Number(auth?.userId)) ? 0 : Number(auth?.userId), portalId = auth?.portalId, token = auth?.token, permissionDomain = PERMISSION_API, iamDomain = IAM_API, appCode = contextAppCode, menuCode = contextMenuCode, } = config || {};
+    const { env = envContext, language = languageCode, 
+    // NOTE: Just hot fix for change userId to accountId
+    userId = isNaN(Number(auth?.accountId || auth?.userId))
+        ? 0
+        : Number(auth?.accountId || auth?.userId), portalId = auth?.portalId, token = auth?.token, permissionDomain = PERMISSION_API, iamDomain = IAM_API, appCode = contextAppCode, menuCode = contextMenuCode, } = config || {};
     const { currentAccount, inputStyle = 'select', onSelectAccount, ...accountSelectionProps } = accountSelection;
     const urlParams = useMemo(() => new URLSearchParams(search), [search]);
     const oidParam = urlParams.get('oid') || currentAccount || 'all';

package/es/components/molecules/MatchAnySelect/MatchesAnySelect.js

@@ -43,7 +43,7 @@ const { t } = i18nInstance;
 const { Text } = Typography;
 export function MatchesAny(props) {
     // Props
-    const { maxSelectedItem, maxLengthEachItem = 200, objectName, loading = false, showExtendValue = true, selectedItems: selectedItemsProp, items, groupSelectProps, renderExtraValues, customItemRenders, listEmptyProps, selectedListEmptyProps, selectedTreeData: selectedTreeDataProp, searchValue = '', isExternalSearch, onApply = () => { }, onCancel = () => { }, onLoadMore = () => { }, onChangeSearch, ...restOfProps } = props;
+    const { maxSelectedItem, maxLengthEachItem, objectName, loading = false, showExtendValue = true, selectedItems: selectedItemsProp, items, groupSelectProps, renderExtraValues, customItemRenders, listEmptyProps, selectedListEmptyProps, selectedTreeData: selectedTreeDataProp, searchValue = '', isExternalSearch, onApply = () => { }, onCancel = () => { }, onLoadMore = () => { }, onChangeSearch, ...restOfProps } = props;
     // State
     const [state, setState] = useState(matchesAnyInitialState);
     const [maxItemsError, setMaxItemsError] = useState(false);
@@ -55,7 +55,9 @@ export function MatchesAny(props) {
     const { description: selectedListEmptyDescription = t(translations.global.selectItemsFromList).toString(), icon: selectedListEmptyIcon = _jsx(DataIcon, { color: globalToken?.bw5, size: 48 }), ...restSelectedListEmptyProps } = selectedListEmptyProps || {};
     useDeepCompareEffect(() => {
         const isOverMaxSelected = maxSelectedItem && selectedItems && selectedItems.length > maxSelectedItem;
-        const isSomeTextTooLong = selectedItems && selectedItems.some(item => item.key?.toString().length > maxLengthEachItem);
+        const isSomeTextTooLong = maxLengthEachItem
+            ? selectedItems && selectedItems.some(item => item.key?.toString().length > maxLengthEachItem)
+            : false;
         setMaxItemsError(!!isOverMaxSelected);
         setItemOverMaxLength(!!isSomeTextTooLong);
         if (isApply && !isOverMaxSelected && !isSomeTextTooLong)
@@ -183,7 +185,7 @@ export function MatchesAny(props) {
     };
     const handleClickRemoveInvalid = () => {
         selectedItems?.forEach(item => {
-            if (item.key?.toString().length > maxLengthEachItem) {
+            if (maxLengthEachItem && item.key?.toString().length > maxLengthEachItem) {
                 onRemoveItem(item);
             }
         });
@@ -205,6 +207,7 @@ export function MatchesAny(props) {
                                             : extraValue.render
                                         : item[extraValue.key] }) }, `${extraValue.key}`))) }))] }), _jsxs(Flex, { align: "center", gap: 10, children: [mode === 'select' && renderItemError(item), mode === 'select' &&
                             item.key?.toString().length &&
+                            maxLengthEachItem &&
                             item.key?.toString().length > maxLengthEachItem && _jsx(ErrorIcon, { size: 16 }), isExtendValue && (_jsx(Icon, { type: "icon-ants-empty-flag", size: 20, color: globalToken?.colorPrimary })), _jsx(ActionButton, { className: "select-button", align: "center", justify: "center", onClick: () => {
                                 // Call onSelectItem function if provided
                                 if (onSelectItem) {
@@ -215,7 +218,7 @@ export function MatchesAny(props) {
                                     onRemoveItem(item);
                                 }
                             }, children: _jsx(Icon, { type: `icon-ants-${onSelectItem ? 'double-arrow-up' : 'remove-slim'}`, size: 11 }) })] })] }));
-    }, [customItemRenders, renderExtraValues, itemOverMaxLength, renderItemError]);
+    }, [renderExtraValues, customItemRenders, maxLengthEachItem, renderItemError]);
     // Memos
     const { treeData } = useDeepCompareMemo(() => {
         const { results, matchedParents } = recursiveSearchItems({
@@ -376,7 +379,7 @@ export function MatchesAny(props) {
     return (_jsx(ConfigProvider, { theme: MATCHES_ANY_THEME, children: _jsxs(MatchesAnyWrapper, { ...restOfProps, vertical: true, justify: "space-between", children: [_jsxs(Flex, { style: { width: '100%', height: '100%' }, children: [renderSelectList(), renderSelectedList()] }), _jsxs(Flex, { className: "matches-any__footer", align: "center", justify: "space-between", children: [_jsxs(Flex, { align: "center", gap: 10, children: [_jsx(Button, { type: "primary", disabled: isDisableApply, onClick: onClickApply, children: translate(translationsLocale._ACT_APPLY) }), _jsx(Button, { onClick: () => onCancel(), children: translate(translationsLocale._ACT_CANCEL) }), isApply && (maxItemsError || itemOverMaxLength) && (_jsxs(_Fragment, { children: [_jsx(Typography, { style: { color: globalToken?.colorError }, children: translate(translationsLocale._OPERATOR_MATCH_ANY_EX_VALUE_LIMIT) }), itemOverMaxLength && (_jsx(Button, { type: "text", onClick: handleClickRemoveInvalid, children: translate(translationsLocale._OPERATOR_MATCH_ANY_EX_VALUE_LIMIT_REMOVE_INV) }))] }))] }), showExtendValue && (_jsx(ExtendValuePopup, { getPopupContainer: trigger => trigger.parentElement || document.body, onApply: onApplyExtendValue, children: _jsx(Button, { icon: _jsx(Icon, { type: "icon-ants-empty-flag" }), children: t(translations.extendValue.title).toString() }) }))] })] }) }));
 }
 export function MatchesAnySelect(props) {
-    const { maxSelectedItem, maxLengthEachItem = 200, placeholder = 'Select an item', dropdownStyle, objectName, selectedItems, items, loading, popupClassName, groupSelectProps, renderExtraValues, customItemRenders, popoverProps, listEmptyProps, selectedListEmptyProps, selectedTreeData, error, onChangeSearch, onChange = () => { }, onLoadMore, ...restProps } = props;
+    const { maxSelectedItem, maxLengthEachItem, placeholder = 'Select an item', dropdownStyle, objectName, selectedItems, items, loading, popupClassName, groupSelectProps, renderExtraValues, customItemRenders, popoverProps, listEmptyProps, selectedListEmptyProps, selectedTreeData, error, onChangeSearch, onChange = () => { }, onLoadMore, ...restProps } = props;
     // State
     const [state, setState] = useState(initialState);
     // Variables

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

@@ -101,7 +101,9 @@ export const usePermission = () => {
             auth: {
                 token: auth?.token,
                 url: permissionDomain || PERMISSION_API,
-                userId: auth?.userId,
+                // NOTE: Hot fix for case menu permission working wrong
+                // userId: auth?.userId,
+                userId: auth?.accountId,
                 accountId: auth?.accountId,
             },
             params: {

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

@@ -99,9 +99,10 @@ export const recursivePermissionMenu = (menuItems, menuPermissions) => {
  */
 export const getGeneratePath = (path, params) => {
     try {
-        const { portalId, userId, dashboardId, channelId } = params || {};
+        const { portalId, userId, accountId, dashboardId, channelId } = params || {};
         const paramsObjects = {
-            user_id: userId ?? '-1',
+            // NOTE: Hot fix for account_id (login account)
+            user_id: accountId ?? userId ?? '-1',
             networkId: portalId ?? -1,
             portalId: portalId ?? -1,
             dashboardId: dashboardId ?? '-1',

package/es/components/template/Layout/Layout.js

@@ -198,7 +198,8 @@ export const Layout = memo(props => {
         permissionDomain,
         socketDomain: SOCKET_API,
         token,
-        accountId: userId,
+        // accountId: userId,
+        accountId,
         userId,
         lang: languageCode,
         networkId: portalId,
@@ -222,6 +223,12 @@ export const Layout = memo(props => {
             : menu_item_name);
         setActiveMenu(activeMenuItem);
         onActiveMenuChange?.(menu_item_code);
+        console.log({
+            activeItemPath: cloneDeep(activeItemPath),
+            flattenPermissionList,
+            menuListPermission,
+            appItem: activeItemPath[0],
+        });
         const hasRole = hasSelectAccountPermission({
             activeItemPath: cloneDeep(activeItemPath),
             flattenPermissionList,
@@ -251,10 +258,10 @@ export const Layout = memo(props => {
     /** Handle replace current userId in params if current userId is not match */
     useDeepCompareEffect(() => {
         const { userId: userIdParam } = (params || {});
-        if (userIdParam && userId && +userIdParam !== +userId && location.pathname) {
-            replace(`${location.pathname.replace(userIdParam, `${userId}`)}${location.search}`);
+        if (userIdParam && accountId && +userIdParam !== +accountId && location.pathname) {
+            replace(`${location.pathname.replace(userIdParam, `${accountId}`)}${location.search}`);
         }
-    }, [params, location.pathname, userId, replace]);
+    }, [params, location.pathname, accountId, replace]);
     /** If left menu props has customization then set layout loading to false, because we don't need check permission here */
     useDeepCompareEffect(() => {
         if (mergeLeftMenuProps.customization) {

package/es/components/template/Layout/components/RecommendationWorkspace/components/MenuMapping/components/OldLeftMenu/index.js

@@ -43,7 +43,9 @@ export const OldLeftMenu = memo(props => {
             auth: {
                 token: auth?.token,
                 url: PERMISSION_API,
-                userId: auth?.userId,
+                // NOTE: Hot fix for case menu permission working wrong
+                // userId: auth?.userId,
+                userId: auth?.accountId,
                 accountId: auth?.accountId,
             },
             params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "2.0.39",
+  "version": "2.0.41",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -251,4 +251,4 @@
     "react-dom": ">=16.9.0",
     "react-router-dom": ">= 5.1.0"
   }
-}
+}