From d037b061f41758023f2434b4752e866da766fe03 Mon Sep 17 00:00:00 2001
From: zhangjingwei <zhang.jingwei@99cloud.net>
Date: Fri, 30 Aug 2024 09:08:01 +0800
Subject: [PATCH] fix: fix user/group column

1. fix the user column in the project manage user form
2. fix the user group column in the project manage user group form
3. fix the user group column in the user creation form
4. fix the user column in the group manage user form

Change-Id: I66caec013023320de557d4b85fe1704d7d1f4b6f
---
 .../containers/Project/actions/ManageUser.jsx |  6 +--
 .../Project/actions/ManageUserGroup.jsx       |  6 +--
 .../containers/User/actions/Create.jsx        | 11 ++---
 .../UserGroup/actions/ManageUser.jsx          |  6 +--
 src/resources/keystone/domain.jsx             | 42 +++++++++++++++++--
 5 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/src/pages/identity/containers/Project/actions/ManageUser.jsx b/src/pages/identity/containers/Project/actions/ManageUser.jsx
index f89a11d3..5e03cef1 100644
--- a/src/pages/identity/containers/Project/actions/ManageUser.jsx
+++ b/src/pages/identity/containers/Project/actions/ManageUser.jsx
@@ -20,7 +20,7 @@ import { UserStore } from 'stores/keystone/user';
 import { RoleStore } from 'stores/keystone/role';
 import { ModalAction } from 'containers/Action';
 import {
-  nameDomainColumns,
+  userDomainColumns,
   transferFilterOption,
 } from 'resources/keystone/domain';
 import { roleFilterOption } from 'resources/keystone/role';
@@ -116,12 +116,12 @@ export class ManageUser extends ModalAction {
   static allowed = () => Promise.resolve(true);
 
   get leftUserTable() {
-    return nameDomainColumns;
+    return userDomainColumns;
   }
 
   get rightUserTable() {
     return [
-      ...nameDomainColumns,
+      ...userDomainColumns,
       {
         title: t('Select Project Role'),
         dataIndex: 'id',
diff --git a/src/pages/identity/containers/Project/actions/ManageUserGroup.jsx b/src/pages/identity/containers/Project/actions/ManageUserGroup.jsx
index 564034ae..3e8252d2 100644
--- a/src/pages/identity/containers/Project/actions/ManageUserGroup.jsx
+++ b/src/pages/identity/containers/Project/actions/ManageUserGroup.jsx
@@ -20,7 +20,7 @@ import { GroupStore } from 'stores/keystone/user-group';
 import globalRoleStore from 'stores/keystone/role';
 import { ModalAction } from 'containers/Action';
 import {
-  nameDomainColumns,
+  groupDomainColumns,
   transferFilterOption,
 } from 'resources/keystone/domain';
 import { roleFilterOption } from 'resources/keystone/role';
@@ -115,7 +115,7 @@ export class ManageUserGroup extends ModalAction {
   static allowed = () => Promise.resolve(true);
 
   get leftGroupGroupTable() {
-    return nameDomainColumns;
+    return groupDomainColumns;
   }
 
   onClickSelect = (e) => {
@@ -142,7 +142,7 @@ export class ManageUserGroup extends ModalAction {
 
   get rightGroupGroupTable() {
     return [
-      ...nameDomainColumns,
+      ...groupDomainColumns,
       {
         title: t('Select Project Role'),
         dataIndex: 'id',
diff --git a/src/pages/identity/containers/User/actions/Create.jsx b/src/pages/identity/containers/User/actions/Create.jsx
index c8afd0bc..f03149bd 100644
--- a/src/pages/identity/containers/User/actions/Create.jsx
+++ b/src/pages/identity/containers/User/actions/Create.jsx
@@ -29,8 +29,9 @@ import {
 import {
   statusTypes,
   getDomainFormItem,
-  nameDomainColumns,
+  projectDomainColumns,
   transferFilterOption,
+  groupDomainColumns,
 } from 'resources/keystone/domain';
 import { roleFilterOption } from 'resources/keystone/role';
 
@@ -135,7 +136,7 @@ export class Create extends FormAction {
   static allowed = () => Promise.resolve(true);
 
   get leftProjectTable() {
-    return nameDomainColumns;
+    return projectDomainColumns;
   }
 
   get projectRoleList() {
@@ -185,7 +186,7 @@ export class Create extends FormAction {
 
   get rightProjectTable() {
     return [
-      ...nameDomainColumns,
+      ...projectDomainColumns,
       {
         title: t('Select Project Role'),
         dataIndex: 'id',
@@ -210,11 +211,11 @@ export class Create extends FormAction {
   };
 
   get leftUserGroupTable() {
-    return nameDomainColumns;
+    return groupDomainColumns;
   }
 
   get rightUserGroupTable() {
-    return nameDomainColumns;
+    return groupDomainColumns;
   }
 
   checkName = (rule, value) => {
diff --git a/src/pages/identity/containers/UserGroup/actions/ManageUser.jsx b/src/pages/identity/containers/UserGroup/actions/ManageUser.jsx
index cee72ec9..1851946d 100644
--- a/src/pages/identity/containers/UserGroup/actions/ManageUser.jsx
+++ b/src/pages/identity/containers/UserGroup/actions/ManageUser.jsx
@@ -17,7 +17,7 @@ import { UserStore } from 'stores/keystone/user';
 import { GroupStore } from 'stores/keystone/user-group';
 import { ModalAction } from 'containers/Action';
 import {
-  nameDomainColumns,
+  userDomainColumns,
   transferFilterOption,
 } from 'resources/keystone/domain';
 
@@ -79,11 +79,11 @@ export class ManageUser extends ModalAction {
   static allowed = () => Promise.resolve(true);
 
   get leftUserTable() {
-    return nameDomainColumns;
+    return userDomainColumns;
   }
 
   get rightUserTable() {
-    return nameDomainColumns;
+    return userDomainColumns;
   }
 
   get defaultValue() {
diff --git a/src/resources/keystone/domain.jsx b/src/resources/keystone/domain.jsx
index f1edcdc5..a96401eb 100644
--- a/src/resources/keystone/domain.jsx
+++ b/src/resources/keystone/domain.jsx
@@ -71,7 +71,20 @@ export const enabledColumn = {
   stringify: (val) => (val ? t('Yes') : t('No')),
 };
 
-export const nameDomainColumns = [
+export const domainColumn = {
+  dataIndex: 'domainName',
+  title: t('Domain ID/Name'),
+  render: (value, record) => {
+    return (
+      <>
+        <div>{getIdRender(record.domain_id, true, false)}</div>
+        <div>{value}</div>
+      </>
+    );
+  },
+};
+
+export const projectDomainColumns = [
   {
     dataIndex: 'name',
     title: t('Project ID/Name'),
@@ -84,18 +97,39 @@ export const nameDomainColumns = [
       );
     },
   },
+  domainColumn,
+];
+
+export const userDomainColumns = [
   {
-    dataIndex: 'domainName',
-    title: t('Domain ID/Name'),
+    dataIndex: 'name',
+    title: t('User ID/Name'),
     render: (value, record) => {
       return (
         <>
-          <div>{getIdRender(record.domain_id, true, false)}</div>
+          <div>{getIdRender(record.id, true, false)}</div>
           <div>{value}</div>
         </>
       );
     },
   },
+  domainColumn,
+];
+
+export const groupDomainColumns = [
+  {
+    dataIndex: 'name',
+    title: t('User Group ID/Name'),
+    render: (value, record) => {
+      return (
+        <>
+          <div>{getIdRender(record.id, true, false)}</div>
+          <div>{value}</div>
+        </>
+      );
+    },
+  },
+  domainColumn,
 ];
 
 export const transferFilterOption = (inputValue, record) => {