Skip to content

Improve UX of role addition. #889

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
hisanhunais merged 1 commit into from
Feb 27, 2025
Merged

Improve UX of role addition. #889

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
23 changes: 19 additions & 4 deletions ...s/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/CreateScope.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,25 @@ class CreateScope extends React.Component {
const promise = APIValidation.role.validate(base64url.encode(role));
promise
.then(() => {
this.setState({
roleValidity: true,
validRoles: [...validRoles, role],
});
const splitRole = role.split('/', 2);
let validatedRole = '';
if (splitRole.length > 1) {
const domain = splitRole.length > 0 ? splitRole[0] : '';
if (domain.toUpperCase() !== 'INTERNAL') {
const domainUpperCase = domain.toUpperCase().concat('/');
validatedRole = domainUpperCase.concat(splitRole[1]);
} else {
validatedRole = role;
}
} else {
validatedRole = role;
}
if (!validRoles.includes(validatedRole)) {
this.setState({
roleValidity: true,
validRoles: [...validRoles, validatedRole],
});
}
})
.catch((error) => {
if (error.status === 404) {
Expand Down
23 changes: 19 additions & 4 deletions ...als/publisher/src/main/webapp/source/src/app/components/Apis/Details/Scopes/EditScope.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,25 @@ class EditScope extends React.Component {
const promise = APIValidation.role.validate(base64url.encode(role));
promise
.then(() => {
this.setState({
roleValidity: true,
validRoles: [...validRoles, role],
});
const splitRole = role.split('/', 2);
let validatedRole = '';
if (splitRole.length > 1) {
const domain = splitRole.length > 0 ? splitRole[0] : '';
if (domain.toUpperCase() !== 'INTERNAL') {
const domainUpperCase = domain.toUpperCase().concat('/');
validatedRole = domainUpperCase.concat(splitRole[1]);
} else {
validatedRole = role;
}
} else {
validatedRole = role;
}
if (!validRoles.includes(validatedRole)) {
this.setState({
roleValidity: true,
validRoles: [...validRoles, validatedRole],
});
}
})
.catch((error) => {
if (error.status === 404) {
Expand Down
23 changes: 19 additions & 4 deletions portals/publisher/src/main/webapp/source/src/app/components/Scopes/Create/CreateScope.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,25 @@ class CreateScope extends React.Component {
const promise = APIValidation.role.validate(base64url.encode(role));
promise
.then(() => {
this.setState({
roleValidity: true,
validRoles: [...validRoles, role],
});
const splitRole = role.split('/', 2);
let validatedRole = '';
if (splitRole.length > 1) {
const domain = splitRole.length > 0 ? splitRole[0] : '';
if (domain.toUpperCase() !== 'INTERNAL') {
const domainUpperCase = domain.toUpperCase().concat('/');
validatedRole = domainUpperCase.concat(splitRole[1]);
} else {
validatedRole = role;
}
} else {
validatedRole = role;
}
if (!validRoles.includes(validatedRole)) {
this.setState({
roleValidity: true,
validRoles: [...validRoles, validatedRole],
});
}
})
.catch((error) => {
if (error.status === 404) {
Expand Down
23 changes: 19 additions & 4 deletions portals/publisher/src/main/webapp/source/src/app/components/Scopes/EditScope.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,25 @@ class EditScope extends React.Component {
const promise = APIValidation.role.validate(base64url.encode(role));
promise
.then(() => {
this.setState({
roleValidity: true,
validRoles: [...validRoles, role],
});
const splitRole = role.split('/', 2);
let validatedRole = '';
if (splitRole.length > 1) {
const domain = splitRole.length > 0 ? splitRole[0] : '';
if (domain.toUpperCase() !== 'INTERNAL') {
const domainUpperCase = domain.toUpperCase().concat('/');
validatedRole = domainUpperCase.concat(splitRole[1]);
} else {
validatedRole = role;
}
} else {
validatedRole = role;
}
if (!validRoles.includes(validatedRole)) {
this.setState({
roleValidity: true,
validRoles: [...validRoles, validatedRole],
});
}
Copy link
Copy Markdown
Contributor

@piyumaldk piyumaldk Feb 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we implement this code segment in a single place and reuse that in these 4 places? Possibly in Shared Component since these are different components?

Copy link
Copy Markdown
Contributor

@AnuGayan AnuGayan Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets fix this in another PR as this is an improvement @shilmyhasan Please note

})
.catch((error) => {
if (error.status === 404) {
Expand Down
Loading