feat: add search adn better triggers to agent/tools/cps combos

Author: theboxer

assets/components/modai/mgr/js/utils/combos.js

@@ -134,7 +134,11 @@ modAIAdmin.combo.ContextProviderClass = function (config) {
         displayField: 'class',
         valueField: 'class',
         fields: ['class', 'config'],
-        pageSize: 20,
+        typeAhead: false,
+        editable: true,
+        forceSelection: true,
+        pageSize: 0,
+        minChars: 0,
         url: MODx.config.connector_url,
         baseParams: {
             action: 'modAI\\Processors\\Combos\\ContextProviderClass',
@@ -153,7 +157,11 @@ modAIAdmin.combo.ToolClass = function (config) {
         displayField: 'class',
         valueField: 'class',
         fields: ['class', 'config', 'suggestedName'],
-        pageSize: 20,
+        typeAhead: false,
+        editable: true,
+        forceSelection: true,
+        pageSize: 0,
+        minChars: 0,
         url: MODx.config.connector_url,
         baseParams: {
             action: 'modAI\\Processors\\Combos\\ToolClass',
@@ -176,10 +184,12 @@ modAIAdmin.combo.Tools = function (config, getStore) {
         fields: ['name', 'id', 'description'],
         mode: 'remote',
         triggerAction: 'all',
-        typeAhead: true,
+        typeAhead: false,
         editable: true,
-        forceSelection: false,
+        forceSelection: true,
         pageSize: 20,
+        queryParam: 'search',
+        minChars: 0,
         url: MODx.config.connector_url,
         clearBtnCls: 'x-form-trigger',
         expandBtnCls: 'x-form-trigger',
@@ -229,9 +239,11 @@ modAIAdmin.combo.ContextProviders = function (config, getStore) {
         fields: ['name', 'id', 'description'],
         mode: 'remote',
         triggerAction: 'all',
-        typeAhead: true,
+        typeAhead: false,
         editable: true,
-        forceSelection: false,
+        forceSelection: true,
+        queryParam: 'search',
+        minChars: 0,
         pageSize: 20,
         url: MODx.config.connector_url,
         clearBtnCls: 'x-form-trigger',
@@ -283,9 +295,11 @@ modAIAdmin.combo.Agents = function (config, getStore) {
         fields: ['name', 'id', 'description'],
         mode: 'remote',
         triggerAction: 'all',
-        typeAhead: true,
+        typeAhead: false,
         editable: true,
-        forceSelection: false,
+        forceSelection: true,
+        queryParam: 'search',
+        minChars: 0,
         pageSize: 20,
         url: MODx.config.connector_url,
         clearBtnCls: 'x-form-trigger',

core/components/modai/src/Processors/Combos/ContextProviderClass.php

@@ -11,19 +11,21 @@ class ContextProviderClass extends Processor
 
     public function process()
     {
+        $query = $this->getProperty('query');
+
         /** @var class-string<ContextProviderInterface>[] $classes */
         $classes = [];
 
         $registeredContextProviders = $this->modx->invokeEvent('modAIOnContextProviderRegister');
         foreach ($registeredContextProviders as $registeredContextProvider) {
-            if (is_string($registeredContextProvider) && class_implements($registeredContextProvider, ContextProviderInterface::class)) {
+            if ($this->validateClassName($registeredContextProvider, $query)) {
                 $classes[] = $registeredContextProvider;
                 continue;
             }
 
             if (is_array($registeredContextProvider)) {
                 foreach ($registeredContextProvider as $contextProvider) {
-                    if (class_implements($contextProvider, ContextProviderInterface::class)) {
+                    if ($this->validateClassName($contextProvider, $query)) {
                         $classes[] = $contextProvider;
                     }
                 }
@@ -42,4 +44,17 @@ public function getLanguageTopics()
     {
         return $this->languageTopics;
     }
+
+    private function validateClassName($class, $query)
+    {
+        if (!class_implements($class, ContextProviderInterface::class)) {
+            return false;
+        }
+
+        if (!empty($query) && stripos($class, $query) === false) {
+            return false;
+        }
+
+        return true;
+    }
 }

core/components/modai/src/Processors/Combos/ToolClass.php

@@ -11,19 +11,21 @@ class ToolClass extends Processor
 
     public function process()
     {
+        $query = $this->getProperty('query');
+
         /** @var class-string<ToolInterface>[] $classes */
         $classes = [];
 
         $registeredTools = $this->modx->invokeEvent('modAIOnToolRegister');
         foreach ($registeredTools as $registeredTool) {
-            if (is_string($registeredTool) && class_implements($registeredTool, ToolInterface::class)) {
+            if ($this->validateClassName($registeredTool, $query)) {
                 $classes[] = $registeredTool;
                 continue;
             }
 
             if (is_array($registeredTool)) {
                 foreach ($registeredTool as $tool) {
-                    if (class_implements($tool, ToolInterface::class)) {
+                    if ($this->validateClassName($tool, $query)) {
                         $classes[] = $tool;
                     }
                 }
@@ -43,4 +45,17 @@ public function getLanguageTopics()
     {
         return $this->languageTopics;
     }
+
+    private function validateClassName($class, $query)
+    {
+        if (!class_implements($class, ToolInterface::class)) {
+            return false;
+        }
+
+        if (!empty($query) && stripos($class, $query) === false) {
+            return false;
+        }
+
+        return true;
+    }
 }