From 0ff8173a852d735fbd6fa574efb48439074c9b59 Mon Sep 17 00:00:00 2001
From: root
| {{ 'roles.accessOverview.tableHeadings.service' | transloco }} |
|
|
|
|
+ *matCellDef="let row; let i = dataIndex"
+ [formGroupName]="i"
+ (click)="toggleRow(row)">
- N/A
+ Show/Hide
|
|
+ |
+
+
+ |
|---|
{{ 'roles.lookupKeys.description' | transloco }} diff --git a/src/app/adf-roles/df-role-details/df-role-details.component.ts b/src/app/adf-roles/df-role-details/df-role-details.component.ts index 4b3c0656..f8630700 100644 --- a/src/app/adf-roles/df-role-details/df-role-details.component.ts +++ b/src/app/adf-roles/df-role-details/df-role-details.component.ts @@ -160,10 +160,87 @@ export class DfRoleDetailsComponent implements OnInit { this.showAlert = true; } + // onSubmit() { + // if (this.roleForm.invalid) return; + + // const formValue = this.roleForm.getRawValue(); + // console.log(formValue); + + // const payload: RolePayload = { + // id: formValue.id, + // name: formValue.name, + // description: formValue.description, + // isActive: formValue.active, + // roleServiceAccessByRoleId: formValue.serviceAccess.map( + // (val: AccessForm) => { + // const advancedFilters = { + // field: val.expandField, + // operator: val.expandOperator, + // value: val.expandValue, + // }; + + // const filtersArray = []; + // filtersArray.push(advancedFilters); + + // return { + // id: val.id, + // serviceId: val.service, + // component: val.component, + // verbMask: val.access.reduce((acc, cur) => acc + cur, 0), // add up all the values in the array + // requestorMask: val.requester.reduce((acc, cur) => acc + cur, 0), // 1 = API, 2 = SCRIPT, 3 = API & SCRIPT + // filters: filtersArray, + // filterOp: 'AND', + // }; + // } + // ), + // lookupByRoleId: formValue.lookupKeys, + // }; + + // const createPayload = { + // resource: [payload], + // }; + + // if (this.type === 'edit' && payload.id) { + // this.roleService + // .update(payload.id, payload) + // .pipe( + // catchError(err => { + // this.triggerAlert('error', err.error.error.message); + // return throwError(() => new Error(err)); + // }) + // ) + // .subscribe(() => { + // this.goBack(); + // }); + // } else { + // console.log(23); + // this.roleService + // .create(createPayload, { + // fields: '*', + // related: 'role_service_access_by_role_id,lookup_by_role_id', + // }) + // .pipe( + // catchError(err => { + // this.triggerAlert( + // 'error', + // err.error.error.context.resource[0].message + // ); + // return throwError(() => new Error(err)); + // }) + // ) + // .subscribe(() => { + // this.goBack(); + // }); + // } + get serviceAccess(): FormArray { + return this.roleForm.get('serviceAccess') as FormArray; + } + onSubmit() { if (this.roleForm.invalid) return; const formValue = this.roleForm.getRawValue(); + console.log(formValue); const payload: RolePayload = { id: formValue.id, @@ -172,18 +249,15 @@ export class DfRoleDetailsComponent implements OnInit { isActive: formValue.active, roleServiceAccessByRoleId: formValue.serviceAccess.map( (val: AccessForm) => { - const advancedFilters = { - field: val.expandField, - operator: val.expandOperator, - value: val.expandValue, - }; - - const filtersArray = []; - filtersArray.push(advancedFilters); + const filtersArray = val.advancedFilters.map((filter: any) => ({ + name: filter.expandField, + operator: filter.expandOperator, + value: filter.expandValue, + })); return { id: val.id, - serviceId: val.service, + serviceId: val.service === 0 ? null : val.service, component: val.component, verbMask: val.access.reduce((acc, cur) => acc + cur, 0), // add up all the values in the array requestorMask: val.requester.reduce((acc, cur) => acc + cur, 0), // 1 = API, 2 = SCRIPT, 3 = API & SCRIPT diff --git a/src/app/adf-roles/df-roles-access/df-roles-access.component.html b/src/app/adf-roles/df-roles-access/df-roles-access.component.html index 13f6690c..43b11712 100644 --- a/src/app/adf-roles/df-roles-access/df-roles-access.component.html +++ b/src/app/adf-roles/df-roles-access/df-roles-access.component.html @@ -1,232 +1,268 @@ -
{{ 'roles.accessOverview.description' | transloco }}
-| - {{ 'roles.accessOverview.tableHeadings.service' | transloco }} - | -
-
|
+ ||
|---|---|---|---|
|
+ + {{ 'roles.accessOverview.noAccessRules' | transloco }} + |
+ |||