@topconsultnpm/sdkui-react-beta 6.9.43 → 6.9.45

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,10 +62,11 @@ 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();
     const [elapsedTime, setElapsedTime] = useState(0);
     const [draggingItem, setDraggingItem] = useState();
@@ -73,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;
@@ -84,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();
@@ -572,27 +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);
+            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 });
@@ -677,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/components/query/TMQueryResult.d.ts

@@ -1,10 +1,10 @@
 import { SearchResultDescriptor } from '@topconsultnpm/sdk-ts-beta';
 declare const TMQueryResult: ({ result, elapsedTime, showHiddenSelectItems, searchText, onSelectionChanged, onDblClick }: {
-    onDblClick?: (() => void) | undefined;
-    onSelectionChanged?: ((e: any[]) => void) | undefined;
+    onDblClick?: () => void;
+    onSelectionChanged?: (e: any[]) => void;
     result: SearchResultDescriptor | undefined;
-    elapsedTime?: number | undefined;
-    showHiddenSelectItems?: boolean | undefined;
-    searchText?: string | undefined;
+    elapsedTime?: number;
+    showHiddenSelectItems?: boolean;
+    searchText?: string;
 }) => import("react/jsx-runtime").JSX.Element;
 export default TMQueryResult;

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

@@ -6,17 +6,17 @@ export declare enum SearchResultContext {
     RECENT = "recent"
 }
 declare const TMQueryResultForm: ({ onUpdate, isModal, onClose, context, result1, result2, elapsedTime, searchText, tabIcon1, tabIcon2, tabTitle1, tabTitle2 }: {
-    tabTitle1?: string | undefined;
-    tabTitle2?: string | undefined;
+    tabTitle1?: string;
+    tabTitle2?: string;
     tabIcon1?: any;
     tabIcon2?: any;
-    isModal?: boolean | undefined;
-    onClose?: (() => void) | undefined;
-    context?: SearchResultContext | undefined;
-    result1?: SearchResultDescriptor | SearchResultDescriptor[] | undefined;
-    result2?: SearchResultDescriptor | SearchResultDescriptor[] | undefined;
-    elapsedTime?: number | undefined;
-    searchText?: string | undefined;
-    onUpdate?: (() => Promise<void>) | undefined;
+    isModal?: boolean;
+    onClose?: () => void;
+    context?: SearchResultContext;
+    result1?: SearchResultDescriptor | SearchResultDescriptor[];
+    result2?: SearchResultDescriptor | SearchResultDescriptor[];
+    elapsedTime?: number;
+    searchText?: string;
+    onUpdate?: () => Promise<void>;
 }) => import("react/jsx-runtime").JSX.Element;
 export default TMQueryResultForm;

package/lib/components/sidebar/TMHeader.d.ts

@@ -24,8 +24,8 @@ interface ITMHeader {
     onSettingsClick?: () => void;
 }
 export declare const TMSearchBar: ({ searchValue, onSearchValueChanged, maxWidth, marginLeft }: {
-    maxWidth?: string | undefined;
-    marginLeft?: string | undefined;
+    maxWidth?: string;
+    marginLeft?: string;
     searchValue: string;
     onSearchValueChanged: (value: string) => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/lib/components/viewers/TMDataListItemViewer.d.ts

@@ -1,9 +1,9 @@
 import { DataListViewModes } from '@topconsultnpm/sdk-ts-beta';
 import { DataGridTypes } from 'devextreme-react/cjs/data-grid';
 declare const TMDataListItemViewer: ({ dataListId, value, viewMode }: {
-    dataListId?: number | undefined;
-    value?: string | undefined;
-    viewMode?: DataListViewModes | undefined;
+    dataListId?: number;
+    value?: string;
+    viewMode?: DataListViewModes;
 }) => import("react/jsx-runtime").JSX.Element;
 export default TMDataListItemViewer;
 export declare const cellRenderDataListItem: (data: DataGridTypes.ColumnCellTemplateData, dataListId?: number, viewMode?: DataListViewModes) => import("react/jsx-runtime").JSX.Element;

package/lib/components/viewers/TMMidViewer.d.ts

@@ -3,12 +3,12 @@ import { ITopMediaSession, LayoutModes, MetadataDescriptor } from '@topconsultnp
 import { TID_MID } from '../../ts';
 import { DataGridTypes } from 'devextreme-react/cjs/data-grid';
 export declare const TMMidViewer: ({ tmSession, tid_mid, showCompleteName, showIcon, showId, noneSelectionText }: {
-    tmSession?: ITopMediaSession | undefined;
+    tmSession?: ITopMediaSession;
     tid_mid: TID_MID | undefined;
-    showCompleteName?: boolean | undefined;
-    showIcon?: boolean | undefined;
-    showId?: boolean | undefined;
-    noneSelectionText?: string | undefined;
+    showCompleteName?: boolean;
+    showIcon?: boolean;
+    showId?: boolean;
+    noneSelectionText?: string;
 }) => import("react/jsx-runtime").JSX.Element;
 interface ITMMetadataIcon {
     tid: number | undefined;

package/lib/components/viewers/TMTidViewer.d.ts

@@ -11,11 +11,11 @@ interface ITMDcmtTypeTooltip {
 }
 export declare const TMDcmtTypeTooltip: React.FC<ITMDcmtTypeTooltip>;
 declare const TMTidViewer: ({ tmSession, tid, showIcon, showId, noneSelectionText }: {
-    tmSession?: ITopMediaSession | undefined;
-    tid?: number | undefined;
-    showIcon?: boolean | undefined;
-    showId?: boolean | undefined;
-    noneSelectionText?: string | undefined;
+    tmSession?: ITopMediaSession;
+    tid?: number;
+    showIcon?: boolean;
+    showId?: boolean;
+    noneSelectionText?: string;
 }) => import("react/jsx-runtime").JSX.Element;
 export default TMTidViewer;
 export declare const cellRenderTID: (data: DataGridTypes.ColumnCellTemplateData, noneSelectionText?: string) => import("react/jsx-runtime").JSX.Element;

package/lib/helper/helpers.d.ts

@@ -4,7 +4,7 @@ import { AppModules, DataColumnDescriptor, ITopMediaSession, QueryDescriptor, Se
 import { FormModes, moduleTypes } from "../ts";
 declare const TABLET_WIDTH = 1024;
 declare const MOBILE_WIDTH = 640;
-declare const calcResponsiveDirection: (deviceType: DeviceType, desktopDir: 'horizontal' | 'vertical', tabletDir: 'horizontal' | 'vertical', mobileDir: 'horizontal' | 'vertical') => 'horizontal' | 'vertical';
+declare const calcResponsiveDirection: (deviceType: DeviceType, desktopDir: "horizontal" | "vertical", tabletDir: "horizontal" | "vertical", mobileDir: "horizontal" | "vertical") => "horizontal" | "vertical";
 declare const openApps: (appModule: AppModules, tmSession: ITopMediaSession, appRoutes?: any[]) => Promise<void>;
 export declare const setSDK_GlobalsInfoAsync: (tms: ITopMediaSession | undefined) => Promise<ITopMediaSession>;
 declare const calcResponsiveSizes: (deviceType: DeviceType | undefined, desktopSize: string, tabletSize: string, mobileSize: string) => string;

package/lib/hooks/useForm.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormModes } from "../ts";
 import { JobTypes, ObjectClasses, ValidationItem } from "@topconsultnpm/sdk-ts-beta";
 export declare class SaveFormOptions {

package/lib/hooks/useOutsideClick.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 export declare const useOutsideClick: (callback: (escPressed?: boolean) => void) => import("react").RefObject<HTMLDivElement>;
 export declare const useEscapeKeyPress: (callback: () => void) => import("react").RefObject<HTMLDivElement>;

package/lib/hooks/useQueryParametersDialog.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { QueryDescriptor, QueryParameterDescriptor } from '@topconsultnpm/sdk-ts-beta';
-export declare const useQueryParametersDialog: () => [(inputQd: QueryDescriptor) => Promise<QueryParameterDescriptor[]>, () => JSX.Element];
+export declare const useQueryParametersDialog: () => [(inputQd: QueryDescriptor, lastQdParams?: QueryParameterDescriptor[]) => Promise<QueryParameterDescriptor[]>, () => JSX.Element];

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,7 +10,12 @@ export const useQueryParametersDialog = () => {
     const [open, setOpen] = useState(false);
     const [qdParams, setQdParams] = useState([]);
     let qdParamsOut = [];
-    const confirmQueryParams = (inputQd) => new Promise((resolve, reject) => {
+    useEffect(() => {
+        for (const qdp of qdParams) {
+            qdParamsOut.push(qdp);
+        }
+    }, [qdParams]);
+    const confirmQueryParams = (inputQd, lastQdParams) => new Promise((resolve, reject) => {
         if (inputQd.where) {
             let newQueryParams = [];
             let id = 1;
@@ -19,6 +24,7 @@ export const useQueryParametersDialog = () => {
                     let qpd = new QueryParameterDescriptor();
                     qpd.id = id++;
                     qpd.name = wi.value1;
+                    qpd.value = lastQdParams?.find(o => o.id == qpd.id)?.value;
                     if (newQueryParams.findIndex(o => o.name == wi.value1) < 0)
                         newQueryParams.push(qpd);
                 }
@@ -26,6 +32,7 @@ export const useQueryParametersDialog = () => {
                     let qpd = new QueryParameterDescriptor();
                     qpd.id = id++;
                     qpd.name = wi.value2;
+                    qpd.value = lastQdParams?.find(o => o.id == qpd.id)?.value;
                     if (newQueryParams.findIndex(o => o.name == wi.value2) < 0)
                         newQueryParams.push(qpd);
                 }
@@ -50,12 +57,12 @@ export const useQueryParametersDialog = () => {
     const ConfirmQueryParamsDialog = () => {
         return (open ?
             _jsx(TMModal, { title: SDKUI_Localizator.QueryParamBind, height: "max-content", width: "400px", onClose: handleClose, children: _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: '5px', padding: '10px', height: '100%' }, children: [qdParams.map((qdp, index) => {
-                            return (_jsx(TMTextBox, { placeHolder: `${SDKUI_Localizator.EnterValue} ...`, label: qdp.name, autoFocus: index == 0, value: qdp.value, onValueChanged: (e) => {
-                                    qdParamsOut = qdParams.map((curItem) => {
-                                        if (curItem.id != qdp.id)
-                                            return curItem;
-                                        return { ...curItem, value: e.target.value };
-                                    });
+                            return (_jsx(TMTextBox, { placeHolder: `${SDKUI_Localizator.EnterValue} ...`, label: qdp.name, autoFocus: index == 0, value: qdp.value ?? '', onValueChanged: (e) => {
+                                    let newQdp = qdParamsOut.find(o => o.id == qdp.id);
+                                    if (newQdp)
+                                        newQdp.value = e.target.value;
+                                    else
+                                        qdParamsOut.push({ id: qdp.id, name: qdp.name, value: e.target.value });
                                 } }, qdp.id));
                         }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: '5px', paddingTop: '10px', justifyContent: 'flex-end', alignItems: 'center', height: '50px' }, children: [_jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconApply, {}), caption: "OK", advancedColor: TMColors.tertiary, onClick: handleConfirm }), _jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Cancel, onClick: handleCancel })] })] }) })
             : _jsx(_Fragment, {}));

package/package.json

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