From a2adb9200925c307a2434fcff855d50cf5cb8ce9 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 19 Aug 2023 20:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/routes/idm/groups/groups.component.ts  |  8 ++++----
 .../src/app/routes/idm/idm.module.ts           | 18 +++++++++++++-----
 .../src/assets/app-data.json                   |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts
index b5f9213a7..6930e4d51 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/groups.component.ts
@@ -175,12 +175,12 @@ export class GroupsComponent implements OnInit {
     });
   }
 
-  onMembers(e: MouseEvent, roleId: String, roleName: String): void {
-    this.router.navigateByUrl(`/access/rolemembers?roleId=${roleId}&roleName=${roleName}`);
+  onMembers(e: MouseEvent, groupId: String, groupName: String): void {
+    this.router.navigateByUrl(`/idm/groupmembers?groupId=${groupId}&groupName=${groupName}`);
   }
 
-  onPermissions(e: MouseEvent, roleId: String, roleName: String): void {
-    this.router.navigateByUrl(`/access/permissions?roleId=${roleId}&roleName=${roleName}`);
+  onPermissions(e: MouseEvent, groupId: String, groupName: String): void {
+    this.router.navigateByUrl(`/access/permissions?groupId=${groupId}&groupName=${groupName}`);
   }
 
   fetch(): void {
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/idm.module.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/idm.module.ts
index 74ef28743..1a992206d 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/idm.module.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/idm.module.ts
@@ -27,7 +27,11 @@ import { MemberGroupsEditerComponent } from './group-members/member-groups-edite
 import { GroupEditerComponent } from './groups/group-editer/group-editer.component';
 import { GroupsComponent } from './groups/groups.component';
 import { SelectGroupsComponent } from './groups/select-groups/select-groups.component';
+import { OrganizationEditerComponent } from './organizations/organization-editer/organization-editer.component';
 import { OrganizationsComponent } from './organizations/organizations.component';
+import { PasswordComponent } from './users/password/password.component';
+import { SelectUserComponent } from './users/select-user/select-user.component';
+import { UserEditerComponent } from './users/user-editer/user-editer.component';
 import { UsersComponent } from './users/users.component';
 
 const routes: Routes = [
@@ -38,14 +42,18 @@ const routes: Routes = [
 ];
 
 const COMPONENTS = [
-  //UsersComponent,
-  OrganizationsComponent,
+  UsersComponent,
   GroupsComponent,
-  GroupMembersComponent,
   SelectGroupsComponent,
+  SelectUserComponent,
+  GroupEditerComponent,
+  PasswordComponent,
+  UserEditerComponent,
+  OrganizationsComponent,
+  OrganizationEditerComponent,
+  GroupMembersComponent,
   GroupMembersEditerComponent,
-  MemberGroupsEditerComponent,
-  GroupEditerComponent
+  MemberGroupsEditerComponent
 ];
 
 @NgModule({
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
index 24a182cbd..ee804c6c1 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/app-data.json
@@ -47,7 +47,7 @@
             {
               "text": "用户组成员",
               "i18n": "mxk.menu.identities.groupmembers",
-              "link": "/idm/rolemembers",
+              "link": "/idm/groupmembers",
               "icon": "anticon-team",
               "children": []
             }