Skip to content

- File: src/app/adf-services/df-service-details/df-service-details.co… #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekevinm merged 1 commit into from
Aug 8, 2025
Merged

- File: src/app/adf-services/df-service-details/df-service-details.co… #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions src/app/adf-roles/df-manage-roles/df-manage-roles-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,24 +171,28 @@ export class DfManageRolesTableComponent extends DfManageTableComponent<RoleRow>
is_active: roleData.isActive || roleData.is_active,
// Copy service access permissions - check both camelCase and snake_case
role_service_access_by_role_id:
(roleData.roleServiceAccessByRoleId || roleData.role_service_access_by_role_id)?.map(
(access: any) => ({
service_id: access.serviceId || access.service_id,
component: access.component,
verb_mask: access.verbMask || access.verb_mask,
requestor_mask: access.requestorMask || access.requestor_mask,
filters:
access.filters?.map((filter: any) => ({
name: filter.name || filter.field,
operator: filter.operator,
value: filter.value,
})) || [],
filter_op: access.filterOp || access.filter_op || 'AND',
})
) || [],
(
roleData.roleServiceAccessByRoleId ||
roleData.role_service_access_by_role_id
)?.map((access: any) => ({
service_id: access.serviceId || access.service_id,
component: access.component,
verb_mask: access.verbMask || access.verb_mask,
requestor_mask:
access.requestorMask || access.requestor_mask,
filters:
access.filters?.map((filter: any) => ({
name: filter.name || filter.field,
operator: filter.operator,
value: filter.value,
})) || [],
filter_op: access.filterOp || access.filter_op || 'AND',
})) || [],
// Copy lookup keys - check both camelCase and snake_case
lookup_by_role_id:
(roleData.lookupByRoleId || roleData.lookup_by_role_id)?.map((lookup: any) => ({
(
roleData.lookupByRoleId || roleData.lookup_by_role_id
)?.map((lookup: any) => ({
name: lookup.name,
value: lookup.value,
private: lookup.private,
Expand All @@ -201,7 +205,10 @@ export class DfManageRolesTableComponent extends DfManageTableComponent<RoleRow>
resource: [duplicatedRole],
};

console.log('Sending payload:', JSON.stringify(payload, null, 2));
console.log(
'Sending payload:',
JSON.stringify(payload, null, 2)
);

// Create the new role
this.roleService
Expand Down
8 changes: 4 additions & 4 deletions src/app/adf-services/df-service-details/df-service-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export class DfServiceDetailsComponent implements OnInit {
description: [''],
isActive: [true],
service_doc_by_service_id: this.fb.group({
format: [],
format: [0],
content: [''],
}),
});
Expand Down Expand Up @@ -560,9 +560,9 @@ export class DfServiceDetailsComponent implements OnInit {
// data.service_doc_by_service_id = null;
// } else {
data.service_doc_by_service_id.content = data.config.content;
data.service_doc_by_service_id.format = Number(
this.serviceDefinitionType
);
data.service_doc_by_service_id.format = this.serviceDefinitionType
? Number(this.serviceDefinitionType)
: 0;
// }
} else if (this.isScriptService) {
params = {
Expand Down