@antscorp/antsomi-ui 1.3.5-beta.76 → 1.3.5-beta.77

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

@@ -5,7 +5,7 @@ import { LayoutContent } from './components';
 import { shareAccessReducer } from './reducer';
 import { updateObjAccessInfo } from './actions';
 export const ShareAccess = (props) => {
-    const { accessInfo, userId, onChange, userPermission } = props;
+    const { accessInfo, excludeUserAccess, userId, onChange, userPermission } = props;
     const [state, dispatch] = useReducer(shareAccessReducer(onChange), {
         modalTransferOwnership: {
             open: false,
@@ -17,7 +17,7 @@ export const ShareAccess = (props) => {
             return;
         dispatch(updateObjAccessInfo(accessInfo));
     }, [accessInfo]);
-    return (React.createElement(ShareAccessStateContext.Provider, { value: Object.assign(Object.assign({}, state), { accessUserId: userId, accessUserPermission: userPermission }) },
+    return (React.createElement(ShareAccessStateContext.Provider, { value: Object.assign(Object.assign({}, state), { excludeUserAccess, accessUserId: userId, accessUserPermission: userPermission }) },
         React.createElement(ShareAccessDispatchContext.Provider, { value: dispatch },
             React.createElement(LayoutContent, Object.assign({}, props)))));
 };

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

@@ -6,14 +6,14 @@ import { PeopleAccess } from '../PeopleAccess';
 import { SearchUser } from '../SearchUser';
 import { StyledLayoutContentRoot } from './styled';
 export const LayoutContent = (props) => {
-    const { getUserInfo, allowChangeOnwership = true, allowAddUser = true } = props;
+    const { getUserInfo, excludeUserAccess, allowAddUser = true } = props;
     const { state } = useShareAccess();
     const { allowEdit, allowView } = state;
     if (!allowEdit && !allowView)
         return null;
     return (React.createElement(StyledLayoutContentRoot, null,
         allowAddUser && React.createElement(SearchUser, { getUserInfo: getUserInfo }),
-        React.createElement(PeopleAccess, { allowChangeOnwership: allowChangeOnwership }),
+        React.createElement(PeopleAccess, { excludeUserAccess: excludeUserAccess }),
         React.createElement(GeneralAccess, null),
         React.createElement(ModalTransferOwnership, null)));
 };

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ShareAccessProps } from '../../types';
-type PeopleAccessProps = Pick<ShareAccessProps, 'allowChangeOnwership'>;
+type PeopleAccessProps = Pick<ShareAccessProps, 'excludeUserAccess'>;
 export declare const PeopleAccess: (props: PeopleAccessProps) => React.JSX.Element | null;
 export {};

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

@@ -14,7 +14,7 @@ const ROLE_BY_ACTIONS = {
     [PEOPLE_ACTION_KEYS.TO_VIEWER]: ROLE_MAPPING.VIEWER,
 };
 export const PeopleAccess = (props) => {
-    const { allowChangeOnwership } = props;
+    const { excludeUserAccess } = props;
     const { state, dispatch } = useShareAccess();
     const { accessInfo, accessUserId, accessUserPermission } = state;
     const handleClickAction = (actKey, updatedUserId) => {
@@ -54,9 +54,10 @@ export const PeopleAccess = (props) => {
     };
     const renderActionItems = (actions) => {
         let hasDivider = false;
-        return actions.flatMap(act => {
+        return actions.flatMap((act, idx) => {
             const items = [];
-            const needDivider = PEOPLE_ACTION_KEYS.REMOVE_ACCESS === act.key || PEOPLE_ACTION_KEYS.TO_OWNER === act.key;
+            const needDivider = (PEOPLE_ACTION_KEYS.REMOVE_ACCESS === act.key || PEOPLE_ACTION_KEYS.TO_OWNER === act.key) &&
+                actions[idx - 1];
             if (needDivider && !hasDivider) {
                 items.push({ type: 'divider' });
                 items.push({ key: act.key, label: act.label });
@@ -78,8 +79,8 @@ export const PeopleAccess = (props) => {
                     objectAccessInfo: accessInfo,
                     userPermission: accessUserPermission,
                 });
-                if (!allowChangeOnwership) {
-                    remove(actions, act => act.key === PEOPLE_ACTION_KEYS.TO_OWNER);
+                if (excludeUserAccess) {
+                    remove(actions, act => excludeUserAccess.includes(act.key));
                 }
                 return (React.createElement(List.Item, null,
                     React.createElement(Avatar, { src: access.avatar }),

package/es/components/molecules/ShareAccess/hooks/useShareAccess.d.ts

@@ -9,6 +9,7 @@ export declare const useShareAccess: () => {
             view: number;
             edit: number;
         } | undefined;
+        excludeUserAccess?: import("../types").ExcludeUserAccess | undefined;
         modalTransferOwnership: {
             open: boolean;
             userToOwnerShipId: number;

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

@@ -1,4 +1,5 @@
 import { updateModalTransferOwnership, updateObjAccessInfo } from './actions';
+import { PEOPLE_ACTION_KEYS } from './constants';
 export type UserInfo = {
     avatar: string;
     full_name: string;
@@ -27,6 +28,7 @@ export type ObjectAccessInfo = {
     ownerId: number;
     listAccess: UserAccessInfo[];
 };
+export type ExcludeUserAccess = Array<(typeof PEOPLE_ACTION_KEYS)[keyof typeof PEOPLE_ACTION_KEYS]>;
 export type ShareAccessProps = {
     userId?: number;
     userPermission?: {
@@ -35,7 +37,7 @@ export type ShareAccessProps = {
     };
     accessInfo?: ObjectAccessInfo;
     allowAddUser?: boolean;
-    allowChangeOnwership?: boolean;
+    excludeUserAccess?: ExcludeUserAccess;
     getUserInfo?(search: string, signal: AbortSignal): Promise<UserInfo[]> | UserInfo[];
     onChange?: (accessInfo: ObjectAccessInfo) => void;
 };
@@ -46,6 +48,7 @@ export type ShareAccessState = {
         view: number;
         edit: number;
     };
+    excludeUserAccess?: ExcludeUserAccess;
     modalTransferOwnership: {
         open: boolean;
         userToOwnerShipId: number;

package/package.json

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