@topconsultnpm/sdkui-react-beta 6.9.44 → 6.9.45

package/lib/components/query/TMQueryEditor.d.ts

@@ -25,7 +25,7 @@ export declare const colorX = "rgb(246, 245, 242)";
 export declare enum Descriptors {
     Query = 3
 }
-export declare function useOrchApplyForm<T>(d: Descriptors, formMode: FormModes, inputData: T | undefined, onApplied?: (newDescriptor: T) => void, parameters?: any[]): {
+export declare function useQueryApplyForm<T>(d: Descriptors, formMode: FormModes, inputData: T | undefined, onApplied?: (newDescriptor: T) => void, parameters?: any[]): {
     formData: T;
     setFormData: React.Dispatch<React.SetStateAction<T>>;
     formDataOrig: T;
@@ -35,7 +35,6 @@ export declare function useOrchApplyForm<T>(d: Descriptors, formMode: FormModes,
     applyData: () => void;
 };
 interface ITMQueryEditor extends ITMApplyFormProps<QueryDescriptor> {
-    runQdImmediately?: boolean;
     validateSelect?: boolean;
     validateOrderBy?: boolean;
     showDistinct?: boolean;

package/lib/components/query/TMQueryEditor.js

@@ -51,7 +51,7 @@ export var Descriptors;
 (function (Descriptors) {
     Descriptors[Descriptors["Query"] = 3] = "Query";
 })(Descriptors || (Descriptors = {}));
-export function useOrchApplyForm(d, formMode, inputData, onApplied, parameters) {
+export function useQueryApplyForm(d, formMode, inputData, onApplied, parameters) {
     const newData = () => {
         switch (d) {
             case Descriptors.Query: return SearchEngine.NewQueryDescriptor();
@@ -62,9 +62,9 @@ export function useOrchApplyForm(d, formMode, inputData, onApplied, parameters)
     const [validationItems, setValidationItems] = useState([]);
     return { formData, setFormData, formDataOrig, validationItems, setValidationItems, exception, applyData };
 }
-const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = false, isModal, showDistinct = false, showToolbar = true, validateSelect = true, validateOrderBy = true, raiseWarningForOnlyMetadataDcmtTypes = false, onApplied, onClose, height = 'auto', borderRadius = '4px', searchText, showApply, showUndo, showBack, onFromTIDChanged }) => {
+const TMQueryEditor = ({ formMode, inputData, onQDChanged, isModal, showDistinct = false, showToolbar = true, validateSelect = true, validateOrderBy = true, raiseWarningForOnlyMetadataDcmtTypes = false, onApplied, onClose, height = 'auto', borderRadius = '4px', searchText, showApply, showUndo, showBack, onFromTIDChanged }) => {
     const [confirmQueryParams, ConfirmQueryParamsDialog] = useQueryParametersDialog();
-    const { formData, setFormData, formDataOrig, validationItems, setValidationItems, exception, applyData } = useOrchApplyForm(Descriptors.Query, formMode, inputData, onApplied);
+    const { formData, setFormData, formDataOrig, validationItems, setValidationItems, exception, applyData } = useQueryApplyForm(Descriptors.Query, formMode, inputData, onApplied);
     const [dcmtTypesList, setDcmtTypesList] = useState([]);
     const [lastQdParams, setLastQdParams] = useState([]);
     const [resultSearch, setResultSearch] = useState();
@@ -74,7 +74,7 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
     const [showCompleteMetadataName, setShowCompleteMetadataName] = useState(false);
     const [showResultSearch, setShowResultSearch] = useState(false);
     const [fromCount, setFromCount] = useState(0);
-    useEffect(() => { setShowResultSearch(false); }, [inputData]);
+    useEffect(() => { setShowResultSearch(false); }, [JSON.stringify(inputData)]);
     useEffect(() => {
         if (!formData)
             return;
@@ -85,9 +85,7 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
     useEffect(() => { validateQd(); }, [formData.select, formData.where, formData.orderBy, formData.maxDcmtsToBeReturned]);
     //Se non c'è la toolbar significa che il qd deve essere gestito dall'esterno
     useEffect(() => { if (!showToolbar)
-        onQDChanged?.(formData); }, [formData]);
-    useEffect(() => { if (runQdImmediately)
-        onSearchAsync().catch((err) => { TMExceptionBoxManager.show({ exception: err }); }); }, [runQdImmediately]);
+        onQDChanged?.(formData); }, [JSON.stringify(formData)]);
     const validateQd = () => {
         let vil = [];
         let qvo = new QueryValidatorOptions();
@@ -573,28 +571,28 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
     // #endregion
     // #region Ricerca 
     const renderResultSearchForm = _jsx(TMQueryResultForm, { context: SearchResultContext.METADATA_SEARCH, onClose: () => { setShowResultSearch(false); }, isModal: isModal, result1: resultSearch, elapsedTime: elapsedTime, searchText: searchText });
-    const onSearchAsync = async () => {
+    const onSearchAsync = async (qdInput) => {
         try {
             const startTime = new Date().getTime();
-            let qd = await prepareQdForSearchAsync(formData);
-            if (IsParametricQuery(qd)) {
-                const qdParams = await confirmQueryParams(qd, lastQdParams);
+            let qdSearch = await prepareQdForSearchAsync(qdInput);
+            if (IsParametricQuery(qdSearch)) {
+                const qdParams = await confirmQueryParams(qdSearch, lastQdParams);
                 setLastQdParams(qdParams);
                 if (!qdParams || qdParams.length <= 0)
                     return;
                 for (const qpd of qdParams) {
-                    let wi = qd.where?.find(o => o.value1 == qpd.name);
+                    let wi = qdSearch.where?.find(o => o.value1 == qpd.name);
                     if (wi)
                         wi.value1 = wi.value1?.replace(wi.value1, !qpd.value ? '' : qpd.value.toString());
                     else {
-                        wi = qd.where?.find(o => o.value2 == qpd.name);
+                        wi = qdSearch.where?.find(o => o.value2 == qpd.name);
                         if (wi)
                             wi.value2 = wi.value2?.replace(wi.value2, !qpd.value ? '' : qpd.value.toString());
                     }
                 }
             }
             TMSpinner.show({ description: `${SDKUI_Localizator.Search} ...`, backgroundColor: 'transparent' });
-            let result = await SDK_Globals.tmSession?.NewSearchEngine().SearchByIDAsync(qd);
+            let result = await SDK_Globals.tmSession?.NewSearchEngine().SearchByIDAsync(qdSearch);
             let dcmtsFound = result?.dcmtsFound ?? 0;
             if (dcmtsFound <= 0)
                 ShowAlert({ message: SDKUI_Localizator.NoDcmtFound, mode: 'info', title: SDKUI_Localizator.SearchResult, duration: 3000 });
@@ -679,7 +677,7 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
         }
     };
     // #endregion
-    return (_jsxs(_Fragment, { children: [_jsxs(TMApplyForm, { isModal: false, formMode: formMode, isModified: calcIsModified(formData, formDataOrig), exception: exception, validationItems: validationItems, hasNavigation: false, customToolbarElements: _jsxs(_Fragment, { children: [_jsx(TMButton, { btnStyle: 'toolbar', caption: SDKUI_Localizator.Search, color: 'tertiary', icon: _jsx(IconSearch, {}), disabled: errorsCount > 0, onClick: onSearchAsync }), _jsx(TMButton, { btnStyle: 'toolbar', caption: SDKUI_Localizator.Count, icon: _jsx(IconCount, {}), disabled: errorsCount > 0, onClick: () => getQueryCountAsync(formData, true) }), SDK_Globals.tmSession?.SessionDescr?.appModuleID == AppModules.SURFER && _jsx(TMButton, { caption: "Passa ad archiviazione", icon: _jsx(IconArchiveDoc, {}), btnStyle: 'toolbar', fontSize: '1.3rem', onClick: () => { ShowAlert({ message: "TODO Passa ad archiviazione", mode: 'info', title: `${"TODO"}`, duration: 3000 }); } }), SDK_Globals.tmSession?.SessionDescr?.appModuleID == AppModules.SURFER && _jsx(TMButton, { caption: "Vai a risultato", icon: _jsx(IconArrowRight, {}), btnStyle: 'toolbar', fontSize: '1.3rem', onClick: () => { ShowAlert({ message: "TODO Vai a risultato", mode: 'info', title: `${"TODO"}`, duration: 3000 }); } })] }), showToolbar: showToolbar, showApply: showApply, showUndo: showUndo, showBack: showBack, onApply: () => applyData(), onClose: () => onClose?.(), onUndo: () => setFormData(formDataOrig), children: [_jsxs(Accordion, { elementAttr: { class: 'tm-query-dx-accordion' }, height: height, multiple: true, collapsible: true, repaintChangesOnly: true, deferRendering: false, animationDuration: 0, onContentReady: (e) => {
+    return (_jsxs(_Fragment, { children: [_jsxs(TMApplyForm, { isModal: false, formMode: formMode, isModified: calcIsModified(formData, formDataOrig), exception: exception, validationItems: validationItems, hasNavigation: false, customToolbarElements: _jsxs(_Fragment, { children: [_jsx(TMButton, { btnStyle: 'toolbar', caption: SDKUI_Localizator.Search, color: 'tertiary', icon: _jsx(IconSearch, {}), disabled: errorsCount > 0, onClick: async () => await onSearchAsync(formData) }), _jsx(TMButton, { btnStyle: 'toolbar', caption: SDKUI_Localizator.Count, icon: _jsx(IconCount, {}), disabled: errorsCount > 0, onClick: () => getQueryCountAsync(formData, true) }), SDK_Globals.tmSession?.SessionDescr?.appModuleID == AppModules.SURFER && _jsx(TMButton, { caption: "Passa ad archiviazione", icon: _jsx(IconArchiveDoc, {}), btnStyle: 'toolbar', fontSize: '1.3rem', onClick: () => { ShowAlert({ message: "TODO Passa ad archiviazione", mode: 'info', title: `${"TODO"}`, duration: 3000 }); } }), SDK_Globals.tmSession?.SessionDescr?.appModuleID == AppModules.SURFER && _jsx(TMButton, { caption: "Vai a risultato", icon: _jsx(IconArrowRight, {}), btnStyle: 'toolbar', fontSize: '1.3rem', onClick: () => { ShowAlert({ message: "TODO Vai a risultato", mode: 'info', title: `${"TODO"}`, duration: 3000 }); } })] }), showToolbar: showToolbar, showApply: showApply, showUndo: showUndo, showBack: showBack, onApply: () => applyData(), onClose: () => onClose?.(), onUndo: () => setFormData(formDataOrig), children: [_jsxs(Accordion, { elementAttr: { class: 'tm-query-dx-accordion' }, height: height, multiple: true, collapsible: true, repaintChangesOnly: true, deferRendering: false, animationDuration: 0, onContentReady: (e) => {
                             let items = e.component.option("items");
                             if (items && items.length > 0) {
                                 for (let i = 0; i < items.length; i++) {

package/lib/hooks/useQueryParametersDialog.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { QueryParameterDescriptor } from '@topconsultnpm/sdk-ts-beta';
 import { TMModal, TMTextBox, TMButton } from "../components";
 import { IconApply, IconCloseOutline, SDKUI_Localizator } from "../helper";
@@ -10,6 +10,11 @@ export const useQueryParametersDialog = () => {
     const [open, setOpen] = useState(false);
     const [qdParams, setQdParams] = useState([]);
     let qdParamsOut = [];
+    useEffect(() => {
+        for (const qdp of qdParams) {
+            qdParamsOut.push(qdp);
+        }
+    }, [qdParams]);
     const confirmQueryParams = (inputQd, lastQdParams) => new Promise((resolve, reject) => {
         if (inputQd.where) {
             let newQueryParams = [];

package/package.json

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