From 2d6f72004126823bf4d188bf7c6f385ad7a4e620 Mon Sep 17 00:00:00 2001
From: "Jingwei.Zhang" <zhang.jingwei@99cloud.net>
Date: Tue, 13 Jun 2023 17:32:18 +0800
Subject: [PATCH] feat: support domain name fuzzy search

Support domain name fuzzy search for users, user groups and projects

Change-Id: I7859b91ced6549c26655b1624f28bb19427194e6
---
 .../Support-Domain-Name-Filter-1d433cb2d548ca2f.yaml   | 10 ++++++++++
 src/pages/identity/containers/Project/index.jsx        |  9 +++++++++
 src/pages/identity/containers/User/index.jsx           |  9 +++++++++
 src/pages/identity/containers/UserGroup/index.jsx      |  9 +++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 releasenotes/notes/Support-Domain-Name-Filter-1d433cb2d548ca2f.yaml

diff --git a/releasenotes/notes/Support-Domain-Name-Filter-1d433cb2d548ca2f.yaml b/releasenotes/notes/Support-Domain-Name-Filter-1d433cb2d548ca2f.yaml
new file mode 100644
index 00000000..e65761dd
--- /dev/null
+++ b/releasenotes/notes/Support-Domain-Name-Filter-1d433cb2d548ca2f.yaml
@@ -0,0 +1,10 @@
+---
+features:
+  - |
+    Support domain name fuzzy search:
+
+    * Support domain name fuzzy search in the user list page.
+
+    * Support domain name fuzzy search in the user group list page.
+
+    * Support domain name fuzzy search in the project list page.
diff --git a/src/pages/identity/containers/Project/index.jsx b/src/pages/identity/containers/Project/index.jsx
index 6593eed6..fdae6995 100644
--- a/src/pages/identity/containers/Project/index.jsx
+++ b/src/pages/identity/containers/Project/index.jsx
@@ -271,6 +271,14 @@ export class Projects extends Base {
   }
 
   get searchFilters() {
+    const domainFilter = this.inDomainDetail
+      ? []
+      : [
+          {
+            label: t('Domain Name'),
+            name: 'domainName',
+          },
+        ];
     return [
       {
         label: t('Project Name'),
@@ -281,6 +289,7 @@ export class Projects extends Base {
         name: 'enabled',
         options: yesNoOptions,
       },
+      ...domainFilter,
       {
         label: t('Tags'),
         name: 'tags',
diff --git a/src/pages/identity/containers/User/index.jsx b/src/pages/identity/containers/User/index.jsx
index 18cc4678..8f65d520 100644
--- a/src/pages/identity/containers/User/index.jsx
+++ b/src/pages/identity/containers/User/index.jsx
@@ -167,6 +167,14 @@ export class User extends Base {
   }
 
   get searchFilters() {
+    const domainFilter = this.inDomainDetail
+      ? []
+      : [
+          {
+            label: t('Domain Name'),
+            name: 'domainName',
+          },
+        ];
     return [
       {
         label: t('User Name'),
@@ -181,6 +189,7 @@ export class User extends Base {
         name: 'enabled',
         options: yesNoOptions,
       },
+      ...domainFilter,
     ];
   }
 
diff --git a/src/pages/identity/containers/UserGroup/index.jsx b/src/pages/identity/containers/UserGroup/index.jsx
index fe59795a..d165d2a4 100644
--- a/src/pages/identity/containers/UserGroup/index.jsx
+++ b/src/pages/identity/containers/UserGroup/index.jsx
@@ -226,11 +226,20 @@ export class UserGroups extends Base {
   }
 
   get searchFilters() {
+    const domainFilter = this.inDomainDetail
+      ? []
+      : [
+          {
+            label: t('Domain Name'),
+            name: 'domainName',
+          },
+        ];
     return [
       {
         label: t('User Group Name'),
         name: 'name',
       },
+      ...domainFilter,
     ];
   }