@antscorp/antsomi-ui 1.3.5-beta.362 → 1.3.5-beta.364

package/es/components/molecules/AccountSelection/hooks/useAccountSelection.js

@@ -3,13 +3,21 @@ import { useMemo } from 'react';
 // Queries
 import { useGetAccountList, useGetPermissionAccountList, useGetRecentAccount, } from '@antscorp/antsomi-ui/es/queries';
 // Constant
-import { PORTALS_IDS } from '@antscorp/antsomi-ui/es/constants';
+import { APP_CODES } from '@antscorp/antsomi-ui/es/constants';
+const { APP_ANTALYSER, DATAFLOWS } = APP_CODES;
+// NOTES: Just define for account selection
+const isUsePermissionAccount = (appCode) => {
+    if ([APP_ANTALYSER, DATAFLOWS].includes(appCode)) {
+        return true;
+    }
+    return false;
+};
 export const useAccountSelection = (apiConfig) => {
-    const { domain, token, userId, appCode, menuCode, portalId } = apiConfig;
+    const { domain, token, userId, appCode, menuCode } = apiConfig;
     const { data } = useGetAccountList({
         apiConfig,
         options: {
-            enabled: portalId !== PORTALS_IDS.SANDBOX_76753,
+            enabled: !isUsePermissionAccount(appCode || ''),
         },
     });
     const { data: permissionAccountList } = useGetPermissionAccountList({
@@ -24,18 +32,18 @@ export const useAccountSelection = (apiConfig) => {
             menuCode: menuCode || appCode || '',
         },
         options: {
-            enabled: portalId === PORTALS_IDS.SANDBOX_76753,
+            enabled: isUsePermissionAccount(appCode || ''),
         },
     });
     const { data: recentData } = useGetRecentAccount({
         apiConfig,
         options: {
-            enabled: portalId !== PORTALS_IDS.SANDBOX_76753,
+            enabled: !isUsePermissionAccount(appCode || ''),
         },
     });
     // Memos
     const accountData = useMemo(() => {
-        if (portalId === PORTALS_IDS.SANDBOX_76753) {
+        if (isUsePermissionAccount(appCode || '')) {
             return ((permissionAccountList === null || permissionAccountList === void 0 ? void 0 : permissionAccountList.map(account => ({
                 email: account.email,
                 userId: account.user_id,
@@ -44,6 +52,6 @@ export const useAccountSelection = (apiConfig) => {
             }))) || []);
         }
         return (data === null || data === void 0 ? void 0 : data.entries) || [];
-    }, [data === null || data === void 0 ? void 0 : data.entries, permissionAccountList, portalId]);
+    }, [appCode, data === null || data === void 0 ? void 0 : data.entries, permissionAccountList]);
     return { recentData, accountData };
 };

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/NumOfDaysRanges/index.d.ts

@@ -1 +1 @@
-export * from './NumOfDaysRanges';
+export { NumOfDaysRanges } from './NumOfDaysRanges';

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/NumOfDaysRanges/index.js

@@ -1 +1 @@
-export * from './NumOfDaysRanges';
+export { NumOfDaysRanges } from './NumOfDaysRanges';

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/Option/Option.js

@@ -1,12 +1,39 @@
 import React, { useRef } from 'react';
+import { List, Menu } from 'antd';
 import Icon from '@antscorp/icons';
+import styled from 'styled-components';
 import { Popover } from '@antscorp/antsomi-ui/es/components/atoms';
 import classNames from 'classnames';
 import { useCalendarSelectionContext } from '../../../../hooks';
 import { changeRangeType } from '../../../../actions';
 import { rangeInfoToStringType } from '../../../../utils';
-import { StyledMenu } from './styled';
-import { List } from 'antd';
+const StyledMenu = styled(Menu) `
+  &.antsomi-menu-root {
+    .antsomi-menu-item {
+      position: relative;
+      color: black;
+      height: 32px;
+      line-height: 32px;
+      border-radius: 0;
+      width: 100%;
+      margin: 0;
+
+      &.antsomi-menu-item-selected {
+        font-weight: bold;
+
+        &:after {
+          content: '';
+          position: absolute;
+          left: 0;
+          top: 0;
+          width: 4px;
+          height: 100%;
+          background-color: #005fb8;
+        }
+      }
+    }
+  }
+`;
 export const Option = props => {
     const itemRef = useRef(null);
     const { label = '', options = [], type } = props;

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

@@ -1,2 +1,2 @@
-export * from './Option';
-export * from './NumOfDaysRanges';
+export { Option } from './Option';
+export { NumOfDaysRanges } from './NumOfDaysRanges';

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/index.js

@@ -1,2 +1,2 @@
-export * from './Option';
-export * from './NumOfDaysRanges';
+export { Option } from './Option';
+export { NumOfDaysRanges } from './NumOfDaysRanges';

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

@@ -21,5 +21,10 @@ export declare const CalendarSelectionConstants: {
         readonly days_up_to_today: "days_up_to_today";
         readonly days_up_to_yesterday: "days_up_to_yesterday";
     };
+    AUTO_UPDATE_TO_KEY: {
+        readonly today: "today";
+        readonly yesterday: "yesterday";
+        readonly fixed: "fixed";
+    };
 };
 export type { TriggerOutInfo, CalendarSelectionValue } from './types';

package/es/components/molecules/CalendarSelection/index.js

@@ -1,6 +1,7 @@
-import { TRIGGER_OUT_MODE, SELECTION_KEY } from './constants';
+import { TRIGGER_OUT_MODE, SELECTION_KEY, AUTO_UPDATE_TO_KEY } from './constants';
 export { CalendarSelection } from './CalendarSelection';
 export const CalendarSelectionConstants = {
     TRIGGER_OUT_MODE,
     SELECTION_KEY,
+    AUTO_UPDATE_TO_KEY,
 };

package/es/components/molecules/CalendarSelection/utils.js

@@ -7,7 +7,7 @@ import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import { AUTO_UPDATE_TO_KEY, DEFAULT_NUM_UP_TO, MAP_TITLE, RANGE_LIMIT, SELECTION_KEY, } from './constants';
 import { last } from 'lodash';
-import { asssertCannotReach } from '@antscorp/antsomi-ui/es/utils/common';
+import { asssertCannotReach } from '@antscorp/antsomi-ui/es/utils';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 dayjs.extend(isoWeek);

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

@@ -13,7 +13,7 @@ export const usePermission = () => {
     const appConfig = useLeftMenuStore(store => store.state.appConfig);
     const isCustomized = useLeftMenuStore(store => store.state.isCustomized);
     const { isGrouped, objectId, objectType } = useLeftMenuStore(store => store.state.dashboardParams);
-    const { auth, languageCode = 'en', env = 'development' } = appConfig || {};
+    const { auth, languageCode = 'en', env = 'development', permissionDomain } = appConfig || {};
     const { pathname, hash } = window.location;
     const { data: menuList } = useGetListMenu({
         args: {
@@ -63,7 +63,7 @@ export const usePermission = () => {
         args: {
             auth: {
                 token: auth === null || auth === void 0 ? void 0 : auth.token,
-                url: PERMISSION_API,
+                url: permissionDomain || PERMISSION_API,
                 userId: auth === null || auth === void 0 ? void 0 : auth.userId,
                 accountId: auth === null || auth === void 0 ? void 0 : auth.userId,
             },

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

@@ -36,7 +36,7 @@ export const Layout = memo(props => {
     const _a = leftMenuProps || {}, { className = '' } = _a, restOfLeftMenuProps = __rest(_a, ["className"]);
     const _b = workspaceProps || {}, { workspaceContentProps } = _b, restOfWorkspaceProps = __rest(_b, ["workspaceContentProps"]);
     const appConfig = useContextSelector(AppConfigContext, state => state);
-    const { auth, languageCode, appCode, env } = appConfig;
+    const { auth, languageCode, appCode, permissionDomain: configPermissionDomain, env } = appConfig;
     const { token, userId, portalId } = auth || {};
     const showLeftMenu = useLayoutStore(store => store.state.leftMenu.show);
     const header = useLayoutStore(store => store.state.header);
@@ -63,6 +63,12 @@ export const Layout = memo(props => {
     // Memo
     const permissionDomain = useMemo(() => {
         var _a;
+        /**
+         * Priority for permission domain
+         */
+        if (configPermissionDomain) {
+            return configPermissionDomain;
+        }
         /**
          * Check if appCode not exist and portalId is SANDBOX
          * then return production permission api
@@ -76,7 +82,7 @@ export const Layout = memo(props => {
             default:
                 return PERMISSION_API;
         }
-    }, [appCode, env, portalId]);
+    }, [appCode, configPermissionDomain, env, portalId]);
     const iamDomain = useMemo(() => {
         var _a;
         /**

package/es/components/template/TemplateListing/components/BlankTemplate/styled.js

@@ -2,10 +2,12 @@
 import styled from 'styled-components';
 // Components
 import { Flex } from '../../../../atoms';
+// Constants
+import { globalToken } from '@antscorp/antsomi-ui/es/constants';
 export const BlankTemplateWrapper = styled(Flex) `
   box-sizing: border-box;
   border: 1px solid #b8cfe6;
-  border-radius: 5px;
+  border-radius: ${globalToken === null || globalToken === void 0 ? void 0 : globalToken.borderRadius}px;
   cursor: pointer;
 
   .add-blank-btn {

package/es/providers/AppConfigProvider/contexts/index.d.ts

@@ -8,6 +8,8 @@ export interface AppConfigProps {
     menuCode?: string;
     languageCode?: string;
     urlLogout?: string;
+    /** Domain */
+    permissionDomain?: string;
     setAppConfig: React.Dispatch<React.SetStateAction<AppConfigProviderProps>>;
 }
 export interface AppConfigProviderProps extends Omit<AppConfigProps, 'setAppConfig'> {

package/es/utils/common.d.ts

@@ -63,7 +63,6 @@ export declare const isEmail: (email: string) => boolean;
  */
 export declare function mapNumberToOrdinalText(num: number): string;
 export declare const searchParamsToObject: (searchParams?: string) => Record<string, unknown>;
-export declare function asssertCannotReach(x: never): void;
 export declare const getShuffleArray: <T>(array: T[]) => T[];
 export declare const snakeCaseToCamelCase: <T = Record<string, any>>(object: Record<string, any> | Record<string, any>[], recursive?: boolean) => T;
 export declare const camelCaseToSnakeCase: <T = Record<string, any>>(object: Record<string, any>, recursive?: boolean) => T;
@@ -86,3 +85,4 @@ export declare const searchStringQuery: (str: string, queryStr: string) => boole
 export declare const isExistedImage: (imageUrl: string) => boolean;
 export declare const getUrlNoCache: (url?: string, cacheValue?: number | string) => string;
 export declare const safeParseJson: (json?: string | null, defaultValue?: any) => any;
+export declare function asssertCannotReach(x: never): void;

package/es/utils/common.js

@@ -387,9 +387,6 @@ export function mapNumberToOrdinalText(num) {
     }
 }
 export const searchParamsToObject = (searchParams = '') => Object.fromEntries(new URLSearchParams(searchParams));
-export function asssertCannotReach(x) {
-    throw new Error('cannot reach this place in the code!');
-}
 export const getShuffleArray = (array) => {
     for (let i = array.length - 1; i > 0; i--) {
         /* Choose a random position from 0 to i */
@@ -502,3 +499,6 @@ export const safeParseJson = (json, defaultValue) => {
         return defaultValue;
     }
 };
+export function asssertCannotReach(x) {
+    throw new Error('cannot reach this place in the code!');
+}

package/package.json

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

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/Option/styled.d.ts

@@ -1 +0,0 @@
-export declare const StyledMenu: any;

package/es/components/molecules/CalendarSelection/components/RangeSelectOptions/components/Option/styled.js

@@ -1,29 +0,0 @@
-import { Menu } from 'antd';
-import styled from 'styled-components';
-export const StyledMenu = styled(Menu) `
-  &.antsomi-menu-root {
-    .antsomi-menu-item {
-      position: relative;
-      color: black;
-      height: 32px;
-      line-height: 32px;
-      border-radius: 0;
-      width: 100%;
-      margin: 0;
-
-      &.antsomi-menu-item-selected {
-        font-weight: bold;
-
-        &:after {
-          content: '';
-          position: absolute;
-          left: 0;
-          top: 0;
-          width: 4px;
-          height: 100%;
-          background-color: #005fb8;
-        }
-      }
-    }
-  }
-`;