@topconsultnpm/sdkui-react-beta 6.12.22 → 6.12.24

package/lib/components/editors/TMHtmlContentDisplay.js

@@ -17,29 +17,35 @@ const Wrapper = styled.div `
         color: ${(props) => (props.$isSelected ? '#fff' : 'rgb(26, 13, 171)')};
     }
 `;
-const highlightSearchText = (markup, searchText) => {
-    if (!searchText.trim())
-        return markup;
-    // Escape special characters for use in regex
-    const escapedText = searchText.trim().replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    const regex = new RegExp(`(${escapedText})`, 'gi');
-    // Replace only text content, not inside tags
-    return markup.replace(/(?<=>)([^<]+)(?=<)/g, (text) => {
-        return text.replace(regex, '<span class="highlight">$1</span>');
-    });
-};
 const convertLinksToAnchors = (markup) => {
     const urlRegex = /(?<!["'>])(https?:\/\/[^\s<]+)/g;
     return markup.replace(urlRegex, (url) => {
         return `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`;
     });
 };
+const highlightText = (input, searchText) => {
+    if (!searchText)
+        return input;
+    const escapedSearch = searchText.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escape regex
+    const regex = new RegExp(escapedSearch, 'gi');
+    // Regex to split text into HTML tags and text nodes
+    const parts = input.split(/(<[^>]+>)/g); // Captures tags as separate elements
+    const highlighted = parts
+        .map(part => {
+        // Skip HTML tags
+        if (part.startsWith('<') && part.endsWith('>')) {
+            return part;
+        }
+        // Highlight search term in text
+        return part.replace(regex, match => `<span class="highlight">${match}</span>`);
+    })
+        .join('');
+    return highlighted;
+};
 const TMHtmlContentDisplay = (props) => {
     const { markup, searchText, isSelected } = props;
     let updatedMarkup = convertLinksToAnchors(markup);
-    if (searchText) {
-        updatedMarkup = highlightSearchText(updatedMarkup, searchText);
-    }
+    updatedMarkup = highlightText(updatedMarkup, searchText);
     return (_jsx(Wrapper, { "$isSelected": isSelected, children: _jsx("div", { dangerouslySetInnerHTML: { __html: updatedMarkup } }) }));
 };
 export default TMHtmlContentDisplay;

package/lib/helper/Enum_Localizator.d.ts

@@ -2,7 +2,7 @@ import { ArchiveConstraints, JobTypes, JoinTypes, MetadataFormats, OwnershipLeve
 import { FormModes } from "../ts";
 export declare function LocalizeArchiveConstraints(value: ArchiveConstraints | undefined): "Archivierung nur mit Dateien erlauben" | "Allow file only archiving" | "Permitir solo almacenamientos con archivo" | "Autorise uniquement l'archivage de fichiers" | "Permitir somente depósitos com arquivos" | "Consenti solo archiviazioni con file" | "Alles zulassen" | "Allow everything" | "Permitir todo" | "Autorise tout" | "Permitir que todos" | "Consenti tutto" | "Nur Methadatenarchivierung erlauben" | "Allow metadata only archiving" | "Permitir solo almacenamiento de metadatos" | "Autorise uniquement l'archivage de métadonnées" | "Permitir somente os metadados de arquivamento" | "Consenti solo archiviazioni di metadati";
 export declare function LocalizeFormModes(value: FormModes | undefined): "Erstellen" | "Create" | "Crear" | "Créer" | "Criar" | "Crea" | "Duplikat" | "Duplicate" | "Duplicar" | "Dupliquer" | "Duplicado" | "Duplica" | "Nur Lesen" | "Read only" | "Solo lectura" | "En lecture seule" | "Somente leitura" | "Solo lettura" | "Bearbeiten" | "Update" | "Modificar" | "Modifie" | "Modificação" | "Modifica" | "None" | "Niemand" | "Ninguno" | "Aucun" | "Nenhum" | "Nessuno";
-export declare function LocalizeJobTypes(value: JobTypes | undefined): string | undefined;
+export declare function LocalizeJobTypes(value: JobTypes | undefined): string;
 export declare function LocalizeMetadataFormats(value: MetadataFormats): string;
 export declare function LocalizeOwnershipLevels(value: OwnershipLevels | undefined): string | undefined;
 export declare function LocalizeParametricFilterTypes(value: ParametricFilterTypes | undefined): "Personalisierter Ausdruck" | "Custom expression" | "Expresión personalizada" | "Expression personnalisée" | "Expressão personalizado" | "Espressione personalizzata" | "Filtern nach {@UserID}" | "Filter on {@UserID}" | "Filtro en {@UserID}" | "Filtre sur  {@UserID}" | "Filtre on {@UserID}" | "Filtro su {@UserID}" | "Filtern nach {@Benutzername} (=)" | "Filter on {@UserName} (=)" | "Filtro en {@UserName} (=)" | "Filtre sur {@UserName} (=)" | "Filtre on {@UserName} (=)" | "Filtro su {@UserName} (=)" | "Filter nach {@Benutzername} (Enthält)" | "Filter on {@UserName} (Contains)" | "Filtro en {@UserName} (Contiene)" | "Filtre sur {@UserName} (Contient)" | "Filtre on {@UserName} (Contém)" | "Filtro su {@UserName} (Contiene)" | "None" | "Niemand" | "Ninguno" | "Aucun" | "Nenhum" | "Nessuno";

package/lib/helper/Enum_Localizator.js

@@ -20,30 +20,31 @@ export function LocalizeFormModes(value) {
     }
 }
 export function LocalizeJobTypes(value) {
+    let cultureID = SDK_Globals.tmSession?.SessionDescr?.cultureID ?? CultureIDs.It_IT;
     switch (value) {
         case JobTypes.FileExec: return "CustomExec";
         case JobTypes.Signer: return "DcmtSigner";
         case JobTypes.CassettoFiscaleQuery:
-            switch (SDK_Globals.tmSession?.SessionDescr?.cultureID) {
+            switch (cultureID) {
                 case CultureIDs.It_IT: return value?.toString();
                 default: return "TaxDrawerQuery";
             }
         case JobTypes.CassettoFiscaleSender:
-            switch (SDK_Globals.tmSession?.SessionDescr?.cultureID) {
+            switch (cultureID) {
                 case CultureIDs.It_IT: return value?.toString();
                 default: return "TaxDrawerSender";
             }
         case JobTypes.CassettoDoganale:
-            switch (SDK_Globals.tmSession?.SessionDescr?.cultureID) {
+            switch (cultureID) {
                 case CultureIDs.It_IT: return value?.toString();
                 default: return "CustomsDrawer";
             }
         case JobTypes.CassettoDoganalePlus:
-            switch (SDK_Globals.tmSession?.SessionDescr?.cultureID) {
+            switch (cultureID) {
                 case CultureIDs.It_IT: return value?.toString();
                 default: return "CustomsDrawerPlus";
             }
-        default: return value?.toString();
+        default: return value?.toString() ?? '';
     }
 }
 export function LocalizeMetadataFormats(value) {

package/lib/services/platform_services.d.ts

@@ -10,7 +10,7 @@ export declare class PlatformObjectService {
     private static readonly createJobAsync;
     static readonly createAsync: (objClass: ObjectClasses, jobType: JobTypes, d: any) => Promise<number | undefined>;
     static readonly deleteAsync: (objClass: ObjectClasses, id: number) => Promise<number | undefined>;
-    static readonly getName: (objClass: ObjectClasses, jobType?: JobTypes, isPlural?: boolean) => string | undefined;
+    static readonly getName: (objClass: ObjectClasses, jobType?: JobTypes, isPlural?: boolean) => string;
     static readonly getIcon: (objClass: ObjectClasses, d: any) => import("react/jsx-runtime").JSX.Element;
     static readonly getTooltip: (objClass: ObjectClasses, d: any) => import("react/jsx-runtime").JSX.Element | null;
 }

package/package.json

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