Merge branch 'main' into cn-json-data-fmt

GluuFederation · Nov 6, 2024 · 3a1f93d · 3a1f93d
2 parents f9155b3 + 7d818ee
commit 3a1f93d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuAdvancedSearch.js b/admin-ui/app/routes/Apps/Gluu/GluuAdvancedSearch.js
@@ -34,7 +34,7 @@ function GluuAdvancedSearch({
         name="pattern"
         defaultValue={pattern}
         placeholder={t('placeholders.search_pattern')}
-        onChange={handler}
+        onKeyDown={handler}
       />
     </FormGroup>
   )

diff --git a/admin-ui/app/routes/Apps/Gluu/GluuCustomScriptSearch.js b/admin-ui/app/routes/Apps/Gluu/GluuCustomScriptSearch.js
@@ -36,6 +36,7 @@ function GluuCustomScriptSearch({
         data-testid={patternId}
         name="pattern"
         onChange={handler}
+        onKeyDown={handler}
         defaultValue={pattern}
         placeholder={t('placeholders.search_pattern')}
       />

diff --git a/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js b/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js
@@ -185,6 +185,10 @@ function ScriptListTable() {
     const name = event.target.name
     if (name == 'pattern') {
       memoPattern = event.target.value
+      if (event.keyCode === 13) {
+        makeOptions()
+        dispatch(getCustomScriptByType({ action: options }))
+      }
     } else if (name == 'type') {
       memoType = event.target.value
       makeOptions()

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js b/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js
@@ -205,6 +205,10 @@ function ClientListPage() {
       memoLimit = event.target.value
     } else if (event.target.name == 'pattern') {
       memoPattern = event.target.value
+      if (event.keyCode === 13) {
+        makeOptions()
+        dispatch(getOpenidClients({ action: options }))
+      }
     }
   }
   function handleGoToClientEditPage(row, edition) {

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js
@@ -105,6 +105,10 @@ function ScopeListPage() {
       memoLimit = event.target.value
     } else if (event.target.name == 'pattern') {
       memoPattern = event.target.value
+      if (event.keyCode === 13) {
+        makeOptions()
+        dispatch(getScopes({ action: options }))
+      }
     }
   }
 

diff --git a/admin-ui/plugins/schema/components/Person/AttributeListPage.js b/admin-ui/plugins/schema/components/Person/AttributeListPage.js
@@ -77,6 +77,10 @@ function AttributeListPage() {
       memoLimit = event.target.value
     } else if (event.target.name == 'pattern') {
       memoPattern = event.target.value
+      if (event.keyCode === 13) {
+        makeOptions()
+        dispatch(searchAttributes({ options }))
+      }
     }
   }
 

diff --git a/admin-ui/plugins/user-management/components/UserManagement/UserList.js b/admin-ui/plugins/user-management/components/UserManagement/UserList.js
@@ -83,6 +83,11 @@ function UserList(props) {
       memoLimit = event.target.value
     } else if (event.target.name == 'pattern') {
       memoPattern = event.target.value
+      if (event.keyCode === 13) {
+        setLimit(memoLimit)
+        setPattern(memoPattern)
+        dispatch(getUsers({ action: { limit: memoLimit, pattern: memoPattern } }))
+      }
     }
   }