Skip to content

Commit

Permalink
Insert whitespaces after commas in policies (#51)
Browse files Browse the repository at this point in the history
  • Loading branch information
dthomson25 authored Sep 27, 2018
1 parent f353236 commit ba36b3f
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface ProjectRolePoliciesProps {
}

function generatePolicy(project: string, role: string, action?: string, object?: string, permission?: string): string {
return `p,proj:${project}:${role},applications,${action || ''},${project}/${object || ''},${permission || ''}`;
return `p, proj:${project}:${role}, applications, ${action || ''}, ${project}/${object || ''}, ${permission || ''}`;
}

const actions = ['get', 'create', 'update', 'delete', 'sync', 'rollback', 'terminateop'];
Expand Down Expand Up @@ -120,7 +120,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
if (fields.length !== 6) {
return '';
}
return fields[3];
return fields[3].trim();
}

private setAction(action: string) {
Expand All @@ -129,7 +129,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
this.props.fieldApi.setValue(generatePolicy(this.props.projName, this.props.roleName, action, '', ''));
return;
}
fields[3] = action;
fields[3] = ` ${action}`;
this.props.fieldApi.setValue(fields.join());
}

Expand All @@ -138,7 +138,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
if (fields.length !== 6) {
return '';
}
return fields[4];
return fields[4].trim();
}

private setObject(object: string) {
Expand All @@ -147,7 +147,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
this.props.fieldApi.setValue(generatePolicy(this.props.projName, this.props.roleName, '', object, ''));
return;
}
fields[4] = object;
fields[4] = ` ${object}`;
this.props.fieldApi.setValue(fields.join());
}

Expand All @@ -156,15 +156,15 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
if (fields.length !== 6) {
return '';
}
return fields[5];
return fields[5].trim();
}
private setPermission(permission: string) {
const fields = (this.props.fieldApi.getValue() as string).split(',');
if (fields.length !== 6) {
this.props.fieldApi.setValue(generatePolicy(this.props.projName, this.props.roleName, '', '', permission));
return;
}
fields[5] = permission;
fields[5] = ` ${permission}`;
this.props.fieldApi.setValue(fields.join());
}
}
Expand Down

0 comments on commit ba36b3f

Please sign in to comment.