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

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',

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',

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) => {

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() {

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) => {