Skip to content

Commit

Permalink
Merge pull request #6938 from wso2/enable_console_settings_cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
pavinduLakshan authored Oct 1, 2024
2 parents 432dd10 + d82f777 commit 1e9c601
Show file tree
Hide file tree
Showing 14 changed files with 449 additions and 136 deletions.
8 changes: 8 additions & 0 deletions .changeset/gold-pigs-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@wso2is/admin.console-settings.v1": patch
"@wso2is/admin.administrators.v1": patch
"@wso2is/console": patch
"@wso2is/i18n": patch
---

Make console settings UI configurable for managed deployments
5 changes: 4 additions & 1 deletion apps/console/src/public/deployment.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,10 @@
}
},
"consoleSettings": {
"disabledFeatures": [],
"disabledFeatures": [
"consoleSettings.invitedExternalAdmins",
"consoleSettings.privilegedUsers"
],
"enabled": true,
"scopes": {
"create": [
Expand Down
5 changes: 2 additions & 3 deletions features/admin.administrators.v1/pages/administrators.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
const [ currentActivePage, setCurrentActivePage ] = useState<number>(0);
const [ triggerClearQuery, setTriggerClearQuery ] = useState<boolean>(false);
const [ showExtenalAdminWizard, setShowExtenalAdminWizard ] = useState<boolean>(false);
const [ rolesList ] = useState([]);
const [ invitationStatusOption, setInvitationStatusOption ] = useState<string>(InvitationStatus.ACCEPTED);
const [ isInvitationStatusOptionChanged, setIsInvitationStatusOptionChanged ] = useState<boolean>(false);
const [ paginatedGuestList, setPaginateGuestList ] = useState<UserInviteInterface[]>([]);
Expand Down Expand Up @@ -1435,7 +1434,7 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
setShowExtenalAdminWizard(false);
} }
updateList={ () => mutateGuestUserListFetchRequest() }
rolesList={ rolesList }
rolesList={ [] }
emailVerificationEnabled={ true }
onInvitationSendSuccessful={ () => {
mutateGuestUserListFetchRequest();
Expand Down Expand Up @@ -1475,7 +1474,7 @@ const CollaboratorsPage: FunctionComponent<CollaboratorsPageInterface> = (
listOffset={ listOffset }
listItemLimit={ listItemLimit }
updateList={ () => mutateGuestUserListFetchRequest() }
rolesList={ rolesList }
rolesList={ [] }
emailVerificationEnabled={ false }
isAdminUser={ true }
defaultUserTypeSelection={ UserAccountTypes.ADMINISTRATOR }
Expand Down
Loading

0 comments on commit 1e9c601

Please sign in to comment.