@antscorp/antsomi-ui 1.3.3-beta.68 → 1.3.3-beta.69

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

@@ -3,7 +3,7 @@ import { Dropdown } from 'antd';
 import produce from 'immer';
 import React from 'react';
 import { updateObjAccessInfo } from '../../actions';
-import { GENERAL_ACCESS, GENERATE_DESCRIPTION, PUBLIC_ROLE, ROLE_ACCESS_LABEL, } from '../../constants';
+import { GENERAL_ACCESS, PUBLIC_ROLE, ROLE_ACCESS_LABEL } from '../../constants';
 import { useShareAccess } from '../../hooks';
 import { StyledGeneralAccessRoot } from './styled';
 export const GeneralAccess = () => {
@@ -31,6 +31,16 @@ export const GeneralAccess = () => {
         });
         dispatch(updateObjAccessInfo(updated));
     };
+    const renderDescription = () => {
+        let description = 'Only people with access can open this item.';
+        if (isPublic && publicRole === PUBLIC_ROLE.ONLY_VIEWER) {
+            description = 'Anyone on the portal can view this item.';
+        }
+        if (isPublic && publicRole === PUBLIC_ROLE.ONLY_EDITOR) {
+            description = 'Anyone on the portal can edit this item.';
+        }
+        return description;
+    };
     return (React.createElement(StyledGeneralAccessRoot, null,
         React.createElement("div", { className: "title" }, "General access"),
         React.createElement("div", { className: "setting" },
@@ -47,8 +57,8 @@ export const GeneralAccess = () => {
                     React.createElement("div", { className: "general-dropdown-wrapper" },
                         React.createElement("div", { className: "accessable-title" }, isPublic ? 'Public' : 'Restricted'),
                         allowEdit && React.createElement(Icon, { className: "icon-angle", type: "icon-ants-angle-down" }))),
-                React.createElement("div", { className: "description" }, GENERATE_DESCRIPTION[isPublic][publicRole])),
-            !!isPublic && (React.createElement(Dropdown, { placement: "bottomLeft", trigger: ['click'], destroyPopupOnHide: true, disabled: !allowEdit, menu: {
+                React.createElement("div", { className: "description" }, renderDescription())),
+            !!isPublic && publicRole && (React.createElement(Dropdown, { placement: "bottomLeft", trigger: ['click'], destroyPopupOnHide: true, disabled: !allowEdit, menu: {
                     items: [
                         publicRole === PUBLIC_ROLE.ONLY_VIEWER
                             ? {

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ShareAccessProps } from '../../types';
-export declare const LayoutContent: (props: ShareAccessProps) => React.JSX.Element;
+export declare const LayoutContent: (props: ShareAccessProps) => React.JSX.Element | null;

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useShareAccess } from '../../hooks';
 import { GeneralAccess } from '../GeneralAccess';
 import { ModalTransferOwnership } from '../ModalTransferOwnerShip/ModalTransferOwnerShip';
 import { PeopleAccess } from '../PeopleAccess';
@@ -6,6 +7,10 @@ import { SearchUser } from '../SearchUser';
 import { StyledLayoutContentRoot } from './styled';
 export const LayoutContent = (props) => {
     const { getUserInfo, allowChangeOnwership = true } = props;
+    const { state } = useShareAccess();
+    const { allowEdit, allowView } = state;
+    if (!allowEdit && !allowView)
+        return null;
     return (React.createElement(StyledLayoutContentRoot, null,
         React.createElement(SearchUser, { getUserInfo: getUserInfo }),
         React.createElement(PeopleAccess, { allowChangeOnwership: allowChangeOnwership }),

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

@@ -59,14 +59,6 @@ export declare const GENERAL_ACTIONS: {
         readonly label: "Restricted";
     };
 };
-export declare const GENERATE_DESCRIPTION: {
-    1: {
-        [x: number]: string;
-    };
-    0: {
-        [x: number]: string;
-    };
-};
 export declare const MENU_PERMISSION: {
     readonly NONE: 1;
     readonly CREATED_BY_USER: 2;

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

@@ -77,16 +77,6 @@ export const GENERAL_ACTIONS = {
         label: 'Restricted',
     },
 };
-export const GENERATE_DESCRIPTION = {
-    [GENERAL_ACCESS.PUBLIC]: {
-        [PUBLIC_ROLE.ONLY_EDITOR]: 'Anyone on the portal can edit this item.',
-        [PUBLIC_ROLE.ONLY_VIEWER]: 'Anyone on the portal can view this item.',
-    },
-    [GENERAL_ACCESS.RESTRICTED]: {
-        [PUBLIC_ROLE.ONLY_EDITOR]: 'Only people with access can open this item.',
-        [PUBLIC_ROLE.ONLY_VIEWER]: 'Only people with access can open this item.',
-    },
-};
 export const MENU_PERMISSION = {
     NONE: 1,
     CREATED_BY_USER: 2,

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

@@ -3,7 +3,7 @@ import { MENU_PERMISSION } from '../constants';
 import { ShareAccessDispatchContext, ShareAccessStateContext } from '../context';
 import { composeObjectMenuPermissions } from '../utils';
 export const useShareAccess = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const state = useContext(ShareAccessStateContext);
     const dispatch = useContext(ShareAccessDispatchContext);
     if (!state) {
@@ -11,9 +11,11 @@ export const useShareAccess = () => {
     }
     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({
+        isPublic: !!((_b = state.accessInfo) === null || _b === void 0 ? void 0 : _b.isPublic),
+        publicRole: ((_c = state.accessInfo) === null || _c === void 0 ? void 0 : _c.publicRole) || null,
         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,
+            view: ((_d = state.accessUserPermission) === null || _d === void 0 ? void 0 : _d.view) || MENU_PERMISSION.NONE,
+            edit: ((_e = state.accessUserPermission) === null || _e === void 0 ? void 0 : _e.edit) || MENU_PERMISSION.NONE,
         },
         objectPermission: {
             edit: !!(userAccess === null || userAccess === void 0 ? void 0 : userAccess.allowEdit),

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

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

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

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

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

@@ -22,7 +22,7 @@ export type UserAccessInfo = {
 };
 export type ObjectAccessInfo = {
     isPublic: number;
-    publicRole: number;
+    publicRole: number | null;
     ownerId: number;
     listAccess: UserAccessInfo[];
 };

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

@@ -1,6 +1,8 @@
 import { ObjectAccessInfo } from './types';
 export declare const mergePermission: (objectPermissionAllow: boolean, menuPermissionValue: number) => boolean;
 export declare const composeObjectMenuPermissions: (params: {
+    isPublic: boolean;
+    publicRole: number | null;
     objectPermission: {
         edit: boolean;
         view: boolean;

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

@@ -1,4 +1,4 @@
-import { MENU_PERMISSION, PEOPLE_ACTIONS, PEOPLE_ACTION_KEYS, ROLE_MAPPING } from './constants';
+import { MENU_PERMISSION, PEOPLE_ACTIONS, PEOPLE_ACTION_KEYS, PUBLIC_ROLE, ROLE_MAPPING, } from './constants';
 import { remove } from 'lodash';
 export const mergePermission = (objectPermissionAllow, menuPermissionValue) => {
     const valueMapping = {
@@ -14,19 +14,24 @@ export const mergePermission = (objectPermissionAllow, menuPermissionValue) => {
     return !!valueMapping[`${menuPermissionValue}_${objectPermissionAllow}`];
 };
 export const composeObjectMenuPermissions = (params) => {
-    const { menuPermission, objectPermission } = params;
+    const { menuPermission, objectPermission, isPublic, publicRole } = params;
     const edit = mergePermission(objectPermission.edit, menuPermission.edit);
     const view = mergePermission(objectPermission.view, menuPermission.view);
-    return { edit, view };
+    return {
+        edit: edit || (isPublic && publicRole === PUBLIC_ROLE.ONLY_EDITOR),
+        view: view || (isPublic && publicRole === PUBLIC_ROLE.ONLY_VIEWER),
+    };
 };
 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);
+    const { ownerId, listAccess, publicRole, isPublic } = objectAccessInfo;
+    const user = listAccess.find(access => access.userId === userId);
+    const updatedUser = listAccess.find(access => access.userId === updatedUserId);
     const { edit: allowEdit } = composeObjectMenuPermissions({
+        isPublic: !!isPublic,
+        publicRole,
         objectPermission: {
             view: !!(user === null || user === void 0 ? void 0 : user.allowView),
             edit: !!(user === null || user === void 0 ? void 0 : user.allowEdit),
@@ -36,7 +41,7 @@ export const getActionsByUser = (args) => {
             edit: (userPermission === null || userPermission === void 0 ? void 0 : userPermission.edit) || MENU_PERMISSION.NONE,
         },
     });
-    if (!user || !updatedUser || !allowEdit || updatedUser.userId === ownerId)
+    if ((!user && !isPublic) || !updatedUser || !allowEdit || updatedUser.userId === ownerId)
         return [];
     const actions = Object.values(PEOPLE_ACTION_KEYS);
     if (userId !== ownerId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.3-beta.68",
+  "version": "1.3.3-beta.69",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -57,7 +57,7 @@
     "not op_mini all"
   ],
   "dependencies": {
-    "@antscorp/icons": "0.27.5",
+    "@antscorp/icons": "0.27.6",
     "@antscorp/image-editor": "1.0.2",
     "@emotion/react": "^11.11.1",
     "@fortawesome/fontawesome-svg-core": "6.1.1",
@@ -75,9 +75,9 @@
     "html-entities": "^2.0.2",
     "html-to-image": "^1.11.11",
     "html2canvas": "^1.4.1",
-    "immer": "3.0.0",
     "i18next": "21.6.16",
     "i18next-browser-languagedetector": "6.1.2",
+    "immer": "3.0.0",
     "lodash": "^4.17.21",
     "moment": "2.29.2",
     "qs": "6.10.3",