Skip to content

Save button remains active even when attempting to add an invalid role. #863

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 4 commits into from
Feb 7, 2025
Merged

Save button remains active even when attempting to add an invalid role. #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dde2bde
Merge branch 'fixes/add_role_issue' of https://github.com/ShakyaPr/ap…
ShakyaPr Jan 30, 2025
9301070
added save button disbale option
ShakyaPr Jan 31, 2025
e01bc4e
Added save btn disable option for invalid roles - key manager
ShakyaPr Jan 31, 2025
1057453
Merge branch 'main' of https://github.com/wso2/apim-apps into fixes/s…
ShakyaPr Feb 7, 2025
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
5 changes: 4 additions & 1 deletion portals/admin/src/main/webapp/source/src/app/components/AdminPages/Addons/FormDialogBase.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function FormDialogBase({
formSaveCallback,
dialogOpenCallback,
triggerIconProps,
saveButtonDisabled,
}) {
const [open, setOpen] = React.useState(false);
const [saving, setSaving] = useState(false);
Expand Down Expand Up @@ -104,7 +105,7 @@ function FormDialogBase({
onClick={saveTriggerd}
color='primary'
variant='contained'
disabled={saving}
disabled={saving || saveButtonDisabled}
data-testid='form-dialog-base-save-btn'
>
{saving ? (<CircularProgress size={16} />) : (<>{saveButtonText}</>)}
Expand All @@ -124,6 +125,7 @@ FormDialogBase.defaultProps = {
color: 'primary',
component: 'span',
},
saveButtonDisabled: false,
};

FormDialogBase.propTypes = {
Expand All @@ -142,6 +144,7 @@ FormDialogBase.propTypes = {
triggerIconProps: PropTypes.shape({}),
formSaveCallback: PropTypes.func.isRequired,
dialogOpenCallback: PropTypes.func,
saveButtonDisabled: PropTypes.bool,
};

export default FormDialogBase;
1 change: 1 addition & 0 deletions ...in/src/main/webapp/source/src/app/components/GatewayEnvironments/AddEditGWEnvironment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ function AddEditGWEnvironment(props) {
triggerButtonText={triggerButtonText}
formSaveCallback={formSaveCallback}
dialogOpenCallback={dialogOpenCallback}
saveButtonDisabled={!roleValidity}
>
<FormControl
variant='standard'
Expand Down
2 changes: 1 addition & 1 deletion portals/admin/src/main/webapp/source/src/app/components/KeyManagers/AddEditKeyManager.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2275,7 +2275,7 @@ function AddEditKeyManager(props) {
variant='contained'
color='primary'
onClick={formSaveCallback}
disabled={isGlobal && !isSuperAdmin}
disabled={(isGlobal && !isSuperAdmin) || !roleValidity}
>
{saving ? (<CircularProgress size={16} />) : (
<>
Expand Down
Loading