@topconsultnpm/sdkui-react 6.20.0-dev1.65 → 6.20.0-dev1.67

package/lib/components/base/TMDropDownMenu.js

@@ -1,9 +1,8 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState, forwardRef, useRef, useImperativeHandle } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { forwardRef, useRef, useImperativeHandle } from 'react';
 import styled from 'styled-components';
 import { ContextMenu as TMContextMenu } from '../NewComponents/ContextMenu';
 import { TMColors } from '../../utils/theme';
-import { genUniqueId } from '../../helper';
 const StyledContent = styled.div `
     cursor: pointer;
     border-radius: ${props => props.$borderRadius};
@@ -23,9 +22,7 @@ const StyledContent = styled.div `
     }
 `;
 const TMDropDownMenu = forwardRef(({ content, items, disabled = false, color = TMColors.text_normal, backgroundColor = TMColors.default_background, borderRadius, onMenuShown }, ref) => {
-    const [id, setID] = useState('');
-    const dropDownMenuElementRef = useRef(null); // Ref all'elemento DOM div principale
-    useEffect(() => { setID(genUniqueId()); }, [content]);
+    const dropDownMenuElementRef = useRef(null);
     useImperativeHandle(ref, () => ({
         focus: () => {
             dropDownMenuElementRef.current?.focus();
@@ -44,19 +41,6 @@ const TMDropDownMenu = forwardRef(({ content, items, disabled = false, color = T
             submenu: item.items ? convertToContextMenuItems(item.items) : undefined,
         }));
     };
-    const [menuVisible, setMenuVisible] = useState(false);
-    const handleMenuOpen = () => {
-        setMenuVisible(true);
-        onMenuShown?.();
-    };
-    const handleMenuClose = () => {
-        setMenuVisible(false);
-        dropDownMenuElementRef.current?.focus();
-    };
-    return (_jsxs(_Fragment, { children: [_jsx(StyledContent, { id: `idContainer${id}`, ref: dropDownMenuElementRef, tabIndex: disabled ? -1 : 0, "$disabled": disabled, "$color": color, "$backgroundColor": backgroundColor, "$borderRadius": borderRadius, onClick: !disabled ? handleMenuOpen : undefined, children: content }), _jsx(TMContextMenu, { items: convertToContextMenuItems(items), target: `#idContainer${id}`, trigger: "left", externalControl: {
-                    visible: menuVisible,
-                    position: { x: 0, y: 0 },
-                    onClose: handleMenuClose,
-                } })] }));
+    return (_jsx(TMContextMenu, { items: convertToContextMenuItems(items), trigger: "left", children: _jsx(StyledContent, { ref: dropDownMenuElementRef, tabIndex: disabled ? -1 : 0, "$disabled": disabled, "$color": color, "$backgroundColor": backgroundColor, "$borderRadius": borderRadius, children: content }) }));
 });
 export default TMDropDownMenu;

package/lib/components/features/workflow/TMWorkflowPopup.d.ts

@@ -25,7 +25,7 @@ export declare const WorkFlowApproveRejectPopUp: ({ TID, DID, deviceType, isReje
     onClose?: () => void;
     onCompleted?: () => Promise<void>;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const WorkFlowReAssignPopUp: ({ DID, TID, deviceType, onClose, selectedItems, onCompleted, wf }: {
+export declare const WorkFlowReAssignPopUp: ({ DID, TID, deviceType, onClose, selectedItems, onCompleted, wf, workItemDetail }: {
     TID?: number;
     DID?: number;
     deviceType?: DeviceType;
@@ -33,6 +33,7 @@ export declare const WorkFlowReAssignPopUp: ({ DID, TID, deviceType, onClose, se
     selectedItems?: any[];
     onCompleted?: () => Promise<void>;
     wf?: WFDescriptor;
+    workItemDetail?: WorkItemDetail;
 }) => import("react/jsx-runtime").JSX.Element;
 /**
  * Modal per forzare l'approvazione di un work item

package/lib/components/features/workflow/TMWorkflowPopup.js

@@ -95,6 +95,7 @@ export const WorkFlowApproveRejectPopUp = ({ TID = 0, DID = 0, deviceType = Devi
             for (const { TID, DID } of items) {
                 await workflowEngine.WorkItem_CompleteOrRejectAsync(TID, DID, commentValue, isReject);
             }
+            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: isReject === 0 ? SDKUI_Localizator.WorkitemApprove : SDKUI_Localizator.WorkitemReject, message: SDKUI_Localizator.OperationSuccess, duration: 3000 });
         }
         catch (e) {
             TMExceptionBoxManager.show({ exception: e });
@@ -103,7 +104,6 @@ export const WorkFlowApproveRejectPopUp = ({ TID = 0, DID = 0, deviceType = Devi
             onCompleted?.();
             onClose?.();
             TMSpinner.hide();
-            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: isReject === 0 ? SDKUI_Localizator.WorkitemApprove : SDKUI_Localizator.WorkitemReject, message: SDKUI_Localizator.OperationSuccess, duration: 3000 });
         }
     };
     const workflowAction = isReject === 0 ? SDKUI_Localizator.Approve : SDKUI_Localizator.Reject;
@@ -113,23 +113,33 @@ export const WorkFlowApproveRejectPopUp = ({ TID = 0, DID = 0, deviceType = Devi
                         ? _jsx(TMButton, { btnStyle: 'advanced', showTooltip: false, icon: _jsx(IconApply, {}), caption: SDKUI_Localizator.Approve, disabled: false, onClick: () => completeOrRejectAsync(isReject), advancedColor: TMColors.success })
                         : _jsx(TMButton, { btnStyle: 'advanced', showTooltip: false, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Reject, disabled: disable, onClick: () => { !disable && completeOrRejectAsync(isReject); }, advancedColor: TMColors.error }) })] }) }));
 };
-export const WorkFlowReAssignPopUp = ({ DID = 0, TID = 0, deviceType = DeviceType.DESKTOP, onClose, selectedItems = [], onCompleted, wf }) => {
+export const WorkFlowReAssignPopUp = ({ DID = 0, TID = 0, deviceType = DeviceType.DESKTOP, onClose, selectedItems = [], onCompleted, wf, workItemDetail }) => {
     const [commentValue, setCommentValue] = useState('');
     const [selectedUserID, setSelectedUserID] = useState([]);
     const [participants, setParticipants] = useState([]);
     const disable = commentValue.length === 0 || !selectedUserID;
+    // Determina se siamo nel contesto CtrlWorkflow (quando abbiamo workItemDetail)
+    const isCtrlWorkflowContext = !!workItemDetail;
     const reAssignWorkFlowAsync = async () => {
         try {
             TMSpinner.show();
             const workflowEngine = SDK_Globals.tmSession?.NewWorkflowEngine();
             if (!workflowEngine)
                 throw new Error("Workflow engine is not available");
-            const items = selectedItems.length > 0
-                ? selectedItems.map(({ TID, DID }) => ({ TID, DID }))
-                : [{ TID, DID }];
-            for (const { TID, DID } of items) {
-                await SDK_Globals.tmSession?.NewWorkflowEngine().WorkItem_ReassignAsync(TID, DID, selectedUserID?.[0], commentValue);
+            if (isCtrlWorkflowContext && workItemDetail) {
+                // Contesto CtrlWorkflow: usa WFCtrl_ReassignWIAsync
+                await workflowEngine.WFCtrl_ReassignWIAsync(workItemDetail.wfid, workItemDetail.did, selectedUserID?.[0], commentValue);
             }
+            else {
+                // Contesto WorkItem: usa WorkItem_ReassignAsync
+                const items = selectedItems.length > 0
+                    ? selectedItems.map(({ TID, DID }) => ({ TID, DID }))
+                    : [{ TID, DID }];
+                for (const { TID, DID } of items) {
+                    await workflowEngine.WorkItem_ReassignAsync(TID, DID, selectedUserID?.[0], commentValue);
+                }
+            }
+            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: SDKUI_Localizator.WorkitemReassign, message: SDKUI_Localizator.OperationSuccess, duration: 3000 });
         }
         catch (e) {
             TMExceptionBoxManager.show({ exception: e });
@@ -138,11 +148,10 @@ export const WorkFlowReAssignPopUp = ({ DID = 0, TID = 0, deviceType = DeviceTyp
             onCompleted?.();
             onClose?.();
             TMSpinner.hide();
-            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: SDKUI_Localizator.WorkitemReassign, message: SDKUI_Localizator.OperationSuccess, duration: 3000 });
         }
     };
     // Determina il TID da usare
-    const tidToUse = selectedItems?.[0]?.TID ?? TID;
+    const tidToUse = workItemDetail?.tid ?? selectedItems?.[0]?.TID ?? TID;
     useEffect(() => {
         let isMounted = true;
         const fetchData = async () => {
@@ -169,8 +178,11 @@ export const WorkFlowReAssignPopUp = ({ DID = 0, TID = 0, deviceType = DeviceTyp
         };
         fetchData();
         return () => { isMounted = false; };
-    }, [tidToUse, wf]);
-    return (_jsx(TMModal, { onClose: onClose, width: '600px', height: '270px', isModal: true, title: SDKUI_Localizator.Reassign + (selectedItems.length > 0 ? ' (' + selectedItems.length + ' workitem)' : ''), children: _jsxs(StyledModalBodyWrapper, { children: [_jsxs(StyledModalContentContainer, { children: [_jsx(TMUserChooser, { dataSource: participants, values: selectedUserID, onValueChanged: (IDs) => {
+    }, [tidToUse, wf, workItemDetail]);
+    // Determina il conteggio degli item da mostrare nel titolo
+    const itemCount = workItemDetail ? 1 : selectedItems.length;
+    const titleSuffix = itemCount > 0 ? ` (${itemCount} workitem)` : '';
+    return (_jsx(TMModal, { onClose: onClose, width: '600px', height: '270px', isModal: true, title: SDKUI_Localizator.Reassign + titleSuffix, children: _jsxs(StyledModalBodyWrapper, { children: [_jsxs(StyledModalContentContainer, { children: [_jsx(TMUserChooser, { dataSource: participants, values: selectedUserID, onValueChanged: (IDs) => {
                                 setSelectedUserID(IDs ?? []);
                             } }), _jsxs("p", { style: { color: commentValue.length === 0 ? TMColors.error : 'black' }, children: [SDKUI_Localizator.CommentText, " ", commentValue.length === 0 && _jsx("span", { children: ` (${SDKUI_Localizator.RequiredField})` }), " "] }), _jsx(StyledTextArea, { maxLength: 200, "$isValid": commentValue.length !== 0, value: commentValue, onChange: (e) => setCommentValue(e.target.value) }), _jsx(CharacterCounter, { children: `${200 - commentValue.length} ${SDKUI_Localizator.CharactersRemaining}` })] }), _jsx(StyledModalFooter, { children: _jsx(TMButton, { btnStyle: 'advanced', showTooltip: false, icon: _jsx(IconUser, { fontSize: 16 }), caption: SDKUI_Localizator.Reassign, disabled: disable, onClick: () => !disable && reAssignWorkFlowAsync(), advancedColor: TMColors.tertiary }) })] }) }));
 };
@@ -308,6 +320,7 @@ export const WorkFlowMoreInfoPopUp = ({ DID = 0, TID = 0, deviceType = DeviceTyp
                 name: `${TASK_MORE_INFO_PREFIX_NAME}${nameInput}`
             };
             await SDK_Globals.tmSession?.NewWorkflowEngine().WorkItem_MoreInfoAsync(TID, DID, taskWithPrefix);
+            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: SDKUI_Localizator.MoreInformation, message: SDKUI_Localizator.MoreInfoSent, duration: 3000 });
         }
         catch (e) {
             TMExceptionBoxManager.show({ exception: e });
@@ -316,7 +329,6 @@ export const WorkFlowMoreInfoPopUp = ({ DID = 0, TID = 0, deviceType = DeviceTyp
             onCompleted?.();
             onClose?.();
             TMSpinner.hide();
-            ShowAlert({ mode: 'success', position: 'TOP_RIGHT', title: SDKUI_Localizator.MoreInformation, message: SDKUI_Localizator.MoreInfoSent, duration: 3000 });
         }
     };
     useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topconsultnpm/sdkui-react",
-  "version": "6.20.0-dev1.65",
+  "version": "6.20.0-dev1.67",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",