OpenRouter: match both id/text in select2 (#4237) * OpenRouter: match both id/text in select2 * Update public/scripts/utils.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

e1a55408b60e068b648f2d0c53992aa26e357a75

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 38a7668535dabfcd71aabb9eaf1b2222c1fbb778

public/scripts/openai.js+2 -0 Viewed

     parseJsonFile,
     resetScrollHeight,
     stringFormat,
+    textValueMatcher,
     uuidv4,
 } from './utils.js';
 import { countTokensOpenAIAsync, getTokenizerModel } from './tokenizers.js';

             searchInputCssClass: 'text_pole',
             width: '100%',
             templateResult: getOpenRouterModelTemplate,
+            matcher: textValueMatcher,
         });
         $('#model_aimlapi_select').select2({
             placeholder: t`Select a model`,

public/scripts/textgen-models.js+2 -1 Viewed

 import { POPUP_TYPE, callGenericPopup } from './popup.js';
 import { t } from './i18n.js';
 import { accountStorage } from './util/AccountStorage.js';
-import { localizePagination, PAGINATION_TEMPLATE } from './utils.js';
+import { localizePagination, PAGINATION_TEMPLATE, textValueMatcher } from './utils.js';
 let mancerModels = [];
 let togetherModels = [];

             searchInputCssClass: 'text_pole',
             width: '100%',
             templateResult: getOpenRouterModelTemplate,
+            matcher: textValueMatcher,
         });
         $('#vllm_model').select2({
             placeholder: t`Select a model`,

public/scripts/utils.js+50 -0 Viewed

         infoBlock.innerHTML = '';
+    }
+}
+/**
+ * Provides a matcher function for select2 that matches both the text and value of options.
+ * @param {import('select2').SearchOptions} params
+ * @param {import('select2').OptGroupData|import('select2').OptionData} data
+ * @return {import('select2').OptGroupData|import('select2').OptionData|null}
+ */
+export function textValueMatcher(params, data) {
+    // Always return the object if there is nothing to compare
+    if (params.term == null || params.term.trim() === '') {
+        return data;
+    }
+    // Do a recursive check for options with children
+    if (data.children && data.children.length > 0) {
+        // Clone the data object if there are children
+        // This is required as we modify the object to remove any non-matches
+        const match = $.extend(true, {}, data);
+        // Check each child of the option
+        for (let c = data.children.length - 1; c >= 0; c--) {
+            const child = data.children[c];
+            const matches = textValueMatcher(params, child);
+            // If there wasn't a match, remove the object in the array
+            if (matches == null) {
+                match.children.splice(c, 1);
+            }
+        }
+        // If any children matched, return the new object
+        if (match.children.length > 0) {
+            return match;
+        }
+        // If there were no matching children, check just the plain object
+        return textValueMatcher(params, match);
+    }
+    const textMatch = compareIgnoreCaseAndAccents(data.text, params.term, (a, b) => a.indexOf(b) > -1);
+    const valueMatch = data.element instanceof HTMLOptionElement && compareIgnoreCaseAndAccents(data.element.value, params.term, (a, b) => a.indexOf(b) > -1);
+    if (textMatch || valueMatch) {
+        return data;
+    }
+    // If it doesn't contain the term, don't return anything
+    return null;
+}