@antscorp/antsomi-ui 1.3.5-beta.492 → 1.3.5-beta.494

package/es/components/molecules/EditableName/EditableName.js

@@ -70,6 +70,9 @@ export const EditableName = React.forwardRef((props, ref) => {
         (error || requiredError) && !isLoading ? (React.createElement("div", { className: "suffix-icon-error" },
             React.createElement(Tooltip, { title: error || requiredError },
                 React.createElement(Icon, { type: "icon-ants-warning-circle", style: { color: '#F44336', fontSize: '19.2px' } })))) : readonly ? null : (React.createElement("div", { className: "suffix-icon" },
-            React.createElement(Icon, { type: "icon-ants-pencil", style: { color: (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.blue7, fontSize: '24px' } }))),
+            React.createElement(Icon, { type: "icon-ants-pencil", style: { color: (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.blue7, fontSize: '24px' }, onClick: () => {
+                    var _a;
+                    (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+                } }))),
         React.createElement("span", { ref: spanRef, className: "hidden-span" })));
 });

package/es/components/molecules/ShareAccess/ShareAccess.js

@@ -5,7 +5,7 @@ import { LayoutContent } from './components';
 import { shareAccessReducer } from './reducer';
 import { updateObjAccessInfo } from './actions';
 import { useDeepCompareEffect } from '@antscorp/antsomi-ui/es/hooks/useDeepCompareEffect';
-import { formattedAccessInfo } from './utils';
+import { safeParseAccessInfo } from './utils';
 export const ShareAccess = (props) => {
     const { accessInfo, excludeUserAccess, userId, onChange, userPermission } = props;
     const [state, dispatch] = useReducer(shareAccessReducer(onChange), {
@@ -18,7 +18,7 @@ export const ShareAccess = (props) => {
         if (!accessInfo)
             return;
         dispatch(updateObjAccessInfo({
-            updated: formattedAccessInfo(accessInfo),
+            updated: safeParseAccessInfo(accessInfo),
             triggerOut: false,
         }));
     }, [accessInfo]);

package/es/components/molecules/ShareAccess/types.d.ts

@@ -1,25 +1,25 @@
 import { updateModalTransferOwnership, updateObjAccessInfo } from './actions';
 import { PEOPLE_ACTION_KEYS } from './constants';
 export type UserInfo = {
-    avatar: string;
-    full_name: string;
-    email: string;
     user_id: number;
-    user_name: string;
-    user_type: number;
-    ctime: Date;
-    utime: Date;
+    avatar?: string;
+    full_name?: string;
+    email?: string;
+    user_name?: string;
+    user_type?: number;
+    ctime?: Date;
+    utime?: Date;
     [key: string]: any;
 };
 export type UserAccessInfo = {
     userId: number;
-    fullName?: string;
-    email?: string;
-    avatar?: string;
     role: number;
     allowView: number;
     allowEdit: number;
     allowComment: number;
+    fullName?: string;
+    email?: string;
+    avatar?: string;
     [key: string]: any;
 };
 export type ObjectAccessInfo = {

package/es/components/molecules/ShareAccess/utils.d.ts

@@ -15,6 +15,7 @@ export declare const composeObjectMenuPermissions: (params: {
     edit: boolean;
     view: boolean;
 };
+export declare const getOwnerIdFromAccessInfo: (accessInfo: ObjectAccessInfo) => number | undefined;
 export declare const getActionsByUser: (args: {
     userId?: number;
     userPermission?: {
@@ -37,17 +38,17 @@ export declare const getActionsByUser: (args: {
     readonly key: "remove_acess";
 })[];
 export declare const initAccessInfoDefault: (userInfo: Partial<UserInfo>) => ObjectAccessInfo;
-export declare const formattedAccessInfo: (accessInfo: ObjectAccessInfo) => {
+export declare const safeParseAccessInfo: (accessInfo: ObjectAccessInfo) => {
     ownerId: number;
     listAccess: {
         userId: number;
-        fullName?: string | undefined;
-        email?: string | undefined;
-        avatar?: string | undefined;
         role: number;
         allowView: number;
         allowEdit: number;
         allowComment: number;
+        fullName?: string | undefined;
+        email?: string | undefined;
+        avatar?: string | undefined;
     }[];
     isPublic: number;
     publicRole: number | null;

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

@@ -23,6 +23,16 @@ export const composeObjectMenuPermissions = (params) => {
         view: view || (isPublic && publicRole === PUBLIC_ROLE.ONLY_VIEWER),
     };
 };
+export const getOwnerIdFromAccessInfo = (accessInfo) => {
+    const { ownerId } = accessInfo;
+    if (!ownerId) {
+        const ownerInfo = accessInfo.listAccess.find(member => +member.role === ROLE_MAPPING.OWNER);
+        if (!ownerInfo)
+            return;
+        return ownerInfo.userId;
+    }
+    return ownerId;
+};
 export const getActionsByUser = (args) => {
     const { userId, userPermission, updatedUserId, objectAccessInfo } = args;
     if (!userId || !updatedUserId || !objectAccessInfo)
@@ -64,9 +74,10 @@ export const initAccessInfoDefault = (userInfo) => ({
     publicRole: PUBLIC_ROLE.ONLY_VIEWER,
     isPublic: 0,
 });
-export const formattedAccessInfo = (accessInfo) => {
+export const safeParseAccessInfo = (accessInfo) => {
     var _a;
-    return (Object.assign(Object.assign({}, accessInfo), { ownerId: +((accessInfo === null || accessInfo === void 0 ? void 0 : accessInfo.ownerId) || -1), listAccess: (_a = accessInfo === null || accessInfo === void 0 ? void 0 : accessInfo.listAccess) === null || _a === void 0 ? void 0 : _a.map(user => (Object.assign(Object.assign({}, user), { userId: +user.userId }))) }));
+    const ownerId = getOwnerIdFromAccessInfo(accessInfo);
+    return Object.assign(Object.assign({}, accessInfo), { ownerId: +(ownerId || -1), listAccess: (_a = accessInfo === null || accessInfo === void 0 ? void 0 : accessInfo.listAccess) === null || _a === void 0 ? void 0 : _a.map(user => (Object.assign(Object.assign({}, user), { userId: +user.userId }))) });
 };
 export const mappingOutData = (shareAccess) => {
     const result = Object.assign({}, shareAccess);

package/es/components/organism/DataTable/components/Toolbar/SearchPopover.js

@@ -9,7 +9,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { Link } from 'react-router-dom';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import clsx from 'clsx';
@@ -19,7 +18,7 @@ import { EmptyData } from '@antscorp/antsomi-ui/es/components/molecules';
 // Constants
 import { globalToken } from '@antscorp/antsomi-ui/es/constants';
 // Hooks
-import { useDeepCompareMemo } from '@antscorp/antsomi-ui/es/hooks';
+import { useCustomRouter, useDeepCompareMemo } from '@antscorp/antsomi-ui/es/hooks';
 // Utils
 import { searchStringQuery } from '@antscorp/antsomi-ui/es/utils';
 import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
@@ -51,6 +50,8 @@ const StyledContent = styled.div `
 `;
 export const SearchPopover = props => {
     const { children, objectName, searchList, isClientSearch, loading, isAddFilterFromSearchItem, searchItemProps, onAddFilter = () => { }, onSearch = () => { }, onClick = () => { }, onClickSearchItem, itemSearchRender } = props, restProps = __rest(props, ["children", "objectName", "searchList", "isClientSearch", "loading", "isAddFilterFromSearchItem", "searchItemProps", "onAddFilter", "onSearch", "onClick", "onClickSearchItem", "itemSearchRender"]);
+    // Hooks
+    const { navigate } = useCustomRouter();
     // State
     const [state, setState] = useState({
         searchValue: '',
@@ -73,9 +74,12 @@ export const SearchPopover = props => {
             const { id, label, link, icon } = searchItem;
             const Label = (React.createElement(React.Fragment, null,
                 icon && React.createElement(IconWrapper, null, icon),
-                React.createElement(Typography.Text, Object.assign({ ellipsis: { tooltip: label } }, searchItemProps, { className: clsx(`${link ? 'text-link' : ''}`, searchItemProps === null || searchItemProps === void 0 ? void 0 : searchItemProps.className) }), link && !itemSearchRender && !onClickSearchItem && !isAddFilterFromSearchItem ? (React.createElement(Link, { to: link }, label)) : (label))));
+                React.createElement(Typography.Text, Object.assign({ ellipsis: { tooltip: label } }, searchItemProps, { className: clsx(`${link ? 'text-link' : ''}`, searchItemProps === null || searchItemProps === void 0 ? void 0 : searchItemProps.className) }), label)));
             return (React.createElement(StyledSearchItem, { key: id, align: "center", gap: 6, onClick: () => {
                     onClick(searchItem, index);
+                    if (link && !itemSearchRender && !onClickSearchItem && !isAddFilterFromSearchItem) {
+                        navigate(link);
+                    }
                     setState(prev => (Object.assign(Object.assign({}, prev), { isOpenPopover: false })));
                 } }, itemSearchRender ? itemSearchRender(searchItem, index, Label) : Label));
         });

package/package.json

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