@topconsultnpm/sdkui-react 6.22.0-dev2.48 → 6.22.0-dev2.49

package/lib/components/features/search/TMSearch.js

@@ -183,6 +183,11 @@ const TMSearch = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTask
         await setSQDAsync(sqdToRestore?.id === SYS_ALL_DCMTS_SQD_ID ? await getSysAllDcmtsSQD(tid, false) : sqdToRestore);
         // mruTIDs è tra le dipendenze perché setSQDAsync lo legge
     }, [fromDTD?.id, currentTID, currentSQD, mruTIDs]);
+    // Prima di ogni ricerca il pannello rilegge i metadati del tipo documento: si recepisce il descrittore
+    // aggiornato, così anche il resto della vista (titoli, badge, form dei metadati) lavora sulla lista corrente
+    const handleDcmtTypeReloaded = useCallback((dtd) => {
+        setFromDTD(dtd);
+    }, []);
     const onRefreshSearchAsyncDatagrid = async () => {
         try {
             if (lastQdSearched) {
@@ -239,10 +244,10 @@ const TMSearch = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTask
             SDKUI_Globals.userSettings.searchSettings.mruTIDs = newMruTIDS;
             setMruTIDs(newMruTIDS);
         } }), [mruTIDs, currentMruTID, deviceType]);
-    const tmSearchQueryPanelElement = useMemo(() => _jsx(TMSearchQueryPanelWrapper, { isSearchViewOnScreen: currentSearchView === TMSearchViews.Search, passToArchiveCallback: passToArchiveCallback, isExpertMode: isExpertMode, showBackToResultButton: searchResult.length > 0, fromDTD: fromDTD, SQD: currentSQD, inputMids: inputMids, maxDcmtsToBeReturned: maxDcmtsToBeReturned, onBackToResult: () => { setCurrentSearchView(TMSearchViews.Result); }, onSearchCompleted: handleSearchCompleted, onRefreshRequested: refreshSearchQueryPanelAsync, onSqdSaved: async (newSqd) => {
+    const tmSearchQueryPanelElement = useMemo(() => _jsx(TMSearchQueryPanelWrapper, { isSearchViewOnScreen: currentSearchView === TMSearchViews.Search, passToArchiveCallback: passToArchiveCallback, isExpertMode: isExpertMode, showBackToResultButton: searchResult.length > 0, fromDTD: fromDTD, SQD: currentSQD, inputMids: inputMids, maxDcmtsToBeReturned: maxDcmtsToBeReturned, onBackToResult: () => { setCurrentSearchView(TMSearchViews.Result); }, onSearchCompleted: handleSearchCompleted, onRefreshRequested: refreshSearchQueryPanelAsync, onDcmtTypeReloaded: handleDcmtTypeReloaded, onSqdSaved: async (newSqd) => {
             await loadDataSQDsAsync(true, newSqd.masterTID);
             await setSQDAsync(newSqd);
-        } }), [fromDTD, showSearchResults, setShowSearchResults, currentSQD, currentSearchView, isExpertMode, mruTIDs, searchResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, handleSearchCompleted, refreshSearchQueryPanelAsync]);
+        } }), [fromDTD, showSearchResults, setShowSearchResults, currentSQD, currentSearchView, isExpertMode, mruTIDs, searchResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, handleSearchCompleted, refreshSearchQueryPanelAsync, handleDcmtTypeReloaded]);
     const tmSavedQuerySelectorElement = useMemo(() => _jsxs(TabPanel, { width: "100%", height: "100%", showNavButtons: true, repaintChangesOnly: true, selectedIndex: currentSQDMode, onSelectedIndexChange: (index) => setCurrentSQDMode(index), children: [(currentTID || currentSQD) ? _jsx(Item, { title: fromDTD?.nameLoc, children: _jsx(TMSavedQuerySelectorWrapper, { allowShowSearch: false, items: filteredByTIDSQDs, selectedId: currentSQD?.id, onRefreshData: () => { loadDataSQDsAsync(true); }, onItemClick: (sqd) => {
                         onSQDItemClick(sqd, setSQDAsync);
                     }, onDeleted: (sqd) => onSQDDeleted(sqd, sqd.id == currentSQD?.id ? filteredByTIDSQDs.find(o => o.id == 1) : currentSQD, setSQDAsync), refreshFavoriteSavedQueries: refreshFavoriteSavedQueries }) }) : _jsx(_Fragment, {}), _jsx(Item, { title: SDKUI_Localizator.AllFemale, children: _jsx(TMSavedQuerySelectorWrapper, { allowShowSearch: true, items: allSQDs, manageDefault: false, onItemClick: (sqd) => {
@@ -342,11 +347,11 @@ const TMRecentsManagerWrapper = ({ mruTIDs, currentMruTID, deviceType, onSelecte
             onDeletedTID?.(tid);
         } }));
 };
-const TMSearchQueryPanelWrapper = ({ isSearchViewOnScreen, fromDTD, SQD, isExpertMode, showBackToResultButton, onSearchCompleted, onSqdSaved, onBackToResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, onRefreshRequested }) => {
+const TMSearchQueryPanelWrapper = ({ isSearchViewOnScreen, fromDTD, SQD, isExpertMode, showBackToResultButton, onSearchCompleted, onSqdSaved, onBackToResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, onRefreshRequested, onDcmtTypeReloaded }) => {
     const { setPanelVisibilityById, toggleMaximize, countVisibleLeafPanels } = useTMPanelManagerContext();
     const deviceType = useDeviceType();
     const isMobile = deviceType === DeviceType.MOBILE;
-    return (_jsx(TMSearchQueryPanel, { isSearchViewOnScreen: isSearchViewOnScreen, onClosePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => setPanelVisibilityById('TMSearchQueryPanel', false) : undefined, allowMaximize: !isMobile && countVisibleLeafPanels() > 1, onMaximizePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => toggleMaximize("TMSearchQueryPanel") : undefined, isExpertMode: isExpertMode, fromDTD: fromDTD, SQD: SQD, inputMids: inputMids, onSearchCompleted: onSearchCompleted, onRefreshRequested: onRefreshRequested, onSqdSaved: onSqdSaved, showBackToResultButton: showBackToResultButton, onBackToResult: onBackToResult, passToArchiveCallback: passToArchiveCallback, maxDcmtsToBeReturned: maxDcmtsToBeReturned }));
+    return (_jsx(TMSearchQueryPanel, { isSearchViewOnScreen: isSearchViewOnScreen, onClosePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => setPanelVisibilityById('TMSearchQueryPanel', false) : undefined, allowMaximize: !isMobile && countVisibleLeafPanels() > 1, onMaximizePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => toggleMaximize("TMSearchQueryPanel") : undefined, isExpertMode: isExpertMode, fromDTD: fromDTD, SQD: SQD, inputMids: inputMids, onSearchCompleted: onSearchCompleted, onRefreshRequested: onRefreshRequested, onDcmtTypeReloaded: onDcmtTypeReloaded, onSqdSaved: onSqdSaved, showBackToResultButton: showBackToResultButton, onBackToResult: onBackToResult, passToArchiveCallback: passToArchiveCallback, maxDcmtsToBeReturned: maxDcmtsToBeReturned }));
 };
 const TMSavedQuerySelectorWrapper = ({ items, selectedId, allowShowSearch, manageDefault, onRefreshData, onItemClick, onDeleted, refreshFavoriteSavedQueries }) => {
     const { setPanelVisibilityById } = useTMPanelManagerContext();

package/lib/components/features/search/TMSearchQueryPanel.d.ts

@@ -23,6 +23,8 @@ interface ITMSearchQueryPanelProps {
     }>, tid?: number) => void;
     maxDcmtsToBeReturned?: number;
     onRefreshRequested?: () => Promise<void>;
+    /** Notifica il tipo documento riletto dal server prima di ogni ricerca, così il chiamante allinea il proprio descrittore */
+    onDcmtTypeReloaded?: (dtd: DcmtTypeDescriptor) => void;
 }
 declare const TMSearchQueryPanel: React.FunctionComponent<ITMSearchQueryPanelProps>;
 export default TMSearchQueryPanel;

package/lib/components/features/search/TMSearchQueryPanel.js

@@ -24,7 +24,7 @@ import TMToppyMessage from '../../../helper/TMToppyMessage';
 import TMMetadataSorterForm from './TMMetadataSorterForm';
 import TMMetadataOutputForm from './TMMetadataOutputForm';
 import TMTooltip from '../../base/TMTooltip';
-const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToResultButton, isExpertMode = SDKUI_Globals.userSettings.advancedSettings.expertMode === 1, SQD, inputMids, onSearchCompleted, onSqdSaved, onBack, onClosePanel, allowMaximize = true, onMaximizePanel, onBackToResult, passToArchiveCallback, maxDcmtsToBeReturned, onRefreshRequested }) => {
+const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToResultButton, isExpertMode = SDKUI_Globals.userSettings.advancedSettings.expertMode === 1, SQD, inputMids, onSearchCompleted, onSqdSaved, onBack, onClosePanel, allowMaximize = true, onMaximizePanel, onBackToResult, passToArchiveCallback, maxDcmtsToBeReturned, onRefreshRequested, onDcmtTypeReloaded }) => {
     const [confirmQueryParams, ConfirmQueryParamsDialog] = useQueryParametersDialog();
     const [qd, setQd] = useState();
     const [lastQdParams, setLastQdParams] = useState([]);
@@ -55,6 +55,7 @@ const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToRe
     const qdRef = useRef(undefined);
     const showAdvancedSearchRef = useRef(false);
     const searchAsyncRef = useRef();
+    const reloadMetadataAsyncRef = useRef();
     // Tornando dalla vista risultati il pannello dei metadati di ricerca riprende il focus,
     // così è lui quello evidenziato: prendendo il focus gli altri pannelli ricevono l'onBlur e si disattivano
     useEffect(() => {
@@ -173,10 +174,39 @@ const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToRe
             onSearchCompleted?.(results, searchResult?.qd, append);
         }
     };
+    // Tra l'apertura della ricerca e il click su Ricerca la lista dei metadati del tipo documento può essere
+    // cambiata (metadati aggiunti o rimossi lato amministrazione): prima di cercare si rileggono dal server.
+    // I valori digitati restano, mentre i filtri sui metadati non più disponibili vengono scartati.
+    // Restituisce il qd con cui eseguire la ricerca.
+    const reloadMetadataAsync = async (qdInput) => {
+        if (!qdInput?.from?.tid)
+            return qdInput;
+        let dcmtTypes;
+        try {
+            TMSpinner.show({ description: `${SDKUI_Localizator.Loading} ...`, backgroundColor: 'transparent' });
+            dcmtTypes = await getDcmtTypesByQdAsync(qdInput, true);
+        }
+        finally {
+            TMSpinner.hide();
+        }
+        // Rilettura non riuscita: si cerca con i metadati che si hanno, senza scartare nulla
+        if (dcmtTypes.length <= 0)
+            return qdInput;
+        setDcmtTypesList(dcmtTypes);
+        const reloadedFromDTD = dcmtTypes.find(o => o.id === qdInput.from?.tid);
+        if (reloadedFromDTD)
+            onDcmtTypeReloaded?.(reloadedFromDTD);
+        const { qd: newQd, removedCount } = dropUnavailableMetadataFromQd(qdInput, dcmtTypes);
+        if (removedCount <= 0)
+            return qdInput;
+        setQd(newQd);
+        return newQd;
+    };
     // Allineati a ogni render: runSearch li legge quando esegue, non quando viene creata
     qdRef.current = qd;
     showAdvancedSearchRef.current = showAdvancedSearch;
     searchAsyncRef.current = searchAsync;
+    reloadMetadataAsyncRef.current = reloadMetadataAsync;
     // Unico punto di avvio della ricerca: bottone Ricerca, Ricerca e accoda e tasto Invio passano tutti da qui
     const runSearch = useCallback((append) => {
         if (isSearchingRef.current)
@@ -188,7 +218,9 @@ const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToRe
         // Alcuni editor committano il valore in modo asincrono: si attende un tick prima di leggere il qd definitivo
         setTimeout(async () => {
             try {
-                await searchAsyncRef.current?.(qdRef.current, showAdvancedSearchRef.current, append);
+                // I metadati si rileggono a ogni ricerca: si cerca sempre sulla lista aggiornata
+                const qdToSearch = await reloadMetadataAsyncRef.current?.(qdRef.current) ?? qdRef.current;
+                await searchAsyncRef.current?.(qdToSearch, showAdvancedSearchRef.current, append);
             }
             catch (ex) {
                 TMExceptionBoxManager.show({ exception: ex });
@@ -418,6 +450,33 @@ const TMSearchQueryPanel = ({ isSearchViewOnScreen = true, fromDTD, showBackToRe
                     } })] }));
 };
 export default TMSearchQueryPanel;
+/** Scarta dal qd filtri, colonne e ordinamenti sui metadati non più esistenti o non più accessibili, in base
+ *  alla lista dei metadati appena riletta dal server. I valori digitati su quelli ancora presenti si mantengono. */
+const dropUnavailableMetadataFromQd = (qdInput, dcmtTypes) => {
+    const metadataOf = (tid) => dcmtTypes.find(o => o.id === tid)?.metadata;
+    // Un tipo documento non riletto non è verificabile: i suoi item si mantengono così come sono.
+    // Sui metadati di sistema si verifica solo l'esistenza: i loro permessi non li rendono inutilizzabili.
+    const isStillAvailable = (tid, mid, isUsable) => {
+        const metadata = metadataOf(tid);
+        if (!metadata || metadata.length <= 0 || mid == undefined)
+            return true;
+        const md = metadata.find(o => o.id === mid);
+        if (!md)
+            return false;
+        return md.isSystem == 1 || isUsable(md);
+    };
+    const canSearch = (md) => md.perm?.canSearch != AccessLevels.No;
+    const canOutput = (md) => !(md.perm?.canView == AccessLevels.No && md.perm?.canUpdate == AccessLevels.No);
+    const where = qdInput.where?.filter(o => isStillAvailable(o.tid, o.mid, canSearch)) ?? [];
+    const select = qdInput.select?.filter(o => isStillAvailable(o.tid, o.mid, canOutput)) ?? [];
+    const orderBy = qdInput.orderBy?.filter(o => isStillAvailable(o.tid, o.mid, canOutput)) ?? [];
+    const removedCount = ((qdInput.where?.length ?? 0) - where.length)
+        + ((qdInput.select?.length ?? 0) - select.length)
+        + ((qdInput.orderBy?.length ?? 0) - orderBy.length);
+    let qd = new QueryDescriptor();
+    qd.init({ ...qdInput, where: where, select: select, orderBy: orderBy });
+    return { qd: qd, removedCount: removedCount };
+};
 const searchByQdAsync = async (qdInput, searchParams) => {
     let result;
     let qdSearch;

package/lib/helper/queryHelper.d.ts

@@ -5,7 +5,10 @@ export type TID_Alias = {
     alias: string | undefined;
 };
 export declare const getTIDsByQd: (qd: QueryDescriptor | undefined) => TID_Alias[];
-export declare const getDcmtTypesByQdAsync: (qd: QueryDescriptor) => Promise<import("@topconsultnpm/sdk-ts").DcmtTypeDescriptor[]>;
+/** Restituisce i tipi documento (con metadati) referenziati da qd.
+ *  Con refreshCache = true i descrittori vengono riletti dal server, così la lista dei metadati
+ *  recepisce quelli aggiunti o rimossi dopo il popolamento della cache. */
+export declare const getDcmtTypesByQdAsync: (qd: QueryDescriptor, refreshCache?: boolean) => Promise<import("@topconsultnpm/sdk-ts").DcmtTypeDescriptor[]>;
 export declare const displayMetadataValue: (md: MetadataDescriptor | undefined, value: string | undefined, valueEmptyDescription?: string) => string;
 export declare const IsParametricQuery: (qd: QueryDescriptor | undefined) => boolean;
 export declare const addHiddenSelectItem: (select: SelectItem[], tid: number | undefined, mid: SystemMIDsAsNumber) => void;

package/lib/helper/queryHelper.js

@@ -15,8 +15,11 @@ export const getTIDsByQd = (qd) => {
     }
     return tids;
 };
-export const getDcmtTypesByQdAsync = async (qd) => {
-    return await DcmtTypeListCacheService.GetFromQdAsync(qd);
+/** Restituisce i tipi documento (con metadati) referenziati da qd.
+ *  Con refreshCache = true i descrittori vengono riletti dal server, così la lista dei metadati
+ *  recepisce quelli aggiunti o rimossi dopo il popolamento della cache. */
+export const getDcmtTypesByQdAsync = async (qd, refreshCache = false) => {
+    return await DcmtTypeListCacheService.GetFromQdAsync(qd, undefined, false, refreshCache);
 };
 export const displayMetadataValue = (md, value, valueEmptyDescription = "") => {
     if (!value)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.22.0-dev2.48",
+    "version": "6.22.0-dev2.49",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",