@antscorp/antsomi-ui 1.3.5-beta.561 → 1.3.5-beta.563

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

@@ -8,7 +8,7 @@ interface RequestAccessProps {
     sentSubTitle?: string;
     requestText?: string;
     switchAccountText?: string;
-    onRequest?: (message: string) => Promise<void>;
+    onRequest?: (message: string) => Promise<any>;
     onSwitchAccount?: () => void;
 }
 export declare const RequestAccess: React.FC<RequestAccessProps>;

package/es/components/molecules/RequestAccess/RequestAccess.js

@@ -5,6 +5,7 @@ import { RequestAccessStyled } from './styled';
 // Translate
 import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
 import { translations } from '@antscorp/antsomi-ui/es/locales/translations';
+import { BlockIcon } from '../../icons';
 const { t } = i18nInstance;
 export const RequestAccess = props => {
     const { className, placeholder = t(translations.requestAccess.placeholder), deniedTitle = t(translations.requestAccess.deniedTitle), deniedSubTitle = t(translations.requestAccess.deniedSubTitle), sentTitle = t(translations.requestAccess.sentTitle), sentSubTitle = t(translations.requestAccess.sentSubTitle), requestText = t(translations.requestAccess.requestText), switchAccountText = t(translations.requestAccess.switchAccountText), onRequest, onSwitchAccount, } = props;
@@ -18,10 +19,15 @@ export const RequestAccess = props => {
             try {
                 setIsLoading(true);
                 onRequest(message)
-                    .then(() => setIsSentRequest(true))
+                    .then(data => {
+                    if (data) {
+                        setIsSentRequest(true);
+                    }
+                })
                     .finally(() => setIsLoading(false));
             }
             catch (error) {
+                // the onRequest(message) callback is called in try (have not call again)
                 setIsSentRequest(true);
             }
         }
@@ -33,7 +39,9 @@ export const RequestAccess = props => {
     return (React.createElement(RequestAccessStyled, { className: `antsomi-request-access ${className || ''}` },
         React.createElement(Flex, { vertical: true, gap: 20 },
             React.createElement(Flex, { vertical: true, gap: 5 },
-                React.createElement(Typography.Text, { className: "denied-title" }, isSentRequest ? sentTitle : deniedTitle),
+                React.createElement(Typography.Text, { className: "denied-title" }, isSentRequest ? (sentTitle) : (React.createElement(React.Fragment, null,
+                    deniedTitle,
+                    React.createElement(BlockIcon, null)))),
                 React.createElement(Typography.Text, { className: "denied-sub-title" }, isSentRequest ? sentSubTitle : deniedSubTitle)),
             !isSentRequest ? (React.createElement(TextArea, { style: { resize: 'none' }, placeholder: placeholder, ref: messageRef })) : null,
             React.createElement(Flex, { className: "action-buttons", gap: 10 },

package/es/components/molecules/RequestAccess/styled.js

@@ -13,10 +13,17 @@ export const RequestAccessStyled = styled.div `
     width: 350px;
 
     .denied-title {
+      display: inline-flex;
+      gap: 5px;
+
       font-size: 20px;
       line-height: 24px;
       font-weight: 700;
       color: ${globalToken === null || globalToken === void 0 ? void 0 : globalToken.orange6};
+
+      & > svg {
+        color: ${globalToken === null || globalToken === void 0 ? void 0 : globalToken.bw5};
+      }
     }
 
     .denied-sub-title {

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

@@ -11,6 +11,7 @@ import { ENV } from '@antscorp/antsomi-ui/es/config';
 // Utils
 import { findLastMatchedItemByUrl, findPathOfActiveItem, flattenMenuArray, getMappingAppChildren, recursivePermissionMenu, } from '../utils';
 import { useCheckUserPermission } from '@antscorp/antsomi-ui/es/queries';
+import { recursiveSortBy } from '@antscorp/antsomi-ui/es/utils';
 const { DEV, SANDBOX, SANDBOX_CDP } = ENV;
 export const usePermission = () => {
     const appConfig = useLeftMenuContext(store => store.appConfig);
@@ -135,7 +136,7 @@ export const usePermission = () => {
         userPermission,
     ]);
     const mappingChildrenMenuWithNoPermission = useMemo(() => getMappingAppChildren({
-        menuList: (menuList === null || menuList === void 0 ? void 0 : menuList.rows) || [],
+        menuList: recursiveSortBy((menuList === null || menuList === void 0 ? void 0 : menuList.rows) || [], 'children', ['level_position']) || [],
         auth,
         dashboardList,
         destinationChannelEntries: destinationChannel === null || destinationChannel === void 0 ? void 0 : destinationChannel.entries,

package/es/utils/common.d.ts

@@ -137,3 +137,13 @@ export declare function splitTextByNewline(text?: string): string[];
  * @returns {any | null} The parsed JSON object if successful, or `null` if the parsing fails or the key does not exist.
  */
 export declare function parseJSONFromLocalStorage<T = any>(key: string): T | null;
+/**
+ * Recursively sorts an array of objects by specified keys and also sorts their nested children arrays.
+ *
+ * @template T - The type of the objects within the array.
+ * @param {T[]} arr - The array of objects to be sorted.
+ * @param {keyof T} [childrenKey='children'] - The key used to identify the children array in each object.
+ * @param {Array<keyof T>} [sortByKeys=[]] - The keys used to sort the objects.
+ * @returns {T[]} - The sorted array with each object’s children arrays also sorted recursively.
+ */
+export declare const recursiveSortBy: <T = any>(arr: T[], childrenKey?: keyof T, sortByKeys?: (keyof T)[]) => T[];

package/es/utils/common.js

@@ -6,6 +6,7 @@ import uniqid from 'uniqid';
 import { MESSAGES, PORTAL_KEYS } from '@antscorp/antsomi-ui/es/services/constants';
 // Utils
 import { handleError } from './handleError';
+import { sortBy } from 'lodash';
 const PATH = 'src/utils/common.ts';
 /**
  * Function to reorder list
@@ -607,3 +608,15 @@ export function parseJSONFromLocalStorage(key) {
         return null;
     }
 }
+/**
+ * Recursively sorts an array of objects by specified keys and also sorts their nested children arrays.
+ *
+ * @template T - The type of the objects within the array.
+ * @param {T[]} arr - The array of objects to be sorted.
+ * @param {keyof T} [childrenKey='children'] - The key used to identify the children array in each object.
+ * @param {Array<keyof T>} [sortByKeys=[]] - The keys used to sort the objects.
+ * @returns {T[]} - The sorted array with each object’s children arrays also sorted recursively.
+ */
+export const recursiveSortBy = (arr, childrenKey = 'children', sortByKeys = []) => sortBy(arr, [...sortByKeys]).map(item => (Object.assign(Object.assign({}, item), (item[childrenKey] && {
+    [childrenKey]: recursiveSortBy(item[childrenKey], childrenKey, sortByKeys),
+}))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.5-beta.561",
+  "version": "1.3.5-beta.563",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",