@antscorp/antsomi-ui 1.3.3-beta.64 → 1.3.3-beta.66

package/es/components/molecules/DatePicker/components/AdvancedPicker/AdvancedPicker.js

@@ -453,10 +453,7 @@ export const AdvancedPicker = props => {
                             const newDate = getNewDate(item, index);
                             setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(newDate).format(format) })));
                         } }, item)))))) : (React.createElement(React.Fragment, null,
-                    React.createElement(Select, { getPopupContainer: triggerNode => {
-                            console.log(triggerNode.parentNode);
-                            return triggerNode.parentNode;
-                        }, options: newCalculationTypes.map(({ label, value }) => ({
+                    React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newCalculationTypes.map(({ label, value }) => ({
                             value,
                             label: t(label),
                         })), value: option.calculationType.value, onChange: value => {
@@ -464,10 +461,7 @@ export const AdvancedPicker = props => {
                             onChangeOption({ calculationType });
                         } }),
                     React.createElement(InputNumber, { value: option.value, style: { width: '100%' }, min: 0, showHandler: false, onChange: value => onChangeOption({ value }) }),
-                    React.createElement(Select, { getPopupContainer: triggerNode => {
-                            console.log(triggerNode.parentNode);
-                            return triggerNode.parentNode;
-                        }, options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
+                    React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
                             const calculationDate = newCalculationDates.find(calculationDate => calculationDate.value === value);
                             onChangeOption({ calculationDate });
                         } }))),

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuCell/index.js

@@ -89,7 +89,7 @@ export const RichMenuCell = props => {
                 React.createElement("source", { src: videoUrl, type: "video/mp4" }))),
             previewImage && (videoState.status === 'idle' || isPreview) && (React.createElement(ThumbnailBox, null,
                 React.createElement(Image, { src: previewImage, alt: "thumbnail" }))),
-            (videoState.status === 'idle' || isPreview) && videoUrl && (React.createElement(VideoAction, null,
+            (videoState.status === 'idle' || isPreview) && videoUrl && (React.createElement(VideoAction, { className: "video-capture-action-ignore" },
                 React.createElement(ActionButton, { id: "video-capture-action-play", onClick: handleVideoPlay },
                     React.createElement(Icon, { type: "icon-ants-play-circle", size: 24, style: { width: 26, color: '#fff' } }),
                     isAddLabel && React.createElement(ActionButtonLabel, null, "Play")),

package/es/components/molecules/RichMenu/RichMenuBlock/RichMenuCell/styled.js

@@ -104,7 +104,7 @@ export const ThumbnailBox = styled.div `
 export const Image = styled.img `
   width: 100%;
   height: 100%;
-  object-fit: cover;
+  object-fit: contain;
 `;
 export const Link = styled.a `
   display: flex;

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 } = props;
+    const { accessInfo, 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 }) },
+    return (React.createElement(ShareAccessStateContext.Provider, { value: Object.assign(Object.assign({}, state), { accessUserId: userId, accessUserPermission: userPermission }) },
         React.createElement(ShareAccessDispatchContext.Provider, { value: dispatch },
             React.createElement(LayoutContent, Object.assign({}, props)))));
 };

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

@@ -16,7 +16,7 @@ const ROLE_BY_ACTIONS = {
 export const PeopleAccess = (props) => {
     const { allowChangeOnwership } = props;
     const { state, dispatch } = useShareAccess();
-    const { accessInfo, userAccess } = state;
+    const { accessInfo, accessUserId, accessUserPermission } = state;
     const handleClickAction = (actKey, updatedUserId) => {
         if (!accessInfo || !dispatch)
             return;
@@ -72,7 +72,12 @@ export const PeopleAccess = (props) => {
     return (React.createElement(StyledPeopleAccessRoot, null,
         React.createElement("div", { className: "title" }, "People with access"),
         React.createElement(List, { dataSource: accessInfo.listAccess, renderItem: access => {
-                const actions = getActionsByUser(userAccess === null || userAccess === void 0 ? void 0 : userAccess.userId, access.userId, accessInfo);
+                const actions = getActionsByUser({
+                    userId: accessUserId,
+                    updatedUserId: access.userId,
+                    objectAccessInfo: accessInfo,
+                    userPermission: accessUserPermission,
+                });
                 if (!allowChangeOnwership) {
                     remove(actions, act => act.key === PEOPLE_ACTION_KEYS.TO_OWNER);
                 }

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

@@ -67,3 +67,9 @@ export declare const GENERATE_DESCRIPTION: {
         [x: number]: string;
     };
 };
+export declare const MENU_PERMISSION: {
+    readonly NONE: 1;
+    readonly CREATED_BY_USER: 2;
+    readonly MANAGEMENT_BY_USER: 3;
+    readonly EVERYTHING: 4;
+};

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

@@ -87,3 +87,9 @@ export const GENERATE_DESCRIPTION = {
         [PUBLIC_ROLE.ONLY_VIEWER]: 'Only people with access can open this item.',
     },
 };
+export const MENU_PERMISSION = {
+    NONE: 1,
+    CREATED_BY_USER: 2,
+    MANAGEMENT_BY_USER: 3,
+    EVERYTHING: 4,
+};

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

@@ -1,11 +1,14 @@
 /// <reference types="react" />
 export declare const useShareAccess: () => {
     state: {
-        userAccess: import("../types").UserAccessInfo | undefined;
         allowEdit: boolean;
-        allowView: number | undefined;
+        allowView: boolean;
         accessInfo?: import("../types").ObjectAccessInfo | undefined;
         accessUserId?: number | undefined;
+        accessUserPermission?: {
+            view: number;
+            edit: number;
+        } | undefined;
         modalTransferOwnership: {
             open: boolean;
             userToOwnerShipId: number;

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

@@ -1,15 +1,27 @@
 import { useContext, useMemo } from 'react';
+import { MENU_PERMISSION } from '../constants';
 import { ShareAccessDispatchContext, ShareAccessStateContext } from '../context';
+import { composeObjectMenuPermissions } from '../utils';
 export const useShareAccess = () => {
-    var _a;
+    var _a, _b, _c;
     const state = useContext(ShareAccessStateContext);
     const dispatch = useContext(ShareAccessDispatchContext);
     if (!state) {
         throw new Error('useShareAccess must be used within a ShareAccessProvider');
     }
     const userAccess = useMemo(() => { var _a; return (_a = state.accessInfo) === null || _a === void 0 ? void 0 : _a.listAccess.find(access => access.userId === state.accessUserId); }, [state.accessUserId, (_a = state.accessInfo) === null || _a === void 0 ? void 0 : _a.listAccess]);
+    const { edit: allowEdit, view: allowView } = composeObjectMenuPermissions({
+        menuPermission: {
+            view: ((_b = state.accessUserPermission) === null || _b === void 0 ? void 0 : _b.view) || MENU_PERMISSION.NONE,
+            edit: ((_c = state.accessUserPermission) === null || _c === void 0 ? void 0 : _c.edit) || MENU_PERMISSION.NONE,
+        },
+        objectPermission: {
+            edit: !!(userAccess === null || userAccess === void 0 ? void 0 : userAccess.allowEdit),
+            view: !!(userAccess === null || userAccess === void 0 ? void 0 : userAccess.allowView),
+        },
+    });
     return {
-        state: Object.assign(Object.assign({}, state), { userAccess, allowEdit: !!(userAccess === null || userAccess === void 0 ? void 0 : userAccess.allowEdit), allowView: userAccess === null || userAccess === void 0 ? void 0 : userAccess.allowView }),
+        state: Object.assign(Object.assign({}, state), { allowEdit, allowView }),
         dispatch,
     };
 };

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

@@ -1 +1,3 @@
-export * from './ShareAccess';
+export { ShareAccess } from './ShareAccess';
+export * as Constants from './constants';
+export * as Utils from './utils';

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

@@ -1 +1,3 @@
-export * from './ShareAccess';
+export { ShareAccess } from './ShareAccess';
+export * as Constants from './constants';
+export * as Utils from './utils';

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

@@ -28,6 +28,10 @@ export type ObjectAccessInfo = {
 };
 export type ShareAccessProps = {
     userId?: number;
+    userPermission?: {
+        edit: number;
+        view: number;
+    };
     accessInfo?: ObjectAccessInfo;
     allowChangeOnwership?: boolean;
     getUserInfo?(search: string, signal: AbortSignal): Promise<UserInfo[]> | UserInfo[];
@@ -36,6 +40,10 @@ export type ShareAccessProps = {
 export type ShareAccessState = {
     accessInfo?: ObjectAccessInfo;
     accessUserId?: number;
+    accessUserPermission?: {
+        view: number;
+        edit: number;
+    };
     modalTransferOwnership: {
         open: boolean;
         userToOwnerShipId: number;

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

@@ -1,5 +1,27 @@
 import { ObjectAccessInfo } from './types';
-export declare const getActionsByUser: (userId?: number, updatedUserId?: number, objectAccessInfo?: ObjectAccessInfo) => ({
+export declare const mergePermission: (objectPermissionAllow: boolean, menuPermissionValue: number) => boolean;
+export declare const composeObjectMenuPermissions: (params: {
+    objectPermission: {
+        edit: boolean;
+        view: boolean;
+    };
+    menuPermission: {
+        edit: number;
+        view: number;
+    };
+}) => {
+    edit: boolean;
+    view: boolean;
+};
+export declare const getActionsByUser: (args: {
+    userId?: number;
+    userPermission?: {
+        view: number;
+        edit: number;
+    };
+    updatedUserId?: number;
+    objectAccessInfo?: ObjectAccessInfo;
+}) => ({
     readonly label: "Viewer";
     readonly key: "to_viewer";
 } | {

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

@@ -1,21 +1,51 @@
-import { PEOPLE_ACTIONS, PEOPLE_ACTION_KEYS, ROLE_MAPPING } from './constants';
+import { MENU_PERMISSION, PEOPLE_ACTIONS, PEOPLE_ACTION_KEYS, ROLE_MAPPING } from './constants';
 import { remove } from 'lodash';
-export const getActionsByUser = (userId, updatedUserId, objectAccessInfo) => {
+export const mergePermission = (objectPermissionAllow, menuPermissionValue) => {
+    const valueMapping = {
+        [`${MENU_PERMISSION.NONE}_false`]: false,
+        [`${MENU_PERMISSION.CREATED_BY_USER}_false`]: false,
+        [`${MENU_PERMISSION.MANAGEMENT_BY_USER}_false`]: false,
+        [`${MENU_PERMISSION.EVERYTHING}_false`]: true,
+        [`${MENU_PERMISSION.NONE}_true`]: false,
+        [`${MENU_PERMISSION.CREATED_BY_USER}_true`]: true,
+        [`${MENU_PERMISSION.MANAGEMENT_BY_USER}_true`]: true,
+        [`${MENU_PERMISSION.EVERYTHING}_true`]: true,
+    };
+    return !!valueMapping[`${menuPermissionValue}_${objectPermissionAllow}`];
+};
+export const composeObjectMenuPermissions = (params) => {
+    const { menuPermission, objectPermission } = params;
+    const edit = mergePermission(objectPermission.edit, menuPermission.edit);
+    const view = mergePermission(objectPermission.view, menuPermission.view);
+    return { edit, view };
+};
+export const getActionsByUser = (args) => {
+    const { userId, userPermission, updatedUserId, objectAccessInfo } = args;
     if (!userId || !updatedUserId || !objectAccessInfo)
         return [];
     const { ownerId } = objectAccessInfo;
     const user = objectAccessInfo.listAccess.find(access => access.userId === userId);
     const updatedUser = objectAccessInfo.listAccess.find(access => access.userId === updatedUserId);
-    if (!user || !updatedUser || !user.allowEdit || updatedUser.userId === ownerId)
+    const { edit: allowEdit } = composeObjectMenuPermissions({
+        objectPermission: {
+            view: !!(user === null || user === void 0 ? void 0 : user.allowView),
+            edit: !!(user === null || user === void 0 ? void 0 : user.allowEdit),
+        },
+        menuPermission: {
+            view: (userPermission === null || userPermission === void 0 ? void 0 : userPermission.view) || MENU_PERMISSION.NONE,
+            edit: (userPermission === null || userPermission === void 0 ? void 0 : userPermission.edit) || MENU_PERMISSION.NONE,
+        },
+    });
+    if (!user || !updatedUser || !allowEdit || updatedUser.userId === ownerId)
         return [];
     const actions = Object.values(PEOPLE_ACTION_KEYS);
-    if (user.userId !== ownerId) {
+    if (userId !== ownerId) {
         remove(actions, actKey => actKey === PEOPLE_ACTION_KEYS.TO_OWNER);
     }
-    if (user.allowEdit && updatedUser.role === ROLE_MAPPING.EDITOR) {
+    if (allowEdit && updatedUser.role === ROLE_MAPPING.EDITOR) {
         remove(actions, actKey => actKey === PEOPLE_ACTION_KEYS.TO_EDITOR);
     }
-    if (user.allowEdit && updatedUser.role === ROLE_MAPPING.VIEWER) {
+    if (allowEdit && updatedUser.role === ROLE_MAPPING.VIEWER) {
         remove(actions, actKey => actKey === PEOPLE_ACTION_KEYS.TO_VIEWER);
     }
     return actions.map(actKey => PEOPLE_ACTIONS[actKey]);

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

@@ -18,10 +18,9 @@ export { IconSelection } from './IconSelection';
 export { IconSelectionRenderer } from './IconSelection/components/Icon';
 export { AlignSetting } from './AlignSetting';
 export { EdgeSetting } from './EdgeSetting';
-export { ShareAccess } from './ShareAccess';
+export { ShareAccess, Constants as ShareAccessConstants, Utils as ShareAccessUtils, } from './ShareAccess';
 export { Collapse } from './Collapse';
 export { TreeSelect } from './TreeSelect';
-export { Result } from './Result';
 export { Card } from './Card';
 export { InputNumberWithUnit } from './InputNumberWithUnit';
 export { GradientSetting } from './GradientSetting';

package/es/components/molecules/index.js

@@ -18,10 +18,9 @@ export { IconSelection } from './IconSelection';
 export { IconSelectionRenderer } from './IconSelection/components/Icon';
 export { AlignSetting } from './AlignSetting';
 export { EdgeSetting } from './EdgeSetting';
-export { ShareAccess } from './ShareAccess';
+export { ShareAccess, Constants as ShareAccessConstants, Utils as ShareAccessUtils, } from './ShareAccess';
 export { Collapse } from './Collapse';
 export { TreeSelect } from './TreeSelect';
-export { Result } from './Result';
 export { Card } from './Card';
 export { InputNumberWithUnit } from './InputNumberWithUnit';
 export { GradientSetting } from './GradientSetting';

package/es/locales/en/translation.json

@@ -14,8 +14,8 @@
             "firstDayOfMonth": "First day of this month",
             "firstDayOfQuarter": "First day of this quarter",
             "firstDayOfYear": "First day of this year",
-            "lastDayOfWeekMonSun": "First day of this week (Mon - Sun)",
-            "lastDayOfWeekSunSat": "First day of this week (Sun - Sat)",
+            "lastDayOfWeekMonSun": "Last day of this week (Mon - Sun)",
+            "lastDayOfWeekSunSat": "Last day of this week (Sun - Sat)",
             "lastDayOfMonth": "Last day of this month",
             "lastDayOfQuarter": "Last day of this quarter",
             "lastDayOfYear": "Last day of this year",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.3-beta.64",
+  "version": "1.3.3-beta.66",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -93,7 +93,6 @@
   "devDependencies": {
     "@ant-design/cssinjs": "^1.6.2",
     "@antscorp/eslint-config-antsomi": "1.0.4",
-    "@antscorp/icons": "0.27.4",
     "@babel/cli": "^7.23.4",
     "@babel/core": "^7.21.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",