@topconsultnpm/sdkui-react 6.19.0-dev1.33 → 6.19.0-dev1.34

package/lib/components/editors/TMMetadataValues.js

@@ -10,7 +10,7 @@ import TMTooltip from "../base/TMTooltip";
 import TMCheckBox from "./TMCheckBox";
 import TMMetadataEditor, { useMetadataEditableList } from "./TMMetadataEditor";
 import { FormulaHelper } from "./TMFormulaEditor";
-import { DraftsMIDs } from "../../ts";
+import { DraftsMIDs, DSAttachsMIDs } from "../../ts";
 import { TMNothingToShow } from "../features/documents/TMDcmtPreview";
 import TMAccordion from "../base/TMAccordion";
 export var ShowCheckBoxesMode;
@@ -384,7 +384,22 @@ const TMMetadataValues = ({ showCheckBoxes = ShowCheckBoxesMode.Never, checkPerm
                 checkOutData.push(tempCICODataMap[id]);
             }
         });
-        return (_jsxs("div", { style: { width: '100%' }, children: [draftData.length > 0 && _jsx(TMAccordion, { title: SDKUI_Localizator.Draft, children: draftData.map(item => renderMetadataItem(item)) }), checkOutData.length > 0 && _jsx(TMAccordion, { title: `${SDKUI_Localizator.CheckIn}/${SDKUI_Localizator.CheckOut}`, children: checkOutData.map(item => renderMetadataItem(item, true)) })] }));
+        return (_jsxs("div", { style: { width: '100%' }, children: [draftData.length > 0 && _jsx(TMAccordion, { title: SDKUI_Localizator.Draft, children: draftData.map(item => renderMetadataItem(item, isReadOnly)) }), checkOutData.length > 0 && _jsx(TMAccordion, { title: `${SDKUI_Localizator.CheckIn}/${SDKUI_Localizator.CheckOut}`, children: checkOutData.map(item => renderMetadataItem(item, true)) })] }));
+    };
+    const layoutDsAttachs = () => {
+        const dsAttachsData = [];
+        metadataValues.forEach(item => {
+            switch (item.md?.id) {
+                // case DSAttachsMIDs.DSID:
+                case DSAttachsMIDs.Name:
+                case DSAttachsMIDs.Description:
+                    dsAttachsData.push(item);
+                    break;
+                default:
+                    break;
+            }
+        });
+        return (_jsx("div", { style: { width: '100%' }, children: dsAttachsData.length > 0 && _jsx(TMAccordion, { title: SDKUI_Localizator.Attachment, children: dsAttachsData.map(item => renderMetadataItem(item, isReadOnly)) }) }));
     };
     const layoutCustom = () => {
         if (!layout || !layout.items || layout.items.length === 0) {
@@ -437,13 +452,18 @@ const TMMetadataValues = ({ showCheckBoxes = ShowCheckBoxesMode.Never, checkPerm
         return (_jsx("div", { style: { width: '100%' }, children: rootItems.map(item => renderLayoutItem(item, 0)) }));
     };
     const renderForm = () => {
+        // Se tutti i metadata sono di sistema, renderizziamo tutti in sola lettura senza layout
+        const allSystem = metadataValues.length > 0 && metadataValues.every(item => item.md?.isSystem === 1);
+        if (allSystem) {
+            return metadataValues.map((item) => renderMetadataItem(item, true));
+        }
         if (currentDTD?.templateTID === TemplateTIDs.WF_WIApprView && !isReadOnly) {
             return layoutWorkItem();
         }
         switch (currentDTD?.id) {
-            case SystemTIDs.Drafts: return !isReadOnly ? layoutDraft() : metadataValues.map((item) => renderMetadataItem(item));
+            case SystemTIDs.Drafts: return layoutDraft();
             // case SystemTIDs.Chronology: break;
-            // case SystemTIDs.DSAttachs: break;
+            case SystemTIDs.DSAttachs: return layoutDsAttachs();
             default:
                 // Se è presente un layout personalizzato, usalo, altrimenti usa il rendering standard
                 if (layout && layout.items && layout.items.length > 0) {

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import TMDcmtPreview from './TMDcmtPreview';
-import { AccessLevels, ArchiveConstraints, ArchiveEngineByID, DcmtTypeListCacheService, LayoutModes, MetadataDataTypes, ResultTypes, SDK_Globals, SDK_Localizator, SystemMIDsAsNumber, SystemTIDs, Task_States, TemplateTIDs, UpdateEngineByID, ValidationItem, WorkflowCacheService, WorkItemMetadataNames } from '@topconsultnpm/sdk-ts';
+import { AccessLevels, ArchiveConstraints, ArchiveEngineByID, DcmtTypeListCacheService, LayoutCacheService, LayoutModes, MetadataDataTypes, ResultTypes, SDK_Globals, SDK_Localizator, SystemMIDsAsNumber, SystemTIDs, Task_States, TemplateTIDs, UpdateEngineByID, ValidationItem, WorkflowCacheService, WorkItemMetadataNames } from '@topconsultnpm/sdk-ts';
 import { ContextMenu } from 'devextreme-react';
 import { WorkFlowApproveRejectPopUp, WorkFlowMoreInfoPopUp, WorkFlowOperationButtons, WorkFlowReAssignPopUp } from '../workflow/TMWorkflowPopup';
 import { DownloadTypes, FormModes } from '../../../ts';
@@ -153,11 +153,18 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
                 return;
             if (!DID && layoutMode === LayoutModes.Update)
                 return;
-            let getMetadataResult;
-            if (layoutMode === LayoutModes.Update)
-                getMetadataResult = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, DID, true);
+            // Esegui in parallelo GetMetadataAsync e LayoutCacheService.GetAsync
+            // poiché non dipendono l'uno dall'altro
+            const [getMetadataResult, resLayout] = await Promise.all([
+                layoutMode === LayoutModes.Update
+                    ? SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, DID, true)
+                    : Promise.resolve(undefined),
+                LayoutCacheService.GetAsync(TID, layoutMode)
+            ]);
+            // DcmtTypeListCacheService dipende da getMetadataResult, quindi deve attendere
             let dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, DID, getMetadataResult);
             setFromDTD(dtd);
+            setLayout(resLayout);
             if (layoutMode === LayoutModes.Update || (layoutMode === LayoutModes.Ark && DID)) {
                 await setMetadataList(dtd?.metadata ?? [], getMetadataResult);
             }
@@ -168,8 +175,6 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
                 setFormData(structuredClone(metadataList));
                 formDataOrigRef.current = structuredClone(metadataList);
             }
-            let resLayout = await SDK_Globals.tmSession?.NewDcmtTypeEngine().LayoutRetrieveAsync(TID, layoutMode);
-            setLayout(resLayout);
             (layoutMode === LayoutModes.Ark && !inputFile) && handleReset();
         }
         catch (e) {

package/lib/ts/types.d.ts

@@ -61,6 +61,19 @@ export declare enum DraftsMIDs {
     Ver = 6008,// N° di versione della bozza 
     LastVer = 6009
 }
+export declare enum DSAttachsMIDs {
+    DSID = 7001,
+    Name = 7002,
+    Description = 7003
+}
+export declare enum ChronologyMIDs {
+    RefRootTID = 15001,
+    RefDID = 15002,
+    Ver = 15003,
+    AuthorID = 15004,
+    CheckInTime = 15005,
+    Note = 15006
+}
 export type DownloadModes = "none" | "download" | "openInNewWindow";
 export type TID_MID = {
     tid: number | undefined;

package/lib/ts/types.js

@@ -66,6 +66,21 @@ export var DraftsMIDs;
     DraftsMIDs[DraftsMIDs["Ver"] = 6008] = "Ver";
     DraftsMIDs[DraftsMIDs["LastVer"] = 6009] = "LastVer"; // Ultima versione? (0 | 1)
 })(DraftsMIDs || (DraftsMIDs = {}));
+export var DSAttachsMIDs;
+(function (DSAttachsMIDs) {
+    DSAttachsMIDs[DSAttachsMIDs["DSID"] = 7001] = "DSID";
+    DSAttachsMIDs[DSAttachsMIDs["Name"] = 7002] = "Name";
+    DSAttachsMIDs[DSAttachsMIDs["Description"] = 7003] = "Description";
+})(DSAttachsMIDs || (DSAttachsMIDs = {}));
+export var ChronologyMIDs;
+(function (ChronologyMIDs) {
+    ChronologyMIDs[ChronologyMIDs["RefRootTID"] = 15001] = "RefRootTID";
+    ChronologyMIDs[ChronologyMIDs["RefDID"] = 15002] = "RefDID";
+    ChronologyMIDs[ChronologyMIDs["Ver"] = 15003] = "Ver";
+    ChronologyMIDs[ChronologyMIDs["AuthorID"] = 15004] = "AuthorID";
+    ChronologyMIDs[ChronologyMIDs["CheckInTime"] = 15005] = "CheckInTime";
+    ChronologyMIDs[ChronologyMIDs["Note"] = 15006] = "Note";
+})(ChronologyMIDs || (ChronologyMIDs = {}));
 export class MetadataValueDescriptorEx extends MetadataValueDescriptor {
 }
 export var moduleTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev1.33",
+    "version": "6.19.0-dev1.34",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -39,7 +39,7 @@
         "lib"
     ],
     "dependencies": {
-        "@topconsultnpm/sdk-ts": "6.19.0-dev1.5",
+        "@topconsultnpm/sdk-ts": "6.19.0-dev1.6",
         "buffer": "^6.0.3",
         "devextreme": "25.1.4",
         "devextreme-react": "25.1.4",