@topconsultnpm/sdkui-react 6.19.0-dev1.9 → 6.19.0-dev2.2

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

@@ -42,24 +42,53 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
     const isMobile = deviceType === DeviceType.MOBILE;
     let initialMaxItems = deviceType === DeviceType.MOBILE ? 8 : 12;
     const appliedInputMidsRef = useRef(null);
+    const pendingMidsRef = useRef(null);
     useEffect(() => {
         if (!SQD)
             return;
         setDataAsync(SQD);
     }, [SQD]);
     useEffect(() => {
-        if (!inputMids || inputMids.length === 0 || !qd || !fromDTD)
+        pendingMidsRef.current = inputMids ?? null;
+    }, [inputMids]);
+    useEffect(() => {
+        if (!fromDTD)
             return;
-        if (appliedInputMidsRef.current && deepCompare(appliedInputMidsRef.current, inputMids))
+        // Reset appliedInputMidsRef when TID changes so pending mids can be applied to new TID
+        appliedInputMidsRef.current = null;
+        const initQd = async () => {
+            // Only initialize if qd doesn't exist or is for a different TID
+            if (!qd || qd.from?.tid !== fromDTD.id) {
+                const newQd = await getQD(fromDTD.id, false);
+                if (newQd) {
+                    setQd(newQd);
+                }
+            }
+        };
+        initQd();
+    }, [fromDTD?.id]);
+    // Apply inputMids when qd is ready and matches fromDTD
+    useEffect(() => {
+        if (!qd || !fromDTD || qd.from?.tid !== fromDTD.id)
             return;
-        appliedInputMidsRef.current = inputMids;
+        const midsToApply = pendingMidsRef.current;
+        if (!midsToApply || midsToApply.length === 0)
+            return;
+        if (appliedInputMidsRef.current && deepCompare(appliedInputMidsRef.current, midsToApply))
+            return;
+        appliedInputMidsRef.current = midsToApply;
         const newWhere = qd.where?.map((curItem) => {
             let newWi = new WhereItem();
             newWi.init({ ...curItem, value1: undefined, value2: undefined });
             return newWi;
         }) || [];
-        inputMids.forEach(im => {
+        midsToApply.forEach(im => {
             const md = fromDTD.metadata?.find(m => m.id === im.mid);
+            // Skip MIDs that don't belong to this TID
+            if (!md) {
+                console.warn(`MID ${im.mid} does not belong to TID ${fromDTD.id}, skipping`);
+                return;
+            }
             const defaultOperator = getDefaultOperator(md?.dataDomain, md?.dataType);
             let existingWi = newWhere.find(wi => wi.mid === im.mid);
             if (existingWi) {
@@ -78,7 +107,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         });
         setQd({ ...qd, where: newWhere });
         setShowAllMdWhere(true);
-    }, [inputMids, qd, fromDTD]);
+    }, [qd, fromDTD, inputMids]);
     // Eseguire la ricerca quando shouldSearch è true e qd è definito
     useEffect(() => {
         if (shouldSearch && qd) {
@@ -193,8 +222,8 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         const outputMids = qd.where
             .filter(wi => wi.mid && wi.value1 && wi.value1.length > 0)
             .map(wi => ({ mid: wi.mid, value: wi.value1 }));
-        passToArchiveCallback(outputMids);
-    }, [passToArchiveCallback, qd?.where]);
+        passToArchiveCallback(outputMids, fromDTD?.id);
+    }, [passToArchiveCallback, qd?.where, fromDTD?.id]);
     const handleCloseFiltersConfig = useCallback(() => setShowFiltersConfig(false), []);
     const handleChooseFilters = useCallback((tid_mids) => {
         if (!fromDTD?.metadata)

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

@@ -1,9 +1,16 @@
 import React from 'react';
-import { SearchResultDescriptor, DcmtTypeDescriptor, TaskDescriptor, WorkingGroupDescriptor } from '@topconsultnpm/sdk-ts';
+import { SearchResultDescriptor, DcmtTypeDescriptor, TaskDescriptor, WorkingGroupDescriptor, ObjectRef, HomeBlogPost } from '@topconsultnpm/sdk-ts';
 import { DcmtInfo, SearchResultContext, TaskContext } from '../../../ts';
 import { TMSearchResultFloatingActionConfig } from './TMSearchResultFloatingActionButton';
 export declare const getSearchResultCountersSingleCategory: (searchResults: SearchResultDescriptor[]) => string;
 interface ITMSearchResultProps {
+    allTasks?: Array<TaskDescriptor>;
+    getAllTasks?: () => Promise<void>;
+    deleteTaskByIdsCallback?: (deletedTaskIds: Array<number>) => Promise<void>;
+    addTaskCallback?: (task: TaskDescriptor) => Promise<void>;
+    editTaskCallback?: (task: TaskDescriptor) => Promise<void>;
+    handleNavigateToWGs?: (value: HomeBlogPost | number) => Promise<void>;
+    handleNavigateToDossiers?: (value: HomeBlogPost | number) => Promise<void>;
     context?: SearchResultContext;
     title?: string;
     searchResults: SearchResultDescriptor[] | undefined;
@@ -15,6 +22,7 @@ interface ITMSearchResultProps {
     showSearchResultSidebar?: boolean;
     showSelector?: boolean;
     showToolbarHeader?: boolean;
+    showBackButton?: boolean;
     groupId?: string;
     selectedSearchResultTID?: number;
     workingGroupContext?: WorkingGroupDescriptor;
@@ -39,6 +47,7 @@ interface ITMSearchResultProps {
         value: string;
     }>, tid?: number) => void;
     showTodoDcmtForm?: boolean;
+    onReferenceClick?: (ref: ObjectRef) => void;
 }
 declare const TMSearchResult: React.FC<ITMSearchResultProps>;
 export default TMSearchResult;