@antscorp/antsomi-ui 1.3.7-beta.65 → 1.3.7-beta.67

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

@@ -18,6 +18,7 @@ import SearchIcon from './icons/search';
 import { InnerCardStyled, InputSearchStyled, PackageSharingStyled, TriggerPopoverStyled, } from './styled';
 // Utils
 import { formatUserId, getObjectPropSafely, removeAppCookieSessionSubdomain, removeAppCookieSessionSubdomainPrefix, setCookieSession, } from '@antscorp/antsomi-ui/es/utils';
+import { createCrossSubdomainCookieOptions } from '@antscorp/antsomi-ui/es/utils/crossSubdomainCookieOptions';
 import { translate } from './utils';
 import Icon from '@antscorp/icons';
 import { useDebounce } from '@antscorp/antsomi-ui/es/hooks/useDebounceV2';
@@ -364,7 +365,6 @@ export const AccountSharing = props => {
         if (postParam.error && postParam.error !== '')
             return;
         const newUrlObj = urlDomain(selectedNetworkRef?.current?.homePage);
-        const arrTmp = newUrlObj.hostname.split('.');
         if (postParam.action === 'ogs-authenticate') {
             const loginData = { ...postParam };
             if (loginData.full_name) {
@@ -398,34 +398,11 @@ export const AccountSharing = props => {
                     prefix = u_ogs.slice(0, index);
                 }
                 const newU_ogs = prefix + selectedNetworkRef?.current?.networkId;
-                if (newUrlObj.protocol !== 'https:') {
-                    if (arrTmp.length < 4) {
-                        setCookie(newU_ogs, JSON.stringify(loginData), {
-                            domain: arrTmp.slice(-2).join('.'),
-                            path: '/; samesite=None',
-                        });
-                    }
-                    else {
-                        setCookie(newU_ogs, JSON.stringify(loginData), {
-                            domain: arrTmp.slice(-3).join('.'),
-                            path: '/; samesite=None',
-                        });
-                    }
-                }
-                else {
-                    if (arrTmp.length < 4) {
-                        setCookie(newU_ogs, JSON.stringify(loginData), {
-                            domain: arrTmp.slice(-2).join('.'),
-                            path: '/; samesite=None; secure',
-                        });
-                    }
-                    else {
-                        setCookie(newU_ogs, JSON.stringify(loginData), {
-                            domain: arrTmp.slice(-3).join('.'),
-                            path: '/; samesite=None; secure',
-                        });
-                    }
-                }
+                const cookieOptions = createCrossSubdomainCookieOptions({
+                    hostname: newUrlObj.hostname,
+                    protocol: newUrlObj.protocol,
+                });
+                setCookie(newU_ogs, JSON.stringify(loginData), cookieOptions);
             }
         }
         if (portalRedirectUrl) {

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

@@ -59,21 +59,21 @@ export const LeftMenuComponent = memo(props => {
         const isActive = activeAppCode === menu_item_code;
         const isHover = state.hoverItem === menu_item_code;
         let Label = null;
-        Label = (_jsxs("li", { role: "menuitem", className: classNames({ isActive, isHover }), children: [renderMenuIcon(component_icon_name || icon_name || ''), _jsx(Typography.Text, { children: menu_item_name }), showMenuPopover && _jsx("div", { className: "popup-triangle" })] }));
+        Label = (_jsxs("li", { role: "menuitem", className: classNames('menu_item', { isActive, isHover }), children: [renderMenuIcon(component_icon_name || icon_name || ''), _jsx(Typography.Text, { ellipsis: { tooltip: menu_item_name }, children: menu_item_name }), showMenuPopover && _jsx("div", { className: "popup-triangle" })] }));
         return (_jsx(FeatureMenuItem, { onClick: () => onClickFeatureMenuItem(item), onMouseEnter: () => onMouseEnter(menu_item_code), children: Label }, menu_item));
     }, [activeAppCode, state.hoverItem, showMenuPopover, onMouseEnter, onClickFeatureMenuItem]);
     const renderRecommendationMenuItem = useCallback((item) => {
         const { menu_item_name, menu_item, component_icon_name, icon_name, permission_code } = item;
         const isActive = customActiveAppKey === permission_code;
         const isHover = state.hoverItem === permission_code;
-        const renderLabel = () => (_jsxs("li", { role: "menuitem", className: classNames({ isActive, isHover }), onClick: () => onMenuItemClick?.(permission_code || 'null', [permission_code || 'null']), children: [renderMenuIcon(component_icon_name || icon_name || ''), _jsx(Typography.Text, { children: menu_item_name })] }));
+        const renderLabel = () => (_jsxs("li", { role: "menuitem", className: classNames('menu_item', { isActive, isHover }), onClick: () => onMenuItemClick?.(permission_code || 'null', [permission_code || 'null']), children: [renderMenuIcon(component_icon_name || icon_name || ''), _jsx(Typography.Text, { ellipsis: { tooltip: menu_item_name }, children: menu_item_name })] }));
         return (_jsx(FeatureMenuItem, { onMouseEnter: () => onMouseEnter(permission_code || 'null'), children: renderLabel() }, menu_item));
     }, [customActiveAppKey, onMenuItemClick, onMouseEnter, state.hoverItem]);
     const renderCustomizedMenuItems = useCallback((items) => items?.map(item => {
         const { key, icon, label } = item;
         const isActive = key === customActiveAppKey;
         const isHover = key === state.hoverItem;
-        return (_jsx(FeatureMenuItem, { onClick: () => onMenuItemClick?.(key, [key]), onMouseEnter: () => onMouseEnter(key), children: _jsxs("li", { role: "menuitem", className: classNames({ isActive, isHover }), children: [renderMenuIcon(icon || ''), _jsx(Typography.Text, { children: label }), showMenuPopover && _jsx("div", { className: "popup-triangle" })] }) }, key));
+        return (_jsx(FeatureMenuItem, { onClick: () => onMenuItemClick?.(key, [key]), onMouseEnter: () => onMouseEnter(key), children: _jsxs("li", { role: "menuitem", className: classNames('menu_item', { isActive, isHover }), children: [renderMenuIcon(icon || ''), _jsx(Typography.Text, { ellipsis: { tooltip: label }, children: label }), showMenuPopover && _jsx("div", { className: "popup-triangle" })] }) }, key));
     }), [customActiveAppKey, state.hoverItem, showMenuPopover, onMenuItemClick, onMouseEnter]);
     const renderAppMenuItems = useCallback(() => type === 'customization'
         ? renderCustomizedMenuItems(items)

package/es/components/organism/LeftMenu/styled.js

@@ -163,6 +163,8 @@ export const FeatureMenuItem = styled.div `
       font-size: 11px !important;
       font-weight: 500;
       color: inherit;
+      width: 100%;
+      text-align: center;
     }
 
     .menu-item__icon {

package/es/components/organism/Login/Login.js

@@ -17,6 +17,7 @@ import { LoginSelectPortal, LoginWithGG, SignIn, VerifyAccount, SetupGGAuthentic
 import { useContainerDimensions } from './hooks';
 // Utils
 import { checkURL, navigateTo } from './utils';
+import { createCrossSubdomainCookieOptions } from '@antscorp/antsomi-ui/es/utils/crossSubdomainCookieOptions';
 import { LOGIN_METHODS, STEPS } from './constants';
 import { LoginBannerZone, LoginMain, WrapperLogin } from './styled';
 export const Login = props => {
@@ -439,7 +440,6 @@ export const Login = props => {
         if (postParam.error && postParam.error !== '') {
         }
         else {
-            const arrTmp = window.location.hostname.split('.');
             if (postParam.action === 'ogs-authenticate') {
                 const loginData = { ...postParam, type: 'all_account' };
                 if (loginData.hasOwnProperty('full_name')) {
@@ -463,38 +463,12 @@ export const Login = props => {
                         ? u_ogs
                         : `${u_ogs}_${selectedNetworkRef.current?.networkId}`;
                     const maxAge = 30 * 24 * 3600;
-                    if (window.location.protocol !== 'https:') {
-                        if (arrTmp.length < 4) {
-                            setCookie(cookieKey, JSON.stringify(loginData), {
-                                domain: arrTmp.slice(-2).join('.'),
-                                path: '/; samesite=None',
-                                maxAge,
-                            });
-                        }
-                        else {
-                            setCookie(cookieKey, JSON.stringify(loginData), {
-                                domain: arrTmp.slice(-3).join('.'),
-                                path: '/; samesite=None',
-                                maxAge,
-                            });
-                        }
-                    }
-                    else {
-                        if (arrTmp.length < 4) {
-                            setCookie(cookieKey, JSON.stringify(loginData), {
-                                domain: arrTmp.slice(-2).join('.'),
-                                path: '/; samesite=None; secure',
-                                maxAge,
-                            });
-                        }
-                        else {
-                            setCookie(cookieKey, JSON.stringify(loginData), {
-                                domain: arrTmp.slice(-3).join('.'),
-                                path: '/; samesite=None; secure',
-                                maxAge,
-                            });
-                        }
-                    }
+                    const cookieOptions = createCrossSubdomainCookieOptions({
+                        hostname: window.location.hostname,
+                        protocol: window.location.protocol,
+                        maxAge,
+                    });
+                    setCookie(cookieKey, JSON.stringify(loginData), cookieOptions);
                 }
             }
             if (doPostEvent) {

package/es/utils/crossSubdomainCookieOptions.d.ts

@@ -0,0 +1,14 @@
+interface CrossSubdomainCookieOptionsInput {
+    hostname: string;
+    protocol: string;
+    maxAge?: number;
+}
+export interface CrossSubdomainCookieOptions {
+    domain: string;
+    path: '/';
+    sameSite: 'none';
+    secure?: true;
+    maxAge?: number;
+}
+export declare function createCrossSubdomainCookieOptions({ hostname, protocol, maxAge, }: CrossSubdomainCookieOptionsInput): CrossSubdomainCookieOptions;
+export {};

package/es/utils/crossSubdomainCookieOptions.js

@@ -0,0 +1,12 @@
+export function createCrossSubdomainCookieOptions({ hostname, protocol, maxAge, }) {
+    const hostnameParts = hostname.split('.');
+    return {
+        domain: hostnameParts.length < 4
+            ? hostnameParts.slice(-2).join('.')
+            : hostnameParts.slice(-3).join('.'),
+        path: '/',
+        sameSite: 'none',
+        ...(protocol === 'https:' && { secure: true }),
+        ...(maxAge !== undefined && { maxAge }),
+    };
+}

package/package.json

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