@topconsultnpm/sdkui-react-beta 6.14.52 → 6.14.53

package/lib/components/editors/TMMetadataEditor.d.ts

@@ -4,7 +4,6 @@ import { DynDataListsToBeRefreshed, MIDsToBeUpdated } from '../choosers/TMDynDat
 interface ITMMetadataEditorProps {
     tid: number | undefined;
     mid?: number;
-    did?: number;
     value: string | undefined;
     queryParamsDynDataList?: string[];
     autoFocus?: boolean;

package/lib/components/editors/TMMetadataEditor.js

@@ -37,13 +37,14 @@ const getDateDisplayType = (format) => {
         default: return DateDisplayTypes.Date;
     }
 };
-const TMMetadataEditor = ({ isSelected = false, customLabel, isReadOnly, isLexProt, layoutMode, queryOperator, isEditable, isModifiedWhen = false, tid, mid, did, value, queryParamsDynDataList, containerElement, autoFocus, validationItems = [], disabled = false, openChooserBySingleClick = true, onValueChanged, onValueChange, onCascadeRefreshDynDataLists, onCascadeUpdateMIDs }) => {
+const TMMetadataEditor = ({ isSelected = false, customLabel, isReadOnly, isLexProt, layoutMode, queryOperator, isEditable, isModifiedWhen = false, tid, mid, value, queryParamsDynDataList, containerElement, autoFocus, validationItems = [], disabled = false, openChooserBySingleClick = true, onValueChanged, onValueChange, onCascadeRefreshDynDataLists, onCascadeUpdateMIDs }) => {
     const [md, setMd] = useState();
     useEffect(() => {
-        DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did).then((dtd) => {
+        // Passiamo did = undefined, perché è già in cache
+        DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, undefined).then((dtd) => {
             setMd(dtd?.metadata?.find(o => o.id == mid));
         });
-    }, [tid, mid, did]);
+    }, [tid, mid]);
     const isReadOnlyInternal = () => {
         if (!md)
             return false;

package/lib/components/editors/TMMetadataValues.js

@@ -67,7 +67,8 @@ const TMMetadataValues = ({ showCheckBoxes = ShowCheckBoxesMode.Never, checkPerm
         }
     };
     useEffect(() => {
-        DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, 0).then((resultDTD) => {
+        // Passiamo did = undefined, perché è già in cache
+        DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, undefined).then((resultDTD) => {
             setCurrentDTD(resultDTD);
         });
     }, [TID]);

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

@@ -70,27 +70,72 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
     const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, downloadDcmtsAsync } = useDcmtOperations();
     const deviceType = useDeviceType();
     const getDcmts = () => { return [{ TID: currentDcmt?.tid, DID: currentDcmt?.did, FILEEXT: currentDcmt?.fileExt }]; };
-    const retrieveMetadataAsync = async () => {
+    const fetchData = async () => {
         try {
-            await DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, DID).then(async (dtd) => {
-                setFromDTD(dtd);
-                let mdList = dtd?.metadata ?? [];
-                if (layoutMode === LayoutModes.Update || (layoutMode === LayoutModes.Ark && DID)) {
-                    await setMetadataListAsync(mdList);
-                }
-                else {
-                    const renderedMetadata = dtd?.metadata?.filter((metadata) => handleArchiveVisibility(metadata)) ?? [];
-                    const metadataList = searchResultToMetadataValues(dtd?.id, undefined, [], [], renderedMetadata, layoutMode);
-                    setFormDataOrig(structuredClone(metadataList));
-                    setFormData(structuredClone(metadataList));
-                }
-                layoutMode === LayoutModes.Ark && resetHandler();
-            });
+            TMSpinner.show({ description: 'Loading Metadata...' });
+            let getMetadataResult = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, DID, true);
+            let dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, DID, getMetadataResult);
+            setFromDTD(dtd);
+            if (layoutMode === LayoutModes.Update || (layoutMode === LayoutModes.Ark && DID)) {
+                await setMetadataListAsync(dtd?.metadata ?? [], getMetadataResult);
+            }
+            else {
+                const renderedMetadata = dtd?.metadata?.filter((metadata) => handleArchiveVisibility(metadata)) ?? [];
+                const metadataList = searchResultToMetadataValues(dtd?.id, undefined, [], [], renderedMetadata, layoutMode);
+                setFormDataOrig(structuredClone(metadataList));
+                setFormData(structuredClone(metadataList));
+            }
+            layoutMode === LayoutModes.Ark && resetHandler();
         }
         catch (e) {
             let err = e;
             TMExceptionBoxManager.show({ exception: err });
         }
+        finally {
+            TMSpinner.hide();
+        }
+    };
+    const setMetadataListAsync = async (mdList, getMetadataResult = undefined, archived = false, currentDID) => {
+        try {
+            let did = currentDID ?? DID;
+            if (!did)
+                return;
+            TMSpinner.show({ description: 'Loading Metadata...' });
+            let res = getMetadataResult ?? await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, did, true);
+            let dtd = res?.dtdResult;
+            let rows = dtd.rows ? dtd.rows[0] : [];
+            let mids = res?.selectMIDs;
+            let metadataList = searchResultToMetadataValues(TID, dtd, rows, mids, mdList, layoutMode);
+            if (archived) {
+                let tempMetadataList = [];
+                for (let md of metadataList) {
+                    if (md.value === null) {
+                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === '') {
+                            tempMetadataList.push({ ...md, value: '' });
+                        }
+                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === undefined) {
+                            tempMetadataList.push({ ...md, value: undefined });
+                        }
+                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === null) {
+                            tempMetadataList.push(md);
+                        }
+                    }
+                    else {
+                        tempMetadataList.push(md);
+                    }
+                }
+                setFormData(tempMetadataList);
+                return;
+            }
+            setFormDataOrig(structuredClone(metadataList));
+            setFormData(structuredClone(metadataList));
+        }
+        catch (e) {
+            TMExceptionBoxManager.show({ exception: e });
+        }
+        finally {
+            TMSpinner.hide();
+        }
     };
     useEffect(() => { setID(genUniqueId()); }, []);
     //here
@@ -100,7 +145,7 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
         setDcmtFile(fileFromConnector);
     }, [fileFromConnector]);
     useEffect(() => {
-        retrieveMetadataAsync();
+        fetchData();
     }, [TID, DID]);
     useEffect(() => {
         if (formData.length > 0) {
@@ -181,48 +226,6 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
         }
         return changes;
     }
-    const setMetadataListAsync = async (mdList, archived = false, currentDID) => {
-        try {
-            let did = currentDID ?? DID;
-            if (!did)
-                return;
-            TMSpinner.show({ description: 'Loading Metadata...' });
-            let res = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, did, true);
-            let dtd = res?.dtdResult;
-            let rows = dtd.rows ? dtd.rows[0] : [];
-            let mids = res?.selectMIDs;
-            let metadataList = searchResultToMetadataValues(TID, dtd, rows, mids, mdList, layoutMode);
-            if (archived) {
-                let tempMetadataList = [];
-                for (let md of metadataList) {
-                    if (md.value === null) {
-                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === '') {
-                            tempMetadataList.push({ ...md, value: '' });
-                        }
-                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === undefined) {
-                            tempMetadataList.push({ ...md, value: undefined });
-                        }
-                        if (formDataOrig.find(metadata => metadata.mid === md.mid)?.value === null) {
-                            tempMetadataList.push(md);
-                        }
-                    }
-                    else {
-                        tempMetadataList.push(md);
-                    }
-                }
-                setFormData(tempMetadataList);
-                return;
-            }
-            setFormDataOrig(structuredClone(metadataList));
-            setFormData(structuredClone(metadataList));
-        }
-        catch (e) {
-            TMExceptionBoxManager.show({ exception: e });
-        }
-        finally {
-            TMSpinner.hide();
-        }
-    };
     const onUndoHandler = () => {
         setFormData(structuredClone(formDataOrig));
     };
@@ -265,7 +268,7 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
             }
             await ue.UpdateAsync();
             await onSavedAsyncCallback?.(TID, DID);
-            await setMetadataListAsync(fromDTD?.metadata);
+            await setMetadataListAsync(fromDTD?.metadata ?? []);
             ShowAlert({ mode: 'success', title: 'Form di documento', message: 'Le modifiche sono state salvate con successo', duration: 3000 });
         }
         catch (e) {
@@ -324,7 +327,7 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
                     firstBlock = true;
                 }
             });
-            await setMetadataListAsync(fromDTD?.metadata ?? [], true, res);
+            await setMetadataListAsync(fromDTD?.metadata ?? [], undefined, true, res);
             resetHandler();
             let newMruTIDS = updateMruTids(SDKUI_Globals.userSettings.archivingSettings.mruTIDs, TID);
             SDKUI_Globals.userSettings.archivingSettings.mruTIDs = newMruTIDS;

package/lib/components/viewers/TMMidViewer.js

@@ -17,7 +17,8 @@ export const TMMidViewer = ({ isMetadataSelected = false, color, tmSession, tid_
             setMd(undefined);
             return;
         }
-        DcmtTypeListCacheService.GetWithNotGrantedAsync(tid_mid.tid, 0, tmSession).then((dtd) => {
+        //Passiamo did = undefined, perché è già in cache
+        DcmtTypeListCacheService.GetWithNotGrantedAsync(tid_mid.tid, undefined, undefined, tmSession).then((dtd) => {
             setDcmtTypeName(getDisplayAlias(SDK_Globals.useLocalizedName ? dtd?.nameLoc : dtd?.name, tid_mid.aliasTID));
             let md = dtd?.metadata?.find(o => o.id == tid_mid.mid);
             setMd(md);
@@ -51,7 +52,7 @@ export const TMMetadataIcon = ({ tid, md, color, layoutMode = LayoutModes.Update
     let iconColor = md.isRequired === 1 && !isNumeratorInArk ? TMColors.error : (color ?? TMColors.text_normal);
     let icon = null;
     if (md.objectClass === ObjectClasses.Permission)
-        icon = _jsx(IconLocked, { fontSize: 18, color: 'red' });
+        icon = _jsx(IconLocked, { fontSize: 16 });
     else {
         switch (md.dataDomain) {
             case MetadataDataDomains.Computed:

package/lib/components/viewers/TMTidViewer.js

@@ -242,7 +242,7 @@ export const TMDcmtTypeIcon = ({ dtd }) => {
         return null;
     let icon = null;
     if (dtd.customData2 === "NOTGRANTED")
-        icon = _jsx(IconLocked, { fontSize: 18, color: 'red' });
+        icon = _jsx(IconLocked, { fontSize: 16 });
     else if (dtd.imageID && dtd.imageID.length > 0)
         icon = _jsx(TMImageLibrary, { imageID: dtd.imageID });
     if (icon == null) {
@@ -271,7 +271,7 @@ const TMTidViewer = ({ tmSession, tid, did, showIcon = false, color, showId = fa
         if (count <= 0)
             TMSpinner.show({ description: `${SDKUI_Localizator.Loading} - ${SDK_Localizator.ListDcmtTypeOrView} ...` });
         try {
-            const dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did, tmSession);
+            const dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did, undefined, tmSession);
             setDtd(dtd);
         }
         finally {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react-beta",
-    "version": "6.14.52",
+    "version": "6.14.53",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -42,7 +42,7 @@
         "lib"
     ],
     "dependencies": {
-        "@topconsultnpm/sdk-ts-beta": "6.14.12",
+        "@topconsultnpm/sdk-ts-beta": "6.14.13",
         "buffer": "^6.0.3",
         "devextreme": "24.2.6",
         "devextreme-react": "24.2.6",