-
-
- (),
- indeterminate: false,
- checked: false
- };
+ params: {
+ displayName: '',
+ username: '',
+ groupId: '',
+ groupName: '',
+ appName: '',
+ appId: '',
+ startDate: '',
+ endDate: '',
+ startDatePicker: addDays(new Date(), -30),
+ endDatePicker: new Date(),
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableInitialize: true,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
constructor(
private modalService: NzModalService,
private groupPermissionsService: GroupPermissionsService,
+ private groupsService: GroupsService,
private viewContainerRef: ViewContainerRef,
private fb: FormBuilder,
private msg: NzMessageService,
@@ -104,7 +106,7 @@ export class PermissionsComponent implements OnInit {
private route: ActivatedRoute,
private cdr: ChangeDetectorRef,
private http: _HttpClient
- ) {}
+ ) { }
ngOnInit(): void {
if (this.route.snapshot.queryParams['groupId']) {
@@ -126,7 +128,7 @@ export class PermissionsComponent implements OnInit {
this.fetch();
}
- onReset(): void {}
+ onReset(): void { }
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
@@ -143,22 +145,24 @@ export class PermissionsComponent implements OnInit {
onAdd(e: MouseEvent): void {
e.preventDefault();
- const modal = this.modalService.create({
- nzContent: PermissionsEditerComponent,
- nzViewContainerRef: this.viewContainerRef,
- nzComponentParams: {
- isEdit: false,
- groupId: this.query.params.groupId
- },
- nzWidth: 700,
- nzOnOk: () => new Promise(resolve => setTimeout(resolve, 1000))
- });
- // Return a result when closed
- modal.afterClose.subscribe(result => {
- if (result.refresh) {
- this.fetch();
- }
- });
+ if (this.query.params.groupId !== '') {
+ const modal = this.modalService.create({
+ nzContent: PermissionsEditerComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzComponentParams: {
+ isEdit: false,
+ groupId: this.query.params.groupId
+ },
+ nzWidth: 700,
+ nzOnOk: () => new Promise(resolve => setTimeout(resolve, 1000))
+ });
+ // Return a result when closed
+ modal.afterClose.subscribe(result => {
+ if (result.refresh) {
+ this.fetch();
+ }
+ });
+ }
}
onSelect(e: MouseEvent): void {
@@ -239,4 +243,94 @@ export class PermissionsComponent implements OnInit {
this.query.results.rows.filter(({ disabled }) => !disabled).forEach(({ id }) => this.updateTableCheckedSet(id, checked));
this.refreshTableCheckedStatus();
}
+
+ //group list
+ groupQuery: {
+ params: {
+ groupName: String;
+ pageSize: number;
+ pageNumber: number;
+ pageSizeOptions: number[];
+ };
+ results: {
+ records: number;
+ rows: NzSafeAny[];
+ };
+ expandForm: Boolean;
+ submitLoading: boolean;
+ tableLoading: boolean;
+ tableCheckedId: Set;
+ indeterminate: boolean;
+ checked: boolean;
+ } = {
+ params: {
+ groupName: '',
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
+
+ onGroupSearch(): void {
+ this.fetchGroup();
+ }
+
+ onGroupQueryParamsChange(tableQueryParams: NzTableQueryParams): void {
+ this.groupQuery.params.pageNumber = tableQueryParams.pageIndex;
+ this.groupQuery.params.pageSize = tableQueryParams.pageSize;
+ this.fetchGroup();
+ }
+
+ fetchGroup(): void {
+ this.groupQuery.submitLoading = true;
+ this.groupQuery.tableLoading = true;
+ this.groupQuery.indeterminate = false;
+ this.groupQuery.checked = false;
+ this.groupQuery.tableCheckedId.clear();
+ this.groupsService.fetch(this.groupQuery.params).subscribe(res => {
+ this.groupQuery.results = res.data;
+ this.groupQuery.submitLoading = false;
+ this.groupQuery.tableLoading = false;
+ this.cdr.detectChanges();
+ });
+ }
+
+ updateGroupTableCheckedSet(id: String, checked: boolean): void {
+ if (checked) {
+ this.groupQuery.tableCheckedId.add(id);
+ } else {
+ this.groupQuery.tableCheckedId.delete(id);
+ }
+ }
+
+ refreshGroupTableCheckedStatus(): void {
+ const listOfEnabledData = this.groupQuery.results.rows.filter(({ disabled }) => !disabled);
+ this.groupQuery.checked = listOfEnabledData.every(({ id }) => this.groupQuery.tableCheckedId.has(id));
+ this.groupQuery.indeterminate = listOfEnabledData.some(({ id }) => this.groupQuery.tableCheckedId.has(id)) && !this.groupQuery.checked;
+ }
+
+ onGroupTableItemChecked(groupId: String, groupName: String, checked: boolean): void {
+ console.log(`checked ${checked} , groupId ${groupId} , groupName ${groupName}`);
+ this.onGroupTableAllChecked(false);
+ this.updateGroupTableCheckedSet(groupId, checked);
+ this.refreshGroupTableCheckedStatus();
+ this.query.params.groupId = groupId;
+ this.query.params.groupName = groupName;
+ this.fetch();
+ }
+
+ onGroupTableAllChecked(checked: boolean): void {
+ this.groupQuery.results.rows.filter(({ disabled }) => !disabled).forEach(({ id }) => this.updateGroupTableCheckedSet(id, checked));
+ this.refreshGroupTableCheckedStatus();
+ }
}
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
index dd8a2f7ed..bed3a060a 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.html
@@ -1,92 +1,138 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts
index 29cc41f2f..5566ff4fa 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/permissions/permissions.component.ts
@@ -28,6 +28,7 @@ import { NzTableQueryParams } from 'ng-zorro-antd/table';
import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
import { GroupPermissionsService } from '../../../service/group-permissions.service';
+import { GroupsService } from '../../../service/groups.service';
import { set2String } from '../../../shared/index';
import { SelectGroupsComponent } from '../../idm/groups/select-groups/select-groups.component';
import { PermissionsEditerComponent } from './permissions-editer/permissions-editer.component';
@@ -66,37 +67,38 @@ export class PermissionsComponent implements OnInit {
indeterminate: boolean;
checked: boolean;
} = {
- params: {
- displayName: '',
- username: '',
- groupId: '',
- groupName: '',
- appName: '',
- appId: '',
- startDate: '',
- endDate: '',
- startDatePicker: addDays(new Date(), -30),
- endDatePicker: new Date(),
- pageSize: 10,
- pageNumber: 1,
- pageSizeOptions: [10, 20, 50]
- },
- results: {
- records: 0,
- rows: []
- },
- expandForm: false,
- submitLoading: false,
- tableLoading: false,
- tableInitialize: true,
- tableCheckedId: new Set
+
+
+
+ [nzData]="groupQuery.results.rows" [nzFrontPagination]="false" [nzTotal]="groupQuery.results.records"
+ [nzPageSizeOptions]="groupQuery.params.pageSizeOptions" [nzPageSize]="groupQuery.params.pageSize"
+ [nzPageIndex]="groupQuery.params.pageNumber" [nzLoading]="this.groupQuery.tableLoading"
+ (nzQueryParams)="onGroupQueryParamsChange($event)">
- {{ 'mxk.roles.name' | i18n }}
- {{ 'mxk.apps.icon' | i18n }}
- {{ 'mxk.apps.name' | i18n }}
- {{ 'mxk.apps.category' | i18n }}
- {{ 'mxk.text.action' | i18n }}
+ {{ 'mxk.groups.name' | i18n }}
+ {{ 'mxk.groups.category' | i18n }}
-
-
+ {{ data.groupName }}
- 
{{ data.appName }}
-
-
-
-
+ {{ 'mxk.groups.category.dynamic' | i18n }}
+ {{ 'mxk.groups.category.static' | i18n }}
+ {{ 'mxk.groups.category.app' | i18n }}
+ {{ 'mxk.apps.category.none' | i18n }}
- {{ 'mxk.apps.category.1011' | i18n }}
- {{ 'mxk.apps.category.1012' | i18n }}
- {{ 'mxk.apps.category.1013' | i18n }}
- {{ 'mxk.apps.category.1014' | i18n }}
- {{ 'mxk.apps.category.1015' | i18n }}
- {{ 'mxk.apps.category.1016' | i18n }}
- {{ 'mxk.apps.category.1017' | i18n }}
- {{ 'mxk.apps.category.1111' | i18n }}
- {{ 'mxk.apps.category.1112' | i18n }}
- {{ 'mxk.apps.category.1113' | i18n }}
- {{ 'mxk.apps.category.1114' | i18n }}
- {{ 'mxk.apps.category.1211' | i18n }}
- {{ 'mxk.apps.category.1212' | i18n }}
- {{ 'mxk.apps.category.1213' | i18n }}
- {{ 'mxk.apps.category.1214' | i18n }}
- {{ 'mxk.apps.category.1215' | i18n }}
- {{ 'mxk.apps.category.1311' | i18n }}
- {{ 'mxk.apps.category.1411' | i18n }}
- {{ 'mxk.apps.category.1511' | i18n }}
- {{ 'mxk.apps.category.1512' | i18n }}
- {{ 'mxk.apps.category.1611' | i18n }}
- {{ 'mxk.apps.category.1711' | i18n }}
- {{ 'mxk.apps.category.1712' | i18n }}
- {{ 'mxk.apps.category.1811' | i18n }}
- {{ 'mxk.apps.category.1812' | i18n }}
- {{ 'mxk.apps.category.1911' | i18n }}
- {{ 'mxk.apps.category.1912' | i18n }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'mxk.roles.name' | i18n }}
+ {{ 'mxk.apps.icon' | i18n }}
+ {{ 'mxk.apps.name' | i18n }}
+ {{ 'mxk.apps.category' | i18n }}
+ {{ 'mxk.text.action' | i18n }}
+
+
+
+
+ {{ data.groupName }}
+ {{ data.appName }}
+
+
+
+
+
+
+
+
+ {{ 'mxk.apps.category.none' | i18n }}
+ {{ 'mxk.apps.category.1011' | i18n }}
+ {{ 'mxk.apps.category.1012' | i18n }}
+ {{ 'mxk.apps.category.1013' | i18n }}
+ {{ 'mxk.apps.category.1014' | i18n }}
+ {{ 'mxk.apps.category.1015' | i18n }}
+ {{ 'mxk.apps.category.1016' | i18n }}
+ {{ 'mxk.apps.category.1017' | i18n }}
+ {{ 'mxk.apps.category.1111' | i18n }}
+ {{ 'mxk.apps.category.1112' | i18n }}
+ {{ 'mxk.apps.category.1113' | i18n }}
+ {{ 'mxk.apps.category.1114' | i18n }}
+ {{ 'mxk.apps.category.1211' | i18n }}
+ {{ 'mxk.apps.category.1212' | i18n }}
+ {{ 'mxk.apps.category.1213' | i18n }}
+ {{ 'mxk.apps.category.1214' | i18n }}
+ {{ 'mxk.apps.category.1215' | i18n }}
+ {{ 'mxk.apps.category.1311' | i18n }}
+ {{ 'mxk.apps.category.1411' | i18n }}
+ {{ 'mxk.apps.category.1511' | i18n }}
+ {{ 'mxk.apps.category.1512' | i18n }}
+ {{ 'mxk.apps.category.1611' | i18n }}
+ {{ 'mxk.apps.category.1711' | i18n }}
+ {{ 'mxk.apps.category.1712' | i18n }}
+ {{ 'mxk.apps.category.1811' | i18n }}
+ {{ 'mxk.apps.category.1812' | i18n }}
+ {{ 'mxk.apps.category.1911' | i18n }}
+ {{ 'mxk.apps.category.1912' | i18n }}
+
+
+
+
-
-
- (),
- indeterminate: false,
- checked: false
- };
+ params: {
+ groupName: '',
+ displayName: '',
+ username: '',
+ groupId: '',
+ appName: '',
+ appId: '',
+ startDate: '',
+ endDate: '',
+ startDatePicker: addDays(new Date(), -30),
+ endDatePicker: new Date(),
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableInitialize: true,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
constructor(
private modalService: NzModalService,
private groupMembersService: GroupMembersService,
+ private groupsService: GroupsService,
private viewContainerRef: ViewContainerRef,
private fb: FormBuilder,
private msg: NzMessageService,
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private route: ActivatedRoute,
private cdr: ChangeDetectorRef
- ) {}
+ ) { }
ngOnInit(): void {
if (this.route.snapshot.queryParams['username']) {
@@ -266,4 +268,94 @@ export class GroupMembersComponent implements OnInit {
this.query.results.rows.filter(({ disabled }) => !disabled).forEach(({ id }) => this.updateTableCheckedSet(id, checked));
this.refreshTableCheckedStatus();
}
+
+ //group list
+ groupQuery: {
+ params: {
+ groupName: String;
+ pageSize: number;
+ pageNumber: number;
+ pageSizeOptions: number[];
+ };
+ results: {
+ records: number;
+ rows: NzSafeAny[];
+ };
+ expandForm: Boolean;
+ submitLoading: boolean;
+ tableLoading: boolean;
+ tableCheckedId: Set;
+ indeterminate: boolean;
+ checked: boolean;
+ } = {
+ params: {
+ groupName: '',
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
+
+ onGroupSearch(): void {
+ this.fetchGroup();
+ }
+
+ onGroupQueryParamsChange(tableQueryParams: NzTableQueryParams): void {
+ this.groupQuery.params.pageNumber = tableQueryParams.pageIndex;
+ this.groupQuery.params.pageSize = tableQueryParams.pageSize;
+ this.fetchGroup();
+ }
+
+ fetchGroup(): void {
+ this.groupQuery.submitLoading = true;
+ this.groupQuery.tableLoading = true;
+ this.groupQuery.indeterminate = false;
+ this.groupQuery.checked = false;
+ this.groupQuery.tableCheckedId.clear();
+ this.groupsService.fetch(this.groupQuery.params).subscribe(res => {
+ this.groupQuery.results = res.data;
+ this.groupQuery.submitLoading = false;
+ this.groupQuery.tableLoading = false;
+ this.cdr.detectChanges();
+ });
+ }
+
+ updateGroupTableCheckedSet(id: String, checked: boolean): void {
+ if (checked) {
+ this.groupQuery.tableCheckedId.add(id);
+ } else {
+ this.groupQuery.tableCheckedId.delete(id);
+ }
+ }
+
+ refreshGroupTableCheckedStatus(): void {
+ const listOfEnabledData = this.groupQuery.results.rows.filter(({ disabled }) => !disabled);
+ this.groupQuery.checked = listOfEnabledData.every(({ id }) => this.groupQuery.tableCheckedId.has(id));
+ this.groupQuery.indeterminate = listOfEnabledData.some(({ id }) => this.groupQuery.tableCheckedId.has(id)) && !this.groupQuery.checked;
+ }
+
+ onGroupTableItemChecked(groupId: String, groupName: String, checked: boolean): void {
+ console.log(`checked ${checked} , groupId ${groupId} , groupName ${groupName}`);
+ this.onGroupTableAllChecked(false);
+ this.updateGroupTableCheckedSet(groupId, checked);
+ this.refreshGroupTableCheckedStatus();
+ this.query.params.groupId = groupId;
+ this.query.params.groupName = groupName;
+ this.fetch();
+ }
+
+ onGroupTableAllChecked(checked: boolean): void {
+ this.groupQuery.results.rows.filter(({ disabled }) => !disabled).forEach(({ id }) => this.updateGroupTableCheckedSet(id, checked));
+ this.refreshGroupTableCheckedStatus();
+ }
}
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.ts
index 26c975c2d..3b4de0a2c 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.ts
@@ -24,7 +24,7 @@ import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { Groups } from '../../../../entity/Groups';
import { TreeNodes } from '../../../../entity/TreeNodes';
-import { GroupsService } from '../../../../service/Groups.service';
+import { GroupsService } from '../../../../service/groups.service';
import { OrganizationsService } from '../../../../service/organizations.service';
@Component({
@@ -47,9 +47,9 @@ export class GroupEditerComponent implements OnInit {
submitting: boolean;
model: Groups;
} = {
- submitting: false,
- model: new Groups()
- };
+ submitting: false,
+ model: new Groups()
+ };
// TreeNodes
treeNodes = new TreeNodes(false);
@@ -66,7 +66,7 @@ export class GroupEditerComponent implements OnInit {
private msg: NzMessageService,
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private cdr: ChangeDetectorRef
- ) {}
+ ) { }
ngOnInit(): void {
this.tree();
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 6930e4d51..4cbd9dbf4 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
@@ -25,7 +25,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { NzTableQueryParams } from 'ng-zorro-antd/table';
-import { GroupsService } from '../../../service/Groups.service';
+import { GroupsService } from '../../../service/groups.service';
import { set2String } from '../../../shared/index';
import { GroupEditerComponent } from './group-editer/group-editer.component';
@@ -59,29 +59,29 @@ export class GroupsComponent implements OnInit {
indeterminate: boolean;
checked: boolean;
} = {
- params: {
- groupName: '',
- displayName: '',
- employeeNumber: '',
- startDate: '',
- endDate: '',
- startDatePicker: addDays(new Date(), -30),
- endDatePicker: new Date(),
- pageSize: 10,
- pageNumber: 1,
- pageSizeOptions: [10, 20, 50]
- },
- results: {
- records: 0,
- rows: []
- },
- expandForm: false,
- submitLoading: false,
- tableLoading: false,
- tableCheckedId: new Set(),
- indeterminate: false,
- checked: false
- };
+ params: {
+ groupName: '',
+ displayName: '',
+ employeeNumber: '',
+ startDate: '',
+ endDate: '',
+ startDatePicker: addDays(new Date(), -30),
+ endDatePicker: new Date(),
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
constructor(
private modalService: NzModalService,
@@ -92,7 +92,7 @@ export class GroupsComponent implements OnInit {
private router: Router,
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private cdr: ChangeDetectorRef
- ) {}
+ ) { }
ngOnInit(): void {
this.fetch();
@@ -108,7 +108,7 @@ export class GroupsComponent implements OnInit {
this.fetch();
}
- onReset(): void {}
+ onReset(): void { }
onBatchDelete(e: MouseEvent): void {
e.preventDefault();
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.ts
index 949db6ecc..58fd20f70 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/select-groups/select-groups.component.ts
@@ -23,7 +23,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { NzTableQueryParams } from 'ng-zorro-antd/table';
-import { GroupsService } from '../../../../service/Groups.service';
+import { GroupsService } from '../../../../service/groups.service';
@Component({
selector: 'app-select-groups',
@@ -55,29 +55,29 @@ export class SelectGroupsComponent implements OnInit {
indeterminate: boolean;
checked: boolean;
} = {
- params: {
- groupName: '',
- displayName: '',
- protocol: '',
- startDate: '',
- endDate: '',
- startDatePicker: addDays(new Date(), -30),
- endDatePicker: new Date(),
- pageSize: 5,
- pageNumber: 1,
- pageSizeOptions: [5, 15, 50]
- },
- results: {
- records: 0,
- rows: []
- },
- expandForm: false,
- submitLoading: false,
- tableLoading: false,
- tableCheckedId: new Set(),
- indeterminate: false,
- checked: false
- };
+ params: {
+ groupName: '',
+ displayName: '',
+ protocol: '',
+ startDate: '',
+ endDate: '',
+ startDatePicker: addDays(new Date(), -30),
+ endDatePicker: new Date(),
+ pageSize: 5,
+ pageNumber: 1,
+ pageSizeOptions: [5, 15, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
constructor(
private modalRef: NzModalRef,
@@ -86,7 +86,7 @@ export class SelectGroupsComponent implements OnInit {
private fb: FormBuilder,
private msg: NzMessageService,
private cdr: ChangeDetectorRef
- ) {}
+ ) { }
ngOnInit(): void {
this.fetch();
@@ -102,7 +102,7 @@ export class SelectGroupsComponent implements OnInit {
this.fetch();
}
- onReset(): void {}
+ onReset(): void { }
fetch(): void {
this.query.submitLoading = true;
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.ts
index a66d65bc8..fe515e9eb 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/privileges/privileges.component.ts
@@ -36,7 +36,7 @@ import { NzTableQueryParams } from 'ng-zorro-antd/table';
import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions, NzTreeComponent } from 'ng-zorro-antd/tree';
import { TreeNodes } from '../../../entity/TreeNodes';
-import { GroupsService } from '../../../service/Groups.service';
+import { GroupsService } from '../../../service/groups.service';
import { GroupPrivilegesService } from '../../../service/group-privileges.service';
import { ResourcesService } from '../../../service/resources.service';
import { set2String } from '../../../shared/index';
@@ -75,31 +75,31 @@ export class PrivilegesComponent implements OnInit {
indeterminate: boolean;
checked: boolean;
} = {
- params: {
- groupName: '',
- displayName: '',
- employeeNumber: '',
- appId: '',
- appName: '',
- startDate: '',
- endDate: '',
- startDatePicker: addDays(new Date(), -30),
- endDatePicker: new Date(),
- pageSize: 10,
- pageNumber: 1,
- pageSizeOptions: [10, 20, 50]
- },
- results: {
- records: 0,
- rows: []
- },
- expandForm: false,
- submitLoading: false,
- tableLoading: false,
- tableCheckedId: new Set(),
- indeterminate: false,
- checked: false
- };
+ params: {
+ groupName: '',
+ displayName: '',
+ employeeNumber: '',
+ appId: '',
+ appName: '',
+ startDate: '',
+ endDate: '',
+ startDatePicker: addDays(new Date(), -30),
+ endDatePicker: new Date(),
+ pageSize: 10,
+ pageNumber: 1,
+ pageSizeOptions: [10, 20, 50]
+ },
+ results: {
+ records: 0,
+ rows: []
+ },
+ expandForm: false,
+ submitLoading: false,
+ tableLoading: false,
+ tableCheckedId: new Set(),
+ indeterminate: false,
+ checked: false
+ };
treeNodes = new TreeNodes(true);
@@ -114,7 +114,7 @@ export class PrivilegesComponent implements OnInit {
@Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
private cdr: ChangeDetectorRef,
private http: _HttpClient
- ) {}
+ ) { }
ngOnInit(): void {
this.fetch();
@@ -130,7 +130,7 @@ export class PrivilegesComponent implements OnInit {
this.fetch();
}
- onReset(): void {}
+ onReset(): void { }
onSave(e: MouseEvent): void {
e.preventDefault();
+
\ No newline at end of file
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts
index 9516af0cb..ba1bb8000 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/group-members.component.ts
@@ -28,6 +28,7 @@ import { NzTableQueryParams } from 'ng-zorro-antd/table';
import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
import { GroupMembersService } from '../../../service/group-members.service';
+import { GroupsService } from '../../../service/groups.service';
import { set2String } from '../../../shared/index';
import { SelectGroupsComponent } from '../groups/select-groups/select-groups.component';
import { GroupMembersEditerComponent } from './group-members-editer/group-members-editer.component';
@@ -67,44 +68,45 @@ export class GroupMembersComponent implements OnInit {
indeterminate: boolean;
checked: boolean;
} = {
- params: {
- groupName: '',
- displayName: '',
- username: '',
- groupId: '',
- appName: '',
- appId: '',
- startDate: '',
- endDate: '',
- startDatePicker: addDays(new Date(), -30),
- endDatePicker: new Date(),
- pageSize: 10,
- pageNumber: 1,
- pageSizeOptions: [10, 20, 50]
- },
- results: {
- records: 0,
- rows: []
- },
- expandForm: false,
- submitLoading: false,
- tableLoading: false,
- tableInitialize: true,
- tableCheckedId: new Set
+
+
+
+ [nzData]="groupQuery.results.rows" [nzFrontPagination]="false" [nzTotal]="groupQuery.results.records"
+ [nzPageSizeOptions]="groupQuery.params.pageSizeOptions" [nzPageSize]="groupQuery.params.pageSize"
+ [nzPageIndex]="groupQuery.params.pageNumber" [nzLoading]="this.groupQuery.tableLoading"
+ (nzQueryParams)="onGroupQueryParamsChange($event)">
- {{ 'mxk.roles.name' | i18n }}
- {{ 'mxk.users.username' | i18n }}
- {{ 'mxk.users.displayName' | i18n }}
- {{ 'mxk.users.department' | i18n }}
- {{ 'mxk.users.jobTitle' | i18n }}
- {{ 'mxk.users.gender' | i18n }}
- {{ 'mxk.text.action' | i18n }}
+ {{ 'mxk.groups.name' | i18n }}
+ {{ 'mxk.groups.category' | i18n }}
-
- {{ data.groupName }}
- {{ data.username }}
- {{ data.displayName }}
- {{ data.department }}
- {{ data.jobTitle }}
- {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' |
- i18n) }}
-
-
+ {{ data.groupName }}
+ {{ 'mxk.groups.category.dynamic' | i18n }}
+ {{ 'mxk.groups.category.static' | i18n }}
+ {{ 'mxk.groups.category.app' | i18n }}
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'mxk.roles.name' | i18n }}
+ {{ 'mxk.users.username' | i18n }}
+ {{ 'mxk.users.displayName' | i18n }}
+ {{ 'mxk.users.department' | i18n }}
+ {{ 'mxk.users.jobTitle' | i18n }}
+ {{ 'mxk.users.gender' | i18n }}
+ {{ 'mxk.text.action' | i18n }}
+
+
+
+
+ {{ data.groupName }}
+ {{ data.username }}
+ {{ data.displayName }}
+ {{ data.department }}
+ {{ data.jobTitle }}
+ {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) :
+ ('mxk.users.gender.male' | i18n) }}
+
+
+
+
+
+
+
+
+
+