@topconsultnpm/sdkui-react-beta 6.6.31 → 6.6.33

package/lib/components/choosers/TMMetadataChooser.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DcmtTypeDescriptor, MetadataDescriptor, QueryDescriptor, ValidationItem } from '@topconsultnpm/sdk-ts-beta';
+import { MetadataDescriptor, QueryDescriptor, ValidationItem } from '@topconsultnpm/sdk-ts-beta';
 import { ITMChooserFormProps, ITMChooserProps, TID_MID } from '../../ts';
 import { TID_Alias } from '../../helper/queryHelper';
 interface ITMMetadataChooserProps extends ITMChooserProps {
@@ -7,8 +7,6 @@ interface ITMMetadataChooserProps extends ITMChooserProps {
     allowSysMetadata?: boolean;
     /** TIDs dei tipi documento da cui recuperare i metadati */
     tids?: number[];
-    /** Lista dei tipi documento da cui recuperare i metadati */
-    inputDcmtTypesList?: DcmtTypeDescriptor[];
     /** Qd da cui recuperare i metadati */
     qd?: QueryDescriptor;
     /** Contiene i TID / MID selezionati  */
@@ -17,6 +15,8 @@ interface ITMMetadataChooserProps extends ITMChooserProps {
     showCompleteMetadataName?: boolean;
     /** Se input è qd, visualizza solo i metadati presenti nella clausola Select */
     qdShowOnlySelectItems?: boolean;
+    /** predicate function per filtrare i metadati. Significativo per un solo tid (tids)  */
+    filterMetadata?: (value: MetadataDescriptor, index: number, array: MetadataDescriptor[]) => unknown;
     getColorIndex?: (tid: TID_Alias) => string;
     showBorder?: boolean;
     borderRadius?: string;
@@ -26,11 +26,12 @@ interface ITMMetadataChooserProps extends ITMChooserProps {
 declare const TMMetadataChooser: React.FunctionComponent<ITMMetadataChooserProps>;
 export default TMMetadataChooser;
 interface ITMMetadataChooserFormProps extends ITMChooserFormProps<MetadataDescriptor> {
+    /** Consente di visualizzare anche i metadati di sistema  */
     allowSysMetadata?: boolean;
-    /** Lista dei tipi documento da cui recuperare i metadati */
-    inputDcmtTypesList?: DcmtTypeDescriptor[];
     /** TIDs dei tipi documento da cui recuperare i metadati */
     tids?: number[];
+    /** predicate function per filtrare i metadati. Significativo per un solo tid (tids)  */
+    filterMetadata?: (value: MetadataDescriptor, index: number, array: MetadataDescriptor[]) => unknown;
     /** Qd da cui recuperare i metadati */
     qd?: QueryDescriptor;
     /** Se input è qd, visualizza solo i metadati presenti nella clausola Select */

package/lib/components/choosers/TMMetadataChooser.js

@@ -12,16 +12,16 @@ import TMButton from '../base/TMButton';
 import TMSummary from '../editors/TMSummary';
 import TMChooserForm from '../forms/TMChooserForm';
 import TMSpinner from '../base/TMSpinner';
-const TMMetadataChooser = ({ tmSession, dataSource, buttons = [], inputDcmtTypesList, disabled, validationItems, getColorIndex, showCompleteMetadataName, qdShowOnlySelectItems, borderRadius = '4px', fontSize = FontSize.defaultFontSize, backgroundColor, openEditorOnSummaryClick, showBorder = true, showId = false, elementStyle, allowMultipleSelection, allowSysMetadata, value, values, isModifiedWhen, tids, label, width, height, onValueChanged, showClearButton, qd, placeHolder, onRefreshCache }) => {
+const TMMetadataChooser = ({ tmSession, dataSource, buttons = [], disabled, validationItems, getColorIndex, showCompleteMetadataName, qdShowOnlySelectItems, borderRadius = '4px', fontSize = FontSize.defaultFontSize, backgroundColor, openEditorOnSummaryClick, showBorder = true, showId = false, elementStyle, allowMultipleSelection, allowSysMetadata, value, values, isModifiedWhen, tids, label, width, height, showClearButton, qd, placeHolder, filterMetadata, onValueChanged }) => {
     const [showChooser, setShowChooser] = useState(false);
     const renderTemplate = () => {
         return (_jsxs(StyledDivHorizontal, { style: { width: 'max-content', height: '100%' }, children: [values && _jsx(TMMidViewer, { tmSession: tmSession, tid_mid: values[0], showIcon: true, showId: showId, showCompleteName: showCompleteMetadataName }), values && values.length > 1 && _jsx("p", { style: { marginLeft: '10px' }, children: `(+${values.length - 1} ${values.length == 2 ? 'altro' : 'altri'})` }), (values == undefined || values.length == 0) && _jsx("p", { children: placeHolder })] }));
     };
     return (_jsxs(_Fragment, { children: [_jsx(TMSummary, { label: label, width: width, height: showBorder ? height : '24px', validationItems: validationItems, backgroundColor: backgroundColor, buttons: buttons, placeHolder: placeHolder, fontSize: fontSize, showBorder: showBorder, borderRadius: borderRadius, hasValue: values && values.length > 0, showClearButton: showClearButton, iconEditButton: _jsx(IconSearch, { fontSize: 16 }), openEditorOnSummaryClick: openEditorOnSummaryClick, onEditorClick: () => !disabled && setShowChooser(true), elementStyle: elementStyle, isModifiedWhen: isModifiedWhen, template: renderTemplate(), onClearClick: showClearButton ? () => { onValueChanged?.([]); } : undefined }), showChooser &&
-                _jsx(TMMetadataChooserForm, { tmSession: tmSession, allowMultipleSelection: allowMultipleSelection, height: '500px', width: '600px', allowSysMetadata: allowSysMetadata, getColorIndex: getColorIndex, dataSource: dataSource, inputDcmtTypesList: inputDcmtTypesList, tids: tids, qd: qd, qdShowOnlySelectItems: qdShowOnlySelectItems, selectedIDs: values, onRefreshCache: onRefreshCache, onClose: () => setShowChooser(false), onChoose: (tid_mids) => { onValueChanged?.(tid_mids); } })] }));
+                _jsx(TMMetadataChooserForm, { tmSession: tmSession, allowMultipleSelection: allowMultipleSelection, height: '500px', width: '600px', allowSysMetadata: allowSysMetadata, getColorIndex: getColorIndex, dataSource: dataSource, tids: tids, qd: qd, qdShowOnlySelectItems: qdShowOnlySelectItems, filterMetadata: filterMetadata, selectedIDs: values, onClose: () => setShowChooser(false), onChoose: (tid_mids) => { onValueChanged?.(tid_mids); } })] }));
 };
 export default TMMetadataChooser;
-export const TMMetadataChooserForm = ({ tmSession, tids, inputDcmtTypesList, qd, qdShowOnlySelectItems, selectedIDs, dataSource, allowMultipleSelection, allowSysMetadata = true, width, height, getColorIndex, onClose, onChoose, onRefreshCache }) => {
+export const TMMetadataChooserForm = ({ tmSession, tids, qd, filterMetadata, qdShowOnlySelectItems, selectedIDs, dataSource, allowMultipleSelection, allowSysMetadata = true, width, height, getColorIndex, onClose, onChoose }) => {
     const [showSysMetadata, setShowSysMetadata] = useState(false);
     const [hasSysMetadata, setHasSysMetadata] = useState(false);
     const [dcmtTypes, setDcmtTypes] = useState([]);
@@ -59,16 +59,6 @@ export const TMMetadataChooserForm = ({ tmSession, tids, inputDcmtTypesList, qd,
                 dtdList.push(dtd);
             }
         }
-        else if (inputDcmtTypesList) {
-            if (refreshCache)
-                onRefreshCache?.();
-            for (const dtd of inputDcmtTypesList) {
-                const newDtd = new DcmtTypeDescriptor();
-                newDtd.init({ ...dtd });
-                newDtd.metadata?.forEach((md) => { md.customData1 = newDtd.id; });
-                dtdList.push(newDtd);
-            }
-        }
         else if (tids) {
             if (tids.length <= 0)
                 return [];
@@ -77,11 +67,12 @@ export const TMMetadataChooserForm = ({ tmSession, tids, inputDcmtTypesList, qd,
             for (const tid of tids) {
                 if (!tid)
                     continue;
-                let dtd = await DcmtTypeListCacheService.GetAsync(tid, true, tmSession, false, refreshCache);
+                let dtd = await DcmtTypeListCacheService.GetAsync(tid, true, tmSession, true, refreshCache);
                 if (!dtd)
                     throw new Error(`TID sconosciuto (${tid})`);
-                dtd?.metadata?.forEach((md) => { md.customData1 = dtd?.id; });
-                dtdList.push(dtd);
+                let mds = filterMetadata ? dtd.metadata?.filter(filterMetadata) : dtd.metadata;
+                mds?.forEach((md) => { md.customData1 = dtd?.id; });
+                dtdList.push({ ...dtd, metadata: mds });
             }
             if (refreshCache)
                 TMSpinner.hide();
@@ -121,5 +112,5 @@ export const TMMetadataChooserForm = ({ tmSession, tids, inputDcmtTypesList, qd,
     };
     const convertID = (md) => { return { tid: md.customData1, mid: md.id, aliasTID: md.customData2 }; };
     const customFilter = (items) => { return showSysMetadata ? items : items.filter(o => o.isSystem != 1); };
-    return (_jsx(TMChooserForm, { title: SDK_Localizator.Metadatas, allowMultipleSelection: allowMultipleSelection, allowSorting: false, allowGrouping: dcmtTypes.length > 1, width: width, height: height, selectedIDs: selectedIDs?.map((item) => item.mid), convertID: convertID, customFilter: customFilter, cellRenderIcon: cellRenderIcon, cellRenderNameAndDesc: (data) => { return _jsx("p", { style: { textAlign: 'left', color: data.data.isRequired == 1 ? 'red' : '' }, children: data.value }); }, dataSource: dataSource, getItems: getItems, customButtons: renderCustomButtons(), columns: renderDataGridColumns, summaryItems: renderSummaryItems, onRefreshCache: onRefreshCache, onClose: onClose, onChoose: (IDs) => onChoose?.(IDs) }));
+    return (_jsx(TMChooserForm, { title: SDK_Localizator.Metadatas, allowMultipleSelection: allowMultipleSelection, allowSorting: false, allowGrouping: dcmtTypes.length > 1, width: width, height: height, selectedIDs: selectedIDs?.map((item) => item.mid), convertID: convertID, customFilter: customFilter, cellRenderIcon: cellRenderIcon, cellRenderNameAndDesc: (data) => { return _jsx("p", { style: { textAlign: 'left', color: data.data.isRequired == 1 ? 'red' : '' }, children: data.value }); }, dataSource: dataSource, getItems: getItems, customButtons: renderCustomButtons(), columns: renderDataGridColumns, summaryItems: renderSummaryItems, onClose: onClose, onChoose: (IDs) => onChoose?.(IDs) }));
 };

package/lib/components/forms/TMChooserForm.d.ts

@@ -1,3 +1,3 @@
 import { ITMChooserFormProps } from '../../ts';
-declare const TMChooserForm: <T>({ children, title, allowMultipleSelection, hasShowOnlySelectedItems, allowGrouping, allowSorting, width, height, dataSource, selectedIDs, manageUseLocalizedName, hasShowId, keyName, customButtons, showDefaultColumns, columns, summaryItems, convertID, customFilter, getItems, cellRenderIcon, cellRenderNameAndDesc, onChoose, onClose, onShowIdChanged, onRefreshCache }: ITMChooserFormProps<T>) => import("react/jsx-runtime").JSX.Element;
+declare const TMChooserForm: <T>({ children, title, allowMultipleSelection, hasShowOnlySelectedItems, allowGrouping, allowSorting, width, height, dataSource, selectedIDs, manageUseLocalizedName, hasShowId, keyName, customButtons, showDefaultColumns, columns, summaryItems, convertID, customFilter, getItems, cellRenderIcon, cellRenderNameAndDesc, onChoose, onClose, onShowIdChanged }: ITMChooserFormProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default TMChooserForm;

package/lib/components/forms/TMChooserForm.js

@@ -7,7 +7,7 @@ import { IconApply, IconHide, IconRefresh, IconShow, SDKUI_Globals, SDKUI_Locali
 import TMButton from '../base/TMButton';
 import TMToggleButton from '../base/TMToggleButton';
 import TMModal from '../base/TMModal';
-const TMChooserForm = ({ children, title, allowMultipleSelection, hasShowOnlySelectedItems = false, allowGrouping, allowSorting = true, width, height, dataSource, selectedIDs, manageUseLocalizedName = true, hasShowId = true, keyName = "id", customButtons, showDefaultColumns = true, columns, summaryItems, convertID, customFilter, getItems, cellRenderIcon, cellRenderNameAndDesc, onChoose, onClose, onShowIdChanged, onRefreshCache }) => {
+const TMChooserForm = ({ children, title, allowMultipleSelection, hasShowOnlySelectedItems = false, allowGrouping, allowSorting = true, width, height, dataSource, selectedIDs, manageUseLocalizedName = true, hasShowId = true, keyName = "id", customButtons, showDefaultColumns = true, columns, summaryItems, convertID, customFilter, getItems, cellRenderIcon, cellRenderNameAndDesc, onChoose, onClose, onShowIdChanged }) => {
     const [showId, setShowId] = useState(false);
     const [showOnlySelectedItems, setShowOnlySelectedItems] = useState(selectedIDs != undefined && selectedIDs.length > 0);
     const [selectedItems, setSelectedItems] = useState([]);
@@ -19,8 +19,6 @@ const TMChooserForm = ({ children, title, allowMultipleSelection, hasShowOnlySel
     const renderTitle = () => { return title ? `${title} (${selectedItems.length} / ${customFilter ? customFilter(items).length : items.length})` : SDKUI_Localizator.Select; };
     const doGetItems = (refreshCache) => {
         if (dataSource) {
-            if (refreshCache)
-                onRefreshCache?.();
             setItems(dataSource);
             setSelectedItems(dataSource.filter((o) => selectedIDs?.includes(o[keyName])));
             return;

package/lib/ts/types.d.ts

@@ -137,7 +137,6 @@ export interface ITMChooserFormProps<T> {
     onChoose?: (selectedobjects?: any) => void;
     onClose?: () => void;
     onShowIdChanged?: () => void;
-    onRefreshCache?: () => void;
 }
 export interface ITMChooserProps extends ITMEditorBase {
     allowMultipleSelection?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react-beta",
-    "version": "6.6.31",
+    "version": "6.6.33",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",