@topconsultnpm/sdkui-react 6.21.0-dev1.15 → 6.21.0-dev1.16

package/lib/components/features/documents/TMDcmtForm.js

@@ -1238,7 +1238,7 @@ const TMDcmtForm = ({ TID, DID, groupId, layoutMode = LayoutModes.Update, formMo
             },
             {
                 id: 'tmDcmtPreview',
-                name: SDKUI_Localizator.PreviewDocument,
+                name: layoutMode === LayoutModes.Update ? SDKUI_Localizator.PreviewDocument : SDKUI_Localizator.UploadFile,
                 contentOptions: { component: tmDcmtPreview },
                 toolbarOptions: {
                     icon: _jsx(IconShow, { fontSize: 24 }),
@@ -1421,8 +1421,8 @@ const TMDcmtForm = ({ TID, DID, groupId, layoutMode = LayoutModes.Update, formMo
                         position: 'relative',
                         overflow: 'hidden'
                     }, children: [_jsxs("div", { style: { width: '100%', height: '100%', display: isOpenDetails || isOpenMaster ? 'none' : 'flex' }, children: [isNavigating && _jsx(Spinner, { description: SDKUI_Localizator.Loading, flat: false }), (fromDTD) && _jsx(TMLayoutWaitingContainer, { direction: 'vertical', showWaitPanel: useWaitPanelLocalState ? showWaitPanelLocal : showWaitPanel, showWaitPanelPrimary: useWaitPanelLocalState ? showPrimaryLocal : showPrimary, showWaitPanelSecondary: useWaitPanelLocalState ? showSecondaryLocal : showSecondary, waitPanelTitle: useWaitPanelLocalState ? waitPanelTitleLocal : waitPanelTitle, waitPanelTextPrimary: useWaitPanelLocalState ? waitPanelTextPrimaryLocal : waitPanelTextPrimary, waitPanelValuePrimary: useWaitPanelLocalState ? waitPanelValuePrimaryLocal : waitPanelValuePrimary, waitPanelMaxValuePrimary: useWaitPanelLocalState ? waitPanelMaxValuePrimaryLocal : waitPanelMaxValuePrimary, waitPanelTextSecondary: useWaitPanelLocalState ? waitPanelTextSecondaryLocal : waitPanelTextSecondary, waitPanelValueSecondary: useWaitPanelLocalState ? waitPanelValueSecondaryLocal : waitPanelValueSecondary, waitPanelMaxValueSecondary: useWaitPanelLocalState ? waitPanelMaxValueSecondaryLocal : waitPanelMaxValueSecondary, isCancelable: useWaitPanelLocalState ? dcmtFile ? dcmtFile.size >= 1000000 : false : true, abortController: useWaitPanelLocalState ? abortControllerLocal : abortController, children: _jsxs(TMLayoutWaitingContainer, { direction: 'vertical', showWaitPanel: showCicoWaitPanel, showWaitPanelPrimary: showCicoPrimaryProgress, waitPanelTitle: cicoWaitPanelTitle, waitPanelTextPrimary: cicoPrimaryProgressText, waitPanelValuePrimary: cicoPrimaryProgressValue, waitPanelMaxValuePrimary: cicoPrimaryProgressMax, isCancelable: true, abortController: abortControllerLocal, children: [(groupId && groupId.length > 0)
-                                                ? _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", parentId: groupId, showToolbar: showDcmtFormSidebar })
-                                                : _jsxs(TMPanelManagerWithPersistenceProvider, { panels: initialPanels, initialVisibility: allInitialPanelVisibility, defaultDimensions: defaultPanelDimensions, initialDimensions: defaultPanelDimensions, initialMobilePanelId: 'tmDcmtForm', isPersistenceEnabled: !isMobile ? hasSavedLayout() : false, persistPanelStates: !isMobile ? (state) => persistPanelStates(state) : undefined, persistedPanelStates: getPersistedPanelStates(), children: [_jsx(PanelDisabledStateHandler, { isWFDisabled: isWFDisabled, isSysMetadataDisabled: isSysMetadataDisabled, isBoardDisabled: isBoardDisabled, isDcmtTasksDisabled: isDcmtTasksDisabled }), _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", parentId: groupId, showToolbar: showDcmtFormSidebar })] }), isOpenDistinctValues &&
+                                                ? _jsxs(_Fragment, { children: [_jsx(PanelDisabledStateHandler, { isWFDisabled: isWFDisabled, isSysMetadataDisabled: isSysMetadataDisabled, isBoardDisabled: isBoardDisabled, isDcmtTasksDisabled: isDcmtTasksDisabled, isPreviewDisabled: isPreviewDisabled }), _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", parentId: groupId, showToolbar: showDcmtFormSidebar })] })
+                                                : _jsxs(TMPanelManagerWithPersistenceProvider, { panels: initialPanels, initialVisibility: allInitialPanelVisibility, defaultDimensions: defaultPanelDimensions, initialDimensions: defaultPanelDimensions, initialMobilePanelId: 'tmDcmtForm', isPersistenceEnabled: !isMobile ? hasSavedLayout() : false, persistPanelStates: !isMobile ? (state) => persistPanelStates(state) : undefined, persistedPanelStates: getPersistedPanelStates(), children: [_jsx(PanelDisabledStateHandler, { isWFDisabled: isWFDisabled, isSysMetadataDisabled: isSysMetadataDisabled, isBoardDisabled: isBoardDisabled, isDcmtTasksDisabled: isDcmtTasksDisabled, isPreviewDisabled: isPreviewDisabled }), _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", parentId: groupId, showToolbar: showDcmtFormSidebar })] }), isOpenDistinctValues &&
                                                 _jsx(TMDistinctValues, { tid: TID, mid: focusedMetadataValue?.mid, isModal: true, showHeader: false, layoutMode: layoutMode, onClosePanelCallback: () => setIsOpenDistinctValues(false), onSelectionChanged: (e) => {
                                                         if (!e)
                                                             return;
@@ -1512,7 +1512,7 @@ const validateMaxLength = (mvd, value, validationItems) => {
 };
 //#endregion Validation
 // Synchronizes panel visibility and toolbar button disabled states when panels become disabled
-const PanelDisabledStateHandler = ({ isWFDisabled, isSysMetadataDisabled, isBoardDisabled, isDcmtTasksDisabled }) => {
+const PanelDisabledStateHandler = ({ isWFDisabled, isSysMetadataDisabled, isBoardDisabled, isDcmtTasksDisabled, isPreviewDisabled }) => {
     const { setPanelVisibilityById, setToolbarButtonDisabled, panelVisibility } = useTMPanelManagerContext();
     useEffect(() => {
         // Aggiorna lo stato disabled del bottone toolbar
@@ -1520,6 +1520,7 @@ const PanelDisabledStateHandler = ({ isWFDisabled, isSysMetadataDisabled, isBoar
         setToolbarButtonDisabled('tmBlog', isBoardDisabled);
         setToolbarButtonDisabled('tmWF', isWFDisabled);
         setToolbarButtonDisabled('tmDcmtTasks', isDcmtTasksDisabled);
+        setToolbarButtonDisabled('tmDcmtPreview', isPreviewDisabled);
         // Chiude il pannello solo se è attualmente visibile e deve essere disabilitato
         if (isSysMetadataDisabled && panelVisibility['tmSysMetadata']) {
             setPanelVisibilityById('tmSysMetadata', false);
@@ -1533,7 +1534,10 @@ const PanelDisabledStateHandler = ({ isWFDisabled, isSysMetadataDisabled, isBoar
         if (isDcmtTasksDisabled && panelVisibility['tmDcmtTasks']) {
             setPanelVisibilityById('tmDcmtTasks', false);
         }
-    }, [isSysMetadataDisabled, isBoardDisabled, isWFDisabled, isDcmtTasksDisabled, setPanelVisibilityById, setToolbarButtonDisabled, panelVisibility]);
+        if (isPreviewDisabled && panelVisibility['tmDcmtPreview']) {
+            setPanelVisibilityById('tmDcmtPreview', false);
+        }
+    }, [isSysMetadataDisabled, isBoardDisabled, isWFDisabled, isDcmtTasksDisabled, isPreviewDisabled, setPanelVisibilityById, setToolbarButtonDisabled, panelVisibility]);
     return null;
 };
 const TMDcmtPreviewWrapper = ({ refreshPreviewTrigger, fromDTD, currentDcmt, layoutMode, dcmtFile, deviceType, isVisible, onFileUpload, openFileUploaderPdfEditor, enableDragDropOverlay = false, onScanRequest }) => {

package/lib/components/features/workflow/diagram/DiagramItemForm.js

@@ -70,7 +70,11 @@ const ButtonsContainer = styled.div `
 `;
 const SET_RULE_DATASOURCE = [
     { value: WorkItemSetRules.Ands_AND_Ors, display: "Ands_AND_Ors" },
-    { value: WorkItemSetRules.Ands_OR_Ors, display: "Ands_OR_Ors" }
+    { value: WorkItemSetRules.Ands_OR_Ors, display: "Ands_OR_Ors" },
+    { value: WorkItemSetRules.Ands_AND_Ors_AssignModeOrs, display: "Ands_AND_Ors_AssignModeOrs" },
+    { value: WorkItemSetRules.Ands_OR_Ors_AssignModeOrs, display: "Ands_OR_Ors_AssignModeOrs" },
+    { value: WorkItemSetRules.Ands_AND_Ors_WaitForAllAnds, display: "Ands_AND_Ors_WaitForAllAnds" },
+    { value: WorkItemSetRules.Ands_OR_Ors_WaitForAllAnds, display: "Ands_OR_Ors_WaitForAllAnds" }
 ];
 const SEVERITY_DATASOURCE = [
     { value: Severities.Critical, display: "Critical" },

package/lib/components/features/workflow/diagram/xmlParser.js

@@ -67,14 +67,13 @@ export const getSeveritiesNumber = (severity) => {
 };
 export const getWorkItemSetRulesNumber = (setRule) => {
     switch (setRule) {
-        case WorkItemSetRules.Ands_AND_Ors:
-            return 0;
-        case WorkItemSetRules.Ands_OR_Ors:
-            return 1;
-        case WorkItemSetRules.Custom:
-            return 2;
-        default:
-            return 0;
+        case WorkItemSetRules.Ands_AND_Ors: return 0;
+        case WorkItemSetRules.Ands_OR_Ors: return 1;
+        case WorkItemSetRules.Ands_AND_Ors_AssignModeOrs: return 2;
+        case WorkItemSetRules.Ands_OR_Ors_AssignModeOrs: return 3;
+        case WorkItemSetRules.Ands_AND_Ors_WaitForAllAnds: return 4;
+        case WorkItemSetRules.Ands_OR_Ors_WaitForAllAnds: return 5;
+        default: return 0;
     }
 };
 export const getWFAppTypesNumber = (appType) => {
@@ -147,12 +146,12 @@ const mapSeverity = (severityValue) => {
 // Funzione helper per mappare i valori numerici di WorkItemSetRules
 const mapWorkItemSetRules = (ruleValue) => {
     switch (ruleValue) {
-        case 0:
-            return WorkItemSetRules.Ands_AND_Ors;
-        case 1:
-            return WorkItemSetRules.Ands_OR_Ors;
-        case 2:
-            return WorkItemSetRules.Custom;
+        case 0: return WorkItemSetRules.Ands_AND_Ors;
+        case 1: return WorkItemSetRules.Ands_OR_Ors;
+        case 2: return WorkItemSetRules.Ands_AND_Ors_AssignModeOrs;
+        case 3: return WorkItemSetRules.Ands_OR_Ors_AssignModeOrs;
+        case 4: return WorkItemSetRules.Ands_AND_Ors_WaitForAllAnds;
+        case 5: return WorkItemSetRules.Ands_OR_Ors_WaitForAllAnds;
         default:
             console.warn(`Valore WorkItemSetRules sconosciuto: ${ruleValue}. Ritorno WorkItemSetRules.Ands_AND_Ors.`);
             return WorkItemSetRules.Ands_AND_Ors;

package/package.json

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