Skip to content
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

Enable UI to allow managing secondary userstores in sub-organizations. #7269

Merged
merged 8 commits into from
Jan 21, 2025
Merged

Enable UI to allow managing secondary userstores in sub-organizations. #7269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61ddbbc
Allow managing userstores in sub-orgs.
Yasasr1 Jan 8, 2025
05bf2fd
Merge branch 'master' into userstore
Yasasr1 Jan 8, 2025
066e6a5
Add changeset.
Yasasr1 Jan 8, 2025
e109b2f
Fix build failure.
Yasasr1 Jan 8, 2025
5beeabf
Address review comments.
Yasasr1 Jan 9, 2025
fd55059
Merge branch 'master' into userstore
Yasasr1 Jan 20, 2025
28364bf
Make distinct attribute values readonly in sub-orgs.
Yasasr1 Jan 20, 2025
e9ca602
Merge branch 'master' into userstore
Yasasr1 Jan 21, 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
10 changes: 10 additions & 0 deletions .changeset/witty-trainers-greet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@wso2is/admin.connections.v1": minor
"@wso2is/admin.claims.v1": minor
"@wso2is/admin.groups.v1": minor
"@wso2is/admin.users.v1": minor
"@wso2is/admin.core.v1": minor
"@wso2is/console": minor
---

Enable UI to manage secondary userstores in sub-organizations.
9 changes: 9 additions & 0 deletions ...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,6 +2015,15 @@
{% endfor %}
{% endif %}
},
"routes": {
"organizationEnabledRoutes": [
{% if console.ui.routes.organizationEnabledRoutes is defined %}
{% for value in console.ui.routes.organizationEnabledRoutes %}
"{{ value }}"{{ "," if not loop.last }}
{% endfor %}
{% endif %}
]
},
"selfAppIdentifier": "{{ console.self_app_identifier }}",
"systemAppsIdentifiers": [
{% if console.system_apps_identifiers is defined %}
Expand Down
5 changes: 3 additions & 2 deletions apps/console/src/hooks/use-routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { AccessControlUtils } from "@wso2is/access-control";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import useGlobalVariables from "@wso2is/admin.core.v1/hooks/use-global-variables";
import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config";
import { FeatureConfigInterface, RouteConfigInterface } from "@wso2is/admin.core.v1/models/config";
import {
AppState,
setDeveloperVisibility,
Expand Down Expand Up @@ -63,6 +63,7 @@ const useRoutes = (): useRoutesInterface => {
const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
const isGroupAndRoleSeparationEnabled: boolean = useSelector((state: AppState) =>
state?.config?.ui?.isGroupAndRoleSeparationEnabled);
const routesConfig: RouteConfigInterface = useSelector((state: AppState) => state.config.ui.routes);

/**
* Filter the routes based on the user roles and permissions.
Expand Down Expand Up @@ -120,7 +121,7 @@ const useRoutes = (): useRoutesInterface => {
};

const allowedRoutes: string[] = window["AppUtils"].getConfig().organizationName
? AppConstants.ORGANIZATION_ENABLED_ROUTES
? routesConfig?.organizationEnabledRoutes
: undefined;

const [
Expand Down
20 changes: 20 additions & 0 deletions apps/console/src/public/deployment.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,6 +1321,26 @@
"productVersionConfig": {
"productVersion": ""
},
"routes": {
"organizationEnabledRoutes": [
"apiResources",
"applications",
"attributeDialects",
"branding",
"consoleSettings",
"emailTemplates",
"gettingStarted",
"governanceConnectors",
"groups",
"identityProviders",
"organizations",
"roles",
"smsTemplates",
"userRoles",
"userStores",
"users"
]
},
"selfAppIdentifier": "Console",
"showAppSwitchButton": true,
"showSmsOtpPwdRecoveryFeatureStatusChip": false,
Expand Down
2 changes: 1 addition & 1 deletion features/admin.claims.v1/components/claims-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ export const ClaimsList: FunctionComponent<ClaimsListPropsInterface> = (
const resolveTableRowClick = (e: SyntheticEvent, item: Claim | ExternalClaim | ClaimDialect | any): void => {

//Disables inline edit if create scope is not available
if (!hasAttributeCreatePermissions) {
if (!hasAttributeUpdatePermissions) {
return;
}

Expand Down
41 changes: 23 additions & 18 deletions ...s/admin.claims.v1/components/edit/local-claim/edit-additional-properties-local-claims.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import { Show, useRequiredScopes } from "@wso2is/access-control";
import { AppConstants, AppState, FeatureConfigInterface, history } from "@wso2is/admin.core.v1";
import useUIConfig from "@wso2is/admin.core.v1/hooks/use-ui-configs";
import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
import { IdentityAppsError } from "@wso2is/core/errors";
import { AlertLevels, Claim, Property, TestableComponentInterface } from "@wso2is/core/models";
import { addAlert } from "@wso2is/core/store";
Expand Down Expand Up @@ -77,6 +78,8 @@ export const EditAdditionalPropertiesLocalClaims:
featureConfig?.attributeDialects?.scopes?.update
);

const { isSubOrganization } = useGetCurrentOrganizationType();

const { UIConfig } = useUIConfig();

const isReadOnly: boolean = !hasAttributeUpdatePermissions;
Expand Down Expand Up @@ -206,28 +209,30 @@ export const EditAdditionalPropertiesLocalClaims:
});
} }
data-testid={ `${ testId }-form-properties-dynamic-field` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
/>
</Grid.Column>
</Grid.Row>
<Grid.Row columns={ 1 }>
<Grid.Column width={ 6 }>
<Show
when={ featureConfig?.attributeDialects?.scopes?.update }
>
<PrimaryButton
onClick={ () => {
setSubmit();
} }
data-testid={ `${ testId }-submit-button` }
loading={ isSubmitting }
disabled={ isSubmitting }
{ !isSubOrganization() && (
<Grid.Row columns={ 1 }>
<Grid.Column width={ 6 }>
<Show
when={ featureConfig?.attributeDialects?.scopes?.update }
>
{ t("common:update") }
</PrimaryButton>
</Show>
</Grid.Column>
</Grid.Row>
<PrimaryButton
onClick={ () => {
setSubmit();
} }
data-testid={ `${ testId }-submit-button` }
loading={ isSubmitting }
disabled={ isSubmitting }
>
{ t("common:update") }
</PrimaryButton>
</Show>
</Grid.Column>
</Grid.Row>
) }
</Grid>
</EmphasizedSegment>
);
Expand Down
38 changes: 21 additions & 17 deletions features/admin.claims.v1/components/edit/local-claim/edit-basic-details-local-claims.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { AppConstants, AppState, FeatureConfigInterface, history } from "@wso2is
import useUIConfig from "@wso2is/admin.core.v1/hooks/use-ui-configs";
import { attributeConfig } from "@wso2is/admin.extensions.v1";
import { SCIMConfigs } from "@wso2is/admin.extensions.v1/configs/scim";
import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
import {
ConnectorPropertyInterface,
GovernanceConnectorInterface,
Expand Down Expand Up @@ -142,6 +143,8 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
const [ accountVerificationEnabled, setAccountVerificationEnabled ] = useState<boolean>(false);
const [ selfRegistrationEnabled, setSelfRegistrationEnabledEnabled ] = useState<boolean>(false);
const [ isSystemClaim, setIsSystemClaim ] = useState<boolean>(false);

const { isSubOrganization } = useGetCurrentOrganizationType();
const [ isConsoleRequired, setIsConsoleRequired ] = useState<boolean>(false);
const [ isEndUserRequired, setIsEndUserRequired ] = useState<boolean>(false);
const [ isSelfRegistrationRequired, setIsSelfRegistrationRequired ] = useState<boolean>(false);
Expand Down Expand Up @@ -585,7 +588,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
defaultValue={ claim?.profiles?.console?.supportedByDefault ?? claim?.supportedByDefault }
data-componentid={
`${ testId }-form-console-supported-by-default-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isSupportedByDefaultCheckboxDisabled }
{
...( isConsoleRequired && !isConsoleReadOnly
Expand All @@ -603,7 +606,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
required={ false }
defaultValue={ claim?.profiles?.endUser?.supportedByDefault ?? claim?.supportedByDefault }
data-componentid={ `${ testId }-form-end-user-supported-by-default-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isSupportedByDefaultCheckboxDisabled }
{
...( isEndUserRequired && !isEndUserReadOnly
Expand All @@ -623,7 +626,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
claim?.supportedByDefault }
data-componentid={
`${ testId }-form-self-registration-supported-by-default-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isSupportedByDefaultCheckboxDisabled }
{
...( isSelfRegistrationRequired && !isSelfRegistrationReadOnly
Expand Down Expand Up @@ -668,7 +671,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
required={ false }
defaultValue={ claim?.profiles?.console?.required ?? claim?.required }
data-componentid={ `${ testId }-form-console-required-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isRequiredCheckboxDisabled || isConsoleReadOnly }
listen ={ (value: boolean) => {
setIsConsoleRequired(value);
Expand All @@ -688,7 +691,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
required={ false }
defaultValue={ claim?.profiles?.endUser?.required ?? claim?.required }
data-componentid={ `${ testId }-form-end-user-required-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isRequiredCheckboxDisabled || isEndUserReadOnly }
listen ={ (value: boolean) => {
setIsEndUserRequired(value);
Expand All @@ -708,7 +711,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
required={ false }
defaultValue={ claim?.profiles?.selfRegistration?.required ?? claim?.required }
data-componentid={ `${ testId }-form-self-registration-required-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isRequiredCheckboxDisabled || isSelfRegistrationReadOnly }
listen ={ (value: boolean) => {
setIsSelfRegistrationRequired(value);
Expand Down Expand Up @@ -750,7 +753,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
requiredErrorMessage=""
defaultValue={ claim?.profiles?.console?.readOnly ?? claim?.readOnly }
data-componentid={ `${ testId }-form-console-readOnly-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isReadOnlyCheckboxDisabled }
listen ={ (value: boolean) => {
setIsConsoleReadOnly(value);
Expand All @@ -765,7 +768,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
requiredErrorMessage=""
defaultValue={ claim?.profiles?.endUser?.readOnly ?? claim?.readOnly }
data-componentid={ `${ testId }-form-end-user-readOnly-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isReadOnlyCheckboxDisabled }
listen ={ (value: boolean) => {
setIsEndUserReadOnly(value);
Expand All @@ -780,7 +783,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
requiredErrorMessage=""
defaultValue={ claim?.profiles?.selfRegistration?.readOnly ?? claim?.readOnly }
data-componentid={ `${ testId }-form-self-registration-readOnly-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={ isReadOnlyCheckboxDisabled }
listen ={ (value: boolean) => {
setIsSelfRegistrationReadOnly(value);
Expand Down Expand Up @@ -839,7 +842,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
maxLength={ 30 }
minLength={ 1 }
hint={ t("claims:local.forms.nameHint") }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }

/>
<Field.Textarea
Expand All @@ -858,7 +861,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
minLength={ 3 }
data-testid={ `${ testId }-form-description-input` }
hint={ t("claims:local.forms.descriptionHint") }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
/>

{ !attributeConfig.localAttributes.createWizard.showRegularExpression && !hideSpecialClaims
Expand All @@ -877,7 +880,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
maxLength={ ClaimManagementConstants.REGEX_FIELD_MAX_LENGTH }
minLength={ ClaimManagementConstants.REGEX_FIELD_MIN_LENGTH }
hint={ t("claims:local.forms.regExHint") }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
/>
)
}
Expand All @@ -891,6 +894,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
label={ t("claims:local.forms.uniquenessScope.label") }
data-componentid={ `${ testId }-form-uniqueness-scope-dropdown` }
hint={ t("claims:local.forms.uniquenessScopeHint") }
disabled={ isSubOrganization() }
options={ [
{
text: t("claims:local.forms.uniquenessScope.options.none"),
Expand Down Expand Up @@ -960,7 +964,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
setIsShowDisplayOrder(!!values?.supportedByDefault);
} }
data-testid={ `${testId}-form-supported-by-default-input` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
disabled={
!hasMapping
|| (
Expand Down Expand Up @@ -1002,7 +1006,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
ref={ displayOrderField }
data-testid={ `${ testId }-form-display-order-input` }
hint={ t("claims:local.forms.displayOrderHint") }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
/>
)
}
Expand All @@ -1019,7 +1023,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
requiredErrorMessage=""
label={ t("claims:local.forms.required.label") }
data-testid={ `${ testId }-form-required-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
hint={ t("claims:local.forms.requiredHint") }
listen ={ (value: boolean) => {
isSupportedByDefault(value);
Expand Down Expand Up @@ -1075,7 +1079,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
requiredErrorMessage=""
defaultValue={ claim?.readOnly }
data-testid={ `${ testId }-form-readonly-checkbox` }
readOnly={ isReadOnly }
readOnly={ isSubOrganization() || isReadOnly }
hint={ t("claims:local.forms.readOnlyHint") }
listen={ (value: boolean) => {
setIsClaimReadOnly(value);
Expand Down Expand Up @@ -1141,7 +1145,7 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
)
}
{
!hideSpecialClaims &&
!hideSpecialClaims && !isSubOrganization() &&
(
<Show
when={ featureConfig?.attributeDialects?.scopes?.update }
Expand Down
5 changes: 5 additions & 0 deletions features/admin.claims.v1/components/edit/local-claim/edit-mapped-attributes-local-claims.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ export const EditMappedAttributesLocalClaims: FunctionComponent<EditMappedAttrib
]
};

if (validExcludedUserStores?.length === 0) {
submitData.properties = submitData?.properties?.filter((property: Property) =>
property.key !== ClaimManagementConstants.EXCLUDED_USER_STORES_CLAIM_PROPERTY);
}

setIsSubmitting(true);

updateAClaim(claim.id, submitData)
Expand Down
1 change: 1 addition & 0 deletions features/admin.claims.v1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@wso2is/access-control": "^3.3.10",
"@wso2is/admin.claims.v1": "^2.26.48",
"@wso2is/admin.core.v1": "^2.35.27",
"@wso2is/admin.organizations.v1": "^2.26.73",
"@wso2is/admin.extensions.v1": "^2.36.14",
"@wso2is/admin.server-configurations.v1": "^2.32.14",
"@wso2is/admin.users.v1": "^2.29.48",
Expand Down
Loading
Loading