npm - @topconsultnpm/sdkui-react - Versions diffs - 6.22.0-dev2.31 → 6.22.0-dev2.33 - Mend

@topconsultnpm/sdkui-react 6.22.0-dev2.31 → 6.22.0-dev2.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/components/features/search/TMSearch.js +4 -4
package/lib/components/features/search/TMSearchQueryPanel.d.ts +1 -0
package/lib/components/features/search/TMSearchQueryPanel.js +17 -2
package/lib/devextreme-license.d.ts +1 -0
package/lib/devextreme-license.js +3 -0
package/lib/index.js +2 -1
package/package.json +69 -68

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

@@ -208,10 +208,10 @@ const TMSearch = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTask
             SDKUI_Globals.userSettings.searchSettings.mruTIDs = newMruTIDS;
             setMruTIDs(newMruTIDS);
         } }), [mruTIDs, currentMruTID, deviceType]);
-    const tmSearchQueryPanelElement = useMemo(() => _jsx(TMSearchQueryPanelWrapper, { passToArchiveCallback: passToArchiveCallback, isExpertMode: isExpertMode, showBackToResultButton: searchResult.length > 0, fromDTD: fromDTD, SQD: currentSQD, inputMids: inputMids, maxDcmtsToBeReturned: maxDcmtsToBeReturned, onBackToResult: () => { setCurrentSearchView(TMSearchViews.Result); }, onSearchCompleted: handleSearchCompleted, 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, onSqdSaved: async (newSqd) => {
             await loadDataSQDsAsync(true, newSqd.masterTID);
             await setSQDAsync(newSqd);
-        } }), [fromDTD, showSearchResults, setShowSearchResults, currentSQD, isExpertMode, mruTIDs, searchResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, handleSearchCompleted]);
+        } }), [fromDTD, showSearchResults, setShowSearchResults, currentSQD, currentSearchView, isExpertMode, mruTIDs, searchResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned, handleSearchCompleted]);
     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) => {
@@ -298,11 +298,11 @@ const TMRecentsManagerWrapper = ({ mruTIDs, currentMruTID, deviceType, onSelecte
             onDeletedTID?.(tid);
         } }));
 };
-const TMSearchQueryPanelWrapper = ({ fromDTD, SQD, isExpertMode, showBackToResultButton, onSearchCompleted, onSqdSaved, onBackToResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned }) => {
+const TMSearchQueryPanelWrapper = ({ isSearchViewOnScreen, fromDTD, SQD, isExpertMode, showBackToResultButton, onSearchCompleted, onSqdSaved, onBackToResult, passToArchiveCallback, inputMids, maxDcmtsToBeReturned }) => {
     const { setPanelVisibilityById, toggleMaximize, countVisibleLeafPanels } = useTMPanelManagerContext();
     const deviceType = useDeviceType();
     const isMobile = deviceType === DeviceType.MOBILE;
-    return (_jsx(TMSearchQueryPanel, { 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, 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, 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 CHANGED Viewed

@@ -1,6 +1,7 @@
 import React from 'react';
 import { DcmtTypeDescriptor, QueryDescriptor, SavedQueryDescriptor, SearchResultDescriptor } from '@topconsultnpm/sdk-ts';
 interface ITMSearchQueryPanelProps {
+    isSearchViewOnScreen?: boolean;
     fromDTD?: DcmtTypeDescriptor;
     SQD?: SavedQueryDescriptor;
     isExpertMode?: boolean;

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

@@ -24,7 +24,7 @@ import TMToppyMessage from '../../../helper/TMToppyMessage';
 import TMMetadataSorterForm from './TMMetadataSorterForm';
 import TMMetadataOutputForm from './TMMetadataOutputForm';
 import TMTooltip from '../../base/TMTooltip';
-const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SDKUI_Globals.userSettings.advancedSettings.expertMode === 1, SQD, inputMids, onSearchCompleted, onSqdSaved, onBack, onClosePanel, allowMaximize = true, onMaximizePanel, onBackToResult, passToArchiveCallback, maxDcmtsToBeReturned }) => {
+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 }) => {
     const [confirmQueryParams, ConfirmQueryParamsDialog] = useQueryParametersDialog();
     const [qd, setQd] = useState();
     const [shouldSearch, setShouldSearch] = useState(false);
@@ -44,10 +44,25 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
     const deviceType = useDeviceType();
     const isMobile = deviceType === DeviceType.MOBILE;
     let initialMaxItems = deviceType === DeviceType.MOBILE ? 8 : 12;
+    const tmPanelRef = useRef(null);
+    // Passando nella vista risultati si prenota il focus, che verrà ripreso al rientro nella ricerca
+    const shouldRefocusOnReturnRef = useRef(false);
     const appliedInputMidsRef = useRef(null);
     const pendingMidsRef = useRef(null);
     // Flag "accoda": impostato dall'azione secondaria del bottone Ricerca, consumato in executeSearch
     const appendNextSearchRef = useRef(false);
+    // 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(() => {
+        if (!isSearchViewOnScreen) {
+            shouldRefocusOnReturnRef.current = true;
+            return;
+        }
+        if (!shouldRefocusOnReturnRef.current)
+            return;
+        shouldRefocusOnReturnRef.current = false;
+        tmPanelRef.current?.focusPanel();
+    }, [isSearchViewOnScreen]);
     useEffect(() => {
         if (!SQD)
             return;
@@ -342,7 +357,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
             return false;
         return qd?.orderBy && qd.orderBy.length > 0;
     }, [showAdvancedSearch, qd?.orderBy]);
-    return (_jsxs(_Fragment, { children: [_jsxs(TMPanel, { title: fromDTD?.nameLoc ?? SDKUI_Localizator.Search_Metadata, allowMaximize: allowMaximize, onMaximize: onMaximizePanel, onHeaderDoubleClick: onMaximizePanel, onBack: onBack, onActiveChanged: handlePanelActiveChanged, toolbar: _jsx(_Fragment, { children: (SQD && !showSqdForm) ?
+    return (_jsxs(_Fragment, { children: [_jsxs(TMPanel, { ref: tmPanelRef, title: fromDTD?.nameLoc ?? SDKUI_Localizator.Search_Metadata, allowMaximize: allowMaximize, onMaximize: onMaximizePanel, onHeaderDoubleClick: onMaximizePanel, onBack: onBack, onActiveChanged: handlePanelActiveChanged, toolbar: _jsx(_Fragment, { children: (SQD && !showSqdForm) ?
                         _jsx(ContextMenu, { items: contextMenuItems, trigger: "left", children: _jsx(TMButton, { btnStyle: 'icon', caption: 'Altro', icon: _jsx(IconMenuVertical, { color: 'white' }), showTooltip: false, onClick: () => setIsQueryPanelActive(true) }) })
                         : _jsx(_Fragment, {}) }), children: [_jsx(ConfirmQueryParamsDialog, {}), SQD
                         ? _jsxs("div", { onContextMenu: (e) => e.preventDefault(), style: { height: '100%', width: '100%', position: 'relative', display: showSqdForm ? 'none' : 'flex', flexDirection: 'column', gap: 5 }, children: [showAdvancedSearch

package/lib/devextreme-license.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare const licenseKey = "LCPv1>7eY(j4LeYSi9_V6!J4He7,1:JfoSYV:%QDL7+aJZee3%oR>!N,(7<,!cyaX>Qta3%e7(nrB7+a42R-8pJ@(>Qm<IJ+(Sn,e3J+:VN-;(y,$Zj4yZ74[S<FZ:ee49ntV(%Xn3Lr19Y9[7iR3:74X7RV(6ye(Iea1cNSS3gFf!N91%R-ppQQmk79-6%)<SQf-I_@F6_y6SjzB6_!Q2bREIgF:aQdE!KF6>%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll";

package/lib/devextreme-license.js ADDED Viewed

@@ -0,0 +1,3 @@
+// Auto-generated by devextreme-license.
+// Do not commit this file to source control.
+export const licenseKey = 'LCPv1>7eY(j4LeYSi9_V6!J4He7,1:JfoSYV:%QDL7+aJZee3%oR>!N,(7<,!cyaX>Qta3%e7(nrB7+a42R-8pJ@(>Qm<IJ+(Sn,e3J+:VN-;(y,$Zj4yZ74[S<FZ:ee49ntV(%Xn3Lr19Y9[7iR3:74X7RV(6ye(Iea1cNSS3gFf!N91%R-ppQQmk79-6%)<SQf-I_@F6_y6SjzB6_!Q2bREIgF:aQdE!KF6>%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll';

package/lib/index.js CHANGED Viewed

@@ -15,5 +15,6 @@ export * from './hooks/useBetaFeatures';
 export * from './hooks/useShowDossiersV5';
 export * from './services';
 import config from 'devextreme/core/config';
+import { licenseKey } from "./devextreme-license";
 // DevExtreme License Key (valid for v25.2 and earlier versions)
-config({ licenseKey: 'ewogICJmb3JtYXQiOiAxLAogICJjdXN0b21lcklkIjogIjE1ODg1NDc4LTNjNTItNGUzYy1hNDI1LTU5NjAzMzQ0ZDVjMyIsCiAgIm1heFZlcnNpb25BbGxvd2VkIjogMjUyCn0=.ClI5PeQ2vnl48q0hwdwPHM6oDArs6XTeZ9u4JfN6kxaHoKgszVywO996SluAQfPdFhtzWz6OZsyDdenKv28UU2dOF5wppP88hGEJ17PAg+N/OpUkL1L/CMFNXlOIsYd2517GWA==' });
+config({ licenseKey });

package/package.json CHANGED Viewed

@@ -1,68 +1,69 @@
-{
-    "name": "@topconsultnpm/sdkui-react",
-    "version": "6.22.0-dev2.31",
-    "description": "",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "clean": "node -e \"const fs=require('fs');fs.rmSync('lib',{recursive:true,force:true});fs.mkdirSync('lib')\"",
-        "copy-files": "cpx \"src/{assets/*.*,assets/ImageLibrary/*.*,assets/thumbnails/*.*,assets/IconsS4t/*.*,assets/Metadata/*.*,css/tm-sdkui.css}\" lib",
-        "tm-build": "npm run clean && tsc && npm run copy-files",
-        "tm-watch": "tsc -w",
-        "tm-publish": "npm publish --tag latest",
-        "tm-publish_wl": "npm publish",
-        "storybook": "storybook dev -p 6006",
-        "build-storybook": "storybook build"
-    },
-    "author": "TopConsult",
-    "license": "ISC",
-    "devDependencies": {
-        "@chromatic-com/storybook": "^5.1.2",
-        "@storybook/addon-docs": "^10.3.5",
-        "@storybook/addon-onboarding": "^10.3.5",
-        "@storybook/react-vite": "^10.3.5",
-        "@types/node": "^24.12.2",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.3",
-        "cpx2": "^9.0.0",
-        "esbuild": "^0.25.0",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "storybook": "^10.3.5",
-        "typescript": "^5.9.3",
-        "vite": "^6.1.1"
-    },
-    "main": "dist/cjs/index.js",
-    "types": "./index.d.ts",
-    "module": "lib/esm/index.js",
-    "files": [
-        "dist",
-        "lib"
-    ],
-    "dependencies": {
-        "@topconsultnpm/sdk-ts": "6.22.0-dev2.7",
-        "@zip.js/zip.js": "2.8.26",
-        "buffer": "^6.0.3",
-        "devextreme": "^25.2.6",
-        "devextreme-exceljs-fork": "^4.4.10",
-        "devextreme-react": "^25.2.6",
-        "htmlparser2": "^10.0.0",
-        "pdf-lib": "^1.17.1",
-        "react-pdf": "^10.4.1",
-        "react-window": "^2.2.7",
-        "styled-components": "^6.1.1"
-    },
-    "overrides": {
-        "esbuild": "^0.25.0",
-        "devextreme-exceljs-fork": {
-            "archiver": "^8.0.0"
-        },
-        "quill-delta": {
-            "lodash.isequal": "npm:fast-deep-equal@^3.1.3"
-        }
-    },
-    "allowScripts": {
-        "core-js@3.49.0": true,
-        "esbuild@0.25.12": true,
-        "inferno@8.2.3": true
-    }
-}
+{
+    "name": "@topconsultnpm/sdkui-react",
+    "version": "6.22.0-dev2.33",
+    "description": "",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "clean": "node -e \"const fs=require('fs');fs.rmSync('lib',{recursive:true,force:true});fs.mkdirSync('lib')\"",
+        "gen-license": "devextreme-license --out src/devextreme-license.ts --force --no-gitignore",
+        "copy-files": "cpx \"src/{assets/*.*,assets/ImageLibrary/*.*,assets/thumbnails/*.*,assets/IconsS4t/*.*,assets/Metadata/*.*,css/tm-sdkui.css}\" lib",
+        "tm-build": "npm run clean && npm run gen-license && tsc && npm run copy-files",
+        "tm-watch": "tsc -w",
+        "tm-publish": "npm publish --tag latest",
+        "tm-publish_wl": "npm publish",
+        "storybook": "npm run gen-license && storybook dev -p 6006",
+        "build-storybook": "npm run gen-license && storybook build"
+    },
+    "author": "TopConsult",
+    "license": "ISC",
+    "devDependencies": {
+        "@chromatic-com/storybook": "^5.1.2",
+        "@storybook/addon-docs": "^10.3.5",
+        "@storybook/addon-onboarding": "^10.3.5",
+        "@storybook/react-vite": "^10.3.5",
+        "@types/node": "^24.12.2",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.3",
+        "cpx2": "^9.0.0",
+        "esbuild": "^0.25.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "storybook": "^10.3.5",
+        "typescript": "^5.9.3",
+        "vite": "^6.1.1"
+    },
+    "main": "dist/cjs/index.js",
+    "types": "./index.d.ts",
+    "module": "lib/esm/index.js",
+    "files": [
+        "dist",
+        "lib"
+    ],
+    "dependencies": {
+        "@topconsultnpm/sdk-ts": "6.22.0-dev2.7",
+        "@zip.js/zip.js": "2.8.26",
+        "buffer": "^6.0.3",
+        "devextreme": "26.1.4",
+        "devextreme-exceljs-fork": "4.4.13",
+        "devextreme-react": "26.1.4",
+        "htmlparser2": "^10.0.0",
+        "pdf-lib": "^1.17.1",
+        "react-pdf": "^10.4.1",
+        "react-window": "^2.2.7",
+        "styled-components": "^6.1.1"
+    },
+    "overrides": {
+        "esbuild": "^0.25.0",
+        "devextreme-exceljs-fork": {
+            "archiver": "^8.0.0"
+        },
+        "quill-delta": {
+            "lodash.isequal": "npm:fast-deep-equal@^3.1.3"
+        }
+    },
+    "allowScripts": {
+        "esbuild@0.25.12": true,
+        "inferno@8.2.3": true,
+        "core-js@3.50.0": true
+    }
+}