@giteeteam/apps-team-components 1.2.3-alpha.1 → 1.2.3-alpha.2

package/dist/components/fields/status/SelectTransition.js

@@ -4,14 +4,79 @@ import { ClassNames } from '@emotion/react';
 import { Spin } from 'antd';
 import useWorkflowConfig from '../../../lib/hooks/useWorkflowConfig';
 import { i18n } from '../../../lib/i18n';
+import { checkFlowHandler } from '../../../lib/workflow';
 import { flowNextStyle, flowWrapperStyle, noPermissionStyle, spinStyle } from './style';
 import TransitionButton from './TransitionButton';
 import View from './View';
-const SelectTransition = ({ fetching, flowing, tasks, itemId, itemData, currentUser, workspace, setPopoverVisible, name, objectId, workflowData, roleIds, groupIds, workspaceRoleIds, approval, checkIn, handleTransition, readonly, flowHandlerActive, }) => {
+const ApprovalStatus = {
+    approved: 'approved',
+    rejected: 'rejected',
+};
+const CheckInStatus = {
+    closed: 'closed',
+    pending: 'pending',
+};
+const SelectTransition = ({ fetching, flowing, tasks, itemId, itemData, currentUser, setPopoverVisible, name, objectId, workflowData, approval, checkIn, handleTransition, readonly, flowHandlerActive, }) => {
+    const [transitionList, setTransitionList] = useState([]);
+    const [checkResultList, setCheckResultList] = useState([]);
     const [init, setInit] = useState(false);
     const { postCheckTransitions, hideDisabledStatusTransition } = useWorkflowConfig();
-    const [checkResultList, setCheckResultList] = useState([]);
-    const [hideIds, setHideIds] = useState([]);
+    const checkApproval = useCallback(({ text }) => {
+        var _a;
+        if (!approval.requireApproval)
+            return [true];
+        const approvedTransitions = approval.transition.approved.map(approved => approved.label);
+        const rejectedTransitions = approval.transition.rejected.map(rejected => rejected.label);
+        const unrestrictedTransitions = ((_a = approval.transition.unrestricted) === null || _a === void 0 ? void 0 : _a.map(unrestricted => unrestricted.label)) || [];
+        if ((ApprovalStatus.approved === approval.approvalStatus && approvedTransitions.includes(text)) ||
+            (ApprovalStatus.rejected === approval.approvalStatus && rejectedTransitions.includes(text))) {
+            return [true];
+        }
+        if (![ApprovalStatus.approved, ApprovalStatus.rejected].includes(approval.approvalStatus) &&
+            (unrestrictedTransitions === null || unrestrictedTransitions === void 0 ? void 0 : unrestrictedTransitions.includes(text))) {
+            if (!approval.startApproval) {
+                return [true];
+            }
+            else {
+                return [false, i18n.t('pages.fields.view.unrestrictedStatus')];
+            }
+        }
+        return [false, i18n.t('pages.fields.view.approvalStatus')];
+    }, [approval]);
+    const validateCheckIn = useCallback(() => {
+        if (!checkIn.requireCheckIn)
+            return true;
+        if (checkIn.checkInStatus !== CheckInStatus.pending) {
+            return true;
+        }
+        return false;
+    }, [checkIn]);
+    const checkOneTransition = useCallback(({ text, conditionCheck }) => {
+        const [checkApprovalResult, checkApprovalMessage] = checkApproval({ text });
+        if (!checkApprovalResult) {
+            return {
+                result: false,
+                message: checkApprovalMessage,
+            };
+        }
+        if (!validateCheckIn()) {
+            return {
+                result: false,
+                message: i18n.t('pages.fields.view.checkInStatus'),
+            };
+        }
+        const checkResult = checkFlowHandler(itemData, { userId: currentUser.id }, flowHandlerActive);
+        if (checkResult && !checkResult.result) {
+            return checkResult;
+        }
+        if (!(conditionCheck === null || conditionCheck === void 0 ? void 0 : conditionCheck.result) && conditionCheck) {
+            if (hideDisabledStatusTransition === 'enabled') {
+                return { result: false, isHide: true };
+            }
+            return conditionCheck;
+        }
+        return { result: true };
+    }, [checkApproval, currentUser, flowHandlerActive, hideDisabledStatusTransition, validateCheckIn, itemData]);
     useEffect(() => {
         if (!init && workflowData.objectId && tasks.length && postCheckTransitions && itemId) {
             setInit(true);
@@ -19,23 +84,32 @@ const SelectTransition = ({ fetching, flowing, tasks, itemId, itemData, currentU
                 transitionId: _transition.id,
                 itemId,
                 workflowId: workflowData.objectId,
-            }))).then(checkResultList => {
-                setCheckResultList(checkResultList);
+            }))).then(_checkResultList => {
+                setCheckResultList(_checkResultList);
             });
         }
-    }, [init, itemId, workflowData, postCheckTransitions, tasks]);
-    const handleHide = useCallback(id => {
-        setHideIds(c => {
-            if (!c.includes(id)) {
-                return c.concat(id);
-            }
-            return c;
+    }, [init, itemId, workflowData, postCheckTransitions, tasks, itemData]);
+    useEffect(() => {
+        const _transitionList = [];
+        if (checkResultList.length === 0)
+            return;
+        tasks.forEach(task => {
+            var _a;
+            const conditionCheck = (_a = checkResultList.find(checkResult => checkResult.transitionId === task.id)) === null || _a === void 0 ? void 0 : _a.result;
+            const allResult = checkOneTransition({ text: task.name, conditionCheck });
+            _transitionList.push({
+                data: task,
+                checkResult: allResult,
+            });
         });
-    }, []);
-    const isAllHide = tasks.every(task => hideIds.includes(task.id));
-    return (_jsx(ClassNames, { children: ({ cx, css }) => (_jsxs(_Fragment, { children: [fetching ? (_jsx(Spin, { css: css(spinStyle) })) : tasks.length && !isAllHide ? (_jsx("div", { className: cx(css(flowNextStyle), `flow-next-global`), children: _jsx("div", { className: cx(css(flowWrapperStyle)), children: tasks.map(task => {
-                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-                            return (_jsx(TransitionButton, { itemId: itemId, loading: flowing, text: task.name, item: itemData, workspace: workspace, userId: currentUser.id, groupIds: groupIds, roleIds: roleIds, workspaceRoleIds: workspaceRoleIds, currentTaskId: task.id, authUsers: (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) === null || _b === void 0 ? void 0 : _b.users, authRoles: (_d = (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.permissionType) === null || _d === void 0 ? void 0 : _d.roles, authGroups: (_f = (_e = task.parameters) === null || _e === void 0 ? void 0 : _e.permissionType) === null || _f === void 0 ? void 0 : _f.groups, authUserFields: (_h = (_g = task.parameters) === null || _g === void 0 ? void 0 : _g.permissionType) === null || _h === void 0 ? void 0 : _h.customFields, authWorkSpaceRoles: (_k = (_j = task.parameters) === null || _j === void 0 ? void 0 : _j.permissionType) === null || _k === void 0 ? void 0 : _k.workspaceRoles, creatorAuth: (_m = (_l = task.parameters) === null || _l === void 0 ? void 0 : _l.permissionType) === null || _m === void 0 ? void 0 : _m.creatorAuth, scriptValidator: (_o = task.parameters) === null || _o === void 0 ? void 0 : _o.scriptValidator, conditions: (_p = task.parameters) === null || _p === void 0 ? void 0 : _p.fieldType, screenId: (_r = (_q = task.parameters) === null || _q === void 0 ? void 0 : _q.screen) === null || _r === void 0 ? void 0 : _r.key, target: task.target, approval: approval, checkIn: checkIn, handleTransition: handleTransition, hiddenPopover: () => setPopoverVisible(false), readonly: readonly, flowHandlerActive: flowHandlerActive, conditionKey: (_s = task.parameters) === null || _s === void 0 ? void 0 : _s.conditionKey, fieldTypeConditionKey: (_t = task.parameters) === null || _t === void 0 ? void 0 : _t.fieldTypeConditionKey, userConditionKey: (_v = (_u = task.parameters) === null || _u === void 0 ? void 0 : _u.permissionType) === null || _v === void 0 ? void 0 : _v.conditionKey, conditionCheck: (_w = checkResultList.find(checkResult => checkResult.transitionId === task.id)) === null || _w === void 0 ? void 0 : _w.result, hideDisabledStatusTransition: hideDisabledStatusTransition, onHide: handleHide }, task.id));
+        setTransitionList(_transitionList);
+    }, [checkResultList, checkOneTransition, itemData, tasks]);
+    return (_jsx(ClassNames, { children: ({ cx, css }) => (_jsxs(_Fragment, { children: [fetching ? (_jsx(Spin, { css: css(spinStyle) })) : transitionList.length ? (_jsx("div", { className: cx(css(flowNextStyle), `flow-next-global`), children: _jsx("div", { className: cx(css(flowWrapperStyle)), children: transitionList
+                            .filter(_task => { var _a; return !((_a = _task === null || _task === void 0 ? void 0 : _task.checkResult) === null || _a === void 0 ? void 0 : _a.isHide); })
+                            .map(_task => {
+                            var _a, _b, _c;
+                            const { data: task, checkResult } = _task;
+                            return (_jsx(TransitionButton, { loading: flowing, text: task.name, scriptValidator: (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.scriptValidator, screenId: (_c = (_b = task.parameters) === null || _b === void 0 ? void 0 : _b.screen) === null || _c === void 0 ? void 0 : _c.key, target: task.target, handleTransition: handleTransition, readonly: readonly, conditionCheck: checkResult }, task.id));
                         }) }) })) : (_jsx("span", { onClick: () => {
                         setPopoverVisible(false);
                     }, css: css(noPermissionStyle), children: i18n.t('pages.fields.view.noWorkflowOrAuth') })), _jsx(View, { workflowData: workflowData, hiddenPopover: () => setPopoverVisible(false), name: name, objectId: objectId })] })) }));

package/dist/components/fields/status/TransitionButton.d.ts

@@ -1,44 +1,19 @@
 import React from 'react';
-import { ItemResultProps } from '../../../lib/types/item';
-import { ApprovalData, CheckInData, ConditionType, ListItemType, NodeItemProps } from '../../../lib/types/workflow';
+import { NodeItemProps } from '../../../lib/types/workflow';
 interface FlowButtonProps {
-    itemId: string;
     loading: boolean;
     text: string;
     screenId: string;
-    item: ItemResultProps;
-    workspace: string;
-    authRoles: ListItemType[] | undefined;
-    authUsers: ListItemType[] | undefined;
-    authGroups: ListItemType[] | undefined;
-    authUserFields: ListItemType[] | undefined;
-    authWorkSpaceRoles: ListItemType[] | undefined;
-    creatorAuth: boolean | undefined;
     scriptValidator: string;
-    userId: string;
-    roleIds: string[];
-    groupIds: string[];
-    workspaceRoleIds: string[];
-    currentTaskId: string;
-    conditions?: ConditionType[];
-    approval: ApprovalData;
-    checkIn: CheckInData;
     handleTransition: (updateTask: string, screenId: string, script: string) => void;
     target: NodeItemProps & {
         type?: string;
     };
-    hiddenPopover?: () => void;
     readonly?: boolean;
-    conditionKey: string;
-    fieldTypeConditionKey: string;
-    userConditionKey: string;
-    flowHandlerActive?: boolean;
     conditionCheck?: {
         result: boolean;
         message: string;
     };
-    hideDisabledStatusTransition?: string;
-    onHide?: (id: string) => void;
 }
 declare const _default: React.NamedExoticComponent<FlowButtonProps>;
 export default _default;

package/dist/components/fields/status/TransitionButton.js

@@ -1,127 +1,21 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-import { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { memo, useMemo } from 'react';
 import { ClassNames, css } from '@emotion/react';
 import { Tooltip } from 'antd';
 import { WorkFlowStatusColor } from '../../../lib/global';
 import { i18n } from '../../../lib/i18n';
-import { checkFlowHandler } from '../../../lib/workflow';
 import BaseOverflowTooltip from '../../common/overflow-tooltip/BaseOverflowTooltip';
 import { flowBtnStyle, flowStateStyle, iconStyle, notAllowedStyle, pointerStyle, stateBoxStyle, tipLineStyle, tooltipStyle, } from './style';
-const ApprovalStatus = {
-    approved: 'approved',
-    rejected: 'rejected',
-};
-const CheckInStatus = {
-    closed: 'closed',
-    pending: 'pending',
-};
-const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUsers, authGroups, creatorAuth, authUserFields, authWorkSpaceRoles, scriptValidator, approval, checkIn, conditions = [], handleTransition, target, readonly, conditionKey, fieldTypeConditionKey, userConditionKey, flowHandlerActive, conditionCheck, hideDisabledStatusTransition, onHide, currentTaskId, }) => {
-    const [isCheck, setIsCheck] = useState(true);
-    const [tip, setTip] = useState('');
-    const [hide, setHide] = useState(false);
-    const checkApproval = useCallback(() => {
-        var _a;
-        if (!approval.requireApproval)
-            return true;
-        const approvedTransitions = approval.transition.approved.map(approved => approved.label);
-        const rejectedTransitions = approval.transition.rejected.map(rejected => rejected.label);
-        const unrestrictedTransitions = ((_a = approval.transition.unrestricted) === null || _a === void 0 ? void 0 : _a.map(unrestricted => unrestricted.label)) || [];
-        if ((ApprovalStatus.approved === approval.approvalStatus && approvedTransitions.includes(text)) ||
-            (ApprovalStatus.rejected === approval.approvalStatus && rejectedTransitions.includes(text))) {
-            return true;
-        }
-        if (![ApprovalStatus.approved, ApprovalStatus.rejected].includes(approval.approvalStatus) &&
-            (unrestrictedTransitions === null || unrestrictedTransitions === void 0 ? void 0 : unrestrictedTransitions.includes(text))) {
-            if (!approval.startApproval) {
-                return true;
-            }
-            else {
-                setTip(i18n.t('pages.fields.view.unrestrictedStatus'));
-                return false;
-            }
-        }
-        setTip(i18n.t('pages.fields.view.approvalStatus'));
-        return false;
-    }, [approval, text]);
-    const validateCheckIn = useCallback(() => {
-        if (!checkIn.requireCheckIn)
-            return true;
-        if (checkIn.checkInStatus !== CheckInStatus.pending) {
-            return true;
-        }
-        return false;
-    }, [checkIn]);
-    const checkAuth = useCallback(async () => {
-        setIsCheck(true);
-        if (!checkApproval()) {
-            setIsCheck(false);
-            return;
-        }
-        if (!validateCheckIn()) {
-            setTip(i18n.t('pages.fields.view.checkInStatus'));
-            setIsCheck(false);
-            return;
-        }
-        const transition = {
-            conditionKey,
-            parameters: {
-                fieldType: conditions,
-                permissionType: {
-                    users: authUsers,
-                    roles: authRoles,
-                    groups: authGroups,
-                    workspaceRoles: authWorkSpaceRoles,
-                    customFields: authUserFields,
-                    creatorAuth,
-                    conditionKey: userConditionKey,
-                },
-                fieldTypeConditionKey,
-            },
-        };
-        let checkResult = checkFlowHandler(item, transition, { userId }, flowHandlerActive);
-        if (!checkResult) {
-            checkResult = conditionCheck;
-        }
-        if (!(checkResult === null || checkResult === void 0 ? void 0 : checkResult.result)) {
-            setTip(checkResult === null || checkResult === void 0 ? void 0 : checkResult.message);
-            setIsCheck(false);
-            if (hideDisabledStatusTransition === 'enabled') {
-                setHide(true);
-                onHide(currentTaskId);
-            }
-        }
-    }, [
-        hideDisabledStatusTransition,
-        checkApproval,
-        validateCheckIn,
-        conditions,
-        authUsers,
-        authRoles,
-        authGroups,
-        authWorkSpaceRoles,
-        authUserFields,
-        creatorAuth,
-        item,
-        userId,
-        conditionKey,
-        fieldTypeConditionKey,
-        userConditionKey,
-        flowHandlerActive,
-        conditionCheck,
-        onHide,
-        currentTaskId,
-    ]);
-    useEffect(() => {
-        checkAuth();
-    }, [checkAuth]);
+const FlowButton = ({ loading, screenId, text, scriptValidator, handleTransition, target, readonly, conditionCheck, }) => {
     const tipContent = useMemo(() => {
+        const _tip = conditionCheck.message;
         if (readonly)
             return i18n.t('pages.fields.view.readonlyStatus');
-        if (!tip)
+        if (!_tip)
             return '';
-        const contents = tip.split('--');
+        const contents = _tip.split('--');
         return (_jsx("div", { children: contents.map((text, index) => (_jsx("p", { css: css(tipLineStyle), children: text }, String(index)))) }));
-    }, [tip, readonly]);
+    }, [readonly, conditionCheck]);
     const OverflowText = ({ text, target }) => {
         var _a, _b;
         return (_jsxs(_Fragment, { children: [_jsx(BaseOverflowTooltip, { css: css(tooltipStyle), title: text, children: text }), _jsx("span", { css: css(iconStyle), children: " \u2192 " }), _jsx("div", { css: css(stateBoxStyle), children: _jsx(BaseOverflowTooltip, { css: css(flowStateStyle), style: {
@@ -130,11 +24,11 @@ const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUser
                         }, title: target.name, children: target.name }) })] }));
     };
     return (_jsx(ClassNames, { children: ({ cx, css }) => {
-            return isCheck && !readonly ? (_jsx("div", { className: cx(css(flowBtnStyle), loading ? css(notAllowedStyle) : css(pointerStyle)), onClick: () => {
+            return conditionCheck ? ((conditionCheck === null || conditionCheck === void 0 ? void 0 : conditionCheck.result) && !readonly ? (_jsx("div", { className: cx(css(flowBtnStyle), loading ? css(notAllowedStyle) : css(pointerStyle)), onClick: () => {
                     if (!loading) {
                         handleTransition(text, screenId, scriptValidator);
                     }
-                }, children: _jsx(OverflowText, { text: text, target: target }) })) : hide ? null : (_jsx(Tooltip, { title: tipContent, placement: "right", children: _jsx("div", { className: cx(css(flowBtnStyle), css(notAllowedStyle)), children: _jsx(OverflowText, { text: text, target: target }) }) }));
+                }, children: _jsx(OverflowText, { text: text, target: target }) })) : (_jsx(Tooltip, { title: tipContent, placement: "right", children: _jsx("div", { className: cx(css(flowBtnStyle), css(notAllowedStyle)), children: _jsx(OverflowText, { text: text, target: target }) }) }))) : null;
         } }));
 };
 export default memo(FlowButton);

package/dist/lib/workflow.d.ts

@@ -107,6 +107,6 @@ interface CheckUserPermissionParams {
 export declare function checkUserPermission({ transition, userId, roleIds, groupIds, item, workspaceRoleIds, }: CheckUserPermissionParams): ResultType;
 export declare function checkItemCondition(transition: TransitionProps, item: ItemResultProps): ResultType;
 export declare function checkTransition(item: ItemResultProps, transition: TransitionProps, permissions: WorkflowPermissionType, flowHandlerActive?: boolean): ResultType;
-export declare function checkFlowHandler(item: ItemResultProps, transition: TransitionProps, permissions: WorkflowPermissionType, flowHandlerActive?: boolean): ResultType;
+export declare function checkFlowHandler(item: ItemResultProps, permissions: WorkflowPermissionType, flowHandlerActive?: boolean): ResultType;
 export declare const useWorkflowPermission: (workspaceId: ObjectId) => [ObjectId[], ObjectId[], ObjectId[]];
 export {};

package/dist/lib/workflow.js

@@ -440,9 +440,9 @@ export function checkTransition(item, transition, permissions, flowHandlerActive
         }
     }
 }
-export function checkFlowHandler(item, transition, permissions, flowHandlerActive) {
+export function checkFlowHandler(item, permissions, flowHandlerActive) {
     var _a, _b;
-    if (!item || !transition)
+    if (!item)
         return { result: false };
     if (flowHandlerActive && ((_b = (_a = item === null || item === void 0 ? void 0 : item.values) === null || _a === void 0 ? void 0 : _a.flowHandler) === null || _b === void 0 ? void 0 : _b.length)) {
         const flowHandler = item.values.flowHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-team-components",
-  "version": "1.2.3-alpha.1",
+  "version": "1.2.3-alpha.2",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",