@topconsultnpm/sdkui-react-beta 6.16.43 → 6.16.44

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

@@ -274,12 +274,7 @@ const searchByQdAsync = async (qdInput, searchParams) => {
     let result;
     let qdSearch;
     try {
-        qdSearch = await prepareQdForSearchAsync(qdInput);
-        // In modalità easy rimuovi filtri non valorizzati
-        if (!searchParams.isAdvancedSearch) {
-            qdSearch.where = qdSearch?.where?.filter(o => PlatformObjectValidator.WhereItemHasValues(o));
-            qdSearch.where?.forEach(o => o.or = false); // props.easyOr
-        }
+        qdSearch = await prepareQdForSearchAsync(qdInput, !searchParams.isAdvancedSearch);
         qdSearch.select?.forEach(o => { o.visibility ??= SelectItemVisibilities.Visible; });
         if (IsParametricQuery(qdSearch)) {
             const qdParams = await searchParams.confirmQueryParams?.(qdSearch, searchParams.lastQdParams) ?? [];

package/lib/helper/queryHelper.d.ts

@@ -9,7 +9,8 @@ export declare const getDcmtTypesByQdAsync: (qd: QueryDescriptor) => Promise<imp
 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;
-export declare const prepareQdForSearchAsync: (qdInput?: QueryDescriptor) => Promise<QueryDescriptor>;
+export declare const prepareQdForSearchAsync: (qdInput?: QueryDescriptor, removeWhereItemNoValue?: boolean) => Promise<QueryDescriptor>;
+export declare function addWhereClausesForConnect(qd: QueryDescriptor): void;
 export declare function getDefaultOperator(dataDomain: MetadataDataDomains | undefined, dataType: MetadataDataTypes | undefined): QueryOperators.Equal | QueryOperators.Contain | QueryOperators.In;
 export declare const getQD: (tid: number | undefined, easyOr: boolean) => Promise<QueryDescriptor | undefined>;
 export declare const getWorkItemSetIDAsync: (vid: number, did: number) => Promise<string | undefined>;

package/lib/helper/queryHelper.js

@@ -1,4 +1,4 @@
-import { AccessLevels, MetadataDataDomains, DcmtTypeListCacheService, SystemMIDsAsNumber, MetadataDataTypes, QueryDescriptor, QueryFunctions, SelectItem, SelectItemVisibilities, FromItem, LayoutModes, QueryOperators, SavedQueryDescriptor, SearchEngine, WhereItem, OrderByItem, SDK_Globals, AppModules, SystemTIDs, WorkItemMetadataNames } from '@topconsultnpm/sdk-ts-beta';
+import { AccessLevels, MetadataDataDomains, DcmtTypeListCacheService, SystemMIDsAsNumber, MetadataDataTypes, QueryDescriptor, QueryFunctions, SelectItem, SelectItemVisibilities, FromItem, LayoutModes, QueryOperators, SavedQueryDescriptor, SearchEngine, WhereItem, OrderByItem, SDK_Globals, AppModules, SystemTIDs, WorkItemMetadataNames, PlatformObjectValidator } from '@topconsultnpm/sdk-ts-beta';
 import { DateDisplayTypes, Globalization } from './Globalization';
 import { DraftsMIDs, MetadataValueDescriptorEx } from '../ts';
 import { SDKUI_Localizator } from './SDKUI_Localizator';
@@ -55,12 +55,17 @@ export const addHiddenSelectItem = (select, tid, mid) => {
     si.visibility = SelectItemVisibilities.Hidden;
     select.push(si);
 };
-export const prepareQdForSearchAsync = async (qdInput) => {
+export const prepareQdForSearchAsync = async (qdInput, removeWhereItemNoValue) => {
     let qd = new QueryDescriptor();
     qd.init({ ...qdInput });
     let fromTID = qd?.from?.tid;
     qd.select ??= [];
     qd.orderBy ??= [];
+    // In modalità easy rimuovi filtri non valorizzati
+    if (removeWhereItemNoValue) {
+        qd.where = qd?.where?.filter(o => PlatformObjectValidator.WhereItemHasValues(o));
+        qd.where?.forEach(o => o.or = false); // props.easyOr
+    }
     let qdWithAggrFunctions = qd.select?.some(o => o.function != QueryFunctions.None && o.function != undefined);
     if (!qd.isDistinct && !qdWithAggrFunctions) {
         addHiddenSelectItem(qd.select, fromTID, SystemMIDsAsNumber.TID);
@@ -101,16 +106,17 @@ export const prepareQdForSearchAsync = async (qdInput) => {
         }
     }
     qd.isLexProt = 1;
-    //Apply Filters for Connectors
+    // Apply Filters for Connectors
     addWhereClausesForConnect(qd);
     return qd;
 };
-function addWhereClausesForConnect(qd) {
+export function addWhereClausesForConnect(qd) {
     switch (SDK_Globals.tmSession?.SessionDescr?.appModuleID) {
         case AppModules.EXCEL_CONNECTOR:
         case AppModules.OUTLOOK_CONNECTOR:
         case AppModules.POWERPOINT_CONNECTOR:
         case AppModules.WORD_CONNECTOR:
+        case AppModules.SURFER:
             break; // Continua l'esecuzione per questi moduli
         default:
             return; // Esci dalla funzione per tutti gli altri moduli
@@ -129,7 +135,7 @@ function addWhereClausesForConnect(qd) {
     }
     qd.where ??= [];
     // ( <filtri utente> ) AND FileCount > 0 [AND FileExt IN (....)]
-    if (qd.where.length > 2) {
+    if (qd.where.length >= 2) {
         qd.where[0].leftBrackets = '(' + qd.where[0].leftBrackets;
         qd.where[qd.where.length - 1].rightBrackets += ')';
     }

package/package.json

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