Unverified Commit a37eec26 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #16351 from ElectronicBlueberry/toolbox-regex 

[23.1] Sanitize substring in matchingTerm
parents e5197a4b 87bb30de

client/src/components/Panels/utilities.js

+6 −4
Original line number Diff line number Diff line 
/**

 * Utilities file for Panel Searches (panel/client search + advanced/backend search)

 */

import { orderBy, escapeRegExp } from "lodash";

import { orderBy } from "lodash";

import levenshteinDistance from "utils/levenshtein";



const TOOLS_RESULTS_SORT_LABEL = "apiSort";
@@ -252,9 +252,11 @@ function isToolObject(tool) { 


// given array and a substring, get the closest matching term for substring

function matchingTerm(termArray, substring) {

    const sanitized = sanitizeString(substring);



    for (const i in termArray) {

        const term = termArray[i];

        if (term.match(substring)) {

        if (term.match(sanitized)) {

            return term;

        }

    }
@@ -273,8 +275,8 @@ function sanitizeString(value, targets = [], substitute = "") { 
    targets.forEach((rep) => {

        sanitized = sanitized.replaceAll(rep, substitute);

    });

    sanitized = escapeRegExp(sanitized);

    return sanitized;



    return sanitized.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

}



function flattenToolsSection(section) {